bpf: Extend BPF syscall with common attributes support
Subsystems (6)
v8 cover bpf: Extend BPF syscall with common attributes support
This patch series builds upon the discussion in
"[PATCH bpf-next v4 0/4] bpf: Improve error reporting for freplace attachment failure" [1].
This patch series introduces support for *common attributes* in the BPF syscall, providing a unified mechanism for passing shared metadata across all BPF commands.
The initial set of common attributes includes:
1. 'log_buf': User-provided buffer for storing log output.
2. 'log_size': Size of the provided log buffer.
3. 'log_level': Verbosity level for logging.
4. 'log_true_size': The size of log reported by kernel.
With this extension, the BPF syscall will be able to return meaningful error messages (e.g., failures of creating map), improving debuggability and user experience.
Links:
[1] https://lore.kernel.org/bpf/[email protected]/
Changes:
v7 -> v8:
* Return 0 when fd < 0 and errno != EFAULT in probe_sys_bpf_ext(), then simplify probe_bpf_syscall_common_attrs() (per Alexei and Andrii).
* v7: https://lore.kernel.org/bpf/[email protected]/
v6 -> v7:
* Return -errno when fd < 0 and errno != EFAULT in probe_sys_bpf_ext().
* Convert return value of probe_sys_bpf_ext() to bool in probe_bpf_syscall_common_attrs().
* Address comments from Andrii:
* Drop the comment, and handle fd >= 0 case explicitly in
probe_sys_bpf_ext().
* Return an error when fd >= 0 in probe_sys_bpf_ext().
* v6: https://lore.kernel.org/bpf/[email protected]/
v5 -> v6:
* Address comments from Andrii:
* Update some variables' name.
* Drop unnecessary 'close(fd)' in libbpf.
* Rename FEAT_EXTENDED_SYSCALL to FEAT_BPF_SYSCALL_COMMON_ATTRS with updated description in libbpf.
* Use EINVAL instead of EUSERS, as EUSERS is not used in bpf yet.
* Rename struct bpf_syscall_common_attr_opts to bpf_log_opts in libbpf.
* Add 'OPTS_SET(log_opts, log_true_size, 0);' in libbpf's 'bpf_map_create()'.
* v5: https://lore.kernel.org/bpf/[email protected]/
v4 -> v5:
* Rework reporting 'log_true_size' for prog_load, btf_load, and map_create (per Alexei).
* v4: https://lore.kernel.org/bpf/[email protected]/
RFC v3 -> v4:
* Drop RFC.
* Address comments from Andrii:
* Add parentheses in 'sys_bpf_ext()'.
* Avoid creating new fd in 'probe_sys_bpf_ext()'.
* Add a new struct to wrap log fields in libbpf.
* Address comments from Alexei:
* Do not skip writing to user space when log_true_size is zero.
* Do not use 'bool' arguments.
* Drop the adding WARN_ON_ONCE()'s.
* v3: https://lore.kernel.org/bpf/[email protected]/
RFC v2 -> RFC v3:
* Rename probe_sys_bpf_extended to probe_sys_bpf_ext.
* Refactor reporting 'log_true_size' for prog_load.
* Refactor reporting 'btf_log_true_size' for btf_load.
* Add warnings for internal bugs in map_create.
* Check log_true_size in test cases.
* Address comment from Alexei:
* Change kvzalloc/kvfree to kzalloc/kfree.
* Address comments from Andrii:
* Move BPF_COMMON_ATTRS to 'enum bpf_cmd' alongside brief comment.
* Add bpf_check_uarg_tail_zero() for extra checks.
* Rename sys_bpf_extended to sys_bpf_ext.
* Rename sys_bpf_fd_extended to sys_bpf_ext_fd.
* Probe the new feature using NULL and -EFAULT.
* Move probe_sys_bpf_ext to libbpf_internal.h and drop LIBBPF_API.
* Return -EUSERS when log attrs are conflict between bpf_attr and bpf_common_attr.
* Avoid touching bpf_vlog_init().
* Update the reason messages in map_create.
* Finalize the log using __cleanup().
* Report log size to users.
* Change type of log_buf from '__u64' to 'const char *' and cast type
using ptr_to_u64() in bpf_map_create().
* Do not return -EOPNOTSUPP when kernel doesn't support this feature in bpf_map_create().
* Add log_level support for map creation for consistency.
* Address comment from Eduard:
* Use common_attrs->log_level instead of BPF_LOG_FIXED.
* v2: https://lore.kernel.org/bpf/[email protected]/
RFC v1 -> RFC v2:
* Fix build error reported by test bot.
* Address comments from Alexei:
* Drop new uapi for freplace.
* Add common attributes support for prog_load and btf_load.
* Add common attributes support for map_create.
* v1: https://lore.kernel.org/bpf/[email protected]/
Leon Hwang (9):
bpf: Extend BPF syscall with common attributes support
libbpf: Add support for extended bpf syscall
bpf: Refactor reporting log_true_size for prog_load
bpf: Add syscall common attributes support for prog_load
bpf: Refactor reporting btf_log_true_size for btf_load
bpf: Add syscall common attributes support for btf_load
bpf: Add syscall common attributes support for map_create
libbpf: Add common attr support for map_create selftests/bpf: Add tests to verify map create failure log
include/linux/bpf.h | 19 +- include/linux/bpf_verifier.h | 17 ++ include/linux/btf.h | 3 +- include/linux/syscalls.h | 3 +- include/uapi/linux/bpf.h | 8 + kernel/bpf/btf.c | 32 +--- kernel/bpf/log.c | 103 +++++++++++ kernel/bpf/syscall.c | 122 ++++++++++--- kernel/bpf/verifier.c | 19 +- tools/include/uapi/linux/bpf.h | 8 + tools/lib/bpf/bpf.c | 52 +++++- tools/lib/bpf/bpf.h | 17 +- tools/lib/bpf/features.c | 8 + tools/lib/bpf/libbpf_internal.h | 3 + .../selftests/bpf/prog_tests/map_init.c | 168 ++++++++++++++++++ 15 files changed, 521 insertions(+), 61 deletions(-)
--
2.52.0
PATCH v8 1/9 bpf: Extend BPF syscall with common attributes support
Extend the BPF syscall to support a set of common attributes shared across all BPF commands:
1. 'log_buf': User-provided buffer for storing logs.
2. 'log_size': Size of the log buffer.
3. 'log_level': Log verbosity level.
4. 'log_true_size': The size of log reported by kernel.
These common attributes are passed as the 4th argument to the BPF syscall, with the 5th argument specifying the size of this structure.
To indicate the use of these common attributes from userspace, a new flag 'BPF_COMMON_ATTRS' ('1 << 16') is introduced. This flag is OR-ed into the 'cmd' field of the syscall.
When 'cmd & BPF_COMMON_ATTRS' is set, the kernel will copy the common attributes from userspace into kernel space for use.
--- include/linux/syscalls.h | 3 ++- include/uapi/linux/bpf.h | 8 ++++++++ kernel/bpf/syscall.c | 25 +++++++++++++++++++++---- tools/include/uapi/linux/bpf.h | 8 ++++++++ 4 files changed, 39 insertions(+), 5 deletions(-)
include/linux/syscalls.h +2 -1
@@ -937,7 +937,8 @@ asmlinkage long sys_seccomp(unsigned int op, unsigned int flags,asmlinkage long sys_getrandom (char __user *buf,size_t count,unsigned int flags);asmlinkage long sys_memfd_create (const char __user *uname_ptr,unsigned int flags); -asmlinkage long sys_bpf (int cmd,union bpf_attr __user *attr,unsigned int size); +asmlinkage long sys_bpf (int cmd,union bpf_attr __user *attr,unsigned int size, +struct bpf_common_attr __user *attr_common,unsigned int size_common);asmlinkage long sys_execveat (int dfd,const char __user *filename,const char __user *const __user *argv,const char __user *const __user *envp,int flags);
include/uapi/linux/bpf.h +8 -0
@@ -986,6 +986,7 @@ enum bpf_cmd {BPF_PROG_STREAM_READ_BY_FD ,BPF_PROG_ASSOC_STRUCT_OPS , __MAX_BPF_CMD, + BPF_COMMON_ATTRS = 1 << 16, /* Indicate carrying syscall common attrs. */ }; enum bpf_map_type {
@@ -1492,6 +1493,13 @@ struct bpf_stack_build_id { }; }; +struct bpf_common_attr { +__u64 log_buf; +__u32 log_size; +__u32 log_level; +__u32 log_true_size; +}; +#define BPF_OBJ_NAME_LEN 16Uenum {
kernel/bpf/syscall.c +21 -4
@@ -6179,8 +6179,10 @@ static int prog_assoc_struct_ops(union bpf_attr *attr)return ret; } -static int __sys_bpf (enum bpf_cmd cmd,bpfptr_t uattr,unsigned int size) +static int __sys_bpf (enum bpf_cmd cmd,bpfptr_t uattr,unsigned int size, +bpfptr_t uattr_common,unsigned int size_common) { +struct bpf_common_attr attr_common;union bpf_attr attr;int err;
@@ -6194,6 +6196,20 @@ static int __sys_bpf(enum bpf_cmd cmd, bpfptr_t uattr, unsigned int size)if (copy_from_bpfptr (&attr, uattr, size) !=0 )return -EFAULT ; +memset (&attr_common,0 ,sizeof (attr_common)); +if (cmd &BPF_COMMON_ATTRS ) { + err =bpf_check_uarg_tail_zero (uattr_common,sizeof (attr_common), size_common); +if (err) +return err; + + cmd &= ~BPF_COMMON_ATTRS ; + size_common =min_t (u32, size_common,sizeof (attr_common)); +if (copy_from_bpfptr (&attr_common, uattr_common, size_common) !=0 ) +return -EFAULT ; + }else { + size_common =0 ; + } + err =security_bpf (cmd, &attr, size, uattr.is_kernel);if (err <0 )return err;
@@ -6329,9 +6345,10 @@ static int __sys_bpf(enum bpf_cmd cmd, bpfptr_t uattr, unsigned int size)return err; } -SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size) +SYSCALL_DEFINE5(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size, + struct bpf_common_attr __user *, uattr_common, unsigned int, size_common) { -return __sys_bpf (cmd,USER_BPFPTR (uattr), size); +return __sys_bpf (cmd,USER_BPFPTR (uattr), size,USER_BPFPTR (uattr_common), size_common); } static bool syscall_prog_is_valid_access(int off, int size,
@@ -6362,7 +6379,7 @@ BPF_CALL_3(bpf_sys_bpf, int, cmd, union bpf_attr *, attr, u32, attr_size)default :return -EINVAL ; } -return __sys_bpf (cmd,KERNEL_BPFPTR (attr), attr_size); +return __sys_bpf (cmd,KERNEL_BPFPTR (attr), attr_size,KERNEL_BPFPTR (NULL ),0 ); }
tools/include/uapi/linux/bpf.h +8 -0
@@ -986,6 +986,7 @@ enum bpf_cmd {BPF_PROG_STREAM_READ_BY_FD ,BPF_PROG_ASSOC_STRUCT_OPS , __MAX_BPF_CMD, + BPF_COMMON_ATTRS = 1 << 16, /* Indicate carrying syscall common attrs. */ }; enum bpf_map_type {
@@ -1492,6 +1493,13 @@ struct bpf_stack_build_id { }; }; +struct bpf_common_attr { +__u64 log_buf; +__u32 log_size; +__u32 log_level; +__u32 log_true_size; +}; +#define BPF_OBJ_NAME_LEN 16Uenum {
Signature · 1 line
2.52.0
PATCH v8 2/9 libbpf: Add support for extended bpf syscall
In reply to Leon HwangTo support the extended BPF syscall introduced in the previous commit, introduce the following internal APIs:
* 'sys_bpf_ext()'
* 'sys_bpf_ext_fd()'
They wrap the raw 'syscall()' interface to support passing extended attributes.
* 'probe_sys_bpf_ext()'
Check whether current kernel supports the BPF syscall common attributes.
--- tools/lib/bpf/bpf.c | 36 +++++++++++++++++++++++++++++++++ tools/lib/bpf/features.c | 8 ++++++++ tools/lib/bpf/libbpf_internal.h | 3 +++ 3 files changed, 47 insertions(+)
tools/lib/bpf/bpf.c +36 -0
@@ -69,6 +69,42 @@ static inline __u64 ptr_to_u64(const void *ptr)return (__u64 ) (unsigned long ) ptr; } +static inline int sys_bpf_ext (enum bpf_cmd cmd,union bpf_attr *attr, +unsigned int size, +struct bpf_common_attr *attr_common, +unsigned int size_common) +{ + cmd = attr_common ? (cmd |BPF_COMMON_ATTRS ) : (cmd & ~BPF_COMMON_ATTRS ); +return syscall (__NR_bpf, cmd, attr, size, attr_common, size_common); +} + +static inline int sys_bpf_ext_fd (enum bpf_cmd cmd,union bpf_attr *attr, +unsigned int size, +struct bpf_common_attr *attr_common, +unsigned int size_common) +{ +int fd; + + fd =sys_bpf_ext (cmd, attr, size, attr_common, size_common); +return ensure_good_fd (fd); +} + +int probe_sys_bpf_ext (void ) +{ + const size_t attr_sz = offsetofend(union bpf_attr, prog_token_fd); +union bpf_attr attr; +int fd; + +memset (&attr,0 , attr_sz); + fd =syscall (__NR_bpf,BPF_PROG_LOAD |BPF_COMMON_ATTRS , &attr, attr_sz,NULL , +sizeof (struct bpf_common_attr )); +if (fd >=0 ) { +close (fd); +return -EINVAL ; + } +return errno ==EFAULT ?1 :0 ; +} +static inline int sys_bpf (enum bpf_cmd cmd,union bpf_attr *attr,unsigned int size) {
tools/lib/bpf/features.c +8 -0
@@ -506,6 +506,11 @@ static int probe_kern_arg_ctx_tag(int token_fd)return probe_fd (prog_fd); } +static int probe_bpf_syscall_common_attrs (int token_fd) +{ +return probe_sys_bpf_ext (); +} +typedef int (*feature_probe_fn )(int /* token_fd */ );static struct kern_feature_cache feature_cache;
@@ -581,6 +586,9 @@ static struct kern_feature_desc { [FEAT_BTF_QMARK_DATASEC ] = {"BTF DATASEC names starting from '?'" , probe_kern_btf_qmark_datasec, }, + [FEAT_BPF_SYSCALL_COMMON_ATTRS ] = { +"BPF syscall common attributes support" , probe_bpf_syscall_common_attrs, + }, };bool feat_supported (struct kern_feature_cache *cache,enum kern_feature_id feat_id)
tools/lib/bpf/libbpf_internal.h +3 -0
@@ -392,6 +392,8 @@ enum kern_feature_id {FEAT_ARG_CTX_TAG ,/* Kernel supports '?' at the front of datasec names */ FEAT_BTF_QMARK_DATASEC , +/* Kernel supports BPF syscall common attributes */ +FEAT_BPF_SYSCALL_COMMON_ATTRS , __FEAT_CNT, };
@@ -757,4 +759,5 @@ int probe_fd(int fd);#define SHA256_DWORD_SIZE SHA256_DIGEST_LENGTH / sizeof(__u64)void libbpf_sha256 (const void *data,size_t len,__u8 out[SHA256_DIGEST_LENGTH ]); +int probe_sys_bpf_ext (void );#endif /* __LIBBPF_LIBBPF_INTERNAL_H */
Signature · 1 line
2.52.0
PATCH v8 3/9 bpf: Refactor reporting log_true_size for prog_load
In reply to Leon HwangThe next commit will add support for reporting logs via extended common attributes, including 'log_true_size'.
To prepare for that, refactor the 'log_true_size' reporting logic by introducing a new struct bpf_log_attr to encapsulate log-related behavior:
* bpf_prog_load_log_attr_init(): initialize the log fields, which will support extended common attributes in the next commit.
* bpf_log_attr_finalize(): handle log finalization and write back 'log_true_size' to userspace.
--- include/linux/bpf.h | 19 ++++++++++++++++- include/linux/bpf_verifier.h | 11 ++++++++++ kernel/bpf/log.c | 40 ++++++++++++++++++++++++++++++++++++ kernel/bpf/syscall.c | 9 +++++++- kernel/bpf/verifier.c | 19 ++++++----------- 5 files changed, 83 insertions(+), 15 deletions(-)
include/linux/bpf.h +18 -1
@@ -2903,8 +2903,25 @@ int bpf_get_file_flag(int flags);int bpf_check_uarg_tail_zero (bpfptr_t uaddr,size_t expected_size,size_t actual_size); +struct bpf_attrs { +const void *attr; +bpfptr_t uattr; +u32 size; +}; + +static inline void bpf_attrs_init (struct bpf_attrs *attrs,const void *attr,bpfptr_t uattr, +u32 size) +{ +memset (attrs,0 ,sizeof (*attrs)); + attrs->attr = attr; + attrs->uattr = uattr; + attrs->size = size; +} +/* verify correctness of eBPF program */ -int bpf_check (struct bpf_prog **fp,union bpf_attr *attr,bpfptr_t uattr,u32 uattr_size); +struct bpf_log_attr ; +int bpf_check (struct bpf_prog **fp,union bpf_attr *attr,bpfptr_t uattr, +struct bpf_log_attr *log_attr);#ifndef CONFIG_BPF_JIT_ALWAYS_ON void bpf_patch_call_args (struct bpf_insn *insn,u32 stack_depth);
include/linux/bpf_verifier.h +11 -0
@@ -631,6 +631,17 @@ static inline bool bpf_verifier_log_needed(const struct bpf_verifier_log *log)return log && log->level; } +struct bpf_log_attr { +u64 log_buf; +u32 log_size; +u32 log_level; +struct bpf_attrs *attrs; +u32 offsetof_log_true_size; +}; + +int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs); +int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log); +#define BPF_MAX_SUBPROGS 256struct bpf_subprog_arg_info {
kernel/bpf/log.c +40 -0
@@ -863,3 +863,43 @@ void print_insn_state(struct bpf_verifier_env *env, const struct bpf_verifier_st }print_verifier_state (env, vstate, frameno, false); } + +static int bpf_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs,u64 log_buf, +u32 log_size,u32 log_level,int offsetof_log_true_size) +{ +memset (log_attr,0 ,sizeof (*log_attr)); + log_attr->log_buf = log_buf; + log_attr->log_size = log_size; + log_attr->log_level = log_level; + log_attr->attrs = attrs; + log_attr->offsetof_log_true_size = offsetof_log_true_size; +return 0 ; +} + +int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs) +{ +const union bpf_attr *attr = attrs->attr; + +return bpf_log_attr_init (log_attr, attrs, attr->log_buf, attr->log_size, attr->log_level, + offsetof(union bpf_attr , log_true_size)); +} + +int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log) +{ +u32 log_true_size, off; +size_t size; +int err; + +if (!log) +return 0 ; + + err =bpf_vlog_finalize (log, &log_true_size); + + size =sizeof (log_true_size); + off = log_attr->offsetof_log_true_size; +if (log_attr->attrs && log_attr->attrs->size >= off + size && +copy_to_bpfptr_offset (log_attr->attrs->uattr, off, &log_true_size, size)) + err = -EFAULT ; + +return err; +}
kernel/bpf/syscall.c +8 -1
@@ -2871,6 +2871,8 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size)struct bpf_prog *prog, *dst_prog =NULL ;struct btf *attach_btf =NULL ;struct bpf_token *token =NULL ; +struct bpf_log_attr log_attr; +struct bpf_attrs attrs;bool bpf_cap;int err;char license[128 ];
@@ -3082,8 +3084,13 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size)if (err) goto free_prog_sec; +bpf_attrs_init (&attrs, attr, uattr, uattr_size); + err =bpf_prog_load_log_attr_init (&log_attr, &attrs); +if (err <0 ) + goto free_used_maps; +/* run eBPF verifier */ - err =bpf_check (&prog, attr, uattr, uattr_size); + err =bpf_check (&prog, attr, uattr, &log_attr);if (err <0 ) goto free_used_maps;
kernel/bpf/verifier.c +6 -13
@@ -25643,12 +25643,12 @@ static int compute_scc(struct bpf_verifier_env *env)return err; } -int bpf_check (struct bpf_prog **prog,union bpf_attr *attr,bpfptr_t uattr,__u32 uattr_size) +int bpf_check (struct bpf_prog **prog,union bpf_attr *attr,bpfptr_t uattr, +struct bpf_log_attr *log_attr) {u64 start_time =ktime_get_ns ();struct bpf_verifier_env *env;int i, len, ret = -EINVAL , err; -u32 log_true_size;bool is_priv;BTF_TYPE_EMIT (enum bpf_features );
@@ -25695,9 +25695,9 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr, __u3/* user could have requested verbose verifier output * and supplied buffer to store the verification trace */ - ret =bpf_vlog_init (&env->log, attr->log_level, - (char __user *) (unsigned long ) attr->log_buf, - attr->log_size); + ret =bpf_vlog_init (&env->log, log_attr->log_level, +u64_to_user_ptr (log_attr->log_buf), + log_attr->log_size);if (ret) goto err_unlock;
@@ -25847,17 +25847,10 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr, __u3 env->prog->aux->verified_insns = env->insn_processed;/* preserve original error even if log finalization is successful */ - err =bpf_vlog_finalize (&env->log, &log_true_size); + err =bpf_log_attr_finalize (log_attr, &env->log);if (err) ret = err; - if (uattr_size >= offsetofend(union bpf_attr, log_true_size) && -copy_to_bpfptr_offset (uattr, offsetof(union bpf_attr , log_true_size), - &log_true_size,sizeof (log_true_size))) { - ret = -EFAULT ; - goto err_release_maps; - } -if (ret) goto err_release_maps;
Signature · 1 line
2.52.0
PATCH v8 4/9 bpf: Add syscall common attributes support for prog_load
In reply to Leon HwangThe log buffer of common attributes would be confusing with the one in 'union bpf_attr' for BPF_PROG_LOAD.
In order to clarify the usage of these two log buffers, they both can be used for logging if:
* They are same, including 'log_buf', 'log_level' and 'log_size'.
* One of them is missing, then another one will be used for logging.
If they both have 'log_buf' but they are not same totally, return -EINVAL.
--- include/linux/bpf_verifier.h | 4 +++- kernel/bpf/log.c | 29 ++++++++++++++++++++++++++--- kernel/bpf/syscall.c | 9 ++++++--- 3 files changed, 35 insertions(+), 7 deletions(-)
include/linux/bpf_verifier.h +3 -1
@@ -637,9 +637,11 @@ struct bpf_log_attr {u32 log_level;struct bpf_attrs *attrs;u32 offsetof_log_true_size; +struct bpf_attrs *attrs_common; }; -int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs); +int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs, +struct bpf_attrs *attrs_common);int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log);#define BPF_MAX_SUBPROGS 256
kernel/bpf/log.c +26 -3
@@ -865,23 +865,41 @@ void print_insn_state(struct bpf_verifier_env *env, const struct bpf_verifier_st }static int bpf_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs,u64 log_buf, -u32 log_size,u32 log_level,int offsetof_log_true_size) +u32 log_size,u32 log_level,int offsetof_log_true_size, +struct bpf_attrs *attrs_common) { +const struct bpf_common_attr *common = attrs_common ? attrs_common->attr :NULL ; +memset (log_attr,0 ,sizeof (*log_attr)); log_attr->log_buf = log_buf; log_attr->log_size = log_size; log_attr->log_level = log_level; log_attr->attrs = attrs; log_attr->offsetof_log_true_size = offsetof_log_true_size; + log_attr->attrs_common = attrs_common; + +if (log_buf && common && common->log_buf && + (log_buf != common->log_buf || + log_size != common->log_size || + log_level != common->log_level)) +return -EINVAL ; + +if (!log_buf && common && common->log_buf) { + log_attr->log_buf = common->log_buf; + log_attr->log_size = common->log_size; + log_attr->log_level = common->log_level; + } +return 0 ; } -int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs) +int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs, +struct bpf_attrs *attrs_common) {const union bpf_attr *attr = attrs->attr;return bpf_log_attr_init (log_attr, attrs, attr->log_buf, attr->log_size, attr->log_level, - offsetof(union bpf_attr , log_true_size)); + offsetof(union bpf_attr , log_true_size), attrs_common); }int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log)
@@ -901,5 +919,10 @@ int bpf_log_attr_finalize(struct bpf_log_attr *log_attr, struct bpf_verifier_log copy_to_bpfptr_offset(log_attr->attrs->uattr, off, &log_true_size, size)) err = -EFAULT ; + off = offsetof(struct bpf_common_attr , log_true_size); +if (log_attr->attrs_common && log_attr->attrs_common->size >= off + size && +copy_to_bpfptr_offset (log_attr->attrs_common->uattr, off, &log_true_size, size)) + err = -EFAULT ; +return err; }
kernel/bpf/syscall.c +6 -3
@@ -2865,7 +2865,8 @@ static int bpf_prog_mark_insn_arrays_ready(struct bpf_prog *prog)/* last field in 'union bpf_attr' used by this command */ #define BPF_PROG_LOAD_LAST_FIELD keyring_id -static int bpf_prog_load (union bpf_attr *attr,bpfptr_t uattr,u32 uattr_size) +static int bpf_prog_load (union bpf_attr *attr,bpfptr_t uattr,u32 uattr_size, +struct bpf_attrs *attrs_common) {enum bpf_prog_type type = attr->prog_type;struct bpf_prog *prog, *dst_prog =NULL ;
@@ -3085,7 +3086,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size) goto free_prog_sec;bpf_attrs_init (&attrs, attr, uattr, uattr_size); - err =bpf_prog_load_log_attr_init (&log_attr, &attrs); + err =bpf_prog_load_log_attr_init (&log_attr, &attrs, attrs_common);if (err <0 ) goto free_used_maps;
@@ -6190,6 +6191,7 @@ static int __sys_bpf(enum bpf_cmd cmd, bpfptr_t uattr, unsigned int size, bpfptr_t uattr_common, unsigned int size_common) { struct bpf_common_attr attr_common; +struct bpf_attrs attrs_common;union bpf_attr attr;int err;
@@ -6241,7 +6243,8 @@ static int __sys_bpf(enum bpf_cmd cmd, bpfptr_t uattr, unsigned int size, err =map_freeze (&attr);break ;case BPF_PROG_LOAD : - err =bpf_prog_load (&attr, uattr, size); +bpf_attrs_init (&attrs_common, &attr_common, uattr_common, size_common); + err =bpf_prog_load (&attr, uattr, size, &attrs_common);break ;case BPF_OBJ_PIN : err =bpf_obj_pin (&attr);
Signature · 1 line
2.52.0
PATCH v8 5/9 bpf: Refactor reporting btf_log_true_size for btf_load
In reply to Leon HwangIn the next commit, it will be able to report logs via extended common attributes, which will report 'log_true_size' via the extended common attributes meanwhile.
Therefore, refactor the way of 'btf_log_true_size' reporting in order to report 'log_true_size' via the extended common attributes easily.
--- include/linux/bpf_verifier.h | 1 + include/linux/btf.h | 3 ++- kernel/bpf/btf.c | 32 +++++++++----------------------- kernel/bpf/log.c | 9 +++++++++ kernel/bpf/syscall.c | 10 +++++++++- 5 files changed, 30 insertions(+), 25 deletions(-)
include/linux/bpf_verifier.h +1 -0
@@ -642,6 +642,7 @@ struct bpf_log_attr {int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs,struct bpf_attrs *attrs_common); +int bpf_btf_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs);int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log);#define BPF_MAX_SUBPROGS 256
include/linux/btf.h +2 -1
@@ -145,7 +145,8 @@ const char *btf_get_name(const struct btf *btf);void btf_get (struct btf *btf);void btf_put (struct btf *btf);const struct btf_header *btf_header (const struct btf *btf); -int btf_new_fd (const union bpf_attr *attr,bpfptr_t uattr,u32 uattr_sz); +struct bpf_log_attr ; +int btf_new_fd (const union bpf_attr *attr,bpfptr_t uattr,struct bpf_log_attr *log_attr);struct btf *btf_get_by_fd (int fd); int btf_get_info_by_fd(const struct btf *btf, const union bpf_attr *attr,
kernel/bpf/btf.c +9 -23
@@ -5856,25 +5856,11 @@ static int btf_check_type_tags(struct btf_verifier_env *env,return 0 ; } -static int finalize_log (struct bpf_verifier_log *log,bpfptr_t uattr,u32 uattr_size) -{ -u32 log_true_size; -int err; - - err =bpf_vlog_finalize (log, &log_true_size); - - if (uattr_size >= offsetofend(union bpf_attr, btf_log_true_size) && -copy_to_bpfptr_offset (uattr, offsetof(union bpf_attr , btf_log_true_size), - &log_true_size,sizeof (log_true_size))) - err = -EFAULT ; - -return err; -} - -static struct btf *btf_parse (const union bpf_attr *attr,bpfptr_t uattr,u32 uattr_size) +static struct btf *btf_parse (const union bpf_attr *attr,bpfptr_t uattr, +struct bpf_log_attr *log_attr) {bpfptr_t btf_data =make_bpfptr (attr->btf, uattr.is_kernel); -char __user *log_ubuf =u64_to_user_ptr (attr->btf_log_buf); +char __user *log_ubuf =u64_to_user_ptr (log_attr->log_buf);struct btf_struct_metas *struct_meta_tab;struct btf_verifier_env *env =NULL ;struct btf *btf =NULL ;
@@ -5891,8 +5877,8 @@ static struct btf *btf_parse(const union bpf_attr *attr, bpfptr_t uattr, u32 uat/* user could have requested verbose verifier output * and supplied buffer to store the verification trace */ - err =bpf_vlog_init (&env->log, attr->btf_log_level, - log_ubuf, attr->btf_log_size); + err =bpf_vlog_init (&env->log, log_attr->log_level, + log_ubuf, log_attr->log_size);if (err) goto errout_free;
@@ -5953,7 +5939,7 @@ static struct btf *btf_parse(const union bpf_attr *attr, bpfptr_t uattr, u32 uat } } - err =finalize_log (&env->log, uattr, uattr_size); + err =bpf_log_attr_finalize (log_attr, &env->log);if (err) goto errout_free;
@@ -5965,7 +5951,7 @@ static struct btf *btf_parse(const union bpf_attr *attr, bpfptr_t uattr, u32 uatbtf_free_struct_meta_tab (btf); errout:/* overwrite err with -ENOSPC or -EFAULT */ - ret =finalize_log (&env->log, uattr, uattr_size); + ret =bpf_log_attr_finalize (log_attr, &env->log);if (ret) err = ret; errout_free:
@@ -8136,12 +8122,12 @@ static int __btf_new_fd(struct btf *btf)return anon_inode_getfd ("btf" , &btf_fops, btf,O_RDONLY |O_CLOEXEC ); } -int btf_new_fd (const union bpf_attr *attr,bpfptr_t uattr,u32 uattr_size) +int btf_new_fd (const union bpf_attr *attr,bpfptr_t uattr,struct bpf_log_attr *log_attr) {struct btf *btf;int ret; - btf =btf_parse (attr, uattr, uattr_size); + btf =btf_parse (attr, uattr, log_attr);if (IS_ERR (btf))return PTR_ERR (btf);
kernel/bpf/log.c +9 -0
@@ -902,6 +902,15 @@ int bpf_prog_load_log_attr_init(struct bpf_log_attr *log_attr, struct bpf_attrs offsetof(union bpf_attr, log_true_size), attrs_common); } +int bpf_btf_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs) +{ +const union bpf_attr *attr = attrs->attr; + +return bpf_log_attr_init (log_attr, attrs, attr->btf_log_buf, attr->btf_log_size, + attr->btf_log_level, offsetof(union bpf_attr , btf_log_true_size), +NULL ); +} +int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log) {u32 log_true_size, off;
kernel/bpf/syscall.c +9 -1
@@ -5452,6 +5452,9 @@ static int bpf_obj_get_info_by_fd(const union bpf_attr *attr,static int bpf_btf_load (const union bpf_attr *attr,bpfptr_t uattr,__u32 uattr_size) {struct bpf_token *token =NULL ; +struct bpf_log_attr log_attr; +struct bpf_attrs attrs; +int err;if (CHECK_ATTR (BPF_BTF_LOAD ))return -EINVAL ;
@@ -5459,6 +5462,11 @@ static int bpf_btf_load(const union bpf_attr *attr, bpfptr_t uattr, __u32 uattr_if (attr->btf_flags & ~BPF_F_TOKEN_FD )return -EINVAL ; +bpf_attrs_init (&attrs, attr, uattr, uattr_size); + err =bpf_btf_load_log_attr_init (&log_attr, &attrs); +if (err) +return err; +if (attr->btf_flags &BPF_F_TOKEN_FD ) { token =bpf_token_get_from_fd (attr->btf_token_fd);if (IS_ERR (token))
@@ -5476,7 +5484,7 @@ static int bpf_btf_load(const union bpf_attr *attr, bpfptr_t uattr, __u32 uattr_bpf_token_put (token); -return btf_new_fd (attr, uattr, uattr_size); +return btf_new_fd (attr, uattr, &log_attr); }#define BPF_BTF_GET_FD_BY_ID_LAST_FIELD fd_by_id_token_fd
Signature · 1 line
2.52.0
PATCH v8 6/9 bpf: Add syscall common attributes support for btf_load
In reply to Leon HwangSince bpf_log_attr_init() now supports struct bpf_common_attr, pass the common attributes to it to enable syscall common attributes support for BPF_BTF_LOAD.
--- include/linux/bpf_verifier.h | 3 ++- kernel/bpf/log.c | 5 +++-- kernel/bpf/syscall.c | 8 +++++--- 3 files changed, 10 insertions(+), 6 deletions(-)
include/linux/bpf_verifier.h +2 -1
@@ -642,7 +642,8 @@ struct bpf_log_attr {int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs,struct bpf_attrs *attrs_common); -int bpf_btf_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs); +int bpf_btf_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs, +struct bpf_attrs *attrs_common);int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log);#define BPF_MAX_SUBPROGS 256
kernel/bpf/log.c +3 -2
@@ -902,13 +902,14 @@ int bpf_prog_load_log_attr_init(struct bpf_log_attr *log_attr, struct bpf_attrs offsetof(union bpf_attr, log_true_size), attrs_common); } -int bpf_btf_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs) +int bpf_btf_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs, +struct bpf_attrs *attrs_common) {const union bpf_attr *attr = attrs->attr;return bpf_log_attr_init (log_attr, attrs, attr->btf_log_buf, attr->btf_log_size, attr->btf_log_level, offsetof(union bpf_attr , btf_log_true_size), -NULL ); + attrs_common); }int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log)
kernel/bpf/syscall.c +5 -3
@@ -5449,7 +5449,8 @@ static int bpf_obj_get_info_by_fd(const union bpf_attr *attr,#define BPF_BTF_LOAD_LAST_FIELD btf_token_fd -static int bpf_btf_load (const union bpf_attr *attr,bpfptr_t uattr,__u32 uattr_size) +static int bpf_btf_load (const union bpf_attr *attr,bpfptr_t uattr,__u32 uattr_size, +struct bpf_attrs *attrs_common) {struct bpf_token *token =NULL ;struct bpf_log_attr log_attr;
@@ -5463,7 +5464,7 @@ static int bpf_btf_load(const union bpf_attr *attr, bpfptr_t uattr, __u32 uattr_return -EINVAL ;bpf_attrs_init (&attrs, attr, uattr, uattr_size); - err =bpf_btf_load_log_attr_init (&log_attr, &attrs); + err =bpf_btf_load_log_attr_init (&log_attr, &attrs, attrs_common);if (err)return err;
@@ -6297,7 +6298,8 @@ static int __sys_bpf(enum bpf_cmd cmd, bpfptr_t uattr, unsigned int size, err =bpf_raw_tracepoint_open (&attr);break ;case BPF_BTF_LOAD : - err =bpf_btf_load (&attr, uattr, size); +bpf_attrs_init (&attrs_common, &attr_common, uattr_common, size_common); + err =bpf_btf_load (&attr, uattr, size, &attrs_common);break ;case BPF_BTF_GET_FD_BY_ID : err =bpf_btf_get_fd_by_id (&attr);
Signature · 1 line
2.52.0
PATCH v8 7/9 bpf: Add syscall common attributes support for map_create
In reply to Leon HwangCurrently, many BPF_MAP_CREATE failures return -EINVAL without providing any explanation to userspace.
With extended BPF syscall support, detailed error messages can now be reported via the log buffer, allowing users to understand the specific reason for a failed map creation.
--- include/linux/bpf_verifier.h | 2 ++ kernel/bpf/log.c | 30 +++++++++++++++++ kernel/bpf/syscall.c | 65 ++++++++++++++++++++++++++++++------ 3 files changed, 87 insertions(+), 10 deletions(-)
include/linux/bpf_verifier.h +2 -0
@@ -644,6 +644,8 @@ int bpf_prog_load_log_attr_init(struct bpf_log_attr *log_attr, struct bpf_attrs struct bpf_attrs *attrs_common);int bpf_btf_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs,struct bpf_attrs *attrs_common); +struct bpf_verifier_log *bpf_log_attr_create_vlog (struct bpf_log_attr *log_attr, +struct bpf_attrs *attrs_common);int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log);#define BPF_MAX_SUBPROGS 256
kernel/bpf/log.c +30 -0
@@ -912,6 +912,36 @@ int bpf_btf_load_log_attr_init(struct bpf_log_attr *log_attr, struct bpf_attrs * attrs_common); } +struct bpf_verifier_log *bpf_log_attr_create_vlog (struct bpf_log_attr *log_attr, +struct bpf_attrs *attrs_common) +{ +const struct bpf_common_attr *common = attrs_common->attr; +struct bpf_verifier_log *log; +int err; + +memset (log_attr,0 ,sizeof (*log_attr)); + log_attr->log_buf = common->log_buf; + log_attr->log_size = common->log_size; + log_attr->log_level = common->log_level; + log_attr->attrs_common = attrs_common; + +if (!log_attr->log_buf) +return NULL ; + + log =kzalloc (sizeof (*log),GFP_KERNEL ); +if (!log) +return ERR_PTR (-ENOMEM ); + + err =bpf_vlog_init (log, log_attr->log_level,u64_to_user_ptr (log_attr->log_buf), + log_attr->log_size); +if (err) { +kfree (log); +return ERR_PTR (err); + } + +return log; +} +int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log) {u32 log_true_size, off;
kernel/bpf/syscall.c +55 -10
147 lines not on this page · raw message
Signature · 1 line
2.52.0
PATCH v8 8/9 libbpf: Add common attr support for map_create
In reply to Leon HwangWith the previous commit adding common attribute support for BPF_MAP_CREATE, users can now retrieve detailed error messages when map creation fails via the log_buf field.
Introduce struct bpf_log_opts with the following fields:log_buf, log_size, log_level, and log_true_size.
Extend bpf_map_create_opts with a new field log_opts, allowing users to capture and inspect log messages on map creation failures.
--- tools/lib/bpf/bpf.c | 16 +++++++++++++++- tools/lib/bpf/bpf.h | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-)
tools/lib/bpf/bpf.c +15 -1
@@ -209,6 +209,9 @@ int bpf_map_create(enum bpf_map_type map_type, const struct bpf_map_create_opts *opts) { const size_t attr_sz = offsetofend(union bpf_attr, excl_prog_hash_size); +const size_t attr_common_sz =sizeof (struct bpf_common_attr ); +struct bpf_common_attr attr_common; +struct bpf_log_opts *log_opts;union bpf_attr attr;int fd;
@@ -242,7 +245,18 @@ int bpf_map_create(enum bpf_map_type map_type, attr.excl_prog_hash =ptr_to_u64 (OPTS_GET (opts, excl_prog_hash,NULL )); attr.excl_prog_hash_size =OPTS_GET (opts, excl_prog_hash_size,0 ); - fd =sys_bpf_fd (BPF_MAP_CREATE , &attr, attr_sz); + log_opts =OPTS_GET (opts, log_opts,NULL ); +if (log_opts &&feat_supported (NULL ,FEAT_BPF_SYSCALL_COMMON_ATTRS )) { +memset (&attr_common,0 , attr_common_sz); + attr_common.log_buf =ptr_to_u64 (OPTS_GET (log_opts, log_buf,NULL )); + attr_common.log_size =OPTS_GET (log_opts, log_size,0 ); + attr_common.log_level =OPTS_GET (log_opts, log_level,0 ); + fd =sys_bpf_ext_fd (BPF_MAP_CREATE , &attr, attr_sz, &attr_common, attr_common_sz); +OPTS_SET (log_opts, log_true_size, attr_common.log_true_size); + }else { + fd =sys_bpf_fd (BPF_MAP_CREATE , &attr, attr_sz); +OPTS_SET (log_opts, log_true_size,0 ); + }return libbpf_err_errno (fd); }
tools/lib/bpf/bpf.h +16 -1
@@ -37,6 +37,18 @@ extern "C" { LIBBPF_API int libbpf_set_memlock_rlim(size_t memlock_bytes); +struct bpf_log_opts { +size_t sz;/* size of this struct for forward/backward compatibility */ + +char *log_buf; +__u32 log_size; +__u32 log_level; +__u32 log_true_size; + + size_t :0; +}; +#define bpf_log_opts__last_field log_true_size +struct bpf_map_create_opts {size_t sz;/* size of this struct for forward/backward compatibility */
@@ -57,9 +69,12 @@ struct bpf_map_create_opts {const void *excl_prog_hash;__u32 excl_prog_hash_size; + +struct bpf_log_opts *log_opts; + size_t :0; }; -#define bpf_map_create_opts__last_field excl_prog_hash_size +#define bpf_map_create_opts__last_field log_opts LIBBPF_API int bpf_map_create(enum bpf_map_type map_type, const char *map_name,
Signature · 1 line
2.52.0
PATCH v8 9/9 selftests/bpf: Add tests to verify map create failure log
In reply to Leon HwangAdd tests to verify that the kernel reports the expected error messages when map creation fails.
--- .../selftests/bpf/prog_tests/map_init.c | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+)
tools/testing/selftests/bpf/prog_tests/map_init.c +168 -0
@@ -212,3 +212,171 @@ void test_map_init(void)if (test__start_subtest ("pcpu_lru_map_init" ))test_pcpu_lru_map_init (); } + +#define BPF_LOG_FIXED 8 + +static void test_map_create (enum bpf_map_type map_type,const char *map_name, +struct bpf_map_create_opts *opts,const char *exp_msg) +{ +const int key_size =4 , value_size =4 , max_entries =1 ; +char log_buf[128 ]; +int fd; +LIBBPF_OPTS (bpf_log_opts, log_opts); + + log_buf[0 ] ='\0' ; + log_opts.log_buf = log_buf; + log_opts.log_size =sizeof (log_buf); + log_opts.log_level =BPF_LOG_FIXED ; + opts->log_opts = &log_opts; + fd =bpf_map_create (map_type, map_name, key_size, value_size, max_entries, opts); +if (!ASSERT_LT (fd,0 ,"bpf_map_create" )) { +close (fd); +return ; + } + +ASSERT_STREQ (log_buf, exp_msg,"log_buf" ); +ASSERT_EQ (log_opts.log_true_size,strlen (exp_msg) +1 ,"log_true_size" ); +} + +static void test_map_create_array (struct bpf_map_create_opts *opts,const char *exp_msg) +{ +test_map_create (BPF_MAP_TYPE_ARRAY ,"test_map_create" , opts, exp_msg); +} + +static void test_invalid_vmlinux_value_type_id_struct_ops (void ) +{ +const char *msg ="btf_vmlinux_value_type_id can only be used with struct_ops maps.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .btf_vmlinux_value_type_id = 1, + ); + +test_map_create_array (&opts, msg); +} + +static void test_invalid_vmlinux_value_type_id_kv_type_id (void ) +{ +const char *msg ="btf_vmlinux_value_type_id is mutually exclusive with btf_key_type_id and btf_value_type_id.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .btf_vmlinux_value_type_id = 1, + .btf_key_type_id = 1, + ); + +test_map_create (BPF_MAP_TYPE_STRUCT_OPS ,"test_map_create" , &opts, msg); +} + +static void test_invalid_value_type_id (void ) +{ +const char *msg ="Invalid btf_value_type_id.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .btf_key_type_id = 1, + ); + +test_map_create_array (&opts, msg); +} + +static void test_invalid_map_extra (void ) +{ +const char *msg ="Invalid map_extra.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .map_extra = 1, + ); + +test_map_create_array (&opts, msg); +} + +static void test_invalid_numa_node (void ) +{ +const char *msg ="Invalid numa_node.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .map_flags = BPF_F_NUMA_NODE, + .numa_node = 0xFF, + ); + +test_map_create_array (&opts, msg); +} + +static void test_invalid_map_type (void ) +{ +const char *msg ="Invalid map_type.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts); + +test_map_create (__MAX_BPF_MAP_TYPE,"test_map_create" , &opts, msg); +} + +static void test_invalid_token_fd (void ) +{ +const char *msg ="Invalid map_token_fd.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .map_flags = BPF_F_TOKEN_FD, + .token_fd = 0xFF, + ); + +test_map_create_array (&opts, msg); +} + +static void test_invalid_map_name (void ) +{ +const char *msg ="Invalid map_name.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts); + +test_map_create (BPF_MAP_TYPE_ARRAY ,"test-!@#" , &opts, msg); +} + +static void test_invalid_btf_fd (void ) +{ +const char *msg ="Invalid btf_fd.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .btf_fd = -1, + .btf_key_type_id = 1, + .btf_value_type_id = 1, + ); + +test_map_create_array (&opts, msg); +} + +static void test_excl_prog_hash_size_1 (void ) +{ +const char *msg ="Invalid excl_prog_hash_size.\n" ; +const char *hash ="DEADCODE" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .excl_prog_hash = hash, + ); + +test_map_create_array (&opts, msg); +} + +static void test_excl_prog_hash_size_2 (void ) +{ +const char *msg ="Invalid excl_prog_hash_size.\n" ; +LIBBPF_OPTS (bpf_map_create_opts, opts, + .excl_prog_hash_size = 1, + ); + +test_map_create_array (&opts, msg); +} + +void test_map_create_failure (void ) +{ +if (test__start_subtest ("invalid_vmlinux_value_type_id_struct_ops" )) +test_invalid_vmlinux_value_type_id_struct_ops (); +if (test__start_subtest ("invalid_vmlinux_value_type_id_kv_type_id" )) +test_invalid_vmlinux_value_type_id_kv_type_id (); +if (test__start_subtest ("invalid_value_type_id" )) +test_invalid_value_type_id (); +if (test__start_subtest ("invalid_map_extra" )) +test_invalid_map_extra (); +if (test__start_subtest ("invalid_numa_node" )) +test_invalid_numa_node (); +if (test__start_subtest ("invalid_map_type" )) +test_invalid_map_type (); +if (test__start_subtest ("invalid_token_fd" )) +test_invalid_token_fd (); +if (test__start_subtest ("invalid_map_name" )) +test_invalid_map_name (); +if (test__start_subtest ("invalid_btf_fd" )) +test_invalid_btf_fd (); +if (test__start_subtest ("invalid_excl_prog_hash_size_1" )) +test_excl_prog_hash_size_1 (); +if (test__start_subtest ("invalid_excl_prog_hash_size_2" )) +test_excl_prog_hash_size_2 (); +}
Signature · 1 line
2.52.0
Re: [PATCH bpf-next v8 4/9] bpf: Add syscall common attributes support for prog_load
In reply to Leon Hwang,
Quoted 41 lines · Leon Hwang
The log buffer of common attributes would be confusing with the one in 'union
bpf_attr' forBPF_PROG_LOAD.In order to clarify the usage of these two log buffers, they both can be used for logging if:
* They are same, including '
log_buf', 'log_level' and 'log_size'.
* One of them is missing, then another one will be used for logging.If they both have '
log_buf' but they are not same totally, return-EINVAL.Signed-off-by Leon Hwang <[email protected]>--- include/linux/bpf_verifier.h | 4 +++- kernel/bpf/log.c | 29 ++++++++++++++++++++++++++--- kernel/bpf/syscall.c | 9 ++++++--- 3 files changed, 35 insertions(+), 7 deletions(-)include/linux/bpf_verifier.h +3
-1@@ -637,9 +637,11 @@ struct bpf_log_attr {u32 log_level;struct bpf_attrs *attrs;u32 offsetof_log_true_size; +struct bpf_attrs *attrs_common; }; -int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs); +int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs, +struct bpf_attrs *attrs_common);int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log);#define BPF_MAX_SUBPROGS 256kernel/bpf/log.c +0
-0
kernel/bpf/log.c void print_insn_state(struct bpf_verifier_env *env, const struct bpf_verifier_st · line 872
Quoted 9 lines
kernel/bpf/log.c +4
-1@@ -865,23 +865,41 @@ void print_insn_state(struct bpf_verifier_env *env, const struct bpf_verifier_st }static int bpf_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs,u64 log_buf, -u32 log_size,u32 log_level,int offsetof_log_true_size) +u32 log_size,u32 log_level,int offsetof_log_true_size, +struct bpf_attrs *attrs_common) { +const struct bpf_common_attr *common = attrs_common ? attrs_common->attr :NULL ; +
It seems the only point of struct bpf_attrs is to pass the attrs here and remember them in bpf_log_attr.
It looks unnecessary. Also the cast to void and back to actual type doesn't look pretty.
It seems all of it is to do two copy_to_bpfptr_offset() of log_true_size in different places,
but libbpf will use only one, so let's do only one copy_to_bpfptr_offset() and simply the whole thing.
struct bpf_log_attr only needs
u32 offsetof_true_size;
bpfptr_t uattr;
No need to introduce bpf_attrs and bpf_attrs_init() either. When bpf_log_attr is inited make the choice of uattr and offset. uattr will point at either new bpf_common_attr or old bpf_attr, and offsetof_true_size will have 3 possible offsets.
pw-bot: cr
Re: [PATCH bpf-next v8 4/9] bpf: Add syscall common attributes support for prog_load
Quoted 67 lines · Alexei Starovoitov
,
Quoted 41 lines · Leon Hwang
The log buffer of common attributes would be confusing with the one in 'union
bpf_attr' forBPF_PROG_LOAD.In order to clarify the usage of these two log buffers, they both can be used for logging if:
* They are same, including '
log_buf', 'log_level' and 'log_size'.
* One of them is missing, then another one will be used for logging.If they both have '
log_buf' but they are not same totally, return-EINVAL.Signed-off-by Leon Hwang <[email protected]>--- include/linux/bpf_verifier.h | 4 +++- kernel/bpf/log.c | 29 ++++++++++++++++++++++++++--- kernel/bpf/syscall.c | 9 ++++++--- 3 files changed, 35 insertions(+), 7 deletions(-)include/linux/bpf_verifier.h +3
-1@@ -637,9 +637,11 @@ struct bpf_log_attr {u32 log_level;struct bpf_attrs *attrs;u32 offsetof_log_true_size; +struct bpf_attrs *attrs_common; }; -int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs); +int bpf_prog_load_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs, +struct bpf_attrs *attrs_common);int bpf_log_attr_finalize (struct bpf_log_attr *log_attr,struct bpf_verifier_log *log);#define BPF_MAX_SUBPROGS 256kernel/bpf/log.c +0
-0kernel/bpf/log.c void print_insn_state(struct bpf_verifier_env *env, const struct bpf_verifier_st · line 872
Quoted 9 lines
kernel/bpf/log.c +4
-1@@ -865,23 +865,41 @@ void print_insn_state(struct bpf_verifier_env *env, const struct bpf_verifier_st }static int bpf_log_attr_init (struct bpf_log_attr *log_attr,struct bpf_attrs *attrs,u64 log_buf, -u32 log_size,u32 log_level,int offsetof_log_true_size) +u32 log_size,u32 log_level,int offsetof_log_true_size, +struct bpf_attrs *attrs_common) { +const struct bpf_common_attr *common = attrs_common ? attrs_common->attr :NULL ; +It seems the only point of struct
bpf_attrsis to pass the attrs here and remember them inbpf_log_attr.
It looks unnecessary. Also the cast to void and back to actual type doesn't look pretty.
It seems all of it is to do twocopy_to_bpfptr_offset()oflog_true_sizein different places,
but libbpf will use only one, so let's do only onecopy_to_bpfptr_offset()and simply the whole thing.
structbpf_log_attronly needs
u32offsetof_true_size;
bpfptr_tuattr;
Quoted 5 lines
No need to introduce
bpf_attrsandbpf_attrs_init()either. Whenbpf_log_attris inited make the choice of uattr and offset. uattr will point at either newbpf_common_attror oldbpf_attr, andoffsetof_true_sizewill have 3 possible offsets.
That makes sense.
Then struct bpf_log_attr can be simplified to:
struct bpf_log_attr {
u32 offsetof_true_size;
u32 size;
bpfptr_t uattr;
};And bpf_log_attr_finalize() would become:
int bpf_log_attr_finalize(struct bpf_log_attr *attr, struct bpf_verifier_log *log)
{
...
err = bpf_vlog_finalize(log, &log_true_size);
size = sizeof(log_true_size);
if (attr->size >= off + size &&
copy_to_bpfptr_offset(attr->uattr, attr->offsetof_true_size,
&log_true_size, size))
err = -EFAULT;
return err;
}Thanks,
Leon