From patchwork Fri Apr 2 20:22:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Uladzislau Rezki (Sony)" X-Patchwork-Id: 12181515 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 C5374C43461 for ; Fri, 2 Apr 2021 20:22:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7212561168 for ; Fri, 2 Apr 2021 20:22:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7212561168 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 76A1A6B009A; Fri, 2 Apr 2021 16:22:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 719376B009C; Fri, 2 Apr 2021 16:22:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 520FC6B009D; Fri, 2 Apr 2021 16:22:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0251.hostedemail.com [216.40.44.251]) by kanga.kvack.org (Postfix) with ESMTP id 2120C6B009A for ; Fri, 2 Apr 2021 16:22:53 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id DCB6D184B009D for ; Fri, 2 Apr 2021 20:22:52 +0000 (UTC) X-FDA: 77988550584.29.5968989 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by imf24.hostedemail.com (Postfix) with ESMTP id 87AC1A00038C for ; Fri, 2 Apr 2021 20:22:50 +0000 (UTC) Received: by mail-lf1-f48.google.com with SMTP id n138so9013190lfa.3 for ; Fri, 02 Apr 2021 13:22:52 -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=TPp5hmBkKmG7G/BogtZYwpF2ZqC9GPGqxLj7HZ4GHEc=; b=C5LIGAPLdvor1WU3eE6WVYmmUsYBKDJxINoQD4JGpkc5pgEUXZO8zpbfmDxXbQgrpk aRJ9N6H0/mxhg4FK+gOekMOPIsJA3a0DGVIJArzCRovJK3yEldVKMdxxCjRRCdE5TGCi 3YXGQn+SwKTpwL9I+KRk7ZaxuN606tBVFiHw5xhtS6LEL8lGMC+GyxH8zxqUaXfGuNZN 8NASV9Q36joo2U1elr4mXSH1K4OtNBn0kZ6irL3hbQswIn4F3/Z9sqUP3xInbQLBbwds BL+dyWDXH2DQrpMcLP081s2ugUadzRECjpcerWAagN/0AE6cCfBTboxRuknp91B5h512 8P0A== 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=TPp5hmBkKmG7G/BogtZYwpF2ZqC9GPGqxLj7HZ4GHEc=; b=THs4VGQ+TzLQwtgbzOi+sEv8s/NJW+UxgZQQZTynDpTuI/ADTjYuFs7Su2Wfodzwye ESgMpWKAbX6roWCRd8ADioLM5jYspC+9g1assdU6sEANxMgX0VEQd+C0OvAV1jaVWvzp QS7pr1j/XqIeiUwe3JUsg3WwvqBjcMOZIxsg7Bfz00UE2S6MtFgrdghBBbrm8uIXkdoM ULVthZC0zbCqNmRm5fDOnzX4mEksdVxzZ5naPMt/rgyOrP9qyRuT/Jv+HHCHvC20iMGP HpvzyOHqHEbA56Bx5m1OXRUOdE1/QF6sTx9hGNH1FvYRYV4zdifL+BeVJBuPCDfIb2J7 ud4A== X-Gm-Message-State: AOAM531EPVTDuIi2hbGPN0AwibTDfjaM06OQC01Mu156zkvDH5GlYJb8 wlFraMM0bpcKf9jPYS0qNig= X-Google-Smtp-Source: ABdhPJycCgbuewUDCT7jlGaEzljaZ4quXQcfLi67z6o6c8OPyv/4jUaybvTf8xE5nllI5qjrGP6i/w== X-Received: by 2002:a05:6512:314d:: with SMTP id s13mr9436973lfi.95.1617394971196; Fri, 02 Apr 2021 13:22:51 -0700 (PDT) Received: from pc638.lan (h5ef52e3d.seluork.dyn.perspektivbredband.net. [94.245.46.61]) by smtp.gmail.com with ESMTPSA id f11sm952514lfr.119.2021.04.02.13.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 13:22:50 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: Andrew Morton Cc: linux-mm@kvack.org, LKML , Uladzislau Rezki , Hillf Danton , Michal Hocko , Matthew Wilcox , Oleksiy Avramchenko , Steven Rostedt Subject: [PATCH-next 4/5] mm/vmalloc: refactor the preloading loagic Date: Fri, 2 Apr 2021 22:22:36 +0200 Message-Id: <20210402202237.20334-4-urezki@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210402202237.20334-1-urezki@gmail.com> References: <20210402202237.20334-1-urezki@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 87AC1A00038C X-Stat-Signature: swhiodfjo7c8hjsw8ebfcaif74xxqrd1 Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf24; identity=mailfrom; envelope-from=""; helo=mail-lf1-f48.google.com; client-ip=209.85.167.48 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617394970-588115 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: Instead of keeping open-coded style, move the code related to preloading into a separate function. Therefore introduce the preload_this_cpu_lock() routine that prelaods a current CPU with one extra vmap_area object. There is no functional change as a result of this patch. Signed-off-by: Uladzislau Rezki (Sony) --- mm/vmalloc.c | 60 +++++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 8b564f91a610..093c7e034ca2 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1430,6 +1430,29 @@ static void free_vmap_area(struct vmap_area *va) spin_unlock(&free_vmap_area_lock); } +static inline void +preload_this_cpu_lock(spinlock_t *lock, gfp_t gfp_mask, int node) +{ + struct vmap_area *va = NULL; + + /* + * Preload this CPU with one extra vmap_area object. It is used + * when fit type of free area is NE_FIT_TYPE. It guarantees that + * a CPU that does an allocation is preloaded. + * + * We do it in non-atomic context, thus it allows us to use more + * permissive allocation masks to be more stable under low memory + * condition and high memory pressure. + */ + if (!this_cpu_read(ne_fit_preload_node)) + va = kmem_cache_alloc_node(vmap_area_cachep, gfp_mask, node); + + spin_lock(lock); + + if (va && __this_cpu_cmpxchg(ne_fit_preload_node, NULL, va)) + kmem_cache_free(vmap_area_cachep, va); +} + /* * Allocate a region of KVA of the specified size and alignment, within the * vstart and vend. @@ -1439,7 +1462,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, unsigned long vstart, unsigned long vend, int node, gfp_t gfp_mask) { - struct vmap_area *va, *pva; + struct vmap_area *va; unsigned long addr; int purged = 0; int ret; @@ -1465,43 +1488,14 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, kmemleak_scan_area(&va->rb_node, SIZE_MAX, gfp_mask); retry: - /* - * Preload this CPU with one extra vmap_area object. It is used - * when fit type of free area is NE_FIT_TYPE. Please note, it - * does not guarantee that an allocation occurs on a CPU that - * is preloaded, instead we minimize the case when it is not. - * It can happen because of cpu migration, because there is a - * race until the below spinlock is taken. - * - * The preload is done in non-atomic context, thus it allows us - * to use more permissive allocation masks to be more stable under - * low memory condition and high memory pressure. In rare case, - * if not preloaded, GFP_NOWAIT is used. - * - * Set "pva" to NULL here, because of "retry" path. - */ - pva = NULL; - - if (!this_cpu_read(ne_fit_preload_node)) - /* - * Even if it fails we do not really care about that. - * Just proceed as it is. If needed "overflow" path - * will refill the cache we allocate from. - */ - pva = kmem_cache_alloc_node(vmap_area_cachep, gfp_mask, node); - - spin_lock(&free_vmap_area_lock); - - if (pva && __this_cpu_cmpxchg(ne_fit_preload_node, NULL, pva)) - kmem_cache_free(vmap_area_cachep, pva); + preload_this_cpu_lock(&free_vmap_area_lock, gfp_mask, node); + addr = __alloc_vmap_area(size, align, vstart, vend); + spin_unlock(&free_vmap_area_lock); /* * If an allocation fails, the "vend" address is * returned. Therefore trigger the overflow path. */ - addr = __alloc_vmap_area(size, align, vstart, vend); - spin_unlock(&free_vmap_area_lock); - if (unlikely(addr == vend)) goto overflow;