From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 5254D61FFE; Wed, 20 May 2026 17:03:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779296631; cv=none; b=TmodpxL3G3t3lVU8RiCNDRTUPntfdxQiog2XrCUGbOVyf9rGTPjoG42oZolDt32EcNHP0N8jzmZrgTq+MdGTUbZch05TnfEx3OHzGdilbTm09jhD1uZOi/wJ2HwFYUTnv1UFTWFq8cVQxSCGJ8lvBRbhjDfTfGCZaUyYYIspmUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779296631; c=relaxed/simple; bh=EXtHMObZJq+XpifWR7Vlsg5cozde5yAdNMXd2+5Fd68=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L8oNbVpsWA26uR+Og5ANElA8IPI4qf7+TdZMO5LAKfueMEUkYIhafZwLDrg3g7LDXqjKsYaeD+RHVZqvXy1TJNhnoVF3s1p/iPFydRrH+HVXeAn0b10vxmYqPms1vl2wIiT22JFgHElmczzA9vnTtcVLlH+gw3Qvu24xWcvqxCg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=M/e80+wH; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="M/e80+wH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEE211F000E9; Wed, 20 May 2026 17:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779296630; bh=mTl4n3O/cDFQxJefUyTJtOVBriVgdQ0CJJyWtxac4SU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M/e80+wH9xMLrwOSczxl8WaAxFRbn5PbNUSS/yXs6pDrWv3prfslFGTscQh9Hx9Sa ozlrKkob8x6ckXPdmd8YbsyWY1cWi0ZVomFBIG+puRmxRQz+4+9JKgrRCEP7UZUB5b tsIPeLF+Scyrn67YLgqYUuVtBMPW8r324IFIywLI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kohei Enju , Simon Horman , Jiayuan Chen , Jakub Kicinski , Sasha Levin Subject: [PATCH 7.0 0830/1146] net: validate skb->napi_id in RX tracepoints Date: Wed, 20 May 2026 18:18:00 +0200 Message-ID: <20260520162207.015068275@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162148.390695140@linuxfoundation.org> References: <20260520162148.390695140@linuxfoundation.org> User-Agent: quilt/0.69 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 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kohei Enju [ Upstream commit 3bfcf396081ace536733b454ff128d53116581e5 ] Since commit 2bd82484bb4c ("xps: fix xps for stacked devices"), skb->napi_id shares storage with sender_cpu. RX tracepoints using net_dev_rx_verbose_template read skb->napi_id directly and can therefore report sender_cpu values as if they were NAPI IDs. For example, on the loopback path this can report 1 as napi_id, where 1 comes from raw_smp_processor_id() + 1 in the XPS path: # bpftrace -e 'tracepoint:net:netif_rx_entry{ print(args->napi_id); }' # taskset -c 0 ping -c 1 ::1 Report only valid NAPI IDs in these tracepoints and use 0 otherwise. Fixes: 2bd82484bb4c ("xps: fix xps for stacked devices") Signed-off-by: Kohei Enju Reviewed-by: Simon Horman Reviewed-by: Jiayuan Chen Link: https://patch.msgid.link/20260420105427.162816-1-kohei@enjuk.jp Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- include/trace/events/net.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/trace/events/net.h b/include/trace/events/net.h index fdd9ad474ce3a..dbc2c5598e35a 100644 --- a/include/trace/events/net.h +++ b/include/trace/events/net.h @@ -10,6 +10,7 @@ #include #include #include +#include TRACE_EVENT(net_dev_start_xmit, @@ -208,7 +209,8 @@ DECLARE_EVENT_CLASS(net_dev_rx_verbose_template, TP_fast_assign( __assign_str(name); #ifdef CONFIG_NET_RX_BUSY_POLL - __entry->napi_id = skb->napi_id; + __entry->napi_id = napi_id_valid(skb->napi_id) ? + skb->napi_id : 0; #else __entry->napi_id = 0; #endif -- 2.53.0