* [PATCH] net: send SYNACK packet with accepted fwmark
@ 2021-07-09 12:35 Alexander Ovechkin
2021-07-09 14:02 ` Eric Dumazet
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Ovechkin @ 2021-07-09 12:35 UTC (permalink / raw)
To: netdev; +Cc: edumazet, davem, jhs, zeil
commit e05a90ec9e16 ("net: reflect mark on tcp syn ack packets")
fixed IPv4 only.
This part is for the IPv6 side.
Signed-off-by: Alexander Ovechkin <ovov@yandex-team.ru>
Acked-by: Dmitry Yakunin <zeil@yandex-team.ru>
---
net/ipv6/tcp_ipv6.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 323989927a0a..0ce52d46e4f8 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -555,7 +555,7 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst,
opt = ireq->ipv6_opt;
if (!opt)
opt = rcu_dereference(np->opt);
- err = ip6_xmit(sk, skb, fl6, sk->sk_mark, opt,
+ err = ip6_xmit(sk, skb, fl6, skb->mark ? : sk->sk_mark, opt,
tclass, sk->sk_priority);
rcu_read_unlock();
err = net_xmit_eval(err);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] net: send SYNACK packet with accepted fwmark
2021-07-09 12:35 [PATCH] net: send SYNACK packet with accepted fwmark Alexander Ovechkin
@ 2021-07-09 14:02 ` Eric Dumazet
0 siblings, 0 replies; 2+ messages in thread
From: Eric Dumazet @ 2021-07-09 14:02 UTC (permalink / raw)
To: Alexander Ovechkin; +Cc: netdev, David Miller, Jamal Hadi Salim, zeil
On Fri, Jul 9, 2021 at 2:35 PM Alexander Ovechkin <ovov@yandex-team.ru> wrote:
>
> commit e05a90ec9e16 ("net: reflect mark on tcp syn ack packets")
> fixed IPv4 only.
>
> This part is for the IPv6 side.
>
> Signed-off-by: Alexander Ovechkin <ovov@yandex-team.ru>
> Acked-by: Dmitry Yakunin <zeil@yandex-team.ru>
Please add a standard tool-friendly Fixes: tag.
Fixes: e05a90ec9e16 ("net: reflect mark on tcp syn ack packets")
> ---
> net/ipv6/tcp_ipv6.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
> index 323989927a0a..0ce52d46e4f8 100644
> --- a/net/ipv6/tcp_ipv6.c
> +++ b/net/ipv6/tcp_ipv6.c
> @@ -555,7 +555,7 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst,
> opt = ireq->ipv6_opt;
> if (!opt)
> opt = rcu_dereference(np->opt);
> - err = ip6_xmit(sk, skb, fl6, sk->sk_mark, opt,
> + err = ip6_xmit(sk, skb, fl6, skb->mark ? : sk->sk_mark, opt,
> tclass, sk->sk_priority);
> rcu_read_unlock();
> err = net_xmit_eval(err);
> --
> 2.17.1
>
ip6_xmit() overwrites skb->mark with its 4th argument, while
ip_build_and_send_pkt()
does the write if skb->mark is zero, so your patch seems fine to me, thanks.
Reviewed-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-09 14:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-09 12:35 [PATCH] net: send SYNACK packet with accepted fwmark Alexander Ovechkin
2021-07-09 14:02 ` Eric Dumazet
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).