iavf: Fix promiscuous mode configuration flow messages
Subsystems (2)
PATCH 1/1 iavf: Fix promiscuous mode configuration flow messages
Currently when configuring promiscuous mode on the AVF we detect a change in the netdev->flags. We use IFF_PROMISC and IFF_ALLMULTI to determine whether or not we need to request/release promiscuous mode and/or multicast promiscuous mode. The problem is that the AQ calls for setting/clearing promiscuous/multicast mode are treated separately. This leads to a case where we can trigger two promiscuous mode AQ calls in a row with the incorrect state. To fix this make a few changes.
Use IAVF_FLAG_AQ_CONFIGURE_PROMISC_MODE instead of the previous IAVF_FLAG_AQ_[REQUEST|RELEASE]_[PROMISC|ALLMULTI] flags.
In iavf_set_rx_mode() detect if there is a change in the netdev->flags in comparison with adapter->flags and set the IAVF_FLAG_AQ_CONFIGURE_PROMISC_MODE aq_required bit. Then in iavf_process_aq_command() only check for IAVF_FLAG_CONFIGURE_PROMISC_MODE and call iavf_set_promiscuous() if it's set.
In iavf_set_promiscuous() check again to see which (if any) promiscuous mode bits have changed when comparing the netdev->flags with the adapter->flags. Use this to set the flags which get sent to the PF driver.
Add a spinlock that is used for updating current_netdev_promisc_flags and only allows one promiscuous mode AQ at a time.
[1] Fixes the fact that we will only have one AQ call in the aq_required queue at any one time.
[2] Streamlines the change in promiscuous mode to only set one AQ required bit.
[3] This allows us to keep track of the current state of the flags and also makes it so we can take the most recent netdev->flags promiscuous mode state.
[4] This fixes the problem where a change in the netdev->flags can cause IAVF_FLAG_AQ_CONFIGURE_PROMISC_MODE to be set in iavf_set_rx_mode(), but cleared in iavf_set_promiscuous() before the change is ever made via AQ call.
--- drivers/net/ethernet/intel/iavf/iavf.h | 16 ++-- drivers/net/ethernet/intel/iavf/iavf_main.c | 45 +++++------ .../net/ethernet/intel/iavf/iavf_virtchnl.c | 77 ++++++++++++------- 3 files changed, 76 insertions(+), 62 deletions(-)
drivers/net/ethernet/intel/iavf/iavf.h +9 -7
@@ -267,8 +267,6 @@ struct iavf_adapter {#define IAVF_FLAG_CLIENT_NEEDS_OPEN BIT(10)#define IAVF_FLAG_CLIENT_NEEDS_CLOSE BIT(11)#define IAVF_FLAG_CLIENT_NEEDS_L2_PARAMS BIT(12) -#define IAVF_FLAG_PROMISC_ON BIT(13) -#define IAVF_FLAG_ALLMULTI_ON BIT(14)#define IAVF_FLAG_LEGACY_RX BIT(15)#define IAVF_FLAG_REINIT_ITR_NEEDED BIT(16)#define IAVF_FLAG_QUEUES_DISABLED BIT(17)
@@ -292,10 +290,7 @@ struct iavf_adapter {#define IAVF_FLAG_AQ_SET_HENA BIT(12)#define IAVF_FLAG_AQ_SET_RSS_KEY BIT(13)#define IAVF_FLAG_AQ_SET_RSS_LUT BIT(14) -#define IAVF_FLAG_AQ_REQUEST_PROMISC BIT(15) -#define IAVF_FLAG_AQ_RELEASE_PROMISC BIT(16) -#define IAVF_FLAG_AQ_REQUEST_ALLMULTI BIT(17) -#define IAVF_FLAG_AQ_RELEASE_ALLMULTI BIT(18) +#define IAVF_FLAG_AQ_CONFIGURE_PROMISC_MODE BIT(15)#define IAVF_FLAG_AQ_ENABLE_VLAN_STRIPPING BIT(19)#define IAVF_FLAG_AQ_DISABLE_VLAN_STRIPPING BIT(20)#define IAVF_FLAG_AQ_ENABLE_CHANNELS BIT(21)
@@ -307,6 +302,12 @@ struct iavf_adapter {#define IAVF_FLAG_AQ_ADD_ADV_RSS_CFG BIT(27)#define IAVF_FLAG_AQ_DEL_ADV_RSS_CFG BIT(28) +/* Lock to prevent possible clobbering of +* current_netdev_promisc_flags +*/ +spinlock_t current_netdev_promisc_flags_lock; +netdev_features_t current_netdev_promisc_flags; +/* OS defined structs */ struct net_device *netdev;struct pci_dev *pdev;
@@ -426,7 +427,8 @@ void iavf_add_ether_addrs(struct iavf_adapter *adapter);void iavf_del_ether_addrs (struct iavf_adapter *adapter);void iavf_add_vlans (struct iavf_adapter *adapter);void iavf_del_vlans (struct iavf_adapter *adapter); -void iavf_set_promiscuous (struct iavf_adapter *adapter,int flags); +void iavf_set_promiscuous (struct iavf_adapter *adapter); +bool iavf_promiscuous_mode_changed (struct iavf_adapter *adapter);void iavf_request_stats (struct iavf_adapter *adapter);void iavf_request_reset (struct iavf_adapter *adapter);void iavf_get_hena (struct iavf_adapter *adapter);
drivers/net/ethernet/intel/iavf/iavf_main.c +18 -27
71 lines not on this page · raw message
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +49 -28
96 lines not on this page · raw message
Signature · 1 line
2.27.0
Nguyen
PATCH 1/1 iavf: Fix promiscuous mode configuration flow messages
Quoted 43 lines · Karen Sornek
Currently when configuring promiscuous mode on the AVF we detect a change in the
netdev->flags. We useIFF_PROMISCandIFF_ALLMULTIto determine whether or not we need to request/release promiscuous mode and/or multicast promiscuous mode. The problem is that the AQ calls for
setting/clearing promiscuous/multicast mode are treated separately. This
leads to a case where we can trigger two promiscuous mode AQ calls in a row with the incorrect state. To fix this make a few changes.Use
IAVF_FLAG_AQ_CONFIGURE_PROMISC_MODEinstead of the previous IAVF_FLAG_AQ_[REQUEST|RELEASE]_[PROMISC|ALLMULTI] flags.In
iavf_set_rx_mode()detect if there is a change in thenetdev->flagsin comparison withadapter->flagsand set theIAVF_FLAG_AQ_CONFIGURE_PROMISC_MODEaq_requiredbit. Then iniavf_process_aq_command()only check forIAVF_FLAG_CONFIGURE_PROMISC_MODE
and calliavf_set_promiscuous()if it's set.In
iavf_set_promiscuous()check again to see which (if any) promiscuous mode bits have changed when comparing thenetdev->flagswith
theadapter->flags. Use this to set the flags which get sent to the PF
driver.Add a spinlock that is used for updating
current_netdev_promisc_flagsand only allows one promiscuous mode AQ at a time.[1] Fixes the fact that we will only have one AQ call in the
aq_required
queue at any one time.[2] Streamlines the change in promiscuous mode to only set one AQ required bit.
[3] This allows us to keep track of the current state of the flags and
also makes it so we can take the most recentnetdev->flagspromiscuous
mode state.
Quoted 6 lines
[4] This fixes the problem where a change in the
netdev->flagscan causeIAVF_FLAG_AQ_CONFIGURE_PROMISC_MODEto be set iniavf_set_rx_mode(), but cleared iniavf_set_promiscuous()before the change is ever made via
AQ call.
This patch still doesn't apply.
Were there any changes made or is this a resend of the same patch[1]? Please include proper tags, revisions, and/or changelogs to make reviews easier.
Quoted 5 lines
Fixes 129cf89e5856 ("iavf: rename functions and structs to newname")
Signed-off-by: Brett Creeley brett.creeley at intel.com
Signed-off-by: Karen Sornek karen.sornek at intel.com
[1] https://patchwork.ozlabs.org/project/intel-wired-
lan/patch/20210902124436.162039-1-karen.sornek at intel.com/