xps: must clear sender_cpu before forwarding
Subsystems (3)
PATCH 1/1 xps: must clear sender_cpu before forwarding
In reply to a message not in the archiveFrom: Eric Dumazet <[email protected]>
John reported that my previous commit added a regression on his router.
This is because sender_cpu & napi_id share a common location, so get_xps_queue() can see garbage and perform an out of bound access.
We need to make sure sender_cpu is cleared before doing the transmit, otherwise any NIC busy poll enabled (skb_mark_napi_id()) can trigger this bug.
--- include/linux/skbuff.h | 7 +++++++ net/core/skbuff.c | 2 +- net/ipv4/ip_forward.c | 1 + net/ipv6/ip6_output.c | 1 + 4 files changed, 10 insertions(+), 1 deletion(-)
include/linux/skbuff.h +7 -0
@@ -948,6 +948,13 @@ static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from) to->l4_hash = from->l4_hash; }; +static inline void skb_sender_cpu_clear (struct sk_buff *skb) +{ +#ifdef CONFIG_XPS + skb->sender_cpu =0 ; +#endif +} +#ifdef NET_SKBUFF_DATA_USES_OFFSET static inline unsigned char *skb_end_pointer (const struct sk_buff *skb) {
net/core/skbuff.c +1 -1
@@ -4173,7 +4173,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) skb->ignore_df =0 ;skb_dst_drop (skb); skb->mark =0 ; - skb->sender_cpu =0 ; +skb_sender_cpu_clear (skb);skb_init_secmark (skb);secpath_reset (skb);nf_reset (skb);
net/ipv4/ip_forward.c +1 -0
@@ -67,6 +67,7 @@ static int ip_forward_finish(struct sk_buff *skb)if (unlikely (opt->optlen))ip_forward_options (skb); +skb_sender_cpu_clear (skb);return dst_output (skb); }
net/ipv6/ip6_output.c +1 -0
@@ -318,6 +318,7 @@ static int ip6_forward_proxy_check(struct sk_buff *skb)static inline int ip6_forward_finish (struct sk_buff *skb) { +skb_sender_cpu_clear (skb);return dst_output (skb); }
From: Eric Dumazet <[email protected]>
Date: Wed, 11 Mar 2015 18:42:02 -0700
Quoted 8 lines
From: Eric Dumazet <[email protected]>
John reported that my previous commit added a regression on his router.
This is because
sender_cpu&napi_idshare a common location, soget_xps_queue()can see garbage and perform an out of bound access.
Quoted 8 lines
We need to make sure
sender_cpuis cleared before doing the transmit, otherwise any NIC busy poll enabled (skb_mark_napi_id()) can trigger this bug.Signed-off-by Eric Dumazet <[email protected]>Reported-by John <[email protected]>Bisected-by John <[email protected]>Fixes 2bd82484bb4c ("xps: fix xps for stacked devices")
Applied, thanks Eric.
Thanks, Eric. I will test again tomorrow.
-John
Quoted 80 lines · Eric Dumazet
From: Eric Dumazet <[email protected]>
John reported that my previous commit added a regression on his router.
This is because
sender_cpu&napi_idshare a common location, soget_xps_queue()can see garbage and perform an out of bound access.We need to make sure
sender_cpuis cleared before doing the transmit, otherwise any NIC busy poll enabled (skb_mark_napi_id()) can trigger this bug.Signed-off-by Eric Dumazet <[email protected]>Reported-by John <[email protected]>Bisected-by John <[email protected]>Fixes 2bd82484bb4c ("xps: fix xps for stacked devices")--- include/linux/skbuff.h | 7 +++++++ net/core/skbuff.c | 2 +- net/ipv4/ip_forward.c | 1 + net/ipv6/ip6_output.c | 1 + 4 files changed, 10 insertions(+), 1 deletion(-)include/linux/skbuff.h +7
-0@@ -948,6 +948,13 @@ static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from) to->l4_hash = from->l4_hash; }; +static inline void skb_sender_cpu_clear (struct sk_buff *skb) +{ +#ifdef CONFIG_XPS + skb->sender_cpu =0 ; +#endif +} +#ifdef NET_SKBUFF_DATA_USES_OFFSET static inline unsigned char *skb_end_pointer (const struct sk_buff *skb) {net/core/skbuff.c +1
-1@@ -4173,7 +4173,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) skb->ignore_df =0 ;skb_dst_drop (skb); skb->mark =0 ; - skb->sender_cpu =0 ; +skb_sender_cpu_clear (skb);skb_init_secmark (skb);secpath_reset (skb);nf_reset (skb);net/ipv4/ip_forward.c +1
-0@@ -67,6 +67,7 @@ static int ip_forward_finish(struct sk_buff *skb)if (unlikely (opt->optlen))ip_forward_options (skb); +skb_sender_cpu_clear (skb);return dst_output (skb); }net/ipv6/ip6_output.c +1
-0@@ -318,6 +318,7 @@ static int ip6_forward_proxy_check(struct sk_buff *skb)static inline int ip6_forward_finish (struct sk_buff *skb) { +skb_sender_cpu_clear (skb);return dst_output (skb); }
Quoted 15 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Wed, 11 Mar 2015 18:42:02 -0700Quoted 12 lines
From: Eric Dumazet <[email protected]>
John reported that my previous commit added a regression on his router.
This is because
sender_cpu&napi_idshare a common location, soget_xps_queue()can see garbage and perform an out of bound access.We need to make sure
sender_cpuis cleared before doing the transmit, otherwise any NIC busy poll enabled (skb_mark_napi_id()) can trigger this bug.
Quoted 5 lines
Quoted 4 lines
Signed-off-by Eric Dumazet <[email protected]>Reported-by John <[email protected]>Bisected-by John <[email protected]>Fixes 2bd82484bb4c ("xps: fix xps for stacked devices")Applied, thanks Eric.
Running this patch, I have confirmed that I no longer see panics under the conditions that I saw them previously.
-John
David Miller
maintainerFrom: John <[email protected]>
Date: Thu, 12 Mar 2015 19:36:38 -0700
Quoted 2 lines
Running this patch, I have confirmed that I no longer see panics under the conditions that I saw them previously.
Thanks for testing.
Quoted 2 lines · John
Running this patch, I have confirmed that I no longer see panics under the conditions that I saw them previously.
Thanks a lot John !