From mboxrd@z Thu Jan 1 00:00:00 1970 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 03958C83F17 for ; Wed, 16 Jul 2025 02:30:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 953666B00C2; Tue, 15 Jul 2025 22:30:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8DDD36B00C4; Tue, 15 Jul 2025 22:30:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 77D246B00C5; Tue, 15 Jul 2025 22:30:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 62DCD6B00C2 for ; Tue, 15 Jul 2025 22:30:05 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DE1A316025F for ; Wed, 16 Jul 2025 02:30:04 +0000 (UTC) X-FDA: 83668547928.07.DB6C613 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by imf04.hostedemail.com (Postfix) with ESMTP id E782B40002 for ; Wed, 16 Jul 2025 02:30:02 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FQLvuNrz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.215.181 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752633003; a=rsa-sha256; cv=none; b=jFT8KNXbvFrtnvlI19U4ORESAK0kaDSlopHlHyibPeYiWPwvkYyiRO66rJzPCc7z10TNJL WrRXrz40j0khgtB9QAeG7Mw3E4GfSfQY3blAWHo/PIcHJ3KOhNFI88RUX/ipIanhst0npw KdzR9JI2uJU3WYOOFwVtFZeQrOiT3nE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FQLvuNrz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.215.181 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752633003; 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:in-reply-to:references:references:dkim-signature; bh=ZuA/XIiS/PtBSaJOIUt5hu5AZg5850snKe3VMWy5DuQ=; b=JyzyOrs9MH4L80I9xEPCs8OXq1MXbSUYNDbGDzBFMpy7GSPFtkAIXEaSKi5VoygSabfjiu cspTlhTK95C2VocjiXy31jgX79mQ5LWjYBh2irBfwnGxot+OeePqfU3Ii4i18oHbIn7ma1 RySRbo9QKKolNl2rxDLNDrly3gsdFT8= Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-b34ab678931so4516008a12.0 for ; Tue, 15 Jul 2025 19:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752633002; x=1753237802; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZuA/XIiS/PtBSaJOIUt5hu5AZg5850snKe3VMWy5DuQ=; b=FQLvuNrz8OrvVyjDya8Q3it4wNL2nDTSnbJnPYyx/Z0bQZ5m1BVOXkvwYzvbJjRMRe Kc3CCyoWOK3h/O7A5gpe/AB8Omhjz37AvK6dsAkdbOAOqstPVQ3rUQ3vFqtnPVFPa1wB +5KEAmL1mlN5ftec2HhKcBjR2F+rd1TMmyfrUwNJpzWhxxCcbJDmL2Ziq1QZ4Friaox5 3uBL85ctSsfQ/Il/2nY5c89UTOH46IbBd7JwvMhR0aMYB4AI+ythBL08HZOlijo3jiTG XKaFfyVyf5lEi1YxOR0O7Cj17+uZIu66T/LSsmLps4dSisYc8D60k5EAm2xNlGpHt5tG 6fpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752633002; x=1753237802; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZuA/XIiS/PtBSaJOIUt5hu5AZg5850snKe3VMWy5DuQ=; b=SHQhr9uoRniUpvHe/NmYKVtFBuYoLjNpAQv8dWuvTj+3KnD4Dg1EG3twRdL7EZgSQ6 fJFV6hQxuFR5wEMhE7rUkcNhq8UcQGC2Yci0pNvk1dXf00S0YHLzzalb8WlAiWiBAwEJ sAfii8Pa2/YQs9DKG8K5of3wWYOjF6g8fVaKRYR74OwtX2LgYUJl4vAafpE2/efM5BfM YwMxupX/2R3Cy5O/dJ6JYFtc4EJy2nERqUAx0pcFxus9V3z3DgBIkeVynjielekfxKph uFIQcJ2kwi9HUWoAuCMJ0YpYLvp70/8ZanRP4RczV4mIwFPS/eaOnuu+kXmrgdDV0dto kryQ== X-Forwarded-Encrypted: i=1; AJvYcCUobURME2VxilLRddOvfPyD84BeIW0C474uVaLRSzKFXCHsRgJFIEMtdcl+KvA1bPkmnhMtRXHH1g==@kvack.org X-Gm-Message-State: AOJu0YzJHBFyqW5a5gkPfZlMkM0Tv1hrCsZR0ntUDexG7KwaHiwyJ4zj rgQd/faTrdjSBhuzJvuPQ9Yj+9Ur6C1i2jqjr29liCdGwL+eW60wXIJK X-Gm-Gg: ASbGncvt43PT2NaYhWeD6u3iAvMopXplvA3t8rQlWyD2sWeeqsczcZbjT1G0y8Wcx89 XTJikmWMTOoPz6eoHwnScwdpOAqz0zZ5WdF4xG8Vej1yZbH15kTDOPm3OIy7yGVrlf2sZaH4p/f Rx9+lBbafrypDzlc1qRjJaZ46HkHbMVfvwAEtd5UJuti156lerKzfKjWmsjIKHH8ehadyJbifEz Ss9YGf1SygiDkSTr4wf6R77FsXwXsJ0pvRAVnWUWOWBZ40CqC9cDMkb437MPXtUGEmFPzs8xIQq sMueh20PsrCVXtIwsLlHPSMSlZduiBXIWA14yOjzwcEUhavcEjz7wjfq8/cxIbc+Zzyk5iA/ulc Pq5hEtn5V7iXdw4si6UysTnWmLZubRyfF/kV+PrYH+W7cFylDjTt/h26x3xFMltY= X-Google-Smtp-Source: AGHT+IGx77ETC8ZOiWV8rNUIJdKbdYS3AhSCR/mbxtYMjINZJ59P+I7tTHKAVaz7pIGdO1wkg7hNlw== X-Received: by 2002:a17:90b:28c4:b0:311:e8cc:425e with SMTP id 98e67ed59e1d1-31c9e78b707mr1669029a91.31.1752633001702; Tue, 15 Jul 2025 19:30:01 -0700 (PDT) Received: from localhost.localdomain ([2001:558:600a:7:a83d:600f:32cc:235a]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31c9f1e61f3sm306751a91.15.2025.07.15.19.30.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 15 Jul 2025 19:30:01 -0700 (PDT) From: Alexei Starovoitov To: bpf@vger.kernel.org, linux-mm@kvack.org Cc: vbabka@suse.cz, harry.yoo@oracle.com, shakeel.butt@linux.dev, mhocko@suse.com, bigeasy@linutronix.de, andrii@kernel.org, memxor@gmail.com, akpm@linux-foundation.org, peterz@infradead.org, rostedt@goodmis.org, hannes@cmpxchg.org Subject: [PATCH v3 3/6] mm: Allow GFP_ACCOUNT to be used in alloc_pages_nolock(). Date: Tue, 15 Jul 2025 19:29:47 -0700 Message-Id: <20250716022950.69330-4-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250716022950.69330-1-alexei.starovoitov@gmail.com> References: <20250716022950.69330-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: E782B40002 X-Stat-Signature: f7s1nut7iqgpissd7ke1hmb8gcq9ka34 X-HE-Tag: 1752633002-543568 X-HE-Meta: U2FsdGVkX1+i8/Pn7+D4ogzijd7iiXHiZZYiH057rOgNmpgrIxHhVMGwFeMu+rm09VMVP0tZ1GkQsj6VsFCcy3bFtGNfaff9cHK62ayL4Z1xZs1so7Y3en0vC49gNcpavnYO2QXpvmUKjMQ30pqu+8wZoYnI+sC9FSu1zKUTcSRUl2TbfIDgC3HWS72y2Iur6xoc9L2e/Q7cUX9paE8oQcBjb5i34APtflc7rPBy8tyG3j1D6IsrxqQP2dc4gsG2wptnRjIuMsLzVIwJkqMYWiJPUhOfL+tqvDvIm17QYbPCXbf96cVQqoQZ/eSGvl/LRZyhX6S5mYu2Y6CuoXI2MLwCBPsN2mQES+BIXtpgq1xpsQXWRMzIVaQ9lfcwxsbCXgiqtok1hjyAym/JunAO7DDSIiGignLYYOY988PynNCyKgLsHJa7KUd1glVaGdD2hTQR+QP4iM+6M90hilHgKdwLVfQtITIwQzdVUkTnpncmFjdDG7742nCz6EivUu81pjZlcEvtmzLfNIXwDxishWKQtAXvwf4gPbvNOugv4+PIeiloSRy1QI5xfS0/ZKmlk0k+wMEzxGrO6ySXgA+rEUJquPu3xABdByIOQe2hLq9pKGQi9w0p3yYxafzmzRiaBbYV6DMXOVlP2Jm/J12SlZJXu6aRjj72rJWNOMwyTBel39AJ9y945wW5q3rrGP7Hy73j6Ke6UhLWyEVO261M8v+N2j+oRxU3CGeNAlcLuZ6RbYMHmPHY+3ahDcuFwt8Uwosm85j8qmSjWmC/PT5mypUfN0lg7q87YYmEViim87ztiaaiFZ4gtoNChP4YjIQyIh/LCxznfqsFvv+FHZSGGYAJqNeX+jqtw7FpXLoygpMFWGw/NxOBRUaoXNbqCRhdRbhaplJuPqJgjNVkE3kfjqjoQTIrGLvzwF4s+kSRuM9f5l0IytG/QuQyVdsuNMs/D6PlHWcixJ/77Crv54c UDtuPn+2 6YFq+d/X6ZAtwAYHGEEmxS7y7x0s29AO1+Y1NfEFhlEvHlgS6513Xo9SJh0/I1f4PPGV2+m/Fhxkc1JsijIoKOzeOgur1qiuXlLiR7k3MG5ykm7ag9sJlZAKePDjYMBzQmG3VK54OXVZstlSh+9dDNDc+5j2KMTCN2MnhHj321N2lo6QWVLgHqOeFbwi79DFea1ayeh3neL4EonzxkDZR+8DeCLKlr8xEK6xjjjgm1rw5FB1dwk9RJ6N4KPIr1CbZKDmmGBgbDwd0Fkrfks/r2ZT9hNgTEpSVANIdzuP8wGxmBj1yWmtQXKxdD4tAdUSwuwMO9y0KTOg8epVBRDpJoO9WI8UAaAzvLpUYbgm6qrPqpmL3QEz/bpXXyqdpf2HU3I+3Dywv7lQ9OPjZ56rEyxbR8x0i9EZb1XshsaUej5UILFdylIe8HWX0DrOUqZnfaqBjMZM31CGtTsjuwGU9elUdjFxWSuKA+9sDu92AuxU0p6YHaS61UZooOTXR/EyHCMX2KS5/jFyJeTZ0I/nGJVwuRFy0UDF/cEbn/7YE0GqAalcX4PgynrWqVrBBy3KpWliY 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: List-Subscribe: List-Unsubscribe: From: Alexei Starovoitov Change alloc_pages_nolock() to default to __GFP_COMP when allocating pages, since upcoming reentrant alloc_slab_page() needs __GFP_COMP. Also allow __GFP_ACCOUNT flag to be specified, since BPF infra needs __GFP_ACCOUNT. Reviewed-by: Vlastimil Babka Signed-off-by: Alexei Starovoitov --- include/linux/gfp.h | 2 +- kernel/bpf/syscall.c | 2 +- mm/page_alloc.c | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 5ebf26fcdcfa..0ceb4e09306c 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -354,7 +354,7 @@ static inline struct page *alloc_page_vma_noprof(gfp_t gfp, } #define alloc_page_vma(...) alloc_hooks(alloc_page_vma_noprof(__VA_ARGS__)) -struct page *alloc_pages_nolock_noprof(int nid, unsigned int order); +struct page *alloc_pages_nolock_noprof(gfp_t gfp_flags, int nid, unsigned int order); #define alloc_pages_nolock(...) alloc_hooks(alloc_pages_nolock_noprof(__VA_ARGS__)) extern unsigned long get_free_pages_noprof(gfp_t gfp_mask, unsigned int order); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index dd5304c6ac3c..eb9b6c4c10e9 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -579,7 +579,7 @@ static bool can_alloc_pages(void) static struct page *__bpf_alloc_page(int nid) { if (!can_alloc_pages()) - return alloc_pages_nolock(nid, 0); + return alloc_pages_nolock(__GFP_ACCOUNT, nid, 0); return alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | __GFP_ACCOUNT diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 78ddf1d43c6c..148945f0b667 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7506,6 +7506,7 @@ static bool __free_unaccepted(struct page *page) /** * alloc_pages_nolock - opportunistic reentrant allocation from any context + * @gfp_flags: GFP flags. Only __GFP_ACCOUNT allowed. * @nid: node to allocate from * @order: allocation order size * @@ -7519,7 +7520,7 @@ static bool __free_unaccepted(struct page *page) * Return: allocated page or NULL on failure. NULL does not mean EBUSY or EAGAIN. * It means ENOMEM. There is no reason to call it again and expect !NULL. */ -struct page *alloc_pages_nolock_noprof(int nid, unsigned int order) +struct page *alloc_pages_nolock_noprof(gfp_t gfp_flags, int nid, unsigned int order) { /* * Do not specify __GFP_DIRECT_RECLAIM, since direct claim is not allowed. @@ -7541,12 +7542,13 @@ struct page *alloc_pages_nolock_noprof(int nid, unsigned int order) * specify it here to highlight that alloc_pages_nolock() * doesn't want to deplete reserves. */ - gfp_t alloc_gfp = __GFP_NOWARN | __GFP_ZERO | __GFP_NOMEMALLOC - | __GFP_ACCOUNT; + gfp_t alloc_gfp = __GFP_NOWARN | __GFP_ZERO | __GFP_NOMEMALLOC | __GFP_COMP + | gfp_flags; unsigned int alloc_flags = ALLOC_TRYLOCK; struct alloc_context ac = { }; struct page *page; + VM_WARN_ON_ONCE(gfp_flags & ~__GFP_ACCOUNT); /* * In PREEMPT_RT spin_trylock() will call raw_spin_lock() which is * unsafe in NMI. If spin_trylock() is called from hard IRQ the current @@ -7584,7 +7586,7 @@ struct page *alloc_pages_nolock_noprof(int nid, unsigned int order) if (page) set_page_refcounted(page); - if (memcg_kmem_online() && page && + if (memcg_kmem_online() && page && (gfp_flags & __GFP_ACCOUNT) && unlikely(__memcg_kmem_charge_page(page, alloc_gfp, order) != 0)) { free_pages_nolock(page, order); page = NULL; -- 2.47.1