BPF: New helper to obtain namespace data from current task
Subsystems (10)
v14 cover BPF: New helper to obtain namespace data from current task
Currently bpf_get_current_pid_tgid(), is used to do pid filtering in bcc's scripts but this helper returns the pid as seen by the root namespace which is fine when a bcc script is not executed inside a container.
When the process of interest is inside a container, pid filtering will not work if bpf_get_current_pid_tgid() is used.
This helper addresses this limitation returning the pid as it's seen by the current namespace where the script is executing.
In the future different pid_ns files may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 Linux plumbers conference. To address that situation the helper requires inum and dev_t from /proc/self/ns/pid. This helper has the same use cases as bpf_get_current_pid_tgid() as it can be used to do pid filtering even inside a container.
Changes from V13:
- refactored selftests
- refactored ebpf helper
Carlos Neira (5):
fs/nsfs.c: added ns_match
bpf: added new helper bpf_get_ns_current_pid_tgid
tools: Added bpf_get_ns_current_pid_tgid helper tools/testing/selftests/bpf: Add self-tests for new helper. bpf_helpers_doc.py: Add struct bpf_pidns_info to known types
fs/nsfs.c | 8 ++ include/linux/bpf.h | 1 + include/linux/proc_ns.h | 2 + include/uapi/linux/bpf.h | 20 +++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 45 +++++++++ kernel/trace/bpf_trace.c | 2 + scripts/bpf_helpers_doc.py | 1 + tools/include/uapi/linux/bpf.h | 20 +++- .../bpf/prog_tests/get_ns_current_pid_tgid.c | 96 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++ 11 files changed, 247 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c create mode 100644 tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c
Signature · 1 line
2.20.1
PATCH v14 1/5 fs/nsfs.c: added ns_match
ns_match returns true if the namespace inode and dev_t matches the ones provided by the caller.
--- fs/nsfs.c | 8 ++++++++ include/linux/proc_ns.h | 2 ++ 2 files changed, 10 insertions(+)
fs/nsfs.c +8 -0
@@ -245,6 +245,14 @@ struct file *proc_ns_fget(int fd)return ERR_PTR (-EINVAL ); } +/* Returns true if current namespace matches dev/ino. +*/ +bool ns_match (const struct ns_common *ns,dev_t dev,ino_t ino) +{ +return ((ns->inum == ino) && (nsfs_mnt->mnt_sb->s_dev == dev)); +} + +static int nsfs_show_path (struct seq_file *seq,struct dentry *dentry) {struct inode *inode =d_inode (dentry);
include/linux/proc_ns.h +2 -0
@@ -82,6 +82,8 @@ typedef struct ns_common *ns_get_path_helper_t(void *);extern void *ns_get_path_cb (struct path *path,ns_get_path_helper_t ns_get_cb,void *private_data); +extern bool ns_match (const struct ns_common *ns,dev_t dev,ino_t ino); +extern int ns_get_name (char *buf,size_t size,struct task_struct *task,const struct proc_ns_operations *ns_ops);extern void nsfs_init (void );
Signature · 1 line
2.20.1
Re: [PATCH v14 1/5] fs/nsfs.c: added ns_match
Quoted 14 lines · Carlos Neira
ns_matchreturns true if the namespace inode anddev_tmatches the ones provided by the caller.Signed-off-by Carlos Neira <[email protected]>--- fs/nsfs.c | 8 ++++++++ include/linux/proc_ns.h | 2 ++ 2 files changed, 10 insertions(+)fs/nsfs.c +0
-0
fs/nsfs.c struct file *proc_ns_fget(int fd) · line 249
Quoted 5 lines
fs/nsfs.c +2
-0@@ -245,6 +245,14 @@ struct file *proc_ns_fget(int fd)return ERR_PTR (-EINVAL ); } +/* Returns true if current namespace matches dev/ino. +*/
The above could be a single line comment. Perhaps using kdoc format would be appropriate here.
fs/nsfs.c struct file *proc_ns_fget(int fd) · line 252
Quoted 3 lines
fs/nsfs.c +3
-0+bool ns_match (const struct ns_common *ns,dev_t dev,ino_t ino) +{ +return ((ns->inum == ino) && (nsfs_mnt->mnt_sb->s_dev == dev));
The parentheses on the line above seem unnecessary.
Quoted 22 lines
fs/nsfs.c +3
-0+} + +static int nsfs_show_path (struct seq_file *seq,struct dentry *dentry) {struct inode *inode =d_inode (dentry);include/linux/proc_ns.h +2
-0@@ -82,6 +82,8 @@ typedef struct ns_common *ns_get_path_helper_t(void *);extern void *ns_get_path_cb (struct path *path,ns_get_path_helper_t ns_get_cb,void *private_data); +extern bool ns_match (const struct ns_common *ns,dev_t dev,ino_t ino); +extern int ns_get_name (char *buf,size_t size,struct task_struct *task,const struct proc_ns_operations *ns_ops);extern void nsfs_init (void );Signature · 1 line
2.20.1
PATCH v14 2/5 bpf: added new helper bpf_get_ns_current_pid_tgid
In reply to Carlos NeiraNew bpf helper bpf_get_ns_current_pid_tgid,
This helper will return pid and tgid from current task which namespace matches dev_t and inode number provided, this will allows us to instrument a process inside a container.
--- include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 20 +++++++++++++++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 45 ++++++++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 2 ++ 5 files changed, 68 insertions(+), 1 deletion(-)
include/linux/bpf.h +1 -0
@@ -1055,6 +1055,7 @@ extern const struct bpf_func_proto bpf_get_local_storage_proto;extern const struct bpf_func_proto bpf_strtol_proto;extern const struct bpf_func_proto bpf_strtoul_proto;extern const struct bpf_func_proto bpf_tcp_sock_proto; +extern const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );
include/uapi/linux/bpf.h +19 -1
@@ -2750,6 +2750,19 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* u64 bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size) +* Description +* Returns 0 on success, values for *pid* and *tgid* as seen from the current +* *namespace* will be returned in *nsdata*. +* +* On failure, the returned value is one of the following: +* +* **-EINVAL** if dev and inum supplied don't match dev_t and inode number +* with nsfs of current task, or if dev conversion to dev_t lost high bits. +* +* **-ENOENT** if /proc/self/ns does not exists. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2862,7 +2875,8 @@ union bpf_attr {FN (sk_storage_get), \FN (sk_storage_delete), \FN (send_signal), \ -FN (tcp_gen_syncookie), +FN (tcp_gen_syncookie), \ +FN (get_ns_current_pid_tgid),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -3613,4 +3627,8 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 pid; +__u32 tgid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +1 -0
@@ -2042,6 +2042,7 @@ const struct bpf_func_proto bpf_get_current_uid_gid_proto __weak;const struct bpf_func_proto bpf_get_current_comm_proto__weak ;const struct bpf_func_proto bpf_get_current_cgroup_id_proto__weak ;const struct bpf_func_proto bpf_get_local_storage_proto__weak ; +const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {
kernel/bpf/helpers.c +45 -0
54 lines not on this page · raw message
kernel/trace/bpf_trace.c +2 -0
@@ -735,6 +735,8 @@ tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)#endif case BPF_FUNC_send_signal:return &bpf_send_signal_proto; +case BPF_FUNC_get_ns_current_pid_tgid: +return &bpf_get_ns_current_pid_tgid_proto;default :return NULL ; }
Signature · 1 line
2.20.1
Re: [PATCH v14 2/5] bpf: added new helper bpf_get_ns_current_pid_tgid
Quoted 6 lines · Carlos Neira
New bpf helper
bpf_get_ns_current_pid_tgid,
This helper will return pid and tgid from current task which namespace matchesdev_tand inode number provided, this will allows us to instrument a process inside a container.Signed-off-by Carlos Neira <[email protected]>
You need to rebase the whole series, a new helper skb_output is just added.
Quoted 25 lines
--- include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 20 +++++++++++++++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 45 ++++++++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 2 ++ 5 files changed, 68 insertions(+), 1 deletion(-)include/linux/bpf.h +1
-0@@ -1055,6 +1055,7 @@ extern const struct bpf_func_proto bpf_get_local_storage_proto;extern const struct bpf_func_proto bpf_strtol_proto;extern const struct bpf_func_proto bpf_strtoul_proto;extern const struct bpf_func_proto bpf_tcp_sock_proto; +extern const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/uapi/linux/bpf.h +0
-0
include/uapi/linux/bpf.h union bpf_attr { · line 2754
Quoted 5 lines
include/uapi/linux/bpf.h +2
-0@@ -2750,6 +2750,19 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* u64 bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size)
-EINVAL/-ENOENT may be returned, so let us have return type "int" instead.
include/uapi/linux/bpf.h union bpf_attr { · line 2764
Quoted 10 lines
include/uapi/linux/bpf.h +10
-0+* Description +* Returns 0 on success, values for *pid* and *tgid* as seen from the current +* *namespace* will be returned in *nsdata*. +* +* On failure, the returned value is one of the following: +* +* **-EINVAL** if dev and inum supplied don't match dev_t and inode number +* with nsfs of current task, or if dev conversion to dev_t lost high bits. +* +* **-ENOENT** if /proc/self/ns does not exists.
Let us do not hard code the /proc/self/ns path. Just mention that the pidns does not exist for the current task.
Quoted 109 lines
include/uapi/linux/bpf.h +7
-1+* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2862,7 +2875,8 @@ union bpf_attr {FN (sk_storage_get), \FN (sk_storage_delete), \FN (send_signal), \ -FN (tcp_gen_syncookie), +FN (tcp_gen_syncookie), \ +FN (get_ns_current_pid_tgid),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3613,4 +3627,8 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 pid; +__u32 tgid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2042,6 +2042,7 @@ const struct bpf_func_proto bpf_get_current_uid_gid_proto __weak;const struct bpf_func_proto bpf_get_current_comm_proto__weak ;const struct bpf_func_proto bpf_get_current_cgroup_id_proto__weak ;const struct bpf_func_proto bpf_get_local_storage_proto__weak ; +const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +45
-0@@ -11,6 +11,8 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/proc_ns.h> #include "../../lib/kstrtox.h" @@ -487,3 +489,46 @@ const struct bpf_func_proto bpf_strtoul_proto = { .arg4_type = ARG_PTR_TO_LONG, };#endif + +BPF_CALL_4 (bpf_get_ns_current_pid_tgid, u64, dev, u64, ino, + struct bpf_pidns_info *, nsdata, u32, size) +{ +struct task_struct *task = current; +struct pid_namespace *pidns; +int err = -EINVAL ; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) + goto clear; + +if (unlikely ((u64 )(dev_t )dev != dev)) + goto clear; + +if (unlikely (!task)) + goto clear; + + pidns =task_active_pid_ns (task); +if (unlikely (!pidns)) { + err = -ENOENT ; + goto clear; + } + +if (!ns_match (&pidns->ns, (dev_t )dev, ino)) + goto clear; + + nsdata->pid =task_pid_nr_ns (task, pidns); + nsdata->tgid =task_tgid_nr_ns (task, pidns); +return 0 ; +clear: +memset ((void *)nsdata,0 , (size_t ) size); +return err; +} + +const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto = { + .func = bpf_get_ns_current_pid_tgid, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_ANYTHING , + .arg2_type =ARG_ANYTHING , + .arg3_type =ARG_PTR_TO_UNINIT_MEM , + .arg4_type =ARG_CONST_SIZE , +};kernel/trace/bpf_trace.c +2
-0@@ -735,6 +735,8 @@ tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)#endif case BPF_FUNC_send_signal:return &bpf_send_signal_proto; +case BPF_FUNC_get_ns_current_pid_tgid: +return &bpf_get_ns_current_pid_tgid_proto;default :return NULL ; }
PATCH v14 3/5 tools: Added bpf_get_ns_current_pid_tgid helper
In reply to Carlos Neirasync tools/include/uapi/linux/bpf.h to include new helper.
--- tools/include/uapi/linux/bpf.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
tools/include/uapi/linux/bpf.h +19 -1
@@ -2750,6 +2750,19 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* u64 bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size) +* Description +* Returns 0 on success, values for *pid* and *tgid* as seen from the current +* *namespace* will be returned in *nsdata*. +* +* On failure, the returned value is one of the following: +* +* **-EINVAL** if dev and inum supplied don't match dev_t and inode number +* with nsfs of current task, or if dev conversion to dev_t lost high bits. +* +* **-ENOENT** if /proc/self/ns does not exists. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2862,7 +2875,8 @@ union bpf_attr {FN (sk_storage_get), \FN (sk_storage_delete), \FN (send_signal), \ -FN (tcp_gen_syncookie), +FN (tcp_gen_syncookie), \ +FN (get_ns_current_pid_tgid),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -3613,4 +3627,8 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 pid; +__u32 tgid; +};#endif /* _UAPI__LINUX_BPF_H__ */
Signature · 1 line
2.20.1
Re: [PATCH v14 3/5] tools: Added bpf_get_ns_current_pid_tgid helper
Quoted 17 lines · Carlos Neira
sync
tools/include/uapi/linux/bpf.hto include new helper.Signed-off-by Carlos Neira <[email protected]>--- tools/include/uapi/linux/bpf.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)tools/include/uapi/linux/bpf.h +2
-0@@ -2750,6 +2750,19 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* u64 bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size)
tools/include/uapi/linux/bpf.h union bpf_attr { · line 2764
Quoted 10 lines
tools/include/uapi/linux/bpf.h +10
-0+* Description +* Returns 0 on success, values for *pid* and *tgid* as seen from the current +* *namespace* will be returned in *nsdata*. +* +* On failure, the returned value is one of the following: +* +* **-EINVAL** if dev and inum supplied don't match dev_t and inode number +* with nsfs of current task, or if dev conversion to dev_t lost high bits. +* +* **-ENOENT** if /proc/self/ns does not exists.
The same return type and description changes as suggested in my previous comment.
Quoted 24 lines
tools/include/uapi/linux/bpf.h +7
-1+* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2862,7 +2875,8 @@ union bpf_attr {FN (sk_storage_get), \FN (sk_storage_delete), \FN (send_signal), \ -FN (tcp_gen_syncookie), +FN (tcp_gen_syncookie), \ +FN (get_ns_current_pid_tgid),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3613,4 +3627,8 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 pid; +__u32 tgid; +};#endif /* _UAPI__LINUX_BPF_H__ */
PATCH v14 4/5 tools/testing/selftests/bpf: Add self-tests for new helper.
In reply to Carlos NeiraSelf tests added for new helper
--- .../bpf/prog_tests/get_ns_current_pid_tgid.c | 96 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++ 2 files changed, 149 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c create mode 100644 tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +96 -0
@@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019 Carlos Neira [email protected] */ +#include <test_progs.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <sys/syscall.h> + +struct bss { +__u64 dev; +__u64 ino; +__u64 pidtgid; +__u64 userpidtgid; +} data; + +void test_get_ns_current_pid_tgid (void ) +{ +const char *probe_name ="raw_tracepoint/sys_enter" ; +const char *file ="get_ns_current_pid_tgid_kern.o" ; +struct bpf_object_load_attr load_attr = {}; +struct bpf_link *link =NULL ; +struct bpf_program *prog; +struct bpf_map *bss_map; +struct bpf_object *obj; +int err, duration =0 ; +const __u32 key =0 ; +struct stat st; +__u64 id; + + obj =bpf_object__open (file); +if (CHECK (IS_ERR_OR_NULL (obj),"obj_open" , +"failed to open '%s': %ld\n" , + file,PTR_ERR (obj))) + goto cleanup; + + prog =bpf_object__find_program_by_title (obj, probe_name); +if (CHECK (!prog,"find_probe" , +"prog '%s' not found\n" , probe_name)) + goto cleanup; + +bpf_program__set_type (prog,BPF_PROG_TYPE_RAW_TRACEPOINT ); + + load_attr.obj = obj; + load_attr.log_level =0 ; + load_attr.target_btf_path =NULL ; + err =bpf_object__load_xattr (&load_attr); +if (CHECK (err,"obj_load" , +"failed to load prog '%s': %d\n" , + probe_name, err)) + goto cleanup; + + link =bpf_program__attach_raw_tracepoint (prog,"sys_enter" ); +if (CHECK (IS_ERR (link),"attach_raw_tp" ,"err %ld\n" , +PTR_ERR (link))) + goto cleanup; + + bss_map =bpf_object__find_map_by_name (obj,"ns_data_map" ); +if (CHECK (!bss_map,"find_bss_map" ,"failed\n" )) + goto cleanup; + +memset (&data,0 ,sizeof (data)); +pid_t tid =syscall (SYS_gettid); +pid_t pid =getpid (); + + id = (__u64 ) tid <<32 | pid; + data.userpidtgid = id; + +if (CHECK (stat ("/proc/self/ns/pid" , &st),"stat" ,"failed\n" )) + goto cleanup; + + data.dev = st.st_dev; + data.ino = st.st_ino; + + err =bpf_map_update_elem (bpf_map__fd (bss_map), &key, &data,0 ); +if (CHECK (err,"setting_bss" ,"failed to set bss data: %d\n" , err)) + goto cleanup; + +/* trigger some syscalls */ +usleep (1 ); + + err =bpf_map_lookup_elem (bpf_map__fd (bss_map), &key, &data); +if (CHECK (err,"set_bss" ,"failed to get bss data: %d\n" , err)) + goto cleanup; + +if (CHECK (id != data.pidtgid,"Compare user pid/tgid vs. bpf pid/tgid" , +"User pid/tgid %llu EBPF pid/tgid %llu\n" , id, data.pidtgid)) + goto cleanup; +cleanup: + +if (!IS_ERR_OR_NULL (link)) { +bpf_link__destroy (link); + link =NULL ; + } +bpf_object__close (obj); +}
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c new file +53 -0
53 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v14 4/5] tools/testing/selftests/bpf: Add self-tests for new helper.
Quoted 19 lines · Carlos Neira
Self tests added for new helper
Signed-off-by Carlos Neira <[email protected]>--- .../bpf/prog_tests/get_ns_current_pid_tgid.c | 96 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++ 2 files changed, 149 insertions(+)create mode 100644
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.ccreate mode 100644tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.ctools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +3
-0@@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019 Carlos Neira [email protected] */ +#include <test_progs.h>
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 13
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +10
-0+#include <sys/stat.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <sys/syscall.h> + +struct bss { +__u64 dev; +__u64 ino; +__u64 pidtgid;
Maybe pid_tgid?
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 14
Quoted 1 line
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +1
-0+__u64 userpidtgid;
Maybe user_pid_tgid?
Quoted 18 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +18
-0+} data; + +void test_get_ns_current_pid_tgid (void ) +{ +const char *probe_name ="raw_tracepoint/sys_enter" ; +const char *file ="get_ns_current_pid_tgid_kern.o" ; +struct bpf_object_load_attr load_attr = {}; +struct bpf_link *link =NULL ; +struct bpf_program *prog; +struct bpf_map *bss_map; +struct bpf_object *obj; +int err, duration =0 ; +const __u32 key =0 ; +struct stat st; +__u64 id; + + obj =bpf_object__open (file); + if (CHECK(IS_ERR_OR_NULL(obj), "obj_open",
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 42
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +10
-0+ "failed to open '%s': %ld\n", + file, PTR_ERR(obj))) + goto cleanup; + + prog =bpf_object__find_program_by_title (obj, probe_name); +if (CHECK (!prog,"find_probe" , +"prog '%s' not found\n" , probe_name)) + goto cleanup; + +bpf_program__set_type (prog,BPF_PROG_TYPE_RAW_TRACEPOINT );
Do we need this? I thought libbpf should automatically infer program type from section name?
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 51
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +9
-0+ + load_attr.obj = obj; + load_attr.log_level =0 ; + load_attr.target_btf_path =NULL ; + err =bpf_object__load_xattr (&load_attr); +if (CHECK (err,"obj_load" , +"failed to load prog '%s': %d\n" , + probe_name, err)) + goto cleanup;
Your load_attr only has 'obj', you could use bpf_object__load for simplicity.
Quoted 16 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +16
-0+ + link =bpf_program__attach_raw_tracepoint (prog,"sys_enter" ); +if (CHECK (IS_ERR (link),"attach_raw_tp" ,"err %ld\n" , +PTR_ERR (link))) + goto cleanup; + + bss_map =bpf_object__find_map_by_name (obj,"ns_data_map" ); +if (CHECK (!bss_map,"find_bss_map" ,"failed\n" )) + goto cleanup; + +memset (&data,0 ,sizeof (data)); +pid_t tid =syscall (SYS_gettid); +pid_t pid =getpid (); + + id = (__u64 ) tid <<32 | pid; + data.userpidtgid = id;
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 77
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +10
-0+ +if (CHECK (stat ("/proc/self/ns/pid" , &st),"stat" ,"failed\n" )) + goto cleanup; + + data.dev = st.st_dev; + data.ino = st.st_ino; + + err =bpf_map_update_elem (bpf_map__fd (bss_map), &key, &data,0 ); +if (CHECK (err,"setting_bss" ,"failed to set bss data: %d\n" , err)) + goto cleanup;
Typically, we would like to do map_update_elem first and then do attach_raw_tracepoint. This will ensure updated elem is seen even for the first invocation of the program.
In your case, since you ignore all unmatched version, so I won't insist if there is no revision needed.
Since you need respin any way, I suggest to switch the
order between bpf_map_update_elem and attach_raw_tracepoint, which is a good practice any way.
Quoted 25 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +19
-0+ +/* trigger some syscalls */ +usleep (1 ); + + err =bpf_map_lookup_elem (bpf_map__fd (bss_map), &key, &data); +if (CHECK (err,"set_bss" ,"failed to get bss data: %d\n" , err)) + goto cleanup; + +if (CHECK (id != data.pidtgid,"Compare user pid/tgid vs. bpf pid/tgid" , +"User pid/tgid %llu EBPF pid/tgid %llu\n" , id, data.pidtgid)) + goto cleanup; +cleanup: + +if (!IS_ERR_OR_NULL (link)) { +bpf_link__destroy (link); + link =NULL ; + } +bpf_object__close (obj); +}tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c new file +0
-0
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c line 7
Quoted 7 lines
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c new file +7
-0@@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019 Carlos Neira [email protected] */ + +#include <linux/bpf.h> +#include <stdint.h> +#include "bpf_helpers.h" +#include "bpf_core_read.h"
You do not need "bpf_core_read.h" here.
Quoted 4 lines
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c new file +4
-0+ +struct res { +__u64 dev; +__u64 ino;
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c line 21
Quoted 10 lines
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c new file +10
-0+__u64 pidtgid; +__u64 userpidtgid; +}; + +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, struct res); +} ns_data_map SEC(".maps");
In you code, you use ns_data_map which has max_entries = 1. In this case, static volatile variable can be used to simplify the bpf program. You have
'static struct res data' which will turn into a map as well. So now you have two maps to hold the nsdata. I suggest to remove the above ns_data_map.
You can take a look at the below commit for an example:
commit 666b2c10ee9d51f14d04c416a14b1cb6fd0846e4
Author: Andrii Nakryiko <[email protected]> Date: Wed Oct 9 13:14:58 2019 -0700
selftests/bpf: Add read-only map values propagation tests
Add tests checking that verifier does proper constant propagation for read-only maps. If constant propagation didn't work, skipp_loop and part_loop BPF programs would be rejected due to BPF verifier otherwise not being able to prove they ever complete. With constant propagation, though, they are succesfully validated as properly terminating loops.
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c line 30
Quoted 9 lines
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c new file +9
-0+ +static struct res data; + +SEC("raw_tracepoint/sys_enter") +int trace (void *ctx) +{ +__u64 nspidtgid, expected_pid; +struct bpf_pidns_info nsdata; +const __u32 key =0 ;
You can remove "const" here, not very useful.
Quoted 24 lines
tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c new file +23
-0+struct res *pres; + + pres =bpf_map_lookup_elem (&ns_data_map, &key); +if (!pres) +return 0 ; + +if (bpf_get_ns_current_pid_tgid (pres->dev, pres->ino, &nsdata, +sizeof (struct bpf_pidns_info ))) +return 0 ; + + nspidtgid = (__u64 )nsdata.tgid <<32 | nsdata.pid; + expected_pid = pres->userpidtgid; + +if (expected_pid != nspidtgid) +return 0 ; + + data.pidtgid = nspidtgid; +bpf_map_update_elem (&ns_data_map, &key, &data,0 ); + +return 0 ; +} + +char _license[] SEC("license") = "GPL";
Re: [PATCH v14 4/5] tools/testing/selftests/bpf: Add self-tests for new helper.
Quoted 10 lines · Yonghong Song
Quoted 6 lines · Carlos Neira
Self tests added for new helper
Signed-off-by Carlos Neira <[email protected]>--- .../bpf/prog_tests/get_ns_current_pid_tgid.c | 96 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++
It looks like typical naming convention is:
prog_test/<something>.c
progs/test_<something>.c
Let's keep this consistent. I'm about to do a bit smarter Makefile that will capture this convention, so it's good to have less exception to create. Thanks!
Otherwise, besides what Yonghong mentioned, this look good to me.
Quoted 4 lines
Quoted 4 lines
2 files changed, 149 insertions(+)create mode 100644
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.ccreate mode 100644tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c
[...]
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 42
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +6
-0+ prog =bpf_object__find_program_by_title (obj, probe_name); +if (CHECK (!prog,"find_probe" , +"prog '%s' not found\n" , probe_name)) + goto cleanup; + +bpf_program__set_type (prog,BPF_PROG_TYPE_RAW_TRACEPOINT );Do we need this? I thought libbpf should automatically infer program type from section name?
We used to, until the patch set that Daniel landed today. Now it can be dropped.
Quoted 11 lines
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +9
-0+ + load_attr.obj = obj; + load_attr.log_level =0 ; + load_attr.target_btf_path =NULL ; + err =bpf_object__load_xattr (&load_attr); +if (CHECK (err,"obj_load" , +"failed to load prog '%s': %d\n" , + probe_name, err)) + goto cleanup;
[...]
Re: [PATCH v14 4/5] tools/testing/selftests/bpf: Add self-tests for new helper.
Quoted 55 lines · Andrii Nakryiko
Quoted 10 lines · Yonghong Song
Quoted 6 lines · Carlos Neira
Self tests added for new helper
Signed-off-by Carlos Neira <[email protected]>--- .../bpf/prog_tests/get_ns_current_pid_tgid.c | 96 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++It looks like typical naming convention is:
prog_test/<something>.c
progs/test_<something>.cLet's keep this consistent. I'm about to do a bit smarter
Makefilethat will capture this convention, so it's good to have less exception to create. Thanks!Otherwise, besides what Yonghong mentioned, this look good to me.
Quoted 4 lines
Quoted 4 lines
2 files changed, 149 insertions(+)create mode 100644
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.ccreate mode 100644tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c[...]
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 42
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +6
-0+ prog =bpf_object__find_program_by_title (obj, probe_name); +if (CHECK (!prog,"find_probe" , +"prog '%s' not found\n" , probe_name)) + goto cleanup; + +bpf_program__set_type (prog,BPF_PROG_TYPE_RAW_TRACEPOINT );Do we need this? I thought libbpf should automatically infer program type from section name?
We used to, until the patch set that Daniel landed today. Now it can be dropped.
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 51
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +9
-0+ + load_attr.obj = obj; + load_attr.log_level =0 ; + load_attr.target_btf_path =NULL ; + err =bpf_object__load_xattr (&load_attr); +if (CHECK (err,"obj_load" , +"failed to load prog '%s': %d\n" , + probe_name, err)) + goto cleanup;
Quoted 1 line
[...]
Thanks Andrii,
I have a doubt, I don't find in prog_tests/rdonly_map.c where is "test_rdo.bss" defined ?, is called in line 43 but I'm missing how to is it used as I don't see it defined.
Bests
Re: [PATCH v14 4/5] tools/testing/selftests/bpf: Add self-tests for new helper.
Quoted 57 lines · Carlos Antonio Neira Bustos
Quoted 55 lines · Andrii Nakryiko
Quoted 10 lines · Yonghong Song
Quoted 6 lines · Carlos Neira
Self tests added for new helper
Signed-off-by Carlos Neira <[email protected]>--- .../bpf/prog_tests/get_ns_current_pid_tgid.c | 96 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++It looks like typical naming convention is:
prog_test/<something>.c
progs/test_<something>.cLet's keep this consistent. I'm about to do a bit smarter
Makefilethat will capture this convention, so it's good to have less exception to create. Thanks!Otherwise, besides what Yonghong mentioned, this look good to me.
Quoted 4 lines
Quoted 4 lines
2 files changed, 149 insertions(+)create mode 100644
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.ccreate mode 100644tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c[...]
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 42
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +6
-0+ prog =bpf_object__find_program_by_title (obj, probe_name); +if (CHECK (!prog,"find_probe" , +"prog '%s' not found\n" , probe_name)) + goto cleanup; + +bpf_program__set_type (prog,BPF_PROG_TYPE_RAW_TRACEPOINT );Do we need this? I thought libbpf should automatically infer program type from section name?
We used to, until the patch set that Daniel landed today. Now it can be dropped.
Quoted 11 lines
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +9
-0+ + load_attr.obj = obj; + load_attr.log_level =0 ; + load_attr.target_btf_path =NULL ; + err =bpf_object__load_xattr (&load_attr); +if (CHECK (err,"obj_load" , +"failed to load prog '%s': %d\n" , + probe_name, err)) + goto cleanup;
Quoted 5 lines
Quoted 1 line
[...]
Thanks Andrii,
I have a doubt, I don't find inprog_tests/rdonly_map.cwhere is "test_rdo.bss" defined ?, is called in line 43 but I'm missing how to is it used as I don't see it defined.
This map is created by libbpf implicitly from global variables used by BPF object. You just look it up by name, set its value to whatever you need global variables to be set up to, and that value will be available to BPF program. From BPF program side, when you update global variable, that value can be read from user space using that same test_rdo.bss map. Does it make sense?
Quoted 1 line
Bests
Re: [PATCH v14 4/5] tools/testing/selftests/bpf: Add self-tests for new helper.
Quoted 65 lines · Andrii Nakryiko
Quoted 57 lines · Carlos Antonio Neira Bustos
Quoted 55 lines · Andrii Nakryiko
Quoted 10 lines · Yonghong Song
Quoted 6 lines · Carlos Neira
Self tests added for new helper
Signed-off-by Carlos Neira <[email protected]>--- .../bpf/prog_tests/get_ns_current_pid_tgid.c | 96 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++It looks like typical naming convention is:
prog_test/<something>.c
progs/test_<something>.cLet's keep this consistent. I'm about to do a bit smarter
Makefilethat will capture this convention, so it's good to have less exception to create. Thanks!Otherwise, besides what Yonghong mentioned, this look good to me.
Quoted 4 lines
Quoted 4 lines
2 files changed, 149 insertions(+)create mode 100644
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.ccreate mode 100644tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c[...]
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c line 42
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +6
-0+ prog =bpf_object__find_program_by_title (obj, probe_name); +if (CHECK (!prog,"find_probe" , +"prog '%s' not found\n" , probe_name)) + goto cleanup; + +bpf_program__set_type (prog,BPF_PROG_TYPE_RAW_TRACEPOINT );Do we need this? I thought libbpf should automatically infer program type from section name?
We used to, until the patch set that Daniel landed today. Now it can be dropped.
Quoted 11 lines
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file +9
-0+ + load_attr.obj = obj; + load_attr.log_level =0 ; + load_attr.target_btf_path =NULL ; + err =bpf_object__load_xattr (&load_attr); +if (CHECK (err,"obj_load" , +"failed to load prog '%s': %d\n" , + probe_name, err)) + goto cleanup;Quoted 5 lines
Quoted 1 line
[...]
Thanks Andrii,
I have a doubt, I don't find inprog_tests/rdonly_map.cwhere is "test_rdo.bss" defined ?, is called in line 43 but I'm missing how to is it used as I don't see it defined.
Quoted 8 lines
This map is created by libbpf implicitly from global variables used by BPF object. You just look it up by name, set its value to whatever you need global variables to be set up to, and that value will be available to BPF program. From BPF program side, when you update global variable, that value can be read from user space using that same test_rdo.bss map. Does it make sense?
Quoted 1 line
Bests
Thanks for the explanation Andrii, now it works!.
PATCH v14 5/5 bpf_helpers_doc.py: Add struct bpf_pidns_info to known types
In reply to Carlos NeiraAdd struct bpf_pidns_info to known types
--- scripts/bpf_helpers_doc.py | 1 + 1 file changed, 1 insertion(+)
scripts/bpf_helpers_doc.py +1 -0
@@ -450,6 +450,7 @@ class PrinterHelpers(Printer): 'struct sk_reuseport_md', 'struct sockaddr', 'struct tcphdr', + 'struct bpf_pidns_info', } mapped_types = { 'u8': '__u8',
Signature · 1 line
2.20.1
Re: [PATCH v14 5/5] bpf_helpers_doc.py: Add struct bpf_pidns_info to known types
Quoted 12 lines · Carlos Neira
Add struct
bpf_pidns_infoto known typesSigned-off-by Carlos Neira <[email protected]>--- scripts/bpf_helpers_doc.py | 1 + 1 file changed, 1 insertion(+)scripts/bpf_helpers_doc.py +0
-0
scripts/bpf_helpers_doc.py class PrinterHelpers(Printer): · line 453
Quoted 4 lines
scripts/bpf_helpers_doc.py +1
-0@@ -450,6 +450,7 @@ class PrinterHelpers(Printer): 'struct sk_reuseport_md', 'struct sockaddr', 'struct tcphdr', + 'struct bpf_pidns_info',
looks like the names are sorted. please put it into appropriate place.
Quoted 4 lines
scripts/bpf_helpers_doc.py +0
-0} mapped_types = { 'u8': '__u8',