ipvs: clear skb->tstamp in forwarding path
Subsystems (3)
Julian Anastasov
maintainerPATCH 1/1 ipvs: clear skb->tstamp in forwarding path
fq qdisc requires tstamp to be cleared in forwarding path
Reported-by Evgeny B <[email protected]>
Suggested-by Eric Dumazet <[email protected]>
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 <[email protected]>
--- net/netfilter/ipvs/ip_vs_xmit.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/ipvs/ip_vs_xmit.c +6 -0
@@ -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
Signature · 1 line
2.26.2
Quoted 9 lines · Julian Anastasov
fq qdisc requires tstamp to be cleared in forwarding path
Reported-by Evgeny B <[email protected]>Suggested-by Eric Dumazet <[email protected]>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 <[email protected]>
Reviewed-by Simon Horman <[email protected]>
Pablo, could you consider this for nf ?
Quoted 39 lines
--- net/netfilter/ipvs/ip_vs_xmit.c | 6 ++++++ 1 file changed, 6 insertions(+)net/netfilter/ipvs/ip_vs_xmit.c +6
-0@@ -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 Signature · 1 line
2.26.2
Quoted 1 line · Julian Anastasov
fq qdisc requires tstamp to be cleared in forwarding path
Applied, thanks.