summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorQingfang DENG <qingfang.deng@siflower.com.cn>2023-02-03 04:16:11 +0300
committerDavid S. Miller <davem@davemloft.net>2023-02-06 12:15:22 +0300
commit542bcea4be866b14b3a5c8e90773329066656c43 (patch)
tree5ed46ceeeae204005279fef6ea89c26c91fb6d8b /include
parent637bc8f09b0492f979992d38dfae0ebc17799529 (diff)
downloadlinux-542bcea4be866b14b3a5c8e90773329066656c43.tar.xz
net: page_pool: use in_softirq() instead
We use BH context only for synchronization, so we don't care if it's actually serving softirq or not. As a side node, in case of threaded NAPI, in_serving_softirq() will return false because it's in process context with BH off, making page_pool_recycle_in_cache() unreachable. Signed-off-by: Qingfang DENG <qingfang.deng@siflower.com.cn> Tested-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/page_pool.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/page_pool.h b/include/net/page_pool.h
index 813c93499f20..34bf531ffc8d 100644
--- a/include/net/page_pool.h
+++ b/include/net/page_pool.h
@@ -386,7 +386,7 @@ static inline void page_pool_nid_changed(struct page_pool *pool, int new_nid)
static inline void page_pool_ring_lock(struct page_pool *pool)
__acquires(&pool->ring.producer_lock)
{
- if (in_serving_softirq())
+ if (in_softirq())
spin_lock(&pool->ring.producer_lock);
else
spin_lock_bh(&pool->ring.producer_lock);
@@ -395,7 +395,7 @@ static inline void page_pool_ring_lock(struct page_pool *pool)
static inline void page_pool_ring_unlock(struct page_pool *pool)
__releases(&pool->ring.producer_lock)
{
- if (in_serving_softirq())
+ if (in_softirq())
spin_unlock(&pool->ring.producer_lock);
else
spin_unlock_bh(&pool->ring.producer_lock);