diff mbox series

[net] inet: use #ifdef CONFIG_SOCK_RX_QUEUE_MAPPING consistently

Message ID 20211202224218.269441-1-eric.dumazet@gmail.com (mailing list archive)
State Accepted
Commit a9418924552e52e63903cbb0310d7537260702bf
Delegated to: Netdev Maintainers
Headers show
Series [net] inet: use #ifdef CONFIG_SOCK_RX_QUEUE_MAPPING consistently | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net
netdev/fixes_present success Fixes tag present in non-next series
netdev/subject_prefix success Link
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 5 this patch: 5
netdev/cc_maintainers warning 2 maintainers not CCed: yoshfuji@linux-ipv6.org dsahern@kernel.org
netdev/build_clang success Errors and warnings before: 20 this patch: 20
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 7 this patch: 7
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Eric Dumazet Dec. 2, 2021, 10:42 p.m. UTC
From: Eric Dumazet <edumazet@google.com>

Since commit 4e1beecc3b58 ("net/sock: Add kernel config
SOCK_RX_QUEUE_MAPPING"),
sk_rx_queue_mapping access is guarded by CONFIG_SOCK_RX_QUEUE_MAPPING.

Fixes: 54b92e841937 ("tcp: Migrate TCP_ESTABLISHED/TCP_SYN_RECV sockets in accept queues.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Martin KaFai Lau <kafai@fb.com>
Cc: Tariq Toukan <tariqt@nvidia.com>
---
 net/ipv4/inet_connection_sock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Iwashima, Kuniyuki Dec. 3, 2021, 12:21 a.m. UTC | #1
From:   Eric Dumazet <eric.dumazet@gmail.com>
Date:   Thu,  2 Dec 2021 14:42:18 -0800
> Since commit 4e1beecc3b58 ("net/sock: Add kernel config
> SOCK_RX_QUEUE_MAPPING"),
> sk_rx_queue_mapping access is guarded by CONFIG_SOCK_RX_QUEUE_MAPPING.
> 
> Fixes: 54b92e841937 ("tcp: Migrate TCP_ESTABLISHED/TCP_SYN_RECV sockets in accept queues.")
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Acked-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>

I missed the commit which was added while I was developing the SO_REUSEPORT
series.

Thank you, Eric!


> Cc: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: Martin KaFai Lau <kafai@fb.com>
> Cc: Tariq Toukan <tariqt@nvidia.com>
> ---
>  net/ipv4/inet_connection_sock.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
> index f7fea3a7c5e64b92ca9c6b56293628923649e58c..62a67fdc344cd21505a84c905c1e2c05cc0ff866 100644
> --- a/net/ipv4/inet_connection_sock.c
> +++ b/net/ipv4/inet_connection_sock.c
> @@ -721,7 +721,7 @@ static struct request_sock *inet_reqsk_clone(struct request_sock *req,
>  
>  	sk_node_init(&nreq_sk->sk_node);
>  	nreq_sk->sk_tx_queue_mapping = req_sk->sk_tx_queue_mapping;
> -#ifdef CONFIG_XPS
> +#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING
>  	nreq_sk->sk_rx_queue_mapping = req_sk->sk_rx_queue_mapping;
>  #endif
>  	nreq_sk->sk_incoming_cpu = req_sk->sk_incoming_cpu;
> -- 
> 2.34.1.400.ga245620fadb-goog
Tariq Toukan Dec. 3, 2021, 9:04 a.m. UTC | #2
On 12/3/2021 2:21 AM, Kuniyuki Iwashima wrote:
> From:   Eric Dumazet <eric.dumazet@gmail.com>
> Date:   Thu,  2 Dec 2021 14:42:18 -0800
>> Since commit 4e1beecc3b58 ("net/sock: Add kernel config
>> SOCK_RX_QUEUE_MAPPING"),
>> sk_rx_queue_mapping access is guarded by CONFIG_SOCK_RX_QUEUE_MAPPING.
>>
>> Fixes: 54b92e841937 ("tcp: Migrate TCP_ESTABLISHED/TCP_SYN_RECV sockets in accept queues.")
>> Signed-off-by: Eric Dumazet <edumazet@google.com>
> 
> Acked-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
> 
> I missed the commit which was added while I was developing the SO_REUSEPORT
> series.
> 
> Thank you, Eric!
> 
> 
>> Cc: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
>> Cc: Daniel Borkmann <daniel@iogearbox.net>
>> Cc: Martin KaFai Lau <kafai@fb.com>
>> Cc: Tariq Toukan <tariqt@nvidia.com>
>> ---
>>   net/ipv4/inet_connection_sock.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
>> index f7fea3a7c5e64b92ca9c6b56293628923649e58c..62a67fdc344cd21505a84c905c1e2c05cc0ff866 100644
>> --- a/net/ipv4/inet_connection_sock.c
>> +++ b/net/ipv4/inet_connection_sock.c
>> @@ -721,7 +721,7 @@ static struct request_sock *inet_reqsk_clone(struct request_sock *req,
>>   
>>   	sk_node_init(&nreq_sk->sk_node);
>>   	nreq_sk->sk_tx_queue_mapping = req_sk->sk_tx_queue_mapping;
>> -#ifdef CONFIG_XPS
>> +#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING
>>   	nreq_sk->sk_rx_queue_mapping = req_sk->sk_rx_queue_mapping;
>>   #endif
>>   	nreq_sk->sk_incoming_cpu = req_sk->sk_incoming_cpu;
>> -- 
>> 2.34.1.400.ga245620fadb-goog


Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Thank you
patchwork-bot+netdevbpf@kernel.org Dec. 3, 2021, 2:20 p.m. UTC | #3
Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Thu,  2 Dec 2021 14:42:18 -0800 you wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> Since commit 4e1beecc3b58 ("net/sock: Add kernel config
> SOCK_RX_QUEUE_MAPPING"),
> sk_rx_queue_mapping access is guarded by CONFIG_SOCK_RX_QUEUE_MAPPING.
> 
> Fixes: 54b92e841937 ("tcp: Migrate TCP_ESTABLISHED/TCP_SYN_RECV sockets in accept queues.")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: Martin KaFai Lau <kafai@fb.com>
> Cc: Tariq Toukan <tariqt@nvidia.com>
> 
> [...]

Here is the summary with links:
  - [net] inet: use #ifdef CONFIG_SOCK_RX_QUEUE_MAPPING consistently
    https://git.kernel.org/netdev/net/c/a9418924552e

You are awesome, thank you!
diff mbox series

Patch

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index f7fea3a7c5e64b92ca9c6b56293628923649e58c..62a67fdc344cd21505a84c905c1e2c05cc0ff866 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -721,7 +721,7 @@  static struct request_sock *inet_reqsk_clone(struct request_sock *req,
 
 	sk_node_init(&nreq_sk->sk_node);
 	nreq_sk->sk_tx_queue_mapping = req_sk->sk_tx_queue_mapping;
-#ifdef CONFIG_XPS
+#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING
 	nreq_sk->sk_rx_queue_mapping = req_sk->sk_rx_queue_mapping;
 #endif
 	nreq_sk->sk_incoming_cpu = req_sk->sk_incoming_cpu;