Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0d1095a authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL 



Eliezer renames several *ll_poll to *busy_poll, but forgets
CONFIG_NET_LL_RX_POLL, so in case of confusion, rename it too.

Cc: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dfcefb0b

Documentation/sysctl/net.txt

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ Default: 64 


busy_read

----------------

Low latency busy poll timeout for socket reads. (needs CONFIG_NET_LL_RX_POLL)

Low latency busy poll timeout for socket reads. (needs CONFIG_NET_RX_BUSY_POLL)

Approximate time in us to busy loop waiting for packets on the device queue.

This sets the default value of the SO_BUSY_POLL socket option.

Can be set or overridden per socket by setting socket option SO_BUSY_POLL,
@@ -63,7 +63,7 @@ Default: 0 (off) 


busy_poll

----------------

Low latency busy poll timeout for poll and select. (needs CONFIG_NET_LL_RX_POLL)

Low latency busy poll timeout for poll and select. (needs CONFIG_NET_RX_BUSY_POLL)

Approximate time in us to busy loop waiting for events.

Recommended value depends on the number of sockets you poll on.

For several sockets 50, for several hundreds 100.

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+4 −4
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ struct bnx2x_fastpath { 


	struct napi_struct	napi;



#ifdef CONFIG_NET_LL_RX_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

	unsigned int state;

#define BNX2X_FP_STATE_IDLE		      0

#define BNX2X_FP_STATE_NAPI		(1 << 0)    /* NAPI owns this FP */
@@ -498,7 +498,7 @@ struct bnx2x_fastpath { 
#define BNX2X_FP_USER_PEND (BNX2X_FP_STATE_POLL | BNX2X_FP_STATE_POLL_YIELD)

	/* protect state */

	spinlock_t lock;

#endif /* CONFIG_NET_LL_RX_POLL */

#endif /* CONFIG_NET_RX_BUSY_POLL */



	union host_hc_status_block	status_blk;

	/* chip independent shortcuts into sb structure */
@@ -572,7 +572,7 @@ struct bnx2x_fastpath { 
#define bnx2x_fp_stats(bp, fp)	(&((bp)->fp_stats[(fp)->index]))

#define bnx2x_fp_qstats(bp, fp)	(&((bp)->fp_stats[(fp)->index].eth_q_stats))



#ifdef CONFIG_NET_LL_RX_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

static inline void bnx2x_fp_init_lock(struct bnx2x_fastpath *fp)

{

	spin_lock_init(&fp->lock);
@@ -680,7 +680,7 @@ static inline bool bnx2x_fp_ll_polling(struct bnx2x_fastpath *fp) 
{

	return false;

}

#endif /* CONFIG_NET_LL_RX_POLL */

#endif /* CONFIG_NET_RX_BUSY_POLL */



/* Use 2500 as a mini-jumbo MTU for FCoE */

#define BNX2X_FCOE_MINI_JUMBO_MTU	2500

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -3117,7 +3117,7 @@ int bnx2x_poll(struct napi_struct *napi, int budget) 
	return work_done;

}



#ifdef CONFIG_NET_LL_RX_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

/* must be called with local_bh_disable()d */

int bnx2x_low_latency_recv(struct napi_struct *napi)

{

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -12026,7 +12026,7 @@ static const struct net_device_ops bnx2x_netdev_ops = { 
	.ndo_fcoe_get_wwn	= bnx2x_fcoe_get_wwn,

#endif



#ifdef CONFIG_NET_LL_RX_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

	.ndo_busy_poll		= bnx2x_low_latency_recv,

#endif

};

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+6 −6
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 


#include <net/busy_poll.h>



#ifdef CONFIG_NET_LL_RX_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

#define LL_EXTENDED_STATS

#endif

/* common prefix used by pr_<> macros */
@@ -366,7 +366,7 @@ struct ixgbe_q_vector { 
	struct rcu_head rcu;	/* to avoid race with update stats on free */

	char name[IFNAMSIZ + 9];



#ifdef CONFIG_NET_LL_RX_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

	unsigned int state;

#define IXGBE_QV_STATE_IDLE        0

#define IXGBE_QV_STATE_NAPI	   1    /* NAPI owns this QV */
@@ -377,12 +377,12 @@ struct ixgbe_q_vector { 
#define IXGBE_QV_YIELD (IXGBE_QV_STATE_NAPI_YIELD | IXGBE_QV_STATE_POLL_YIELD)

#define IXGBE_QV_USER_PEND (IXGBE_QV_STATE_POLL | IXGBE_QV_STATE_POLL_YIELD)

	spinlock_t lock;

#endif  /* CONFIG_NET_LL_RX_POLL */

#endif  /* CONFIG_NET_RX_BUSY_POLL */



	/* for dynamic allocation of rings associated with this q_vector */

	struct ixgbe_ring ring[0] ____cacheline_internodealigned_in_smp;

};

#ifdef CONFIG_NET_LL_RX_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

static inline void ixgbe_qv_init_lock(struct ixgbe_q_vector *q_vector)

{
@@ -462,7 +462,7 @@ static inline bool ixgbe_qv_ll_polling(struct ixgbe_q_vector *q_vector) 
	WARN_ON(!(q_vector->state & IXGBE_QV_LOCKED));

	return q_vector->state & IXGBE_QV_USER_PEND;

}

#else /* CONFIG_NET_LL_RX_POLL */

#else /* CONFIG_NET_RX_BUSY_POLL */

static inline void ixgbe_qv_init_lock(struct ixgbe_q_vector *q_vector)

{

}
@@ -491,7 +491,7 @@ static inline bool ixgbe_qv_ll_polling(struct ixgbe_q_vector *q_vector) 
{

	return false;

}

#endif /* CONFIG_NET_LL_RX_POLL */

#endif /* CONFIG_NET_RX_BUSY_POLL */



#ifdef CONFIG_IXGBE_HWMON