mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
6cb54f2162
[ Upstream commit62c07983be] Christophe Leroy reported a ~80ms latency spike happening at first TCP connect() time. This is because __inet_hash_connect() uses get_random_once() to populate a perturbation table which became quite big after commit4c2c8f03a5("tcp: increase source port perturb table to 2^16") get_random_once() uses DO_ONCE(), which block hard irqs for the duration of the operation. This patch adds DO_ONCE_SLOW() which uses a mutex instead of a spinlock for operations where we prefer to stay in process context. Then __inet_hash_connect() can use get_random_slow_once() to populate its perturbation table. Fixes:4c2c8f03a5("tcp: increase source port perturb table to 2^16") Fixes:190cc82489("tcp: change source port randomizarion at connect() time") Reported-by: Christophe Leroy <christophe.leroy@csgroup.eu> Link: https://lore.kernel.org/netdev/CANn89iLAEYBaoYajy0Y9UmGFff5GPxDUoG-ErVB2jDdRNQ5Tug@mail.gmail.com/T/#t Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Willy Tarreau <w@1wt.eu> Tested-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
98 lines
2.2 KiB
C
98 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/once.h>
|
|
#include <linux/random.h>
|
|
#include <linux/module.h>
|
|
|
|
struct once_work {
|
|
struct work_struct work;
|
|
struct static_key_true *key;
|
|
struct module *module;
|
|
};
|
|
|
|
static void once_deferred(struct work_struct *w)
|
|
{
|
|
struct once_work *work;
|
|
|
|
work = container_of(w, struct once_work, work);
|
|
BUG_ON(!static_key_enabled(work->key));
|
|
static_branch_disable(work->key);
|
|
module_put(work->module);
|
|
kfree(work);
|
|
}
|
|
|
|
static void once_disable_jump(struct static_key_true *key, struct module *mod)
|
|
{
|
|
struct once_work *w;
|
|
|
|
w = kmalloc(sizeof(*w), GFP_ATOMIC);
|
|
if (!w)
|
|
return;
|
|
|
|
INIT_WORK(&w->work, once_deferred);
|
|
w->key = key;
|
|
w->module = mod;
|
|
__module_get(mod);
|
|
schedule_work(&w->work);
|
|
}
|
|
|
|
static DEFINE_SPINLOCK(once_lock);
|
|
|
|
bool __do_once_start(bool *done, unsigned long *flags)
|
|
__acquires(once_lock)
|
|
{
|
|
spin_lock_irqsave(&once_lock, *flags);
|
|
if (*done) {
|
|
spin_unlock_irqrestore(&once_lock, *flags);
|
|
/* Keep sparse happy by restoring an even lock count on
|
|
* this lock. In case we return here, we don't call into
|
|
* __do_once_done but return early in the DO_ONCE() macro.
|
|
*/
|
|
__acquire(once_lock);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
EXPORT_SYMBOL(__do_once_start);
|
|
|
|
void __do_once_done(bool *done, struct static_key_true *once_key,
|
|
unsigned long *flags, struct module *mod)
|
|
__releases(once_lock)
|
|
{
|
|
*done = true;
|
|
spin_unlock_irqrestore(&once_lock, *flags);
|
|
once_disable_jump(once_key, mod);
|
|
}
|
|
EXPORT_SYMBOL(__do_once_done);
|
|
|
|
static DEFINE_MUTEX(once_mutex);
|
|
|
|
bool __do_once_slow_start(bool *done)
|
|
__acquires(once_mutex)
|
|
{
|
|
mutex_lock(&once_mutex);
|
|
if (*done) {
|
|
mutex_unlock(&once_mutex);
|
|
/* Keep sparse happy by restoring an even lock count on
|
|
* this mutex. In case we return here, we don't call into
|
|
* __do_once_done but return early in the DO_ONCE_SLOW() macro.
|
|
*/
|
|
__acquire(once_mutex);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
EXPORT_SYMBOL(__do_once_slow_start);
|
|
|
|
void __do_once_slow_done(bool *done, struct static_key_true *once_key,
|
|
struct module *mod)
|
|
__releases(once_mutex)
|
|
{
|
|
*done = true;
|
|
mutex_unlock(&once_mutex);
|
|
once_disable_jump(once_key, mod);
|
|
}
|
|
EXPORT_SYMBOL(__do_once_slow_done);
|