net: Busy polling should ignore sender CPUs
This patch is a cleanup/fix for NAPI IDs following the changes that made it so that sender_cpu and napi_id were doing a better job of sharing the same location in the sk_buff. One issue I found is that we weren't validating the napi_id as being valid before we started trying to setup the busy polling. This change corrects that by using the MIN_NAPI_ID value that is now used in both allocating the NAPI IDs, as well as validating them. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
dcb421f427
commit
545cd5e5ec
@@ -35,6 +35,12 @@ struct napi_struct;
|
||||
extern unsigned int sysctl_net_busy_read __read_mostly;
|
||||
extern unsigned int sysctl_net_busy_poll __read_mostly;
|
||||
|
||||
/* 0 - Reserved to indicate value not set
|
||||
* 1..NR_CPUS - Reserved for sender_cpu
|
||||
* NR_CPUS+1..~0 - Region available for NAPI IDs
|
||||
*/
|
||||
#define MIN_NAPI_ID ((unsigned int)(NR_CPUS + 1))
|
||||
|
||||
static inline bool net_busy_loop_on(void)
|
||||
{
|
||||
return sysctl_net_busy_poll;
|
||||
@@ -58,10 +64,9 @@ static inline unsigned long busy_loop_end_time(void)
|
||||
|
||||
static inline bool sk_can_busy_loop(const struct sock *sk)
|
||||
{
|
||||
return sk->sk_ll_usec && sk->sk_napi_id && !signal_pending(current);
|
||||
return sk->sk_ll_usec && !signal_pending(current);
|
||||
}
|
||||
|
||||
|
||||
static inline bool busy_loop_timeout(unsigned long end_time)
|
||||
{
|
||||
unsigned long now = busy_loop_us_clock();
|
||||
|
||||
Reference in New Issue
Block a user