Re: [PATCH net] inet: use #ifdef CONFIG_SOCK_RX_QUEUE_MAPPING consistently

On 12/3/2021 2:21 AM, Kuniyuki Iwashima wrote:

From:   Eric Dumazet <redacted>
Date:   Thu,  2 Dec 2021 14:42:18 -0800

quoted

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 <redacted>

Acked-by: Kuniyuki Iwashima <redacted>

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

Thank you, Eric!

quoted

Cc: Kuniyuki Iwashima <redacted>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Martin KaFai Lau <redacted>
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