From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:39339 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751893AbbJQVH2 (ORCPT ); Sat, 17 Oct 2015 17:07:28 -0400 Subject: Patch "ipvs: call skb_sender_cpu_clear" has been added to the 4.1-stable tree To: ja@ssi.bg, gregkh@linuxfoundation.org, horms@verge.net.au Cc: , From: Date: Sat, 17 Oct 2015 14:07:27 -0700 Message-ID: <1445116047048@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From e3895c0334d0ef46e80f22eaf2a52401ff6d5a67 Mon Sep 17 00:00:00 2001 From: Julian Anastasov Date: Thu, 9 Jul 2015 11:15:27 +0300 Subject: ipvs: call skb_sender_cpu_clear From: Julian Anastasov commit e3895c0334d0ef46e80f22eaf2a52401ff6d5a67 upstream. Reset XPS's sender_cpu on forwarding. Signed-off-by: Julian Anastasov Fixes: 2bd82484bb4c ("xps: fix xps for stacked devices") Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman --- net/netfilter/ipvs/ip_vs_xmit.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c @@ -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 ja@ssi.bg 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