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,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 CA3A0C2BCA1 for ; Fri, 7 Jun 2019 15:42:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 977472146E for ; Fri, 7 Jun 2019 15:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922134; bh=mSxpHAbBZi99iHthPLILZIexWMs7cfnTd2C/eAmeqss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BxuRimISKm5MiqMgXlMeRe1CUZXA1DXV+iHJquClhqTxQjDq7rAAK+bBvLiPlVEkA DbyzWor6ApxBgfAC1XuVL8oQUcUD/jqTcTFg7wPaBHHOXIqqaUhWnz+yE0SAG5PUN/ JaZ8cSr4B0XB7CjvX6VVuY5/lO/C5mJJv8DJMexc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730514AbfFGPmN (ORCPT ); Fri, 7 Jun 2019 11:42:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:52456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730460AbfFGPmG (ORCPT ); Fri, 7 Jun 2019 11:42:06 -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 DF23B212F5; Fri, 7 Jun 2019 15:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922125; bh=mSxpHAbBZi99iHthPLILZIexWMs7cfnTd2C/eAmeqss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GtUY4P4LuS/iMPeFLde7/AMqwzdvSBD+WVhdhf0lRbIe2X2d72QIfPMmzhoyPoli7 L+6kBGBbisdskPNSM/4Qs5jbDrob/r2/hQgkxuOTpTwKgEo1DOg/u9Sbhj09L1Skkj 5MGcppaejuKIbJnbu2NS52U6OW2vYYjGZXmwWbF8= 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 4.14 10/69] bnxt_en: Fix aggregation buffer leak under OOM condition. Date: Fri, 7 Jun 2019 17:38:51 +0200 Message-Id: <20190607153849.556772096@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@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: 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 @@ -1583,6 +1583,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(bnapi, cp_cons, agg_bufs); rc = -ENOMEM; goto next_rx; }