From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 08/10] ipvs: call skb_sender_cpu_clear
Date: Thu, 23 Jul 2015 01:00:50 +0200 [thread overview]
Message-ID: <1437606052-5179-9-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1437606052-5179-1-git-send-email-pablo@netfilter.org>
From: Julian Anastasov <ja@ssi.bg>
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>
---
net/netfilter/ipvs/ip_vs_xmit.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 34dc142..258a0b0 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -529,6 +529,8 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,
if (ret == NF_ACCEPT) {
nf_reset(skb);
skb_forward_csum(skb);
+ if (!skb->sk)
+ skb_sender_cpu_clear(skb);
}
return ret;
}
@@ -569,6 +571,8 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,
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
@@ -589,6 +593,8 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,
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
--
1.7.10.4
next prev parent reply other threads:[~2015-07-22 23:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-22 23:00 [PATCH 00/10] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2015-07-22 23:00 ` [PATCH 01/10] netfilter: ctnetlink: put back references to master ct and expect objects Pablo Neira Ayuso
2015-07-22 23:00 ` [PATCH 02/10] netfilter: IDLETIMER: fix lockdep warning Pablo Neira Ayuso
2015-07-22 23:00 ` [PATCH 03/10] ipvs: fix ipv6 route unreach panic Pablo Neira Ayuso
2015-07-22 23:00 ` [PATCH 04/10] ipvs: do not use random local source address for tunnels Pablo Neira Ayuso
2015-07-22 23:00 ` [PATCH 05/10] ipvs: fix crash if scheduler is changed Pablo Neira Ayuso
2015-07-22 23:00 ` [PATCH 06/10] ipvs: skb_orphan in case of forwarding Pablo Neira Ayuso
2015-07-22 23:00 ` [PATCH 07/10] ipvs: fix crash with sync protocol v0 and FTP Pablo Neira Ayuso
2015-07-22 23:00 ` Pablo Neira Ayuso [this message]
2015-07-22 23:00 ` [PATCH 09/10] netfilter: fix netns dependencies with conntrack templates Pablo Neira Ayuso
2015-07-22 23:00 ` [PATCH 10/10] netfilter: nf_conntrack: Support expectations in different zones Pablo Neira Ayuso
2015-07-25 7:18 ` [PATCH 00/10] Netfilter/IPVS fixes for net David Miller
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=1437606052-5179-9-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).