workqueue.c: Increase workqueue name length

[ Upstream commit 31c8900728 ]

Currently we limit the size of the workqueue name to 24 characters due to
commit ecf6881ff3 ("workqueue: make workqueue->name[] fixed len")
Increase the size to 32 characters and print a warning in the event
the requested name is larger than the limit of 32 characters.

Signed-off-by: Audra Mitchell <audra@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Stable-dep-of: 5797b1c189 ("workqueue: Implement system-wide nr_active enforcement for unbound workqueues")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Audra Mitchell 2024-01-15 12:08:22 -05:00 committed by Sasha Levin
parent bf9ec1b24a
commit 43f0cec175

View File

@ -108,7 +108,7 @@ enum {
RESCUER_NICE_LEVEL = MIN_NICE,
HIGHPRI_NICE_LEVEL = MIN_NICE,
WQ_NAME_LEN = 24,
WQ_NAME_LEN = 32,
};
/*
@ -4666,6 +4666,7 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
va_list args;
struct workqueue_struct *wq;
struct pool_workqueue *pwq;
int len;
/*
* Unbound && max_active == 1 used to imply ordered, which is no longer
@ -4692,9 +4693,12 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
}
va_start(args, max_active);
vsnprintf(wq->name, sizeof(wq->name), fmt, args);
len = vsnprintf(wq->name, sizeof(wq->name), fmt, args);
va_end(args);
if (len >= WQ_NAME_LEN)
pr_warn_once("workqueue: name exceeds WQ_NAME_LEN. Truncating to: %s\n", wq->name);
max_active = max_active ?: WQ_DFL_ACTIVE;
max_active = wq_clamp_max_active(max_active, flags, wq->name);