Commit 64bdaf96 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Paul E. McKenney
Browse files

scftorture: Move memory allocation outside of preempt_disable region. 



Memory allocations can not happen within regions with explicit disabled
preemption PREEMPT_RT. The problem is that the locking structures
underneath are sleeping locks.

Move the memory allocation outside of the preempt-disabled section. Keep
the GFP_ATOMIC for the allocation to behave like a "ememergncy
allocation".

Tested-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Tested-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 43082cd5

kernel/scftorture.c

+4 −4
Original line number Diff line number Diff line
@@ -320,10 +320,6 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra 
	struct scf_check *scfcp = NULL;

	struct scf_selector *scfsp = scf_sel_rand(trsp);



	if (use_cpus_read_lock)

		cpus_read_lock();

	else

		preempt_disable();

	if (scfsp->scfs_prim == SCF_PRIM_SINGLE || scfsp->scfs_wait) {

		scfcp = kmalloc(sizeof(*scfcp), GFP_ATOMIC);

		if (!scfcp) {
@@ -337,6 +333,10 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra 
			scfcp->scfc_rpc = false;

		}

	}

	if (use_cpus_read_lock)

		cpus_read_lock();

	else

		preempt_disable();

	switch (scfsp->scfs_prim) {

	case SCF_PRIM_RESCHED:

		if (IS_BUILTIN(CONFIG_SCF_TORTURE_TEST)) {