net/iavf: fix vlan offload strip flag inconsistency
Checks
Commit Message
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.qiao@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(+)
Comments
-----Original Message-----
From: Qiao, Wenjing <wenjing.qiao@intel.com>
Sent: Friday, July 7, 2023 3:58 PM
To: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>
Cc: dev@dpdk.org; Huang, ZhiminX <zhiminx.huang@intel.com>; Qiao, Wenjing <wenjing.qiao@intel.com>
Subject: [PATCH] net/iavf: fix vlan offload strip flag inconsistency
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.qiao@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(+)
Verified vf vlan filter and strip cases in i40e and ice intree driver, tested pass.
Tested-by: Zhimin Huang <zhiminx.huang@intel.com >
> -----Original Message-----
> From: Wenjing Qiao <wenjing.qiao@intel.com>
> Sent: Friday, July 7, 2023 3:58 PM
> To: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Huang, ZhiminX <zhiminx.huang@intel.com>; Qiao,
> Wenjing <wenjing.qiao@intel.com>
> Subject: [PATCH] net/iavf: fix vlan offload strip flag inconsistency
>
> 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.qiao@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 */
Can we just use " dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP"?
> };
>
> /* 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:
How we identify this is an in-tree or out-of-tree i40e kernel driver?
> + 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
@@ -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 */
@@ -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;
}
@@ -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