diff options
| author | Qingfang DENG <qingfang.deng@siflower.com.cn> | 2023-02-03 09:16:11 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-02-06 09:15:22 +0000 |
| commit | 542bcea4be866b14b3a5c8e90773329066656c43 (patch) | |
| tree | 5ed46ceeeae204005279fef6ea89c26c91fb6d8b /net/core | |
| parent | 637bc8f09b0492f979992d38dfae0ebc17799529 (diff) | |
| download | linux-542bcea4be866b14b3a5c8e90773329066656c43.tar.gz linux-542bcea4be866b14b3a5c8e90773329066656c43.tar.bz2 linux-542bcea4be866b14b3a5c8e90773329066656c43.zip | |
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 'net/core')
| -rw-r--r-- | net/core/page_pool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 9b203d8660e4..193c18799865 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -511,8 +511,8 @@ static void page_pool_return_page(struct page_pool *pool, struct page *page) static bool page_pool_recycle_in_ring(struct page_pool *pool, struct page *page) { int ret; - /* BH protection not needed if current is serving softirq */ - if (in_serving_softirq()) + /* BH protection not needed if current is softirq */ + if (in_softirq()) ret = ptr_ring_produce(&pool->ring, page); else ret = ptr_ring_produce_bh(&pool->ring, page); @@ -570,7 +570,7 @@ __page_pool_put_page(struct page_pool *pool, struct page *page, page_pool_dma_sync_for_device(pool, page, dma_sync_size); - if (allow_direct && in_serving_softirq() && + if (allow_direct && in_softirq() && page_pool_recycle_in_cache(page, pool)) return NULL; |