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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 14DF2C04AB6 for ; Mon, 3 Jun 2019 09:16:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4B5B27F27 for ; Mon, 3 Jun 2019 09:16:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559553396; bh=NFqSjvuzpsj8og/RBc9ZrBHoz0ZbFv3Ikt0Nw4tmzXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IYy5ztnA8+TtX5tnG4iN/XUg6MYpkzAIwPhYpHzZCalzTOw65m83pMuWSlcPtxARs mPBed9n3i0TQ/EtxkC0DM7PE86PHc9sxPQg05TxC6u3YjW4weY9wXH7j10v3S96s2k juaJ6KYzNlnbR94sEOEB463tn+GcNaEzwW7GrL3c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727870AbfFCJMa (ORCPT ); Mon, 3 Jun 2019 05:12:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:58974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727868AbfFCJM3 (ORCPT ); Mon, 3 Jun 2019 05:12:29 -0400 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 73AB224591; Mon, 3 Jun 2019 09:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559553148; bh=NFqSjvuzpsj8og/RBc9ZrBHoz0ZbFv3Ikt0Nw4tmzXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wjM0FhIFIzZzXzLH/oS6qjVAt0zN3D+bRtUUWai4mrLQ5lXhJ0l1VTFoEDHkWM7lT xVqj4MS9DYUwdtBLFuq8OJAMerrtTifLUUel8J40hdiY1m8nDeDMTFP/ZqcU+vkzmA RSVqkSR7/KaNXQ2MaJiSLsTFPKk/kG4GKt4HjWWs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rakesh Hemnani , Michael Chan , "David S. Miller" Subject: [PATCH 5.0 26/36] bnxt_en: Fix aggregation buffer leak under OOM condition. Date: Mon, 3 Jun 2019 11:09:14 +0200 Message-Id: <20190603090522.701733407@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603090520.998342694@linuxfoundation.org> References: <20190603090520.998342694@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michael Chan [ Upstream commit 296d5b54163964b7ae536b8b57dfbd21d4e868e1 ] For every RX packet, the driver replenishes all buffers used for that packet and puts them back into the RX ring and RX aggregation ring. In one code path where the RX packet has one RX buffer and one or more aggregation buffers, we missed recycling the aggregation buffer(s) if we are unable to allocate a new SKB buffer. This leads to the aggregation ring slowly running out of buffers over time. Fix it by properly recycling the aggregation buffers. Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.") Reported-by: Rakesh Hemnani Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -1636,6 +1636,8 @@ static int bnxt_rx_pkt(struct bnxt *bp, skb = bnxt_copy_skb(bnapi, data_ptr, len, dma_addr); bnxt_reuse_rx_data(rxr, cons, data); if (!skb) { + if (agg_bufs) + bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs); rc = -ENOMEM; goto next_rx; }