lkml.org 
[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 07/42] inet: use #ifdef CONFIG_SOCK_RX_QUEUE_MAPPING consistently
    Date
    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit a9418924552e52e63903cbb0310d7537260702bf ]

    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>
    Acked-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
    Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 f7fea3a7c5e64..62a67fdc344cd 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.33.0


    \
     
     \ /
      Last update: 2021-12-15 18:23    [W:4.319 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site