[PATCH v2] net/iavf: fix VLAN offload strip flag

[Gao, DaxueX]

Hi Amiya,

The dpdk patch you submitted has caused the following issues. Please help confirm if it is a bug.
Subsequent bug tracking will be conducted on bugzilla. If you have any questions, please add commnet on Bugzilla.
 
DPDK patch: https://patchwork.dpdk.org/project/dpdk/patch/20250623181136.48239-1-amiyaranjan.mohakud@gmail.com/

Bugzilla: https://bugs.dpdk.org/show_bug.cgi?id=1735

Thanks,
Daxue Gao


> -----Original Message-----
> From: Loftus, Ciara <ciara.loftus at intel.com>
> Sent: 2025年6月24日 17:19
> To: Amiya Ranjan Mohakud <amiyaranjan.mohakud at gmail.com>;
> dev at dpdk.org
> Cc: stable at dpdk.org
> Subject: RE: [PATCH v2] net/iavf: fix VLAN offload strip flag
> 
> > Subject: [PATCH v2] net/iavf: fix VLAN offload strip flag
> >
> > For i40e kernel drivers which support either vlan(v1) or vlan(v2)
> > VIRTCHNL OP,it will set strip on when setting filter on. But dpdk side
> > will not change strip flag. To be consistent with dpdk side,
> > explicitly disable strip again.
> >
> > Bugzilla ID:1725
> > Cc: stable at dpdk.org
> >
> > v2:
> > - Fixed indentation in commit message
> >
> > Signed-off-by: Amiya Ranjan Mohakud <amiyaranjan.mohakud at gmail.com>
> 
> Thanks for the v2.
> 
> Reviewed-by: Ciara Loftus <ciara.loftus at intel.com>
> 
> > ---
> >  drivers/net/intel/iavf/iavf_ethdev.c | 48
> > +++++++++++++++++-----------
> >  1 file changed, 29 insertions(+), 19 deletions(-)
> >
> > diff --git a/drivers/net/intel/iavf/iavf_ethdev.c
> > b/drivers/net/intel/iavf/iavf_ethdev.c
> > index b3dacbef84..f93e7bf9ae 100644
> > --- a/drivers/net/intel/iavf/iavf_ethdev.c
> > +++ b/drivers/net/intel/iavf/iavf_ethdev.c
> > @@ -1378,13 +1378,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev
> *dev,
> > uint32_t index)
> >  	vf->mac_num--;
> >  }
> >
> > +static int
> > +iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) {
> > +	/* For i40e kernel drivers which supports both vlan(v1 & v2)
> > VIRTCHNL OP,
> > +	 * it will set strip on when setting filter on but dpdk side will not
> > +	 * change strip flag. To be consistent with dpdk side, explicitly disable
> > +	 * strip again.
> > +	 *
> > +	 */
> > +	struct iavf_adapter *adapter =
> > +		IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
> > +	struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
> > +	int err;
> > +
> > +	if (adapter->hw.mac.type == IAVF_MAC_XL710 ||
> > +	    adapter->hw.mac.type == IAVF_MAC_VF ||
> > +	    adapter->hw.mac.type == IAVF_MAC_X722_VF) {
> > +		if (on && !(dev_conf->rxmode.offloads &
> > RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {
> > +			err = iavf_disable_vlan_strip(adapter);
> > +			if (err)
> > +				return -EIO;
> > +		}
> > +	}
> > +	return 0;
> > +}
> > +
> >  static int
> >  iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id,
> > int on)  {
> >  	struct iavf_adapter *adapter =
> >  		IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
> >  	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
> > -	struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
> >  	int err;
> >
> >  	if (adapter->closed)
> > @@ -1394,7 +1419,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev
> > *dev, uint16_t vlan_id, int on)
> >  		err = iavf_add_del_vlan_v2(adapter, vlan_id, on);
> >  		if (err)
> >  			return -EIO;
> > -		return 0;
> > +
> > +		return iavf_disable_vlan_strip_ex(dev, on);
> >  	}
> >
> >  	if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN)) @@
> > -1404,23 +1430,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev,
> > uint16_t vlan_id, int on)
> >  	if (err)
> >  		return -EIO;
> >
> > -	/* For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP,
> > -	 * it will set strip on when setting filter on but dpdk side will not
> > -	 * change strip flag. To be consistent with dpdk side, disable strip
> > -	 * again.
> > -	 *
> > -	 * For i40e kernel driver which supports vlan v2, dpdk will invoke vlan
> > v2
> > -	 * related function, so it won't go through here.
> > -	 */
> > -	if (adapter->hw.mac.type == IAVF_MAC_XL710 ||
> > -	    adapter->hw.mac.type == IAVF_MAC_X722_VF) {
> > -		if (on && !(dev_conf->rxmode.offloads &
> > RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {
> > -			err = iavf_disable_vlan_strip(adapter);
> > -			if (err)
> > -				return -EIO;
> > -		}
> > -	}
> > -	return 0;
> > +	return iavf_disable_vlan_strip_ex(dev, on);
> >  }
> >
> >  static void
> > --
> > 2.39.5 (Apple Git-154)