From nobody Tue Dec 2 02:52:39 2025 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (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 1008E224249 for ; Mon, 17 Nov 2025 16:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396471; cv=none; b=jJpqbDVybwUsamDvZphxk98e2KS8hQUdWoy1Qxhu02SS79EwjRmrX/0cm97LDUvhTGkVdhS0EyhIwTQ5q+D6WiNJqAYkGbYrQUrH9HPdGrNSOgpy4RroXTZYJvuhIP61LtptpdoeopWk1VaGhGVBcpzsTGkH0FpAbh8DTFiR2yo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396471; c=relaxed/simple; bh=2ztbj4mPd31QuTuK5bnL2U2Lf7/tSl1r1lIzhSigxbA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mrQFz5LQz4o3lCUfE2Xt7aMDd4svQE4tawjUK5/igqKAVmTJnqbutX6hNodlXVEo+5WJU9AFsQHVFxwCx0QZ0G9R7q1gz4kgSTBy4KwVYog0va5evgTwg02rerZk2nKNMC2ikPCaZdtdqBzKcr6mSOquEvdXhaiK+eejqfP1Ra8= 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=YF+fda+H; arc=none smtp.client-ip=95.215.58.173 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="YF+fda+H" 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=1763396464; 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=nKXwMeuhN2JRrI0RevMzdYsiWcZ8g/Ifit1TxNI7Jq4=; b=YF+fda+Hh6KQfp6KcVut0vdPkT8q2sqzdkzFnYMP3I5cYfse85bSpAe/pglGvGIHKVPBej yJc95E/Qmh4WLJTLrEZ5lMzLGzW86VmqlVLYz1dcq/Y1ACU4fX6jt8MXbwwLqraQ1JOeNT FchzaGUU4bu5HZ/2esACFe6D5VinSEw= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, jolsa@kernel.org, yonghong.song@linux.dev, song@kernel.org, eddyz87@gmail.com, dxu@dxuuu.xyz, deso@posteo.net, martin.lau@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, shuah@kernel.org, kerneljasonxing@gmail.com, chen.dylane@linux.dev, willemb@google.com, paul.chaignon@gmail.com, a.s.protopopov@gmail.com, memxor@gmail.com, yatsenko@meta.com, tklauser@distanz.ch, leon.hwang@linux.dev, kernel-patches-bot@fb.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v10 1/8] bpf: Introduce internal bpf_map_check_op_flags helper function Date: Tue, 18 Nov 2025 00:20:26 +0800 Message-ID: <20251117162033.6296-2-leon.hwang@linux.dev> In-Reply-To: <20251117162033.6296-1-leon.hwang@linux.dev> References: <20251117162033.6296-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" It is to unify map flags checking for lookup_elem, update_elem, lookup_batch and update_batch APIs. Therefore, it will be convenient to check BPF_F_CPU and BPF_F_ALL_CPUS flags in it for these APIs in next patch. Acked-by: Andrii Nakryiko Signed-off-by: Leon Hwang --- include/linux/bpf.h | 11 +++++++++++ kernel/bpf/syscall.c | 34 +++++++++++----------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 09d5dc541d1ce..a900bc022b1cc 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -3813,4 +3813,15 @@ bpf_prog_update_insn_ptrs(struct bpf_prog *prog, u32= *offsets, void *image) } #endif =20 +static inline int bpf_map_check_op_flags(struct bpf_map *map, u64 flags, u= 64 allowed_flags) +{ + if (flags & ~allowed_flags) + return -EINVAL; + + if ((flags & BPF_F_LOCK) && !btf_record_has_field(map->record, BPF_SPIN_L= OCK)) + return -EINVAL; + + return 0; +} + #endif /* _LINUX_BPF_H */ diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index a2a441185f810..f3dc6e2c82411 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1725,9 +1725,6 @@ static int map_lookup_elem(union bpf_attr *attr) if (CHECK_ATTR(BPF_MAP_LOOKUP_ELEM)) return -EINVAL; =20 - if (attr->flags & ~BPF_F_LOCK) - return -EINVAL; - CLASS(fd, f)(attr->map_fd); map =3D __bpf_map_get(f); if (IS_ERR(map)) @@ -1735,9 +1732,9 @@ static int map_lookup_elem(union bpf_attr *attr) if (!(map_get_sys_perms(map, f) & FMODE_CAN_READ)) return -EPERM; =20 - if ((attr->flags & BPF_F_LOCK) && - !btf_record_has_field(map->record, BPF_SPIN_LOCK)) - return -EINVAL; + err =3D bpf_map_check_op_flags(map, attr->flags, BPF_F_LOCK); + if (err) + return err; =20 key =3D __bpf_copy_key(ukey, map->key_size); if (IS_ERR(key)) @@ -1800,11 +1797,9 @@ static int map_update_elem(union bpf_attr *attr, bpf= ptr_t uattr) goto err_put; } =20 - if ((attr->flags & BPF_F_LOCK) && - !btf_record_has_field(map->record, BPF_SPIN_LOCK)) { - err =3D -EINVAL; + err =3D bpf_map_check_op_flags(map, attr->flags, ~0); + if (err) goto err_put; - } =20 key =3D ___bpf_copy_key(ukey, map->key_size); if (IS_ERR(key)) { @@ -2008,13 +2003,9 @@ int generic_map_update_batch(struct bpf_map *map, st= ruct file *map_file, void *key, *value; int err =3D 0; =20 - if (attr->batch.elem_flags & ~BPF_F_LOCK) - return -EINVAL; - - if ((attr->batch.elem_flags & BPF_F_LOCK) && - !btf_record_has_field(map->record, BPF_SPIN_LOCK)) { - return -EINVAL; - } + err =3D bpf_map_check_op_flags(map, attr->batch.elem_flags, BPF_F_LOCK); + if (err) + return err; =20 value_size =3D bpf_map_value_size(map); =20 @@ -2071,12 +2062,9 @@ int generic_map_lookup_batch(struct bpf_map *map, u32 value_size, cp, max_count; int err; =20 - if (attr->batch.elem_flags & ~BPF_F_LOCK) - return -EINVAL; - - if ((attr->batch.elem_flags & BPF_F_LOCK) && - !btf_record_has_field(map->record, BPF_SPIN_LOCK)) - return -EINVAL; + err =3D bpf_map_check_op_flags(map, attr->batch.elem_flags, BPF_F_LOCK); + if (err) + return err; =20 value_size =3D bpf_map_value_size(map); =20 --=20 2.51.2 From nobody Tue Dec 2 02:52:39 2025 Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.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 9A1FD29D29D for ; Mon, 17 Nov 2025 16:21:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396480; cv=none; b=ZB8YX0B5+Cn9qJQJCctkcneXFneg3dZeF1Yr2dF38j9hdhXhNp4S7KXmUW0ePbiIqwXzanW2bDOSzFOp/qMD+9T5wn5bNwjUZ3BnmLtoCTPJP+S6dbXndbQ1YS0Fo0aedgUBVjvGlcfyXcWZh77GkaxCmPrFY3YdPmY6TrBji/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396480; c=relaxed/simple; bh=jgdcJUwfJQR4nC/n5Z9NX59W/QjTvizZH3HW71G0Wj4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dYop8XM2ie0tFuvB+92PEiTx9YyJImX5dsmcv5VzuVckimrzEXZZ+bnXt3X4Q+jJIkyQ8HgNWdRLjU4b8u6UHtEjDQPAKYsbd4r1xz4r7IQzHQu95QVYqsYc8vfiac9pNMDeCkwzY7/IVd/2Zi49WkFm5Ud9W3HJS2T7jwVt/aY= 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=V11TG+jR; arc=none smtp.client-ip=95.215.58.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="V11TG+jR" 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=1763396475; 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=Emq6bcW/MJSXF1L3/1EP96y3M+k12AFx24671ihRuA0=; b=V11TG+jRwCSA8CuHYsfUpLScD/Lsz8PX8XlgWysLNKgMp6UwA1q3sXI52I9JrePAGogv7p BycobZDfGleFGTGDMw/tLH0aSteUOZxXk+uYE8LQDux0nicsGspSsAQGtsbog2wEQwuiVi ohlGiJM/D5w70sbqq3GHYdmizaiouYU= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, jolsa@kernel.org, yonghong.song@linux.dev, song@kernel.org, eddyz87@gmail.com, dxu@dxuuu.xyz, deso@posteo.net, martin.lau@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, shuah@kernel.org, kerneljasonxing@gmail.com, chen.dylane@linux.dev, willemb@google.com, paul.chaignon@gmail.com, a.s.protopopov@gmail.com, memxor@gmail.com, yatsenko@meta.com, tklauser@distanz.ch, leon.hwang@linux.dev, kernel-patches-bot@fb.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v10 2/8] bpf: Introduce BPF_F_CPU and BPF_F_ALL_CPUS flags Date: Tue, 18 Nov 2025 00:20:27 +0800 Message-ID: <20251117162033.6296-3-leon.hwang@linux.dev> In-Reply-To: <20251117162033.6296-1-leon.hwang@linux.dev> References: <20251117162033.6296-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 BPF_F_CPU and BPF_F_ALL_CPUS flags and check them for following APIs: * 'map_lookup_elem()' * 'map_update_elem()' * 'generic_map_lookup_batch()' * 'generic_map_update_batch()' And, get the correct value size for these APIs. Acked-by: Andrii Nakryiko Signed-off-by: Leon Hwang --- include/linux/bpf.h | 23 ++++++++++++++++++++++- include/uapi/linux/bpf.h | 2 ++ kernel/bpf/syscall.c | 31 +++++++++++++++++-------------- tools/include/uapi/linux/bpf.h | 2 ++ 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index a900bc022b1cc..65737870f2ea6 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -3813,14 +3813,35 @@ bpf_prog_update_insn_ptrs(struct bpf_prog *prog, u3= 2 *offsets, void *image) } #endif =20 +static inline bool bpf_map_supports_cpu_flags(enum bpf_map_type map_type) +{ + return false; +} + static inline int bpf_map_check_op_flags(struct bpf_map *map, u64 flags, u= 64 allowed_flags) { - if (flags & ~allowed_flags) + u32 cpu; + + if ((u32)flags & ~allowed_flags) return -EINVAL; =20 if ((flags & BPF_F_LOCK) && !btf_record_has_field(map->record, BPF_SPIN_L= OCK)) return -EINVAL; =20 + if (!(flags & BPF_F_CPU) && flags >> 32) + return -EINVAL; + + if (flags & (BPF_F_CPU | BPF_F_ALL_CPUS)) { + if (!bpf_map_supports_cpu_flags(map->map_type)) + return -EINVAL; + if ((flags & BPF_F_CPU) && (flags & BPF_F_ALL_CPUS)) + return -EINVAL; + + cpu =3D flags >> 32; + if ((flags & BPF_F_CPU) && cpu >=3D num_possible_cpus()) + return -ERANGE; + } + return 0; } =20 diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index f5713f59ac10a..8b6279ca6e662 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1373,6 +1373,8 @@ enum { BPF_NOEXIST =3D 1, /* create new element if it didn't exist */ BPF_EXIST =3D 2, /* update existing element */ BPF_F_LOCK =3D 4, /* spin_lock-ed map_lookup/map_update */ + BPF_F_CPU =3D 8, /* cpu flag for percpu maps, upper 32-bit of flags is a = cpu number */ + BPF_F_ALL_CPUS =3D 16, /* update value across all CPUs for percpu maps */ }; =20 /* flags for BPF_MAP_CREATE command */ diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index f3dc6e2c82411..6edaab858b326 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -133,12 +133,14 @@ bool bpf_map_write_active(const struct bpf_map *map) return atomic64_read(&map->writecnt) !=3D 0; } =20 -static u32 bpf_map_value_size(const struct bpf_map *map) -{ - if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_HASH || - map->map_type =3D=3D BPF_MAP_TYPE_LRU_PERCPU_HASH || - map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY || - map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE) +static u32 bpf_map_value_size(const struct bpf_map *map, u64 flags) +{ + if (flags & (BPF_F_CPU | BPF_F_ALL_CPUS)) + return map->value_size; + else if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_HASH || + map->map_type =3D=3D BPF_MAP_TYPE_LRU_PERCPU_HASH || + map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY || + map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE) return round_up(map->value_size, 8) * num_possible_cpus(); else if (IS_FD_MAP(map)) return sizeof(u32); @@ -1732,7 +1734,7 @@ static int map_lookup_elem(union bpf_attr *attr) if (!(map_get_sys_perms(map, f) & FMODE_CAN_READ)) return -EPERM; =20 - err =3D bpf_map_check_op_flags(map, attr->flags, BPF_F_LOCK); + err =3D bpf_map_check_op_flags(map, attr->flags, BPF_F_LOCK | BPF_F_CPU); if (err) return err; =20 @@ -1740,7 +1742,7 @@ static int map_lookup_elem(union bpf_attr *attr) if (IS_ERR(key)) return PTR_ERR(key); =20 - value_size =3D bpf_map_value_size(map); + value_size =3D bpf_map_value_size(map, attr->flags); =20 err =3D -ENOMEM; value =3D kvmalloc(value_size, GFP_USER | __GFP_NOWARN); @@ -1807,7 +1809,7 @@ static int map_update_elem(union bpf_attr *attr, bpfp= tr_t uattr) goto err_put; } =20 - value_size =3D bpf_map_value_size(map); + value_size =3D bpf_map_value_size(map, attr->flags); value =3D kvmemdup_bpfptr(uvalue, value_size); if (IS_ERR(value)) { err =3D PTR_ERR(value); @@ -2003,11 +2005,12 @@ int generic_map_update_batch(struct bpf_map *map, s= truct file *map_file, void *key, *value; int err =3D 0; =20 - err =3D bpf_map_check_op_flags(map, attr->batch.elem_flags, BPF_F_LOCK); + err =3D bpf_map_check_op_flags(map, attr->batch.elem_flags, + BPF_F_LOCK | BPF_F_CPU | BPF_F_ALL_CPUS); if (err) return err; =20 - value_size =3D bpf_map_value_size(map); + value_size =3D bpf_map_value_size(map, attr->batch.elem_flags); =20 max_count =3D attr->batch.count; if (!max_count) @@ -2062,11 +2065,11 @@ int generic_map_lookup_batch(struct bpf_map *map, u32 value_size, cp, max_count; int err; =20 - err =3D bpf_map_check_op_flags(map, attr->batch.elem_flags, BPF_F_LOCK); + err =3D bpf_map_check_op_flags(map, attr->batch.elem_flags, BPF_F_LOCK | = BPF_F_CPU); if (err) return err; =20 - value_size =3D bpf_map_value_size(map); + value_size =3D bpf_map_value_size(map, attr->batch.elem_flags); =20 max_count =3D attr->batch.count; if (!max_count) @@ -2188,7 +2191,7 @@ static int map_lookup_and_delete_elem(union bpf_attr = *attr) goto err_put; } =20 - value_size =3D bpf_map_value_size(map); + value_size =3D bpf_map_value_size(map, 0); =20 err =3D -ENOMEM; value =3D kvmalloc(value_size, GFP_USER | __GFP_NOWARN); diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f5713f59ac10a..8b6279ca6e662 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -1373,6 +1373,8 @@ enum { BPF_NOEXIST =3D 1, /* create new element if it didn't exist */ BPF_EXIST =3D 2, /* update existing element */ BPF_F_LOCK =3D 4, /* spin_lock-ed map_lookup/map_update */ + BPF_F_CPU =3D 8, /* cpu flag for percpu maps, upper 32-bit of flags is a = cpu number */ + BPF_F_ALL_CPUS =3D 16, /* update value across all CPUs for percpu maps */ }; =20 /* flags for BPF_MAP_CREATE command */ --=20 2.51.2 From nobody Tue Dec 2 02:52:39 2025 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (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 574652C3258 for ; Mon, 17 Nov 2025 16:21:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396490; cv=none; b=RC2UlKD9CEJIb057NqID5oKcI40UV3ICjFCGS9fpuUYck3bY7a7wY3AtnHkmAO8YltS++XKwA+UWelIonoAvvdJJokNIeei9hv6RjnrhhMavcV9lYGbM6VitXBeNWDh4VADRxi5R6A2lM7lLyhSeCUSggQb6/BdRhw2nHj/wDcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396490; c=relaxed/simple; bh=CyBOfVNq2SwHee2a0ROyzADijwekuhcaBOzZ3pT8ze4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TkSdvdDuQ+fKzvw6AZ8WLReLbUusO08vhXVS10rWrnEpRc/rxhMTZfFPIpoTEBOAt4uP1s2lsGODWAa7Y5Gr0yAqf+ZQKSerM1Irz4+gnnzgWEi8QarBlK8KXkdE48/rihLpbHljRHkaydwjSkCkU0VtQPVoZabrMf6DtfUB+i8= 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=uaC3mE71; arc=none smtp.client-ip=95.215.58.186 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="uaC3mE71" 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=1763396485; 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=unkpcT4ldtjySJJ6S51LVqOBE+PIcmuuvL/JHDNoSLE=; b=uaC3mE71tNKVKT7KBEK9taHIHfVTcREOFZ0jPwKKZkfxxxkoL04wil3S6+Ybu0zLXX24CK 2J/q8XV1DLYXkX4ha9V0XD2SAvWMHPmH35dtvmvXwXvwphKzKYJxkzE4rkgQ+2fJTCgV6x 4IYsHQb4Fizowc1j9e1k5msBKQ4t2FY= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, jolsa@kernel.org, yonghong.song@linux.dev, song@kernel.org, eddyz87@gmail.com, dxu@dxuuu.xyz, deso@posteo.net, martin.lau@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, shuah@kernel.org, kerneljasonxing@gmail.com, chen.dylane@linux.dev, willemb@google.com, paul.chaignon@gmail.com, a.s.protopopov@gmail.com, memxor@gmail.com, yatsenko@meta.com, tklauser@distanz.ch, leon.hwang@linux.dev, kernel-patches-bot@fb.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v10 3/8] bpf: Add BPF_F_CPU and BPF_F_ALL_CPUS flags support for percpu_array maps Date: Tue, 18 Nov 2025 00:20:28 +0800 Message-ID: <20251117162033.6296-4-leon.hwang@linux.dev> In-Reply-To: <20251117162033.6296-1-leon.hwang@linux.dev> References: <20251117162033.6296-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 support for the BPF_F_ALL_CPUS flag in percpu_array maps to allow updating values for all CPUs with a single value for both update_elem and update_batch APIs. Introduce support for the BPF_F_CPU flag in percpu_array maps to allow: * update value for specified CPU for both update_elem and update_batch APIs. * lookup value for specified CPU for both lookup_elem and lookup_batch APIs. The BPF_F_CPU flag is passed via: * map_flags of lookup_elem and update_elem APIs along with embedded cpu info. * elem_flags of lookup_batch and update_batch APIs along with embedded cpu info. Signed-off-by: Leon Hwang --- include/linux/bpf.h | 9 +++++++-- kernel/bpf/arraymap.c | 29 +++++++++++++++++++++++------ kernel/bpf/syscall.c | 2 +- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 65737870f2ea6..c43cdd90bfb12 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2748,7 +2748,7 @@ int map_set_for_each_callback_args(struct bpf_verifie= r_env *env, struct bpf_func_state *callee); =20 int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value); -int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value); +int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value, u64= flags); int bpf_percpu_hash_update(struct bpf_map *map, void *key, void *value, u64 flags); int bpf_percpu_array_update(struct bpf_map *map, void *key, void *value, @@ -3815,7 +3815,12 @@ bpf_prog_update_insn_ptrs(struct bpf_prog *prog, u32= *offsets, void *image) =20 static inline bool bpf_map_supports_cpu_flags(enum bpf_map_type map_type) { - return false; + switch (map_type) { + case BPF_MAP_TYPE_PERCPU_ARRAY: + return true; + default: + return false; + } } =20 static inline int bpf_map_check_op_flags(struct bpf_map *map, u64 flags, u= 64 allowed_flags) diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 1eeb31c5b317d..67e9e811de3a7 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -307,7 +307,7 @@ static void *percpu_array_map_lookup_percpu_elem(struct= bpf_map *map, void *key, return per_cpu_ptr(array->pptrs[index & array->index_mask], cpu); } =20 -int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value) +int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value, u64= map_flags) { struct bpf_array *array =3D container_of(map, struct bpf_array, map); u32 index =3D *(u32 *)key; @@ -325,11 +325,18 @@ int bpf_percpu_array_copy(struct bpf_map *map, void *= key, void *value) size =3D array->elem_size; rcu_read_lock(); pptr =3D array->pptrs[index & array->index_mask]; + if (map_flags & BPF_F_CPU) { + cpu =3D map_flags >> 32; + copy_map_value(map, value, per_cpu_ptr(pptr, cpu)); + check_and_init_map_value(map, value); + goto unlock; + } for_each_possible_cpu(cpu) { copy_map_value_long(map, value + off, per_cpu_ptr(pptr, cpu)); check_and_init_map_value(map, value + off); off +=3D size; } +unlock: rcu_read_unlock(); return 0; } @@ -398,10 +405,11 @@ int bpf_percpu_array_update(struct bpf_map *map, void= *key, void *value, struct bpf_array *array =3D container_of(map, struct bpf_array, map); u32 index =3D *(u32 *)key; void __percpu *pptr; - int cpu, off =3D 0; + void *ptr, *val; u32 size; + int cpu; =20 - if (unlikely(map_flags > BPF_EXIST)) + if (unlikely((map_flags & BPF_F_LOCK) || (u32)map_flags > BPF_F_ALL_CPUS)) /* unknown flags */ return -EINVAL; =20 @@ -422,11 +430,20 @@ int bpf_percpu_array_update(struct bpf_map *map, void= *key, void *value, size =3D array->elem_size; rcu_read_lock(); pptr =3D array->pptrs[index & array->index_mask]; + if (map_flags & BPF_F_CPU) { + cpu =3D map_flags >> 32; + ptr =3D per_cpu_ptr(pptr, cpu); + copy_map_value(map, ptr, value); + bpf_obj_free_fields(array->map.record, ptr); + goto unlock; + } for_each_possible_cpu(cpu) { - copy_map_value_long(map, per_cpu_ptr(pptr, cpu), value + off); - bpf_obj_free_fields(array->map.record, per_cpu_ptr(pptr, cpu)); - off +=3D size; + ptr =3D per_cpu_ptr(pptr, cpu); + val =3D (map_flags & BPF_F_ALL_CPUS) ? value : value + size * cpu; + copy_map_value(map, ptr, val); + bpf_obj_free_fields(array->map.record, ptr); } +unlock: rcu_read_unlock(); return 0; } diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 6edaab858b326..edb7462a34f13 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -318,7 +318,7 @@ static int bpf_map_copy_value(struct bpf_map *map, void= *key, void *value, map->map_type =3D=3D BPF_MAP_TYPE_LRU_PERCPU_HASH) { err =3D bpf_percpu_hash_copy(map, key, value); } else if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) { - err =3D bpf_percpu_array_copy(map, key, value); + err =3D bpf_percpu_array_copy(map, key, value, flags); } else if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE) { err =3D bpf_percpu_cgroup_storage_copy(map, key, value); } else if (map->map_type =3D=3D BPF_MAP_TYPE_STACK_TRACE) { --=20 2.51.2 From nobody Tue Dec 2 02:52:39 2025 Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) (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 D86402C3255 for ; Mon, 17 Nov 2025 16:21:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396499; cv=none; b=s6RMmtqY0Dl/NCEQWSogzHwLOWgLSDnyKrZlqqkrm81LsnFrq+cTSeSvTorzZq8cbkuVSGip2nIHnv1cYMKrIMo6JF0g74JQ+Il9dnPNToLS8ZdsZkghnV9YQkVHF05ZpEH5c1ADziLhtzzkUKmTk7SFCQ/VpKDnAcVSSVmcH7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396499; c=relaxed/simple; bh=nad3ns0Tkp0dhKKMPYpPYv0thZFn54LvuIJxJRbUVaI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fvvF5OfT9Q0w3gdnPRnUhJYKVdwaCdh6PRG2FI9+1P7RRsRXHaEPLqvZaicXH3LuOV6OwBoNcVas+WWLBb2Oqq/Shqzki9u7aryxCjZWZp0pFAOeQwP94UA63U9QeLRdk5SHPxmSAMeJjg4XOGTY05xF7dRVXKAcI+kZCaXZXIM= 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=Ba9kzzNr; arc=none smtp.client-ip=95.215.58.177 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="Ba9kzzNr" 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=1763396495; 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=NxpPmkG0oVW8SEPBdW6VjSMfikLz9cFnZHgyNykgu1c=; b=Ba9kzzNrTKffvdwBl6Y3Q9TalRbbJYjwXzh9gO0ohHhFeuonnS8uEA/YYCuJnUHCd8ZSmi YJWS8zWb2MpOwQWpZFsYS8VmIz3PDF+/3FM2mX6ICBe3LcebRDjGq8qocqJ4sWNGsei1VR 9vHRzcGkpMaYwA8vOD8UgM19U/yd5Zw= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, jolsa@kernel.org, yonghong.song@linux.dev, song@kernel.org, eddyz87@gmail.com, dxu@dxuuu.xyz, deso@posteo.net, martin.lau@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, shuah@kernel.org, kerneljasonxing@gmail.com, chen.dylane@linux.dev, willemb@google.com, paul.chaignon@gmail.com, a.s.protopopov@gmail.com, memxor@gmail.com, yatsenko@meta.com, tklauser@distanz.ch, leon.hwang@linux.dev, kernel-patches-bot@fb.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v10 4/8] bpf: Add BPF_F_CPU and BPF_F_ALL_CPUS flags support for percpu_hash and lru_percpu_hash maps Date: Tue, 18 Nov 2025 00:20:29 +0800 Message-ID: <20251117162033.6296-5-leon.hwang@linux.dev> In-Reply-To: <20251117162033.6296-1-leon.hwang@linux.dev> References: <20251117162033.6296-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 BPF_F_ALL_CPUS flag support for percpu_hash and lru_percpu_hash maps to allow updating values for all CPUs with a single value for both update_elem and update_batch APIs. Introduce BPF_F_CPU flag support for percpu_hash and lru_percpu_hash maps to allow: * update value for specified CPU for both update_elem and update_batch APIs. * lookup value for specified CPU for both lookup_elem and lookup_batch APIs. The BPF_F_CPU flag is passed via: * map_flags along with embedded cpu info. * elem_flags along with embedded cpu info. Signed-off-by: Leon Hwang --- include/linux/bpf.h | 4 +- kernel/bpf/hashtab.c | 94 ++++++++++++++++++++++++++++++-------------- kernel/bpf/syscall.c | 2 +- 3 files changed, 68 insertions(+), 32 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index c43cdd90bfb12..1fc0afb7f547f 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2747,7 +2747,7 @@ int map_set_for_each_callback_args(struct bpf_verifie= r_env *env, struct bpf_func_state *caller, struct bpf_func_state *callee); =20 -int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value); +int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value, u64 = flags); int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value, u64= flags); int bpf_percpu_hash_update(struct bpf_map *map, void *key, void *value, u64 flags); @@ -3817,6 +3817,8 @@ static inline bool bpf_map_supports_cpu_flags(enum bp= f_map_type map_type) { switch (map_type) { case BPF_MAP_TYPE_PERCPU_ARRAY: + case BPF_MAP_TYPE_PERCPU_HASH: + case BPF_MAP_TYPE_LRU_PERCPU_HASH: return true; default: return false; diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index c8a9b27f8663b..441ff5bc54ac2 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -932,7 +932,7 @@ static void free_htab_elem(struct bpf_htab *htab, struc= t htab_elem *l) } =20 static void pcpu_copy_value(struct bpf_htab *htab, void __percpu *pptr, - void *value, bool onallcpus) + void *value, bool onallcpus, u64 map_flags) { void *ptr; =20 @@ -943,19 +943,28 @@ static void pcpu_copy_value(struct bpf_htab *htab, vo= id __percpu *pptr, bpf_obj_free_fields(htab->map.record, ptr); } else { u32 size =3D round_up(htab->map.value_size, 8); - int off =3D 0, cpu; + void *val; + int cpu; + + if (map_flags & BPF_F_CPU) { + cpu =3D map_flags >> 32; + ptr =3D per_cpu_ptr(pptr, cpu); + copy_map_value(&htab->map, ptr, value); + bpf_obj_free_fields(htab->map.record, ptr); + return; + } =20 for_each_possible_cpu(cpu) { ptr =3D per_cpu_ptr(pptr, cpu); - copy_map_value_long(&htab->map, ptr, value + off); + val =3D (map_flags & BPF_F_ALL_CPUS) ? value : value + size * cpu; + copy_map_value(&htab->map, ptr, val); bpf_obj_free_fields(htab->map.record, ptr); - off +=3D size; } } } =20 static void pcpu_init_value(struct bpf_htab *htab, void __percpu *pptr, - void *value, bool onallcpus) + void *value, bool onallcpus, u64 map_flags) { /* When not setting the initial value on all cpus, zero-fill element * values for other cpus. Otherwise, bpf program has no way to ensure @@ -973,7 +982,7 @@ static void pcpu_init_value(struct bpf_htab *htab, void= __percpu *pptr, zero_map_value(&htab->map, per_cpu_ptr(pptr, cpu)); } } else { - pcpu_copy_value(htab, pptr, value, onallcpus); + pcpu_copy_value(htab, pptr, value, onallcpus, map_flags); } } =20 @@ -985,7 +994,7 @@ static bool fd_htab_map_needs_adjust(const struct bpf_h= tab *htab) static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, void *value, u32 key_size, u32 hash, bool percpu, bool onallcpus, - struct htab_elem *old_elem) + struct htab_elem *old_elem, u64 map_flags) { u32 size =3D htab->map.value_size; bool prealloc =3D htab_is_prealloc(htab); @@ -1043,7 +1052,7 @@ static struct htab_elem *alloc_htab_elem(struct bpf_h= tab *htab, void *key, pptr =3D *(void __percpu **)ptr; } =20 - pcpu_init_value(htab, pptr, value, onallcpus); + pcpu_init_value(htab, pptr, value, onallcpus, map_flags); =20 if (!prealloc) htab_elem_set_ptr(l_new, key_size, pptr); @@ -1147,7 +1156,7 @@ static long htab_map_update_elem(struct bpf_map *map,= void *key, void *value, } =20 l_new =3D alloc_htab_elem(htab, key, value, key_size, hash, false, false, - l_old); + l_old, map_flags); if (IS_ERR(l_new)) { /* all pre-allocated elements are in use or memory exhausted */ ret =3D PTR_ERR(l_new); @@ -1249,6 +1258,15 @@ static long htab_lru_map_update_elem(struct bpf_map = *map, void *key, void *value return ret; } =20 +static int htab_map_check_update_flags(bool onallcpus, u64 map_flags) +{ + if (unlikely(!onallcpus && map_flags > BPF_EXIST)) + return -EINVAL; + if (unlikely(onallcpus && ((map_flags & BPF_F_LOCK) || (u32)map_flags > B= PF_F_ALL_CPUS))) + return -EINVAL; + return 0; +} + static long htab_map_update_elem_in_place(struct bpf_map *map, void *key, void *value, u64 map_flags, bool percpu, bool onallcpus) @@ -1262,9 +1280,9 @@ static long htab_map_update_elem_in_place(struct bpf_= map *map, void *key, u32 key_size, hash; int ret; =20 - if (unlikely(map_flags > BPF_EXIST)) - /* unknown flags */ - return -EINVAL; + ret =3D htab_map_check_update_flags(onallcpus, map_flags); + if (unlikely(ret)) + return ret; =20 WARN_ON_ONCE(!bpf_rcu_lock_held()); =20 @@ -1289,7 +1307,7 @@ static long htab_map_update_elem_in_place(struct bpf_= map *map, void *key, /* Update value in-place */ if (percpu) { pcpu_copy_value(htab, htab_elem_get_ptr(l_old, key_size), - value, onallcpus); + value, onallcpus, map_flags); } else { void **inner_map_pptr =3D htab_elem_value(l_old, key_size); =20 @@ -1298,7 +1316,7 @@ static long htab_map_update_elem_in_place(struct bpf_= map *map, void *key, } } else { l_new =3D alloc_htab_elem(htab, key, value, key_size, - hash, percpu, onallcpus, NULL); + hash, percpu, onallcpus, NULL, map_flags); if (IS_ERR(l_new)) { ret =3D PTR_ERR(l_new); goto err; @@ -1324,9 +1342,9 @@ static long __htab_lru_percpu_map_update_elem(struct = bpf_map *map, void *key, u32 key_size, hash; int ret; =20 - if (unlikely(map_flags > BPF_EXIST)) - /* unknown flags */ - return -EINVAL; + ret =3D htab_map_check_update_flags(onallcpus, map_flags); + if (unlikely(ret)) + return ret; =20 WARN_ON_ONCE(!bpf_rcu_lock_held()); =20 @@ -1363,10 +1381,10 @@ static long __htab_lru_percpu_map_update_elem(struc= t bpf_map *map, void *key, =20 /* per-cpu hash map can update value in-place */ pcpu_copy_value(htab, htab_elem_get_ptr(l_old, key_size), - value, onallcpus); + value, onallcpus, map_flags); } else { pcpu_init_value(htab, htab_elem_get_ptr(l_new, key_size), - value, onallcpus); + value, onallcpus, map_flags); hlist_nulls_add_head_rcu(&l_new->hash_node, head); l_new =3D NULL; } @@ -1678,9 +1696,9 @@ __htab_map_lookup_and_delete_batch(struct bpf_map *ma= p, void __user *ukeys =3D u64_to_user_ptr(attr->batch.keys); void __user *ubatch =3D u64_to_user_ptr(attr->batch.in_batch); u32 batch, max_count, size, bucket_size, map_id; + u64 elem_map_flags, map_flags, allowed_flags; u32 bucket_cnt, total, key_size, value_size; struct htab_elem *node_to_free =3D NULL; - u64 elem_map_flags, map_flags; struct hlist_nulls_head *head; struct hlist_nulls_node *n; unsigned long flags =3D 0; @@ -1690,9 +1708,12 @@ __htab_map_lookup_and_delete_batch(struct bpf_map *m= ap, int ret =3D 0; =20 elem_map_flags =3D attr->batch.elem_flags; - if ((elem_map_flags & ~BPF_F_LOCK) || - ((elem_map_flags & BPF_F_LOCK) && !btf_record_has_field(map->record, = BPF_SPIN_LOCK))) - return -EINVAL; + allowed_flags =3D BPF_F_LOCK; + if (!do_delete && is_percpu) + allowed_flags |=3D BPF_F_CPU; + ret =3D bpf_map_check_op_flags(map, elem_map_flags, allowed_flags); + if (ret) + return ret; =20 map_flags =3D attr->batch.flags; if (map_flags) @@ -1715,7 +1736,7 @@ __htab_map_lookup_and_delete_batch(struct bpf_map *ma= p, key_size =3D htab->map.key_size; value_size =3D htab->map.value_size; size =3D round_up(value_size, 8); - if (is_percpu) + if (is_percpu && !(elem_map_flags & BPF_F_CPU)) value_size =3D size * num_possible_cpus(); total =3D 0; /* while experimenting with hash tables with sizes ranging from 10 to @@ -1798,10 +1819,17 @@ __htab_map_lookup_and_delete_batch(struct bpf_map *= map, void __percpu *pptr; =20 pptr =3D htab_elem_get_ptr(l, map->key_size); - for_each_possible_cpu(cpu) { - copy_map_value_long(&htab->map, dst_val + off, per_cpu_ptr(pptr, cpu)); - check_and_init_map_value(&htab->map, dst_val + off); - off +=3D size; + if (elem_map_flags & BPF_F_CPU) { + cpu =3D elem_map_flags >> 32; + copy_map_value(&htab->map, dst_val, per_cpu_ptr(pptr, cpu)); + check_and_init_map_value(&htab->map, dst_val); + } else { + for_each_possible_cpu(cpu) { + copy_map_value_long(&htab->map, dst_val + off, + per_cpu_ptr(pptr, cpu)); + check_and_init_map_value(&htab->map, dst_val + off); + off +=3D size; + } } } else { value =3D htab_elem_value(l, key_size); @@ -2357,7 +2385,7 @@ static void *htab_lru_percpu_map_lookup_percpu_elem(s= truct bpf_map *map, void *k return NULL; } =20 -int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value) +int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value, u64 = map_flags) { struct htab_elem *l; void __percpu *pptr; @@ -2374,16 +2402,22 @@ int bpf_percpu_hash_copy(struct bpf_map *map, void = *key, void *value) l =3D __htab_map_lookup_elem(map, key); if (!l) goto out; + ret =3D 0; /* We do not mark LRU map element here in order to not mess up * eviction heuristics when user space does a map walk. */ pptr =3D htab_elem_get_ptr(l, map->key_size); + if (map_flags & BPF_F_CPU) { + cpu =3D map_flags >> 32; + copy_map_value(map, value, per_cpu_ptr(pptr, cpu)); + check_and_init_map_value(map, value); + goto out; + } for_each_possible_cpu(cpu) { copy_map_value_long(map, value + off, per_cpu_ptr(pptr, cpu)); check_and_init_map_value(map, value + off); off +=3D size; } - ret =3D 0; out: rcu_read_unlock(); return ret; diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index edb7462a34f13..3cff19a4be527 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -316,7 +316,7 @@ static int bpf_map_copy_value(struct bpf_map *map, void= *key, void *value, bpf_disable_instrumentation(); if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_HASH || map->map_type =3D=3D BPF_MAP_TYPE_LRU_PERCPU_HASH) { - err =3D bpf_percpu_hash_copy(map, key, value); + err =3D bpf_percpu_hash_copy(map, key, value, flags); } else if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) { err =3D bpf_percpu_array_copy(map, key, value, flags); } else if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE) { --=20 2.51.2 From nobody Tue Dec 2 02:52:39 2025 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) (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 243522BE7BB for ; Mon, 17 Nov 2025 16:21:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396510; cv=none; b=h6YUYWl1qJt6MQnj68gk8cES74aH0GyZkAKqlw1Z78M70SxLK4kF3fDU1JoB84MzT2yj96edHKcF8eIUl/DsJnAPUaNf1VPsPMDZWHSLBH9M/raSdueSe5F6kujS+e8orQ0MynJgHKNI7ixHJfIQb1kRHEdIJSPXn0jex1Srqjg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396510; c=relaxed/simple; bh=q+SS09vPl9RVqEDMec7z3rfKuBIlv1TiECjWVh29Xtw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ezs91GRoaaA11Bs2Pzi0QSwL+TzWWmhDZ1gKPLnRxd5T5dwxGNX3TbqlJB892Z+8CvVrynvIsqwkUTaTHcLUyyhpCf0L6tYGK+xSZZpya8tcyTpiLSppTqfn0EOzXwV6dMOvICRvULwOrk6kB1qNJ6r6Nj7at7TBOu8Em3qa9E0= 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=XQSoRlRI; arc=none smtp.client-ip=95.215.58.188 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="XQSoRlRI" 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=1763396506; 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=LlFP1LkuoidfQEZRw88sVLRc8cr0hCYNFbVaNj3uzRk=; b=XQSoRlRI0bRU1xDf4iThPmt8e+gcf8dT6Fie5AMJJhFvKAy/I3kZpTJnrIcuS0RA3NUhOn EMztkM8SC3SWgea0Yh8vwXmpYuckRnfB40SPbIvdQut1jcz4pRU6eI14t0UQ5nT90EQyB1 4GEqyPJztZNFTO58rIO8IuE/qzvU8kU= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, jolsa@kernel.org, yonghong.song@linux.dev, song@kernel.org, eddyz87@gmail.com, dxu@dxuuu.xyz, deso@posteo.net, martin.lau@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, shuah@kernel.org, kerneljasonxing@gmail.com, chen.dylane@linux.dev, willemb@google.com, paul.chaignon@gmail.com, a.s.protopopov@gmail.com, memxor@gmail.com, yatsenko@meta.com, tklauser@distanz.ch, leon.hwang@linux.dev, kernel-patches-bot@fb.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v10 5/8] bpf: Copy map value using copy_map_value_long for percpu_cgroup_storage maps Date: Tue, 18 Nov 2025 00:20:30 +0800 Message-ID: <20251117162033.6296-6-leon.hwang@linux.dev> In-Reply-To: <20251117162033.6296-1-leon.hwang@linux.dev> References: <20251117162033.6296-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" Copy map value using 'copy_map_value_long()'. It's to keep consistent style with the way of other percpu maps. No functional change intended. Signed-off-by: Leon Hwang --- kernel/bpf/local_storage.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/bpf/local_storage.c b/kernel/bpf/local_storage.c index c93a756e035c0..2ab4b60ffe61f 100644 --- a/kernel/bpf/local_storage.c +++ b/kernel/bpf/local_storage.c @@ -200,8 +200,7 @@ int bpf_percpu_cgroup_storage_copy(struct bpf_map *_map= , void *key, */ size =3D round_up(_map->value_size, 8); for_each_possible_cpu(cpu) { - bpf_long_memcpy(value + off, - per_cpu_ptr(storage->percpu_buf, cpu), size); + copy_map_value_long(_map, value + off, per_cpu_ptr(storage->percpu_buf, = cpu)); off +=3D size; } rcu_read_unlock(); @@ -234,8 +233,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *_m= ap, void *key, */ size =3D round_up(_map->value_size, 8); for_each_possible_cpu(cpu) { - bpf_long_memcpy(per_cpu_ptr(storage->percpu_buf, cpu), - value + off, size); + copy_map_value_long(_map, per_cpu_ptr(storage->percpu_buf, cpu), value += off); off +=3D size; } rcu_read_unlock(); --=20 2.51.2 From nobody Tue Dec 2 02:52:39 2025 Received: from out-181.mta1.migadu.com (out-181.mta1.migadu.com [95.215.58.181]) (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 9508F2C3252 for ; Mon, 17 Nov 2025 16:21:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396520; cv=none; b=aKtFE40mo7nsOq7wMo4Tq2XHSiSaDy1+XKmkj6VT7RGDcru3RWKncKhtx5HyHox7Od4l0jBRDK0L4wWCEC4zvVRL0Y/tV5iGyHaAJMig1vUh9wu83ld1dtgOYVyHDcz9vffFTXU0vhnQPyk7jyATi2pxnwj6/z16cdcmJm+BNAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396520; c=relaxed/simple; bh=+TvyQ5m3nwqFeuOZjRRIyTskGQ5/rsqaBjt3HmI/ARQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D/tEpkT6dxG6B0640QFgdImPwxbA1qXOo17j0OhSu82NcI6jKKFybVRqnCU4O3ZiQEj/JYQhgNvgtUfNmkWezqYYRU+u6a4l4DWKptHcn4DRGy75T7wBaDW8Tc8Yyz/x9aosqQvlXgjrHzFu2onM+V8mDGxKCwsQGWnoojt1z1Y= 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=pcauAFIW; arc=none smtp.client-ip=95.215.58.181 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="pcauAFIW" 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=1763396516; 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=Zvg92b42OFhnOUh/6Q22itovVwfvakyr46Hx8+9Naz4=; b=pcauAFIWDa/r/2Sc/4WIIXdgdUDWpOddP82dk8fd8TVEEtPN0NAfSSkiiuWtFucvSo4Sw8 M8fh6lEq3ZtDUQDcfLR+koI9iF2OwrrHnCYCj9DrXHepmPWSzU/d6iemYn+LOPNiOKRjnO qjAK+/mAbVakdQRqlK+UW+89xVq9dCg= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, jolsa@kernel.org, yonghong.song@linux.dev, song@kernel.org, eddyz87@gmail.com, dxu@dxuuu.xyz, deso@posteo.net, martin.lau@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, shuah@kernel.org, kerneljasonxing@gmail.com, chen.dylane@linux.dev, willemb@google.com, paul.chaignon@gmail.com, a.s.protopopov@gmail.com, memxor@gmail.com, yatsenko@meta.com, tklauser@distanz.ch, leon.hwang@linux.dev, kernel-patches-bot@fb.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v10 6/8] bpf: Add BPF_F_CPU and BPF_F_ALL_CPUS flags support for percpu_cgroup_storage maps Date: Tue, 18 Nov 2025 00:20:31 +0800 Message-ID: <20251117162033.6296-7-leon.hwang@linux.dev> In-Reply-To: <20251117162033.6296-1-leon.hwang@linux.dev> References: <20251117162033.6296-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 BPF_F_ALL_CPUS flag support for percpu_cgroup_storage maps to allow updating values for all CPUs with a single value for update_elem API. Introduce BPF_F_CPU flag support for percpu_cgroup_storage maps to allow: * update value for specified CPU for update_elem API. * lookup value for specified CPU for lookup_elem API. The BPF_F_CPU flag is passed via map_flags along with embedded cpu info. Signed-off-by: Leon Hwang --- include/linux/bpf-cgroup.h | 4 ++-- include/linux/bpf.h | 1 + kernel/bpf/local_storage.c | 23 ++++++++++++++++++----- kernel/bpf/syscall.c | 2 +- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index aedf573bdb426..013f4db9903fd 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -172,7 +172,7 @@ void bpf_cgroup_storage_link(struct bpf_cgroup_storage = *storage, void bpf_cgroup_storage_unlink(struct bpf_cgroup_storage *storage); int bpf_cgroup_storage_assign(struct bpf_prog_aux *aux, struct bpf_map *ma= p); =20 -int bpf_percpu_cgroup_storage_copy(struct bpf_map *map, void *key, void *v= alue); +int bpf_percpu_cgroup_storage_copy(struct bpf_map *map, void *key, void *v= alue, u64 flags); int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key, void *value, u64 flags); =20 @@ -467,7 +467,7 @@ static inline struct bpf_cgroup_storage *bpf_cgroup_sto= rage_alloc( static inline void bpf_cgroup_storage_free( struct bpf_cgroup_storage *storage) {} static inline int bpf_percpu_cgroup_storage_copy(struct bpf_map *map, void= *key, - void *value) { + void *value, u64 flags) { return 0; } static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map, diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 1fc0afb7f547f..e87779d3c5927 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -3819,6 +3819,7 @@ static inline bool bpf_map_supports_cpu_flags(enum bp= f_map_type map_type) case BPF_MAP_TYPE_PERCPU_ARRAY: case BPF_MAP_TYPE_PERCPU_HASH: case BPF_MAP_TYPE_LRU_PERCPU_HASH: + case BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE: return true; default: return false; diff --git a/kernel/bpf/local_storage.c b/kernel/bpf/local_storage.c index 2ab4b60ffe61f..1ccbf28b2ad9f 100644 --- a/kernel/bpf/local_storage.c +++ b/kernel/bpf/local_storage.c @@ -180,7 +180,7 @@ static long cgroup_storage_update_elem(struct bpf_map *= map, void *key, } =20 int bpf_percpu_cgroup_storage_copy(struct bpf_map *_map, void *key, - void *value) + void *value, u64 map_flags) { struct bpf_cgroup_storage_map *map =3D map_to_storage(_map); struct bpf_cgroup_storage *storage; @@ -198,11 +198,17 @@ int bpf_percpu_cgroup_storage_copy(struct bpf_map *_m= ap, void *key, * access 'value_size' of them, so copying rounded areas * will not leak any kernel data */ + if (map_flags & BPF_F_CPU) { + cpu =3D map_flags >> 32; + copy_map_value(_map, value, per_cpu_ptr(storage->percpu_buf, cpu)); + goto unlock; + } size =3D round_up(_map->value_size, 8); for_each_possible_cpu(cpu) { copy_map_value_long(_map, value + off, per_cpu_ptr(storage->percpu_buf, = cpu)); off +=3D size; } +unlock: rcu_read_unlock(); return 0; } @@ -212,10 +218,11 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *= _map, void *key, { struct bpf_cgroup_storage_map *map =3D map_to_storage(_map); struct bpf_cgroup_storage *storage; - int cpu, off =3D 0; + void *val; u32 size; + int cpu; =20 - if (map_flags !=3D BPF_ANY && map_flags !=3D BPF_EXIST) + if ((u32)map_flags & ~(BPF_ANY | BPF_EXIST | BPF_F_CPU | BPF_F_ALL_CPUS)) return -EINVAL; =20 rcu_read_lock(); @@ -231,11 +238,17 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *= _map, void *key, * returned or zeros which were zero-filled by percpu_alloc, * so no kernel data leaks possible */ + if (map_flags & BPF_F_CPU) { + cpu =3D map_flags >> 32; + copy_map_value(_map, per_cpu_ptr(storage->percpu_buf, cpu), value); + goto unlock; + } size =3D round_up(_map->value_size, 8); for_each_possible_cpu(cpu) { - copy_map_value_long(_map, per_cpu_ptr(storage->percpu_buf, cpu), value += off); - off +=3D size; + val =3D (map_flags & BPF_F_ALL_CPUS) ? value : value + size * cpu; + copy_map_value(_map, per_cpu_ptr(storage->percpu_buf, cpu), val); } +unlock: rcu_read_unlock(); return 0; } diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 3cff19a4be527..643e589c10231 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -320,7 +320,7 @@ static int bpf_map_copy_value(struct bpf_map *map, void= *key, void *value, } else if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY) { err =3D bpf_percpu_array_copy(map, key, value, flags); } else if (map->map_type =3D=3D BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE) { - err =3D bpf_percpu_cgroup_storage_copy(map, key, value); + err =3D bpf_percpu_cgroup_storage_copy(map, key, value, flags); } else if (map->map_type =3D=3D BPF_MAP_TYPE_STACK_TRACE) { err =3D bpf_stackmap_extract(map, key, value, false); } else if (IS_FD_ARRAY(map) || IS_FD_PROG_ARRAY(map)) { --=20 2.51.2 From nobody Tue Dec 2 02:52:39 2025 Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) (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 286D42C21E6 for ; Mon, 17 Nov 2025 16:22:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396529; cv=none; b=c+J/kU5tt5ryLuH7zqTRNne5Pi1LcKWvKK12XDBzXp/5c0srg49Cstx1Zaksro6Ta8vsLN5CD/kOHbImAkgmBLomQ4agXA4qA1AZKwqLcOlZsyh6tLKsBpsghHEAJ9inWG5dJDzn2GIMRQSw86eLpZt8VRA6NxFwV+Hmuc3gJIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396529; c=relaxed/simple; bh=strluwMZYQ5PBpkqM8MNnJOEj1xKu7oah0lwSl6oqb0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DdXwmj5Sc+LgNuwKzYhuCIoHp6QqqaXkOfUMoRhLnZ4y5F3TuLjgGdSRVAJB+wZcSQvjafuEyDAMvDemWQjGQbzZ5TBf68bci3iuqU9C1zfYg+T7A6lRSLZi82t7YDnFsi8o0KMJHPty4L0tkVM27Nap/O4p0kbUhGaDgOk8ANg= 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=Y7KS95Zg; arc=none smtp.client-ip=95.215.58.180 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="Y7KS95Zg" 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=1763396526; 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=XsoQjQ4s8IFk5ibcGPwigbH86qdVNAD9OQYZj/lMsGQ=; b=Y7KS95Zgzevq4WhXJM3eS83xjWc6/K072k+U+97Sf2uQWhLZTO2zhqPEPnyQEgC4ckeylk M9PnUpys36TQnH2tKj7Z9cVp0jOUVX63Gu7t1tBI9IzwWjyveYKzbMjpQWBHTsLWjQib3I cJzJi7MRW76zOMbdRzgE6gwjHzSNHds= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, jolsa@kernel.org, yonghong.song@linux.dev, song@kernel.org, eddyz87@gmail.com, dxu@dxuuu.xyz, deso@posteo.net, martin.lau@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, shuah@kernel.org, kerneljasonxing@gmail.com, chen.dylane@linux.dev, willemb@google.com, paul.chaignon@gmail.com, a.s.protopopov@gmail.com, memxor@gmail.com, yatsenko@meta.com, tklauser@distanz.ch, leon.hwang@linux.dev, kernel-patches-bot@fb.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v10 7/8] libbpf: Add BPF_F_CPU and BPF_F_ALL_CPUS flags support for percpu maps Date: Tue, 18 Nov 2025 00:20:32 +0800 Message-ID: <20251117162033.6296-8-leon.hwang@linux.dev> In-Reply-To: <20251117162033.6296-1-leon.hwang@linux.dev> References: <20251117162033.6296-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 libbpf support for the BPF_F_CPU flag for percpu maps by embedding the cpu info into the high 32 bits of: 1. **flags**: bpf_map_lookup_elem_flags(), bpf_map__lookup_elem(), bpf_map_update_elem() and bpf_map__update_elem() 2. **opts->elem_flags**: bpf_map_lookup_batch() and bpf_map_update_batch() And the flag can be BPF_F_ALL_CPUS, but cannot be 'BPF_F_CPU | BPF_F_ALL_CPUS'. Behavior: * If the flag is BPF_F_ALL_CPUS, the update is applied across all CPUs. * If the flag is BPF_F_CPU, it updates value only to the specified CPU. * If the flag is BPF_F_CPU, lookup value only from the specified CPU. * lookup does not support BPF_F_ALL_CPUS. Acked-by: Andrii Nakryiko Signed-off-by: Leon Hwang --- tools/lib/bpf/bpf.h | 8 ++++++++ tools/lib/bpf/libbpf.c | 26 ++++++++++++++++++++------ tools/lib/bpf/libbpf.h | 21 ++++++++------------- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index e983a3e40d612..ffd93feffd71d 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -289,6 +289,14 @@ LIBBPF_API int bpf_map_lookup_and_delete_batch(int fd,= void *in_batch, * Update spin_lock-ed map elements. This must be * specified if the map value contains a spinlock. * + * **BPF_F_CPU** + * As for percpu maps, update value on the specified CPU. And the cpu + * info is embedded into the high 32 bits of **opts->elem_flags**. + * + * **BPF_F_ALL_CPUS** + * As for percpu maps, update value across all CPUs. This flag cannot + * be used with BPF_F_CPU at the same time. + * * @param fd BPF map file descriptor * @param keys pointer to an array of *count* keys * @param values pointer to an array of *count* values diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 706e7481bdf6b..65b9b5e955449 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -10913,7 +10913,7 @@ bpf_object__find_map_fd_by_name(const struct bpf_ob= ject *obj, const char *name) } =20 static int validate_map_op(const struct bpf_map *map, size_t key_sz, - size_t value_sz, bool check_value_sz) + size_t value_sz, bool check_value_sz, __u64 flags) { if (!map_is_created(map)) /* map is not yet created */ return -ENOENT; @@ -10940,6 +10940,20 @@ static int validate_map_op(const struct bpf_map *m= ap, size_t key_sz, int num_cpu =3D libbpf_num_possible_cpus(); size_t elem_sz =3D roundup(map->def.value_size, 8); =20 + if (flags & (BPF_F_CPU | BPF_F_ALL_CPUS)) { + if ((flags & BPF_F_CPU) && (flags & BPF_F_ALL_CPUS)) { + pr_warn("map '%s': BPF_F_CPU and BPF_F_ALL_CPUS are mutually exclusive= \n", + map->name); + return -EINVAL; + } + if (map->def.value_size !=3D value_sz) { + pr_warn("map '%s': unexpected value size %zu provided for either BPF_F= _CPU or BPF_F_ALL_CPUS, expected %u\n", + map->name, value_sz, map->def.value_size); + return -EINVAL; + } + break; + } + if (value_sz !=3D num_cpu * elem_sz) { pr_warn("map '%s': unexpected value size %zu provided for per-CPU map, = expected %d * %zu =3D %zd\n", map->name, value_sz, num_cpu, elem_sz, num_cpu * elem_sz); @@ -10964,7 +10978,7 @@ int bpf_map__lookup_elem(const struct bpf_map *map, { int err; =20 - err =3D validate_map_op(map, key_sz, value_sz, true); + err =3D validate_map_op(map, key_sz, value_sz, true, flags); if (err) return libbpf_err(err); =20 @@ -10977,7 +10991,7 @@ int bpf_map__update_elem(const struct bpf_map *map, { int err; =20 - err =3D validate_map_op(map, key_sz, value_sz, true); + err =3D validate_map_op(map, key_sz, value_sz, true, flags); if (err) return libbpf_err(err); =20 @@ -10989,7 +11003,7 @@ int bpf_map__delete_elem(const struct bpf_map *map, { int err; =20 - err =3D validate_map_op(map, key_sz, 0, false /* check_value_sz */); + err =3D validate_map_op(map, key_sz, 0, false /* check_value_sz */, flags= ); if (err) return libbpf_err(err); =20 @@ -11002,7 +11016,7 @@ int bpf_map__lookup_and_delete_elem(const struct bp= f_map *map, { int err; =20 - err =3D validate_map_op(map, key_sz, value_sz, true); + err =3D validate_map_op(map, key_sz, value_sz, true, flags); if (err) return libbpf_err(err); =20 @@ -11014,7 +11028,7 @@ int bpf_map__get_next_key(const struct bpf_map *map, { int err; =20 - err =3D validate_map_op(map, key_sz, 0, false /* check_value_sz */); + err =3D validate_map_op(map, key_sz, 0, false /* check_value_sz */, 0); if (err) return libbpf_err(err); =20 diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 5118d0a90e243..7c38b2e546080 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -1196,12 +1196,13 @@ LIBBPF_API struct bpf_map *bpf_map__inner_map(struc= t bpf_map *map); * @param key_sz size in bytes of key data, needs to match BPF map definit= ion's **key_size** * @param value pointer to memory in which looked up value will be stored * @param value_sz size in byte of value data memory; it has to match BPF = map - * definition's **value_size**. For per-CPU BPF maps value size has to be - * a product of BPF map value size and number of possible CPUs in the syst= em - * (could be fetched with **libbpf_num_possible_cpus()**). Note also that = for - * per-CPU values value size has to be aligned up to closest 8 bytes for - * alignment reasons, so expected size is: `round_up(value_size, 8) - * * libbpf_num_possible_cpus()`. + * definition's **value_size**. For per-CPU BPF maps, value size can be + * `value_size` if either **BPF_F_CPU** or **BPF_F_ALL_CPUS** is specified + * in **flags**, otherwise a product of BPF map value size and number of + * possible CPUs in the system (could be fetched with + * **libbpf_num_possible_cpus()**). Note also that for per-CPU values value + * size has to be aligned up to closest 8 bytes, so expected size is: + * `round_up(value_size, 8) * libbpf_num_possible_cpus()`. * @flags extra flags passed to kernel for this operation * @return 0, on success; negative error, otherwise * @@ -1219,13 +1220,7 @@ LIBBPF_API int bpf_map__lookup_elem(const struct bpf= _map *map, * @param key pointer to memory containing bytes of the key * @param key_sz size in bytes of key data, needs to match BPF map definit= ion's **key_size** * @param value pointer to memory containing bytes of the value - * @param value_sz size in byte of value data memory; it has to match BPF = map - * definition's **value_size**. For per-CPU BPF maps value size has to be - * a product of BPF map value size and number of possible CPUs in the syst= em - * (could be fetched with **libbpf_num_possible_cpus()**). Note also that = for - * per-CPU values value size has to be aligned up to closest 8 bytes for - * alignment reasons, so expected size is: `round_up(value_size, 8) - * * libbpf_num_possible_cpus()`. + * @param value_sz refer to **bpf_map__lookup_elem**'s description.' * @flags extra flags passed to kernel for this operation * @return 0, on success; negative error, otherwise * --=20 2.51.2 From nobody Tue Dec 2 02:52:39 2025 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 0A9792D193F for ; Mon, 17 Nov 2025 16:22:19 +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=1763396543; cv=none; b=f2Zjp5qFK44qfkRcdQyQnIDMWik3O1M1xzogaIQoUr/KO3HlX1piZ9idhUrQ5jy64aRPm8wEmCJPn35qNVwtihHmCsmrZSAf8tf7PDcsaYHOTPVyyVkJ9ffIyY7Cu5ki9JZY0mlewfZjgewD/DSi5dpNXvjG55jBAZvWSFZq7gQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396543; c=relaxed/simple; bh=SKr58fb+ikusy3qLEZ2m7t609IIGLppJ+QZT3pNXvvw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=koW8gh8mB5UuTaHJQ+HckrJwSGNf0A+93XZFmtNIBQ9hnkqyZTVNi5M0r3EnsWHlLS+LWhMhWUthg0LBHtIDwjqPTvChcOSyLb2Hr6O4LnBHqcUkFrN2eji3jqRkF+ESxlds7rZAv6D0b4KWlUjvl6615PeJVTULRvlfVt7plLw= 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=l+dSqZlQ; 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="l+dSqZlQ" 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=1763396538; 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=aTlMjUTcXE4fJ5z7shdH28WHy+3mpeKxMQ8iG8kJtuo=; b=l+dSqZlQcDJWPXJvafvqJVkNlJf+wo5YZN71QJHJmXlIBFn/UsWxMEL+AN5ZQCNiIThLAK +bDVR0Qun57F2s3pKc3FdxM4QwxPQ9hHrqTbQp6BBF98rSwabov+qFWqrYG1mTjiJCSVNo 7jLmXegVmvqWo64RLjk1Ut0B9ScA1d0= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, jolsa@kernel.org, yonghong.song@linux.dev, song@kernel.org, eddyz87@gmail.com, dxu@dxuuu.xyz, deso@posteo.net, martin.lau@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, shuah@kernel.org, kerneljasonxing@gmail.com, chen.dylane@linux.dev, willemb@google.com, paul.chaignon@gmail.com, a.s.protopopov@gmail.com, memxor@gmail.com, yatsenko@meta.com, tklauser@distanz.ch, leon.hwang@linux.dev, kernel-patches-bot@fb.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v10 8/8] selftests/bpf: Add cases to test BPF_F_CPU and BPF_F_ALL_CPUS flags Date: Tue, 18 Nov 2025 00:20:33 +0800 Message-ID: <20251117162033.6296-9-leon.hwang@linux.dev> In-Reply-To: <20251117162033.6296-1-leon.hwang@linux.dev> References: <20251117162033.6296-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 test coverage for the new BPF_F_CPU and BPF_F_ALL_CPUS flags support in percpu maps. The following APIs are exercised: * bpf_map_update_batch() * bpf_map_lookup_batch() * bpf_map_update_elem() * bpf_map__update_elem() * bpf_map_lookup_elem_flags() * bpf_map__lookup_elem() Add tests to verify that array and hash maps do not support BPF_F_CPU and BPF_F_ALL_CPUS flags. Signed-off-by: Leon Hwang --- .../selftests/bpf/prog_tests/percpu_alloc.c | 312 ++++++++++++++++++ .../selftests/bpf/progs/percpu_alloc_array.c | 32 ++ 2 files changed, 344 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/percpu_alloc.c b/tools/= testing/selftests/bpf/prog_tests/percpu_alloc.c index 343da65864d6d..b9c3f5f6cd9c3 100644 --- a/tools/testing/selftests/bpf/prog_tests/percpu_alloc.c +++ b/tools/testing/selftests/bpf/prog_tests/percpu_alloc.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include "cgroup_helpers.h" #include "percpu_alloc_array.skel.h" #include "percpu_alloc_cgrp_local_storage.skel.h" #include "percpu_alloc_fail.skel.h" @@ -115,6 +116,305 @@ static void test_failure(void) { RUN_TESTS(percpu_alloc_fail); } =20 +static void test_percpu_map_op_cpu_flag(struct bpf_map *map, void *keys, s= ize_t key_sz, + u32 max_entries, bool test_batch) +{ + size_t value_sz =3D sizeof(u32), value_sz_cpus, value_sz_total; + u32 *values =3D NULL, *values_percpu =3D NULL; + int i, j, cpu, map_fd, nr_cpus, err; + const u32 value =3D 0xDEADC0DE; + u32 count =3D max_entries, v; + u64 batch =3D 0, flags; + void *values_row; + LIBBPF_OPTS(bpf_map_batch_opts, batch_opts); + + nr_cpus =3D libbpf_num_possible_cpus(); + if (!ASSERT_GT(nr_cpus, 0, "libbpf_num_possible_cpus")) + return; + + value_sz_cpus =3D value_sz * nr_cpus; + values =3D calloc(max_entries, value_sz_cpus); + if (!ASSERT_OK_PTR(values, "calloc values")) + return; + + values_percpu =3D calloc(max_entries, roundup(value_sz, 8) * nr_cpus); + if (!ASSERT_OK_PTR(values_percpu, "calloc values_percpu")) { + free(values); + return; + } + + value_sz_total =3D value_sz_cpus * max_entries; + memset(values, 0, value_sz_total); + + map_fd =3D bpf_map__fd(map); + flags =3D BPF_F_CPU | BPF_F_ALL_CPUS; + err =3D bpf_map_lookup_elem_flags(map_fd, keys, values, flags); + if (!ASSERT_ERR(err, "bpf_map_lookup_elem_flags cpu|all_cpus")) + goto out; + + err =3D bpf_map_update_elem(map_fd, keys, values, flags); + if (!ASSERT_ERR(err, "bpf_map_update_elem cpu|all_cpus")) + goto out; + + flags =3D BPF_F_ALL_CPUS; + err =3D bpf_map_lookup_elem_flags(map_fd, keys, values, flags); + if (!ASSERT_ERR(err, "bpf_map_lookup_elem_flags all_cpus")) + goto out; + + flags =3D BPF_F_LOCK | BPF_F_CPU; + err =3D bpf_map_lookup_elem_flags(map_fd, keys, values, flags); + if (!ASSERT_ERR(err, "bpf_map_lookup_elem_flags BPF_F_LOCK")) + goto out; + + flags =3D BPF_F_LOCK | BPF_F_ALL_CPUS; + err =3D bpf_map_update_elem(map_fd, keys, values, flags); + if (!ASSERT_ERR(err, "bpf_map_update_elem BPF_F_LOCK")) + goto out; + + flags =3D (u64)nr_cpus << 32 | BPF_F_CPU; + err =3D bpf_map_update_elem(map_fd, keys, values, flags); + if (!ASSERT_EQ(err, -ERANGE, "bpf_map_update_elem -ERANGE")) + goto out; + + err =3D bpf_map__update_elem(map, keys, key_sz, values, value_sz, flags); + if (!ASSERT_EQ(err, -ERANGE, "bpf_map__update_elem -ERANGE")) + goto out; + + err =3D bpf_map_lookup_elem_flags(map_fd, keys, values, flags); + if (!ASSERT_EQ(err, -ERANGE, "bpf_map_lookup_elem_flags -ERANGE")) + goto out; + + err =3D bpf_map__lookup_elem(map, keys, key_sz, values, value_sz, flags); + if (!ASSERT_EQ(err, -ERANGE, "bpf_map__lookup_elem -ERANGE")) + goto out; + + for (cpu =3D 0; cpu < nr_cpus; cpu++) { + /* clear value on all cpus */ + values[0] =3D 0; + flags =3D BPF_F_ALL_CPUS; + for (i =3D 0; i < max_entries; i++) { + err =3D bpf_map__update_elem(map, keys + i * key_sz, key_sz, values, + value_sz, flags); + if (!ASSERT_OK(err, "bpf_map__update_elem all_cpus")) + goto out; + } + + /* update value on specified cpu */ + for (i =3D 0; i < max_entries; i++) { + values[0] =3D value; + flags =3D (u64)cpu << 32 | BPF_F_CPU; + err =3D bpf_map__update_elem(map, keys + i * key_sz, key_sz, values, + value_sz, flags); + if (!ASSERT_OK(err, "bpf_map__update_elem specified cpu")) + goto out; + + /* lookup then check value on CPUs */ + for (j =3D 0; j < nr_cpus; j++) { + flags =3D (u64)j << 32 | BPF_F_CPU; + err =3D bpf_map__lookup_elem(map, keys + i * key_sz, key_sz, values, + value_sz, flags); + if (!ASSERT_OK(err, "bpf_map__lookup_elem specified cpu")) + goto out; + if (!ASSERT_EQ(values[0], j !=3D cpu ? 0 : value, + "bpf_map__lookup_elem value on specified cpu")) + goto out; + } + } + } + + if (!test_batch) + goto out; + + batch_opts.elem_flags =3D (u64)nr_cpus << 32 | BPF_F_CPU; + err =3D bpf_map_update_batch(map_fd, keys, values, &max_entries, &batch_o= pts); + if (!ASSERT_EQ(err, -ERANGE, "bpf_map_update_batch -ERANGE")) + goto out; + + for (cpu =3D 0; cpu < nr_cpus; cpu++) { + memset(values, 0, value_sz_total); + + /* clear values across all CPUs */ + batch_opts.elem_flags =3D BPF_F_ALL_CPUS; + err =3D bpf_map_update_batch(map_fd, keys, values, &max_entries, &batch_= opts); + if (!ASSERT_OK(err, "bpf_map_update_batch all_cpus")) + goto out; + + /* update values on specified CPU */ + for (i =3D 0; i < max_entries; i++) + values[i] =3D value; + + batch_opts.elem_flags =3D (u64)cpu << 32 | BPF_F_CPU; + err =3D bpf_map_update_batch(map_fd, keys, values, &max_entries, &batch_= opts); + if (!ASSERT_OK(err, "bpf_map_update_batch specified cpu")) + goto out; + + /* lookup values on specified CPU */ + memset(values, 0, max_entries * value_sz); + err =3D bpf_map_lookup_batch(map_fd, NULL, &batch, keys, values, &count,= &batch_opts); + if (!ASSERT_TRUE(!err || err =3D=3D -ENOENT, "bpf_map_lookup_batch speci= fied cpu")) + goto out; + + for (i =3D 0; i < max_entries; i++) + if (!ASSERT_EQ(values[i], value, + "bpf_map_lookup_batch value on specified cpu")) + goto out; + + /* lookup values from all CPUs */ + batch =3D 0; + count =3D max_entries; + batch_opts.elem_flags =3D 0; + memset(values_percpu, 0, roundup(value_sz, 8) * nr_cpus * max_entries); + err =3D bpf_map_lookup_batch(map_fd, NULL, &batch, keys, values_percpu, = &count, + &batch_opts); + if (!ASSERT_TRUE(!err || err =3D=3D -ENOENT, "bpf_map_lookup_batch all_c= pus")) + goto out; + + for (i =3D 0; i < max_entries; i++) { + values_row =3D (void *) values_percpu + + roundup(value_sz, 8) * i * nr_cpus; + for (j =3D 0; j < nr_cpus; j++) { + v =3D *(u32 *) (values_row + roundup(value_sz, 8) * j); + if (!ASSERT_EQ(v, j !=3D cpu ? 0 : value, + "bpf_map_lookup_batch value all_cpus")) + goto out; + } + } + } + +out: + free(values_percpu); + free(values); +} + +static void test_percpu_map_cpu_flag(enum bpf_map_type map_type) +{ + struct percpu_alloc_array *skel; + size_t key_sz =3D sizeof(int); + int *keys =3D NULL, i, err; + struct bpf_map *map; + u32 max_entries; + + skel =3D percpu_alloc_array__open(); + if (!ASSERT_OK_PTR(skel, "percpu_alloc_array__open")) + return; + + map =3D skel->maps.percpu; + bpf_map__set_type(map, map_type); + + err =3D percpu_alloc_array__load(skel); + if (!ASSERT_OK(err, "test_percpu_alloc__load")) + goto out; + + max_entries =3D bpf_map__max_entries(map); + keys =3D calloc(max_entries, key_sz); + if (!ASSERT_OK_PTR(keys, "calloc keys")) + goto out; + + for (i =3D 0; i < max_entries; i++) + keys[i] =3D i; + + test_percpu_map_op_cpu_flag(map, keys, key_sz, max_entries, true); +out: + if (keys) + free(keys); + percpu_alloc_array__destroy(skel); +} + +static void test_percpu_array_cpu_flag(void) +{ + test_percpu_map_cpu_flag(BPF_MAP_TYPE_PERCPU_ARRAY); +} + +static void test_percpu_hash_cpu_flag(void) +{ + test_percpu_map_cpu_flag(BPF_MAP_TYPE_PERCPU_HASH); +} + +static void test_lru_percpu_hash_cpu_flag(void) +{ + test_percpu_map_cpu_flag(BPF_MAP_TYPE_LRU_PERCPU_HASH); +} + +static void test_percpu_cgroup_storage_cpu_flag(void) +{ + struct percpu_alloc_array *skel =3D NULL; + struct bpf_cgroup_storage_key key; + int cgroup, prog_fd, err; + struct bpf_map *map; + + cgroup =3D create_and_get_cgroup("/cg_percpu"); + if (!ASSERT_GE(cgroup, 0, "create_and_get_cgroup")) { + cleanup_cgroup_environment(); + return; + } + + err =3D join_cgroup("/cg_percpu"); + if (!ASSERT_OK(err, "join_cgroup")) + goto out; + + skel =3D percpu_alloc_array__open_and_load(); + if (!ASSERT_OK_PTR(skel, "percpu_alloc_array__open_and_load")) + goto out; + + prog_fd =3D bpf_program__fd(skel->progs.cgroup_egress); + err =3D bpf_prog_attach(prog_fd, cgroup, BPF_CGROUP_INET_EGRESS, 0); + if (!ASSERT_OK(err, "bpf_prog_attach")) + goto out; + + map =3D skel->maps.percpu_cgroup_storage; + err =3D bpf_map_get_next_key(bpf_map__fd(map), NULL, &key); + if (!ASSERT_OK(err, "bpf_map_get_next_key")) + goto out; + + test_percpu_map_op_cpu_flag(map, &key, sizeof(key), 1, false); +out: + bpf_prog_detach2(-1, cgroup, BPF_CGROUP_INET_EGRESS); + close(cgroup); + cleanup_cgroup_environment(); + percpu_alloc_array__destroy(skel); +} + +static void test_map_op_cpu_flag(enum bpf_map_type map_type) +{ + u32 max_entries =3D 1, count =3D max_entries; + u64 flags, batch =3D 0, val =3D 0; + int err, map_fd, key =3D 0; + LIBBPF_OPTS(bpf_map_batch_opts, batch_opts); + + map_fd =3D bpf_map_create(map_type, "test_cpu_flag", sizeof(int), sizeof(= u64), max_entries, + NULL); + if (!ASSERT_GE(map_fd, 0, "bpf_map_create")) + return; + + flags =3D BPF_F_ALL_CPUS; + err =3D bpf_map_update_elem(map_fd, &key, &val, flags); + ASSERT_ERR(err, "bpf_map_update_elem all_cpus"); + + batch_opts.elem_flags =3D BPF_F_ALL_CPUS; + err =3D bpf_map_update_batch(map_fd, &key, &val, &count, &batch_opts); + ASSERT_ERR(err, "bpf_map_update_batch all_cpus"); + + flags =3D BPF_F_CPU; + err =3D bpf_map_lookup_elem_flags(map_fd, &key, &val, flags); + ASSERT_ERR(err, "bpf_map_lookup_elem_flags cpu"); + + batch_opts.elem_flags =3D BPF_F_CPU; + err =3D bpf_map_lookup_batch(map_fd, NULL, &batch, &key, &val, &count, &b= atch_opts); + ASSERT_ERR(err, "bpf_map_lookup_batch cpu"); + + close(map_fd); +} + +static void test_array_cpu_flag(void) +{ + test_map_op_cpu_flag(BPF_MAP_TYPE_ARRAY); +} + +static void test_hash_cpu_flag(void) +{ + test_map_op_cpu_flag(BPF_MAP_TYPE_HASH); +} + void test_percpu_alloc(void) { if (test__start_subtest("array")) @@ -125,4 +425,16 @@ void test_percpu_alloc(void) test_cgrp_local_storage(); if (test__start_subtest("failure_tests")) test_failure(); + if (test__start_subtest("cpu_flag_percpu_array")) + test_percpu_array_cpu_flag(); + if (test__start_subtest("cpu_flag_percpu_hash")) + test_percpu_hash_cpu_flag(); + if (test__start_subtest("cpu_flag_lru_percpu_hash")) + test_lru_percpu_hash_cpu_flag(); + if (test__start_subtest("cpu_flag_percpu_cgroup_storage")) + test_percpu_cgroup_storage_cpu_flag(); + if (test__start_subtest("cpu_flag_array")) + test_array_cpu_flag(); + if (test__start_subtest("cpu_flag_hash")) + test_hash_cpu_flag(); } diff --git a/tools/testing/selftests/bpf/progs/percpu_alloc_array.c b/tools= /testing/selftests/bpf/progs/percpu_alloc_array.c index 37c2d2608ec0b..ed6a2a93d5a51 100644 --- a/tools/testing/selftests/bpf/progs/percpu_alloc_array.c +++ b/tools/testing/selftests/bpf/progs/percpu_alloc_array.c @@ -187,4 +187,36 @@ int BPF_PROG(test_array_map_10) return 0; } =20 +struct { + __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); + __uint(max_entries, 2); + __type(key, int); + __type(value, u32); +} percpu SEC(".maps"); + +SEC("?fentry/bpf_fentry_test1") +int BPF_PROG(test_percpu_array, int x) +{ + u64 value =3D 0xDEADC0DE; + int key =3D 0; + + bpf_map_update_elem(&percpu, &key, &value, BPF_ANY); + return 0; +} + +struct { + __uint(type, BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE); + __type(key, struct bpf_cgroup_storage_key); + __type(value, u32); +} percpu_cgroup_storage SEC(".maps"); + +SEC("cgroup_skb/egress") +int cgroup_egress(struct __sk_buff *skb) +{ + u32 *val =3D bpf_get_local_storage(&percpu_cgroup_storage, 0); + + *val =3D 1; + return 1; +} + char _license[] SEC("license") =3D "GPL"; --=20 2.51.2