On Sun, Mar 15, 2020 at 07:18:37PM +0100, Uladzislau Rezki (Sony) wrote:
> Rename rcu_invoke_kfree_callback to rcu_invoke_kvfree_callback.
> Do the same with second trace event, that is rcu_kfree_callback,
> it becomes rcu_kvfree_callback. The reason is to be aligned with
> kvfree notation.
Reviewed-by: Joel Fernandes (Google) <joel@xxxxxxxxxxxxxxxxx>
thanks,
- Joel
>
> Signed-off-by: Uladzislau Rezki (Sony) <urezki@xxxxxxxxx>
> ---
> include/trace/events/rcu.h | 8 ++++----
> kernel/rcu/tiny.c | 2 +-
> kernel/rcu/tree.c | 4 ++--
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
> index f9a7811148e2..0ee93d0b1daa 100644
> --- a/include/trace/events/rcu.h
> +++ b/include/trace/events/rcu.h
> @@ -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),
>
> diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
> index 4b99f7b88bee..3dd8e6e207b0 100644
> --- a/kernel/rcu/tiny.c
> +++ b/kernel/rcu/tiny.c
> @@ -86,7 +86,7 @@ static inline bool rcu_reclaim_tiny(struct rcu_head *head)
>
> rcu_lock_acquire(&rcu_callback_map);
> if (__is_kfree_rcu_offset(offset)) {
> - trace_rcu_invoke_kfree_callback("", head, offset);
> + trace_rcu_invoke_kvfree_callback("", head, offset);
> kvfree((void *)head - offset);
> rcu_lock_release(&rcu_callback_map);
> return true;
> diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
> index 1c0a73616872..eef75cd210fd 100644
> --- a/kernel/rcu/tree.c
> +++ b/kernel/rcu/tree.c
> @@ -2720,7 +2720,7 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func)
> // If no-CBs CPU gets here, rcu_nocb_try_bypass() acquired ->nocb_lock.
> rcu_segcblist_enqueue(&rdp->cblist, head);
> if (__is_kfree_rcu_offset((unsigned long)func))
> - trace_rcu_kfree_callback(rcu_state.name, head,
> + trace_rcu_kvfree_callback(rcu_state.name, head,
> (unsigned long)func,
> rcu_segcblist_n_cbs(&rdp->cblist));
> else
> @@ -2909,7 +2909,7 @@ static void kfree_rcu_work(struct work_struct *work)
> next = head->next;
> debug_rcu_head_unqueue(head);
> rcu_lock_acquire(&rcu_callback_map);
> - trace_rcu_invoke_kfree_callback(rcu_state.name, head, offset);
> + trace_rcu_invoke_kvfree_callback(rcu_state.name, head, offset);
>
> if (!WARN_ON_ONCE(!__is_kfree_rcu_offset(offset)))
> kvfree((void *)head - offset);
> --
> 2.20.1
>
