From patchwork Mon Mar 30 02:32:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 11464469 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 29CE813A4 for ; Mon, 30 Mar 2020 02:33:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D41AB20842 for ; Mon, 30 Mar 2020 02:33:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="x1VGsvdO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D41AB20842 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BB1356B0037; Sun, 29 Mar 2020 22:33:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B124F6B006C; Sun, 29 Mar 2020 22:33:35 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B73B6B006E; Sun, 29 Mar 2020 22:33:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0080.hostedemail.com [216.40.44.80]) by kanga.kvack.org (Postfix) with ESMTP id 83DA16B0037 for ; Sun, 29 Mar 2020 22:33:35 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 617FF180AD817 for ; Mon, 30 Mar 2020 02:33:35 +0000 (UTC) X-FDA: 76650457590.12.wound85_598361dcd9d51 X-Spam-Summary: 2,0,0,26a709705d8e8b66,d41d8cd98f00b204,joel@joelfernandes.org,,RULES_HIT:41:355:379:541:800:960:965:966:973:988:989:1260:1311:1314:1345:1359:1437:1515:1535:1543:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:3138:3139:3140:3141:3142:3354:3865:3866:3867:3868:3871:3872:3874:4117:4250:4321:4385:4390:4395:4605:5007:6119:6261:6653:6742:7514:7576:7875:10004:11026:11473:11658:11914:12043:12114:12296:12297:12438:12517:12519:12555:12895:13894:13972:14096:14181:14394:14721:21080:21212:21444:21451:21627:21740:21772:21987:21990:30034:30054:30070:30076,0,RBL:209.85.160.193:@joelfernandes.org:.lbl8.mailshell.net-62.2.0.100 66.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:26,LUA_SUMMARY:none X-HE-Tag: wound85_598361dcd9d51 X-Filterd-Recvd-Size: 6906 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Mon, 30 Mar 2020 02:33:34 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id a5so13897766qtw.10 for ; Sun, 29 Mar 2020 19:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Wx0JY2YKiW3y6xXQtIfMDOCqiN7fPBTCk6pvf651C60=; b=x1VGsvdOgbW/pXh3K2fqEFIrtX7CGT8Kj9GkfUuhJ8X66LsZN584UWKXUs/dyaR6Uy rskvRF/ZZBYw63xgUm1Ivc2mBaaKNEoUxVmZK6nYp83mdBOhL3z+bR5+bMB7SLBVqF2H 5bdDD8rjYW1c5sAQfJh2fVXftxZB5W0S4KVZM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Wx0JY2YKiW3y6xXQtIfMDOCqiN7fPBTCk6pvf651C60=; b=tH20nAsQwjzjuWMyKt+bGgNPLP4IDeWAyM2yobFQ1ybn2CvE69wd56aCdcRRI0GQ/a dcuwts3VaTsub66+gck6gbJUNEJZ1sVI4OwMM6tIxkZPjv+m0xLYwdFDNAYvi/T1yTAi TiXO9Wxbmf5vMGHi/lFdIpir4JdOvZBobAVmvSOTEbGVzL1PCymf3n14MA2gpFPR3jME PbJcVJLkw2eBs+c2doe89YgGjJZ9n0LpXej1dHkzCQPAFIiT8m00ytnQ9yMrjemMOmkX N7i9yI52ZhOytIFk6fIsLU914Z45wGZKIoN5ziIH/iGRr935KgC8+Ua2iGvB9yP9DS/p 867Q== X-Gm-Message-State: ANhLgQ0mgonm3PClJEteSLJr0bo2/zL9qamqY39lUJOa4ANklfBud2SS X2OqYNiPznLFcQEzRAgp8NSbfQ== X-Google-Smtp-Source: ADFU+vtq1MY/K8kiAE34+qHLDxZNEQyC7+n4jsYMeFFHn7w7o9ddSCQKGt3nomzKdenQfVtzBbc36g== X-Received: by 2002:ac8:6f46:: with SMTP id n6mr9692172qtv.119.1585535614134; Sun, 29 Mar 2020 19:33:34 -0700 (PDT) Received: from joelaf.cam.corp.google.com ([2620:15c:6:12:9c46:e0da:efbf:69cc]) by smtp.gmail.com with ESMTPSA id q15sm10030625qtj.83.2020.03.29.19.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 19:33:33 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Uladzislau Rezki (Sony)" , Joel Fernandes , Andrew Morton , Ingo Molnar , Josh Triplett , Lai Jiangshan , linux-mm@kvack.org, Mathieu Desnoyers , "Paul E. McKenney" , "Rafael J. Wysocki" , rcu@vger.kernel.org, Steven Rostedt Subject: [PATCH 03/18] rcu: Rename rcu_invoke_kfree_callback/rcu_kfree_callback Date: Sun, 29 Mar 2020 22:32:33 -0400 Message-Id: <20200330023248.164994-4-joel@joelfernandes.org> X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d-goog In-Reply-To: <20200330023248.164994-1-joel@joelfernandes.org> References: <20200330023248.164994-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Uladzislau Rezki (Sony)" 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. Signed-off-by: Uladzislau Rezki (Sony) Reviewed-by: Joel Fernandes (Google) Signed-off-by: Joel Fernandes (Google) --- 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 f9a7811148e2a..0ee93d0b1daa8 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 4b99f7b88beec..3dd8e6e207b09 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 2d10c50621c38..88b744ce896c0 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2744,7 +2744,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 @@ -2935,7 +2935,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);