From: JABLONSKY Jan <Jan.JABLONSKY@thalesgroup.com>
To: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
"J. Bruce Fields" <bfields@fieldses.org>,
"Jeff Layton" <jlayton@poochiereds.net>,
"David S. Miller" <davem@davemloft.net>,
"linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>,
Jan Stancek <jstancek@redhat.com>,
Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net] sunrpc: fix UDP memory accounting for v4.4 kernel
Date: Tue, 15 Oct 2019 07:21:41 +0000 [thread overview]
Message-ID: <e5070c6d6157290c2a3f627a50d951ca141973b1.camel@thalesgroup.com> (raw)
The same warnings reported by Jan Stancek may appear also on 4.4
Based on Paolo Abeni's work.
WARNING: at net/ipv4/af_inet.c:155
CPU: 1 PID: 214 Comm: kworker/1:1H Not tainted 4.4.166 #1
Workqueue: rpciod .xprt_autoclose
task: c0000000366f57c0 ti: c000000034134000 task.ti: c000000034134000
NIP [c000000000662268] .inet_sock_destruct+0x158/0x200
Based on: "[net] sunrpc: fix UDP memory accounting"
Signed-off-by: Jan Jablonsky <jan.jablonsky@thalesgroup.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Cc: Jan Stancek <jstancek@redhat.com>
---
net/sunrpc/xprtsock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index c9c0976d3bbb..72277cb9785e 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1056,7 +1056,7 @@ static void xs_udp_data_receive(struct sock_xprt *transport)
if (skb == NULL)
break;
xs_udp_data_read_skb(&transport->xprt, sk, skb);
- skb_free_datagram(sk, skb);
+ skb_free_datagram_locked(sk, skb);
}
out:
mutex_unlock(&transport->recv_mutex);
next reply other threads:[~2019-10-15 7:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 7:21 JABLONSKY Jan [this message]
2019-10-15 9:19 ` [PATCH net] sunrpc: fix UDP memory accounting for v4.4 kernel Paolo Abeni
2019-10-17 4:30 ` JABLONSKY Jan
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=e5070c6d6157290c2a3f627a50d951ca141973b1.camel@thalesgroup.com \
--to=jan.jablonsky@thalesgroup.com \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=davem@davemloft.net \
--cc=jlayton@poochiereds.net \
--cc=jstancek@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).