From patchwork Tue Oct 15 07:21:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JABLONSKY Jan X-Patchwork-Id: 11189775 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC3EA1668 for ; Tue, 15 Oct 2019 07:26:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0DCC21835 for ; Tue, 15 Oct 2019 07:26:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=thalesgroup.com header.i=@thalesgroup.com header.b="b3isKKVg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725890AbfJOH0x (ORCPT ); Tue, 15 Oct 2019 03:26:53 -0400 Received: from thsbbfxrt02p.thalesgroup.com ([192.93.158.29]:54656 "EHLO thsbbfxrt02p.thalesgroup.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725710AbfJOH0x (ORCPT ); Tue, 15 Oct 2019 03:26:53 -0400 X-Greylist: delayed 307 seconds by postgrey-1.27 at vger.kernel.org; Tue, 15 Oct 2019 03:26:52 EDT Received: from thsbbfxrt02p.thalesgroup.com (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id 46sn1422T2zJv83; Tue, 15 Oct 2019 09:21:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thalesgroup.com; s=xrt20181201; t=1571124104; bh=e7ZdgwbK4zLEEWsyLPkAAm9Y800MLgadyEqmXXg46g8=; h=From:To:Subject:Date:Message-ID:Content-Transfer-Encoding: MIME-Version:From; b=b3isKKVgPOvWWuDze5Lo4URBQLTbn+e49AkNP0tYEEd2A4jMNN2HAjnGKa4q6pQ9h yIAJdvqrThZ39qI2KxSe3IZgIPSUZW7vM1LvbSH+OHo91iOqah2EkJovw4DECDszYJ 1KRaytGclAE6i6nWFYcqc4b0VDrs4VFWTcPrCICID656WINCT00Ls9KUnEzzgtZsyz qD0CG5Yq8UxD2posZu/B0yd2mr8VcHc/XY+l4jOxd2XK03szqFWo3Q6oJawJgNVSSC 6eu2D3MeZmw1wi2DUhuV890MEuQJuOY5T5/Bj6fOlPYYm+5zRKsuz6ioE/c1WfyY6e 6Hk/aLllQj8cg== From: JABLONSKY Jan To: "netdev@vger.kernel.org" CC: Trond Myklebust , Anna Schumaker , "J. Bruce Fields" , "Jeff Layton" , "David S. Miller" , "linux-nfs@vger.kernel.org" , Jan Stancek , Paolo Abeni Subject: [PATCH net] sunrpc: fix UDP memory accounting for v4.4 kernel Thread-Topic: [PATCH net] sunrpc: fix UDP memory accounting for v4.4 kernel Thread-Index: AQHVgykwG4NF6Q3nKk+Y9JJzJaI8uQ== Date: Tue, 15 Oct 2019 07:21:41 +0000 Message-ID: Accept-Language: en-US, fr-FR Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.1-2 x-pmwin-version: 4.0.3, Antivirus-Engine: 3.74.1, Antivirus-Data: 5.68 Content-ID: <41DCB7FCFABCFD4ABF5EC486755F2DDE@iris.infra.thales> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org 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 Signed-off-by: Paolo Abeni Cc: Jan Stancek --- 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);