From patchwork Wed Feb 12 17:47:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13972264 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 BE10AC02198 for ; Wed, 12 Feb 2025 17:47:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5ADFA280004; Wed, 12 Feb 2025 12:47:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 55C71280001; Wed, 12 Feb 2025 12:47:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D5F3280004; Wed, 12 Feb 2025 12:47:38 -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 1EF5D280001 for ; Wed, 12 Feb 2025 12:47:38 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D26391C7126 for ; Wed, 12 Feb 2025 17:47:37 +0000 (UTC) X-FDA: 83112024954.17.9BFECE9 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by imf17.hostedemail.com (Postfix) with ESMTP id DE5A040011 for ; Wed, 12 Feb 2025 17:47:35 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QVgxrPXJ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739382455; a=rsa-sha256; cv=none; b=7qy/Xa7ZNIXt3qeJX4wGeMToy3fvZudMnXUbbyjDjFytwGXLYiuX0kSIXFXCEgHOLulTyc h340XzTkLKwnlG5onIvRvVCOGWYBT5HDMn1It0I7+wR2S12FiFSnN2KpVvV5a0AHs+Whum q04LWpPQcqA3G4euTjJMJo/SfOhW9fk= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QVgxrPXJ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.53 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=1739382455; 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=bDuPZRtqsVh7bFH3yxNIFanE739bKkzWZ/UfDyq/wdw=; b=q2PdfXFDqdqjBInLkZK9DrrVWJNDUASrMlZSsK13inq0BZ7ODpcTV8RC95A6h1jsmq1nu+ NVZLtos+ah8uBzWMxKVy0CHeQWz8XHowMxUNPk0S9Z3beBUeK+vCuzxekJMXHThEaJ6LGE iL/6LY52G+yYifdBFT5EvogQtakBAaU= Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2f9d3d0f55dso60657a91.1 for ; Wed, 12 Feb 2025 09:47:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739382455; x=1739987255; 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=bDuPZRtqsVh7bFH3yxNIFanE739bKkzWZ/UfDyq/wdw=; b=QVgxrPXJygYDPIeY4XEMwcK/XBTv20bgpdzl+fIsqz6iHiuSBmiLw29Mn9X/SfUAdr bgkDRAqkEQdURTmsGV+VA7HZCDlJq2UeB2oIRQpoZX0aULNsKvNtihX+KhHbXPLbeIsf 8oe3wTsX5uuZL2pLHEzUa6VFePfI51IuhhP3TZjhTZgK+A/g3ctSLX8jT+JZBZBAe7JQ H7fsVdri3ELQsAy/eHL1jQHMIDgHPgMaIX/24OiKkHLgyAAac3DY8PGKno3g0ti1p9IV PPQ1Szc3cu/VVZ0zVP1/JzHtjmlVy3aQrrwbvIMhDYbpNrH2+2xQpq+hrlbvfMeyLex3 YR+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739382455; x=1739987255; 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=bDuPZRtqsVh7bFH3yxNIFanE739bKkzWZ/UfDyq/wdw=; b=JMCWPr5VIIl3lk6pJSFUrtkLWpbKxtAIjUNopXHaya1yX25w7NLtzLLruwWSfnJYsn xZTzaIrWmMuoKw1RCHB88vr5htH2p9OzU4+bbvVQa2P3URUtIgKanbMDflwaQB7cL58i FlKaKykMSJ3fOjEfemK5sB1eEV9OJp38a4rIKi845RmwAhlw8b7CBn8D7dfWxaozy+Pa 1KGbbHkbZQxDcdS60KC1+R2jzNIrMzZ91YO6F6Db6X+0Lh+L8jEKDhn2TMoezplzDDk1 bcl2puZ59XljBUUHevCFeUGUZEG1q0BBErKjFNqZqcH1SgWV3XveDyKHOzJSlws/b+ss b67Q== X-Forwarded-Encrypted: i=1; AJvYcCWeAIZqALogjbC0tINGkerVrh9p9p82q6FRNN6KGP6EaD23Kgc2fDSQoXATtz7vHSKQ6k2ZwJGGOw==@kvack.org X-Gm-Message-State: AOJu0YykYLA17ULZHgFklgjAKpl1AXHP9qYv7O5VZajJB5NXmGGtwTMI VEz6ov2QoxG13M9cTvfil9P/uGLGWscWTFLaGSizR711Q6D6n/Hs X-Gm-Gg: ASbGncuwiju2m2axqBp5jkuiZyK/jbvKKL1nv+qJknpIltJowXGdVCXYikMkFVJ/ByA swKRx9RGExmrKNNTosAU13njJRREV0cL2WN7vZR3OwvCefo9zgEkd9PyP+Jg7GfjiZSyjABj58D 1g5yPGlmN5tMi7R809u70y4sMVEkBe/bO7xUVqtDINIeaqnwiQ5zditeM6eQ/50mhXbU+BUAQId BLs2H1GtoJGlSS5yYLsTfdJxA0y0NHegmJglxhyfcVQ2d+QhmG/MlXjPsO8+4ygljQCAXfFBN97 AXeM3zEP3r8SK2rTKU9lAhII5z1xPv/52/SVBsPwI8vsiw== X-Google-Smtp-Source: AGHT+IE9puw91tznIalD6EtLkH8J2zj9zmB6kCfaMb8CIT8gL4HusyDm8J9VmRaGQdeer0qVub9Dvw== X-Received: by 2002:a17:90b:280b:b0:2f8:2c47:fb36 with SMTP id 98e67ed59e1d1-2fbf5c6ea65mr7171319a91.33.1739382454794; Wed, 12 Feb 2025 09:47:34 -0800 (PST) Received: from ast-mac.thefacebook.com ([2620:10d:c090:500::4:c330]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f36882dd7sm115611505ad.199.2025.02.12.09.47.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Feb 2025 09:47:34 -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, 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 v7 6/6] bpf: Use try_alloc_pages() to allocate pages for bpf needs. Date: Wed, 12 Feb 2025 09:47:05 -0800 Message-Id: <20250212174705.44492-7-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250212174705.44492-1-alexei.starovoitov@gmail.com> References: <20250212174705.44492-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: DE5A040011 X-Rspamd-Server: rspam12 X-Stat-Signature: dqgpyfs8nsqtoxhcxzxfhj1ynbnadx8g X-HE-Tag: 1739382455-826488 X-HE-Meta: U2FsdGVkX1/cb8iItYu1jdoeBhKH/nlwGwE+rJYMMSyvRVmEKPrPBRqzPqiu5bJFnZQqlzseLN8VfOJ9UpP1f6wzSL7xhdr6C936FHlWd+z9FVtMICRfS+igKL86uHG1HBj3podATWcjdevnxV/mGDCv0GB4Sd4tUKi6e5wMtmGnt5BQy76qU9tMU/JL7f0jO6RRFHo1s1rCDYEhsxwojKBpMYXJa/hFFTrk7GwFIREa+hb16aFbKinY+TRAvXxxtylMoCgW32j0y28KWLwzGe/FxlSD4sWqyiJBZWkiOy13OBC9GbEyrF+LmnvuQYG4Y/G6I9k9kJZ4QXxtFEoHEtnd5M9WLlQuAymrHZtYv/tyE5b5uc9ieSQ5dPhBxd0/hM6tHjRk1ZFx82wUMwMSb5cKRGpFi0n0/VU3EQLdLCZEyuKCgQO8RNb7KGpPFjqV0smntWljHUfhI6M76XwTFcffQTk8KwQ2LiVqlGKy7k7ngtCnh8rqpm85h7lbqMzM4BWXRrYPmoUm1bWWL/hSqQn3xlQz0pFyzQgd3Sqx9f4Cp2OQY2FzJiP3PJhIfGyPB8OL5wMbKCrAtQWlT0N95893EjoU9x4GhL4K6YeaOR8uQUyV4GhadqnHNUhgr8dPivLXPH6FJAj0y1qru4X880l5pBNNdPTrtMnvuKM8LMvK4wosLynUkbPdwyDLWd5lqIoIREGbHYHyUY9nAeb1lGqOoMepNZ/4g6K21gGFOsjSeAEVcPAYXRIp8TO0Op3VXIIhxUCD0o48Od10eMW/HKnfbHhylm6CbTgpAluUoiVMtPF7lF6+lmolMO5eqMGe7jhc5VzqSU7mN11tVOG8TLjtwdiDEPbZUl+lRxtVcXyFtkq420ae/BvAOyqlZN9RoV11Q2opGpfseSwl63GeabAn8FWkB4DLzmYQzIwZfTRxCmRmyHjKRUXWutVqlXsPZHRx+yvpWS+5bvHSsZs ocTsvF/C yVUzm9tgCaXt6SO3D2zhLIUZqDhdUiBZMe4bO8+6E9U2Aq8Z5zjKW45zXxm6MUtrW+9slaGEUnUrMlqx5rNPtTPbYqF0RoPrJRxaBrt/SEReaKlL0Z5rHqoAVQ0LN0stYEAmFJ4Hb8uAR1/UwhRA5v58iYLqWd9fzRdPdf2br6rwrNeuczs52joEiC7az+bAQnxWnymXj9Qgyyjn8y8eE8DzwRlkkSaFYJ5a1lYobjT4aHwya/1DyRbmvznTUDp3ThJVa3HtX+wefGDYjkbgnUPizVvxSH5zVEsUH4Vt8Yzk2+75Y2uV2W4PTSDKeo6T2PoS9LOKal/GNh2j7O35fdKB6pB3IQbYo8lDJAldWzU9yfXunnd2yw2k6pB38u1LAn7H2oYiMQR9Nphl7HbsbEMV67T5+gi5i2YluP1PIIyjxxCW0biy6NBBUG/Z10Uxz39Nx9I07maKE/uOm+8dP1IfK5xuazTyuFtYKYNOT4/xwOyeA86jGm/bZ2/ebhj2xcDak0NdX3qnwuEjhXxKJP97h/LCrzVzRoXwceupfdCvhm0E= 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 4b22a651b5d5..642399a5fd9f 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 0daf098e3207..55588dbd2fce 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; }