netdev - [PATCH net] net: add no-op for napi_busy_loop if CONFIG_NET_RX_BUSY

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20230223012258.1701175-1-jacob.e.keller@intel.com>
Date:   Wed, 22 Feb 2023 17:22:58 -0800
From:   Jacob Keller <jacob.e.keller@...el.com>
To:     netdev@...r.kernel.org
Cc:     Jacob Keller <jacob.e.keller@...el.com>
Subject: [PATCH net] net: add no-op for napi_busy_loop if CONFIG_NET_RX_BUSY_POLL=n

Commit 7db6b048da3b ("net: Commonize busy polling code to focus on napi_id
instead of socket") introduced napi_busy_loop and refactored sk_busy_loop
to call this new function. The commit removed the no-op implementation of
sk_busy_loop in the #else block for CONFIG_NET_RX_BUSY_POLL, and placed the
declaration of napi_busy_poll inside the # block where sk_busy_loop used to
be declared.

Because of this, if a module tries to use napi_busy_loop it must wrap the
use inside a IS_ENABLED(CONFIG_NET_RX_BUSY_POLL) check, as the function is
not declared when this is false.

The original sk_busy_loop function had both a declaration and a no-op
variant when the config flag was set to N. Do the same for napi_busy_loop
by adding a no-op implementation in the #else block as expected.

Fixes: 7db6b048da3b ("net: Commonize busy polling code to focus on napi_id instead of socket")
Signed-off-by: Jacob Keller <jacob.e.keller@...el.com>
---
 include/net/busy_poll.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index f90f0021f5f2..8f84f6202f1c 100644
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h
@@ -58,6 +58,13 @@ static inline bool sk_can_busy_loop(struct sock *sk)
 	return false;
 }

+static inline void
+napi_busy_loop(unsigned int napi_id,
+	       bool (*loop_end)(void *, unsigned long),
+	       void *loop_end_arg, bool prefer_busy_poll, u16 budget)
+{
+}
+
 #endif /* CONFIG_NET_RX_BUSY_POLL */

 static inline unsigned long busy_loop_current_time(void)

base-commit: 5b7c4cabbb65f5c469464da6c5f614cbd7f730f2
-- 
2.39.1.405.gd4c25cc71f83