diff options
| author |   Kevin Yang <yyd@google.com> | 2023-02-07 02:08:20 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2023-02-08 09:07:11 +0000 |
| commit | c11204c78d6966c5bda6dd05c3ac5cbb193f93e3 (patch) | |
| tree | 54f64528a4dd356ee84f12c30f5174c41577b4d7 /net/ipv4/inet_connection_sock.c | |
| parent | net: ethernet: mtk_eth_soc: fix wrong parameters order in __xdp_rxq_info_reg() (diff) | |
| download | linux-c11204c78d6966c5bda6dd05c3ac5cbb193f93e3.tar.xz linux-c11204c78d6966c5bda6dd05c3ac5cbb193f93e3.zip | |
txhash: fix sk->sk_txrehash default
This code fix a bug that sk->sk_txrehash gets its default enable
value from sysctl_txrehash only when the socket is a TCP listener.
We should have sysctl_txrehash to set the default sk->sk_txrehash,
no matter TCP, nor listerner/connector.
Tested by following packetdrill:
0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
+0 socket(..., SOCK_DGRAM, IPPROTO_UDP) = 4
// SO_TXREHASH == 74, default to sysctl_txrehash == 1
+0 getsockopt(3, SOL_SOCKET, 74, [1], [4]) = 0
+0 getsockopt(4, SOL_SOCKET, 74, [1], [4]) = 0
Fixes: 26859240e4ee ("txhash: Add socket option to control TX hash rethink behavior")
Signed-off-by: Kevin Yang <yyd@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index d1f837579398..f2c43f67187d 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -1225,9 +1225,6 @@ int inet_csk_listen_start(struct sock *sk) sk->sk_ack_backlog = 0; inet_csk_delack_init(sk); - if (sk->sk_txrehash == SOCK_TXREHASH_DEFAULT) - sk->sk_txrehash = READ_ONCE(sock_net(sk)->core.sysctl_txrehash); - /* There is race window here: we announce ourselves listening, * but this transition is still not validated by get_port(). * It is OK, because this socket enters to hash table only |