iavf: Fix handling of vlan strip virtual channel messages
Subsystems (2)
PATCH v5 1/1 iavf: Fix handling of vlan strip virtual channel messages
Modify netdev->features for vlan stripping based on virtual channel messages received from the PF. Change is needed to synchronize vlan strip status between PF sysfs and iavf ethtool.
---
v5: Changed fixes tag into the proper one due to missclick in pervious one
v4: Changed the same flags which occured in statement and did not have any sense.
Changed fixes tag into the proper one
v3: NETIF_F_HW_VLAN_RX changed into NETIF_F_HW_VLAN_CTAG_RX because there's
no such definition since Linux 3.10. The code is the same as the one from OOT. Code successfully passed inner review. netdev_update_features() function is not added because it causes infinite loop.
v2: Changed fixes tag into the more probable and accurate
---
--- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +40 -0
@@ -1855,6 +1855,22 @@ void iavf_request_reset(struct iavf_adapter *adapter) adapter->current_op =VIRTCHNL_OP_UNKNOWN ; } +/** +* iavf_netdev_features_vlan_strip_set - update vlan strip status +* @netdev: ptr to netdev being adjusted +* @enable: enable or disable vlan strip +* +* Helper function to change vlan strip status in netdev->features. +*/ +static void iavf_netdev_features_vlan_strip_set (struct net_device *netdev, +const bool enable) +{ +if (enable) + netdev->features |=NETIF_F_HW_VLAN_CTAG_RX ; +else + netdev->features &= ~NETIF_F_HW_VLAN_CTAG_RX ; +} +/** * iavf_virtchnl_completion * @adapter: adapter structure
@@ -2078,8 +2094,18 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, }break ;case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING : +dev_warn (&adapter->pdev->dev,"Changing VLAN Stripping is not allowed when Port VLAN is configured\n" ); +/* Vlan stripping could not be enabled by ethtool. +* Disable it in netdev->features. +*/ +iavf_netdev_features_vlan_strip_set (netdev, false); +break ;case VIRTCHNL_OP_DISABLE_VLAN_STRIPPING :dev_warn (&adapter->pdev->dev,"Changing VLAN Stripping is not allowed when Port VLAN is configured\n" ); +/* Vlan stripping could not be disabled by ethtool. +* Enable it in netdev->features. +*/ +iavf_netdev_features_vlan_strip_set (netdev, true);break ;default : dev_err(&adapter->pdev->dev, "PF returned error %d (%s) to our request %d\n",
@@ -2355,6 +2381,20 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,spin_unlock_bh (&adapter->adv_rss_lock); }break ; +case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING : +/* PF enabled vlan strip on this VF. +* Update netdev->features if needed to be in sync with ethtool. +*/ +if (!v_retval) +iavf_netdev_features_vlan_strip_set (netdev, true); +break ; +case VIRTCHNL_OP_DISABLE_VLAN_STRIPPING : +/* PF disabled vlan strip on this VF. +* Update netdev->features if needed to be in sync with ethtool. +*/ +if (!v_retval) +iavf_netdev_features_vlan_strip_set (netdev, false); +break ;default :if (adapter->current_op && (v_opcode != adapter->current_op)) dev_warn(&adapter->pdev->dev, "Expected response %d from PF, received %d\n",
Signature · 1 line
2.27.0
Jankowski
PATCH v5 1/1 iavf: Fix handling of vlan strip virtual channel messages
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
Quoted 42 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Michal Maloszewski
Sent: Monday, January 24, 2022 2:36 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Maloszewski, Michal <[email protected]>; Ciosek, NorbertX <[email protected]>
Subject: [Intel-wired-lan] [PATCH net v5] iavf: Fix handling of vlan strip virtual channel messagesModify
netdev->featuresfor vlan stripping based on virtual channel messages received from the PF. Change is needed to synchronize vlan strip status between PF sysfs and iavf ethtool.Fixes 5951a2b9812d ("iavf: Fix VLAN feature flags after VFR")Signed-off-by Norbert Ciosek <[email protected]>Signed-off-by Michal Maloszewski <[email protected]>---
v5: Changed fixes tag into the proper one due to missclick in pervious one
v4: Changed the same flags which occured in statement and did not have any sense.
Changed fixes tag into the proper one
v3:NETIF_F_HW_VLAN_RXchanged intoNETIF_F_HW_VLAN_CTAG_RXbecause there's
no such definition since Linux 3.10. The code is the same as the one from
OOT.
Code successfully passed inner review.netdev_update_features()
function is not added
because it causes infinite loop.
v2: Changed fixes tag into the more probable and accurate
------ .../net/ethernet/intel/iavf/iavf_virtchnl.c | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +0
-0