From patchwork Fri Dec 16 23:46:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13075648 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B317FC4332F for ; Fri, 16 Dec 2022 23:47:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5D058E0002; Fri, 16 Dec 2022 18:47:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E0CD58E0001; Fri, 16 Dec 2022 18:47:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFC5B8E0002; Fri, 16 Dec 2022 18:47:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BE3AF8E0001 for ; Fri, 16 Dec 2022 18:47:45 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 776E441275 for ; Fri, 16 Dec 2022 23:47:45 +0000 (UTC) X-FDA: 80249809290.09.1B85C86 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by imf24.hostedemail.com (Postfix) with ESMTP id DD8AC180003 for ; Fri, 16 Dec 2022 23:47:42 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=RQ4om1iH; spf=pass (imf24.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671234463; a=rsa-sha256; cv=none; b=UrHDYmInu8A5tOzKBPut0u8Pb0HYBXnRcnDOjGQdjEjUaNgHS1/J8HZTK8chgmIfoJWdLI gv6hX3TA4ydOP5jDg1yLmbzmddFHSALNpOE8l4snQjWDiW2r6CrNGCzNsNektxHfWEVaUl r87dTKynmGy9JNFAQAIn4cvsPZeoqeM= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=RQ4om1iH; spf=pass (imf24.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671234463; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=YKCtj2GItVn5vwBA55ZwLozGerWg+NJMZ6sxZgOdjMw=; b=aHogBJ4c6EE065s3gHk5QLanWDUZUh2QIA5pChXIHzly/ZdfJtz0zuNs7uNI6qFnlnqMKE GDBMujc9rJFH3eTQnhPVFbDAcqXP33Y3YeqjS1p7UGoZJn9TkbOgDORh3tTx+0dHMVGQmz HyZh93tjz+ADeiGG630eguz5+iZWxrw= Received: by mail-wm1-f52.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso5127498wme.5 for ; Fri, 16 Dec 2022 15:47:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YKCtj2GItVn5vwBA55ZwLozGerWg+NJMZ6sxZgOdjMw=; b=RQ4om1iHJz9UV/iaR/HjPgpl0yqpoyE4rl9RgvBzTe5x3j+U4SQs0vuQtyXkhTWrOi rkqBsfT2eTos1yGxzvFmYJQ8hfhCKV0tQpd1qIEFAh5X87d9hEWgMqgTzLBgRpAnT5fa ltMAj1Zpvrik6wFz9/XIJ7mB3saNJMd/rH2W02JE2wdMZxKMoLQDt1AfQE8udqOZGiQs 0QDdgoi9KzMTPhMgr1+y+05ZhZrj8rkOJ3vGjcJ3x+sGChnUxtd8lEAJYsUCYa9BaZ1T Cg6BItPZnffnwPneQzdZR89P5dQHl851qzje1idgA5NzQAX3bGfaO8/ynradFA3dS9ob Ug3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YKCtj2GItVn5vwBA55ZwLozGerWg+NJMZ6sxZgOdjMw=; b=2Y1gKGwFaU5pjv5w4yqMpzLaIf+a6PfLH8ahEiAyqiAJiQhMmM3mjycZvSUbwYtath q19G/EMrBCA0N1btRQw/p+jXgjUXAFyv0RE2haubWBqanFLWcc5wcHbz+PMEz9qFGOyE RagZ0VuSDgSB2465gvfhzo6nYVyWjbjBrqVqAlcb/YdKkJY5Df0PkRdyGokunasb96uy LqzzdoPsn9yxdbN7jraJikoXTj1ILR5VxFOrFKOrs9krR0/Pl2QOVqsypFwqvPBpRWy7 zmvRVizWLUvXgx9kMFmbvC4nm1p+QZEZMz5He072rj4+bNus9VLF5FJoqsZNMbuRPiwl TvQw== X-Gm-Message-State: ANoB5pk8OcbwimXO8ZxuQekYuZAaHxK0K/6HJPtu2BWAW4AISiQB+Vc2 i6ob+eaa3EKWABEUeWdU4cp+6iDhYeQ= X-Google-Smtp-Source: AA0mqf7HMHTbeA3MM1mVyYjnJdlEPY0HsVdj4nFPmJwiDRjbfsC+3BE20Gmz5xwLvfwT33vdVwPi0w== X-Received: by 2002:a05:600c:35c4:b0:3cf:85f7:bbc4 with SMTP id r4-20020a05600c35c400b003cf85f7bbc4mr27799118wmq.2.1671234460998; Fri, 16 Dec 2022 15:47:40 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id j41-20020a05600c1c2900b003b4ff30e566sm23829333wms.3.2022.12.16.15.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 15:47:40 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , Uladzislau Rezki , Christoph Hellwig , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Nicholas Piggin , Baoquan He , Lorenzo Stoakes Subject: [PATCH] mm: vmalloc: correct use of __GFP_NOWARN mask in __vmalloc_area_node() Date: Fri, 16 Dec 2022 23:46:59 +0000 Message-Id: <20221216234659.493794-1-lstoakes@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: DD8AC180003 X-Rspamd-Server: rspam01 X-Stat-Signature: t357ae7etz9i31obtdgkuwm496d46z4k X-HE-Tag: 1671234462-100261 X-HE-Meta: U2FsdGVkX19sHKWkQqKkeNrm3+q/3cdUxNRhfl2mH0Fd2uB28YG/PrNbbOfQCf3AbBGotRzdB7S4HJlgfj0RkYMO7hBh+q/X9qvV/muhipH+a+qiOBlkXbw4wsKGCFEXdKwni7znfRnAPxfoEmwqaRfQEdx+Kxli2lwbOjdWvWe3G4AqNlx6YmAcokSC8XgKFDKmSYwj1qc6p/vU6Z4i0GPYD1mDMq5R212KNW0a0V8AXBMAqVzQ/+XkAE0Aa6o6OEQ9QWOlTWXYBenk5UjL+0e0k3TcWPlQ24MhhgxYJQaejIckk61wBCocIhfc1rK5JPWx0idAwbKo8Wv12lxQ7xwYt3r0kq6838beSfMMyjeW2CcBPCGbqVBRVFLcUn0hGda6xMP5XMRiiNl/68L5uwMFcf/ii3U9JKp0SOVDmOr4dWd1fRM6GviyONHs7pTZ4cgqwVlq+fO7mRdipRCPfqqhZfM3cXXTb+xi63EEPg5WiOT+j7iCH/I0Rnfc1COiX9q6FiPZq3aPGhlHvaiYbm36j5ZRwpP2wsyv1y67fm0uyzIjBkhYBTfEEsKXusd+ZiA9n0tgmDaF4o6iUgytS1nJikqNpUhx7mm1Rn8jd8kAZ3XKOLq5b/V3sNCsKSgVBe8bM4ZjUHyRaUkdHK5xjAXjsLUjbZhLP7OowzGttpie5/J7/CVitQRjESeqh5y8AHBxGT11trJ9ADl1za4VRVyIJKmJeGo0qoi0NFkqEzC92vtEKXbXByh3qTp2NVZW5ka4SDqGJyBTMQpgBSYGFPAJXSaMssrcRHGLb9xVni9RJnQ9m9F/tKxnC0awcdn94CDSWpxgtiHUXzbzlmT/n/6PhgQqCct8DlkpJ4hX+M9ZqhBdMAcNuvjoEbbl+3JTFFgAiKmc28awm9iYMW04TzfCiwZ416VhDQqHT/5bQNxbShHtxHuBJ3erV7Zn/h+R9QhiCLMVBsSYLp78Nu9 XmHDMnhq YGhrnXlyKqNvhguEysHw+dYmjpjXDYutj2CNIjvntgDakxefHCpm8+TOXnM7S3pl2XiMluyNiMnhdJvHcYTenEDyq1GKf+hPIoZu46qOpvo/11GU1O6dPFLRxbe34Rp8I2gqrcZpOZjEYncXKF8X+FTf6SZEprlBkbiHBPOhYfTLce2s= 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: This function invokes warn_alloc() with __GFP_NOWARN set which is a no-op. Set this flag _after_ this call so it is actually invoked, and additionally remove a duplicate application of __GFP_NOWARN afterwards. Signed-off-by: Lorenzo Stoakes --- mm/vmalloc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.38.1 diff --git a/mm/vmalloc.c b/mm/vmalloc.c index ca71de7c9d77..9e30f0b39203 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3031,7 +3031,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, int ret; array_size = (unsigned long)nr_small_pages * sizeof(struct page *); - gfp_mask |= __GFP_NOWARN; + if (!(gfp_mask & (GFP_DMA | GFP_DMA32))) gfp_mask |= __GFP_HIGHMEM; @@ -3051,10 +3051,12 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, return NULL; } + gfp_mask |= __GFP_NOWARN; + set_vm_area_page_order(area, page_shift - PAGE_SHIFT); page_order = vm_area_page_order(area); - area->nr_pages = vm_area_alloc_pages(gfp_mask | __GFP_NOWARN, + area->nr_pages = vm_area_alloc_pages(gfp_mask, node, page_order, nr_small_pages, area->pages); atomic_long_add(area->nr_pages, &nr_vmalloc_pages);