DPDK patches and discussions
 help / color / mirror / Atom feed
From: Guinan Sun <guinanx.sun@intel.com>
To: dev@dpdk.org
Cc: Beilei Xing <beilei.xing@intel.com>, Jeff Guo <jia.guo@intel.com>,
	Guinan Sun <guinanx.sun@intel.com>,
	stable@dpdk.org,
	Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Subject: [dpdk-dev] [PATCH v3 12/15] net/i40e/base: fix Rx only mode for unicast promisc on VLAN
Date: Thu,  3 Sep 2020 04:48:53 +0000	[thread overview]
Message-ID: <20200903044856.61961-13-guinanx.sun@intel.com> (raw)
In-Reply-To: <20200903044856.61961-1-guinanx.sun@intel.com>

Set promiscuous mode to rx traffic only if VSI has VLANs configured.
Rename misleading PROMISC_TX bit to proper name.
Added I40E_AQC_SET_VSI_PROMISC_RX_ONLY during VSI unicast promiscuous
mode configuration with port VLAN.
Aligned unicast promiscuous with VLAN to the one without VLAN.
Previously other VFs could listen to unicast tx traffic of other VFs.

Fixes: 8db9e2a1b232 ("i40e: base driver")
Cc: stable@dpdk.org

Signed-off-by: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
---
 drivers/net/i40e/base/i40e_adminq_cmd.h |  2 +-
 drivers/net/i40e/base/i40e_common.c     | 36 +++++++++++++++++++------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h b/drivers/net/i40e/base/i40e_adminq_cmd.h
index 4db8cdd8c..d6402a691 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -1222,7 +1222,7 @@ struct i40e_aqc_set_vsi_promiscuous_modes {
 #define I40E_AQC_SET_VSI_PROMISC_BROADCAST	0x04
 #define I40E_AQC_SET_VSI_DEFAULT		0x08
 #define I40E_AQC_SET_VSI_PROMISC_VLAN		0x10
-#define I40E_AQC_SET_VSI_PROMISC_TX		0x8000
+#define I40E_AQC_SET_VSI_PROMISC_RX_ONLY	0x8000
 	__le16	seid;
 #define I40E_AQC_VSI_PROM_CMD_SEID_MASK		0x3FF
 	__le16	vlan_tag;
diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index 15f4e91a4..cd8b27e40 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -2270,6 +2270,22 @@ enum i40e_status_code i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
 	return status;
 }
 
+/**
+ * i40e_hw_ver_ge
+ * @hw: pointer to the hw struct
+ * @maj: api major value
+ * @min: api minor value
+ *
+ * Assert whether current HW api version is greater/equal than provided.
+ **/
+static bool i40e_hw_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
+{
+	if (hw->aq.api_maj_ver > maj ||
+	    (hw->aq.api_maj_ver == maj && hw->aq.api_min_ver >= min))
+		return true;
+	return false;
+}
+
 /**
  * i40e_aq_add_vsi
  * @hw: pointer to the hw struct
@@ -2395,18 +2411,16 @@ enum i40e_status_code i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,
 
 	if (set) {
 		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;
-		if (rx_only_promisc &&
-		    (((hw->aq.api_maj_ver == 1) && (hw->aq.api_min_ver >= 5)) ||
-		     (hw->aq.api_maj_ver > 1)))
-			flags |= I40E_AQC_SET_VSI_PROMISC_TX;
+		if (rx_only_promisc && i40e_hw_ver_ge(hw, 1, 5))
+			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;
 	}
 
 	cmd->promiscuous_flags = CPU_TO_LE16(flags);
 
 	cmd->valid_flags = CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_UNICAST);
-	if (((hw->aq.api_maj_ver >= 1) && (hw->aq.api_min_ver >= 5)) ||
-	     (hw->aq.api_maj_ver > 1))
-		cmd->valid_flags |= CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_TX);
+	if (i40e_hw_ver_ge(hw, 1, 5))
+		cmd->valid_flags |=
+			CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);
 
 	cmd->seid = CPU_TO_LE16(seid);
 	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
@@ -2538,11 +2552,17 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,
 	i40e_fill_default_direct_cmd_desc(&desc,
 					i40e_aqc_opc_set_vsi_promiscuous_modes);
 
-	if (enable)
+	if (enable) {
 		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;
+		if (i40e_hw_ver_ge(hw, 1, 5))
+			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;
+	}
 
 	cmd->promiscuous_flags = CPU_TO_LE16(flags);
 	cmd->valid_flags = CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_UNICAST);
+	if (i40e_hw_ver_ge(hw, 1, 5))
+		cmd->valid_flags |=
+			CPU_TO_LE16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);
 	cmd->seid = CPU_TO_LE16(seid);
 	cmd->vlan_tag = CPU_TO_LE16(vid | I40E_AQC_SET_VSI_VLAN_VALID);
 
-- 
2.17.1


  parent reply	other threads:[~2020-09-03  4:57 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-21  7:39 [dpdk-dev] [PATCH 0/8] update i40e base code Guinan Sun
2020-07-21  7:39 ` [dpdk-dev] [PATCH 1/8] net/i40e/base: enable FEC on/off flag setting for X722 Guinan Sun
2020-07-27  3:38   ` Jeff Guo
2020-07-21  7:39 ` [dpdk-dev] [PATCH 2/8] net/i40e/base: add PTYPE definition Guinan Sun
2020-07-27  3:43   ` Jeff Guo
2020-07-21  7:39 ` [dpdk-dev] [PATCH 3/8] net/i40e/base: enable new custom cloud filters Guinan Sun
2020-07-27  3:53   ` Jeff Guo
2020-07-27  4:55     ` Sun, GuinanX
2020-07-21  7:39 ` [dpdk-dev] [PATCH 4/8] net/i40e/base: update FVL FW API version to 1.11 Guinan Sun
2020-07-21  7:39 ` [dpdk-dev] [PATCH 5/8] net/i40e/base: check return value of DNL admin command Guinan Sun
2020-07-27  4:07   ` Jeff Guo
2020-07-27  4:53     ` Sun, GuinanX
2020-07-27  5:19     ` Sun, GuinanX
2020-07-21  7:39 ` [dpdk-dev] [PATCH 6/8] net/i40e/base: add disable unused ports capability Guinan Sun
2020-07-27  4:24   ` Jeff Guo
2020-07-27  5:01     ` Sun, GuinanX
2020-07-21  7:39 ` [dpdk-dev] [PATCH 7/8] net/i40e/base: replace AQ command for NVM update Guinan Sun
2020-07-27  4:32   ` Jeff Guo
2020-07-21  7:40 ` [dpdk-dev] [PATCH 8/8] net/i40e/base: update version Guinan Sun
2020-07-27  4:32   ` Jeff Guo
2020-07-27  5:34 ` [dpdk-dev] [PATCH v2 0/8] update i40e base code Guinan Sun
2020-07-27  5:34   ` [dpdk-dev] [PATCH v2 1/8] net/i40e/base: enable FEC on/off flag setting for X722 Guinan Sun
2020-07-27  5:34   ` [dpdk-dev] [PATCH v2 2/8] net/i40e/base: add PTYPE definition Guinan Sun
2020-07-27  5:34   ` [dpdk-dev] [PATCH v2 3/8] net/i40e/base: add new custom cloud filter types Guinan Sun
2020-07-27  6:43     ` Jeff Guo
2020-07-27  5:34   ` [dpdk-dev] [PATCH v2 4/8] net/i40e/base: update FW API version to 1.11 Guinan Sun
2020-07-27  6:44     ` Jeff Guo
2020-07-27  5:34   ` [dpdk-dev] [PATCH v2 5/8] net/i40e/base: fix possible uninitialized variable Guinan Sun
2020-07-27  6:45     ` Jeff Guo
2020-07-27  5:34   ` [dpdk-dev] [PATCH v2 6/8] net/i40e/base: support unused ports disabling Guinan Sun
2020-07-28  1:31     ` Jeff Guo
2020-07-27  5:34   ` [dpdk-dev] [PATCH v2 7/8] net/i40e/base: replace AQ command for NVM update Guinan Sun
2020-07-27  5:34   ` [dpdk-dev] [PATCH v2 8/8] net/i40e/base: update version Guinan Sun
2020-07-28  1:32   ` [dpdk-dev] [PATCH v2 0/8] update i40e base code Jeff Guo
2020-08-31  3:58     ` Zhang, Qi Z
2020-09-03  4:48   ` [dpdk-dev] [PATCH v3 00/15] " Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 01/15] net/i40e/base: enable FEC on/off flag setting for X722 Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 02/15] net/i40e/base: add PTYPE definition Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 03/15] net/i40e/base: add new custom cloud filter types Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 04/15] net/i40e/base: update FW API version to 1.12 Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 05/15] net/i40e/base: fix possible uninitialized variable Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 06/15] net/i40e/base: support unused ports disabling Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 07/15] net/i40e/base: replace AQ command for NVM update Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 08/15] net/i40e/base: add VLAN field for input set Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 09/15] net/i40e/base: enable pipe monitor thresholds Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 10/15] net/i40e/base: fix missing function header arguments Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 11/15] net/i40e/base: add support for Minimum Rollback Revision Guinan Sun
2020-09-03  4:48     ` Guinan Sun [this message]
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 13/15] net/i40e/base: add EEE LPI status check for X722 adapters Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 14/15] net/i40e/base: fix PHY config param when enabling EEE Guinan Sun
2020-09-03  4:48     ` [dpdk-dev] [PATCH v3 15/15] net/i40e/base: update version Guinan Sun
2020-09-03 14:31     ` [dpdk-dev] [PATCH v3 00/15] update i40e base code Ferruh Yigit
2020-09-04  1:24       ` Sun, GuinanX

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=20200903044856.61961-13-guinanx.sun@intel.com \
    --to=guinanx.sun@intel.com \
    --cc=beilei.xing@intel.com \
    --cc=dev@dpdk.org \
    --cc=jia.guo@intel.com \
    --cc=przemyslawx.patynowski@intel.com \
    --cc=stable@dpdk.org \
    /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).