From: Heiko Carstens <hca@linux•ibm.com>
To: Gal Pressman <gal@nvidia•com>
Cc: Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>,
"David S. Miller" <davem@davemloft•net>,
netdev@vger•kernel.org, Tariq Toukan <tariqt@nvidia•com>,
Saeed Mahameed <saeedm@nvidia•com>
Subject: Re: [PATCH net 2/2] net: Flush deferred skb free on socket destroy
Date: Sun, 23 Jan 2022 10:50:49 +0100 [thread overview]
Message-ID: <Ye0k+Z9nD4JY0OMd@osiris> (raw)
In-Reply-To: <20220117092733.6627-3-gal@nvidia.com>
On Mon, Jan 17, 2022 at 11:27:33AM +0200, Gal Pressman wrote:
> The cited Fixes patch moved to a deferred skb approach where the skbs
> are not freed immediately under the socket lock. Add a WARN_ON_ONCE()
> to verify the deferred list is empty on socket destroy, and empty it to
> prevent potential memory leaks.
>
> Fixes: f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
> Signed-off-by: Gal Pressman <gal@nvidia•com>
> ---
> net/core/sock.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/core/sock.c b/net/core/sock.c
> index f32ec08a0c37..4ff806d71921 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -2049,6 +2049,9 @@ void sk_destruct(struct sock *sk)
> {
> bool use_call_rcu = sock_flag(sk, SOCK_RCU_FREE);
>
> + WARN_ON_ONCE(!llist_empty(&sk->defer_list));
> + sk_defer_free_flush(sk);
> +
This leads to a link error if CONFIG_INET is not set:
s390x-11.2.0-ld: net/core/sock.o: in function `sk_defer_free_flush':
linux/./include/net/tcp.h:1378: undefined reference to `__sk_defer_free_flush'
make: *** [Makefile:1155: vmlinux] Error 1
next prev parent reply other threads:[~2022-01-23 9:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-17 9:27 [PATCH net 0/2] Couple of skb memory leak fixes Gal Pressman
2022-01-17 9:27 ` [PATCH net 1/2] net/tls: Fix another skb memory leak when running kTLS traffic Gal Pressman
2022-01-17 9:27 ` [PATCH net 2/2] net: Flush deferred skb free on socket destroy Gal Pressman
2022-01-23 9:50 ` Heiko Carstens [this message]
2022-01-23 9:53 ` Gal Pressman
2022-01-17 13:10 ` [PATCH net 0/2] Couple of skb memory leak fixes patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Ye0k+Z9nD4JY0OMd@osiris \
--to=hca@linux$(echo .)ibm.com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=gal@nvidia$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=saeedm@nvidia$(echo .)com \
--cc=tariqt@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox