workqueue: Don't call va_start / va_end twice

JIRA: https://issues.redhat.com/browse/RHEL-53569
Upstream Status: v6.12-rc1

commit 9b59a85
Author:     Matthew Brost <matthew.brost@intel.com>
AuthorDate: Tue Aug 20 12:38:08 2024 -0700
Commit:     Tejun Heo <tj@kernel.org>
CommitDate: Tue Aug 20 09:38:39 2024 -1000

    Calling va_start / va_end multiple times is undefined and causes
    problems with certain compiler / platforms.

    Change alloc_ordered_workqueue_lockdep_map to a macro and updated
    __alloc_workqueue to take a va_list argument.

    Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Lai Jiangshan <jiangshanlai@gmail.com>
    Signed-off-by: Matthew Brost <matthew.brost@intel.com>
    Signed-off-by: Tejun Heo <tj@kernel.org>

Signed-off-by: Robert Foss <rfoss@redhat.com>

Author: Robert Foss

include/linux/workqueue.h

@@ -536,20 +536,8 @@ alloc_workqueue_lockdep_map(const char *fmt, unsigned int flags, int max_active,
  * RETURNS:
  * Pointer to the allocated workqueue on success, %NULL on failure.
  */
-__printf(1, 4) static inline struct workqueue_struct *
-alloc_ordered_workqueue_lockdep_map(const char *fmt, unsigned int flags,
-				    struct lockdep_map *lockdep_map, ...)
-{
-	struct workqueue_struct *wq;
-	va_list args;
-
-	va_start(args, lockdep_map);
-	wq = alloc_workqueue_lockdep_map(fmt, WQ_UNBOUND | __WQ_ORDERED | flags,
-					 1, lockdep_map, args);
-	va_end(args);
-
-	return wq;
-}
+#define alloc_ordered_workqueue_lockdep_map(fmt, flags, lockdep_map, args...)	\
+	alloc_workqueue_lockdep_map(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, lockdep_map, ##args)
 #endif
 
 /**

kernel/workqueue.c

@@ -5537,12 +5537,10 @@ static void wq_adjust_max_active(struct workqueue_struct *wq)
 	} while (activated);
 }
 
-__printf(1, 4)
 static struct workqueue_struct *__alloc_workqueue(const char *fmt,
 						  unsigned int flags,
-						  int max_active, ...)
+						  int max_active, va_list args)
 {
-	va_list args;
 	struct workqueue_struct *wq;
 	size_t wq_size;
 	int name_len;
@@ -5574,9 +5572,7 @@ static struct workqueue_struct *__alloc_workqueue(const char *fmt,
 			goto err_free_wq;
 	}
 
-	va_start(args, max_active);
 	name_len = vsnprintf(wq->name, sizeof(wq->name), fmt, args);
-	va_end(args);
 
 	if (name_len >= WQ_NAME_LEN)
 		pr_warn_once("workqueue: name exceeds WQ_NAME_LEN. Truncating to: %s\n",