* [PATCH] net-ipv6: do not allow IPV6_TCLASS to muck with tcp's ECN
@ 2021-11-23 22:31 Maciej Żenczykowski
2021-11-23 22:52 ` Eric Dumazet
2021-11-25 3:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Maciej Żenczykowski @ 2021-11-23 22:31 UTC (permalink / raw)
To: Maciej Żenczykowski
Cc: Linux Network Development Mailing List, Eric Dumazet, Neal Cardwell
From: Maciej Żenczykowski <maze@google.com>
This is to match ipv4 behaviour, see __ip_sock_set_tos()
implementation at ipv4/ip_sockglue.c:579
void __ip_sock_set_tos(struct sock *sk, int val)
{
if (sk->sk_type == SOCK_STREAM) {
val &= ~INET_ECN_MASK;
val |= inet_sk(sk)->tos & INET_ECN_MASK;
}
if (inet_sk(sk)->tos != val) {
inet_sk(sk)->tos = val;
sk->sk_priority = rt_tos2priority(val);
sk_dst_reset(sk);
}
}
Cc: Eric Dumazet <edumazet@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
net/ipv6/ipv6_sockglue.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 41efca817db4..204b0b4d10c8 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -599,6 +599,10 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
/* RFC 3542, 6.5: default traffic class of 0x0 */
if (val == -1)
val = 0;
+ if (sk->sk_type == SOCK_STREAM) {
+ val &= ~INET_ECN_MASK;
+ val |= np->tclass & INET_ECN_MASK;
+ }
np->tclass = val;
retv = 0;
break;
--
2.34.0.rc2.393.gf8c9666880-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net-ipv6: do not allow IPV6_TCLASS to muck with tcp's ECN
2021-11-23 22:31 [PATCH] net-ipv6: do not allow IPV6_TCLASS to muck with tcp's ECN Maciej Żenczykowski
@ 2021-11-23 22:52 ` Eric Dumazet
2021-11-25 3:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Eric Dumazet @ 2021-11-23 22:52 UTC (permalink / raw)
To: Maciej Żenczykowski
Cc: Maciej Żenczykowski, Linux Network Development Mailing List,
Neal Cardwell
On Tue, Nov 23, 2021 at 2:32 PM Maciej Żenczykowski
<zenczykowski@gmail.com> wrote:
>
> From: Maciej Żenczykowski <maze@google.com>
>
> This is to match ipv4 behaviour, see __ip_sock_set_tos()
> implementation at ipv4/ip_sockglue.c:579
>
> void __ip_sock_set_tos(struct sock *sk, int val)
> {
> if (sk->sk_type == SOCK_STREAM) {
> val &= ~INET_ECN_MASK;
> val |= inet_sk(sk)->tos & INET_ECN_MASK;
> }
> if (inet_sk(sk)->tos != val) {
> inet_sk(sk)->tos = val;
> sk->sk_priority = rt_tos2priority(val);
> sk_dst_reset(sk);
> }
> }
>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Neal Cardwell <ncardwell@google.com>
> Signed-off-by: Maciej Żenczykowski <maze@google.com>
>
This makes sense, thanks, even if INET_ECN_dontxmit() would eventually
catch up for non dctcp.
Reviewed-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net-ipv6: do not allow IPV6_TCLASS to muck with tcp's ECN
2021-11-23 22:31 [PATCH] net-ipv6: do not allow IPV6_TCLASS to muck with tcp's ECN Maciej Żenczykowski
2021-11-23 22:52 ` Eric Dumazet
@ 2021-11-25 3:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-11-25 3:10 UTC (permalink / raw)
To: =?utf-8?q?Maciej_=C5=BBenczykowski_=3Czenczykowski=40gmail=2Ecom=3E?=
Cc: maze, netdev, edumazet, ncardwell
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 23 Nov 2021 14:31:54 -0800 you wrote:
> From: Maciej Żenczykowski <maze@google.com>
>
> This is to match ipv4 behaviour, see __ip_sock_set_tos()
> implementation at ipv4/ip_sockglue.c:579
>
> void __ip_sock_set_tos(struct sock *sk, int val)
> {
> if (sk->sk_type == SOCK_STREAM) {
> val &= ~INET_ECN_MASK;
> val |= inet_sk(sk)->tos & INET_ECN_MASK;
> }
> if (inet_sk(sk)->tos != val) {
> inet_sk(sk)->tos = val;
> sk->sk_priority = rt_tos2priority(val);
> sk_dst_reset(sk);
> }
> }
>
> [...]
Here is the summary with links:
- net-ipv6: do not allow IPV6_TCLASS to muck with tcp's ECN
https://git.kernel.org/netdev/net-next/c/9f7b3a69c88d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-25 3:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-23 22:31 [PATCH] net-ipv6: do not allow IPV6_TCLASS to muck with tcp's ECN Maciej Żenczykowski
2021-11-23 22:52 ` Eric Dumazet
2021-11-25 3:10 ` patchwork-bot+netdevbpf
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.