Commit 033a9441 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'livepatching-for-5.20' of... 

Merge tag 'livepatching-for-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Pull livepatching update from Petr Mladek:

 - Make a selftest more reliable

* tag 'livepatching-for-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  selftests/livepatch: better synchronize test_klp_callbacks_busy
parents a9cf69d0 55eb9a6c

lib/livepatch/test_klp_callbacks_busy.c

+8 −0
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ MODULE_PARM_DESC(block_transition, "block_transition (default=false)"); 


static void busymod_work_func(struct work_struct *work);

static DECLARE_WORK(work, busymod_work_func);

static DECLARE_COMPLETION(busymod_work_started);



static void busymod_work_func(struct work_struct *work)

{

	pr_info("%s enter\n", __func__);

	complete(&busymod_work_started);



	while (READ_ONCE(block_transition)) {

		/*
@@ -37,6 +39,12 @@ static int test_klp_callbacks_busy_init(void) 
	pr_info("%s\n", __func__);

	schedule_work(&work);



	/*

	 * To synchronize kernel messages, hold the init function from

	 * exiting until the work function's entry message has printed.

	 */

	wait_for_completion(&busymod_work_started);



	if (!block_transition) {

		/*

		 * Serialize output: print all messages from the work