From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 427FFC8300A for ; Tue, 28 Apr 2020 21:00:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EC48320775 for ; Tue, 28 Apr 2020 21:00:00 +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="s5+emd78" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC48320775 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 0FE568E0013; Tue, 28 Apr 2020 16:59:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 08A2A8E0007; Tue, 28 Apr 2020 16:59:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF8EB8E0013; Tue, 28 Apr 2020 16:59:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0025.hostedemail.com [216.40.44.25]) by kanga.kvack.org (Postfix) with ESMTP id B3B188E0007 for ; Tue, 28 Apr 2020 16:59:47 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 78B1952CC for ; Tue, 28 Apr 2020 20:59:47 +0000 (UTC) X-FDA: 76758480414.15.rifle26_5575b1d259625 X-HE-Tag: rifle26_5575b1d259625 X-Filterd-Recvd-Size: 6094 Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Tue, 28 Apr 2020 20:59:47 +0000 (UTC) Received: by mail-lj1-f196.google.com with SMTP id u6so221558ljl.6 for ; Tue, 28 Apr 2020 13:59:47 -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=NnJAtzNPQwOuN35prMWYFplXmKr7NAfEhiUXNxLclG8=; b=s5+emd78kekw/TXnvyA/bAOGc0SGZJAVB/4WGiYByfbpRI2x2pn3OrAbtzIvYhDPjg Xn63HYYc1XoBn8Jw9nvyZZH6daZ4v6723VaraNGm/RUwC5omukWIHw46Zg1xWaUcGBNZ oWnGge8C2RJuhXkJKzxwv5ACwD18xJChSmTWAaQuteDz8wCucOZYeCqGzU+ew0ixZ70z +kd1806zFpfw7lsZtANv/4OyHov/Wf/l+TUIGtjCkSIFKvQqB6vbiM8TlUb6X74bPQ1U WNupVjZ7RXbsPY5YXgkc8vGnbMdvna2JCxbwpfg75EvHH9ftEwW/NUBpxR8OWCNq0wzp //nQ== 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=NnJAtzNPQwOuN35prMWYFplXmKr7NAfEhiUXNxLclG8=; b=e0Bv/LYN4L+llbxh30JdgumGVDafmdTvi/wrOliMRJ98ILAdld1pbj2kqFmlxA0AgE ihbuh+5yaUD1AF9btLF+LLAoZhMThJI1x+5pVyPHTm++upNGYzs3VCpbc2/Q2nH9YNwC t80ppon0xM0Dby7o5YEP3q2WmXcVsTYQeIGq3W7ZDlYIHtXkw7jwver71HfR4TwxNP2j MBIRuhtCuXy1KjCTizDCr0tiH1zIs1HtJo0+LKToGXzoSZ6FGs9Zs/PG+e1CXV+54b4o T7OL1b5OpvwGmtz0mzL2CX+R+uZLxBBel25Kk0BOeHJhvbxLgH7xhnifdTtIgXla6cs1 crrA== X-Gm-Message-State: AGi0PuYQLbh+aKcO05ELBwC1IB3h+m6J/VLVXzPYSdhUR44mIq92+CxE NCH2f9ijffS1qYM9LVf8xrY= X-Google-Smtp-Source: APiQypIVpmrbm6mASEgB0xwC50tr3MbUHiwxa5AkAqbG8qXM4FhLBQercE0GBtCprGgQO16dDjqtNQ== X-Received: by 2002:a2e:5813:: with SMTP id m19mr10296851ljb.230.1588107585895; Tue, 28 Apr 2020 13:59:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 13:59:45 -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 14/24] rcu: Rename __is_kfree_rcu_offset() macro Date: Tue, 28 Apr 2020 22:58:53 +0200 Message-Id: <20200428205903.61704-15-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 Content-Transfer-Encoding: quoted-printable 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 __is_kfree_rcu_offset to __is_kvfree_rcu_offset. All RCU paths use kvfree() now instead of kfree(), thus rename it. Signed-off-by: Uladzislau Rezki (Sony) Reviewed-by: Joel Fernandes (Google) Signed-off-by: Joel Fernandes (Google) --- include/linux/rcupdate.h | 6 +++--- kernel/rcu/tiny.c | 2 +- kernel/rcu/tree.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 659cbfa7581a..1d25e6c23ebd 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -828,16 +828,16 @@ static inline notrace void rcu_read_unlock_sched_no= trace(void) =20 /* * 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) =20 /* * Helper macro for kfree_rcu() to prevent argument-expansion eyestrain. */ #define __kfree_rcu(head, offset) \ do { \ - BUILD_BUG_ON(!__is_kfree_rcu_offset(offset)); \ + BUILD_BUG_ON(!__is_kvfree_rcu_offset(offset)); \ kfree_call_rcu(head, (rcu_callback_t)(unsigned long)(offset)); \ } while (0) =20 diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c index 3dd8e6e207b0..aa897c3f2e92 100644 --- a/kernel/rcu/tiny.c +++ b/kernel/rcu/tiny.c @@ -85,7 +85,7 @@ static inline bool rcu_reclaim_tiny(struct rcu_head *he= ad) unsigned long offset =3D (unsigned long)head->func; =20 rcu_lock_acquire(&rcu_callback_map); - if (__is_kfree_rcu_offset(offset)) { + if (__is_kvfree_rcu_offset(offset)) { trace_rcu_invoke_kvfree_callback("", head, offset); kvfree((void *)head - offset); rcu_lock_release(&rcu_callback_map); diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 821de8149928..5f53368f2554 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2793,7 +2793,7 @@ __call_rcu(struct rcu_head *head, rcu_callback_t fu= nc) return; // Enqueued onto ->nocb_bypass, so just leave. // 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)) + if (__is_kvfree_rcu_offset((unsigned long)func)) trace_rcu_kvfree_callback(rcu_state.name, head, (unsigned long)func, rcu_segcblist_n_cbs(&rdp->cblist)); @@ -3079,7 +3079,7 @@ static void kfree_rcu_work(struct work_struct *work= ) rcu_lock_acquire(&rcu_callback_map); trace_rcu_invoke_kvfree_callback(rcu_state.name, head, offset); =20 - if (!WARN_ON_ONCE(!__is_kfree_rcu_offset(offset))) + if (!WARN_ON_ONCE(!__is_kvfree_rcu_offset(offset))) kvfree(ptr); =20 rcu_lock_release(&rcu_callback_map); --=20 2.20.1