From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF958FA3741 for ; Mon, 31 Oct 2022 22:32:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229744AbiJaWco (ORCPT ); Mon, 31 Oct 2022 18:32:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229469AbiJaWcn (ORCPT ); Mon, 31 Oct 2022 18:32:43 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 963B326F7 for ; Mon, 31 Oct 2022 15:32:42 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id q9so33069652ejd.0 for ; Mon, 31 Oct 2022 15:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=vvDTkuaUsux+g6wxPiqq82wGh6VnuNHEffXlBYQbqrI=; b=stIVvXYzYw7+erjDVtr/Pon2+3gbP0DW+SmaPbkj0Mci/bZzU0uvv6psHQro1aa1nW 7TvqUwyFIZPX6SBZopDWhYrnbeeZxHdV1imqye/+Z/BOaG+IPeR3kg7riWZLhoscxSIR VZ+OjMbEZBOLi0Msf8VqBbE1BP4q4cWnAxluw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vvDTkuaUsux+g6wxPiqq82wGh6VnuNHEffXlBYQbqrI=; b=k4JKeujiRl5+FxEhmZHU7Aq88XU3oKmP/yeHD3V0DNbP+sSmlEP68rors7D2EBSllk cNGBx9nCI5kpd4siUpB+uhrghJbd+G8DQs08LQ2HvkNBtEDPv5GjL9+qJDGOrTiKY13x kTnSffo47Uhwt63wteywFUXZggXzrdrmSVEl2apz0qnUIwlh5LW4+GaZr7y1E3FAZP56 Fi9TMcN0kbAS706dqRRuv0KJpDo73/bOkXl5gj+CBxFr5l6ZKUL3ISSMbL55qI4/01Do AtBGUKBAd4MAEpGnxPKteSukUJ2/P1UUC7znsicR6dQhW0SInm14j2+Tm8Ks9APq6U2R PcBg== X-Gm-Message-State: ACrzQf250H+/UxpWI+9gcTXHmTREMfXn1oYy2s/qjGhrQkPH9Yw6ifZh ilAGB+DzZl7LGcPIHoHjtM4TQPPfIA2qZw== X-Google-Smtp-Source: AMsMyM6lr1+QjNnJETiN2xIBWVewGe3NZZMJQjkdypULY30P+2qDkuVSkJlWCsTLvdERofYaUXMZCw== X-Received: by 2002:a17:906:8a6a:b0:79e:2efe:e0 with SMTP id hy10-20020a1709068a6a00b0079e2efe00e0mr15582247ejc.401.1667255561128; Mon, 31 Oct 2022 15:32:41 -0700 (PDT) Received: from cloudflare.com (79.191.56.44.ipv4.supernova.orange.pl. [79.191.56.44]) by smtp.gmail.com with ESMTPSA id n9-20020a056402060900b00459148fbb3csm3707005edv.86.2022.10.31.15.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 15:32:40 -0700 (PDT) References: <1667000674-13237-1-git-send-email-wangyufen@huawei.com> <87fsf3q36k.fsf@cloudflare.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Jakub Sitnicki To: Wang Yufen Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, john.fastabend@gmail.com Subject: Re: [PATCH net v2] bpf, sockmap: fix the sk->sk_forward_alloc warning of sk_stream_kill_queues() Date: Mon, 31 Oct 2022 23:26:14 +0100 In-reply-to: <87fsf3q36k.fsf@cloudflare.com> Message-ID: <877d0fpqt4.fsf@cloudflare.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Oct 31, 2022 at 06:56 PM +01, Jakub Sitnicki wrote: > On Sat, Oct 29, 2022 at 07:44 AM +08, Wang Yufen wrote: >> When running `test_sockmap` selftests, got the following warning: >> >> WARNING: CPU: 2 PID: 197 at net/core/stream.c:205 sk_stream_kill_queues+0xd3/0xf0 >> Call Trace: >> >> inet_csk_destroy_sock+0x55/0x110 >> tcp_rcv_state_process+0xd28/0x1380 >> ? tcp_v4_do_rcv+0x77/0x2c0 >> tcp_v4_do_rcv+0x77/0x2c0 >> __release_sock+0x106/0x130 >> __tcp_close+0x1a7/0x4e0 >> tcp_close+0x20/0x70 >> inet_release+0x3c/0x80 >> __sock_release+0x3a/0xb0 >> sock_close+0x14/0x20 >> __fput+0xa3/0x260 >> task_work_run+0x59/0xb0 >> exit_to_user_mode_prepare+0x1b3/0x1c0 >> syscall_exit_to_user_mode+0x19/0x50 >> do_syscall_64+0x48/0x90 >> entry_SYSCALL_64_after_hwframe+0x44/0xae >> >> The root case is: In commit 84472b436e76 ("bpf, sockmap: Fix more >> uncharged while msg has more_data") , I used msg->sg.size replace >> tosend rudely, which break the >> if (msg->apply_bytes && msg->apply_bytes < send) >> scene. >> >> Fixes: 84472b436e76 ("bpf, sockmap: Fix more uncharged while msg has more_data") >> Reported-by: Jakub Sitnicki >> Signed-off-by: Wang Yufen >> Acked-by: John Fastabend >> --- >> v1 -> v2: typo fixup >> net/ipv4/tcp_bpf.c | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c >> index a1626af..774d481 100644 >> --- a/net/ipv4/tcp_bpf.c >> +++ b/net/ipv4/tcp_bpf.c >> @@ -278,7 +278,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, >> { >> bool cork = false, enospc = sk_msg_full(msg); >> struct sock *sk_redir; >> - u32 tosend, delta = 0; >> + u32 tosend, orgsize, sent, delta = 0; >> u32 eval = __SK_NONE; >> int ret; >> >> @@ -333,10 +333,12 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, >> cork = true; >> psock->cork = NULL; >> } >> - sk_msg_return(sk, msg, msg->sg.size); >> + sk_msg_return(sk, msg, tosend); >> release_sock(sk); >> >> + orgsize = msg->sg.size; >> ret = tcp_bpf_sendmsg_redir(sk_redir, msg, tosend, flags); >> + sent = orgsize - msg->sg.size; > > If I'm reading the code right, it's the same as: > > sent = tosend - msg->sg.size; > > If so, no need for orgsize. Sorry, that doesn't make any sense. I misread the code. The fix is correct. If I can have a small ask to rename `orgsize` to something more common. We have `orig_size` or `origsize` in use today, but no `orgsize`: $ git grep -c '\' -- net net/core/sysctl_net_core.c:3 net/psample/psample.c:1 net/tls/tls_device.c:5 net/tls/tls_sw.c:7 $ git grep -c '\' -- net net/bridge/netfilter/ebtables.c:5 net/ipv4/netfilter/arp_tables.c:10 net/ipv4/netfilter/ip_tables.c:10 net/ipv6/netfilter/ip6_tables.c:10 It reads a bit better, IMHO. Thanks for fixing it so quickly. Acked-by: Jakub Sitnicki