From patchwork Wed Oct 16 09:54:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 11192795 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 190D01390 for ; Wed, 16 Oct 2019 09:54:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D9CA62168B for ; Wed, 16 Oct 2019 09:54:53 +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="hh2BQR9H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9CA62168B 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 6FD818E0008; Wed, 16 Oct 2019 05:54:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6372E8E0001; Wed, 16 Oct 2019 05:54:52 -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 39F8F8E0008; Wed, 16 Oct 2019 05:54:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0211.hostedemail.com [216.40.44.211]) by kanga.kvack.org (Postfix) with ESMTP id 0B4968E0001 for ; Wed, 16 Oct 2019 05:54:52 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 95737183D71F1 for ; Wed, 16 Oct 2019 09:54:51 +0000 (UTC) X-FDA: 76049188782.15.clam72_6491c71a9b03e X-Spam-Summary: 2,0,0,5d99db1b158e1053,d41d8cd98f00b204,urezki@gmail.com,:akpm@linux-foundation.org:dwagner@suse.de:bigeasy@linutronix.de:tglx@linutronix.de::linux-kernel@vger.kernel.org:peterz@infradead.org:urezki@gmail.com:hdanton@sina.com:mhocko@suse.com:willy@infradead.org:oleksiy.avramchenko@sonymobile.com:rostedt@goodmis.org,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2195:2199:2393:2559:2562:2693:2732:3138:3139:3140:3141:3142:3352:3865:3867:3868:3870:3871:3872:3874:4250:5007:6261:6653:6742:7514:8603:9413:10004:11026:11473:11658:11914:12043:12296:12297:12438:12517:12519:12555:12895:13069:13311:13357:13894:14096:14181:14384:14394:14687:14721:21080:21433:21444:21451:21627:21666:30054,0,RBL:209.85.167.67:@gmail.com:.lbl8.mailshell.net-62.18.175.100 66.100.201.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:24,LUA_SUMMAR Y:none X-HE-Tag: clam72_6491c71a9b03e X-Filterd-Recvd-Size: 4871 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Wed, 16 Oct 2019 09:54:51 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id r2so16896821lfn.8 for ; Wed, 16 Oct 2019 02:54:50 -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=8BWvlmXa5Itb4HNOlJ7mNfofmk+n7/jwhwr224X7wkA=; b=hh2BQR9H/TttXyKoEjHs8VBNq116FbnDFbRYWngV3I1sbmyuCJJ0vQH83n9YmJgHQS USutVgNbliEBrCahSr2saDHdP9vgSwJOLG8mjfs+fEW3aFx4aduW3klPJGYQsa2F3DnQ P2KzeoYK2UXDFk9PzwqjjggtmuIrxibVzQClvj8qnA9Q7L72eManT4pLUm2JFW/CvjgK eM87O72+RoLgxEDvHpa4Nn6Mxt33vFRsd/Fcc5ic0fnnZqgX5PNG/YQcBURfbDSMckxf xIDEtnk1d6jfkScKnA5gc/H63GJYsDi+B0OLWl+qIKqqsK7SFX+yLlCvDEeav2dSA1r4 c6Tg== 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=8BWvlmXa5Itb4HNOlJ7mNfofmk+n7/jwhwr224X7wkA=; b=lYTahVXKu3DGM/26X6s40I+UB0E6k0XyIER9KvkqlnuS3TDX4bdM2z6uWmQshGs4Cf CwB9iZG9wD9St0RxaDYOPP/Aen3S36ADLd1rLlVUlhjbbiu7ylH3KIx2dewfh0LloheF 7fwaye3KeiwVAbCPZl+zxvcCiGxJdDvzSWgXuDuVr2CQI8YH5CAg1YINxi5cm8Y4pDSi 3vos/EolgHV9XHr7Ttw+L2YKd0rry02HJGXQmSolGKQi77hFE8DHSiqLFo4kMlhil/9L z1gi8dLsra9i5cJ0qoc3Xqwd8oGmQjEeVtB0bCwkEuOGfA9HQjWy5etiIK7aLKn4JzwM 1E1A== X-Gm-Message-State: APjAAAX7Azr3ubvrXTmz7XR6EEBzToRjeoF/ee+L66dm2Fki1s07G8UN 3STTB4wFPilORYmBt8Xj3kQ= X-Google-Smtp-Source: APXvYqyHqhSJPrwVPXwEIlMetVVFuIqlUxsmBmpW3xM6pBv558tYFejHW/wi29csutcwzsGqsNpstg== X-Received: by 2002:ac2:4c38:: with SMTP id u24mr1294786lfq.45.1571219689589; Wed, 16 Oct 2019 02:54:49 -0700 (PDT) Received: from pc636.semobile.internal ([37.139.158.167]) by smtp.gmail.com with ESMTPSA id b2sm886452lfq.27.2019.10.16.02.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 02:54:48 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: Andrew Morton Cc: Daniel Wagner , Sebastian Andrzej Siewior , Thomas Gleixner , linux-mm@kvack.org, LKML , Peter Zijlstra , Uladzislau Rezki , Hillf Danton , Michal Hocko , Matthew Wilcox , Oleksiy Avramchenko , Steven Rostedt Subject: [PATCH v3 2/3] mm/vmalloc: respect passed gfp_mask when do preloading Date: Wed, 16 Oct 2019 11:54:37 +0200 Message-Id: <20191016095438.12391-2-urezki@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191016095438.12391-1-urezki@gmail.com> References: <20191016095438.12391-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: alloc_vmap_area() is given a gfp_mask for the page allocator. Let's respect that mask and consider it even in the case when doing regular CPU preloading, i.e. where a context can sleep. Signed-off-by: Uladzislau Rezki (Sony) Acked-by: Michal Hocko Signed-off-by: Uladzislau Rezki (Sony) Acked-by: Michal Hocko Signed-off-by: Andrew Morton --- mm/vmalloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index b7b443bfdd92..593bf554518d 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1064,9 +1064,9 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, return ERR_PTR(-EBUSY); might_sleep(); + gfp_mask = gfp_mask & GFP_RECLAIM_MASK; - va = kmem_cache_alloc_node(vmap_area_cachep, - gfp_mask & GFP_RECLAIM_MASK, node); + va = kmem_cache_alloc_node(vmap_area_cachep, gfp_mask, node); if (unlikely(!va)) return ERR_PTR(-ENOMEM); @@ -1074,7 +1074,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, * Only scan the relevant parts containing pointers to other objects * to avoid false negatives. */ - kmemleak_scan_area(&va->rb_node, SIZE_MAX, gfp_mask & GFP_RECLAIM_MASK); + kmemleak_scan_area(&va->rb_node, SIZE_MAX, gfp_mask); retry: /* @@ -1100,7 +1100,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, * 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_KERNEL, node); + pva = kmem_cache_alloc_node(vmap_area_cachep, gfp_mask, node); spin_lock(&vmap_area_lock);