Unverified Commit 2df0f545 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14719 rcu/kvfree: Fix data-race in __mod_timer / kvfree_call_rcu 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XPQYDE7XOUPBU4YTYSV3A4B4QRLL4GM4/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBDHGP 
 
Link:https://gitee.com/openeuler/kernel/pulls/14719

 

Reviewed-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 253891dd 376c1d49

kernel/rcu/tree.c

+12 −2
Original line number Diff line number Diff line
@@ -3150,7 +3150,7 @@ static int krc_count(struct kfree_rcu_cpu *krcp) 
}



static void

schedule_delayed_monitor_work(struct kfree_rcu_cpu *krcp)

__schedule_delayed_monitor_work(struct kfree_rcu_cpu *krcp)

{

	long delay, delay_left;
@@ -3164,6 +3164,16 @@ schedule_delayed_monitor_work(struct kfree_rcu_cpu *krcp) 
	queue_delayed_work(system_wq, &krcp->monitor_work, delay);

}



static void

schedule_delayed_monitor_work(struct kfree_rcu_cpu *krcp)

{

	unsigned long flags;



	raw_spin_lock_irqsave(&krcp->lock, flags);

	__schedule_delayed_monitor_work(krcp);

	raw_spin_unlock_irqrestore(&krcp->lock, flags);

}



static void

kvfree_rcu_drain_ready(struct kfree_rcu_cpu *krcp)

{
@@ -3460,7 +3470,7 @@ void kvfree_call_rcu(struct rcu_head *head, void *ptr) 


	// Set timer to drain after KFREE_DRAIN_JIFFIES.

	if (rcu_scheduler_active == RCU_SCHEDULER_RUNNING)

		schedule_delayed_monitor_work(krcp);

		__schedule_delayed_monitor_work(krcp);



unlock_return:

	krc_this_cpu_unlock(krcp, flags);