From nobody Sat Jul 25 21:18:44 2026 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) (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 288EF3E1208 for ; Mon, 13 Jul 2026 15:40:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957243; cv=none; b=WP58zBtpcwXeF9KKKpluM656htNHvTl6u0DedKjwu8AUJY1o7SwJeCaE+6J5ytrTWu4J4bNplqvFBMCbDTnN82gdfweeRIFy3MJ7n233BkHT9y7aOYYWl32C/17NKqQozYdjnSqTCNbOcHNW2Z20JABO1BLZ1nAUN5IgDx7zQaM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957243; c=relaxed/simple; bh=HxWQqAWEXGvBemAMe9Iz9nZLvBvWd3r/qm/dPlfaRL0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rxMpH8nVJ4TagTb559RUFA7uzaSop7sIum4M7GfH5930b3CrpCz6CKLzOjJB/DpBJ7Z8vuBxLkYbpvPorhCdzezTb5kG/0hZQIY8YNSfUqncyxvznbLso1yFpch8CIIG7T0wqf35YZ9EpMBBpypzOc4sd/h5ZRM+jUhOctTUnoA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=USlJqVxj; arc=none smtp.client-ip=91.218.175.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="USlJqVxj" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XaqYoSTHegTYHmfZKuxLnj0GEL9ZknWZa8BMGTCX7YE=; b=USlJqVxj/85XE2ioXOiZsF+9CKJbFaRzrdJQX9RRs5Q+dmj1MB/1zXkG+If883GuRk2jOA Cdbuxy8ft7yFnfcEVFdewZOXElF3n/o4kjFqfhhKwr1G/gVtF0zcCfytO5K/kUl6z6zmvd zw22S6tTxwnGOZqRscfFc7EzBgdmgfw= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 1/9] bpf: Drop duplicate blank lines in verifier Date: Mon, 13 Jul 2026 23:40:16 +0800 Message-ID: <20260713154024.30851-2-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" There are many adjacent blank lines in the verifier that have accumulated over time. Drop them for cleanup. No functional changes intended. Signed-off-by: Leon Hwang --- kernel/bpf/verifier.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 03e2202cca13..b5666a75a273 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -655,7 +655,6 @@ static void __mark_dynptr_reg(struct bpf_reg_state *reg, enum bpf_dynptr_type type, bool first_slot, int id, int parent_id); =20 - static void mark_dynptr_stack_regs(struct bpf_verifier_env *env, struct bpf_reg_state *sreg1, struct bpf_reg_state *sreg2, @@ -1692,7 +1691,6 @@ static bool same_callsites(struct bpf_verifier_state = *a, struct bpf_verifier_sta return true; } =20 - void bpf_free_backedges(struct bpf_scc_visit *visit) { struct bpf_scc_backedge *backedge, *next; @@ -2312,7 +2310,6 @@ static struct bpf_verifier_state *push_async_cb(struc= t bpf_verifier_env *env, return &elem->st; } =20 - static int cmp_subprogs(const void *a, const void *b) { return ((struct bpf_subprog_info *)a)->start - @@ -4065,7 +4062,6 @@ static int check_stack_read(struct bpf_verifier_env *= env, return err; } =20 - /* check_stack_write dispatches to check_stack_write_fixed_off or * check_stack_write_var_off. * @@ -4861,7 +4857,6 @@ static int check_sock_access(struct bpf_verifier_env = *env, int insn_idx, valid =3D false; } =20 - if (valid) { env->insn_aux_data[insn_idx].ctx_field_size =3D info.ctx_field_size; @@ -6702,7 +6697,6 @@ static int check_stack_range_initialized( if (err) return err; =20 - if (tnum_is_const(reg->var_off)) { min_off =3D max_off =3D reg->var_off.value + off; } else { @@ -7416,7 +7410,6 @@ static bool is_iter_new_kfunc(struct bpf_kfunc_call_a= rg_meta *meta) return meta->kfunc_flags & KF_ITER_NEW; } =20 - static bool is_iter_destroy_kfunc(struct bpf_kfunc_call_arg_meta *meta) { return meta->kfunc_flags & KF_ITER_DESTROY; @@ -11562,7 +11555,6 @@ static int process_irq_flag(struct bpf_verifier_env= *env, struct bpf_reg_state * return 0; } =20 - static int ref_set_non_owning(struct bpf_verifier_env *env, struct bpf_reg= _state *reg) { struct btf_record *rec =3D reg_btf_record(reg); @@ -16465,7 +16457,6 @@ static int check_ld_abs(struct bpf_verifier_env *en= v, struct bpf_insn *insn) return 0; } =20 - static bool return_retval_range(struct bpf_verifier_env *env, struct bpf_r= etval_range *range) { enum bpf_prog_type prog_type =3D resolve_prog_type(env->prog); @@ -18407,8 +18398,6 @@ static void release_insn_arrays(struct bpf_verifier= _env *env) bpf_insn_array_release(env->insn_array_maps[i]); } =20 - - /* The verifier does more data flow analysis than llvm and will not * explore branches that are dead at run time. Malicious programs can * have dead code too. Therefore replace all dead at-run-time code @@ -18436,8 +18425,6 @@ static void sanitize_dead_code(struct bpf_verifier_= env *env) } } =20 - - static void free_states(struct bpf_verifier_env *env) { struct bpf_verifier_state_list *sl; @@ -18719,7 +18706,6 @@ static int do_check_main(struct bpf_verifier_env *e= nv) return ret; } =20 - static void print_verification_stats(struct bpf_verifier_env *env) { /* Skip over hidden subprogs which are not verified. */ --=20 2.55.0 From nobody Sat Jul 25 21:18:44 2026 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) (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 4053437F8BC for ; Mon, 13 Jul 2026 15:40:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957247; cv=none; b=L/PNkFmyngI+F1H4OnDdczxoSQoZgR4dTlMI3gjhpoAY4OuwwOnAcULrO7nUOAk9JQAeySR57n1htUa8qJtqyDbK3TqPWDvIff2unjAOOzlXoASRskyv9p/HBaDkHjimXQXrxVrLuZvJEV5K60gdPw/fI9O6zYbCIfOWE3gOLps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957247; c=relaxed/simple; bh=DA4cdwYFOuFF/2XYQwjl794CyWvqKVChXCM7I2sIj00=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E+bBn7JhQ28DNa3BwnupWS6zq0YYoqHOqalcZeMyCdL8VrM3TpxsXEC5JrlBdkHCs0dULLtDImffeeJtdNjDi9uMr9yzDjOrOIYDwc+T/Mkk3AT/+EcVvmzFqXmGc2y2C/yRa07Yjf0XQHTCGWdW0EiBYebEzY26ZJKG77gv6eM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Sb40yoig; arc=none smtp.client-ip=91.218.175.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Sb40yoig" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yqyRtFoksXMdrJOF9ulNDpslD4TUkqibldpwg5eBYnY=; b=Sb40yoigBeYKt4wzQr1cyVgr8EqJXeIQ8eTgjLhirenckGTyMag0z41rP49fCSYYCq7lt8 FnHCbvzE+EGKReJ9qIyV6S4jaPkZHxg+An4qsbbvXJBi8Cfip1s8yJO/k1nbwP2oW/bLR9 MEWa0ZUKKVXS9lTlIfjjdHlt7FVDiKA= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 2/9] bpf: Introduce global percpu data Date: Mon, 13 Jul 2026 23:40:17 +0800 Message-ID: <20260713154024.30851-3-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Introduce global percpu data, inspired by the commit 6316f78306c1 ("Merge branch 'support-global-data'"). It enables the definition of global percpu variables in BPF, similar to the include/linux/percpu-defs.h::DEFINE_PER_CPU() macro. For example, in BPF, it is able to define a global percpu variable like: int data SEC(".percpu"); With this patch, tools like retsnoop [1] and bpfsnoop [2] can simplify their BPF code for handling LBRs. The code can be updated from static struct perf_branch_entry lbrs[1][MAX_LBR_ENTRIES] SEC(".data.lbrs"); to static struct perf_branch_entry lbrs[MAX_LBR_ENTRIES] SEC(".percpu.lbrs"); This eliminates the need to retrieve the CPU ID using the bpf_get_smp_processor_id() helper. Additionally, by reusing global percpu data map, sharing information between tail callers and callees or freplace callers and callees becomes simpler compared to reusing percpu_array maps. Links: [1] https://github.com/anakryiko/retsnoop [2] https://github.com/bpfsnoop/bpfsnoop Signed-off-by: Leon Hwang --- kernel/bpf/arraymap.c | 38 ++++++++++++++++++++++++++++++++++++-- kernel/bpf/const_fold.c | 1 - kernel/bpf/fixups.c | 38 ++++++++++++++++++++++++++++++++++++++ kernel/bpf/verifier.c | 15 +++++++++++++++ 4 files changed, 89 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 248b4818178c..c4e9430941e5 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -259,6 +259,37 @@ static void *percpu_array_map_lookup_elem(struct bpf_m= ap *map, void *key) return this_cpu_ptr(array->pptrs[index & array->index_mask]); } =20 +static int percpu_array_map_direct_value_addr(const struct bpf_map *map, u= 64 *imm, u32 off) +{ + struct bpf_array *array =3D container_of(map, struct bpf_array, map); + + if (map->max_entries !=3D 1) + return -EOPNOTSUPP; + if (off >=3D map->value_size) + return -EINVAL; + if (!bpf_jit_supports_percpu_insn()) + return -EOPNOTSUPP; + + *imm =3D (u64)(__force unsigned long) array->pptrs[0]; + return 0; +} + +static int percpu_array_map_direct_value_meta(const struct bpf_map *map, u= 64 imm, u32 *off) +{ + struct bpf_array *array =3D container_of(map, struct bpf_array, map); + u64 base =3D (u64)(__force unsigned long) array->pptrs[0]; + + if (map->max_entries !=3D 1) + return -EOPNOTSUPP; + if (imm < base || imm >=3D base + array->elem_size) + return -ENOENT; + if (!bpf_jit_supports_percpu_insn()) + return -EOPNOTSUPP; + + *off =3D imm - base; + return 0; +} + /* emit BPF instructions equivalent to C code of percpu_array_map_lookup_e= lem() */ static int percpu_array_map_gen_lookup(struct bpf_map *map, struct bpf_ins= n *insn_buf) { @@ -551,9 +582,10 @@ static int array_map_check_btf(struct bpf_map *map, const struct btf_type *key_type, const struct btf_type *value_type) { - /* One exception for keyless BTF: .bss/.data/.rodata map */ + /* One exception for keyless BTF: .bss/.data/.rodata/.percpu map */ if (btf_type_is_void(key_type)) { - if (map->map_type !=3D BPF_MAP_TYPE_ARRAY || + if ((map->map_type !=3D BPF_MAP_TYPE_ARRAY && + map->map_type !=3D BPF_MAP_TYPE_PERCPU_ARRAY) || map->max_entries !=3D 1) return -EINVAL; =20 @@ -832,6 +864,8 @@ const struct bpf_map_ops percpu_array_map_ops =3D { .map_get_next_key =3D bpf_array_get_next_key, .map_lookup_elem =3D percpu_array_map_lookup_elem, .map_gen_lookup =3D percpu_array_map_gen_lookup, + .map_direct_value_addr =3D percpu_array_map_direct_value_addr, + .map_direct_value_meta =3D percpu_array_map_direct_value_meta, .map_update_elem =3D array_map_update_elem, .map_delete_elem =3D array_map_delete_elem, .map_lookup_percpu_elem =3D percpu_array_map_lookup_percpu_elem, diff --git a/kernel/bpf/const_fold.c b/kernel/bpf/const_fold.c index b2a19acadb91..5787246bef30 100644 --- a/kernel/bpf/const_fold.c +++ b/kernel/bpf/const_fold.c @@ -182,7 +182,6 @@ static void const_reg_xfer(struct bpf_verifier_env *env= , struct const_arg_info * u64 val =3D 0; =20 if (!bpf_map_is_rdonly(map) || !map->ops->map_direct_value_addr || - map->map_type =3D=3D BPF_MAP_TYPE_INSN_ARRAY || off < 0 || off + size > map->value_size || bpf_map_direct_read(map, off, size, &val, is_ldsx)) { *dst =3D unknown; diff --git a/kernel/bpf/fixups.c b/kernel/bpf/fixups.c index d3be972714b2..02642bba73e5 100644 --- a/kernel/bpf/fixups.c +++ b/kernel/bpf/fixups.c @@ -1818,6 +1818,44 @@ int bpf_do_misc_fixups(struct bpf_verifier_env *env) goto next_insn; } =20 + if (env->prog->jit_requested && + bpf_jit_supports_percpu_insn() && + insn->code =3D=3D (BPF_LD | BPF_IMM | BPF_DW) && + (insn->src_reg =3D=3D BPF_PSEUDO_MAP_VALUE || + insn->src_reg =3D=3D BPF_PSEUDO_MAP_IDX_VALUE)) { + struct bpf_map *map; + + aux =3D &env->insn_aux_data[i + delta]; + map =3D env->used_maps[aux->map_index]; + if (map->map_type !=3D BPF_MAP_TYPE_PERCPU_ARRAY) + goto next_insn; + + prog->jit_required =3D true; + + /* + * We are *skipping* first half of ld_imm64 insn + * with 'i++;', patching over second half of it + * with that same half + mov64_percpu_reg insn. + * All because bpf_patch_insn_data() can only + * replace one 8-byte insn, which does not work + * well for ld_imm64 insn. + */ + + insn_buf[0] =3D insn[1]; + insn_buf[1] =3D BPF_MOV64_PERCPU_REG(insn->dst_reg, insn->dst_reg); + cnt =3D 2; + + i++; + new_prog =3D bpf_patch_insn_data(env, i + delta, insn_buf, cnt); + if (!new_prog) + return -ENOMEM; + + delta +=3D cnt - 1; + env->prog =3D prog =3D new_prog; + insn =3D new_prog->insnsi + i + delta; + goto next_insn; + } + if (insn->code !=3D (BPF_JMP | BPF_CALL)) goto next_insn; if (insn->src_reg =3D=3D BPF_PSEUDO_CALL) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index b5666a75a273..1ef5a3a0230d 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -5636,6 +5636,8 @@ int bpf_map_direct_read(struct bpf_map *map, int off,= int size, u64 *val, u64 addr; int err; =20 + if (map->map_type =3D=3D BPF_MAP_TYPE_INSN_ARRAY || map->map_type =3D=3D = BPF_MAP_TYPE_PERCPU_ARRAY) + return -EINVAL; err =3D map->ops->map_direct_value_addr(map, &addr, off); if (err) return err; @@ -6195,6 +6197,7 @@ static int check_mem_access(struct bpf_verifier_env *= env, int insn_idx, struct b if (tnum_is_const(reg->var_off) && bpf_map_is_rdonly(map) && map->ops->map_direct_value_addr && + map->map_type !=3D BPF_MAP_TYPE_PERCPU_ARRAY && map->map_type !=3D BPF_MAP_TYPE_INSN_ARRAY) { int map_off =3D off + reg->var_off.value; u64 val =3D 0; @@ -8182,6 +8185,12 @@ static int check_arg_const_str(struct bpf_verifier_e= nv *env, return -EACCES; } =20 + if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) { + verbose(env, "%s points to percpu_array map which cannot be used as cons= t string\n", + reg_arg_name(env, argno)); + return -EACCES; + } + if (!bpf_map_is_rdonly(map)) { verbose(env, "%s does not point to a readonly map'\n", reg_arg_name(env,= argno)); return -EACCES; @@ -18323,6 +18332,12 @@ static int check_and_resolve_insns(struct bpf_veri= fier_env *env) return -EINVAL; } =20 + if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY && + !env->prog->jit_requested) { + verbose(env, "JIT is required to use global percpu data\n"); + return -EOPNOTSUPP; + } + err =3D map->ops->map_direct_value_addr(map, &addr, off); if (err) { verbose(env, "invalid access to map value pointer, value_size=3D%u of= f=3D%u\n", --=20 2.55.0 From nobody Sat Jul 25 21:18:44 2026 Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) (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 8CEF443B3CB for ; Mon, 13 Jul 2026 15:40:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957253; cv=none; b=QKT5DLdjIAkISHrByoBABxZzhPRPaFif77aLxs+RO5zNAlxL68TfmEeTXROWvLywo4bIua4GEjwLkyu0Z5te3d9DjXhpMWAJP+EGzbWZrEHEr9pT0f7Abg/e11jgXcwRGmO9fwY0U25yaLrGRKhHac/ll6PVdPOUQSULE925Yso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957253; c=relaxed/simple; bh=C88f278chIaEJJAdQbh1l7mNoy3eQE9pTZD+uwhdNtg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CgsaPEQlAbZPhfDppeDNWtXrqYX+CIu86eh7w6VuxJWwCBT7wsJ96Y1GtNLBv3sia+H8RJ40cj+OYqiyRq0KnrSZz3q4oSRFfgBgHfDrSLAS3A7FHyCgBWcs6jkzNIvUTIOIACim5T9y1rKjd2bwy1o32mQ6bUypV1l35j48Yn8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=d5D4p3xs; arc=none smtp.client-ip=91.218.175.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="d5D4p3xs" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iqcT0c5+/T9YfND+JhfpyEeMFUEVTiMyL+yzUXTMIqs=; b=d5D4p3xs0JZu93Hd4tY/0/M8V4OxYRAici3V7teqcj9eyGPGIPspWc+rWeep4FEx4eo1/Q Ndr/Aq0VlE9NPHCNoXzGCZo6kjWwHK2gm4IVt5/kHm4ov4qzgMqFweIq1tBOSoZISJUo0t XYl1PQWK69/znQbNqSXmTMLciScvbyc= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 3/9] libbpf: Probe percpu data feature Date: Mon, 13 Jul 2026 23:40:18 +0800 Message-ID: <20260713154024.30851-4-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" libbpf needs a reliable way to distinguish kernels that can support global percpu data from those that cannot. Add a dedicated feature probe, so libbpf can make capability decisions early and fail predictably when global percpu data is unavailable. Acked-by: Andrii Nakryiko Signed-off-by: Leon Hwang --- tools/lib/bpf/features.c | 35 +++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf_internal.h | 2 ++ 2 files changed, 37 insertions(+) diff --git a/tools/lib/bpf/features.c b/tools/lib/bpf/features.c index b7e388f99d0b..ef9581c11303 100644 --- a/tools/lib/bpf/features.c +++ b/tools/lib/bpf/features.c @@ -620,6 +620,38 @@ static int probe_bpf_syscall_common_attrs(int token_fd) return probe_sys_bpf_ext(); } =20 +static int probe_kern_percpu_data(int token_fd) +{ + struct bpf_insn insns[] =3D { + BPF_LD_MAP_VALUE(BPF_REG_1, 0, 0), + BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, 0), + BPF_EXIT_INSN(), + }; + LIBBPF_OPTS(bpf_map_create_opts, map_opts, + .token_fd =3D token_fd, + .map_flags =3D token_fd ? BPF_F_TOKEN_FD : 0, + ); + LIBBPF_OPTS(bpf_prog_load_opts, prog_opts, + .token_fd =3D token_fd, + .prog_flags =3D token_fd ? BPF_F_TOKEN_FD : 0, + ); + int ret, map, insn_cnt =3D ARRAY_SIZE(insns); + + map =3D bpf_map_create(BPF_MAP_TYPE_PERCPU_ARRAY, "libbpf_percpu", sizeof= (int), 8, 1, + &map_opts); + if (map < 0) { + pr_warn("Error in %s(): %s. Couldn't create simple percpu_array map.\n", + __func__, errstr(map)); + return map; + } + + insns[0].imm =3D map; + + ret =3D bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, NULL, "GPL", insns, in= sn_cnt, &prog_opts); + close(map); + return probe_fd(ret); +} + typedef int (*feature_probe_fn)(int /* token_fd */); =20 static struct kern_feature_cache feature_cache; @@ -707,6 +739,9 @@ static struct kern_feature_desc { [FEAT_BPF_SYSCALL_COMMON_ATTRS] =3D { "BPF syscall common attributes support", probe_bpf_syscall_common_attrs, }, + [FEAT_PERCPU_DATA] =3D { + "kernel supports percpu data", probe_kern_percpu_data, + }, }; =20 bool feat_supported(struct kern_feature_cache *cache, enum kern_feature_id= feat_id) diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_interna= l.h index d5b7db703b3f..b786f1a35567 100644 --- a/tools/lib/bpf/libbpf_internal.h +++ b/tools/lib/bpf/libbpf_internal.h @@ -401,6 +401,8 @@ enum kern_feature_id { FEAT_BTF_LAYOUT, /* Kernel supports BPF syscall common attributes */ FEAT_BPF_SYSCALL_COMMON_ATTRS, + /* Kernel supports percpu data */ + FEAT_PERCPU_DATA, __FEAT_CNT, }; =20 --=20 2.55.0 From nobody Sat Jul 25 21:18:44 2026 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) (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 624333DE44D for ; Mon, 13 Jul 2026 15:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957257; cv=none; b=tORs0BKbq/Jzc68+YNw4ThIVwPuyqlF7t2TQD9yC/Xx77t8h/+2tg8ukCCWUPu8wvfNhrkncQp783ZbG98CIeP548D0segUInFEEGQyit6xtxhTIHtfhuGLhiUlB+B+pttSjdb5ckvNEITu/aXzx6K4NlcfvpruvtQwojFJ1dqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957257; c=relaxed/simple; bh=ey2FkOYV0HOt9y84j/xH2sahyftxCCkR/7uwsK+DwrA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=npiPNzxWRwcSss+ru7rvwaFrbalSmAPVtPTuEBRbulV2PUGL0CfCt2jGOprbX38YrQOoUxD4RHWRluAwU9IweoLi43oKtGUGmydEQMSY3705hTGLHTPNKEZfe2geUrLQ8CYvIFyAVHYwyVDhX4BW5rdqJdkxRawXQEm+znopk0g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=JJxpda/D; arc=none smtp.client-ip=91.218.175.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="JJxpda/D" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PlMlp2TY6xC+mBkDyBNDRqqCEjP22tcpGGOvHehlGgg=; b=JJxpda/DY0aLKpyvNKoYWCZuMhVopfZtmY2dxqQDiJYIIIdJoWB4DL8IZj1xjWbwjOLvWV DUnEfCrMpR4H42qtaxW8UffzpIJMuHakGmw3ZNAYbZTsfqRbofeUxupIIDbcbSo0XsmsgJ bgdkc0MoV5Anub2XIUOEBR1qyfmfAOY= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 4/9] libbpf: Add support for global percpu data Date: Mon, 13 Jul 2026 23:40:19 +0800 Message-ID: <20260713154024.30851-5-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Add support for global percpu data in libbpf by adding a new ".percpu" section, similar to ".data". It enables efficient handling of percpu global variables in bpf programs. When generating loader for lightweight skeleton, update the percpu_array map used for global percpu data using BPF_F_ALL_CPUS, in order to update values across all CPUs using one value slot. Unlike global data, the mmaped data for global percpu data will be marked as read-only after populating the percpu_array map. Thereafter, users can read those initialized percpu data after loading prog. If they want to update the percpu data after loading prog, they have to update the percpu_array map using key=3D0 instead. Signed-off-by: Leon Hwang --- tools/lib/bpf/bpf_gen_internal.h | 3 +- tools/lib/bpf/gen_loader.c | 3 +- tools/lib/bpf/libbpf.c | 72 +++++++++++++++++++++++++++----- 3 files changed, 65 insertions(+), 13 deletions(-) diff --git a/tools/lib/bpf/bpf_gen_internal.h b/tools/lib/bpf/bpf_gen_inter= nal.h index 042569187752..6c5ad6c55e8a 100644 --- a/tools/lib/bpf/bpf_gen_internal.h +++ b/tools/lib/bpf/bpf_gen_internal.h @@ -65,7 +65,8 @@ void bpf_gen__prog_load(struct bpf_gen *gen, enum bpf_prog_type prog_type, const char *prog_name, const char *license, struct bpf_insn *insns, size_t insn_cnt, struct bpf_prog_load_opts *load_attr, int prog_idx); -void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *valu= e, __u32 value_size); +void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *valu= e, __u32 value_size, + __u64 flags); void bpf_gen__map_freeze(struct bpf_gen *gen, int map_idx); void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *name, = enum bpf_attach_type type); void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, bool is= _weak, diff --git a/tools/lib/bpf/gen_loader.c b/tools/lib/bpf/gen_loader.c index 6e3dd5242761..af3a04f161ac 100644 --- a/tools/lib/bpf/gen_loader.c +++ b/tools/lib/bpf/gen_loader.c @@ -1128,7 +1128,7 @@ void bpf_gen__prog_load(struct bpf_gen *gen, } =20 void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *pval= ue, - __u32 value_size) + __u32 value_size, __u64 flags) { int attr_size =3D offsetofend(union bpf_attr, flags); int map_update_attr, value, key; @@ -1136,6 +1136,7 @@ void bpf_gen__map_update_elem(struct bpf_gen *gen, in= t map_idx, void *pvalue, int zero =3D 0; =20 memset(&attr, 0, attr_size); + attr.flags =3D tgt_endian(flags); =20 value =3D add_data(gen, pvalue, value_size); key =3D add_data(gen, &zero, sizeof(zero)); diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index f88b7c8de304..e4104d18521b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -541,6 +541,7 @@ struct bpf_struct_ops { }; =20 #define DATA_SEC ".data" +#define PERCPU_SEC ".percpu" #define BSS_SEC ".bss" #define RODATA_SEC ".rodata" #define KCONFIG_SEC ".kconfig" @@ -555,6 +556,7 @@ enum libbpf_map_type { LIBBPF_MAP_BSS, LIBBPF_MAP_RODATA, LIBBPF_MAP_KCONFIG, + LIBBPF_MAP_PERCPU, }; =20 struct bpf_map_def { @@ -666,6 +668,7 @@ enum sec_type { SEC_DATA, SEC_RODATA, SEC_ST_OPS, + SEC_PERCPU, }; =20 struct elf_sec_desc { @@ -1839,6 +1842,8 @@ static size_t bpf_map_mmap_sz(const struct bpf_map *m= ap) switch (map->def.type) { case BPF_MAP_TYPE_ARRAY: return array_map_mmap_sz(map->def.value_size, map->def.max_entries); + case BPF_MAP_TYPE_PERCPU_ARRAY: + return map->def.value_size; case BPF_MAP_TYPE_ARENA: return page_sz * map->def.max_entries; default: @@ -1866,7 +1871,8 @@ static int bpf_map_mmap_resize(struct bpf_map *map, s= ize_t old_sz, size_t new_sz return 0; } =20 -static char *internal_map_name(struct bpf_object *obj, const char *real_na= me) +static char *internal_map_name(struct bpf_object *obj, const char *real_na= me, + enum libbpf_map_type type) { char map_name[BPF_OBJ_NAME_LEN], *p; int pfx_len, sfx_len =3D max((size_t)7, strlen(real_name)); @@ -1907,8 +1913,11 @@ static char *internal_map_name(struct bpf_object *ob= j, const char *real_name) if (sfx_len >=3D BPF_OBJ_NAME_LEN) sfx_len =3D BPF_OBJ_NAME_LEN - 1; =20 - /* if there are two or more dots in map name, it's a custom dot map */ - if (strchr(real_name + 1, '.') !=3D NULL) + /* + * Don't prefix the bpf_object name if this is a custom dot map + * (containing two or more dots) or a percpu data map. + */ + if (strchr(real_name + 1, '.') !=3D NULL || type =3D=3D LIBBPF_MAP_PERCPU) pfx_len =3D 0; else pfx_len =3D min((size_t)BPF_OBJ_NAME_LEN - sfx_len - 1, strlen(obj->name= )); @@ -1938,7 +1947,7 @@ static bool map_is_mmapable(struct bpf_object *obj, s= truct bpf_map *map) struct btf_var_secinfo *vsi; int i, n; =20 - if (!map->btf_value_type_id) + if (!map->btf_value_type_id || map->libbpf_type =3D=3D LIBBPF_MAP_PERCPU) return false; =20 t =3D btf__type_by_id(obj->btf, map->btf_value_type_id); @@ -1962,6 +1971,7 @@ static int bpf_object__init_internal_map(struct bpf_object *obj, enum libbpf_map_type= type, const char *real_name, int sec_idx, void *data, size_t data_sz) { + bool is_percpu =3D type =3D=3D LIBBPF_MAP_PERCPU; struct bpf_map_def *def; struct bpf_map *map; size_t mmap_sz; @@ -1975,7 +1985,7 @@ bpf_object__init_internal_map(struct bpf_object *obj,= enum libbpf_map_type type, map->sec_idx =3D sec_idx; map->sec_offset =3D 0; map->real_name =3D strdup(real_name); - map->name =3D internal_map_name(obj, real_name); + map->name =3D internal_map_name(obj, real_name, type); if (!map->real_name || !map->name) { zfree(&map->real_name); zfree(&map->name); @@ -1983,7 +1993,7 @@ bpf_object__init_internal_map(struct bpf_object *obj,= enum libbpf_map_type type, } =20 def =3D &map->def; - def->type =3D BPF_MAP_TYPE_ARRAY; + def->type =3D is_percpu ? BPF_MAP_TYPE_PERCPU_ARRAY : BPF_MAP_TYPE_ARRAY; def->key_size =3D sizeof(int); def->value_size =3D data_sz; def->max_entries =3D 1; @@ -1996,8 +2006,9 @@ bpf_object__init_internal_map(struct bpf_object *obj,= enum libbpf_map_type type, if (map_is_mmapable(obj, map)) def->map_flags |=3D BPF_F_MMAPABLE; =20 - pr_debug("map '%s' (global data): at sec_idx %d, offset %zu, flags %x.\n", - map->name, map->sec_idx, map->sec_offset, def->map_flags); + pr_debug("map '%s' (global %sdata): at sec_idx %d, offset %zu, flags %x.\= n", + map->name, is_percpu ? "percpu " : "", map->sec_idx, + map->sec_offset, def->map_flags); =20 mmap_sz =3D bpf_map_mmap_sz(map); map->mmaped =3D mmap(NULL, mmap_sz, PROT_READ | PROT_WRITE, @@ -2057,6 +2068,13 @@ static int bpf_object__init_global_data_maps(struct = bpf_object *obj) NULL, sec_desc->data->d_size); break; + case SEC_PERCPU: + sec_name =3D elf_sec_name(obj, elf_sec_by_idx(obj, sec_idx)); + err =3D bpf_object__init_internal_map(obj, LIBBPF_MAP_PERCPU, + sec_name, sec_idx, + sec_desc->data->d_buf, + sec_desc->data->d_size); + break; default: /* skip */ break; @@ -4016,6 +4034,11 @@ static int bpf_object__elf_collect(struct bpf_object= *obj) sec_desc->sec_type =3D SEC_RODATA; sec_desc->shdr =3D sh; sec_desc->data =3D data; + } else if (strcmp(name, PERCPU_SEC) =3D=3D 0 || + str_has_pfx(name, PERCPU_SEC ".")) { + sec_desc->sec_type =3D SEC_PERCPU; + sec_desc->shdr =3D sh; + sec_desc->data =3D data; } else if (strcmp(name, STRUCT_OPS_SEC) =3D=3D 0 || strcmp(name, STRUCT_OPS_LINK_SEC) =3D=3D 0 || strcmp(name, "?" STRUCT_OPS_SEC) =3D=3D 0 || @@ -4544,6 +4567,7 @@ static bool bpf_object__shndx_is_data(const struct bp= f_object *obj, case SEC_BSS: case SEC_DATA: case SEC_RODATA: + case SEC_PERCPU: return true; default: return false; @@ -4569,6 +4593,8 @@ bpf_object__section_to_libbpf_map_type(const struct b= pf_object *obj, int shndx) return LIBBPF_MAP_DATA; case SEC_RODATA: return LIBBPF_MAP_RODATA; + case SEC_PERCPU: + return LIBBPF_MAP_PERCPU; default: return LIBBPF_MAP_UNSPEC; } @@ -4944,7 +4970,7 @@ static int map_fill_btf_type_info(struct bpf_object *= obj, struct bpf_map *map) =20 /* * LLVM annotates global data differently in BTF, that is, - * only as '.data', '.bss' or '.rodata'. + * only as '.data', '.bss', '.percpu' or '.rodata'. */ if (!bpf_map__is_internal(map)) return -ENOENT; @@ -5293,18 +5319,30 @@ static int bpf_object__populate_internal_map(struct bpf_object *obj, struct bpf_map *= map) { enum libbpf_map_type map_type =3D map->libbpf_type; + bool is_percpu =3D map_type =3D=3D LIBBPF_MAP_PERCPU; + __u64 update_flags =3D 0; int err, zero =3D 0; size_t mmap_sz; =20 + if (is_percpu) { + if (!obj->gen_loader && !kernel_supports(obj, FEAT_PERCPU_DATA)) { + pr_warn("map '%s': kernel does not support percpu data.\n", + bpf_map__name(map)); + return -EOPNOTSUPP; + } + + update_flags =3D BPF_F_ALL_CPUS; + } + if (obj->gen_loader) { bpf_gen__map_update_elem(obj->gen_loader, map - obj->maps, - map->mmaped, map->def.value_size); + map->mmaped, map->def.value_size, update_flags); if (map_type =3D=3D LIBBPF_MAP_RODATA || map_type =3D=3D LIBBPF_MAP_KCON= FIG) bpf_gen__map_freeze(obj->gen_loader, map - obj->maps); return 0; } =20 - err =3D bpf_map_update_elem(map->fd, &zero, map->mmaped, 0); + err =3D bpf_map_update_elem(map->fd, &zero, map->mmaped, update_flags); if (err) { err =3D -errno; pr_warn("map '%s': failed to set initial contents: %s\n", @@ -5349,6 +5387,13 @@ bpf_object__populate_internal_map(struct bpf_object = *obj, struct bpf_map *map) return err; } map->mmaped =3D mmaped; + } else if (is_percpu) { + if (mprotect(map->mmaped, mmap_sz, PROT_READ)) { + err =3D -errno; + pr_warn("map '%s': failed to mprotect() contents: %s\n", + bpf_map__name(map), errstr(err)); + return err; + } } else if (map->mmaped) { munmap(map->mmaped, mmap_sz); map->mmaped =3D NULL; @@ -10807,11 +10852,16 @@ static bool map_uses_real_name(const struct bpf_m= ap *map) * such map's corresponding ELF section name as a map name. * This check distinguishes .data/.rodata from .data.* and .rodata.* * maps to know which name has to be returned to the user. + * Map name of the custom .percpu.* maps might be truncated to + * BPF_OBJ_NAME_LEN-1 chars in internal_map_name(). Hence, percpu data + * maps must use real name for their user-visible name. */ if (map->libbpf_type =3D=3D LIBBPF_MAP_DATA && strcmp(map->real_name, DAT= A_SEC) !=3D 0) return true; if (map->libbpf_type =3D=3D LIBBPF_MAP_RODATA && strcmp(map->real_name, R= ODATA_SEC) !=3D 0) return true; + if (map->libbpf_type =3D=3D LIBBPF_MAP_PERCPU) + return true; return false; } =20 --=20 2.55.0 From nobody Sat Jul 25 21:18:44 2026 Received: from out-187.mta1.migadu.com (out-187.mta1.migadu.com [95.215.58.187]) (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 B62C43E022E for ; Mon, 13 Jul 2026 15:41:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957278; cv=none; b=L8XJNS1G8xET3tvsb0AfeKtbPvIJoLXT0sz3EKluFTgw9uEyXB1YCgra8U7AX1XdvOie6pIN8nxbk9NjMEti07T2ELuQcCKMODHcEFVJhhTMWRGf26bv9G93HxLUApbM2PckJ59b+n3iGVGhyBzxaU/s6/uuNXX2qVHDTXMwJ24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957278; c=relaxed/simple; bh=5Gs9lpB29potX4QnrvDusLVJ/aaMcUDBRLbQ9GJSD5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rt4mt4oTmNd175jNfg/RiWwz8MjSHMW2/8nHplh4eNQyceVNUX1ii9qfSi0jUYxguFF8BuSAfxa8TkjsZlyG7UXaHy+xtMTL9xUawjWfzLKV89Hd2F8Pnk33AGJULLRBrJYYOlbPu3kdUxYYm8ppnY5NLAhy0UblE3Y2yZdZnP4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=MsCFmQmV; arc=none smtp.client-ip=95.215.58.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="MsCFmQmV" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hzeBVrq6hHQ0NkIFbRun2A7rrCztpk43QeGTJlPzK+w=; b=MsCFmQmVppb158pOGcSHmN3ZPT7M7IXnKgKGVKqyFo7zDokyiPPw1vANv9jHZr84IUXfNL WZkiek8ldyz29b+dXK0e1pHCUsvtC5kG5wvPalx2KCpwJWSPkvNvi9dqDWirSRik1u6YCE c92xprpFE4RjYFJDMk8Pqd6ZZr79SYM= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 5/9] bpftool: Generate skeleton for global percpu data Date: Mon, 13 Jul 2026 23:40:20 +0800 Message-ID: <20260713154024.30851-6-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Enhance bpftool to generate skeletons that properly handle global percpu variables. The generated skeleton now includes a dedicated structure for percpu data, allowing users to initialize and access percpu variables more efficiently. For global percpu variables, the skeleton now includes a nested structure, e.g.: struct test_global_percpu_data { struct bpf_object_skeleton *skeleton; struct bpf_object *obj; struct { struct bpf_map *percpu; } maps; // ... struct test_global_percpu_data__percpu { int data; char run; struct { char set; int i; int nums[7]; } struct_data; int nums[7]; } *percpu; // ... }; * The "struct test_global_percpu_data__percpu *percpu" points to initialized data, which is actually "maps.percpu->mmaped". * Before loading the skeleton, updating the "struct test_global_percpu_data__percpu *percpu" modifies the initial value of the corresponding global percpu variables. * After loading the skeleton, "maps.percpu->mmaped" has been marked as read-only in libbpf. If users want to update the global percpu variables, they have to update the "maps.percpu" map instead. * For lightweight skeleton, "lskel->percpu" will be protected by "mprotect(p, sz, PROT_READ)". * For subskeleton, those variables of global percpu data will be skipped. Acked-by: Quentin Monnet Assisted-by: Codex:gpt-5.5-xhigh Signed-off-by: Leon Hwang --- tools/bpf/bpftool/gen.c | 76 +++++++++++++++++++++++++++-------- tools/lib/bpf/skel_internal.h | 24 ++++++++++- 2 files changed, 81 insertions(+), 19 deletions(-) diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c index a01d06d22d1a..b60db1108149 100644 --- a/tools/bpf/bpftool/gen.c +++ b/tools/bpf/bpftool/gen.c @@ -101,6 +101,12 @@ static bool get_map_ident(const struct bpf_map *map, c= har *buf, size_t buf_sz) return true; } =20 + if (bpf_map__type(map) =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) { + snprintf(buf, buf_sz, "%s", name + 1); + sanitize_identifier(buf); + return true; + } + for (i =3D 0, n =3D ARRAY_SIZE(sfxs); i < n; i++) { const char *sfx =3D sfxs[i], *p; =20 @@ -117,7 +123,7 @@ static bool get_map_ident(const struct bpf_map *map, ch= ar *buf, size_t buf_sz) =20 static bool get_datasec_ident(const char *sec_name, char *buf, size_t buf_= sz) { - static const char *pfxs[] =3D { ".data", ".rodata", ".bss", ".kconfig" }; + static const char *pfxs[] =3D { ".data", ".rodata", ".bss", ".percpu", ".= kconfig" }; int i, n; =20 /* recognize hard coded LLVM section name */ @@ -254,7 +260,7 @@ static const struct btf_type *find_type_for_map(struct = btf *btf, const char *map return NULL; } =20 -static bool is_mmapable_map(const struct bpf_map *map, char *buf, size_t s= z) +static bool is_skel_data(const struct bpf_map *map, char *buf, size_t sz) { size_t tmp_sz; =20 @@ -263,13 +269,19 @@ static bool is_mmapable_map(const struct bpf_map *map= , char *buf, size_t sz) return true; } =20 - if (!bpf_map__is_internal(map) || !(bpf_map__map_flags(map) & BPF_F_MMAPA= BLE)) + if (!bpf_map__is_internal(map)) return false; =20 if (!get_map_ident(map, buf, sz)) return false; =20 - return true; + if (bpf_map__map_flags(map) & BPF_F_MMAPABLE) + return true; + + if (bpf_map__type(map) =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) + return true; + + return false; } =20 static int codegen_datasecs(struct bpf_object *obj, const char *obj_name) @@ -286,8 +298,11 @@ static int codegen_datasecs(struct bpf_object *obj, co= nst char *obj_name) return -errno; =20 bpf_object__for_each_map(map, obj) { - /* only generate definitions for memory-mapped internal maps */ - if (!is_mmapable_map(map, map_ident, sizeof(map_ident))) + /* + * Only generate definitions for internal maps that have + * mmapped data. + */ + if (!is_skel_data(map, map_ident, sizeof(map_ident))) continue; =20 sec =3D find_type_for_map(btf, map_ident); @@ -339,8 +354,14 @@ static int codegen_subskel_datasecs(struct bpf_object = *obj, const char *obj_name return -errno; =20 bpf_object__for_each_map(map, obj) { - /* only generate definitions for memory-mapped internal maps */ - if (!is_mmapable_map(map, map_ident, sizeof(map_ident))) + /* + * Only generate definitions for internal maps that have + * mmapped data. + */ + if (!is_skel_data(map, map_ident, sizeof(map_ident))) + continue; + + if (bpf_map__type(map) =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) continue; =20 sec =3D find_type_for_map(btf, map_ident); @@ -493,7 +514,10 @@ static size_t bpf_map_mmap_sz(const struct bpf_map *ma= p) return map_sz; } =20 -/* Emit type size asserts for all top-level fields in memory-mapped intern= al maps. */ +/* + * Emit type size asserts for all top-level fields in internal maps that + * have mmaped data. + */ static void codegen_asserts(struct bpf_object *obj, const char *obj_name) { struct btf *btf =3D bpf_object__btf(obj); @@ -517,7 +541,7 @@ static void codegen_asserts(struct bpf_object *obj, con= st char *obj_name) ", obj_name); =20 bpf_object__for_each_map(map, obj) { - if (!is_mmapable_map(map, map_ident, sizeof(map_ident))) + if (!is_skel_data(map, map_ident, sizeof(map_ident))) continue; =20 sec =3D find_type_for_map(btf, map_ident); @@ -669,7 +693,8 @@ static void codegen_destroy(struct bpf_object *obj, con= st char *obj_name) if (!get_map_ident(map, ident, sizeof(ident))) continue; if (bpf_map__is_internal(map) && - (bpf_map__map_flags(map) & BPF_F_MMAPABLE)) + ((bpf_map__map_flags(map) & BPF_F_MMAPABLE) || + bpf_map__type(map) =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY)) printf("\tskel_free_map_data(skel->%1$s, skel->maps.%1$s.initial_value,= %2$zu);\n", ident, bpf_map_mmap_sz(map)); codegen("\ @@ -741,7 +766,7 @@ static int gen_trace(struct bpf_object *obj, const char= *obj_name, const char *h const void *mmap_data =3D NULL; size_t mmap_size =3D 0; =20 - if (!is_mmapable_map(map, ident, sizeof(ident))) + if (!is_skel_data(map, ident, sizeof(ident))) continue; =20 codegen("\ @@ -849,8 +874,22 @@ static int gen_trace(struct bpf_object *obj, const cha= r *obj_name, const char *h bpf_object__for_each_map(map, obj) { const char *mmap_flags; =20 - if (!is_mmapable_map(map, ident, sizeof(ident))) + if (!is_skel_data(map, ident, sizeof(ident))) + continue; + + if (bpf_map__type(map) =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) { + codegen("\ + \n\ + err =3D skel_protect_map_data(skel->%1$s, &skel->maps.%1$s.initial_valu= e, %2$zd);\n\ + if (err) \n\ + return err; \n\ + #ifdef __KERNEL__ \n\ + skel->%1$s =3D NULL; \n\ + #endif \n\ + ", + ident, bpf_map_mmap_sz(map)); continue; + } =20 if (bpf_map__map_flags(map) & BPF_F_RDONLY_PROG) mmap_flags =3D "PROT_READ"; @@ -955,8 +994,7 @@ codegen_maps_skeleton(struct bpf_object *obj, size_t ma= p_cnt, bool mmaped, bool map->map =3D &obj->maps.%s; \n\ ", i, bpf_map__name(map), ident); - /* memory-mapped internal maps */ - if (mmaped && is_mmapable_map(map, ident, sizeof(ident))) { + if (mmaped && is_skel_data(map, ident, sizeof(ident))) { printf("\tmap->mmaped =3D (void **)&obj->%s;\n", ident); } =20 @@ -1740,7 +1778,9 @@ static int do_subskeleton(int argc, char **argv) /* Also count all maps that have a name */ map_cnt++; =20 - if (!is_mmapable_map(map, ident, sizeof(ident))) + if (!is_skel_data(map, ident, sizeof(ident))) + continue; + if (bpf_map__type(map) =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) continue; =20 map_type_id =3D bpf_map__btf_value_type_id(map); @@ -1863,7 +1903,9 @@ static int do_subskeleton(int argc, char **argv) =20 /* walk through each symbol and emit the runtime representation */ bpf_object__for_each_map(map, obj) { - if (!is_mmapable_map(map, ident, sizeof(ident))) + if (!is_skel_data(map, ident, sizeof(ident))) + continue; + if (bpf_map__type(map) =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) continue; =20 map_type_id =3D bpf_map__btf_value_type_id(map); diff --git a/tools/lib/bpf/skel_internal.h b/tools/lib/bpf/skel_internal.h index 53fee53d36d5..1f3f332dffbe 100644 --- a/tools/lib/bpf/skel_internal.h +++ b/tools/lib/bpf/skel_internal.h @@ -131,8 +131,10 @@ static inline void skel_free_map_data(void *p, __u64 a= ddr, size_t sz) { if (addr !=3D ~0ULL) kvfree(p); - /* When addr =3D=3D ~0ULL the 'p' points to - * ((struct bpf_array *)map)->value. See skel_finalize_map_data. + /* + * When addr =3D=3D ~0ULL the init buffer has already been released. + * For skel_finalize_map_data(), 'p' points to + * ((struct bpf_array *)map)->value. */ } =20 @@ -170,6 +172,15 @@ static inline void *skel_finalize_map_data(__u64 *init= _val, size_t mmap_sz, int return addr; } =20 +static inline int skel_protect_map_data(void *p, __u64 *init_val, size_t s= z) +{ + (void)sz; + + kvfree(p); + *init_val =3D ~0ULL; + return 0; +} + #else =20 static inline void *skel_alloc(size_t size) @@ -208,6 +219,15 @@ static inline void *skel_finalize_map_data(__u64 *init= _val, size_t mmap_sz, int return NULL; return addr; } + +static inline int skel_protect_map_data(void *p, __u64 *init_val, size_t s= z) +{ + (void)init_val; + + if (mprotect(p, sz, PROT_READ)) + return -errno; + return 0; +} #endif =20 static inline int skel_closenz(int fd) --=20 2.55.0 From nobody Sat Jul 25 21:18:44 2026 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) (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 73ACB40BCC4 for ; Mon, 13 Jul 2026 15:41:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957282; cv=none; b=oHIdFc6Mac8++RpoBvP7hj2XOrsoeg1irOTlMXE9rvfWre+d08NSketcTPFSHdFC4NEq3aqOtt/ARyzRSg4lnlrdnY0eldi4a1GlUqrMYmJwbNnLNjyOYWNhZhdEs2YKOLf/KZdldBnmtBFsF3yjOA2/8n00DYsow3oespSa7os= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957282; c=relaxed/simple; bh=b8mjJQjtEdXauz5qdwDZA6bsb0cJ3U+M6ZaVJpxFwfU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sjAnWAf+kTn+yd5fLZrcl6dG2/IF/xWSbPmPZwHQhDXI8okYZTeInGZ/K1KEQlinJvYfpLsycP4xDxAw8Fls3+MsSWaiTp+8pYueMChGg/ENMQiu2nscebqhnspxJqxuN4vrFduKt8mb14Cx8vhghMZovjA/FeDkp2NqYC74HBo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=gR5Ulp6H; arc=none smtp.client-ip=95.215.58.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="gR5Ulp6H" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tuBsOItjU5UNLGE/nAfxiyn6o+P+qbBxavh6rq9zykM=; b=gR5Ulp6Hsm/EGLK6AAwHK7JWWSUonsF/+8uuVwEFULg0f4edZajzuuCRS312YRt9Kp5eU4 3d29apTUhvUo/jd27y/ku7RIj1sRgkkPjuXhzXwyofTGdtCVbDLBG/DO8kO71og5M6kIHX g4CCdbfJAqHDq1ZVenQdxxBFpLQHE6s= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 6/9] selftests/bpf: Add tests to verify global percpu data Date: Mon, 13 Jul 2026 23:40:21 +0800 Message-ID: <20260713154024.30851-7-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" If the arch, like s390x, does not support percpu insn, these cases won't test global percpu data by checking FEAT_PERCPU_DATA support. The following APIs have been tested for global percpu data: 1. bpf_map__set_initial_value() 2. bpf_map__initial_value() 3. generated percpu struct pointer pointing to internal map's mmaped data 4. bpf_map__lookup_elem() for global percpu data map At the same time, the case is also tested with 'bpftool gen skeleton -L'. Add a test to verify that the live vars of subskel won't include the vars for global percpu data. Assisted-by: Codex:gpt-5.5-xhigh Signed-off-by: Leon Hwang --- tools/testing/selftests/bpf/Makefile | 2 +- .../bpf/prog_tests/global_data_init.c | 151 ++++++++++++++++++ .../bpf/prog_tests/global_percpu_subskel.c | 37 +++++ .../bpf/progs/test_global_percpu_data.c | 33 ++++ 4 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/global_percpu_su= bskel.c create mode 100644 tools/testing/selftests/bpf/progs/test_global_percpu_da= ta.c diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests= /bpf/Makefile index b642ee489ea6..c37ed9e7b97c 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -533,7 +533,7 @@ LSKELS_SIGNED :=3D fentry_test.c fexit_test.c atomics.c =20 # Generate both light skeleton and libbpf skeleton for these LSKELS_EXTRA :=3D test_ksyms_module.c test_ksyms_weak.c kfunc_call_test.c \ - kfunc_call_test_subprog.c + kfunc_call_test_subprog.c test_global_percpu_data.c SKEL_BLACKLIST +=3D $$(LSKELS) $$(LSKELS_SIGNED) =20 test_static_linked.skel.h-deps :=3D test_static_linked1.bpf.o test_static_= linked2.bpf.o diff --git a/tools/testing/selftests/bpf/prog_tests/global_data_init.c b/to= ols/testing/selftests/bpf/prog_tests/global_data_init.c index 8466332d7406..f7a56e3fdbce 100644 --- a/tools/testing/selftests/bpf/prog_tests/global_data_init.c +++ b/tools/testing/selftests/bpf/prog_tests/global_data_init.c @@ -1,5 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include "bpf/libbpf_internal.h" +#include "test_global_percpu_data.skel.h" +#include "test_global_percpu_data.lskel.h" =20 void test_global_data_init(void) { @@ -60,3 +63,151 @@ void test_global_data_init(void) free(newval); bpf_object__close(obj); } + +static void test_percpu_data_on_cpus(int map_fd, int prog_fd) +{ + __u64 args[2] =3D {0x1234ULL, 0x5678ULL}; + LIBBPF_OPTS(bpf_test_run_opts, topts, + .ctx_in =3D args, + .ctx_size_in =3D sizeof(args), + .flags =3D BPF_F_TEST_RUN_ON_CPU, + ); + int i, err, key =3D 0, num_online; + bool *online; + + err =3D parse_cpu_mask_file("/sys/devices/system/cpu/online", &online, &n= um_online); + if (!ASSERT_OK(err, "parse_cpu_mask_file")) + return; + + /* run on every online-CPU */ + for (i =3D 0; i < num_online; i++) { + struct test_global_percpu_data__percpu data =3D {}; + __u64 flags; + + if (!online[i]) + continue; + + topts.cpu =3D i; + topts.retval =3D -1; + err =3D bpf_prog_test_run_opts(prog_fd, &topts); + ASSERT_OK(err, "bpf_prog_test_run_opts"); + ASSERT_EQ(topts.retval, 0, "bpf_prog_test_run_opts retval"); + + flags =3D ((__u64) i << 32) | BPF_F_CPU; + err =3D bpf_map_lookup_elem_flags(map_fd, &key, &data, flags); + if (!ASSERT_OK(err, "bpf_map_lookup_elem_flags")) + break; + + ASSERT_EQ(data.data, 1, "data.data"); + ASSERT_TRUE(data.run, "data.run"); + ASSERT_EQ(data.nums[6], 0xc0de, "data.nums[6]"); + ASSERT_EQ(data.struct_data.i, 1, "struct_data.i"); + ASSERT_TRUE(data.struct_data.set, "struct_data.set"); + ASSERT_EQ(data.struct_data.nums[6], 0xc0de, "struct_data.nums[6]"); + } + + free(online); +} + +static void test_global_percpu_data_init(void) +{ + struct test_global_percpu_data__percpu init_value =3D {}; + struct test_global_percpu_data__percpu *init_data; + struct test_global_percpu_data *skel =3D NULL; + size_t init_data_sz; + struct bpf_map *map; + int prog_fd, err; + + skel =3D test_global_percpu_data__open(); + if (!ASSERT_OK_PTR(skel, "test_global_percpu_data__open")) + goto out; + if (!ASSERT_OK_PTR(skel->percpu, "skel->percpu")) + goto out; + if (!ASSERT_OK_PTR(skel->percpu_data, "skel->percpu_data")) + goto out; + if (!ASSERT_OK_PTR(skel->percpu_looooooooong, "skel->percpu_looooooooong"= )) + goto out; + + ASSERT_STREQ(bpf_map__name(skel->maps.percpu_data), ".percpu.data", "data= map name"); + ASSERT_STREQ(bpf_map__name(skel->maps.percpu_looooooooong), ".percpu.looo= oooooong", + "long map name"); + ASSERT_STREQ(bpf_map__name(skel->maps.percpu), ".percpu", "map name"); + ASSERT_EQ(skel->percpu->data, -1, "skel->percpu->data"); + ASSERT_FALSE(skel->percpu->run, "skel->percpu->run"); + ASSERT_EQ(skel->percpu->nums[6], 0, "skel->percpu->nums[6]"); + ASSERT_EQ(skel->percpu->struct_data.i, -1, "struct_data.i"); + ASSERT_FALSE(skel->percpu->struct_data.set, "struct_data.set"); + ASSERT_EQ(skel->percpu->struct_data.nums[6], 0, "struct_data.nums[6]"); + + map =3D skel->maps.percpu; + if (!ASSERT_EQ(bpf_map__type(map), BPF_MAP_TYPE_PERCPU_ARRAY, "bpf_map__t= ype")) + goto out; + + init_value.data =3D 2; + init_value.nums[6] =3D -1; + init_value.struct_data.i =3D 2; + init_value.struct_data.nums[6] =3D -1; + err =3D bpf_map__set_initial_value(map, &init_value, sizeof(init_value)); + if (!ASSERT_OK(err, "bpf_map__set_initial_value")) + goto out; + + init_data =3D bpf_map__initial_value(map, &init_data_sz); + if (!ASSERT_OK_PTR(init_data, "bpf_map__initial_value")) + goto out; + + ASSERT_EQ(init_data->data, init_value.data, "init_value data"); + ASSERT_EQ(init_data->run, init_value.run, "init_value run"); + ASSERT_EQ(init_data->struct_data.i, init_value.struct_data.i, "init_value= struct_data.i"); + ASSERT_EQ(init_data->struct_data.nums[6], init_value.struct_data.nums[6], + "init_value struct_data.nums[6]"); + ASSERT_EQ(init_data_sz, sizeof(init_value), "init_value size"); + ASSERT_EQ((void *) init_data, (void *) skel->percpu, "skel->percpu eq ini= t_data"); + ASSERT_EQ(skel->percpu->data, init_value.data, "skel->percpu->data"); + ASSERT_EQ(skel->percpu->run, init_value.run, "skel->percpu->run"); + ASSERT_EQ(skel->percpu->struct_data.i, init_value.struct_data.i, + "skel->percpu->struct_data.i"); + ASSERT_EQ(skel->percpu->struct_data.nums[6], init_value.struct_data.nums[= 6], + "skel->percpu->struct_data.nums[6]"); + + err =3D test_global_percpu_data__load(skel); + if (!ASSERT_OK(err, "test_global_percpu_data__load")) + goto out; + + ASSERT_OK_PTR(skel->percpu, "skel->percpu"); + + prog_fd =3D bpf_program__fd(skel->progs.update_percpu_data); + test_percpu_data_on_cpus(bpf_map__fd(map), prog_fd); + +out: + test_global_percpu_data__destroy(skel); +} + +static void test_global_percpu_data_lskel(void) +{ + struct test_global_percpu_data_lskel *lskel =3D NULL; + int prog_fd, map_fd; + + lskel =3D test_global_percpu_data_lskel__open_and_load(); + if (!ASSERT_OK_PTR(lskel, "test_global_percpu_data_lskel__open_and_load")) + goto out; + + map_fd =3D lskel->maps.percpu.map_fd; + prog_fd =3D lskel->progs.update_percpu_data.prog_fd; + test_percpu_data_on_cpus(map_fd, prog_fd); + +out: + test_global_percpu_data_lskel__destroy(lskel); +} + +void test_global_percpu_data(void) +{ + if (!feat_supported(NULL, FEAT_PERCPU_DATA)) { + test__skip(); + return; + } + + if (test__start_subtest("init")) + test_global_percpu_data_init(); + if (test__start_subtest("lskel")) + test_global_percpu_data_lskel(); +} diff --git a/tools/testing/selftests/bpf/prog_tests/global_percpu_subskel.c= b/tools/testing/selftests/bpf/prog_tests/global_percpu_subskel.c new file mode 100644 index 000000000000..8aebd533d86b --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/global_percpu_subskel.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include "test_global_percpu_data.subskel.h" + +void test_global_percpu_data_subskel(void) +{ + struct test_global_percpu_data *subskel =3D NULL; + struct bpf_object *obj; + int i; + + obj =3D bpf_object__open_file("./test_global_percpu_data.bpf.o", NULL); + if (!ASSERT_OK_PTR(obj, "bpf_object__open_file")) + return; + + subskel =3D test_global_percpu_data__open(obj); + if (!ASSERT_OK_PTR(subskel, "test_global_percpu_data__open")) + goto out; + + if (!ASSERT_OK_PTR(subskel->subskel, "subskel")) + goto out; + if (!ASSERT_OK_PTR(subskel->maps.percpu, "maps.percpu")) + goto out; + ASSERT_EQ(bpf_map__type(subskel->maps.percpu), BPF_MAP_TYPE_PERCPU_ARRAY, + "percpu_map_type"); + ASSERT_GT(subskel->subskel->var_cnt, 0, "var_cnt"); + + for (i =3D 0; i < subskel->subskel->var_cnt; i++) { + const struct bpf_var_skeleton *var; + + var =3D (void *) subskel->subskel->vars + i * subskel->subskel->var_skel= _sz; + ASSERT_NEQ(var->map, &subskel->maps.percpu, "var"); + } + +out: + test_global_percpu_data__destroy(subskel); + bpf_object__close(obj); +} diff --git a/tools/testing/selftests/bpf/progs/test_global_percpu_data.c b/= tools/testing/selftests/bpf/progs/test_global_percpu_data.c new file mode 100644 index 000000000000..54380dfb11a5 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_global_percpu_data.c @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include "bpf_misc.h" + +int unused SEC(".percpu.looooooooong"); +int data2 SEC(".percpu.data"); +int data SEC(".percpu") =3D -1; +int nums[7] SEC(".percpu"); +char run SEC(".percpu") =3D 0; +struct { + char set; + int i; + int nums[7]; +} struct_data SEC(".percpu") =3D { + .set =3D 0, + .i =3D -1, +}; + +SEC("raw_tp/task_rename") +__auxiliary +int update_percpu_data(void *ctx) +{ + struct_data.nums[6] =3D 0xc0de; + struct_data.set =3D 1; + struct_data.i =3D 1; + nums[6] =3D 0xc0de; + data =3D 1; + run =3D 1; + return 0; +} + +char _license[] SEC("license") =3D "GPL"; --=20 2.55.0 From nobody Sat Jul 25 21:18:44 2026 Received: from out-179.mta1.migadu.com (out-179.mta1.migadu.com [95.215.58.179]) (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 50E84437102 for ; Mon, 13 Jul 2026 15:41:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957286; cv=none; b=DzNnIAQCxAAnTFmWBhT8+LrcphHUj8hdWMz9xYPJnWQ1RuvMstfcx3sGGPztHoYZ2SPlOsCMkwe1fhAarv4BQqmTdoU62fIQaztul4r3Ma4ma6je1ogVaFFB9nTGnLHyZov4+LPWnCSHdyDLeyAoewlw1RW1FgpgSmpG18/RHi4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957286; c=relaxed/simple; bh=riRTrIoqFo+PbRQRHfcW9xXW4TXDFm7I2ycyKwfYlPc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C54c9cHJ1J7nzEhejohSQ/sWLdkS/WphwfE8tBW/pihxWJYYgaJwg+guFbPfWPKTlKMxN5pNokFGazfaz46tNYWgz9hPQfxniV0GzLn5gygRffaTys8KFblZG7mOvT8+i45uR8VXR6SnDJG6UIvUX3rpY22G4pnbNp5i/GnXBQw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=xG9GPfEC; arc=none smtp.client-ip=95.215.58.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="xG9GPfEC" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vZn600RVrFmmznckCxP8gJAMBPxEVEpOMcF+M6pN0nY=; b=xG9GPfECK35+lq5GLmMOe4PtT8Sr5HgR76HqyYfi2Cjlo7/aB2b8dP+UonPyPft/h2q5Pb somKj9pYjiQeusP4ibKm8MZtE5qdruQmPdSBalWXi63KXmBxbee5TFojYKqYWf7UEdH4ma a8x6SNUxZ0ybMhebsa9gejk0csTPBgU= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 7/9] selftests/bpf: Test direct reading/writing read-only percpu_array map Date: Mon, 13 Jul 2026 23:40:22 +0800 Message-ID: <20260713154024.30851-8-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Verify these two cases: 1. Direct reading the data of read-only percpu data's percpu_array map is allowed. 2. Direct writing the data of read-only percpu data's percpu_array map is disallowed. Assisted-by: Codex:gpt-5.5-xhigh Signed-off-by: Leon Hwang --- .../bpf/prog_tests/global_data_init.c | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/global_data_init.c b/to= ols/testing/selftests/bpf/prog_tests/global_data_init.c index f7a56e3fdbce..d4405646847a 100644 --- a/tools/testing/selftests/bpf/prog_tests/global_data_init.c +++ b/tools/testing/selftests/bpf/prog_tests/global_data_init.c @@ -199,6 +199,85 @@ static void test_global_percpu_data_lskel(void) test_global_percpu_data_lskel__destroy(lskel); } =20 +static int create_rdonly_percpu_array(void) +{ + LIBBPF_OPTS(bpf_map_create_opts, map_opts, + .map_flags =3D BPF_F_RDONLY_PROG, + ); + int key =3D 0, map_fd, err; + __u64 value =3D 0; + + map_fd =3D bpf_map_create(BPF_MAP_TYPE_PERCPU_ARRAY, "percpu_ro_map", siz= eof(int), + sizeof(__u64), 1, &map_opts); + if (!ASSERT_GE(map_fd, 0, "bpf_map_create")) + return -1; + + err =3D bpf_map_update_elem(map_fd, &key, &value, BPF_F_ALL_CPUS); + if (!ASSERT_OK(err, "bpf_map_update_elem")) + goto out; + + err =3D bpf_map_freeze(map_fd); + if (!ASSERT_OK(err, "bpf_map_freeze")) + goto out; + + return map_fd; + +out: + close(map_fd); + return -1; +} + +static void test_global_percpu_data_rdonly_direct_read(void) +{ + struct bpf_insn insns[] =3D { + BPF_LD_MAP_VALUE(BPF_REG_1, 0, 0), + BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, 0), + BPF_EXIT_INSN(), + }; + int map_fd, prog_fd; + + map_fd =3D create_rdonly_percpu_array(); + if (map_fd < 0) + return; + + insns[0].imm =3D map_fd; + prog_fd =3D bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, "percpu_ro_prog", = "GPL", insns, + ARRAY_SIZE(insns), NULL); + if (ASSERT_GE(prog_fd, 0, "bpf_prog_load")) + close(prog_fd); + close(map_fd); +} + +static void test_global_percpu_data_rdonly_direct_write(void) +{ + LIBBPF_OPTS(bpf_prog_load_opts, prog_opts); + struct bpf_insn insns[] =3D { + BPF_LD_MAP_VALUE(BPF_REG_1, 0, 0), + BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, 0), + BPF_ST_MEM(BPF_DW, BPF_REG_1, 0, 0), + BPF_EXIT_INSN(), + }; + char log_buf[256] =3D {}; + int map_fd, prog_fd; + + prog_opts.log_buf =3D log_buf; + prog_opts.log_size =3D sizeof(log_buf); + prog_opts.log_level =3D 1; + + map_fd =3D create_rdonly_percpu_array(); + if (map_fd < 0) + return; + + insns[0].imm =3D map_fd; + prog_fd =3D bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, "percpu_ro_prog", = "GPL", insns, + ARRAY_SIZE(insns), &prog_opts); + if (!ASSERT_LT(prog_fd, 0, "bpf_prog_load")) + close(prog_fd); + else + ASSERT_HAS_SUBSTR(log_buf, "write into map forbidden", "verifier log"); + close(map_fd); +} + void test_global_percpu_data(void) { if (!feat_supported(NULL, FEAT_PERCPU_DATA)) { @@ -210,4 +289,8 @@ void test_global_percpu_data(void) test_global_percpu_data_init(); if (test__start_subtest("lskel")) test_global_percpu_data_lskel(); + if (test__start_subtest("rdonly_direct_read")) + test_global_percpu_data_rdonly_direct_read(); + if (test__start_subtest("rdonly_direct_write")) + test_global_percpu_data_rdonly_direct_write(); } --=20 2.55.0 From nobody Sat Jul 25 21:18:44 2026 Received: from out-187.mta1.migadu.com (out-187.mta1.migadu.com [95.215.58.187]) (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 532AD40BCC4 for ; Mon, 13 Jul 2026 15:41:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957291; cv=none; b=uWCw2NDzApg5smkCwyGdpuwsP6IhDGw74xvyFspWFLzHijt+iQ3BrQOkpmUIA2cRAOa+gdtRoya6GijqV9YSY76dr+oSrOiZIh/IaYr4KNfZ/wIUphJII4gfipko7mvzVN0SgPYiZkbkw8GBYQ8HosfvcyWMsemMKusIoNLVFFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957291; c=relaxed/simple; bh=9VUVkuDLNQLapCOn23MphWt3JIcg5d8d10IFnq8dNtk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pbItMgFNwdwLG7xi6NlE3eM6VxubfDV27GlgYMta0qsv8Gl++8S71a9+mPS6XpqPzYEBE1hP0jl/FOkdThKhnSiiLJSfDjSCzsbH4h/6SHtHsMJKmfowLVn3S0ow/PMg4/nyAUKt3xdr1WvTPfVLCbHV5/Xy+i/W/LWa0jdU0lw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=iHUIyQ/Y; arc=none smtp.client-ip=95.215.58.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="iHUIyQ/Y" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KhEu73XdDjzOZKOTaznlKskzsmU22YqaUUFeK6qekak=; b=iHUIyQ/YWvN1Ys0DYhHctAaG/Zy21ZY/XmyMTRYeSzn2f5YNsv71buGiLV/dyyOse/mqIr 9IuzLFeT9kdLULmoU54E7CFNLMeWn3wmqScXcFbDP5RWpPSMZLW/agdhX9fHWrhNMs76Dw UnzYIIqxYl91tAHr1u1poXmHYQVS/Kw= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 8/9] selftests/bpf: Test verifier log for global percpu data Date: Mon, 13 Jul 2026 23:40:23 +0800 Message-ID: <20260713154024.30851-9-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Add two tests to verify the verifier log "R%d points to percpu_array map which cannot be used as const string\n". Signed-off-by: Leon Hwang --- .../bpf/prog_tests/global_data_init.c | 6 +++++ .../bpf/progs/test_global_percpu_data.c | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/global_data_init.c b/to= ols/testing/selftests/bpf/prog_tests/global_data_init.c index d4405646847a..598b7dde6581 100644 --- a/tools/testing/selftests/bpf/prog_tests/global_data_init.c +++ b/tools/testing/selftests/bpf/prog_tests/global_data_init.c @@ -278,6 +278,11 @@ static void test_global_percpu_data_rdonly_direct_writ= e(void) close(map_fd); } =20 +static void test_global_percpu_data_verifier_log(void) +{ + RUN_TESTS(test_global_percpu_data); +} + void test_global_percpu_data(void) { if (!feat_supported(NULL, FEAT_PERCPU_DATA)) { @@ -293,4 +298,5 @@ void test_global_percpu_data(void) test_global_percpu_data_rdonly_direct_read(); if (test__start_subtest("rdonly_direct_write")) test_global_percpu_data_rdonly_direct_write(); + test_global_percpu_data_verifier_log(); } diff --git a/tools/testing/selftests/bpf/progs/test_global_percpu_data.c b/= tools/testing/selftests/bpf/progs/test_global_percpu_data.c index 54380dfb11a5..b852a0b07508 100644 --- a/tools/testing/selftests/bpf/progs/test_global_percpu_data.c +++ b/tools/testing/selftests/bpf/progs/test_global_percpu_data.c @@ -30,4 +30,27 @@ int update_percpu_data(void *ctx) return 0; } =20 +static const char fmt[] SEC(".percpu.fmt") =3D "data %d\n"; + +SEC("?kprobe") +__failure __msg("R{{[0-9]+}} points to percpu_array map which cannot be us= ed as const string") +int verifier_strncmp(void *ctx) +{ + return bpf_strncmp("test", 5, fmt); +} + +SEC("?kprobe") +__failure __msg("R{{[0-9]+}} points to percpu_array map which cannot be us= ed as const string") +int verifier_snprintf(void *ctx) +{ + u64 args[] =3D { data }; + char buf[128]; + int len; + + len =3D bpf_snprintf(buf, sizeof(buf), fmt, args, sizeof(args)); + if (len > 0) + bpf_printk("snprintf: %s\n", buf); + return 0; +} + char _license[] SEC("license") =3D "GPL"; --=20 2.55.0 From nobody Sat Jul 25 21:18:44 2026 Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) (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 1C7433E0C4D for ; Mon, 13 Jul 2026 15:41:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957294; cv=none; b=s8uF9HPERuHv0+cFxecbOy2MLk97J7IfKGSvBXvwG31UCCG/I/9a9htpw4z9SDPIsygkLoPp/b0L4TQhTYVoOHRT0KHNoxSJwA+ky+D7wiIjE9oXeipEA/o9S6z5ZLZINrsFKv2hcvjd13uM5cab+FS10lZh3OS5pU/6DT0rAoI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783957294; c=relaxed/simple; bh=me6OL90Ypr8Ilpx+65NnZrX1cBHotrcVrQNa58+nAzM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nN3A75WF74qyBN4x9fb4Zvw+fX9yWJPcAQWM4I+N5vDHvgvdSC4+iLYLLLoRvCgeTzHt1ZP3CjbYnJo9xqHPV8XHnff8/U7x+Xi5KvDm5PkvUXluFDgt9gvsz9t5B1uP7DYVqNVFca9Br8lylf2VXlX5UTORu2NBAlHT/0soN2o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=ULHY483k; arc=none smtp.client-ip=95.215.58.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="ULHY483k" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783957291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GBQaFEoNYmmYAMbxysMsFS3t2NOHg74qWyOBvlWdFCc=; b=ULHY483koL9sC6MgP4q98U/tGVB3OyyOKvHVJb3avAq3UqKnxVrQR6/hKi3puct2ZsdH21 ws6LLJgEf+HQ93/7KsSBbKjroCeAZzv+FvpVZMfqHYkYxS12T3i8piV3FROZUJCd/2eDY9 jHIfvwnoLGtLTnw8bQQvpp3GmQrwXaA= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Quentin Monnet , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 9/9] selftests/bpf: Verify bpf_iter for global percpu data Date: Mon, 13 Jul 2026 23:40:24 +0800 Message-ID: <20260713154024.30851-10-leon.hwang@linux.dev> In-Reply-To: <20260713154024.30851-1-leon.hwang@linux.dev> References: <20260713154024.30851-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Add a test to verify that it is OK to iter the percpu_array map used for global percpu data. Signed-off-by: Leon Hwang --- .../bpf/prog_tests/global_data_init.c | 52 +++++++++++++++++++ .../bpf/progs/test_global_percpu_data.c | 25 +++++++++ 2 files changed, 77 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/global_data_init.c b/to= ols/testing/selftests/bpf/prog_tests/global_data_init.c index 598b7dde6581..e5a40ea36ee7 100644 --- a/tools/testing/selftests/bpf/prog_tests/global_data_init.c +++ b/tools/testing/selftests/bpf/prog_tests/global_data_init.c @@ -283,6 +283,56 @@ static void test_global_percpu_data_verifier_log(void) RUN_TESTS(test_global_percpu_data); } =20 +static void test_global_percpu_data_iter(void) +{ + DECLARE_LIBBPF_OPTS(bpf_iter_attach_opts, opts); + struct test_global_percpu_data *skel; + union bpf_iter_link_info linfo =3D {}; + struct bpf_link *link =3D NULL; + int fd, num_cpus, len, err; + char buf[16]; + + num_cpus =3D libbpf_num_possible_cpus(); + if (!ASSERT_GT(num_cpus, 0, "libbpf_num_possible_cpus")) + return; + + skel =3D test_global_percpu_data__open(); + if (!ASSERT_OK_PTR(skel, "test_global_percpu_data__open")) + return; + + skel->rodata->num_cpus =3D num_cpus; + skel->rodata->offsetof_num =3D offsetof(struct test_global_percpu_data__p= ercpu, struct_data); + skel->rodata->offsetof_num +=3D sizeof(skel->percpu->struct_data) - sizeo= f(int); + skel->rodata->elem_sz =3D roundup(sizeof(struct test_global_percpu_data__= percpu), 8); + skel->percpu->struct_data.nums[6] =3D 0xc0de; + + err =3D test_global_percpu_data__load(skel); + if (!ASSERT_OK(err, "test_global_percpu_data__load")) + goto out; + + linfo.map.map_fd =3D bpf_map__fd(skel->maps.percpu); + opts.link_info =3D &linfo; + opts.link_info_len =3D sizeof(linfo); + link =3D bpf_program__attach_iter(skel->progs.dump_percpu_data, &opts); + if (!ASSERT_OK_PTR(link, "bpf_program__attach_iter")) + goto out; + + fd =3D bpf_iter_create(bpf_link__fd(link)); + if (!ASSERT_GE(fd, 0, "bpf_iter_create")) + goto out; + + while ((len =3D read(fd, buf, sizeof(buf))) > 0) + do { } while (0); + ASSERT_EQ(len, 0, "read iter"); + ASSERT_TRUE(skel->bss->run_iter, "run_iter"); + ASSERT_EQ(skel->bss->percpu_data_sum, 0xc0de * num_cpus, "percpu_data_sum= "); + + close(fd); +out: + bpf_link__destroy(link); + test_global_percpu_data__destroy(skel); +} + void test_global_percpu_data(void) { if (!feat_supported(NULL, FEAT_PERCPU_DATA)) { @@ -299,4 +349,6 @@ void test_global_percpu_data(void) if (test__start_subtest("rdonly_direct_write")) test_global_percpu_data_rdonly_direct_write(); test_global_percpu_data_verifier_log(); + if (test__start_subtest("iter")) + test_global_percpu_data_iter(); } diff --git a/tools/testing/selftests/bpf/progs/test_global_percpu_data.c b/= tools/testing/selftests/bpf/progs/test_global_percpu_data.c index b852a0b07508..8b1f625017d1 100644 --- a/tools/testing/selftests/bpf/progs/test_global_percpu_data.c +++ b/tools/testing/selftests/bpf/progs/test_global_percpu_data.c @@ -53,4 +53,29 @@ int verifier_snprintf(void *ctx) return 0; } =20 +volatile const __u32 num_cpus =3D 0; +volatile const int offsetof_num; +volatile const int elem_sz; +__u32 percpu_data_sum =3D 0; +bool run_iter =3D false; + +SEC("iter/bpf_map_elem") +__auxiliary +int dump_percpu_data(struct bpf_iter__bpf_map_elem *ctx) +{ + void *pptr =3D ctx->value; + int i; + + if (!pptr) + return 0; + + run_iter =3D true; + + for (i =3D 0; i < num_cpus; i++) { + percpu_data_sum +=3D *(int *) (pptr + offsetof_num); + pptr +=3D elem_sz; + } + return 0; +} + char _license[] SEC("license") =3D "GPL"; --=20 2.55.0