Commit 542bcea4 authored by Qingfang DENG's avatar Qingfang DENG Committed by David S. Miller
Browse files

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: default avatarQingfang DENG <qingfang.deng@siflower.com.cn>
Tested-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 637bc8f0

include/net/page_pool.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/core/page_pool.c

+3 −3
Original line number Diff line number Diff line
@@ -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;