From: David Wei <dw@davidwei.uk>
Date: Wed, 5 Jun 2024 16:19:24 +0000 (-0700)
Subject: page_pool: remove WARN_ON() with OR
X-Git-Tag: v6.11-rc1~163^2~231
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e61103b2f7887af0be402a79b9c70425ceba3e3;p=thirdparty%2Fkernel%2Flinux.git

page_pool: remove WARN_ON() with OR

Having an OR in WARN_ON() makes me sad because it's impossible to tell
which condition is true when triggered.

Split a WARN_ON() with an OR in page_pool_disable_direct_recycling().

Signed-off-by: David Wei <dw@davidwei.uk>
Reviewed-by: Mina Almasry <almasrymina@google.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index f4444b4e39e63..3927a0a7fa9a8 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -1027,8 +1027,8 @@ static void page_pool_disable_direct_recycling(struct page_pool *pool)
 	/* To avoid races with recycling and additional barriers make sure
 	 * pool and NAPI are unlinked when NAPI is disabled.
 	 */
-	WARN_ON(!test_bit(NAPI_STATE_SCHED, &pool->p.napi->state) ||
-		READ_ONCE(pool->p.napi->list_owner) != -1);
+	WARN_ON(!test_bit(NAPI_STATE_SCHED, &pool->p.napi->state));
+	WARN_ON(READ_ONCE(pool->p.napi->list_owner) != -1);
 
 	WRITE_ONCE(pool->p.napi, NULL);
 }