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 B9E423093B5; Tue, 2 Sep 2025 13:32:03 +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=1756819923; cv=none; b=I46/pvK/rKgWO4CurUZs3TTvgLKFhbBPHlJsJaNu5pZnsbNlQDb+AgYkkVpf9M7lhckU9wAMZ5otErmEGG1uI1+X23eb2WNJkyrmr1AsWUJj+aY08P5052s4lBr6wXX+6Z2nspc9n65yI79W/ZsWYo5aA/KqZJgbmrRXr9Mwfxs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756819923; c=relaxed/simple; bh=xvCqKjQQaiSEZO4sTRwnmVXtw/CRLYX1YP5vE61lZUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rucfj+se5IJwjmzzJfXJdMLHr9uZAsQbzJsNgMuUx6T+qBKX6Fnbh1m5/wZrxRbvTu2aeOSXFbIbwuA29I0ykHfCsbG9CD5cp9wUZ3zdWfPTjd0eULdrreBOZDzLdJVdbiq4L04z/565ozuRoeq4zwiBINX3rNtQqEYZMmfkrTs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nUMRMysZ; 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="nUMRMysZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B7FAC4CEED; Tue, 2 Sep 2025 13:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756819923; bh=xvCqKjQQaiSEZO4sTRwnmVXtw/CRLYX1YP5vE61lZUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nUMRMysZYdfdxauENXDww/5M8jGeTOo9UshkXovGjsv2bhHCwqgYad8LhQPIDpLo8 ubqDXQE1mxMrt88bNLXZuWYNkqqmH2SYMNUZwJScal/MVJ7NDQXYACn4RU0Suuxg52 9kkKOXA10bvXKkWsWaEVT7353PCT1VQTIHxZFn90= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jacob Keller , Paul Menzel , Michal Kubiak , Jason Xing , Aleksandr Loktionov , Priya Singh , Tony Nguyen , Sasha Levin Subject: [PATCH 6.12 38/95] ice: fix incorrect counter for buffer allocation failures Date: Tue, 2 Sep 2025 15:20:14 +0200 Message-ID: <20250902131941.072770525@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131939.601201881@linuxfoundation.org> References: <20250902131939.601201881@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michal Kubiak [ Upstream commit b1a0c977c6f1130f7dd125ee3db8c2435d7e3d41 ] Currently, the driver increments `alloc_page_failed` when buffer allocation fails in `ice_clean_rx_irq()`. However, this counter is intended for page allocation failures, not buffer allocation issues. This patch corrects the counter by incrementing `alloc_buf_failed` instead, ensuring accurate statistics reporting for buffer allocation failures. Fixes: 2fba7dc5157b ("ice: Add support for XDP multi-buffer on Rx side") Reported-by: Jacob Keller Suggested-by: Paul Menzel Signed-off-by: Michal Kubiak Reviewed-by: Paul Menzel Reviewed-by: Jason Xing Reviewed-by: Aleksandr Loktionov Tested-by: Priya Singh Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c index f522dd42093a9..cde69f5686656 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c @@ -1295,7 +1295,7 @@ int ice_clean_rx_irq(struct ice_rx_ring *rx_ring, int budget) skb = ice_construct_skb(rx_ring, xdp); /* exit if we failed to retrieve a buffer */ if (!skb) { - rx_ring->ring_stats->rx_stats.alloc_page_failed++; + rx_ring->ring_stats->rx_stats.alloc_buf_failed++; xdp_verdict = ICE_XDP_CONSUMED; } ice_put_rx_mbuf(rx_ring, xdp, &xdp_xmit, ntc, xdp_verdict); -- 2.50.1