From patchwork Tue Apr 28 20:58:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 11515579 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 1AA631805 for ; Tue, 28 Apr 2020 21:00:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CF63920775 for ; Tue, 28 Apr 2020 20:59:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kP02x+M/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF63920775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BD2C08E0012; Tue, 28 Apr 2020 16:59:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B83DB8E0007; Tue, 28 Apr 2020 16:59:46 -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 A990F8E0012; Tue, 28 Apr 2020 16:59:46 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0124.hostedemail.com [216.40.44.124]) by kanga.kvack.org (Postfix) with ESMTP id 7E8F98E0007 for ; Tue, 28 Apr 2020 16:59:46 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 4A629181AC9CB for ; Tue, 28 Apr 2020 20:59:46 +0000 (UTC) X-FDA: 76758480372.30.table07_554698de62b52 X-Spam-Summary: 2,0,0,6bc14bedb6a14386,d41d8cd98f00b204,urezki@gmail.com,,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:2907:3138:3139:3140:3141:3142:3355:3865:3866:3867:3868:3871:4118:4250:4321:4385:4390:4395:4605:5007:6119:6261:6653:7514:7875:9413:10004:11026:11473:11658:11914:12043:12114:12296:12297:12438:12517:12519:12555:12895:12986:13894:13972:14181:14394:14687:14721:21080:21212:21444:21451:21627:21666:21740:21772:21987:21990:30034:30054:30070:30076,0,RBL:209.85.208.194:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100,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:1,LUA_SUMMARY:none X-HE-Tag: table07_554698de62b52 X-Filterd-Recvd-Size: 7206 Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Tue, 28 Apr 2020 20:59:45 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id j3so210796ljg.8 for ; Tue, 28 Apr 2020 13:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3fJ5TMdCQebVw9K/lB+iz58HUNfGtYvyfl9ym54rQlM=; b=kP02x+M/0VMqRYPckvkQ5KHhPgnUW+5je7IT6oUunk7FfGrXaOci+I2mXWMDeyhOV+ KCxCW5+E3z8CDdniIsgjw+Ujmj6woV9U2vpX7RROlqU9D0LbWlJfs+R59GhHyvBsxF+I L47755O8cNu7u2Z/RS+DscHR3jg7t2kEgk2+xKx+IeZvovvdyET6gUnF4P4jSVhGfSNE v+b+D8rAkEN2F79mxfA/MHMqmjojM/AFxTmpVrpecE23T7JYANaUUoy818jZ50BZmWok ge+DSSWtnaH79mXjgMAsH8fLpNXfKya00SxR3Ef21hbEWNN5D2wi/rAOzhUnL8HEykqb fE/g== 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=3fJ5TMdCQebVw9K/lB+iz58HUNfGtYvyfl9ym54rQlM=; b=BYuNnjRVzDEtXoXxNHWSFls2p4fM9jUQHB3gzqmYT5ditVtwT89DLFx/X4GrVs/vAY nDy3xTnJvE7UzazU1rJrxktR+wGK2l7GzZ2MfQ9pL3zm1hWnaeiKW2PsyPd4FBK4qO5E RzxT+ctZCCRdV9grIW9PtgazUt0cvSyyvk7XZSyaQoPuu+Acl2Aj7AjYX9LUn0Y1KQij tHW4RNghuypujvmLk22Al2uj5W/Y2pEXKLT2e/RrQslXWhCtwaAHbXAet77OKVUtLHFN vqViuC8le8D8BlWRgvdpgnTVG1i+vzQYujkaYtx6dUZTGiPgV4l0djnELtSB3G+cI40g Edzw== X-Gm-Message-State: AGi0PuYqMiAse0xrvFN/jGv6pEMsFFGhKMhftiBll1NYPlkNt6O0dEif WHMsI240/VqPDvirz+PEs5Q= X-Google-Smtp-Source: APiQypLFK7pLf6v4TBbEd8q0pQMGD3hqv0CAeV1BrlcjzHb6iUbngmOpghi/7W8+zKnNzxEpk2jThw== X-Received: by 2002:a05:651c:2002:: with SMTP id s2mr17409411ljo.285.1588107584561; Tue, 28 Apr 2020 13:59:44 -0700 (PDT) Received: from pc638.lan (h5ef52e31.seluork.dyn.perspektivbredband.net. [94.245.46.49]) by smtp.gmail.com with ESMTPSA id z21sm295483ljh.42.2020.04.28.13.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 13:59:43 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: LKML , linux-mm@kvack.org Cc: Andrew Morton , "Paul E . McKenney" , "Theodore Y . Ts'o" , Matthew Wilcox , Joel Fernandes , RCU , Uladzislau Rezki , Oleksiy Avramchenko Subject: [PATCH 13/24] rcu: Rename rcu_invoke_kfree_callback/rcu_kfree_callback Date: Tue, 28 Apr 2020 22:58:52 +0200 Message-Id: <20200428205903.61704-14-urezki@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200428205903.61704-1-urezki@gmail.com> References: <20200428205903.61704-1-urezki@gmail.com> 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: Rename rcu_invoke_kfree_callback to rcu_invoke_kvfree_callback. Do the same with second trace event, the rcu_kfree_callback, 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 | 6 +++--- 3 files changed, 8 insertions(+), 8 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 7983926af95b..821de8149928 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2794,7 +2794,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 @@ -3048,7 +3048,7 @@ static void kfree_rcu_work(struct work_struct *work) rcu_lock_acquire(&rcu_callback_map); for (i = 0; i < bvhead->nr_records; i++) { - trace_rcu_invoke_kfree_callback(rcu_state.name, + trace_rcu_invoke_kvfree_callback(rcu_state.name, (struct rcu_head *) bvhead->records[i], 0); vfree(bvhead->records[i]); } @@ -3077,7 +3077,7 @@ static void kfree_rcu_work(struct work_struct *work) next = head->next; debug_rcu_head_unqueue((struct rcu_head *)ptr); 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(ptr);