Commit 5ea5d1ed authored by Uladzislau Rezki (Sony)'s avatar Uladzislau Rezki (Sony) Committed by Paul E. McKenney
Browse files

rcu: Eliminate the __kvfree_rcu() macro 



This commit open-codes the __kvfree_rcu() macro, thus saving a
few lines of code and improving readability.

Signed-off-by: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 5130b8fd

include/linux/rcupdate.h

+6 −12
Original line number Diff line number Diff line
@@ -840,15 +840,6 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) 
 */

#define __is_kvfree_rcu_offset(offset) ((offset) < 4096)



/*

 * Helper macro for kfree_rcu() to prevent argument-expansion eyestrain.

 */

#define __kvfree_rcu(head, offset) \

	do { \

		BUILD_BUG_ON(!__is_kvfree_rcu_offset(offset)); \

		kvfree_call_rcu(head, (rcu_callback_t)(unsigned long)(offset)); \

	} while (0)



/**

 * kfree_rcu() - kfree an object after a grace period.

 * @ptr: pointer to kfree for both single- and double-argument invocations.
@@ -866,7 +857,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) 
 * Because the functions are not allowed in the low-order 4096 bytes of

 * kernel virtual memory, offsets up to 4095 bytes can be accommodated.

 * If the offset is larger than 4095 bytes, a compile-time error will

 * be generated in __kvfree_rcu(). If this error is triggered, you can

 * be generated in kvfree_rcu_arg_2(). If this error is triggered, you can

 * either fall back to use of call_rcu() or rearrange the structure to

 * position the rcu_head structure into the first 4096 bytes.

 *
@@ -912,8 +903,11 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) 
do {									\

	typeof (ptr) ___p = (ptr);					\

									\

	if (___p)							\

		__kvfree_rcu(&((___p)->rhf), offsetof(typeof(*(ptr)), rhf)); \

	if (___p) {									\

		BUILD_BUG_ON(!__is_kvfree_rcu_offset(offsetof(typeof(*(ptr)), rhf)));	\

		kvfree_call_rcu(&((___p)->rhf), (rcu_callback_t)(unsigned long)		\

			(offsetof(typeof(*(ptr)), rhf)));				\

	}										\

} while (0)



#define kvfree_rcu_arg_1(ptr)					\