android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: page_pool: use in_softirq() instead

Browse Source 
[ Upstream commit 542bcea4be866b14b3a5c8e90773329066656c43 ]

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>
Stable-dep-of: 368d3cb406cd ("page_pool: fix inconsistency for page_pool_ring_[un]lock()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Qingfang DENG 2023-02-03 09:16:11 +08:00 committed by Greg Kroah-Hartman
parent cd3c5e4e0d
commit 7dccd5fa7e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/page_pool.h
View File

@ -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) static inline void page_pool_ring_lock(struct page_pool *pool)
__acquires(&pool->ring.producer_lock) __acquires(&pool->ring.producer_lock)
{ {
if (in_serving_softirq()) if (in_softirq())
spin_lock(&pool->ring.producer_lock); spin_lock(&pool->ring.producer_lock);
else else
spin_lock_bh(&pool->ring.producer_lock); 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) static inline void page_pool_ring_unlock(struct page_pool *pool)
__releases(&pool->ring.producer_lock) __releases(&pool->ring.producer_lock)
{ {
if (in_serving_softirq()) if (in_softirq())
spin_unlock(&pool->ring.producer_lock); spin_unlock(&pool->ring.producer_lock);
else else
spin_unlock_bh(&pool->ring.producer_lock); spin_unlock_bh(&pool->ring.producer_lock);

6
net/core/page_pool.c
View File

@ -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) static bool page_pool_recycle_in_ring(struct page_pool *pool, struct page *page)
{ {
int ret; int ret;
/* BH protection not needed if current is serving softirq */ /* BH protection not needed if current is softirq */
if (in_serving_softirq()) if (in_softirq())
ret = ptr_ring_produce(&pool->ring, page); ret = ptr_ring_produce(&pool->ring, page);
else else
ret = ptr_ring_produce_bh(&pool->ring, page); 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, page_pool_dma_sync_for_device(pool, page,
dma_sync_size); dma_sync_size);
if (allow_direct && in_serving_softirq() && if (allow_direct && in_softirq() &&
page_pool_recycle_in_cache(page, pool)) page_pool_recycle_in_cache(page, pool))
return NULL; return NULL;