From: <gregkh@linuxfoundation.org>
To: ja@ssi.bg, gregkh@linuxfoundation.org, horms@verge.net.au
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "ipvs: call skb_sender_cpu_clear" has been added to the 4.1-stable tree
Date: Sat, 17 Oct 2015 14:07:27 -0700 [thread overview]
Message-ID: <1445116047048@kroah.com> (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 <stable@vger.kernel.org> know about it.
>From e3895c0334d0ef46e80f22eaf2a52401ff6d5a67 Mon Sep 17 00:00:00 2001
From: Julian Anastasov <ja@ssi.bg>
Date: Thu, 9 Jul 2015 11:15:27 +0300
Subject: ipvs: call skb_sender_cpu_clear
From: Julian Anastasov <ja@ssi.bg>
commit e3895c0334d0ef46e80f22eaf2a52401ff6d5a67 upstream.
Reset XPS's sender_cpu on forwarding.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Fixes: 2bd82484bb4c ("xps: fix xps for stacked devices")
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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
reply other threads:[~2015-10-17 21:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445116047048@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.