* [PATCH net] ipvs: clear skb->tstamp in forwarding path
@ 2020-10-09 18:24 Julian Anastasov
2020-10-10 6:42 ` Simon Horman
2020-10-12 0:00 ` Pablo Neira Ayuso
0 siblings, 2 replies; 3+ messages in thread
From: Julian Anastasov @ 2020-10-09 18:24 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, Pablo Neira Ayuso, netfilter-devel, Evgeny B, Eric Dumazet
fq qdisc requires tstamp to be cleared in forwarding path
Reported-by: Evgeny B <abt-admin@mail.ru>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=209427
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Fixes: 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.")
Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
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 b00866d777fe..d2e5a8f644b8 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -609,6 +609,8 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,
if (ret == NF_ACCEPT) {
nf_reset_ct(skb);
skb_forward_csum(skb);
+ if (skb->dev)
+ skb->tstamp = 0;
}
return ret;
}
@@ -649,6 +651,8 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,
if (!local) {
skb_forward_csum(skb);
+ if (skb->dev)
+ skb->tstamp = 0;
NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
NULL, skb_dst(skb)->dev, dst_output);
} else
@@ -669,6 +673,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->dev)
+ skb->tstamp = 0;
NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
NULL, skb_dst(skb)->dev, dst_output);
} else
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] ipvs: clear skb->tstamp in forwarding path
2020-10-09 18:24 [PATCH net] ipvs: clear skb->tstamp in forwarding path Julian Anastasov
@ 2020-10-10 6:42 ` Simon Horman
2020-10-12 0:00 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2020-10-10 6:42 UTC (permalink / raw)
To: Julian Anastasov
Cc: lvs-devel, Pablo Neira Ayuso, netfilter-devel, Evgeny B, Eric Dumazet
On Fri, Oct 09, 2020 at 09:24:25PM +0300, Julian Anastasov wrote:
> fq qdisc requires tstamp to be cleared in forwarding path
>
> Reported-by: Evgeny B <abt-admin@mail.ru>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=209427
> Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
> Fixes: 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
> Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
> Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.")
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
Reviewed-by: Simon Horman <horms@verge.net.au>
Pablo, could you consider this for nf ?
> ---
> 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 b00866d777fe..d2e5a8f644b8 100644
> --- a/net/netfilter/ipvs/ip_vs_xmit.c
> +++ b/net/netfilter/ipvs/ip_vs_xmit.c
> @@ -609,6 +609,8 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,
> if (ret == NF_ACCEPT) {
> nf_reset_ct(skb);
> skb_forward_csum(skb);
> + if (skb->dev)
> + skb->tstamp = 0;
> }
> return ret;
> }
> @@ -649,6 +651,8 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,
>
> if (!local) {
> skb_forward_csum(skb);
> + if (skb->dev)
> + skb->tstamp = 0;
> NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
> NULL, skb_dst(skb)->dev, dst_output);
> } else
> @@ -669,6 +673,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->dev)
> + skb->tstamp = 0;
> NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
> NULL, skb_dst(skb)->dev, dst_output);
> } else
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] ipvs: clear skb->tstamp in forwarding path
2020-10-09 18:24 [PATCH net] ipvs: clear skb->tstamp in forwarding path Julian Anastasov
2020-10-10 6:42 ` Simon Horman
@ 2020-10-12 0:00 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2020-10-12 0:00 UTC (permalink / raw)
To: Julian Anastasov
Cc: Simon Horman, lvs-devel, netfilter-devel, Evgeny B, Eric Dumazet
On Fri, Oct 09, 2020 at 09:24:25PM +0300, Julian Anastasov wrote:
> fq qdisc requires tstamp to be cleared in forwarding path
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-12 0:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-09 18:24 [PATCH net] ipvs: clear skb->tstamp in forwarding path Julian Anastasov
2020-10-10 6:42 ` Simon Horman
2020-10-12 0:00 ` Pablo Neira Ayuso
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).