<div dir="ltr"><div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default">Hi Ciara</div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default">Thanks for your effort in reproducing the issue and confirming that the patch works. However, I have taken care of the indentation in the commit message and sent out a v2 patch. Appreciate your review comments.</div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default"><br></div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default"><i>>>>Perhaps we should make the disabling unconditional or even better make it depend on if the stripping was enabled although I'm not sure if there's a way to check for this.</i></div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default"><br></div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default">I understand and agree with your point of disabling vlan_strip after checking if the stripping is enabled. But like you mentioned, I'm also not sure if there is any way to know that.</div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default"><br></div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default">However, I think, the current check also does a good job by checking the dev_conf parameter against RTE_ETH_RX_OFFLOAD_VLAN_STRIP and re-disables the vlan_strip after every vlan_add operation.</div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default"><br></div><div style="font-family:verdana,sans-serif;color:rgb(103,78,167)" class="gmail_default"><br></div></div><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><span style="font-family:verdana,sans-serif">Thanks</span></div><div><span style="font-family:verdana,sans-serif">Amiya</span><br></div></div></div></div><br></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Mon, 23 Jun 2025 at 23:41, Amiya Ranjan Mohakud <<a href="mailto:amiyaranjan.mohakud@gmail.com">amiyaranjan.mohakud@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">For i40e kernel drivers which support either vlan(v1) or vlan(v2)<br> VIRTCHNL OP,it will set strip on when setting filter on. But dpdk<br> side will not change strip flag. To be consistent with dpdk side,<br> explicitly disable strip again.<br> <br> Bugzilla ID:1725<br> Cc: <a href="mailto:stable@dpdk.org" target="_blank">stable@dpdk.org</a><br> <br> v2:<br> - Fixed indentation in commit message<br> <br> Signed-off-by: Amiya Ranjan Mohakud <<a href="mailto:amiyaranjan.mohakud@gmail.com" target="_blank">amiyaranjan.mohakud@gmail.com</a>><br> ---<br> drivers/net/intel/iavf/iavf_ethdev.c | 48 +++++++++++++++++-----------<br> 1 file changed, 29 insertions(+), 19 deletions(-)<br> <br> diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c<br> index b3dacbef84..f93e7bf9ae 100644<br> --- a/drivers/net/intel/iavf/iavf_ethdev.c<br> +++ b/drivers/net/intel/iavf/iavf_ethdev.c<br> @@ -1378,13 +1378,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uint32_t index)<br> vf->mac_num--;<br> }<br> <br> +static int<br> +iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)<br> +{<br> + /* For i40e kernel drivers which supports both vlan(v1 & v2) VIRTCHNL OP,<br> + * it will set strip on when setting filter on but dpdk side will not<br> + * change strip flag. To be consistent with dpdk side, explicitly disable<br> + * strip again.<br> + *<br> + */<br> + struct iavf_adapter *adapter =<br> + IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);<br> + struct rte_eth_conf *dev_conf = &dev->data->dev_conf;<br> + int err;<br> +<br> + if (adapter->hw.mac.type == IAVF_MAC_XL710 ||<br> + adapter->hw.mac.type == IAVF_MAC_VF ||<br> + adapter->hw.mac.type == IAVF_MAC_X722_VF) {<br> + if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {<br> + err = iavf_disable_vlan_strip(adapter);<br> + if (err)<br> + return -EIO;<br> + }<br> + }<br> + return 0;<br> +}<br> +<br> static int<br> iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)<br> {<br> struct iavf_adapter *adapter =<br> IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);<br> struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);<br> - struct rte_eth_conf *dev_conf = &dev->data->dev_conf;<br> int err;<br> <br> if (adapter->closed)<br> @@ -1394,7 +1419,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)<br> err = iavf_add_del_vlan_v2(adapter, vlan_id, on);<br> if (err)<br> return -EIO;<br> - return 0;<br> +<br> + return iavf_disable_vlan_strip_ex(dev, on);<br> }<br> <br> if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN))<br> @@ -1404,23 +1430,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)<br> if (err)<br> return -EIO;<br> <br> - /* For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP,<br> - * it will set strip on when setting filter on but dpdk side will not<br> - * change strip flag. To be consistent with dpdk side, disable strip<br> - * again.<br> - *<br> - * For i40e kernel driver which supports vlan v2, dpdk will invoke vlan v2<br> - * related function, so it won't go through here.<br> - */<br> - if (adapter->hw.mac.type == IAVF_MAC_XL710 ||<br> - adapter->hw.mac.type == IAVF_MAC_X722_VF) {<br> - if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {<br> - err = iavf_disable_vlan_strip(adapter);<br> - if (err)<br> - return -EIO;<br> - }<br> - }<br> - return 0;<br> + return iavf_disable_vlan_strip_ex(dev, on);<br> }<br> <br> static void<br> -- <br> 2.39.5 (Apple Git-154)<br> <br> </blockquote></div>