From patchwork Thu Feb 13 03:35:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13972753 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 7E34BC0219D for ; Thu, 13 Feb 2025 03:36:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0B40628000A; Wed, 12 Feb 2025 22:36:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 06750280007; Wed, 12 Feb 2025 22:36:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF88E28000A; Wed, 12 Feb 2025 22:36:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BD372280007 for ; Wed, 12 Feb 2025 22:36:22 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 31B5D4503B for ; Thu, 13 Feb 2025 03:36:22 +0000 (UTC) X-FDA: 83113508604.02.910F420 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf23.hostedemail.com (Postfix) with ESMTP id 4276A140004 for ; Thu, 13 Feb 2025 03:36:20 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=TJGvUOYg; spf=pass (imf23.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=alexei.starovoitov@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=1739417780; 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=1bG2TcWcZQz5k+Gqwwy79wI8/0pax/QFELT9STfGtKY=; b=MpDUiKLfsQ8bZn9bFp+EJVFcPZQpR/bz3Idc4gAEQW66mtN1ziD4tRvrZEmICCyquWm34L V/w+CC1WmphHIziv+DPbaqVsoUB4yab3P6b7c1jxYVr+/zLG9Owl8FxPYb58ATHUVsQivx R910txpuvOvFbYRDQJemCJ+WP3M9NPg= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=TJGvUOYg; spf=pass (imf23.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739417780; a=rsa-sha256; cv=none; b=BI6TMx7UPiS8Y8bz6fokOqJy1x3VXHYQWOc7QXWL6sLIGYOc1F23y+B6n+I51I/n2UIlBz FILIb7vwPiyCLZGxh2Cv89iNI+A+Ybc0VebjK+5Rmxqa8UUts7Y7Rube+3HoqwY9I+f90x GG6TwghDT3wrMlE5q/LLVECkZBTlK8U= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21f78b1fb7dso5424315ad.3 for ; Wed, 12 Feb 2025 19:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739417779; x=1740022579; 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=1bG2TcWcZQz5k+Gqwwy79wI8/0pax/QFELT9STfGtKY=; b=TJGvUOYgO4n0x1l83LSYWQHD92LNY7KgdwaVVu24Bbe6s52gRivBx1L1iH0AQyiPW1 QJ7gvsvPc9yanl/RvKRUPBXnaji/ED4yBr70bZngoHRyihd1buEeKL1O4P34bOePb6he kx53WiQkAa0T05S46OsRw5J/Plhx/FJ49X0km3a6WREMNASdwjY16HsHGw5sDrFPXtag jEHlyHiUJ4FzLj7SHhpFk1Yhd5NzzmN7vIgW5oa4g6MXhp0cYZNFPHSwBNSAd6HWekt/ g+Sh5kolQFvoaKMEJGwN2l9UIZfxUnoGrir5MUSWahthwMepD4enKJZRk5PVzxmfkGdq fqlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739417779; x=1740022579; 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=1bG2TcWcZQz5k+Gqwwy79wI8/0pax/QFELT9STfGtKY=; b=wHrXXSl4UhzA33Bnar95Dp5wd3vQXaE9v1zF8D0wdvfq6cnX6EM0r+J8nlpkREKlxO wuh8un8QnOKS3GbDBKs7mu5iXjdu/qt5JcZek+dzO8FHnO+x+xOa0wZCk0XQiBwAb1Kh LiCgh7GiOFByoFRRi+sNwOl9y+4IEdPaufiIs6iLjoWsg4Df+U7HlY1BrpcPDzetWPom Mpyvwk1CXmwjWWtNk72dHYEneZMxmaaawHCIgGR6y7VVz3f3o8RIHDGaKvpXTUEqMbX6 ek8JXkM3OU4nOEUIl/763ClbpV0xIFEXBXg8QnNA4Nq9sGYdZt25uyWPKzghKFFew3c0 ZU2Q== X-Forwarded-Encrypted: i=1; AJvYcCXko7gwlrNIBzs8xOKMxPYKpN5gMHfdlsCbTWX/BwhRIjmjmsTbFNGVCHHTu9qPodlzYlYxHlZcSw==@kvack.org X-Gm-Message-State: AOJu0YxWSkIK+5dIjSIvbuU0y/IMldD1cUw4MVzfJR02+uaX1Q/ot+1Y CKcZpbtkJkmJ39z78Yn/35TLkwTd/3nVlndwKveNUAOK9YpUimOL X-Gm-Gg: ASbGncszMEshut1Z93XQfOO4elCrh9yw/wgXazoE1cgNpd13OW+K7aK+LVZp8uqBjbf NPjw6yoK4/kJI81HMcNKUTWRi/J5SKwZvwpD5Ro6QFmrzCQz/udCOUgvkmRQjca9VH5R6/YLza+ uYtUtD3nj8RN7/vjsnDRNwm4G/BMgQfm0wr2N0OVajY4x+s/ju2wtULKgbUtspkZ3+hiXH6aeW2 N9PvCzO0mPBk3yRF2wJhm9eFvzAovpujirSKRd9t86PbOa3YqAZCjnfJRAJgo2o/RAQ+baFNlGN PdOp5BVfkeZg86UpsEpD6zRNUAO4tlgohW4QeQjxd4FPqoAixw== X-Google-Smtp-Source: AGHT+IFXy/P5J+sCx9sY/U/MAEMVw0FrBRnsYEuISK2pqOweK9ST2IkQe2QsXaxkx9P9LFDey130mw== X-Received: by 2002:a05:6a00:2294:b0:730:9768:ccdf with SMTP id d2e1a72fcca58-7322c3a5ef2mr7987610b3a.14.1739417779128; Wed, 12 Feb 2025 19:36:19 -0800 (PST) Received: from macbookpro.lan ([2603:3023:16e:5000:8af:ecd2:44cd:8027]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-732425468bdsm222056b3a.31.2025.02.12.19.36.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Feb 2025 19:36:18 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: andrii@kernel.org, memxor@gmail.com, akpm@linux-foundation.org, peterz@infradead.org, vbabka@suse.cz, bigeasy@linutronix.de, rostedt@goodmis.org, houtao1@huawei.com, hannes@cmpxchg.org, shakeel.butt@linux.dev, mhocko@suse.com, willy@infradead.org, tglx@linutronix.de, jannh@google.com, tj@kernel.org, linux-mm@kvack.org, kernel-team@fb.com Subject: [PATCH bpf-next v8 6/6] bpf: Use try_alloc_pages() to allocate pages for bpf needs. Date: Wed, 12 Feb 2025 19:35:56 -0800 Message-Id: <20250213033556.9534-7-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250213033556.9534-1-alexei.starovoitov@gmail.com> References: <20250213033556.9534-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4276A140004 X-Stat-Signature: u1ndpeta8jwyhrg7r5yej14fdas6ge87 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739417780-268587 X-HE-Meta: U2FsdGVkX18xo2KCnTZfpc0d+vyfKdx8wsvxgsb5NfDEi4dPgQWiGOMjD+hGrWW1Iso8HjIM3LX9Oj0XzTwtTAs7AW9SCPHPqgpLxZeMp1Nt5rviBwYm6qN1njLPiWP7aPsUdlg4+yjq6L7y36YjoXkdGsaiJlaxYsSUt96DtCaOocZ7OJBSmvyEHotATZ61wYEWeqEj/J6GY3NbEoI+bZ++sPCF1ArUaQ2dodlnOMfdsr2SgZIIaU/OEE2/cJXazFu0djVvrlVUPB6ClwfFqxv85usOuhshdCkhOsP7R6Sri5n/MxVGkvDWCxdg7FqVUs2OiNSuiU5+Cvnz+Qg6JzMWoJp3fWLAJ+zHZtQLx0fB+XofagBy5PqRB7ZvlP9t+q2crei3mRG8L776XsUrJVwmTy1IAOVePXJdcyniB3nTyaUhZjn23QrWVUWihwySnhZfBbTVeUit4ICEQm+gh8RbYev1r4uTzkvc1ST2Ik5AAy6hripLgyeWRDpcln7bgLrBBxv5Klr1ZdIa67XD2kw1mxwzIbrL7uOanOlSBQnPPgSEKf+hLUUwobM3LzWJ1zIx1yu1gSt9qgubru9zCzaOtrmfs4wXi8ZB1+UxTCrgnTZSZNXJkWhAOXUjn477or94mh1AiVEMhM1KbNI11GHWpqz6EARvT/jSK9OIerVqa7Eev+yAqZpzwHxxbyQrR5JfYYi6q+v+T+YcgWPQk3+Fisbka0X8mhJ4pHksFtnH5NLpJV5lLFBxmuYu0J4WXcCmV4VTOGgkuQmHjLxEFTXvPe8NB0DkpwWAvOXpZyuA7HWJ005zbfhHJSPpZStAo+HmvB9/JKLDVXbKMt3N/KgEG0UArUw/cZfcLK8RqkpDKTIa7YGV0fqaVgfzDM7CA1mXxCM2P6/ZgORqBzhez6C/QsnMa2kA7KiEv9PuYGxvsebUoNeswmEk52R202D35wg5D59B6r93H+F90Bs CopDyC/t 7N9rXmkc2Kimd99mOrNjUwnxbBbOJz17bqCkpr2Srg078fWTHFmpdr9TYN9dqG/BSDCKSppPNKC05im/wyEvveuA0sp+femB3tb27sBXSZ8KEUkoJGS/OMEKIEfB5Zd+GQJ5IwH4/yPVjd09i+9gBPICJAlw4GuxG0Y4JnuriBttc/QoWManp2DSz2CXqkgObu6jXcgggBQVpEhwPb2U/3rjDZynWz7aV7tHxpqhoFZKy6bG/SwNo8qJofvoZQzKXMZSpZz0srT/5NhT1s4z60pf7fOFneLNfBJCFrZHPij8/6uVVidiSugc9Lv/dwpd3ZxLgKhDt2K1Je4yOttviEbneuZUFng2q7ejhl9KZ8oPF9s30HJ3n/OBNxuqNGi4lwHrY4RDywfjWqg/gR8jUc3lWhX594oakA7pY/DCusImwMnxz9qMb+thB0k/M6JO5gvxLPloy3hFj5QRqx/7xPvAd0czJI69CzfddO0nx4B9gKzWwcNbYW35mUL0A7H8nMy4x5YxUZNK4Tz/fq7UbB6wxMiNX5rnUAVbVOvSyAFZyPbc= 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 Use try_alloc_pages() and free_pages_nolock() for BPF needs when context doesn't allow using normal alloc_pages. This is a prerequisite for further work. Signed-off-by: Alexei Starovoitov --- include/linux/bpf.h | 2 +- kernel/bpf/arena.c | 5 ++--- kernel/bpf/syscall.c | 23 ++++++++++++++++++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index f3f50e29d639..e1838a341817 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2348,7 +2348,7 @@ int generic_map_delete_batch(struct bpf_map *map, struct bpf_map *bpf_map_get_curr_or_next(u32 *id); struct bpf_prog *bpf_prog_get_curr_or_next(u32 *id); -int bpf_map_alloc_pages(const struct bpf_map *map, gfp_t gfp, int nid, +int bpf_map_alloc_pages(const struct bpf_map *map, int nid, unsigned long nr_pages, struct page **page_array); #ifdef CONFIG_MEMCG void *bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags, diff --git a/kernel/bpf/arena.c b/kernel/bpf/arena.c index 0975d7f22544..8ecc62e6b1a2 100644 --- a/kernel/bpf/arena.c +++ b/kernel/bpf/arena.c @@ -287,7 +287,7 @@ static vm_fault_t arena_vm_fault(struct vm_fault *vmf) return VM_FAULT_SIGSEGV; /* Account into memcg of the process that created bpf_arena */ - ret = bpf_map_alloc_pages(map, GFP_KERNEL | __GFP_ZERO, NUMA_NO_NODE, 1, &page); + ret = bpf_map_alloc_pages(map, NUMA_NO_NODE, 1, &page); if (ret) { range_tree_set(&arena->rt, vmf->pgoff, 1); return VM_FAULT_SIGSEGV; @@ -465,8 +465,7 @@ static long arena_alloc_pages(struct bpf_arena *arena, long uaddr, long page_cnt if (ret) goto out_free_pages; - ret = bpf_map_alloc_pages(&arena->map, GFP_KERNEL | __GFP_ZERO, - node_id, page_cnt, pages); + ret = bpf_map_alloc_pages(&arena->map, node_id, page_cnt, pages); if (ret) goto out; diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index c420edbfb7c8..a7af8d0185d0 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -569,7 +569,24 @@ static void bpf_map_release_memcg(struct bpf_map *map) } #endif -int bpf_map_alloc_pages(const struct bpf_map *map, gfp_t gfp, int nid, +static bool can_alloc_pages(void) +{ + return preempt_count() == 0 && !irqs_disabled() && + !IS_ENABLED(CONFIG_PREEMPT_RT); +} + +static struct page *__bpf_alloc_page(int nid) +{ + if (!can_alloc_pages()) + return try_alloc_pages(nid, 0); + + return alloc_pages_node(nid, + GFP_KERNEL | __GFP_ZERO | __GFP_ACCOUNT + | __GFP_NOWARN, + 0); +} + +int bpf_map_alloc_pages(const struct bpf_map *map, int nid, unsigned long nr_pages, struct page **pages) { unsigned long i, j; @@ -582,14 +599,14 @@ int bpf_map_alloc_pages(const struct bpf_map *map, gfp_t gfp, int nid, old_memcg = set_active_memcg(memcg); #endif for (i = 0; i < nr_pages; i++) { - pg = alloc_pages_node(nid, gfp | __GFP_ACCOUNT, 0); + pg = __bpf_alloc_page(nid); if (pg) { pages[i] = pg; continue; } for (j = 0; j < i; j++) - __free_page(pages[j]); + free_pages_nolock(pages[j], 0); ret = -ENOMEM; break; }