[net-next PATCH 1/5] net: Do not record sender_cpu as napi_id in socket receive paths
From: Alexander Duyck <hidden>
Date: 2017-03-16 18:32:53
Also in:
lkml
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Sridhar Samudrala <sridhar.samudrala@intel.com> Fix sk_mark_napi_id() and sk_mark_napi_id_once() to set sk_napi_id only if skb->napi_id is a valid value. This happens in loopback paths where skb->napi_id is not updated in rx path and holds sender_cpu that is set in xmit path. Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com> Signed-off-by: Alexander Duyck <redacted> --- include/net/busy_poll.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index c0452de83086..67991635953e 100644
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h@@ -116,7 +116,8 @@ static inline bool sk_busy_loop(struct sock *sk, int nonblock) static inline void sk_mark_napi_id(struct sock *sk, const struct sk_buff *skb) { #ifdef CONFIG_NET_RX_BUSY_POLL - sk->sk_napi_id = skb->napi_id; + if (skb->napi_id > (u32)NR_CPUS) + sk->sk_napi_id = skb->napi_id; #endif }
@@ -125,7 +126,7 @@ static inline void sk_mark_napi_id_once(struct sock *sk, const struct sk_buff *skb) { #ifdef CONFIG_NET_RX_BUSY_POLL - if (!sk->sk_napi_id) + if (!sk->sk_napi_id && (skb->napi_id > (u32)NR_CPUS)) sk->sk_napi_id = skb->napi_id; #endif }