From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3C2A1514DC; Tue, 2 Jul 2024 17:28:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719941301; cv=none; b=FRx1HJ7ehLkuaaM1wHLNqaDXOo71GwbRfWRJeAwyu/7h8kZaUsiEZNaVB3wOfEnAjXxWfTiuGuYrTSekksXj8rKSJyQeT7SIB45e/I43HpFaPefowhuKhHM28vjGlI/KSGp6+XnMtob92yP9lSW5PShno3G45+/2DeLX4uP4tg4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719941301; c=relaxed/simple; bh=Qua3BFbP8n/KHJ4g1qzPtbWKrqFQQnvcQz1KqwdRjrY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ahRCjyH8dsTqJ9JzrJWHVeySyiIb3jpZ+Unm1AGZEpe7weP1WXXbYsg4fXr6lFs1o5mUIs+Pxg7yX8GIYmISOB8UsX01dFMgFbJNgUzuZs9ZsJ0R989gG7D48KWmGwISlfwAOsYn3lfA/jM1uWP5jFU5tso3uWZorAqCxx+A+Ho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DB1wisNw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DB1wisNw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB455C116B1; Tue, 2 Jul 2024 17:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719941300; bh=Qua3BFbP8n/KHJ4g1qzPtbWKrqFQQnvcQz1KqwdRjrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DB1wisNwFhkToxFV6eCF2FhC03ljvpFcdBZhwcmBmadtKlo6Sy+RUTGIbij80K1V3 PZD0ZxmandOh7etfk4PFkDNP5iZrYLiZDcItCI7O0d0ApqTKzWhSzJ/RC96ARB5euk R7UAygMdGUOjjbXyOe3a0Vl/Idqcs/0QGab5acWw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nick Child , "David S. Miller" , Sasha Levin Subject: [PATCH 6.1 023/128] ibmvnic: Free any outstanding tx skbs during scrq reset Date: Tue, 2 Jul 2024 19:03:44 +0200 Message-ID: <20240702170227.111131753@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702170226.231899085@linuxfoundation.org> References: <20240702170226.231899085@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nick Child [ Upstream commit 49bbeb5719c2f56907d3a9623b47c6c15c2c431d ] There are 2 types of outstanding tx skb's: Type 1: Packets that are sitting in the drivers ind_buff that are waiting to be batch sent to the NIC. During a device reset, these are freed with a call to ibmvnic_tx_scrq_clean_buffer() Type 2: Packets that have been sent to the NIC and are awaiting a TX completion IRQ. These are free'd during a reset with a call to clean_tx_pools() During any reset which requires us to free the tx irq, ensure that the Type 2 skb references are freed. Since the irq is released, it is impossible for the NIC to inform of any completions. Furthermore, later in the reset process is a call to init_tx_pools() which marks every entry in the tx pool as free (ie not outstanding). So if the driver is to make a call to init_tx_pools(), it must first be sure that the tx pool is empty of skb references. This issue was discovered by observing the following in the logs during EEH testing: TX free map points to untracked skb (tso_pool 0 idx=4) TX free map points to untracked skb (tso_pool 0 idx=5) TX free map points to untracked skb (tso_pool 1 idx=36) Fixes: 65d6470d139a ("ibmvnic: clean pending indirect buffs during reset") Signed-off-by: Nick Child Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 157be4e9be4b7..8f377d0a80fe6 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -3859,6 +3859,12 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter, bool do_h_free) adapter->num_active_tx_scrqs = 0; } + /* Clean any remaining outstanding SKBs + * we freed the irq so we won't be hearing + * from them + */ + clean_tx_pools(adapter); + if (adapter->rx_scrq) { for (i = 0; i < adapter->num_active_rx_scrqs; i++) { if (!adapter->rx_scrq[i]) -- 2.43.0