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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5829BC2D0DB for ; Tue, 28 Jan 2020 14:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BF9024685 for ; Tue, 28 Jan 2020 14:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220098; bh=hKmzfO9nRza+flA5fqdRdHgQTYYJnSpTmnRA9g8mnWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KpZ7evk/vChzPAKn0vlZdQkh5G1YcHrHzuEleE9Snx35Xgbei9vMTmjNqG10lDkH8 JRUSjEQXZHRMWffIRbzekBHJuRPRLkBzhii4iikKFnSWQz38Fr1n2Ne0iwQz/JAiyQ ZfUVzU/FdE4AsjvbOIkElObezlnuCmpLy1MrqLlA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727490AbgA1OBh (ORCPT ); Tue, 28 Jan 2020 09:01:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:47682 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727129AbgA1OBf (ORCPT ); Tue, 28 Jan 2020 09:01:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4356624685; Tue, 28 Jan 2020 14:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220094; bh=hKmzfO9nRza+flA5fqdRdHgQTYYJnSpTmnRA9g8mnWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o0RdNAMNlh6zugH7SF1Ez9eVnzuvQuckJm0+NGA3W5hXhkrUnpmBfipwcoz08RFOG /F0q7cas46UT3ltdpThAOw/xbsf3m4ASHy2TuzJNncuMHw5PCFF1KO6iIGVh1Ujr4X vBQyj+Uut2ABbESF14NM7UfigrW2HKsT60p2v6Ok= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Willem de Bruijn , Paolo Abeni , Willem de Bruijn , "David S. Miller" , Eric Dumazet Subject: [PATCH 5.4 015/104] Revert "udp: do rmem bulk free even if the rx sk queue is empty" Date: Tue, 28 Jan 2020 14:59:36 +0100 Message-Id: <20200128135819.348847802@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135817.238524998@linuxfoundation.org> References: <20200128135817.238524998@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paolo Abeni [ Upstream commit d39ca2590d10712f412add7a88e1dd467a7246f4 ] This reverts commit 0d4a6608f68c7532dcbfec2ea1150c9761767d03. Willem reported that after commit 0d4a6608f68c ("udp: do rmem bulk free even if the rx sk queue is empty") the memory allocated by an almost idle system with many UDP sockets can grow a lot. For stable kernel keep the solution as simple as possible and revert the offending commit. Reported-by: Willem de Bruijn Diagnosed-by: Eric Dumazet Fixes: 0d4a6608f68c ("udp: do rmem bulk free even if the rx sk queue is empty") Signed-off-by: Paolo Abeni Acked-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/udp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1368,7 +1368,8 @@ static void udp_rmem_release(struct sock if (likely(partial)) { up->forward_deficit += size; size = up->forward_deficit; - if (size < (sk->sk_rcvbuf >> 2)) + if (size < (sk->sk_rcvbuf >> 2) && + !skb_queue_empty(&up->reader_queue)) return; } else { size += up->forward_deficit;