{"id":818123,"url":"http://patchwork.ozlabs.org/api/patches/818123/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170925085822.1358-2-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170925085822.1358-2-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-25T08:58:20","name":"[net-next,1/3] mlxsw: spectrum_acl: Propagate errors from mlxsw_afa_block_jump/continue","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"a183d6f61a37ac4450593c551bfbc0f33292c93a","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170925085822.1358-2-jiri@resnulli.us/mbox/","series":[{"id":4907,"url":"http://patchwork.ozlabs.org/api/series/4907/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4907","date":"2017-09-25T08:58:19","name":"mlxsw: Introduce support for \"pass\" gact action offloading","version":1,"mbox":"http://patchwork.ozlabs.org/series/4907/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818123/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818123/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"UUThvtSe\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y0yfy696Tz9tXG\n\tfor ;\n\tMon, 25 Sep 2017 18:58:34 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933306AbdIYI63 (ORCPT );\n\tMon, 25 Sep 2017 04:58:29 -0400","from mail-wm0-f65.google.com ([74.125.82.65]:36713 \"EHLO\n\tmail-wm0-f65.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932342AbdIYI6Z (ORCPT\n\t); Mon, 25 Sep 2017 04:58:25 -0400","by mail-wm0-f65.google.com with SMTP id r136so6536792wmf.3\n\tfor ; Mon, 25 Sep 2017 01:58:24 -0700 (PDT)","from localhost (ip-89-177-136-69.net.upcbroadband.cz.\n\t[89.177.136.69]) by smtp.gmail.com with ESMTPSA id\n\to11sm3334667wrg.5.2017.09.25.01.58.23\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tMon, 25 Sep 2017 01:58:23 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=S+TLGJaiiugy0lq5jz3EkOdFGghO979v5AOPsPInbiw=;\n\tb=UUThvtSeY5lOUobuCJer6h5bsqHCJ8inkwCIrndHWq8XayxdOjnsRDry2pAC9gIqDa\n\toKG7b1Ajh15Kg77l1SR48mB0EL2jBjhw4qojKQkIn9+huW/rlWczTzkhXUk/ypG+m6B1\n\t/45ggqNeavsnZuuud/8uydnHGbpkhig2nyFsVqVVa8x6Y2aUEbxdQJy8YbXnuLWloHmv\n\tSH4kHt4vymAOSKoEBxKWiqOd6qZUF6oF+gJKxQhvGX0EaXNRg+HBFUFEZP7i30eDqzQJ\n\tIWFb1L5ekfI47UXtxjTF+smIG6726SfKGFHaNOWFtSqtvVJLrIdE2+Pglb/kTluXFoFW\n\tda0Q==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=S+TLGJaiiugy0lq5jz3EkOdFGghO979v5AOPsPInbiw=;\n\tb=XGgT9YzbSbW72/q0FDwhwI3Wd1wGluNEclxpG9KdOsnZt7PZJOUJeVvmNG1cmk25WM\n\tRKGOs21k0oKuOcthdx/ZiVzGiZjdlrvjIg7UfMJMz5ICYV8MY6R5UuDY67Xy4cw1DnpO\n\tYmSWGpR7kG4TSfjbDDBUTwcUopXztqxu0Am8qo7pBeLvscWkS2SdSbyCErggjoDfIbdV\n\t2TqLtExg7ih4TugXbetW8R66kb/QvQouHZryk9IxGKEl3HucprY5Npz0slfAk3KM6rG6\n\toMpGy2WIeFM+R5IKiPe8hm4X0gd2xHOY90xcsuQEVgOYAxOJd8vO4dCEIhJ8MKimBaAu\n\tJWWw==","X-Gm-Message-State":"AHPjjUiHQL2S2sVPPRKlFHFDV2C/oNmqid/nYHxCgJ6aQxyJsvl+s3RG\n\tAeSx9RXKxh2vMcZTLtR+Z+xIq1lY","X-Google-Smtp-Source":"AOwi7QAhbiAHkzCkQZeK8heC0rBMGLLuKN//jOemeWYojre0b/vz6EV9r0M2/gUQ/N/3mK/4VINxwA==","X-Received":"by 10.28.173.1 with SMTP id w1mr9337753wme.3.1506329904017;\n\tMon, 25 Sep 2017 01:58:24 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, idosch@mellanox.com, mlxsw@mellanox.com,\n\tjhs@mojatatu.com, xiyou.wangcong@gmail.com","Subject":"[patch net-next 1/3] mlxsw: spectrum_acl: Propagate errors from\n\tmlxsw_afa_block_jump/continue","Date":"Mon, 25 Sep 2017 10:58:20 +0200","Message-Id":"<20170925085822.1358-2-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20170925085822.1358-1-jiri@resnulli.us>","References":"<20170925085822.1358-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Jiri Pirko \n\nPropagate error instead of doing WARN_ON right away.\n\nSigned-off-by: Jiri Pirko \n---\n .../net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c | 14 ++++++++------\n .../net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h | 4 ++--\n drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 6 +++---\n drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 10 +++++-----\n drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 6 +++++-\n drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c | 4 +++-\n 6 files changed, 26 insertions(+), 18 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c\nindex ab3ffe7a..bc55d0e 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c\n@@ -399,23 +399,25 @@ u32 mlxsw_afa_block_first_set_kvdl_index(struct mlxsw_afa_block *block)\n }\n EXPORT_SYMBOL(mlxsw_afa_block_first_set_kvdl_index);\n \n-void mlxsw_afa_block_continue(struct mlxsw_afa_block *block)\n+int mlxsw_afa_block_continue(struct mlxsw_afa_block *block)\n {\n-\tif (WARN_ON(block->finished))\n-\t\treturn;\n+\tif (block->finished)\n+\t\treturn -EINVAL;\n \tmlxsw_afa_set_goto_set(block->cur_set,\n \t\t\t MLXSW_AFA_SET_GOTO_BINDING_CMD_NONE, 0);\n \tblock->finished = true;\n+\treturn 0;\n }\n EXPORT_SYMBOL(mlxsw_afa_block_continue);\n \n-void mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id)\n+int mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id)\n {\n-\tif (WARN_ON(block->finished))\n-\t\treturn;\n+\tif (block->finished)\n+\t\treturn -EINVAL;\n \tmlxsw_afa_set_goto_set(block->cur_set,\n \t\t\t MLXSW_AFA_SET_GOTO_BINDING_CMD_JUMP, group_id);\n \tblock->finished = true;\n+\treturn 0;\n }\n EXPORT_SYMBOL(mlxsw_afa_block_jump);\n \ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h\nindex 501819c..06b0be4 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h\n@@ -57,8 +57,8 @@ void mlxsw_afa_block_destroy(struct mlxsw_afa_block *block);\n int mlxsw_afa_block_commit(struct mlxsw_afa_block *block);\n char *mlxsw_afa_block_first_set(struct mlxsw_afa_block *block);\n u32 mlxsw_afa_block_first_set_kvdl_index(struct mlxsw_afa_block *block);\n-void mlxsw_afa_block_continue(struct mlxsw_afa_block *block);\n-void mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id);\n+int mlxsw_afa_block_continue(struct mlxsw_afa_block *block);\n+int mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id);\n int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block);\n int mlxsw_afa_block_append_trap(struct mlxsw_afa_block *block, u16 trap_id);\n int mlxsw_afa_block_append_fwd(struct mlxsw_afa_block *block,\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\nindex d06f7fe..ae67e60 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\n@@ -470,9 +470,9 @@ void mlxsw_sp_acl_rulei_keymask_buf(struct mlxsw_sp_acl_rule_info *rulei,\n \t\t\t\t enum mlxsw_afk_element element,\n \t\t\t\t const char *key_value,\n \t\t\t\t const char *mask_value, unsigned int len);\n-void mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei);\n-void mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,\n-\t\t\t\t u16 group_id);\n+int mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei);\n+int mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,\n+\t\t\t\tu16 group_id);\n int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei);\n int mlxsw_sp_acl_rulei_act_trap(struct mlxsw_sp_acl_rule_info *rulei);\n int mlxsw_sp_acl_rulei_act_fwd(struct mlxsw_sp *mlxsw_sp,\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c\nindex eede75f..93dcd31 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c\n@@ -378,15 +378,15 @@ void mlxsw_sp_acl_rulei_keymask_buf(struct mlxsw_sp_acl_rule_info *rulei,\n \t\t\t\t key_value, mask_value, len);\n }\n \n-void mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei)\n+int mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei)\n {\n-\tmlxsw_afa_block_continue(rulei->act_block);\n+\treturn mlxsw_afa_block_continue(rulei->act_block);\n }\n \n-void mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,\n-\t\t\t\t u16 group_id)\n+int mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,\n+\t\t\t\tu16 group_id)\n {\n-\tmlxsw_afa_block_jump(rulei->act_block, group_id);\n+\treturn mlxsw_afa_block_jump(rulei->act_block, group_id);\n }\n \n int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei)\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c\nindex 50b40de..7e8284b 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c\n@@ -608,7 +608,10 @@ mlxsw_sp_acl_tcam_region_catchall_add(struct mlxsw_sp *mlxsw_sp,\n \t\tgoto err_rulei_create;\n \t}\n \n-\tmlxsw_sp_acl_rulei_act_continue(rulei);\n+\terr = mlxsw_sp_acl_rulei_act_continue(rulei);\n+\tif (WARN_ON(err))\n+\t\tgoto err_rulei_act_continue;\n+\n \terr = mlxsw_sp_acl_rulei_commit(rulei);\n \tif (err)\n \t\tgoto err_rulei_commit;\n@@ -623,6 +626,7 @@ mlxsw_sp_acl_tcam_region_catchall_add(struct mlxsw_sp *mlxsw_sp,\n \n err_rule_insert:\n err_rulei_commit:\n+err_rulei_act_continue:\n \tmlxsw_sp_acl_rulei_destroy(rulei);\n err_rulei_create:\n \tparman_item_remove(region->parman, parman_prio, parman_item);\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c\nindex 8aace9a..f1cedcc 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c\n@@ -84,7 +84,9 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\treturn PTR_ERR(ruleset);\n \n \t\t\tgroup_id = mlxsw_sp_acl_ruleset_group_id(ruleset);\n-\t\t\tmlxsw_sp_acl_rulei_act_jump(rulei, group_id);\n+\t\t\terr = mlxsw_sp_acl_rulei_act_jump(rulei, group_id);\n+\t\t\tif (err)\n+\t\t\t\treturn err;\n \t\t} else if (is_tcf_mirred_egress_redirect(a)) {\n \t\t\tint ifindex = tcf_mirred_ifindex(a);\n \t\t\tstruct net_device *out_dev;\n","prefixes":["net-next","1/3"]}