Skip to contentSkip to conversation

Patch "ipvs: call skb_sender_cpu_clear" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Oct 17, 2015

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ipvs: call skb_sender_cpu_clear

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ipvs-call-skb_sender_cpu_clear.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e3895c0334d0ef46e80f22eaf2a52401ff6d5a67 Mon Sep 17 00:00:00 2001

From: Julian Anastasov <[email protected]>
Date: Thu, 9 Jul 2015 11:15:27 +0300
Subject: ipvs: call skb_sender_cpu_clear

From: Julian Anastasov <[email protected]>

commit e3895c0334d0ef46e80f22eaf2a52401ff6d5a67 upstream.

Reset XPS's sender_cpu on forwarding.

Fixes 2bd82484bb4c ("xps: fix xps for stacked devices")
---
 net/netfilter/ipvs/ip_vs_xmit.c |    6 ++++++
 1 file changed, 6 insertions(+)
net/netfilter/ipvs/ip_vs_xmit.c +6 -0
@@ -518,6 +518,8 @@ static inline int ip_vs_tunnel_xmit_prep
 	if (ret == NF_ACCEPT) {
 		nf_reset(skb);
 		skb_forward_csum(skb);
+		if (!skb->sk)
+			skb_sender_cpu_clear(skb);
 	}
 	return ret;
 }
@@ -558,6 +560,8 @@ static inline int ip_vs_nat_send_or_cont
 
 	if (!local) {
 		skb_forward_csum(skb);
+		if (!skb->sk)
+			skb_sender_cpu_clear(skb);
 		NF_HOOK(pf, NF_INET_LOCAL_OUT, NULL, skb,
 			NULL, skb_dst(skb)->dev, dst_output_sk);
 	} else
@@ -578,6 +582,8 @@ static inline int ip_vs_send_or_cont(int
 	if (!local) {
 		ip_vs_drop_early_demux_sk(skb);
 		skb_forward_csum(skb);
+		if (!skb->sk)
+			skb_sender_cpu_clear(skb);
 		NF_HOOK(pf, NF_INET_LOCAL_OUT, NULL, skb,
 			NULL, skb_dst(skb)->dev, dst_output_sk);
 	} else

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/ipvs-call-skb_sender_cpu_clear.patch queue-4.1/ipvs-skb_orphan-in-case-of-forwarding.patch queue-4.1/ipvs-do-not-use-random-local-source-address-for-tunnels.patch queue-4.1/ipvs-fix-crash-if-scheduler-is-changed.patch queue-4.1/ipvs-fix-crash-with-sync-protocol-v0-and-ftp.patch