From patchwork Mon May 25 21:47:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 11569475 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 8B5BF913 for ; Mon, 25 May 2020 21:48:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4E7C3206C3 for ; Mon, 25 May 2020 21:48:24 +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="MiYel4cr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E7C3206C3 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 38D2780066; Mon, 25 May 2020 17:48:19 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2275880061; Mon, 25 May 2020 17:48:19 -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 0C74D80066; Mon, 25 May 2020 17:48:19 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0204.hostedemail.com [216.40.44.204]) by kanga.kvack.org (Postfix) with ESMTP id D6D2280061 for ; Mon, 25 May 2020 17:48:18 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 909812C32 for ; Mon, 25 May 2020 21:48:18 +0000 (UTC) X-FDA: 76856580276.11.form98_2b6bb832ecd20 X-Spam-Summary: 2,0,0,909084c594c08379,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:1542:1711:1730:1747:1777:1792:2194:2196:2199:2200:2393:2559:2562:2693:3138:3139:3140:3141:3142:3353:3865:3867:3868:3870:3871:3872:3874:4321:4385:4390:4395:5007:6117:6119:6261:6653:7514:9413:9592:10004:11026:11473:11658:11914:12043:12291:12296:12297:12438:12517:12519:12555:12683:12895:13255:13894:14096:14110:14181:14394:14687:14721:21080:21433:21444:21451:21627:21666:21740:21990:30054:30070,0,RBL:209.85.208.195:@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:23,LUA_SUMMARY:none X-HE-Tag: form98_2b6bb832ecd20 X-Filterd-Recvd-Size: 5246 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Mon, 25 May 2020 21:48:18 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id l15so21806164lje.9 for ; Mon, 25 May 2020 14:48:18 -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=myZbGzUvCLDF53laDPj5mc/dKuerQ91BFIMGTCX8KTY=; b=MiYel4crknK5dXCl5GHpc6bBf3Hel4UK5iJXpbbn3FNgSjsxMB1Mq5QBrlw9Dm0oKt p5pJ/J6P3q28DJM/MHq/cL40IA1JX42PUYLbPaUa4l16QNFz/R9GXie4lY5P31QrVdyc U7qEY+zsEkwxvJvZKg2h3Qk5wwTiIyseRKQ+fyscqBk0nerwsTHcRG0rzs/XaAdw9cFE fcQTGKZLjzeowQ1ntpUs8Lk3cv02BJw9afWKbJxYVpCQ5OJ6i/SxwVWLDBF/0bxRFY1Z Hb+Ylu/piIEoG9HTZX1ceVG/SFPuFWQOFTYL3RG/AHpMqgDV/6b/YFyIu+6fowY1+TJV gBuQ== 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=myZbGzUvCLDF53laDPj5mc/dKuerQ91BFIMGTCX8KTY=; b=XUdjNSFfMmQ4qElIgBpe0HgJ7pF8MBQW/TGXBnadqWnd3q/MobSoFdN46f5Q8sK4D4 lyVFnFRx1or67zTsJJ4xiRV7rx1m2j2d7SaYsy0rmfQcXy2dZU0hSTVgfG0+XlC+6IZD T/M741Db8cE+tgmpJPXtH9HujghRjzcTSuoEjiLQBBotQYn5Yvc0c8eaezU4qSagzhDN V6sVkM4Pvu84E9TDvvmDGMcKYBVoM1sGFWhpnFOW9Na+0AO7WdnA+8KT1dsNjUvQNns8 GZaJo+W0PQGbyrMeOVrrImw1vAo04eOqrmTA/cZJxP99CUir5vsn/LbLJedmFwGRH84D jpIw== X-Gm-Message-State: AOAM532gVrCzITbmC4cpUl+IhzJ1ErJC8bk4eqhL5drqYFEnZ7YjdQ7L iwZWSRQkSYnHmWOH/1fAxT4= X-Google-Smtp-Source: ABdhPJwSIz48TxBYILx85UNtNxrSRT7oQBbn/6kX4IFkWPacY0Y7bMHszbNeQvbgXRgnvoSyEX311Q== X-Received: by 2002:a2e:7d19:: with SMTP id y25mr14028058ljc.255.1590443297064; Mon, 25 May 2020 14:48:17 -0700 (PDT) Received: from pc638.lan (h5ef52e31.seluork.dyn.perspektivbredband.net. [94.245.46.49]) by smtp.gmail.com with ESMTPSA id a6sm2280044lji.29.2020.05.25.14.48.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2020 14:48:16 -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 v2 06/16] rcu/tree: Move kfree_rcu_cpu locking/unlocking to separate functions Date: Mon, 25 May 2020 23:47:50 +0200 Message-Id: <20200525214800.93072-7-urezki@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200525214800.93072-1-urezki@gmail.com> References: <20200525214800.93072-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: Introduce helpers to lock and unlock per-cpu "kfree_rcu_cpu" structures. That will make kfree_call_rcu() more readable and prevent programming errors. Reviewed-by: Joel Fernandes (Google) Signed-off-by: Uladzislau Rezki (Sony) --- kernel/rcu/tree.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 6501fbcae3c7..c1f4b740cf14 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2901,6 +2901,27 @@ debug_rcu_bhead_unqueue(struct kfree_rcu_bulk_data *bhead) #endif } +static inline struct kfree_rcu_cpu * +krc_this_cpu_lock(unsigned long *flags) +{ + struct kfree_rcu_cpu *krcp; + + local_irq_save(*flags); // For safely calling this_cpu_ptr(). + krcp = this_cpu_ptr(&krc); + if (likely(krcp->initialized)) + raw_spin_lock(&krcp->lock); + + return krcp; +} + +static inline void +krc_this_cpu_unlock(struct kfree_rcu_cpu *krcp, unsigned long flags) +{ + if (likely(krcp->initialized)) + raw_spin_unlock(&krcp->lock); + local_irq_restore(flags); +} + /* * This function is invoked in workqueue context after a grace period. * It frees all the objects queued on ->bhead_free or ->head_free. @@ -3126,11 +3147,7 @@ void kfree_call_rcu(struct rcu_head *head, rcu_callback_t func) struct kfree_rcu_cpu *krcp; void *ptr; - local_irq_save(flags); // For safely calling this_cpu_ptr(). - krcp = this_cpu_ptr(&krc); - if (krcp->initialized) - raw_spin_lock(&krcp->lock); - + krcp = krc_this_cpu_lock(&flags); ptr = (void *)head - (unsigned long)func; // Queue the object but don't yet schedule the batch. @@ -3161,9 +3178,7 @@ void kfree_call_rcu(struct rcu_head *head, rcu_callback_t func) } unlock_return: - if (krcp->initialized) - raw_spin_unlock(&krcp->lock); - local_irq_restore(flags); + krc_this_cpu_unlock(krcp, flags); } EXPORT_SYMBOL_GPL(kfree_call_rcu);