Commit 74fe02ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'wq-for-7.1-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

Pull workqueue fixes from Tejun Heo:

 - Fix devm_alloc_workqueue() passing a va_list as a positional arg to
   the variadic alloc_workqueue() macro, which garbled wq->name and
   skipped lockdep init on the devm path. Fold both noprof entry points
   onto a va_list helper.

   Also, annotate it using __printf(1, 0)

* tag 'wq-for-7.1-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Annotate alloc_workqueue_va() with __printf(1, 0)
  workqueue: fix devm_alloc_workqueue() va_list misuse
parents 11f00074 20e81c64

include/linux/workqueue.h

+4 −2
Original line number Diff line number Diff line
@@ -534,8 +534,10 @@ alloc_workqueue_noprof(const char *fmt, unsigned int flags, int max_active, ...) 
 * Pointer to the allocated workqueue on success, %NULL on failure.

 */

__printf(2, 5) struct workqueue_struct *

devm_alloc_workqueue(struct device *dev, const char *fmt, unsigned int flags,

		     int max_active, ...);

devm_alloc_workqueue_noprof(struct device *dev, const char *fmt,

			    unsigned int flags, int max_active, ...);

#define devm_alloc_workqueue(...)	\

	alloc_hooks(devm_alloc_workqueue_noprof(__VA_ARGS__))



#ifdef CONFIG_LOCKDEP

/**

kernel/workqueue.c

+20 −9
Original line number Diff line number Diff line
@@ -5906,6 +5906,21 @@ static struct workqueue_struct *__alloc_workqueue(const char *fmt, 
	return NULL;

}



__printf(1, 0)

static struct workqueue_struct *alloc_workqueue_va(const char *fmt,

						   unsigned int flags,

						   int max_active,

						   va_list args)

{

	struct workqueue_struct *wq;



	wq = __alloc_workqueue(fmt, flags, max_active, args);

	if (wq)

		wq_init_lockdep(wq);



	return wq;

}



__printf(1, 4)

struct workqueue_struct *alloc_workqueue_noprof(const char *fmt,

						unsigned int flags,
@@ -5915,12 +5930,8 @@ struct workqueue_struct *alloc_workqueue_noprof(const char *fmt, 
	va_list args;



	va_start(args, max_active);

	wq = __alloc_workqueue(fmt, flags, max_active, args);

	wq = alloc_workqueue_va(fmt, flags, max_active, args);

	va_end(args);

	if (!wq)

		return NULL;



	wq_init_lockdep(wq);



	return wq;

}
@@ -5932,15 +5943,15 @@ static void devm_workqueue_release(void *res) 
}



__printf(2, 5) struct workqueue_struct *

devm_alloc_workqueue(struct device *dev, const char *fmt, unsigned int flags,

		     int max_active, ...)

devm_alloc_workqueue_noprof(struct device *dev, const char *fmt,

			    unsigned int flags, int max_active, ...)

{

	struct workqueue_struct *wq;

	va_list args;

	int ret;



	va_start(args, max_active);

	wq = alloc_workqueue(fmt, flags, max_active, args);

	wq = alloc_workqueue_va(fmt, flags, max_active, args);

	va_end(args);

	if (!wq)

		return NULL;
@@ -5951,7 +5962,7 @@ devm_alloc_workqueue(struct device *dev, const char *fmt, unsigned int flags, 


	return wq;

}

EXPORT_SYMBOL_GPL(devm_alloc_workqueue);

EXPORT_SYMBOL_GPL(devm_alloc_workqueue_noprof);



#ifdef CONFIG_LOCKDEP

__printf(1, 5)