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 B885C3A716D; Sat, 28 Feb 2026 17:37:59 +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=1772300279; cv=none; b=eE4EKbwF99M3LtKrWKRXKmv60Nob62hHDCQo4TVV9gdww6ZHyN0EM1PcLSnlpRhkeniIr0wgC+Ws6qLPkL9TJIDk/i8wTCUPRQoszCZepXE5ANHBXXgmd9Sr6qzrounrvcR6oSIk/hEnIIJiP/0UKwIZcN6bHpgyzq3ldNFjS6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300279; c=relaxed/simple; bh=W2Zu8bffyf0YcmUgY9hYpsOx4Ln8hzrk78JdvpIjSgY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oz8Km5R5vsIEumaQbndkVy1rq8HaLORVrFx5ZtuYAVOSPjzNPdhV8FJDScknxJEl8BHRsL6x4/6lzY6r4bGYNwF4z1Zqe6Qu1jcqa1RZYTwEA0WNZiqEPXp8vJGCBfwTtL0HsrGYh9YkdfPExV44oeWllhpfL8oXbmOijdAejXc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RQpM+pYV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RQpM+pYV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 135A0C116D0; Sat, 28 Feb 2026 17:37:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300279; bh=W2Zu8bffyf0YcmUgY9hYpsOx4Ln8hzrk78JdvpIjSgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RQpM+pYVbRT6FqMJpYlfMI3pS626lKYtNmQQW/DikHT+pNZy8NhBin2DznHEyye+p onVUl8YxqLJ/QoilQLFP4WrEARdj+ZDUOMoMRmpB++JjPqFLtIMDytaTXelESg8jwI /MeHzGVPlwcO6xSDjQp+FwTqz6CwivBenA9nsKg1L66OK2rs8a8Wncj+Zue4jDWGKN Nm94qBbWqb9ZDjNx1JA2Thh3V4fJ+9BeLT3nHaXQeQQUMG5ndentQhPBapw0uDADVT R5XYA8NIqMehtqyUA+b7izkJR/DfEK7ISrLPhUVR1+oKbg1diQnvkdXl6xGNR7xyIG +MpG6rYcTjp/Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.19 307/844] gro: change the BUG_ON() in gro_pull_from_frag0() Date: Sat, 28 Feb 2026 12:23:40 -0500 Message-ID: <20260228173244.1509663-308-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Eric Dumazet [ Upstream commit cbe41362be2c27e0237a94a404ae413cec9c2ad9 ] Replace the BUG_ON() which never fired with a DEBUG_NET_WARN_ON_ONCE() $ scripts/bloat-o-meter -t vmlinux.1 vmlinux.2 add/remove: 2/2 grow/shrink: 1/1 up/down: 370/-254 (116) Function old new delta gro_try_pull_from_frag0 - 196 +196 napi_gro_frags 771 929 +158 __pfx_gro_try_pull_from_frag0 - 16 +16 __pfx_gro_pull_from_frag0 16 - -16 dev_gro_receive 1514 1464 -50 gro_pull_from_frag0 188 - -188 Total: Before=22565899, After=22566015, chg +0.00% Signed-off-by: Eric Dumazet Link: https://patch.msgid.link/20260122045720.1221017-3-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/gro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/gro.c b/net/core/gro.c index 482fa7d7f5981..ef61695fbdbb6 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -417,7 +417,7 @@ static void gro_pull_from_frag0(struct sk_buff *skb, int grow) { struct skb_shared_info *pinfo = skb_shinfo(skb); - BUG_ON(skb->end - skb->tail < grow); + DEBUG_NET_WARN_ON_ONCE(skb->end - skb->tail < grow); memcpy(skb_tail_pointer(skb), NAPI_GRO_CB(skb)->frag0, grow); -- 2.51.0