DO_ONCE(func, ...) will call func with spinlock which acquired by
spin_lock_irqsave in __do_once_start. But the get_random_once_wait
will sleep in get_random_bytes_wait -> wait_for_random_bytes.

Fortunately, there is no place to use {net_}get_random_once_wait,
so we could remove them simply.

Signed-off-by: wuchi <wuchi.zero@gmail.com>
---
 include/linux/net.h  | 2 --
 include/linux/once.h | 2 --
 2 files changed, 4 deletions(-)

diff --git a/include/linux/net.h b/include/linux/net.h
index 12093f4db50c..8613772a1f58 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -303,8 +303,6 @@ do {									\
 
 #define net_get_random_once(buf, nbytes)			\
 	get_random_once((buf), (nbytes))
-#define net_get_random_once_wait(buf, nbytes)			\
-	get_random_once_wait((buf), (nbytes))
 
 /*
  * E.g. XFS meta- & log-data is in slab pages, or bcache meta
diff --git a/include/linux/once.h b/include/linux/once.h
index f54523052bbc..b14d8b309d52 100644
--- a/include/linux/once.h
+++ b/include/linux/once.h
@@ -54,7 +54,5 @@ void __do_once_done(bool *done, struct static_key_true *once_key,
 
 #define get_random_once(buf, nbytes)					     \
 	DO_ONCE(get_random_bytes, (buf), (nbytes))
-#define get_random_once_wait(buf, nbytes)                                    \
-	DO_ONCE(get_random_bytes_wait, (buf), (nbytes))                      \
 
 #endif /* _LINUX_ONCE_H */
-- 
2.20.1

On Sun, 19 Jun 2022 15:46:41 +0800 wuchi wrote:
> DO_ONCE(func, ...) will call func with spinlock which acquired by
> spin_lock_irqsave in __do_once_start. But the get_random_once_wait
> will sleep in get_random_bytes_wait -> wait_for_random_bytes.
> 
> Fortunately, there is no place to use {net_}get_random_once_wait,
> so we could remove them simply.
> 
> Signed-off-by: wuchi <wuchi.zero@gmail.com>

Yeah, sure, if it builds:

Acked-by: Jakub Kicinski <kuba@kernel.org>

If Andrew doesn't pick it you please repost CCing netdev.