From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
edumazet@google.com
Cc: Wojciech Drewek <wojciech.drewek@intel.com>,
netdev@vger.kernel.org, anthony.l.nguyen@intel.com,
Marcin Szycik <marcin.szycik@linux.intel.com>,
Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
Sandeep Penigalapati <sandeep.penigalapati@intel.com>
Subject: [PATCH net-next 04/11] ice: return ENOSPC when exceeding ICE_MAX_CHAIN_WORDS
Date: Thu, 28 Apr 2022 10:24:23 -0700 [thread overview]
Message-ID: <20220428172430.1004528-5-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20220428172430.1004528-1-anthony.l.nguyen@intel.com>
From: Wojciech Drewek <wojciech.drewek@intel.com>
When number of words exceeds ICE_MAX_CHAIN_WORDS, -ENOSPC
should be returned not -EINVAL. Do not overwrite this
error code in ice_add_tc_flower_adv_fltr.
Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com>
Suggested-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: Sandeep Penigalapati <sandeep.penigalapati@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_switch.c | 5 ++++-
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 1 -
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index 496250f9f8fc..9f0a4dfb4818 100644
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -5992,9 +5992,12 @@ ice_add_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
word_cnt++;
}
- if (!word_cnt || word_cnt > ICE_MAX_CHAIN_WORDS)
+ if (!word_cnt)
return -EINVAL;
+ if (word_cnt > ICE_MAX_CHAIN_WORDS)
+ return -ENOSPC;
+
/* locate a dummy packet */
profile = ice_find_dummy_packet(lkups, lkups_cnt, rinfo->tun_type);
diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
index e1e294a1654c..1308adcfde1b 100644
--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
@@ -745,7 +745,6 @@ ice_add_tc_flower_adv_fltr(struct ice_vsi *vsi,
} else if (ret) {
NL_SET_ERR_MSG_MOD(tc_fltr->extack,
"Unable to add filter due to error");
- ret = -EIO;
goto exit;
}
--
2.31.1
next prev parent reply other threads:[~2022-04-28 17:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 17:24 [PATCH net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2022-04-28 Tony Nguyen
2022-04-28 17:24 ` [PATCH net-next 01/11] ice: Add support for classid based queue selection Tony Nguyen
2022-04-28 23:04 ` Jakub Kicinski
2022-04-29 23:43 ` Nambiar, Amritha
2022-04-30 0:17 ` Jakub Kicinski
2022-04-30 2:00 ` Nambiar, Amritha
2022-04-30 2:42 ` Jakub Kicinski
2022-05-03 10:32 ` Jamal Hadi Salim
2022-05-03 15:47 ` Jakub Kicinski
2022-05-03 21:44 ` Jamal Hadi Salim
2022-04-28 17:24 ` [PATCH net-next 02/11] ice: use min_t() to make code cleaner in ice_gnss Tony Nguyen
2022-04-28 17:24 ` [PATCH net-next 03/11] ice: introduce common helper for retrieving VSI by vsi_num Tony Nguyen
2022-04-28 17:24 ` Tony Nguyen [this message]
2022-04-28 17:24 ` [PATCH net-next 05/11] ice: get switch id on switchdev devices Tony Nguyen
2022-04-28 17:24 ` [PATCH net-next 06/11] ice: add newline to dev_dbg in ice_vf_fdir_dump_info Tony Nguyen
2022-04-28 17:24 ` [PATCH net-next 07/11] ice: always check VF VSI pointer values Tony Nguyen
2022-04-28 17:24 ` [PATCH net-next 08/11] ice: remove return value comment for ice_reset_all_vfs Tony Nguyen
2022-04-28 17:24 ` [PATCH net-next 09/11] ice: fix wording in comment for ice_reset_vf Tony Nguyen
2022-04-28 17:24 ` [PATCH net-next 10/11] ice: add a function comment for ice_cfg_mac_antispoof Tony Nguyen
2022-04-28 17:24 ` [PATCH net-next 11/11] ice: remove period on argument description in ice_for_each_vf Tony Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220428172430.1004528-5-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=marcin.szycik@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sandeep.penigalapati@intel.com \
--cc=wojciech.drewek@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).