From patchwork Wed Jul 15 18:35:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 11666065 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 CE49313B4 for ; Wed, 15 Jul 2020 18:35:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9875420672 for ; Wed, 15 Jul 2020 18:35:49 +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="IHh+UXQJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9875420672 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 8D5B18D0003; Wed, 15 Jul 2020 14:35:48 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 85E736B000C; Wed, 15 Jul 2020 14:35:48 -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 701908D0003; Wed, 15 Jul 2020 14:35:48 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0177.hostedemail.com [216.40.44.177]) by kanga.kvack.org (Postfix) with ESMTP id 5EC376B0008 for ; Wed, 15 Jul 2020 14:35:48 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 06C6F1F06 for ; Wed, 15 Jul 2020 18:35:48 +0000 (UTC) X-FDA: 77041163976.08.nerve42_4c0451f26efb Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id D24721819E764 for ; Wed, 15 Jul 2020 18:35:47 +0000 (UTC) X-Spam-Summary: 1,0,0,273b60cbf398fe20,d41d8cd98f00b204,urezki@gmail.com,,RULES_HIT:41:69:355:379:541:800:960:966:973:988:989:1260:1311:1314:1345:1437:1515:1535:1543:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:2693:2731:2736:2901:2907:3138:3139:3140:3141:3142:3355:3865:3866:3867:3868:3870:3871:3872:3874:4117:4385:5007:6117:6119:6261:6653:7514:8660:9413:9592:10004:11026:11473:11658:11914:12043:12048:12296:12297:12438:12517:12519:12555:12683:12895:13141:13148:13161:13229:13230:13894:14181:14394:14687:14721:21080:21444:21451:21627:21666:21740:21789:21939:21990:30041:30054:30070,0,RBL:209.85.208.195:@gmail.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yg5agbyk5r4hymza56djufucunbycxpo5zdcgfwd3xnq9j6fczf7cad4ru9bn.93c1mdzxg3dzydiucm449htn4q6pc9wi3h89x4cu3667crxs4p1afy8xcnb4c9h.n-lbl8.mailshell.net-223.238.255.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:15,LUA_SUMMARY:none X-HE-Tag: nerve42_4c0451f26efb X-Filterd-Recvd-Size: 6861 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Wed, 15 Jul 2020 18:35:46 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id j11so3737660ljo.7 for ; Wed, 15 Jul 2020 11:35:46 -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:mime-version :content-transfer-encoding; bh=a9PukKTmvcEtFB/zd8C81i1uDCtVpQUHLXdMmIW0atQ=; b=IHh+UXQJ7ALwam/o+gFoelFuyxHtkXg6aIc41790oeW8Jop7ibxd/8Yn1QicWPXRp4 cge9/FbC6c/CqS2j2tYZ4Dzb2/Od1HS0HggYxGxUEmVXQeHCEf3NY53e1FVOHy9HVXl1 vRmYPi/QHrxmXmBCGkh/HIrBQo1zlDqLJYkwliuDSZzrPHsCIK1FUynrX2ZbtGf4Kj1f 4YDBoG5clgz7f+4Sdlx3IGclHWLrWLfYno/PMYhT/jnWP4AqmtV3/KaE3idd8Bp56PAl djmoDFM13a8i/ckLXXWGKffm/1FkWWyVLyWx/hZkhiVtmNkt5yHhidfS4Ok1Fdg26Yd/ 68HQ== 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:mime-version :content-transfer-encoding; bh=a9PukKTmvcEtFB/zd8C81i1uDCtVpQUHLXdMmIW0atQ=; b=WhA6WsJpL6W4UFeub+8nR3F1wWR2omWl5w4stfrQMkXDs4hr7xPpHASLq8TL6f5BhI 229xPmc1I5O08PoCS2GiDpKMfcGeyKwb9BTUyYiXBfhC6Db75rxee1XnIAdnBduYMPh2 i8+Zwo7nOvcBdSbiQvLBLMe7oRMpp7VSS+EsbjmwfQhv2y7vX1i8ldxMiyIAB3CIaBx/ n33x3APwQOkR5o1DAnAzF0H5iXo2Ktm9FA1upxm5x4DDDUbzKzqhFhYi7UlHyxZfNYVQ 0cY/A52OvRO8G0MtpngXyXOr26ao8tzfOzEN5d4Yqlmcgu17RLmWpvJ7kuU81GrTahW1 O9jQ== X-Gm-Message-State: AOAM531NJrXShEnQdI0l/9rFaqzc/QquSV8B2YLFxXc0oo8LV+bKMhmC VgxHLkeDCfviTWgxA9zetBo= X-Google-Smtp-Source: ABdhPJwGU5kzEPsSphSpBxfCet59z1f+F8QI5AGjewge8SCR03L2rLj/ScWSD4l0X7MjA1+f8rBqUw== X-Received: by 2002:a2e:808a:: with SMTP id i10mr198256ljg.400.1594838145336; Wed, 15 Jul 2020 11:35:45 -0700 (PDT) Received: from pc638.lan (h5ef52e31.seluork.dyn.perspektivbredband.net. [94.245.46.49]) by smtp.gmail.com with ESMTPSA id u27sm586992ljd.79.2020.07.15.11.35.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 11:35:44 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: LKML , RCU , linux-mm@kvack.org, "Paul E . McKenney" Cc: Andrew Morton , "Theodore Y . Ts'o" , Matthew Wilcox , Joel Fernandes , Sebastian Andrzej Siewior , Uladzislau Rezki , Oleksiy Avramchenko Subject: [PATCH 1/1] rcu/tree: Drop the lock before entering to page allocator Date: Wed, 15 Jul 2020 20:35:37 +0200 Message-Id: <20200715183537.4010-1-urezki@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: D24721819E764 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: If the kernel is built with CONFIG_PROVE_RAW_LOCK_NESTING option, the lockedp will complain about violation of the nesting rules. It does the raw_spinlock vs. spinlock nesting checks. Internally the kfree_rcu() uses raw_spinlock_t whereas the page allocator internally deals with spinlock_t to access to its zones. In order to prevent such vialation that is in question we can drop the internal raw_spinlock_t before entering to the page allocaor. Signed-off-by: Uladzislau Rezki (Sony) --- kernel/rcu/tree.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 21c2fa5bd8c3..7469bd1e5c2c 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -3278,21 +3278,22 @@ static void kfree_rcu_monitor(struct work_struct *work) } static inline bool -kvfree_call_rcu_add_ptr_to_bulk(struct kfree_rcu_cpu *krcp, void *ptr) +add_ptr_to_bulk_krc_lock(struct kfree_rcu_cpu **krcp, + unsigned long *flags, void *ptr) { struct kvfree_rcu_bulk_data *bnode; int idx; - if (unlikely(!krcp->initialized)) + *krcp = krc_this_cpu_lock(flags); + if (unlikely(!(*krcp)->initialized)) return false; - lockdep_assert_held(&krcp->lock); idx = !!is_vmalloc_addr(ptr); /* Check if a new block is required. */ - if (!krcp->bkvhead[idx] || - krcp->bkvhead[idx]->nr_records == KVFREE_BULK_MAX_ENTR) { - bnode = get_cached_bnode(krcp); + if (!(*krcp)->bkvhead[idx] || + (*krcp)->bkvhead[idx]->nr_records == KVFREE_BULK_MAX_ENTR) { + bnode = get_cached_bnode(*krcp); if (!bnode) { /* * To keep this path working on raw non-preemptible @@ -3306,6 +3307,9 @@ kvfree_call_rcu_add_ptr_to_bulk(struct kfree_rcu_cpu *krcp, void *ptr) if (IS_ENABLED(CONFIG_PREEMPT_RT)) return false; + preempt_disable(); + krc_this_cpu_unlock(*krcp, *flags); + /* * NOTE: For one argument of kvfree_rcu() we can * drop the lock and get the page in sleepable @@ -3315,6 +3319,9 @@ kvfree_call_rcu_add_ptr_to_bulk(struct kfree_rcu_cpu *krcp, void *ptr) */ bnode = (struct kvfree_rcu_bulk_data *) __get_free_page(GFP_NOWAIT | __GFP_NOWARN); + + *krcp = krc_this_cpu_lock(flags); + preempt_enable(); } /* Switch to emergency path. */ @@ -3323,15 +3330,15 @@ kvfree_call_rcu_add_ptr_to_bulk(struct kfree_rcu_cpu *krcp, void *ptr) /* Initialize the new block. */ bnode->nr_records = 0; - bnode->next = krcp->bkvhead[idx]; + bnode->next = (*krcp)->bkvhead[idx]; /* Attach it to the head. */ - krcp->bkvhead[idx] = bnode; + (*krcp)->bkvhead[idx] = bnode; } /* Finally insert. */ - krcp->bkvhead[idx]->records - [krcp->bkvhead[idx]->nr_records++] = ptr; + (*krcp)->bkvhead[idx]->records + [(*krcp)->bkvhead[idx]->nr_records++] = ptr; return true; } @@ -3369,24 +3376,19 @@ void kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func) ptr = (unsigned long *) func; } - krcp = krc_this_cpu_lock(&flags); - // Queue the object but don't yet schedule the batch. if (debug_rcu_head_queue(ptr)) { // Probable double kfree_rcu(), just leak. WARN_ONCE(1, "%s(): Double-freed call. rcu_head %p\n", __func__, head); - - // Mark as success and leave. - success = true; - goto unlock_return; + return; } /* * Under high memory pressure GFP_NOWAIT can fail, * in that case the emergency path is maintained. */ - success = kvfree_call_rcu_add_ptr_to_bulk(krcp, ptr); + success = add_ptr_to_bulk_krc_lock(&krcp, &flags, ptr); if (!success) { if (head == NULL) // Inline if kvfree_rcu(one_arg) call.