mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

once: rename _SLOW to _SLEEPABLE 

The _SLOW designation wasn't really descriptive of anything. This is
meant to be called from process context when it's possible to sleep. So
name this more aptly _SLEEPABLE, which better fits its intended use.

Fixes: 62c07983be ("once: add DO_ONCE_SLOW() for sleepable contexts")
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20221003181413.1221968-1-Jason@zx2c4.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jason A. Donenfeld 2022-10-03 20:14:13 +02:00 committed by Jakub Kicinski
parent 331834898f
commit 2a4187f440
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/linux/once.h
View File

@ -13,9 +13,9 @@ void __do_once_done(bool *done, struct static_key_true *once_key,
unsigned long *flags, struct module *mod); unsigned long *flags, struct module *mod);
/* Variant for process contexts only. */ /* Variant for process contexts only. */
bool __do_once_slow_start(bool *done); bool __do_once_sleepable_start(bool *done);
void __do_once_slow_done(bool *done, struct static_key_true *once_key, void __do_once_sleepable_done(bool *done, struct static_key_true *once_key,
struct module *mod); struct module *mod);
/* Call a function exactly once. The idea of DO_ONCE() is to perform /* Call a function exactly once. The idea of DO_ONCE() is to perform
* a function call such as initialization of random seeds, etc, only * a function call such as initialization of random seeds, etc, only
@ -61,26 +61,26 @@ void __do_once_slow_done(bool *done, struct static_key_true *once_key,
}) })
/* Variant of DO_ONCE() for process/sleepable contexts. */ /* Variant of DO_ONCE() for process/sleepable contexts. */
#define DO_ONCE_SLOW(func, ...) \ #define DO_ONCE_SLEEPABLE(func, ...) \
({ \ ({ \
bool ___ret = false; \ bool ___ret = false; \
static bool __section(".data.once") ___done = false; \ static bool __section(".data.once") ___done = false; \
static DEFINE_STATIC_KEY_TRUE(___once_key); \ static DEFINE_STATIC_KEY_TRUE(___once_key); \
if (static_branch_unlikely(&___once_key)) { \ if (static_branch_unlikely(&___once_key)) { \
___ret = __do_once_slow_start(&___done); \ ___ret = __do_once_sleepable_start(&___done); \
if (unlikely(___ret)) { \ if (unlikely(___ret)) { \
func(__VA_ARGS__); \ func(__VA_ARGS__); \
__do_once_slow_done(&___done, &___once_key, \ __do_once_sleepable_done(&___done, &___once_key,\
THIS_MODULE); \ THIS_MODULE); \
} \ } \
} \ } \
___ret; \ ___ret; \
}) })
#define get_random_once(buf, nbytes) \ #define get_random_once(buf, nbytes) \
DO_ONCE(get_random_bytes, (buf), (nbytes)) DO_ONCE(get_random_bytes, (buf), (nbytes))
#define get_random_slow_once(buf, nbytes) \ #define get_random_sleepable_once(buf, nbytes) \
DO_ONCE_SLOW(get_random_bytes, (buf), (nbytes)) DO_ONCE_SLEEPABLE(get_random_bytes, (buf), (nbytes))
#endif /* _LINUX_ONCE_H */ #endif /* _LINUX_ONCE_H */

10
lib/once.c
View File

@ -69,7 +69,7 @@ EXPORT_SYMBOL(__do_once_done);
static DEFINE_MUTEX(once_mutex); static DEFINE_MUTEX(once_mutex);
bool __do_once_slow_start(bool *done) bool __do_once_sleepable_start(bool *done)
__acquires(once_mutex) __acquires(once_mutex)
{ {
mutex_lock(&once_mutex); mutex_lock(&once_mutex);
@ -77,7 +77,7 @@ bool __do_once_slow_start(bool *done)
mutex_unlock(&once_mutex); mutex_unlock(&once_mutex);
/* Keep sparse happy by restoring an even lock count on /* Keep sparse happy by restoring an even lock count on
* this mutex. In case we return here, we don't call into * this mutex. In case we return here, we don't call into
* __do_once_done but return early in the DO_ONCE_SLOW() macro. * __do_once_done but return early in the DO_ONCE_SLEEPABLE() macro.
*/ */
__acquire(once_mutex); __acquire(once_mutex);
return false; return false;
@ -85,9 +85,9 @@ bool __do_once_slow_start(bool *done)
return true; return true;
} }
EXPORT_SYMBOL(__do_once_slow_start); EXPORT_SYMBOL(__do_once_sleepable_start);
void __do_once_slow_done(bool *done, struct static_key_true *once_key, void __do_once_sleepable_done(bool *done, struct static_key_true *once_key,
struct module *mod) struct module *mod)
__releases(once_mutex) __releases(once_mutex)
{ {
@ -95,4 +95,4 @@ void __do_once_slow_done(bool *done, struct static_key_true *once_key,
mutex_unlock(&once_mutex); mutex_unlock(&once_mutex);
once_disable_jump(once_key, mod); once_disable_jump(once_key, mod);
} }
EXPORT_SYMBOL(__do_once_slow_done); EXPORT_SYMBOL(__do_once_sleepable_done);

4
net/ipv4/inet_hashtables.c
View File

@ -958,8 +958,8 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,
if (likely(remaining > 1)) if (likely(remaining > 1))
remaining &= ~1U; remaining &= ~1U;
get_random_slow_once(table_perturb, get_random_sleepable_once(table_perturb,
INET_TABLE_PERTURB_SIZE * sizeof(*table_perturb)); INET_TABLE_PERTURB_SIZE * sizeof(*table_perturb));
index = port_offset & (INET_TABLE_PERTURB_SIZE - 1); index = port_offset & (INET_TABLE_PERTURB_SIZE - 1);
offset = READ_ONCE(table_perturb[index]) + (port_offset >> 32); offset = READ_ONCE(table_perturb[index]) + (port_offset >> 32);