Commit a4790c94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: print out alloc information with KERN_DEBUG instead of KERN_INFO
  kthread_work: make lockdep happy
parents 08da5a32 bcbea798

include/linux/kthread.h

+35 −10
Original line number Diff line number Diff line
@@ -81,16 +81,41 @@ struct kthread_work { 
#define DEFINE_KTHREAD_WORK(work, fn)					\

	struct kthread_work work = KTHREAD_WORK_INIT(work, fn)



static inline void init_kthread_worker(struct kthread_worker *worker)

{

	*worker = (struct kthread_worker)KTHREAD_WORKER_INIT(*worker);

}



static inline void init_kthread_work(struct kthread_work *work,

				     kthread_work_func_t fn)

{

	*work = (struct kthread_work)KTHREAD_WORK_INIT(*work, fn);

}

/*

 * kthread_worker.lock and kthread_work.done need their own lockdep class

 * keys if they are defined on stack with lockdep enabled.  Use the

 * following macros when defining them on stack.

 */

#ifdef CONFIG_LOCKDEP

# define KTHREAD_WORKER_INIT_ONSTACK(worker)				\

	({ init_kthread_worker(&worker); worker; })

# define DEFINE_KTHREAD_WORKER_ONSTACK(worker)				\

	struct kthread_worker worker = KTHREAD_WORKER_INIT_ONSTACK(worker)

# define KTHREAD_WORK_INIT_ONSTACK(work, fn)				\

	({ init_kthread_work((&work), fn); work; })

# define DEFINE_KTHREAD_WORK_ONSTACK(work, fn)				\

	struct kthread_work work = KTHREAD_WORK_INIT_ONSTACK(work, fn)

#else

# define DEFINE_KTHREAD_WORKER_ONSTACK(worker) DEFINE_KTHREAD_WORKER(worker)

# define DEFINE_KTHREAD_WORK_ONSTACK(work, fn) DEFINE_KTHREAD_WORK(work, fn)

#endif



extern void __init_kthread_worker(struct kthread_worker *worker,

			const char *name, struct lock_class_key *key);



#define init_kthread_worker(worker)					\

	do {								\

		static struct lock_class_key __key;			\

		__init_kthread_worker((worker), "("#worker")->lock", &__key); \

	} while (0)



#define init_kthread_work(work, fn)					\

	do {								\

		memset((work), 0, sizeof(struct kthread_work));		\

		INIT_LIST_HEAD(&(work)->node);				\

		(work)->func = (fn);					\

		init_waitqueue_head(&(work)->done);			\

	} while (0)



int kthread_worker_fn(void *worker_ptr);

kernel/kthread.c

+11 −0
Original line number Diff line number Diff line
@@ -265,6 +265,17 @@ int kthreadd(void *unused) 
	return 0;

}



void __init_kthread_worker(struct kthread_worker *worker,

				const char *name,

				struct lock_class_key *key)

{

	spin_lock_init(&worker->lock);

	lockdep_set_class_and_name(&worker->lock, key, name);

	INIT_LIST_HEAD(&worker->work_list);

	worker->task = NULL;

}

EXPORT_SYMBOL_GPL(__init_kthread_worker);



/**

 * kthread_worker_fn - kthread function to process kthread_worker

 * @worker_ptr: pointer to initialized kthread_worker

mm/percpu.c

+1 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai, 


	/* we're done parsing the input, undefine BUG macro and dump config */

#undef PCPU_SETUP_BUG_ON

	pcpu_dump_alloc_info(KERN_INFO, ai);

	pcpu_dump_alloc_info(KERN_DEBUG, ai);



	pcpu_nr_groups = ai->nr_groups;

	pcpu_group_offsets = group_offsets;