Skip to content

Commit

Permalink
Revert "workqueue.c: Increase workqueue name length"
Browse files Browse the repository at this point in the history
This reverts commit 43a181f which is
commit 31c8900 upstream.

The workqueue patches backported to 6.6.y caused some reported
regressions, so revert them for now.

Reported-by: Thorsten Leemhuis <regressions@leemhuis.info>
Cc: Tejun Heo <tj@kernel.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Cc: Audra Mitchell <audra@redhat.com>
Link: https://lore.kernel.org/all/ce4c2f67-c298-48a0-87a3-f933d646c73b@leemhuis.info/
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
gregkh committed Apr 4, 2024
1 parent d8354f2 commit a99d727
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions kernel/workqueue.c
Expand Up @@ -108,7 +108,7 @@ enum {
RESCUER_NICE_LEVEL = MIN_NICE,
HIGHPRI_NICE_LEVEL = MIN_NICE,

WQ_NAME_LEN = 32,
WQ_NAME_LEN = 24,
};

/*
Expand Down Expand Up @@ -4673,7 +4673,6 @@ 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
Expand All @@ -4700,12 +4699,9 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
}

va_start(args, max_active);
len = vsnprintf(wq->name, sizeof(wq->name), fmt, args);
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);

Expand Down

0 comments on commit a99d727

Please sign in to comment.