For i40e in-tree kernel driver, it will set strip on when setting filter on. To be consistent with dpdk, disable strip again.
Fixes: cb25d4323fbf ("net/avf: enable MAC VLAN and promisc ops") Signed-off-by: Wenjing Qiao <wenjing.q...@intel.com> --- drivers/net/iavf/iavf.h | 1 + drivers/net/iavf/iavf_ethdev.c | 18 ++++++++++++++++++ drivers/net/iavf/iavf_vchnl.c | 2 ++ 3 files changed, 21 insertions(+) diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index 98861e4242..18b05f5cce 100644 --- a/drivers/net/iavf/iavf.h +++ b/drivers/net/iavf/iavf.h @@ -325,6 +325,7 @@ struct iavf_adapter { bool closed; uint16_t fdir_ref_cnt; struct iavf_devargs devargs; + bool is_strip; /* only for vlan v1 */ }; /* IAVF_DEV_PRIVATE_TO */ diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 00b963128b..8cd534e93c 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1379,6 +1379,24 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) err = iavf_add_del_vlan(adapter, vlan_id, on); if (err) return -EIO; + /* for i40e in-tree kernel driver, it will set strip on when setting + * filter on. To be consistent with dpdk, disable strip again. + */ + if (adapter->hw.vendor_id == IAVF_INTEL_VENDOR_ID) { + switch (adapter->hw.device_id) { + case IAVF_DEV_ID_VF: + case IAVF_DEV_ID_VF_HV: + case IAVF_DEV_ID_X722_VF: + if (on && !adapter->is_strip) { + err = iavf_disable_vlan_strip(adapter); + if (err) + return -EIO; + } + break; + default: + break; + } + } return 0; } diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 524732f67d..2d2fee4312 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -589,6 +589,7 @@ iavf_enable_vlan_strip(struct iavf_adapter *adapter) PMD_DRV_LOG(ERR, "Failed to execute command of" " OP_ENABLE_VLAN_STRIPPING"); + adapter->is_strip = true; return ret; } @@ -611,6 +612,7 @@ iavf_disable_vlan_strip(struct iavf_adapter *adapter) " OP_DISABLE_VLAN_STRIPPING"); return ret; + adapter->is_strip = false; } #define VIRTCHNL_VERSION_MAJOR_START 1 -- 2.34.1