Skip to contentSkip to conversation

net-lib-once-remove-net_get_random_once_wait-macro.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Jul 18, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: net, lib/once: remove {net_}get_random_once_wait macro
has been removed from the -mm tree. Its filename was
net-lib-once-remove-net_get_random_once_wait-macro.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: wuchi <[email protected]>
Subject: net, lib/once: remove {net_}get_random_once_wait macro
Date: Sun, 19 Jun 2022 15:46:41 +0800

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.

---

 include/linux/net.h  |    2 --
 include/linux/once.h |    2 --
 2 files changed, 4 deletions(-)
include/linux/net.h renamed from include/linux/net.h~net-lib-once-remove-net_get_random_once_wait-macro +0 -2
@@ -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
include/linux/once.h renamed from include/linux/once.h~net-lib-once-remove-net_get_random_once_wait-macro +0 -2
@@ -54,7 +54,5 @@ void __do_once_done(bool *done, struct s
 
 #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 */

_

Patches currently in -mm which might be from [email protected] are

lib-debugobjects-fix-stat-count-and-optimize-debug_objects_mem_init.patch