Commit b7172414 authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: replace polling with sleeping in the FW completion path 



The ndo_set_rx_mode() and ndo_add/del_vxlan_port() calls may be called with
BHs disabled. The driver currently issues the required cmds to the FW in
these contexts and polls on completions from the FW, while BHs remain
disabled.  This can cause either packet loss or packet reception to be
delayed on that CPU.

This patch defers processing of the above cmds to a separate workqueue.
With this change, FW cmds are now issued only in process context.
Now that the FW cmds are issued only in process context, they can sleep
waiting for a completion instead of polling. All the spin_lock_bh(mcc_lock)
calls are now replaced with mutex calls.

Also a new rx_filter_lock is now needed to protect the RX filtering fields
like vids[] between be_vlan_add/rem_vid() and __be_set_rx_mode() contexts.

Signed-off-by: default avatarSathya Perla <sathya.perla@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 92fbb1df

drivers/net/ethernet/emulex/benet/be.h

+18 −1
Original line number Diff line number Diff line
@@ -508,6 +508,10 @@ struct be_wrb_params { 
	u16 lso_mss;	/* MSS for LSO */

};



struct be_eth_addr {

	unsigned char mac[ETH_ALEN];

};



struct be_adapter {

	struct pci_dev *pdev;

	struct net_device *netdev;
@@ -523,7 +527,7 @@ struct be_adapter { 
	struct be_dma_mem mbox_mem_alloced;



	struct be_mcc_obj mcc_obj;

	spinlock_t mcc_lock;	/* For serializing mcc cmds to BE card */

	struct mutex mcc_lock;	/* For serializing mcc cmds to BE card */

	spinlock_t mcc_cq_lock;



	u16 cfg_num_rx_irqs;		/* configured via set-channels */
@@ -570,11 +574,15 @@ struct be_adapter { 
	int if_handle;		/* Used to configure filtering */

	u32 if_flags;		/* Interface filtering flags */

	u32 *pmac_id;		/* MAC addr handle used by BE card */

	struct be_eth_addr *uc_list;/* list of uc-addrs programmed (not perm) */

	u32 uc_macs;		/* Count of secondary UC MAC programmed */

	struct be_eth_addr *mc_list;/* list of mcast addrs programmed */

	u32 mc_count;

	unsigned long vids[BITS_TO_LONGS(VLAN_N_VID)];

	u16 vlans_added;

	bool update_uc_list;

	bool update_mc_list;

	struct mutex rx_filter_lock;/* For protecting vids[] & mc/uc_list[] */



	u32 beacon_state;	/* for set_phys_id */
@@ -628,6 +636,15 @@ struct be_adapter { 
	u8 phy_state; /* state of sfp optics (functional, faulted, etc.,) */

};



/* Used for defered FW config cmds. Add fields to this struct as reqd */

struct be_cmd_work {

	struct work_struct work;

	struct be_adapter *adapter;

	union {

		__be16 vxlan_port;

	} info;

};



#define be_physfn(adapter)		(!adapter->virtfn)

#define be_virtfn(adapter)		(adapter->virtfn)

#define sriov_enabled(adapter)		(adapter->flags &	\

drivers/net/ethernet/emulex/benet/be_cmds.c

+101 −101

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/emulex/benet/be_main.c

+208 −56

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE