diff options
| author | Felix Fietkau | 2025-05-15 13:41:37 +0000 |
|---|---|---|
| committer | Felix Fietkau | 2025-05-15 13:43:58 +0000 |
| commit | ba37852951743f0348b89a6172d30179fa138b04 (patch) | |
| tree | d3e04e13eb4eca785a1fb8befb71eab4ee71af27 | |
| parent | 2bcc3163a6ea02919e699d0562032d821341fabb (diff) | |
| download | openwrt-ba37852951743f0348b89a6172d30179fa138b04.tar.gz | |
kernel: fix warning on retrying page pool release
Fixes the following warning:
[ 180.314652] NOHZ tick-stop error: local softirq work is pending, handler #08!!!
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 610dd871aa59baef063cdc79bf57be92a0c45474)
| -rw-r--r-- | target/linux/generic/hack-6.6/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/generic/hack-6.6/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch b/target/linux/generic/hack-6.6/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch index 85cd79f1a9..cfe35bc51a 100644 --- a/target/linux/generic/hack-6.6/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch +++ b/target/linux/generic/hack-6.6/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch @@ -16,16 +16,17 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/core/page_pool.c +++ b/net/core/page_pool.c -@@ -873,7 +873,7 @@ static void page_pool_release_retry(stru +@@ -873,7 +873,8 @@ static void page_pool_release_retry(stru { struct delayed_work *dwq = to_delayed_work(wq); struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw); - int inflight; ++ unsigned long flags; + int cpu, inflight; inflight = page_pool_release(pool); /* In rare cases, a driver bug may cause inflight to go negative. -@@ -885,6 +885,17 @@ static void page_pool_release_retry(stru +@@ -885,6 +886,21 @@ static void page_pool_release_retry(stru if (inflight <= 0) return; @@ -33,12 +34,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + * defer_list that can stay in the list until we have enough queued + * traffic. + */ ++ local_irq_save(flags); + for_each_online_cpu(cpu) { + struct softnet_data *sd = &per_cpu(softnet_data, cpu); + -+ if (!cmpxchg(&sd->defer_ipi_scheduled, 0, 1)) ++ if (cpu == raw_smp_processor_id()) ++ raise_softirq_irqoff(NET_RX_SOFTIRQ); ++ else if (!cmpxchg(&sd->defer_ipi_scheduled, 0, 1)) + smp_call_function_single_async(cpu, &sd->defer_csd); + } ++ local_irq_restore(flags); + /* Periodic warning */ if (time_after_eq(jiffies, pool->defer_warn)) { |