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

rcu: Rename *_kfree_callback/*_kfree_rcu_offset/kfree_call_* 



The following changes are introduced:

1. Rename rcu_invoke_kfree_callback() to rcu_invoke_kvfree_callback(),
as well as the associated trace events, so the rcu_kfree_callback(),
becomes rcu_kvfree_callback(). The reason is to be aligned with kvfree()
notation.

2. Rename __is_kfree_rcu_offset to __is_kvfree_rcu_offset. All RCU
paths use kvfree() now instead of kfree(), thus rename it.

3. Rename kfree_call_rcu() to the kvfree_call_rcu(). The reason is,
it is capable of freeing vmalloc() memory now. Do the same with
__kfree_rcu() macro, it becomes __kvfree_rcu(), the goal is the
same.

Reviewed-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Co-developed-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 64d1d06c

include/linux/rcupdate.h

+7 −7
Original line number Diff line number Diff line
@@ -828,17 +828,17 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) 


/*

 * Does the specified offset indicate that the corresponding rcu_head

 * structure can be handled by kfree_rcu()?

 * structure can be handled by kvfree_rcu()?

 */

#define __is_kfree_rcu_offset(offset) ((offset) < 4096)

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



/*

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

 */

#define __kfree_rcu(head, offset) \

#define __kvfree_rcu(head, offset) \

	do { \

		BUILD_BUG_ON(!__is_kfree_rcu_offset(offset)); \

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

		BUILD_BUG_ON(!__is_kvfree_rcu_offset(offset)); \

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

	} while (0)



/**
@@ -857,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 __kfree_rcu().  If this error is triggered, you can

 * be generated in __kvfree_rcu(). 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.

 *
@@ -872,7 +872,7 @@ do { \ 
	typeof (ptr) ___p = (ptr);					\

									\

	if (___p)							\

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

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

} while (0)



/*

include/linux/rcutiny.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static inline void synchronize_rcu_expedited(void) 
	synchronize_rcu();

}



static inline void kfree_call_rcu(struct rcu_head *head, rcu_callback_t func)

static inline void kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func)

{

	call_rcu(head, func);

}

include/linux/rcutree.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static inline void rcu_virt_note_context_switch(int cpu) 
}



void synchronize_rcu_expedited(void);

void kfree_call_rcu(struct rcu_head *head, rcu_callback_t func);

void kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func);



void rcu_barrier(void);

bool rcu_eqs_special_set(int cpu);

include/trace/events/rcu.h

+4 −4
Original line number Diff line number Diff line
@@ -506,13 +506,13 @@ TRACE_EVENT_RCU(rcu_callback, 


/*

 * Tracepoint for the registration of a single RCU callback of the special

 * kfree() form.  The first argument is the RCU type, the second argument

 * kvfree() form.  The first argument is the RCU type, the second argument

 * is a pointer to the RCU callback, the third argument is the offset

 * of the callback within the enclosing RCU-protected data structure,

 * the fourth argument is the number of lazy callbacks queued, and the

 * fifth argument is the total number of callbacks queued.

 */

TRACE_EVENT_RCU(rcu_kfree_callback,

TRACE_EVENT_RCU(rcu_kvfree_callback,



	TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset,

		 long qlen),
@@ -596,12 +596,12 @@ TRACE_EVENT_RCU(rcu_invoke_callback, 


/*

 * Tracepoint for the invocation of a single RCU callback of the special

 * kfree() form.  The first argument is the RCU flavor, the second

 * kvfree() form.  The first argument is the RCU flavor, the second

 * argument is a pointer to the RCU callback, and the third argument

 * is the offset of the callback within the enclosing RCU-protected

 * data structure.

 */

TRACE_EVENT_RCU(rcu_invoke_kfree_callback,

TRACE_EVENT_RCU(rcu_invoke_kvfree_callback,



	TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset),

kernel/rcu/tiny.c

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ static inline bool rcu_reclaim_tiny(struct rcu_head *head) 
	unsigned long offset = (unsigned long)head->func;



	rcu_lock_acquire(&rcu_callback_map);

	if (__is_kfree_rcu_offset(offset)) {

		trace_rcu_invoke_kfree_callback("", head, offset);

	if (__is_kvfree_rcu_offset(offset)) {

		trace_rcu_invoke_kvfree_callback("", head, offset);

		kvfree((void *)head - offset);

		rcu_lock_release(&rcu_callback_map);

		return true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE