[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <e5070c6d6157290c2a3f627a50d951ca141973b1.camel@thalesgroup.com>
Date: Tue, 15 Oct 2019 07:21:41 +0000
From: JABLONSKY Jan <Jan.JABLONSKY@...lesgroup.com>
To: "netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC: Trond Myklebust <trond.myklebust@...marydata.com>,
Anna Schumaker <anna.schumaker@...app.com>,
"J. Bruce Fields" <bfields@...ldses.org>,
"Jeff Layton" <jlayton@...chiereds.net>,
"David S. Miller" <davem@...emloft.net>,
"linux-nfs@...r.kernel.org" <linux-nfs@...r.kernel.org>,
Jan Stancek <jstancek@...hat.com>,
Paolo Abeni <pabeni@...hat.com>
Subject: [PATCH net] sunrpc: fix UDP memory accounting for v4.4 kernel
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@...lesgroup.com>
Signed-off-by: Paolo Abeni <pabeni@...hat.com>
Cc: Jan Stancek <jstancek@...hat.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);
Powered by blists - more mailing lists