rcu/tree: Move kfree_rcu_cpu locking/unlocking to separate functions (952371d6) · Commits · 戴 / test

kernel/rcu/tree.c

+23 −8

Original line number	Diff line number	Diff line
		@@ -3035,6 +3035,27 @@ debug_rcu_bhead_unqueue(struct kfree_rcu_bulk_data *bhead)
		#endif
		}

		static inline struct kfree_rcu_cpu *
		krc_this_cpu_lock(unsigned long *flags)
		{
		struct kfree_rcu_cpu *krcp;

		local_irq_save(*flags); // For safely calling this_cpu_ptr().
		krcp = this_cpu_ptr(&krc);
		if (likely(krcp->initialized))
		raw_spin_lock(&krcp->lock);

		return krcp;
		}

		static inline void
		krc_this_cpu_unlock(struct kfree_rcu_cpu *krcp, unsigned long flags)
		{
		if (likely(krcp->initialized))
		raw_spin_unlock(&krcp->lock);
		local_irq_restore(flags);
		}

		/*
		* This function is invoked in workqueue context after a grace period.
		* It frees all the objects queued on ->bhead_free or ->head_free.
		@@ -3260,11 +3281,7 @@ void kfree_call_rcu(struct rcu_head *head, rcu_callback_t func)
		struct kfree_rcu_cpu *krcp;
		void *ptr;

		local_irq_save(flags); // For safely calling this_cpu_ptr().
		krcp = this_cpu_ptr(&krc);
		if (krcp->initialized)
		raw_spin_lock(&krcp->lock);

		krcp = krc_this_cpu_lock(&flags);
		ptr = (void *)head - (unsigned long)func;

		// Queue the object but don't yet schedule the batch.
		@@ -3295,9 +3312,7 @@ void kfree_call_rcu(struct rcu_head *head, rcu_callback_t func)
		}

		unlock_return:
		if (krcp->initialized)
		raw_spin_unlock(&krcp->lock);
		local_irq_restore(flags);
		krc_this_cpu_unlock(krcp, flags);
		}
		EXPORT_SYMBOL_GPL(kfree_call_rcu);