]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
i40e: Fix preempt count leak in napi poll tracepoint
authorThomas Gleixner <tglx@kernel.org>
Sat, 7 Feb 2026 10:50:23 +0000 (11:50 +0100)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 25 Feb 2026 19:43:57 +0000 (11:43 -0800)
Using get_cpu() in the tracepoint assignment causes an obvious preempt
count leak because nothing invokes put_cpu() to undo it:

  softirq: huh, entered softirq 3 NET_RX with preempt_count 00000100, exited with 00000101?

This clearly has seen a lot of testing in the last 3+ years...

Use smp_processor_id() instead.

Fixes: 6d4d584a7ea8 ("i40e: Add i40e_napi_poll tracepoint")
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Reviewed-by: Joe Damato <joe@dama.to>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/i40e/i40e_trace.h

index 759f3d1c4c8f004810351c429e8faccd8a174aa0..dde0ccd789ed168f207484f1855e8292d93020e5 100644 (file)
@@ -88,7 +88,7 @@ TRACE_EVENT(i40e_napi_poll,
                __entry->rx_clean_complete = rx_clean_complete;
                __entry->tx_clean_complete = tx_clean_complete;
                __entry->irq_num = q->irq_num;
-               __entry->curr_cpu = get_cpu();
+               __entry->curr_cpu = smp_processor_id();
                __assign_str(qname);
                __assign_str(dev_name);
                __assign_bitmask(irq_affinity, cpumask_bits(&q->affinity_mask),