rcutorture: Properly set rcu_fwds for OOM handling (c8fa6371) · Commits · 戴 / test

The conversion of rcu_fwds to dynamic allocation failed to actually allocate the required structure. This commit therefore allocates it, frees it, and updates rcu_fwds accordingly. While in the area, it abstracts the cleanup actions into rcu_torture_fwd_prog_cleanup(). Fixes: ("rcutorture: Dynamically allocate rcu_fwds structure") Reported-by:

kernel test robot <rong.a.chen@intel.com> Signed-off-by:

Paul E. McKenney <paulmck@kernel.org>

kernel/rcu/rcutorture.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -2148,9 +2148,20 @@ static int __init rcu_torture_fwd_prog_init(void)
		return -ENOMEM;
		spin_lock_init(&rfp->rcu_fwd_lock);
		rfp->rcu_fwd_cb_tail = &rfp->rcu_fwd_cb_head;
		rcu_fwds = rfp;
		return torture_create_kthread(rcu_torture_fwd_prog, rfp, fwd_prog_task);
		}

		static void rcu_torture_fwd_prog_cleanup(void)
		{
		struct rcu_fwd *rfp;

		torture_stop_kthread(rcu_torture_fwd_prog, fwd_prog_task);
		rfp = rcu_fwds;
		rcu_fwds = NULL;
		kfree(rfp);
		}

		/* Callback function for RCU barrier testing. */
		static void rcu_torture_barrier_cbf(struct rcu_head *rcu)
		{
		@@ -2448,7 +2459,7 @@ rcu_torture_cleanup(void)
		show_rcu_gp_kthreads();
		rcu_torture_read_exit_cleanup();
		rcu_torture_barrier_cleanup();
		torture_stop_kthread(rcu_torture_fwd_prog, fwd_prog_task);
		rcu_torture_fwd_prog_cleanup();
		torture_stop_kthread(rcu_torture_stall, stall_task);
		torture_stop_kthread(rcu_torture_writer, writer_task);

Admin message