From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 503F7194098 for ; Wed, 17 Dec 2025 23:36:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766014594; cv=none; b=KordXKrQAihDpud183t6S5D43l5fAHqavqsCsrpa7H3Fr2GFcwxJIdBMiCKX/aGaqulYFM4wXLBNJ7AD/ENYwCtzDcqNen3Ro1slOsINv1BloM70D0cXNJdWCXRnmCe5qyjC6btwrdmmIvOyG1AduyVB39QhVVaQGJVIjDuWqj0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766014594; c=relaxed/simple; bh=5BKlIx1Q1LN/lVqkX6DbDb6UTMWGaR40UBh8Wa4lrKM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pnZfEHhIX55GQueIbUKv4H+yW8EA3H/WQXg9UWoAC2aZHAYnWRdv9SwDh8xI0c38fktEUj7192cAa/ZlAZhnRQv5/tLLBX51TtWmOWTIJXVUoTv34sYnDjSHqxvp7dsHX8CQC1fJ9IaJduqpir07OU1M55ZYerjxnllJWOlY26c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E9n/SKUV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="E9n/SKUV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00987C4CEF5; Wed, 17 Dec 2025 23:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766014594; bh=5BKlIx1Q1LN/lVqkX6DbDb6UTMWGaR40UBh8Wa4lrKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E9n/SKUVtUECaK3/a87+ubRR6MBNF4eM8oyrkidCsc7saRlR5SpD6jqaydp8cr0H+ Eiy1MZV/RQmNeRyabtU2HJa8crSvuIH/byAutOoTEiuzK0SdW7l9R0iTfGBmFnwD8J 2nJBuHA96s2v8S6TabzDzTOYjLANE6Qye6os3wouzEzSTAnAo36z9TmA2G2hVTIypL E85eyvhi5DsdNH+w5vQiNr/1Z5aWYV4BrbHjqSooIxfPjNEMqpGob7ZPxpVWkx7mx2 FaXzJikwAkuMWDLayTfHmDYt3IzjcKruInVATW5suaINFlrqm3gAhgt53r5iAw51dF 9W9YKS8LVd1gw== From: Puranjay Mohan To: bpf@vger.kernel.org Cc: Puranjay Mohan , Puranjay Mohan , Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , kernel-team@meta.com, Catalin Marinas , Will Deacon , Mark Rutland , linux-arm-kernel@lists.infradead.org Subject: [PATCH bpf-next v2 2/2] bpf: arm64: Optimize recursion detection by not using atomics Date: Wed, 17 Dec 2025 15:35:57 -0800 Message-ID: <20251217233608.2374187-3-puranjay@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251217233608.2374187-1-puranjay@kernel.org> References: <20251217233608.2374187-1-puranjay@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit BPF programs detect recursion using a per-CPU 'active' flag in struct bpf_prog. The trampoline currently sets/clears this flag with atomic operations. On some arm64 platforms (e.g., Neoverse V2 with LSE), per-CPU atomic operations are relatively slow. Unlike x86_64 - where per-CPU updates can avoid cross-core atomicity, arm64 LSE atomics are always atomic across all cores, which is unnecessary overhead for strictly per-CPU state. This patch removes atomics from the recursion detection path on arm64 by changing 'active' to a per-CPU array of four u8 counters, one per context: {NMI, hard-irq, soft-irq, normal}. The running context uses a non-atomic increment/decrement on its element. After increment, recursion is detected by reading the array as a u32 and verifying that only the expected element changed; any change in another element indicates inter-context recursion, and a value > 1 in the same element indicates same-context recursion. For example, starting from {0,0,0,0}, a normal-context trigger changes the array to {0,0,0,1}. If an NMI arrives on the same CPU and triggers the program, the array becomes {1,0,0,1}. When the NMI context checks the u32 against the expected mask for normal (0x00000001), it observes 0x01000001 and correctly reports recursion. Same-context recursion is detected analogously. Signed-off-by: Puranjay Mohan --- include/linux/bpf.h | 33 ++++++++++++++++++++++++++++++--- kernel/bpf/core.c | 3 ++- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 2da986136d26..5ca2a761d9a1 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -31,6 +31,7 @@ #include #include #include +#include #include struct bpf_verifier_env; @@ -1746,6 +1747,8 @@ struct bpf_prog_aux { struct bpf_map __rcu *st_ops_assoc; }; +#define BPF_NR_CONTEXTS 4 /* normal, softirq, hardirq, NMI */ + struct bpf_prog { u16 pages; /* Number of allocated pages */ u16 jited:1, /* Is our filter JIT'ed? */ @@ -1772,7 +1775,7 @@ struct bpf_prog { u8 tag[BPF_TAG_SIZE]; }; struct bpf_prog_stats __percpu *stats; - int __percpu *active; + u8 __percpu *active; /* u8[BPF_NR_CONTEXTS] for rerecursion protection */ unsigned int (*bpf_func)(const void *ctx, const struct bpf_insn *insn); struct bpf_prog_aux *aux; /* Auxiliary fields */ @@ -2006,12 +2009,36 @@ struct bpf_struct_ops_common_value { static inline bool bpf_prog_get_recursion_context(struct bpf_prog *prog) { - return this_cpu_inc_return(*(prog->active)) == 1; +#ifdef CONFIG_ARM64 + u8 rctx = interrupt_context_level(); + u8 *active = this_cpu_ptr(prog->active); + u32 val; + + preempt_disable(); + active[rctx]++; + val = get_unaligned_le32(active); + preempt_enable(); + if (val != BIT(rctx * 8)) + return false; + + return true; +#else + return this_cpu_inc_return(*(int __percpu *)(prog->active)) == 1; +#endif } static inline void bpf_prog_put_recursion_context(struct bpf_prog *prog) { - this_cpu_dec(*(prog->active)); +#ifdef CONFIG_ARM64 + u8 rctx = interrupt_context_level(); + u8 *active = this_cpu_ptr(prog->active); + + preempt_disable(); + active[rctx]--; + preempt_enable(); +#else + this_cpu_dec(*(int __percpu *)(prog->active)); +#endif } #if defined(CONFIG_BPF_JIT) && defined(CONFIG_BPF_SYSCALL) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index c66316e32563..b5063acfcf92 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -112,7 +112,8 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag vfree(fp); return NULL; } - fp->active = alloc_percpu_gfp(int, bpf_memcg_flags(GFP_KERNEL | gfp_extra_flags)); + fp->active = __alloc_percpu_gfp(sizeof(u8[BPF_NR_CONTEXTS]), 8, + bpf_memcg_flags(GFP_KERNEL | gfp_extra_flags)); if (!fp->active) { vfree(fp); kfree(aux); -- 2.47.3