| Message ID | 20230417180939.26609-1-ahmed.zaki@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | [net,v2] iavf: send VLAN offloading caps once after VFR | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Ahmed Zaki > Sent: poniedziałek, 17 kwietnia 2023 20:10 > To: intel-wired-lan@lists.osuosl.org > Subject: [Intel-wired-lan] [PATCH net v2] iavf: send VLAN offloading caps > once after VFR > > When the user disables rxvlan offloading and then changes the number of > channels, all VLAN ports are unable to receive traffic. > > Changing the number of channels triggers a VFR reset. During re-init, when > VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS is received, we do: > 1 - set the IAVF_FLAG_SETUP_NETDEV_FEATURES flag > 2 - call > iavf_set_vlan_offload_features(adapter, 0, netdev->features); > > The second step sends to the PF the __default__ features, in this case > aq_required |= IAVF_FLAG_AQ_ENABLE_CTAG_VLAN_STRIPPING > > While the first step forces the watchdog task to call > netdev_update_features() -> iavf_set_features() -> > iavf_set_vlan_offload_features(adapter, netdev->features, features). > Since the user disabled the "rxvlan", this sets: > aq_required |= IAVF_FLAG_AQ_DISABLE_CTAG_VLAN_STRIPPING > > When we start processing the AQ commands, both flags are enabled. Since > we process DISABLE_XTAG first then ENABLE_XTAG, this results in the PF > enabling the rxvlan offload. This breaks all communications on the VLAN net > devices. > > Fix by removing the call to iavf_set_vlan_offload_features() (second step). > Calling netdev_update_features() from watchdog task is enough for both init > and reset paths. > > Fixes: 7598f4b40bd6 ("iavf: Move netdev_update_features() into watchdog > task") > Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com> > --- > v2: add Fixes tag > --- > drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c > b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c > index 9afbbdac3590..7c0578b5457b 100644 > --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c > +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c index 9afbbdac3590..7c0578b5457b 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c @@ -2238,11 +2238,6 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, iavf_process_config(adapter); adapter->flags |= IAVF_FLAG_SETUP_NETDEV_FEATURES; - /* Request VLAN offload settings */ - if (VLAN_V2_ALLOWED(adapter)) - iavf_set_vlan_offload_features(adapter, 0, - netdev->features); - iavf_set_queue_vlan_tag_loc(adapter); was_mac_changed = !ether_addr_equal(netdev->dev_addr,
When the user disables rxvlan offloading and then changes the number of channels, all VLAN ports are unable to receive traffic. Changing the number of channels triggers a VFR reset. During re-init, when VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS is received, we do: 1 - set the IAVF_FLAG_SETUP_NETDEV_FEATURES flag 2 - call iavf_set_vlan_offload_features(adapter, 0, netdev->features); The second step sends to the PF the __default__ features, in this case aq_required |= IAVF_FLAG_AQ_ENABLE_CTAG_VLAN_STRIPPING While the first step forces the watchdog task to call netdev_update_features() -> iavf_set_features() -> iavf_set_vlan_offload_features(adapter, netdev->features, features). Since the user disabled the "rxvlan", this sets: aq_required |= IAVF_FLAG_AQ_DISABLE_CTAG_VLAN_STRIPPING When we start processing the AQ commands, both flags are enabled. Since we process DISABLE_XTAG first then ENABLE_XTAG, this results in the PF enabling the rxvlan offload. This breaks all communications on the VLAN net devices. Fix by removing the call to iavf_set_vlan_offload_features() (second step). Calling netdev_update_features() from watchdog task is enough for both init and reset paths. Fixes: 7598f4b40bd6 ("iavf: Move netdev_update_features() into watchdog task") Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com> --- v2: add Fixes tag --- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 5 ----- 1 file changed, 5 deletions(-)