BPF: helpers: New helper to obtain namespace data from current task
Subsystems (10)
PATCH v5 1/1 BPF: helpers: New helper to obtain namespace data from current task
The code has been modified to avoid syscalls that could sleep. Please let me know if any other modification is needed.
From be0384c0fa209a78c1567936e8db4e35b9a7c0f8 Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain namespace data
from current task
This helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from /proc/self/ns/pid, as in the future it's possible that different pid_ns files may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
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.
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.
For example a bcc script using bpf_get_current_pid_tgid() (tools/funccount.py):
u32 pid = bpf_get_current_pid_tgid() >> 32;
if (pid != <pid_arg_passed_in>)
return 0;Could be modified to use bpf_get_current_pidns_info() as follows:
struct bpf_pidns pidns;
bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns));
u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>))
return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>
Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pid
--- fs/namei.c | 2 +- include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 29 ++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 78 ++++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 29 ++++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 15 files changed, 418 insertions(+), 4 deletions(-) create mode 100644 samples/bpf/trace_ns_info_user.c create mode 100644 samples/bpf/trace_ns_info_user_kern.c create mode 100644 tools/testing/selftests/bpf/progs/test_pidns_kern.c create mode 100644 tools/testing/selftests/bpf/test_pidns.c
fs/namei.c +1 -1
@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h>
@@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, struct filename *name, unsigned flags,putname (name);return retval; } +EXPORT_SYMBOL (filename_lookup);/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ static int path_parentat(struct nameidata *nd, unsigned flags,
include/linux/bpf.h +1 -0
@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );
include/linux/namei.h +4 -0
@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };
@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned int flags, +struct path *path,struct path *root); +static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;
include/uapi/linux/bpf.h +28 -1
@@ -2741,6 +2741,26 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if unable to get ns, pid or tgid of current task. +* Or if size_of_pidns is not valid. +* +* **-ENOMEM** if allocation fails. +* +* If unable to get the inode from /proc/self/ns/pid an error code +* will be returned. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2853,7 +2873,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +1 -0
@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {
kernel/bpf/helpers.c +78 -0
90 lines not on this page · raw message
kernel/trace/bpf_trace.c +2 -0
@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }
samples/bpf/Makefile +3 -0
@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info # Libbpf dependencies LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a
@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.o task_fd_query_user.o $(TRACE_HELPERS) xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o # Tell kbuild to always build the programs always := $(hostprogs-y)
@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.o always += ibumad_kern.o always += hbm_out_kern.o always += hbm_edt_kern.o +always += trace_ns_info_user_kern.o KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/bpf/
samples/bpf/trace_ns_info_user.c new file +35 -0
@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used +* to exercize bpf_get_current_pidns_info() helper call. +*/ +int main (int ac,char **argv) +{ +FILE *f; +char filename[256 ]; + +snprintf (filename,sizeof (filename),"%s_user_kern.o" , argv[0 ]); +printf ("loading %s\n" , filename); + +if (load_bpf_file (filename)) { +printf ("%s" , bpf_log_buf); +return 1 ; + } + + f =popen ("taskset 1 ping localhost" ,"r" ); + (void ) f; +read_trace_pipe (); +return 0 ; +}
samples/bpf/trace_ns_info_user_kern.c new file +44 -0
44 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +28 -1
@@ -2741,6 +2741,26 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if unable to get ns, pid or tgid of current task. +* Or if size_of_pidns is not valid. +* +* **-ENOMEM** if allocation fails. +* +* If unable to get the inode from /proc/self/ns/pid an error code +* will be returned. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2853,7 +2873,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
tools/testing/selftests/bpf/Makefile +1 -1
@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \ - test_sockopt_multi test_tcp_rtt + test_sockopt_multi test_tcp_rtt test_pidns BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES)
tools/testing/selftests/bpf/bpf_helpers.h +3 -0
@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) = (void *)BPF_FUNC_send_signal;static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk,void *ip,int ip_len,void *tcp,int tcp_len) = (void *) BPF_FUNC_tcp_gen_syncookie; +static int (*bpf_get_current_pidns_info)(struct bpf_pidns_info *buf, +unsigned int buf_size) = + (void *) BPF_FUNC_get_current_pidns_info;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions
tools/testing/selftests/bpf/progs/test_pidns_kern.c new file +51 -0
51 lines not on this page · raw message
tools/testing/selftests/bpf/test_pidns.c new file +138 -0
138 lines not on this page · raw message
Signature · 1 line
2.11.0
Quoted 67 lines · Carlos Antonio Neira Bustos
The code has been modified to avoid syscalls that could sleep. Please let me know if any other modification is needed.
From
be0384c0fa209a78c1567936e8db4e35b9a7c0f8Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain namespace data
from current taskThis helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from/proc/self/ns/pid, as in the future it's possible that differentpid_nsfiles may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
Currentlybpf_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 ifbpf_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.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.For example a bcc script using
bpf_get_current_pid_tgid()(tools/funccount.py):u32 pid = bpf_get_current_pid_tgid() >> 32; if (pid != <pid_arg_passed_in>) return 0;Could be modified to use
bpf_get_current_pidns_info()as follows:struct bpf_pidns pidns; bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns)); u32 pid = pidns.tgid; u32 nsid = pidns.nsid; if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>)) return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>--- fs/namei.c | 2 +- include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 29 ++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 78 ++++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 29 ++++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 15 files changed, 418 insertions(+), 4 deletions(-)
Quoted 4 lines
create mode 100644
samples/bpf/trace_ns_info_user.c
create mode 100644samples/bpf/trace_ns_info_user_kern.ccreate mode 100644tools/testing/selftests/bpf/progs/test_pidns_kern.ccreate mode 100644tools/testing/selftests/bpf/test_pidns.c
Carlos,
Thanks for your patch. Maybe the following changes can be made for easier review and eventual merging if accepted.
(1). The single patch should be broken into multiple patches:
#1. fs/namei.c include/linux/namei.h
#2. bpf kernel changes in include/linux/bpf.h,
include/uapi/linux/bpf.h, kernel/bpf/core.c kernel/bpf/helpers.h kernel/trace/bpf_trace.c
#3. sync uapi header tools/include/uapi/linux/bpf.h #4. tools/testing/selftests/bpf changes.
#5. samples/bpf/ changes.
(2). Since you have more than one patch, please do provide
a cover letter to describe use case as you did in the above commit. Please put the change logs after the original commit message.
You can look at some other examples
"git log" in the net-next or bpf-next repo.
(3). Please send to or cc BPF maintainers:
Alexei Starovoitov <[email protected]>
Daniel Borkmann <[email protected]>
Quoted 628 lines
fs/namei.c +1
-1@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h> @@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, struct filename *name, unsigned flags,putname (name);return retval; } +EXPORT_SYMBOL (filename_lookup);/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ static int path_parentat(struct nameidata *nd, unsigned flags,include/linux/bpf.h +1
-0@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/linux/namei.h +4
-0@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned int flags, +struct path *path,struct path *root); +static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;include/uapi/linux/bpf.h +28
-1@@ -2741,6 +2741,26 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if unable to get ns, pid or tgid of current task. +* Or if size_of_pidns is not valid. +* +* **-ENOMEM** if allocation fails. +* +* If unable to get the inode from /proc/self/ns/pid an error code +* will be returned. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2873,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +78
-0@@ -11,6 +11,12 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "../../lib/kstrtox.h" @@ -312,6 +318,78 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,preempt_enable (); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *, pidns_info, u32, + size) +{ +const char *name ="/proc/self/ns/pid" ; +struct pid_namespace *pidns =NULL ; +struct filename *tmp =NULL ; +int len =strlen (name) +1 ; +struct inode *inode; +struct path kp; +pid_t tgid =0 ; +pid_t pid =0 ; +int ret; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) +return -EINVAL ; + + pidns =task_active_pid_ns (current); + +if (unlikely (!pidns)) + goto clear; + + pidns_info->nsid = pidns->ns.inum; + pid =task_pid_nr_ns (current, pidns); + +if (unlikely (!pid)) + goto clear; + + tgid =task_tgid_nr_ns (current, pidns); + +if (unlikely (!tgid)) + goto clear; + + pidns_info->tgid = (u32 ) tgid; + pidns_info->pid = (u32 ) pid; + + tmp =kmem_cache_alloc (names_cachep,GFP_ATOMIC ); +if (unlikely (!tmp)) { +memset ((void *)pidns_info,0 , (size_t ) size); +return -ENOMEM ; + } + +memcpy ((char *)tmp->name, name, len); + tmp->uptr =NULL ; + tmp->aname =NULL ; + tmp->refcnt =1 ; + + ret =filename_lookup (AT_FDCWD , tmp,0 , &kp,NULL ); + +if (ret) { +memset ((void *)pidns_info,0 , (size_t ) size); +return ret; + } + + inode =d_backing_inode (kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; + +return 0 ; + +clear: +memset ((void *)pidns_info,0 , (size_t ) size); + +return -EINVAL ; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_UNINIT_MEM , + .arg2_type =ARG_CONST_SIZE , +}; +#ifdef CONFIG_CGROUPS BPF_CALL_0 (bpf_get_current_cgroup_id) {kernel/trace/bpf_trace.c +2
-0@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }samples/bpf/Makefile +3
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info # Libbpf dependencies LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.o task_fd_query_user.o $(TRACE_HELPERS) xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o # Tell kbuild to always build the programs always := $(hostprogs-y)@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.o always += ibumad_kern.o always += hbm_out_kern.o always += hbm_edt_kern.o +always += trace_ns_info_user_kern.o KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/bpf/samples/bpf/trace_ns_info_user.c new file +35
-0@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used +* to exercize bpf_get_current_pidns_info() helper call. +*/ +int main (int ac,char **argv) +{ +FILE *f; +char filename[256 ]; + +snprintf (filename,sizeof (filename),"%s_user_kern.o" , argv[0 ]); +printf ("loading %s\n" , filename); + +if (load_bpf_file (filename)) { +printf ("%s" , bpf_log_buf); +return 1 ; + } + + f =popen ("taskset 1 ping localhost" ,"r" ); + (void ) f; +read_trace_pipe (); +return 0 ; +}samples/bpf/trace_ns_info_user_kern.c new file +44
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include <linux/version.h> +#include <uapi/linux/bpf.h> +#include "bpf_helpers.h" + +typedef __u64 u64 ; +typedef __u32 u32 ; + + +/* kprobe is NOT a stable ABI +* kernel functions can be removed, renamed or completely change semantics. +* Number of arguments and their positions can change, etc. +* In such case this bpf+kprobe example will no longer be meaningful +*/ + +/* This will call bpf_get_current_pidns_info() to display pid and ns values +* as seen by the current namespace, on the far left you will see the pid as +* seen as by the root namespace. +*/ + +SEC("kprobe/__netif_receive_skb_core") +int bpf_prog1 (struct pt_regs *ctx) +{ +char fmt[] ="nsid:%u, dev: %u, pid:%u\n" ; +struct bpf_pidns_info nsinfo; +int ok =0 ; + + ok =bpf_get_current_pidns_info (&nsinfo,sizeof (nsinfo)); +if (ok ==0 ) +bpf_trace_printk (fmt,sizeof (fmt), (u32 )nsinfo.nsid, + (u32 ) nsinfo.dev, (u32 )nsinfo.pid); + +return 0 ; +} +char _license[] SEC("license") = "GPL"; +u32 _version SEC("version") = LINUX_VERSION_CODE;tools/include/uapi/linux/bpf.h +28
-1@@ -2741,6 +2741,26 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if unable to get ns, pid or tgid of current task. +* Or if size_of_pidns is not valid. +* +* **-ENOMEM** if allocation fails. +* +* If unable to get the inode from /proc/self/ns/pid an error code +* will be returned. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2873,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ tools/testing/selftests/bpf/Makefile +1
-1@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \ - test_sockopt_multi test_tcp_rtt + test_sockopt_multi test_tcp_rtt test_pidns BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES)tools/testing/selftests/bpf/bpf_helpers.h +3
-0@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) = (void *)BPF_FUNC_send_signal;static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk,void *ip,int ip_len,void *tcp,int tcp_len) = (void *) BPF_FUNC_tcp_gen_syncookie; +static int (*bpf_get_current_pidns_info)(struct bpf_pidns_info *buf, +unsigned int buf_size) = + (void *) BPF_FUNC_get_current_pidns_info;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions tools/testing/selftests/bpf/progs/test_pidns_kern.c new file +51
-0@@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <linux/bpf.h> +#include <errno.h> +#include "bpf_helpers.h" + +struct bpf_map_def SEC("maps") nsidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +struct bpf_map_def SEC("maps") pidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +SEC("tracepoint/syscalls/sys_enter_nanosleep") +int trace (void *ctx) +{ +struct bpf_pidns_info nsinfo; +__u32 key =0 , *expected_pid, *val; +char fmt[] ="ERROR nspid:%d\n" ; + +if (bpf_get_current_pidns_info (&nsinfo,sizeof (nsinfo))) +return -EINVAL ; + + expected_pid =bpf_map_lookup_elem (&pidmap, &key); + + +if (!expected_pid || *expected_pid != nsinfo.pid) +return 0 ; + + val =bpf_map_lookup_elem (&nsidmap, &key); +if (val) + *val = nsinfo.nsid; + +return 0 ; +} + +char _license[] SEC("license") = "GPL"; +__u32 _version SEC("version") = 1;tools/testing/selftests/bpf/test_pidns.c new file +138
-0@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <syscall.h> +#include <unistd.h> +#include <linux/perf_event.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include <linux/bpf.h> +#include <bpf/bpf.h> +#include <bpf/libbpf.h> + +#include "cgroup_helpers.h" +#include "bpf_rlimit.h" + +#define CHECK(condition, tag, format...) ({ \ + int __ret = !!(condition); \ + if (__ret) { \ + printf("%s:FAIL:%s ", __func__, tag); \ + printf(format); \ + } else { \ + printf("%s:PASS:%s\n", __func__, tag); \ + } \ + __ret; \ +}) + +static int bpf_find_map (const char *test,struct bpf_object *obj, +const char *name) +{ +struct bpf_map *map; + + map =bpf_object__find_map_by_name (obj, name); +if (!map) +return -1 ; +return bpf_map__fd (map); +} + + +int main (int argc,char **argv) +{ +const char *probe_name ="syscalls/sys_enter_nanosleep" ; +const char *file ="test_pidns_kern.o" ; +int err, bytes, efd, prog_fd, pmu_fd; +int pidmap_fd, nsidmap_fd; +struct perf_event_attr attr = {}; +struct bpf_object *obj; +__u32 knsid =0 ; +__u32 key =0 , pid; +int exit_code =1 ; +struct stat st; +char buf[256 ]; + + err =bpf_prog_load (file,BPF_PROG_TYPE_TRACEPOINT , &obj, &prog_fd); +if (CHECK (err,"bpf_prog_load" ,"err %d errno %d\n" , err, errno)) + goto cleanup_cgroup_env; + + nsidmap_fd =bpf_find_map (__func__, obj,"nsidmap" ); +if (CHECK (nsidmap_fd <0 ,"bpf_find_map" ,"err %d errno %d\n" , + nsidmap_fd, errno)) + goto close_prog; + + pidmap_fd =bpf_find_map (__func__, obj,"pidmap" ); +if (CHECK (pidmap_fd <0 ,"bpf_find_map" ,"err %d errno %d\n" , + pidmap_fd, errno)) + goto close_prog; + + pid =getpid (); +bpf_map_update_elem (pidmap_fd, &key, &pid,0 ); + +snprintf (buf,sizeof (buf), +"/sys/kernel/debug/tracing/events/%s/id" , probe_name); + efd =open (buf,O_RDONLY ,0 ); +if (CHECK (efd <0 ,"open" ,"err %d errno %d\n" , efd, errno)) + goto close_prog; + bytes =read (efd, buf,sizeof (buf)); +close (efd); +if (CHECK (bytes <=0 || bytes >=sizeof (buf),"read" , +"bytes %d errno %d\n" , bytes, errno)) + goto close_prog; + + attr.config =strtol (buf,NULL ,0 ); + attr.type =PERF_TYPE_TRACEPOINT ; + attr.sample_type =PERF_SAMPLE_RAW ; + attr.sample_period =1 ; + attr.wakeup_events =1 ; + + pmu_fd =syscall (__NR_perf_event_open, &attr,getpid (),-1 ,-1 ,0 ); +if (CHECK (pmu_fd <0 ,"perf_event_open" ,"err %d errno %d\n" , pmu_fd, + errno)) + goto close_prog; + + err =ioctl (pmu_fd,PERF_EVENT_IOC_ENABLE ,0 ); +if (CHECK (err,"perf_event_ioc_enable" ,"err %d errno %d\n" , err, + errno)) + goto close_pmu; + + err =ioctl (pmu_fd,PERF_EVENT_IOC_SET_BPF , prog_fd); +if (CHECK (err,"perf_event_ioc_set_bpf" ,"err %d errno %d\n" , err, + errno)) + goto close_pmu; + +/* trigger some syscalls */ +sleep (1 ); + + err =bpf_map_lookup_elem (nsidmap_fd, &key, &knsid); +if (CHECK (err,"bpf_map_lookup_elem" ,"err %d errno %d\n" , err, errno)) + goto close_pmu; + +if (stat ("/proc/self/ns/pid" , &st)) + goto close_pmu; + +if (CHECK (knsid != (__u32 ) st.st_ino,"compare_namespace_id" , +"kern knsid %u user unsid %u\n" , knsid, (__u32 ) st.st_ino)) + goto close_pmu; + + exit_code =0 ; +printf ("%s:PASS\n" , argv[0 ]); + +close_pmu: +close (pmu_fd); +close_prog: +bpf_object__close (obj); +cleanup_cgroup_env: +return exit_code; +}
Quoted 85 lines · Carlos Antonio Neira Bustos
The code has been modified to avoid syscalls that could sleep. Please let me know if any other modification is needed.
From
be0384c0fa209a78c1567936e8db4e35b9a7c0f8Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain namespace data
from current taskThis helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from/proc/self/ns/pid, as in the future it's possible that differentpid_nsfiles may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
Currentlybpf_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 ifbpf_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.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.For example a bcc script using
bpf_get_current_pid_tgid()(tools/funccount.py):u32 pid = bpf_get_current_pid_tgid() >> 32; if (pid != <pid_arg_passed_in>) return 0;Could be modified to use
bpf_get_current_pidns_info()as follows:struct bpf_pidns pidns; bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns)); u32 pid = pidns.tgid; u32 nsid = pidns.nsid; if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>)) return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>--- fs/namei.c | 2 +- include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 29 ++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 78 ++++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 29 ++++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 15 files changed, 418 insertions(+), 4 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.c
create mode 100644samples/bpf/trace_ns_info_user_kern.ccreate mode 100644tools/testing/selftests/bpf/progs/test_pidns_kern.ccreate mode 100644tools/testing/selftests/bpf/test_pidns.cfs/namei.c +0
-1@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h>
fs/namei.c int filename_lookup(int dfd, struct filename *name, unsigned flags, · line 2357
Quoted 4 lines
fs/namei.c +1
-0@@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, struct filename *name, unsigned flags,putname (name);return retval; } +EXPORT_SYMBOL (filename_lookup);
No need to export symbols. bpf uses it and bpf is in the core, not in modules.
Quoted 28 lines
fs/namei.c +0
-0/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ static int path_parentat(struct nameidata *nd, unsigned flags,include/linux/bpf.h +1
-0@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/linux/namei.h +1
-0@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };
include/linux/namei.h extern void unlock_rename(struct dentry *, struct dentry *); · line 102
Quoted 5 lines
include/linux/namei.h +2
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned int flags, +struct path *path,struct path *root);
The previous definition in fs/internal.h should be removed.
Quoted 17 lines
include/linux/namei.h +1
-0+static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;include/uapi/linux/bpf.h +5
-0@@ -2741,6 +2741,26 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid.
include/uapi/linux/bpf.h union bpf_attr { · line 2758
Quoted 10 lines
include/uapi/linux/bpf.h +10
-0+* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if unable to get ns, pid or tgid of current task. +* Or if size_of_pidns is not valid.
Maybe reword by following the code sequence.
if *size_of_pidns* is not valid or unable to get ns, pid or tgid of the current task.
include/uapi/linux/bpf.h union bpf_attr { · line 2760
Quoted 2 lines
include/uapi/linux/bpf.h +2
-0+* +* **-ENOMEM** if allocation fails.
Maybe some other error codes in filename_lookup() function?
include/uapi/linux/bpf.h union bpf_attr { · line 2763
Quoted 3 lines
include/uapi/linux/bpf.h +3
-0+* +* If unable to get the inode from /proc/self/ns/pid an error code +* will be returned.
You do not need this. The description of error code cases should cover this.
Quoted 54 lines
include/uapi/linux/bpf.h +8
-1*/ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2873,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "../../lib/kstrtox.h"
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 324
Quoted 7 lines
kernel/bpf/helpers.c +4
-0@@ -312,6 +318,78 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,preempt_enable (); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *, pidns_info, u32, + size) +{ +const char *name ="/proc/self/ns/pid" ;
maybe rename this variable to pidns_path?
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 326
Quoted 2 lines
kernel/bpf/helpers.c +2
-0+struct pid_namespace *pidns =NULL ; +struct filename *tmp =NULL ;
Maybe rename this variable to name?
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 327
Quoted 1 line
kernel/bpf/helpers.c +1
-0+int len =strlen (name) +1 ;
We can delay this assignment later until it is needed.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 338
Quoted 11 lines
kernel/bpf/helpers.c +11
-0+struct inode *inode; +struct path kp; +pid_t tgid =0 ; +pid_t pid =0 ; +int ret; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) +return -EINVAL ; + + pidns =task_active_pid_ns (current); +
we can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 344
Quoted 6 lines
kernel/bpf/helpers.c +6
-0+if (unlikely (!pidns)) + goto clear; + + pidns_info->nsid = pidns->ns.inum; + pid =task_pid_nr_ns (current, pidns); +
We can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 349
Quoted 5 lines
kernel/bpf/helpers.c +5
-0+if (unlikely (!pid)) + goto clear; + + tgid =task_tgid_nr_ns (current, pidns); +
ditto. save an empty line.
Quoted 7 lines
kernel/bpf/helpers.c +7
-0+if (unlikely (!tgid)) + goto clear; + + pidns_info->tgid = (u32 ) tgid; + pidns_info->pid = (u32 ) pid; + + tmp =kmem_cache_alloc (names_cachep,GFP_ATOMIC );
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 366
Quoted 10 lines
kernel/bpf/helpers.c +10
-0+if (unlikely (!tmp)) { +memset ((void *)pidns_info,0 , (size_t ) size); +return -ENOMEM ; + } + +memcpy ((char *)tmp->name, name, len); + tmp->uptr =NULL ; + tmp->aname =NULL ; + tmp->refcnt =1 ; +
ditto. save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 368
Quoted 2 lines
kernel/bpf/helpers.c +2
-0+ ret =filename_lookup (AT_FDCWD , tmp,0 , &kp,NULL ); +
ditto. save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 381
Quoted 13 lines
kernel/bpf/helpers.c +13
-0+if (ret) { +memset ((void *)pidns_info,0 , (size_t ) size); +return ret; + } + + inode =d_backing_inode (kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; + +return 0 ; + +clear: +memset ((void *)pidns_info,0 , (size_t ) size); +
save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 386
Quoted 5 lines
kernel/bpf/helpers.c +5
-0+return -EINVAL ; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info,
make the "= " aligned with others?
Quoted 31 lines
kernel/bpf/helpers.c +6
-0+ .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE, +}; +#ifdef CONFIG_CGROUPS BPF_CALL_0 (bpf_get_current_cgroup_id) {kernel/trace/bpf_trace.c +2
-0@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }samples/bpf/Makefile +1
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info
[...]
Yonghong,
I have modified the patch following your feedback. Let me know if I'm missing something.
Bests
From 70f8d5584700c9cfc82c006901d8ee9595c53f15 Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v6 bpf-next] BPF: New helper to obtain namespace data
from current task
This helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from /proc/self/ns/pid, as in the future it's possible that different pid_ns files may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
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.
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.
For example a bcc script using bpf_get_current_pid_tgid() (tools/funccount.py):
u32 pid = bpf_get_current_pid_tgid() >> 32;
if (pid != <pid_arg_passed_in>)
return 0;Could be modified to use bpf_get_current_pidns_info() as follows:
struct bpf_pidns pidns;
bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns));
u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>))
return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>
Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pid
--- fs/internal.h | 2 - fs/namei.c | 1 - include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 27 +++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 64 ++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 27 +++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 16 files changed, 399 insertions(+), 6 deletions(-) create mode 100644 samples/bpf/trace_ns_info_user.c create mode 100644 samples/bpf/trace_ns_info_user_kern.c create mode 100644 tools/testing/selftests/bpf/progs/test_pidns_kern.c create mode 100644 tools/testing/selftests/bpf/test_pidns.c
fs/internal.h +0 -2
@@ -59,8 +59,6 @@ extern int finish_clean_context(struct fs_context *fc);/* * namei.c */ -extern int filename_lookup (int dfd,struct filename *name,unsigned flags, -struct path *path,struct path *root);extern int user_path_mountpoint_at (int ,const char __user *,unsigned int ,struct path *);extern int vfs_path_lookup (struct dentry *,struct vfsmount *,const char *,unsigned int ,struct path *);
fs/namei.c +0 -1
@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h>
include/linux/bpf.h +1 -0
@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );
include/linux/namei.h +4 -0
@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };
@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned flags, +struct path *path,struct path *root); +static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;
include/uapi/linux/bpf.h +26 -1
@@ -2741,6 +2741,24 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2853,7 +2871,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +1 -0
@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {
kernel/bpf/helpers.c +64 -0
76 lines not on this page · raw message
kernel/trace/bpf_trace.c +2 -0
@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }
samples/bpf/Makefile +3 -0
@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info # Libbpf dependencies LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a
@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.o task_fd_query_user.o $(TRACE_HELPERS) xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o # Tell kbuild to always build the programs always := $(hostprogs-y)
@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.o always += ibumad_kern.o always += hbm_out_kern.o always += hbm_edt_kern.o +always += trace_ns_info_user_kern.o KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/bpf/
samples/bpf/trace_ns_info_user.c new file +35 -0
@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used +* to exercize bpf_get_current_pidns_info() helper call. +*/ +int main (int ac,char **argv) +{ +FILE *f; +char filename[256 ]; + +snprintf (filename,sizeof (filename),"%s_user_kern.o" , argv[0 ]); +printf ("loading %s\n" , filename); + +if (load_bpf_file (filename)) { +printf ("%s" , bpf_log_buf); +return 1 ; + } + + f =popen ("taskset 1 ping localhost" ,"r" ); + (void ) f; +read_trace_pipe (); +return 0 ; +}
samples/bpf/trace_ns_info_user_kern.c new file +44 -0
44 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +26 -1
@@ -2741,6 +2741,24 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2853,7 +2871,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
tools/testing/selftests/bpf/Makefile +1 -1
@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \ - test_sockopt_multi test_tcp_rtt + test_sockopt_multi test_tcp_rtt test_pidns BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES)
tools/testing/selftests/bpf/bpf_helpers.h +3 -0
@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) = (void *)BPF_FUNC_send_signal;static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk,void *ip,int ip_len,void *tcp,int tcp_len) = (void *) BPF_FUNC_tcp_gen_syncookie; +static int (*bpf_get_current_pidns_info)(struct bpf_pidns_info *buf, +unsigned int buf_size) = + (void *) BPF_FUNC_get_current_pidns_info;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions
tools/testing/selftests/bpf/progs/test_pidns_kern.c new file +51 -0
51 lines not on this page · raw message
tools/testing/selftests/bpf/test_pidns.c new file +138 -0
138 lines not on this page · raw message
Signature · 1 line
2.11.0
Quoted 350 lines · Yonghong Song
Quoted 85 lines · Carlos Antonio Neira Bustos
The code has been modified to avoid syscalls that could sleep. Please let me know if any other modification is needed.
From
be0384c0fa209a78c1567936e8db4e35b9a7c0f8Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain namespace data
from current taskThis helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from/proc/self/ns/pid, as in the future it's possible that differentpid_nsfiles may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
Currentlybpf_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 ifbpf_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.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.For example a bcc script using
bpf_get_current_pid_tgid()(tools/funccount.py):u32 pid = bpf_get_current_pid_tgid() >> 32; if (pid != <pid_arg_passed_in>) return 0;Could be modified to use
bpf_get_current_pidns_info()as follows:struct bpf_pidns pidns; bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns)); u32 pid = pidns.tgid; u32 nsid = pidns.nsid; if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>)) return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>--- fs/namei.c | 2 +- include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 29 ++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 78 ++++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 29 ++++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 15 files changed, 418 insertions(+), 4 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.c
create mode 100644samples/bpf/trace_ns_info_user_kern.ccreate mode 100644tools/testing/selftests/bpf/progs/test_pidns_kern.ccreate mode 100644tools/testing/selftests/bpf/test_pidns.cfs/namei.c +0
-1@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h> fs/namei.c int filename_lookup(int dfd, struct filename *name, unsigned flags, · line 2357
Quoted 4 lines
fs/namei.c +1
-0@@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, struct filename *name, unsigned flags,putname (name);return retval; } +EXPORT_SYMBOL (filename_lookup);No need to export symbols. bpf uses it and bpf is in the core, not in modules.
Quoted 28 lines
fs/namei.c +0
-0/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ static int path_parentat(struct nameidata *nd, unsigned flags,include/linux/bpf.h +1
-0@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/linux/namei.h +1
-0@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };include/linux/namei.h extern void unlock_rename(struct dentry *, struct dentry *); · line 102
Quoted 5 lines
include/linux/namei.h +2
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned int flags, +struct path *path,struct path *root);The previous definition in
fs/internal.hshould be removed.Quoted 17 lines
include/linux/namei.h +1
-0+static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;include/uapi/linux/bpf.h +5
-0@@ -2741,6 +2741,26 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. include/uapi/linux/bpf.h union bpf_attr { · line 2758
Quoted 10 lines
include/uapi/linux/bpf.h +10
-0+* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if unable to get ns, pid or tgid of current task. +* Or if size_of_pidns is not valid. Maybe reword by following the code sequence.
if *size_of_pidns* is not valid or unable to get ns, pid or tgid of the current task.include/uapi/linux/bpf.h union bpf_attr { · line 2760
Quoted 2 lines
include/uapi/linux/bpf.h +2
-0+* +* **-ENOMEM** if allocation fails. Maybe some other error codes in
filename_lookup()function?include/uapi/linux/bpf.h union bpf_attr { · line 2763
Quoted 3 lines
include/uapi/linux/bpf.h +3
-0+* +* If unable to get the inode from /proc/self/ns/pid an error code +* will be returned. You do not need this. The description of error code cases should cover this.
Quoted 54 lines
include/uapi/linux/bpf.h +8
-1*/ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2873,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "../../lib/kstrtox.h" kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 324
Quoted 7 lines
kernel/bpf/helpers.c +4
-0@@ -312,6 +318,78 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,preempt_enable (); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *, pidns_info, u32, + size) +{ +const char *name ="/proc/self/ns/pid" ;maybe rename this variable to
pidns_path?kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 326
Quoted 2 lines
kernel/bpf/helpers.c +2
-0+struct pid_namespace *pidns =NULL ; +struct filename *tmp =NULL ;Maybe rename this variable to name?
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 327
Quoted 1 line
kernel/bpf/helpers.c +1
-0+int len =strlen (name) +1 ;We can delay this assignment later until it is needed.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 338
Quoted 11 lines
kernel/bpf/helpers.c +11
-0+struct inode *inode; +struct path kp; +pid_t tgid =0 ; +pid_t pid =0 ; +int ret; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) +return -EINVAL ; + + pidns =task_active_pid_ns (current); +we can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 344
Quoted 6 lines
kernel/bpf/helpers.c +6
-0+if (unlikely (!pidns)) + goto clear; + + pidns_info->nsid = pidns->ns.inum; + pid =task_pid_nr_ns (current, pidns); +We can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 349
Quoted 5 lines
kernel/bpf/helpers.c +5
-0+if (unlikely (!pid)) + goto clear; + + tgid =task_tgid_nr_ns (current, pidns); +ditto. save an empty line.
Quoted 7 lines
kernel/bpf/helpers.c +7
-0+if (unlikely (!tgid)) + goto clear; + + pidns_info->tgid = (u32 ) tgid; + pidns_info->pid = (u32 ) pid; + + tmp =kmem_cache_alloc (names_cachep,GFP_ATOMIC );kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 366
Quoted 10 lines
kernel/bpf/helpers.c +10
-0+if (unlikely (!tmp)) { +memset ((void *)pidns_info,0 , (size_t ) size); +return -ENOMEM ; + } + +memcpy ((char *)tmp->name, name, len); + tmp->uptr =NULL ; + tmp->aname =NULL ; + tmp->refcnt =1 ; +ditto. save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 368
Quoted 2 lines
kernel/bpf/helpers.c +2
-0+ ret =filename_lookup (AT_FDCWD , tmp,0 , &kp,NULL ); +ditto. save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 381
Quoted 13 lines
kernel/bpf/helpers.c +13
-0+if (ret) { +memset ((void *)pidns_info,0 , (size_t ) size); +return ret; + } + + inode =d_backing_inode (kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; + +return 0 ; + +clear: +memset ((void *)pidns_info,0 , (size_t ) size); +save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 386
Quoted 5 lines
kernel/bpf/helpers.c +5
-0+return -EINVAL ; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info,make the "= " aligned with others?
Quoted 31 lines
kernel/bpf/helpers.c +6
-0+ .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE, +}; +#ifdef CONFIG_CGROUPS BPF_CALL_0 (bpf_get_current_cgroup_id) {kernel/trace/bpf_trace.c +2
-0@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }samples/bpf/Makefile +1
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info[...]
Quoted 5 lines · Carlos Antonio Neira Bustos
Yonghong,
I have modified the patch following your feedback. Let me know if I'm missing something.
Yes, I have some other requests about formating.
https://lore.kernel.org/netdev/20190808174848.poybtaagg5ctle7t@dev00/T/#t
Could you address it as well?
Quoted 1,045 lines
Bests
From
70f8d5584700c9cfc82c006901d8ee9595c53f15Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v6 bpf-next] BPF: New helper to obtain namespace data
from current taskThis helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from/proc/self/ns/pid, as in the future it's possible that differentpid_nsfiles may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
Currentlybpf_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 ifbpf_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.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.For example a bcc script using
bpf_get_current_pid_tgid()(tools/funccount.py):u32 pid = bpf_get_current_pid_tgid() >> 32; if (pid != <pid_arg_passed_in>) return 0;Could be modified to use
bpf_get_current_pidns_info()as follows:struct bpf_pidns pidns; bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns)); u32 pid = pidns.tgid; u32 nsid = pidns.nsid; if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>)) return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>--- fs/internal.h | 2 - fs/namei.c | 1 - include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 27 +++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 64 ++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 27 +++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 16 files changed, 399 insertions(+), 6 deletions(-) create mode 100644 samples/bpf/trace_ns_info_user.c create mode 100644 samples/bpf/trace_ns_info_user_kern.c create mode 100644 tools/testing/selftests/bpf/progs/test_pidns_kern.c create mode 100644 tools/testing/selftests/bpf/test_pidns.cfs/internal.h +0
-2@@ -59,8 +59,6 @@ extern int finish_clean_context(struct fs_context *fc);/* * namei.c */ -extern int filename_lookup (int dfd,struct filename *name,unsigned flags, -struct path *path,struct path *root);extern int user_path_mountpoint_at (int ,const char __user *,unsigned int ,struct path *);extern int vfs_path_lookup (struct dentry *,struct vfsmount *,const char *,unsigned int ,struct path *);fs/namei.c +0
-1@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h> include/linux/bpf.h +1
-0@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/linux/namei.h +4
-0@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned flags, +struct path *path,struct path *root); +static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;include/uapi/linux/bpf.h +26
-1@@ -2741,6 +2741,24 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2871,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +64
-0@@ -11,6 +11,12 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "../../lib/kstrtox.h" @@ -312,6 +318,64 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,preempt_enable (); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *, pidns_info, u32, + size) +{ +const char *pidns_path ="/proc/self/ns/pid" ; +struct pid_namespace *pidns =NULL ; +struct filename *tmp =NULL ; +struct inode *inode; +struct path kp; +pid_t tgid =0 ; +pid_t pid =0 ; +int ret; +int len; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) +return -EINVAL ; + pidns =task_active_pid_ns (current); +if (unlikely (!pidns)) + goto clear; + pidns_info->nsid = pidns->ns.inum; + pid =task_pid_nr_ns (current, pidns); +if (unlikely (!pid)) + goto clear; + tgid =task_tgid_nr_ns (current, pidns); +if (unlikely (!tgid)) + goto clear; + pidns_info->tgid = (u32 ) tgid; + pidns_info->pid = (u32 ) pid; + tmp =kmem_cache_alloc (names_cachep,GFP_ATOMIC ); +if (unlikely (!tmp)) { +memset ((void *)pidns_info,0 , (size_t ) size); +return -ENOMEM ; + } + len =strlen (pidns_path) +1 ; +memcpy ((char *)tmp->name, pidns_path, len); + tmp->uptr =NULL ; + tmp->aname =NULL ; + tmp->refcnt =1 ; + ret =filename_lookup (AT_FDCWD , tmp,0 , &kp,NULL ); +if (ret) { +memset ((void *)pidns_info,0 , (size_t ) size); +return ret; + } + inode =d_backing_inode (kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; +return 0 ; +clear: +memset ((void *)pidns_info,0 , (size_t ) size); +return -EINVAL ; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_UNINIT_MEM , + .arg2_type =ARG_CONST_SIZE , +}; +#ifdef CONFIG_CGROUPS BPF_CALL_0 (bpf_get_current_cgroup_id) {kernel/trace/bpf_trace.c +2
-0@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }samples/bpf/Makefile +3
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info # Libbpf dependencies LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.o task_fd_query_user.o $(TRACE_HELPERS) xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o # Tell kbuild to always build the programs always := $(hostprogs-y)@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.o always += ibumad_kern.o always += hbm_out_kern.o always += hbm_edt_kern.o +always += trace_ns_info_user_kern.o KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/bpf/samples/bpf/trace_ns_info_user.c new file +35
-0@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used +* to exercize bpf_get_current_pidns_info() helper call. +*/ +int main (int ac,char **argv) +{ +FILE *f; +char filename[256 ]; + +snprintf (filename,sizeof (filename),"%s_user_kern.o" , argv[0 ]); +printf ("loading %s\n" , filename); + +if (load_bpf_file (filename)) { +printf ("%s" , bpf_log_buf); +return 1 ; + } + + f =popen ("taskset 1 ping localhost" ,"r" ); + (void ) f; +read_trace_pipe (); +return 0 ; +}samples/bpf/trace_ns_info_user_kern.c new file +44
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include <linux/version.h> +#include <uapi/linux/bpf.h> +#include "bpf_helpers.h" + +typedef __u64 u64 ; +typedef __u32 u32 ; + + +/* kprobe is NOT a stable ABI +* kernel functions can be removed, renamed or completely change semantics. +* Number of arguments and their positions can change, etc. +* In such case this bpf+kprobe example will no longer be meaningful +*/ + +/* This will call bpf_get_current_pidns_info() to display pid and ns values +* as seen by the current namespace, on the far left you will see the pid as +* seen as by the root namespace. +*/ + +SEC("kprobe/__netif_receive_skb_core") +int bpf_prog1 (struct pt_regs *ctx) +{ +char fmt[] ="nsid:%u, dev: %u, pid:%u\n" ; +struct bpf_pidns_info nsinfo; +int ok =0 ; + + ok =bpf_get_current_pidns_info (&nsinfo,sizeof (nsinfo)); +if (ok ==0 ) +bpf_trace_printk (fmt,sizeof (fmt), (u32 )nsinfo.nsid, + (u32 ) nsinfo.dev, (u32 )nsinfo.pid); + +return 0 ; +} +char _license[] SEC("license") = "GPL"; +u32 _version SEC("version") = LINUX_VERSION_CODE;tools/include/uapi/linux/bpf.h +26
-1@@ -2741,6 +2741,24 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2871,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ tools/testing/selftests/bpf/Makefile +1
-1@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \ - test_sockopt_multi test_tcp_rtt + test_sockopt_multi test_tcp_rtt test_pidns BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES)tools/testing/selftests/bpf/bpf_helpers.h +3
-0@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) = (void *)BPF_FUNC_send_signal;static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk,void *ip,int ip_len,void *tcp,int tcp_len) = (void *) BPF_FUNC_tcp_gen_syncookie; +static int (*bpf_get_current_pidns_info)(struct bpf_pidns_info *buf, +unsigned int buf_size) = + (void *) BPF_FUNC_get_current_pidns_info;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions tools/testing/selftests/bpf/progs/test_pidns_kern.c new file +51
-0@@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <linux/bpf.h> +#include <errno.h> +#include "bpf_helpers.h" + +struct bpf_map_def SEC("maps") nsidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +struct bpf_map_def SEC("maps") pidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +SEC("tracepoint/syscalls/sys_enter_nanosleep") +int trace (void *ctx) +{ +struct bpf_pidns_info nsinfo; +__u32 key =0 , *expected_pid, *val; +char fmt[] ="ERROR nspid:%d\n" ; + +if (bpf_get_current_pidns_info (&nsinfo,sizeof (nsinfo))) +return -EINVAL ; + + expected_pid =bpf_map_lookup_elem (&pidmap, &key); + + +if (!expected_pid || *expected_pid != nsinfo.pid) +return 0 ; + + val =bpf_map_lookup_elem (&nsidmap, &key); +if (val) + *val = nsinfo.nsid; + +return 0 ; +} + +char _license[] SEC("license") = "GPL"; +__u32 _version SEC("version") = 1;tools/testing/selftests/bpf/test_pidns.c new file +138
-1@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <syscall.h> +#include <unistd.h> +#include <linux/perf_event.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include <linux/bpf.h> +#include <bpf/bpf.h> +#include <bpf/libbpf.h> + +#include "cgroup_helpers.h" +#include "bpf_rlimit.h" + +#define CHECK(condition, tag, format...) ({ \ + int __ret = !!(condition); \ + if (__ret) { \ + printf("%s:FAIL:%s ", __func__, tag); \ + printf(format); \ + } else { \ + printf("%s:PASS:%s\n", __func__, tag); \ + } \ + __ret; \ +}) + +static int bpf_find_map (const char *test,struct bpf_object *obj, +const char *name) +{ +struct bpf_map *map; + + map =bpf_object__find_map_by_name (obj, name); +if (!map) +return -1 ; +return bpf_map__fd (map); +} + + +int main (int argc,char **argv) +{ +const char *probe_name ="syscalls/sys_enter_nanosleep" ; +const char *file ="test_pidns_kern.o" ; +int err, bytes, efd, prog_fd, pmu_fd; +int pidmap_fd, nsidmap_fd; +struct perf_event_attr attr = {}; +struct bpf_object *obj; +__u32 knsid =0 ; +__u32 key =0 , pid; +int exit_code =1 ; +struct stat st; +char buf[256 ]; + + err =bpf_prog_load (file,BPF_PROG_TYPE_TRACEPOINT , &obj, &prog_fd); +if (CHECK (err,"bpf_prog_load" ,"err %d errno %d\n" , err, errno)) + goto cleanup_cgroup_env; + + nsidmap_fd =bpf_find_map (__func__, obj,"nsidmap" ); +if (CHECK (nsidmap_fd <0 ,"bpf_find_map" ,"err %d errno %d\n" , + nsidmap_fd, errno)) + goto close_prog; + + pidmap_fd =bpf_find_map (__func__, obj,"pidmap" ); +if (CHECK (pidmap_fd <0 ,"bpf_find_map" ,"err %d errno %d\n" , + pidmap_fd, errno)) + goto close_prog; + + pid =getpid (); +bpf_map_update_elem (pidmap_fd, &key, &pid,0 ); + +snprintf (buf,sizeof (buf), +"/sys/kernel/debug/tracing/events/%s/id" , probe_name); + efd =open (buf,O_RDONLY ,0 ); +if (CHECK (efd <0 ,"open" ,"err %d errno %d\n" , efd, errno)) + goto close_prog; + bytes =read (efd, buf,sizeof (buf)); +close (efd); +if (CHECK (bytes <=0 || bytes >=sizeof (buf),"read" , +"bytes %d errno %d\n" , bytes, errno)) + goto close_prog; + + attr.config =strtol (buf,NULL ,0 ); + attr.type =PERF_TYPE_TRACEPOINT ; + attr.sample_type =PERF_SAMPLE_RAW ; + attr.sample_period =1 ; + attr.wakeup_events =1 ; + + pmu_fd =syscall (__NR_perf_event_open, &attr,getpid (),-1 ,-1 ,0 ); +if (CHECK (pmu_fd <0 ,"perf_event_open" ,"err %d errno %d\n" , pmu_fd, + errno)) + goto close_prog; + + err =ioctl (pmu_fd,PERF_EVENT_IOC_ENABLE ,0 ); +if (CHECK (err,"perf_event_ioc_enable" ,"err %d errno %d\n" , err, + errno)) + goto close_pmu; + + err =ioctl (pmu_fd,PERF_EVENT_IOC_SET_BPF , prog_fd); +if (CHECK (err,"perf_event_ioc_set_bpf" ,"err %d errno %d\n" , err, + errno)) + goto close_pmu; + +/* trigger some syscalls */ +sleep (1 ); + + err =bpf_map_lookup_elem (nsidmap_fd, &key, &knsid); +if (CHECK (err,"bpf_map_lookup_elem" ,"err %d errno %d\n" , err, errno)) + goto close_pmu; + +if (stat ("/proc/self/ns/pid" , &st)) + goto close_pmu; + +if (CHECK (knsid != (__u32 ) st.st_ino,"compare_namespace_id" , +"kern knsid %u user unsid %u\n" , knsid, (__u32 ) st.st_ino)) + goto close_pmu; + + exit_code =0 ; +printf ("%s:PASS\n" , argv[0 ]); + +close_pmu: +close (pmu_fd); +close_prog: +bpf_object__close (obj); +cleanup_cgroup_env: +return exit_code; +} --2.11.0
Quoted 350 lines · Yonghong Song
Quoted 85 lines · Carlos Antonio Neira Bustos
The code has been modified to avoid syscalls that could sleep. Please let me know if any other modification is needed.
From
be0384c0fa209a78c1567936e8db4e35b9a7c0f8Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain namespace data
from current taskThis helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from/proc/self/ns/pid, as in the future it's possible that differentpid_nsfiles may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
Currentlybpf_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 ifbpf_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.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.For example a bcc script using
bpf_get_current_pid_tgid()(tools/funccount.py):u32 pid = bpf_get_current_pid_tgid() >> 32; if (pid != <pid_arg_passed_in>) return 0;Could be modified to use
bpf_get_current_pidns_info()as follows:struct bpf_pidns pidns; bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns)); u32 pid = pidns.tgid; u32 nsid = pidns.nsid; if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>)) return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>--- fs/namei.c | 2 +- include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 29 ++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 78 ++++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 29 ++++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 15 files changed, 418 insertions(+), 4 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.c
create mode 100644samples/bpf/trace_ns_info_user_kern.ccreate mode 100644tools/testing/selftests/bpf/progs/test_pidns_kern.ccreate mode 100644tools/testing/selftests/bpf/test_pidns.cfs/namei.c +0
-1@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h> fs/namei.c int filename_lookup(int dfd, struct filename *name, unsigned flags, · line 2357
Quoted 4 lines
fs/namei.c +1
-0@@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, struct filename *name, unsigned flags,putname (name);return retval; } +EXPORT_SYMBOL (filename_lookup);No need to export symbols. bpf uses it and bpf is in the core, not in modules.
Quoted 28 lines
fs/namei.c +0
-0/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ static int path_parentat(struct nameidata *nd, unsigned flags,include/linux/bpf.h +1
-0@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/linux/namei.h +1
-0@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };include/linux/namei.h extern void unlock_rename(struct dentry *, struct dentry *); · line 102
Quoted 5 lines
include/linux/namei.h +2
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned int flags, +struct path *path,struct path *root);The previous definition in
fs/internal.hshould be removed.Quoted 17 lines
include/linux/namei.h +1
-0+static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;include/uapi/linux/bpf.h +5
-0@@ -2741,6 +2741,26 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. include/uapi/linux/bpf.h union bpf_attr { · line 2758
Quoted 10 lines
include/uapi/linux/bpf.h +10
-0+* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if unable to get ns, pid or tgid of current task. +* Or if size_of_pidns is not valid. Maybe reword by following the code sequence.
if *size_of_pidns* is not valid or unable to get ns, pid or tgid of the current task.include/uapi/linux/bpf.h union bpf_attr { · line 2760
Quoted 2 lines
include/uapi/linux/bpf.h +2
-0+* +* **-ENOMEM** if allocation fails. Maybe some other error codes in
filename_lookup()function?include/uapi/linux/bpf.h union bpf_attr { · line 2763
Quoted 3 lines
include/uapi/linux/bpf.h +3
-0+* +* If unable to get the inode from /proc/self/ns/pid an error code +* will be returned. You do not need this. The description of error code cases should cover this.
Quoted 54 lines
include/uapi/linux/bpf.h +8
-1*/ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2873,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "../../lib/kstrtox.h" kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 324
Quoted 7 lines
kernel/bpf/helpers.c +4
-0@@ -312,6 +318,78 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,preempt_enable (); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *, pidns_info, u32, + size) +{ +const char *name ="/proc/self/ns/pid" ;maybe rename this variable to
pidns_path?kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 326
Quoted 2 lines
kernel/bpf/helpers.c +2
-0+struct pid_namespace *pidns =NULL ; +struct filename *tmp =NULL ;Maybe rename this variable to name?
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 327
Quoted 1 line
kernel/bpf/helpers.c +1
-0+int len =strlen (name) +1 ;We can delay this assignment later until it is needed.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 378
Quoted 11 lines
kernel/bpf/helpers.c +11
-0+struct inode *inode; +struct path kp; +pid_t tgid =0 ; +pid_t pid =0 ; +int ret; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) +return -EINVAL ; + + pidns =task_active_pid_ns (current); +we can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 378
Quoted 6 lines
kernel/bpf/helpers.c +6
-0+if (unlikely (!pidns)) + goto clear; + + pidns_info->nsid = pidns->ns.inum; + pid =task_pid_nr_ns (current, pidns); +We can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 378
Quoted 5 lines
kernel/bpf/helpers.c +5
-0+if (unlikely (!pid)) + goto clear; + + tgid =task_tgid_nr_ns (current, pidns); +ditto. save an empty line.
Quoted 7 lines
kernel/bpf/helpers.c +7
-0+if (unlikely (!tgid)) + goto clear; + + pidns_info->tgid = (u32 ) tgid; + pidns_info->pid = (u32 ) pid; + + tmp =kmem_cache_alloc (names_cachep,GFP_ATOMIC );kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 366
Quoted 10 lines
kernel/bpf/helpers.c +10
-0+if (unlikely (!tmp)) { +memset ((void *)pidns_info,0 , (size_t ) size); +return -ENOMEM ; + } + +memcpy ((char *)tmp->name, name, len); + tmp->uptr =NULL ; + tmp->aname =NULL ; + tmp->refcnt =1 ; +ditto. save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 368
Quoted 2 lines
kernel/bpf/helpers.c +2
-0+ ret =filename_lookup (AT_FDCWD , tmp,0 , &kp,NULL ); +ditto. save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 381
Quoted 13 lines
kernel/bpf/helpers.c +13
-0+if (ret) { +memset ((void *)pidns_info,0 , (size_t ) size); +return ret; + } + + inode =d_backing_inode (kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; + +return 0 ; + +clear: +memset ((void *)pidns_info,0 , (size_t ) size); +save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 372
Quoted 5 lines
kernel/bpf/helpers.c +5
-0+return -EINVAL ; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info,make the "= " aligned with others?
Quoted 31 lines
kernel/bpf/helpers.c +6
-0+ .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE, +}; +#ifdef CONFIG_CGROUPS BPF_CALL_0 (bpf_get_current_cgroup_id) {kernel/trace/bpf_trace.c +2
-0@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }samples/bpf/Makefile +1
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info[...]
Hi Yonghong,
I'm sorry just to be sure, I'm just missing the error codes from filename_lookup()?. I'll work on that.
Bests
Quoted 15 lines
Quoted 14 lines
Quoted 14 lines
Maybe reword by following the code sequence.
if *size_of_pidns* is not valid or unable to get ns, pid or tgid of the current task.Quoted 2 lines
+ *
+ * **-ENOMEM** if allocation fails.Maybe some other error codes in
filename_lookup()function?Quoted 3 lines
+ *
+ * If unable to get the inode from/proc/self/ns/pidan error code
+ * will be returned.You do not need this. The description of error code cases should cover this.
Quoted 1,057 lines · Y Song
Quoted 5 lines · Carlos Antonio Neira Bustos
Yonghong,
I have modified the patch following your feedback. Let me know if I'm missing something.
Yes, I have some other requests about formating.
https://lore.kernel.org/netdev/20190808174848.poybtaagg5ctle7t@dev00/T/#t
Could you address it as well?Quoted 1,045 lines
Bests
From
70f8d5584700c9cfc82c006901d8ee9595c53f15Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v6 bpf-next] BPF: New helper to obtain namespace data
from current taskThis helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from/proc/self/ns/pid, as in the future it's possible that differentpid_nsfiles may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
Currentlybpf_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 ifbpf_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.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.For example a bcc script using
bpf_get_current_pid_tgid()(tools/funccount.py):u32 pid = bpf_get_current_pid_tgid() >> 32; if (pid != <pid_arg_passed_in>) return 0;Could be modified to use
bpf_get_current_pidns_info()as follows:struct bpf_pidns pidns; bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns)); u32 pid = pidns.tgid; u32 nsid = pidns.nsid; if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>)) return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>--- fs/internal.h | 2 - fs/namei.c | 1 - include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 27 +++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 64 ++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 27 +++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 16 files changed, 399 insertions(+), 6 deletions(-) create mode 100644 samples/bpf/trace_ns_info_user.c create mode 100644 samples/bpf/trace_ns_info_user_kern.c create mode 100644 tools/testing/selftests/bpf/progs/test_pidns_kern.c create mode 100644 tools/testing/selftests/bpf/test_pidns.cfs/internal.h +0
-2@@ -59,8 +59,6 @@ extern int finish_clean_context(struct fs_context *fc);/* * namei.c */ -extern int filename_lookup (int dfd,struct filename *name,unsigned flags, -struct path *path,struct path *root);extern int user_path_mountpoint_at (int ,const char __user *,unsigned int ,struct path *);extern int vfs_path_lookup (struct dentry *,struct vfsmount *,const char *,unsigned int ,struct path *);fs/namei.c +0
-1@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h> include/linux/bpf.h +1
-0@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/linux/namei.h +4
-0@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned flags, +struct path *path,struct path *root); +static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;include/uapi/linux/bpf.h +26
-1@@ -2741,6 +2741,24 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2871,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +64
-0@@ -11,6 +11,12 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "../../lib/kstrtox.h" @@ -312,6 +318,64 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,preempt_enable (); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *, pidns_info, u32, + size) +{ +const char *pidns_path ="/proc/self/ns/pid" ; +struct pid_namespace *pidns =NULL ; +struct filename *tmp =NULL ; +struct inode *inode; +struct path kp; +pid_t tgid =0 ; +pid_t pid =0 ; +int ret; +int len; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) +return -EINVAL ; + pidns =task_active_pid_ns (current); +if (unlikely (!pidns)) + goto clear; + pidns_info->nsid = pidns->ns.inum; + pid =task_pid_nr_ns (current, pidns); +if (unlikely (!pid)) + goto clear; + tgid =task_tgid_nr_ns (current, pidns); +if (unlikely (!tgid)) + goto clear; + pidns_info->tgid = (u32 ) tgid; + pidns_info->pid = (u32 ) pid; + tmp =kmem_cache_alloc (names_cachep,GFP_ATOMIC ); +if (unlikely (!tmp)) { +memset ((void *)pidns_info,0 , (size_t ) size); +return -ENOMEM ; + } + len =strlen (pidns_path) +1 ; +memcpy ((char *)tmp->name, pidns_path, len); + tmp->uptr =NULL ; + tmp->aname =NULL ; + tmp->refcnt =1 ; + ret =filename_lookup (AT_FDCWD , tmp,0 , &kp,NULL ); +if (ret) { +memset ((void *)pidns_info,0 , (size_t ) size); +return ret; + } + inode =d_backing_inode (kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; +return 0 ; +clear: +memset ((void *)pidns_info,0 , (size_t ) size); +return -EINVAL ; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_UNINIT_MEM , + .arg2_type =ARG_CONST_SIZE , +}; +#ifdef CONFIG_CGROUPS BPF_CALL_0 (bpf_get_current_cgroup_id) {kernel/trace/bpf_trace.c +2
-0@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }samples/bpf/Makefile +3
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info # Libbpf dependencies LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.o task_fd_query_user.o $(TRACE_HELPERS) xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o # Tell kbuild to always build the programs always := $(hostprogs-y)@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.o always += ibumad_kern.o always += hbm_out_kern.o always += hbm_edt_kern.o +always += trace_ns_info_user_kern.o KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/bpf/samples/bpf/trace_ns_info_user.c new file +35
-0@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used +* to exercize bpf_get_current_pidns_info() helper call. +*/ +int main (int ac,char **argv) +{ +FILE *f; +char filename[256 ]; + +snprintf (filename,sizeof (filename),"%s_user_kern.o" , argv[0 ]); +printf ("loading %s\n" , filename); + +if (load_bpf_file (filename)) { +printf ("%s" , bpf_log_buf); +return 1 ; + } + + f =popen ("taskset 1 ping localhost" ,"r" ); + (void ) f; +read_trace_pipe (); +return 0 ; +}samples/bpf/trace_ns_info_user_kern.c new file +44
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include <linux/version.h> +#include <uapi/linux/bpf.h> +#include "bpf_helpers.h" + +typedef __u64 u64 ; +typedef __u32 u32 ; + + +/* kprobe is NOT a stable ABI +* kernel functions can be removed, renamed or completely change semantics. +* Number of arguments and their positions can change, etc. +* In such case this bpf+kprobe example will no longer be meaningful +*/ + +/* This will call bpf_get_current_pidns_info() to display pid and ns values +* as seen by the current namespace, on the far left you will see the pid as +* seen as by the root namespace. +*/ + +SEC("kprobe/__netif_receive_skb_core") +int bpf_prog1 (struct pt_regs *ctx) +{ +char fmt[] ="nsid:%u, dev: %u, pid:%u\n" ; +struct bpf_pidns_info nsinfo; +int ok =0 ; + + ok =bpf_get_current_pidns_info (&nsinfo,sizeof (nsinfo)); +if (ok ==0 ) +bpf_trace_printk (fmt,sizeof (fmt), (u32 )nsinfo.nsid, + (u32 ) nsinfo.dev, (u32 )nsinfo.pid); + +return 0 ; +} +char _license[] SEC("license") = "GPL"; +u32 _version SEC("version") = LINUX_VERSION_CODE;tools/include/uapi/linux/bpf.h +26
-1@@ -2741,6 +2741,24 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2871,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ tools/testing/selftests/bpf/Makefile +1
-1@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \ - test_sockopt_multi test_tcp_rtt + test_sockopt_multi test_tcp_rtt test_pidns BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES)tools/testing/selftests/bpf/bpf_helpers.h +3
-0@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) = (void *)BPF_FUNC_send_signal;static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk,void *ip,int ip_len,void *tcp,int tcp_len) = (void *) BPF_FUNC_tcp_gen_syncookie; +static int (*bpf_get_current_pidns_info)(struct bpf_pidns_info *buf, +unsigned int buf_size) = + (void *) BPF_FUNC_get_current_pidns_info;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions tools/testing/selftests/bpf/progs/test_pidns_kern.c new file +51
-0@@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <linux/bpf.h> +#include <errno.h> +#include "bpf_helpers.h" + +struct bpf_map_def SEC("maps") nsidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +struct bpf_map_def SEC("maps") pidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +SEC("tracepoint/syscalls/sys_enter_nanosleep") +int trace (void *ctx) +{ +struct bpf_pidns_info nsinfo; +__u32 key =0 , *expected_pid, *val; +char fmt[] ="ERROR nspid:%d\n" ; + +if (bpf_get_current_pidns_info (&nsinfo,sizeof (nsinfo))) +return -EINVAL ; + + expected_pid =bpf_map_lookup_elem (&pidmap, &key); + + +if (!expected_pid || *expected_pid != nsinfo.pid) +return 0 ; + + val =bpf_map_lookup_elem (&nsidmap, &key); +if (val) + *val = nsinfo.nsid; + +return 0 ; +} + +char _license[] SEC("license") = "GPL"; +__u32 _version SEC("version") = 1;tools/testing/selftests/bpf/test_pidns.c new file +138
-1@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <syscall.h> +#include <unistd.h> +#include <linux/perf_event.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include <linux/bpf.h> +#include <bpf/bpf.h> +#include <bpf/libbpf.h> + +#include "cgroup_helpers.h" +#include "bpf_rlimit.h" + +#define CHECK(condition, tag, format...) ({ \ + int __ret = !!(condition); \ + if (__ret) { \ + printf("%s:FAIL:%s ", __func__, tag); \ + printf(format); \ + } else { \ + printf("%s:PASS:%s\n", __func__, tag); \ + } \ + __ret; \ +}) + +static int bpf_find_map (const char *test,struct bpf_object *obj, +const char *name) +{ +struct bpf_map *map; + + map =bpf_object__find_map_by_name (obj, name); +if (!map) +return -1 ; +return bpf_map__fd (map); +} + + +int main (int argc,char **argv) +{ +const char *probe_name ="syscalls/sys_enter_nanosleep" ; +const char *file ="test_pidns_kern.o" ; +int err, bytes, efd, prog_fd, pmu_fd; +int pidmap_fd, nsidmap_fd; +struct perf_event_attr attr = {}; +struct bpf_object *obj; +__u32 knsid =0 ; +__u32 key =0 , pid; +int exit_code =1 ; +struct stat st; +char buf[256 ]; + + err =bpf_prog_load (file,BPF_PROG_TYPE_TRACEPOINT , &obj, &prog_fd); +if (CHECK (err,"bpf_prog_load" ,"err %d errno %d\n" , err, errno)) + goto cleanup_cgroup_env; + + nsidmap_fd =bpf_find_map (__func__, obj,"nsidmap" ); +if (CHECK (nsidmap_fd <0 ,"bpf_find_map" ,"err %d errno %d\n" , + nsidmap_fd, errno)) + goto close_prog; + + pidmap_fd =bpf_find_map (__func__, obj,"pidmap" ); +if (CHECK (pidmap_fd <0 ,"bpf_find_map" ,"err %d errno %d\n" , + pidmap_fd, errno)) + goto close_prog; + + pid =getpid (); +bpf_map_update_elem (pidmap_fd, &key, &pid,0 ); + +snprintf (buf,sizeof (buf), +"/sys/kernel/debug/tracing/events/%s/id" , probe_name); + efd =open (buf,O_RDONLY ,0 ); +if (CHECK (efd <0 ,"open" ,"err %d errno %d\n" , efd, errno)) + goto close_prog; + bytes =read (efd, buf,sizeof (buf)); +close (efd); +if (CHECK (bytes <=0 || bytes >=sizeof (buf),"read" , +"bytes %d errno %d\n" , bytes, errno)) + goto close_prog; + + attr.config =strtol (buf,NULL ,0 ); + attr.type =PERF_TYPE_TRACEPOINT ; + attr.sample_type =PERF_SAMPLE_RAW ; + attr.sample_period =1 ; + attr.wakeup_events =1 ; + + pmu_fd =syscall (__NR_perf_event_open, &attr,getpid (),-1 ,-1 ,0 ); +if (CHECK (pmu_fd <0 ,"perf_event_open" ,"err %d errno %d\n" , pmu_fd, + errno)) + goto close_prog; + + err =ioctl (pmu_fd,PERF_EVENT_IOC_ENABLE ,0 ); +if (CHECK (err,"perf_event_ioc_enable" ,"err %d errno %d\n" , err, + errno)) + goto close_pmu; + + err =ioctl (pmu_fd,PERF_EVENT_IOC_SET_BPF , prog_fd); +if (CHECK (err,"perf_event_ioc_set_bpf" ,"err %d errno %d\n" , err, + errno)) + goto close_pmu; + +/* trigger some syscalls */ +sleep (1 ); + + err =bpf_map_lookup_elem (nsidmap_fd, &key, &knsid); +if (CHECK (err,"bpf_map_lookup_elem" ,"err %d errno %d\n" , err, errno)) + goto close_pmu; + +if (stat ("/proc/self/ns/pid" , &st)) + goto close_pmu; + +if (CHECK (knsid != (__u32 ) st.st_ino,"compare_namespace_id" , +"kern knsid %u user unsid %u\n" , knsid, (__u32 ) st.st_ino)) + goto close_pmu; + + exit_code =0 ; +printf ("%s:PASS\n" , argv[0 ]); + +close_pmu: +close (pmu_fd); +close_prog: +bpf_object__close (obj); +cleanup_cgroup_env: +return exit_code; +} --2.11.0
Quoted 350 lines · Yonghong Song
Quoted 85 lines · Carlos Antonio Neira Bustos
The code has been modified to avoid syscalls that could sleep. Please let me know if any other modification is needed.
From
be0384c0fa209a78c1567936e8db4e35b9a7c0f8Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain namespace data
from current taskThis helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from/proc/self/ns/pid, as in the future it's possible that differentpid_nsfiles may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
Currentlybpf_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 ifbpf_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.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.For example a bcc script using
bpf_get_current_pid_tgid()(tools/funccount.py):u32 pid = bpf_get_current_pid_tgid() >> 32; if (pid != <pid_arg_passed_in>) return 0;Could be modified to use
bpf_get_current_pidns_info()as follows:struct bpf_pidns pidns; bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns)); u32 pid = pidns.tgid; u32 nsid = pidns.nsid; if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>)) return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>--- fs/namei.c | 2 +- include/linux/bpf.h | 1 + include/linux/namei.h | 4 + include/uapi/linux/bpf.h | 29 ++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 78 ++++++++++++ kernel/trace/bpf_trace.c | 2 + samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/include/uapi/linux/bpf.h | 29 ++++- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 15 files changed, 418 insertions(+), 4 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.c
create mode 100644samples/bpf/trace_ns_info_user_kern.ccreate mode 100644tools/testing/selftests/bpf/progs/test_pidns_kern.ccreate mode 100644tools/testing/selftests/bpf/test_pidns.cfs/namei.c +0
-1@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h> fs/namei.c int filename_lookup(int dfd, struct filename *name, unsigned flags, · line 2357
Quoted 4 lines
fs/namei.c +1
-0@@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, struct filename *name, unsigned flags,putname (name);return retval; } +EXPORT_SYMBOL (filename_lookup);No need to export symbols. bpf uses it and bpf is in the core, not in modules.
Quoted 28 lines
fs/namei.c +0
-0/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ static int path_parentat(struct nameidata *nd, unsigned flags,include/linux/bpf.h +1
-0@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/linux/namei.h +1
-0@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };include/linux/namei.h extern void unlock_rename(struct dentry *, struct dentry *); · line 102
Quoted 5 lines
include/linux/namei.h +2
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned int flags, +struct path *path,struct path *root);The previous definition in
fs/internal.hshould be removed.Quoted 17 lines
include/linux/namei.h +1
-0+static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;include/uapi/linux/bpf.h +5
-0@@ -2741,6 +2741,26 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. include/uapi/linux/bpf.h union bpf_attr { · line 2758
Quoted 10 lines
include/uapi/linux/bpf.h +10
-0+* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if unable to get ns, pid or tgid of current task. +* Or if size_of_pidns is not valid. Maybe reword by following the code sequence.
if *size_of_pidns* is not valid or unable to get ns, pid or tgid of the current task.include/uapi/linux/bpf.h union bpf_attr { · line 2760
Quoted 2 lines
include/uapi/linux/bpf.h +2
-0+* +* **-ENOMEM** if allocation fails. Maybe some other error codes in
filename_lookup()function?include/uapi/linux/bpf.h union bpf_attr { · line 2763
Quoted 3 lines
include/uapi/linux/bpf.h +3
-0+* +* If unable to get the inode from /proc/self/ns/pid an error code +* will be returned. You do not need this. The description of error code cases should cover this.
Quoted 54 lines
include/uapi/linux/bpf.h +8
-1*/ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,7 +2873,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "../../lib/kstrtox.h" kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 324
Quoted 7 lines
kernel/bpf/helpers.c +4
-0@@ -312,6 +318,78 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,preempt_enable (); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *, pidns_info, u32, + size) +{ +const char *name ="/proc/self/ns/pid" ;maybe rename this variable to
pidns_path?kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 326
Quoted 2 lines
kernel/bpf/helpers.c +2
-0+struct pid_namespace *pidns =NULL ; +struct filename *tmp =NULL ;Maybe rename this variable to name?
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 327
Quoted 1 line
kernel/bpf/helpers.c +1
-0+int len =strlen (name) +1 ;We can delay this assignment later until it is needed.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 378
Quoted 11 lines
kernel/bpf/helpers.c +11
-0+struct inode *inode; +struct path kp; +pid_t tgid =0 ; +pid_t pid =0 ; +int ret; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) +return -EINVAL ; + + pidns =task_active_pid_ns (current); +we can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 378
Quoted 6 lines
kernel/bpf/helpers.c +6
-0+if (unlikely (!pidns)) + goto clear; + + pidns_info->nsid = pidns->ns.inum; + pid =task_pid_nr_ns (current, pidns); +We can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 378
Quoted 5 lines
kernel/bpf/helpers.c +5
-0+if (unlikely (!pid)) + goto clear; + + tgid =task_tgid_nr_ns (current, pidns); +ditto. save an empty line.
Quoted 7 lines
kernel/bpf/helpers.c +7
-0+if (unlikely (!tgid)) + goto clear; + + pidns_info->tgid = (u32 ) tgid; + pidns_info->pid = (u32 ) pid; + + tmp =kmem_cache_alloc (names_cachep,GFP_ATOMIC );kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 366
Quoted 10 lines
kernel/bpf/helpers.c +10
-0+if (unlikely (!tmp)) { +memset ((void *)pidns_info,0 , (size_t ) size); +return -ENOMEM ; + } + +memcpy ((char *)tmp->name, name, len); + tmp->uptr =NULL ; + tmp->aname =NULL ; + tmp->refcnt =1 ; +ditto. save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 368
Quoted 2 lines
kernel/bpf/helpers.c +2
-0+ ret =filename_lookup (AT_FDCWD , tmp,0 , &kp,NULL ); +ditto. save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 381
Quoted 13 lines
kernel/bpf/helpers.c +13
-0+if (ret) { +memset ((void *)pidns_info,0 , (size_t ) size); +return ret; + } + + inode =d_backing_inode (kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; + +return 0 ; + +clear: +memset ((void *)pidns_info,0 , (size_t ) size); +save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 372
Quoted 5 lines
kernel/bpf/helpers.c +5
-0+return -EINVAL ; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info,make the "= " aligned with others?
Quoted 31 lines
kernel/bpf/helpers.c +6
-0+ .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE, +}; +#ifdef CONFIG_CGROUPS BPF_CALL_0 (bpf_get_current_cgroup_id) {kernel/trace/bpf_trace.c +2
-0@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }samples/bpf/Makefile +1
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info[...]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v5 bpf-next] BPF: helpers: New helper to obtain namespacedata from current task
Quoted 4 lines · carlos antonio neira bustos
Hi Yonghong,
I’m sorry, just to be sure, I’m just missing the error codes from
filename_lookup()right ?.
From kernel functionality point of view. Yes, I am talking about
error codes returned by filename_lookup().
For example, if CONFIG_PID_NS or CONFIG_NAMESPACES is not defined in the config, the path "/proc/self/ns/pid" will not exist, the error code will return. It may be -ENOTDIR
if CONFIG_NAMESPACES not defined or -ECHILD if CONFIG_PID_NS is not defined. Please double check.
Please do follow the advice in
to break the single patch to multiple patches.
I only reviewed the kernel code. Will review tools/ code in the next properly-formatted (broken-up) commits.
Also, please also cc commits to bpf mailing list at [email protected]
Quoted 2,231 lines
Bests
Maybe some other error codes in
filename_lookup()function?Quoted 3 lines
+ *
+ * If unable to get the inode from
/proc/self/ns/pidan error codeQuoted 1 line
+ * will be returned.
*From: *Y Song <mailto:[email protected]>
*Sent: *08 August 2019 15:44
*To: *Carlos Antonio Neira Bustos <mailto:[email protected]> *Cc: *Yonghong Song <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>
*Subject: *Re: [PATCH v5 bpf-next] BPF: helpers: New helper to obtain namespacedata from current taskOn Thu, Aug 8, 2019 at 10:52 AM Carlos Antonio Neira Bustos
Quoted 9 lines · <[email protected]> wrote:
Yonghong,
I have modified the patch following your feedback.
Let me know if I'm missing something.
Yes, I have some other requests about formating.
https://lore.kernel.org/netdev/20190808174848.poybtaagg5ctle7t@dev00/T/#t
Could you address it as well?
Quoted 6 lines
Bests
Quoted 7 lines
From
70f8d5584700c9cfc82c006901d8ee9595c53f15Mon Sep 17 00:00:00 2001From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v6 bpf-next] BPF: New helper to obtain
namespace data
Quoted 5 lines
from current task
This helper obtains the active namespace from current and returns
pid, tgid,
Quoted 1 line
device and namespace id as seen from that namespace, allowing to
instrument
Quoted 3 lines
a process inside a container.
Device is read from
/proc/self/ns/pid, as in the future it's possiblethat
Quoted 3 lines
different
pid_nsfiles may belong to different devices, accordingto the discussion between Eric Biederman and Yonghong in 2017 linux
plumbers
Quoted 3 lines
conference.
Currently
bpf_get_current_pid_tgid(), is used to do pid filtering inbcc's
Quoted 1 line
scripts but this helper returns the pid as seen by the root namespace
which is
Quoted 3 lines
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
Quoted 1 line
if
bpf_get_current_pid_tgid()is used. This helper addresses thislimitation
Quoted 1 line
returning the pid as it's seen by the current namespace where the
script is
Quoted 5 lines
executing.
This helper has the same use cases as
bpf_get_current_pid_tgid()asit can be
Quoted 5 lines
used to do pid filtering even inside a container.
For example a bcc script using
bpf_get_current_pid_tgid()(
tools/funccount.py):Quoted 14 lines
u32 pid =
bpf_get_current_pid_tgid()>> 32;if (pid != <
pid_arg_passed_in>)return 0;
Could be modified to use
bpf_get_current_pidns_info()as follows:struct
bpf_pidnspidns;Quoted 7 lines
bpf_get_current_pidns_info(&pidns,
sizeof(struct bpf_pidns));u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <
pid_arg_passed_in>) && (nsid !=<
nsid_arg_passed_in>))Quoted 5 lines
return 0;
To find out the name PID namespace id of a process, you could use
this command:
Quoted 42 lines
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>---
fs/internal.h | 2 -
fs/namei.c | 1 -
include/linux/bpf.h | 1 +
include/linux/namei.h | 4 +
include/uapi/linux/bpf.h | 27 +++-
kernel/bpf/core.c | 1 +
kernel/bpf/helpers.c | 64 ++++++++++
kernel/trace/bpf_trace.c | 2 +
samples/bpf/Makefile | 3 +
samples/bpf/trace_ns_info_user.c | 35 ++++++
samples/bpf/trace_ns_info_user_kern.c | 44 +++++++
tools/include/uapi/linux/bpf.h | 27 +++-
Quoted 7 lines
tools/testing/selftests/bpf/Makefile | 2 +-
tools/testing/selftests/bpf/bpf_helpers.h | 3 +
.../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++
tools/testing/selftests/bpf/test_pidns.c | 138
+++++++++++++++++++++
Quoted 21 lines
16 files changed, 399 insertions(+), 6 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.ccreate mode 100644
samples/bpf/trace_ns_info_user_kern.ccreate mode 100644
tools/testing/selftests/bpf/progs/test_pidns_kern.ccreate mode 100644
tools/testing/selftests/bpf/test_pidns.cfs/internal.h +0
-0index
315fcd8d237c..6647e15dd419100644---
a/fs/internal.h+++
b/fs/internal.hfs/internal.h extern int finish_clean_context(struct fs_context *fc);
Quoted 8 lines
fs/internal.h +0
-1@@ -59,8 +59,6 @@ extern int finish_clean_context(struct fs_context *fc); /** namei.c */ -extern int filename_lookup(int dfd, struct filename *name, unsignedflags,
Quoted 3 lines
- struct path *path, struct path *root);
extern int user_path_mountpoint_at(int, const char
__user*,unsigned int, struct path *);
include/linux/bpf.h extern const struct bpf_func_proto
Quoted 37 lines
extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
const char *, unsigned int, struct path *);
fs/namei.c +0
-0index
209c51a5226c..a89fc72a4a10100644---
a/fs/namei.c+++
b/fs/namei.cfs/namei.c +0
-1@@ -19,7 +19,6 @@ #include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <
linux/namei.h>#include <
linux/pagemap.h>#include <
linux/fsnotify.h>include/linux/bpf.h +0
-0index
f9a506147c8a..e4adf5e05afd100644---
a/include/linux/bpf.h+++
b/include/linux/bpf.hinclude/linux/bpf.h +0
-0@@ -1050,6 +1050,7 @@ extern const struct bpf_func_proto
bpf_get_local_storage_proto;include/linux/namei.h extern void unlock_rename(struct dentry *, struct
Quoted 39 lines
include/linux/bpf.h +1
-0extern 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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */
void
bpf_user_rnd_init_once(void);include/linux/namei.h +0
-0index
9138b4471dbf..b45c8b6f7cb4100644---
a/include/linux/namei.h+++
b/include/linux/namei.hinclude/linux/namei.h +1
-0@@ -6,6 +6,7 @@ #include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {
MAX_NESTED_LINKS= 8 };include/linux/namei.h +0
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, structdentry *);
include/linux/namei.h extern void unlock_rename(struct dentry *, struct · line 102
Quoted 7 lines
include/linux/namei.h +1
-0extern void nd_jump_link(struct path *path); +extern int filename_lookup(int dfd, struct filename *name, unsignedflags,
Quoted 5 lines
include/linux/namei.h +2
-0+ struct path *path, struct path *root); +static inline void nd_terminate_link(void *name,
size_tlen,size_tmaxlen)
Quoted 13 lines
{
((char *) name)[min(len, maxlen)] = '\0';
include/uapi/linux/bpf.h +0
-0index
4393bd4b2419..b0d4869fb860100644---
a/include/uapi/linux/bpf.h+++
b/include/uapi/linux/bpf.hinclude/uapi/linux/bpf.h union bpf_attr { · line 2742
Quoted 2 lines
include/uapi/linux/bpf.h +0
-0@@ -2741,6 +2741,24 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does not enableSYN cookies
include/uapi/linux/bpf.h union bpf_attr {
Quoted 7 lines
include/uapi/linux/bpf.h +2
-0* * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 + * + * int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
+ * Description
+ * Copies into *pidns* pid, namespace id and tgid as
seen by the
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if *size_of_pidns* is not valid or unable
to get ns, pid
Quoted 30 lines
+ * or tgid of the current task.
+ *
+ * **-ENOMEM** if allocation fails.
+ *
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
include/uapi/linux/bpf.h +2
-1@@ -2853,7 +2871,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_current_pidns_info),Quoted 1 line
/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
kernel/bpf/core.c const struct bpf_func_proto
Quoted 33 lines
* function eBPF program intends to call
include/uapi/linux/bpf.h +6
-0@@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +0
-0index
8191a7db2777..3159f2a0188c100644---
a/kernel/bpf/core.c+++
b/kernel/bpf/core.ckernel/bpf/core.c +0
-0@@ -2038,6 +2038,7 @@ const struct bpf_func_proto
bpf_get_current_uid_gid_proto__weak;kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map,
Quoted 49 lines
kernel/bpf/core.c +1
-0const 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_current_pidns_info__weak ;const struct
bpf_func_proto*__weakbpf_get_trace_printk_proto(void){
kernel/bpf/helpers.c +0
-0index
5e28718928ca..41fbf1f28a48100644---
a/kernel/bpf/helpers.c+++
b/kernel/bpf/helpers.ckernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@ #include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "
../../lib/kstrtox.h"kernel/bpf/helpers.c +0
-0@@ -312,6 +318,64 @@ void copy_map_value_locked(struct bpf_map *map,void *dst, void *src,
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, · line 324
Quoted 7 lines
kernel/bpf/helpers.c +1
-0preempt_enable(); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *,
pidns_info, u32,kernel/trace/bpf_trace.c tracing_func_proto(enum bpf_func_id func_id,
Quoted 129 lines
kernel/bpf/helpers.c +57
-0+ size) +{ + const char *pidns_path = "/proc/self/ns/pid"; + struct pid_namespace *pidns = NULL; + struct filename *tmp = NULL; + struct inode *inode; + struct path kp; + pid_t tgid = 0; + pid_t pid = 0; + int ret; + int len; + + if (unlikely(size != sizeof(struct bpf_pidns_info))) + return -EINVAL; + pidns = task_active_pid_ns(current); + if (unlikely(!pidns)) + goto clear; + pidns_info->nsid = pidns->ns.inum; + pid = task_pid_nr_ns(current, pidns); + if (unlikely(!pid)) + goto clear; + tgid = task_tgid_nr_ns(current, pidns); + if (unlikely(!tgid)) + goto clear; + pidns_info->tgid = (u32) tgid; + pidns_info->pid = (u32) pid; + tmp = kmem_cache_alloc(names_cachep, GFP_ATOMIC); + if (unlikely(!tmp)) { + memset((void *)pidns_info, 0, (size_t) size); + return -ENOMEM; + } + len = strlen(pidns_path) + 1; + memcpy((char *)tmp->name, pidns_path, len); + tmp->uptr = NULL; + tmp->aname = NULL; + tmp->refcnt = 1; + ret = filename_lookup(AT_FDCWD, tmp, 0, &kp, NULL); + if (ret) { + memset((void *)pidns_info, 0, (size_t) size); + return ret; + } + inode = d_backing_inode(kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; + return 0; +clear: + memset((void *)pidns_info, 0, (size_t) size); + return -EINVAL; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE, +}; +#ifdef
CONFIG_CGROUPS
BPF_CALL_0(bpf_get_current_cgroup_id){
kernel/trace/bpf_trace.c +0
-0index
ca1255d14576..5e1dc22765a5100644---
a/kernel/trace/bpf_trace.c+++
b/kernel/trace/bpf_trace.ckernel/trace/bpf_trace.c +0
-0@@ -709,6 +709,8 @@ tracing_func_proto(enum bpf_func_id func_id,const struct
bpf_prog*prog)samples/bpf/Makefile task_fd_query-objs := bpf_load.o
Quoted 41 lines
kernel/trace/bpf_trace.c +0
-0#endifcase
BPF_FUNC_send_signal:return
&bpf_send_signal_proto;+ case
BPF_FUNC_get_current_pidns_info:+ return
&bpf_get_current_pidns_info_proto;default:
return NULL;
}
samples/bpf/Makefile +0
-0index
1d9be26b4edd..238453ff27d2100644--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
samples/bpf/Makefile +0
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_queryhostprogs-y +=
xdp_sample_pktshostprogs-y += ibumad
hostprogs-y += hbm
+hostprogs-y +=
trace_ns_info# Libbpf dependencies
LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a
samples/bpf/Makefile +0
-0@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.otask_fd_query_user.o $(TRACE_HELPERS)
Quoted 26 lines
samples/bpf/Makefile +1
-0xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o# Tell kbuild to always build the programs
always := $(hostprogs-y)
samples/bpf/Makefile +0
-0@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.oalways += ibumad_kern.o
always += hbm_out_kern.o
always += hbm_edt_kern.o
+always += trace_ns_info_user_kern.o
Review
Quoted 5 lines
KBUILD_HOSTCFLAGS+= -I$(objtree)/usr/include
KBUILD_HOSTCFLAGS+= -I$(srctree)/tools/lib/bpf/(quoted diff) +0
-0
b/samples/bpf/trace_ns_info_user.cReview
Quoted 81 lines
new file mode 100644
index 000000000000..e06d08db6f30
---
/dev/null+++
b/samples/bpf/trace_ns_info_user.csamples/bpf/Makefile +35
-0@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used + * to exercize bpf_get_current_pidns_info() helper call. + */ +int main(int ac, char **argv) +{ + FILE *f; + char filename[256]; + + snprintf(filename, sizeof(filename), "%s_user_kern.o", argv[0]); + printf("loading %s\n", filename); + + if (load_bpf_file(filename)) { + printf("%s", bpf_log_buf); + return 1; + } + + f = popen("taskset 1 ping localhost", "r"); + (void) f; + read_trace_pipe(); + return 0; +}(quoted diff) +0
-0
b/samples/bpf/trace_ns_info_user_kern.cQuoted 37 lines
new file mode 100644
index 000000000000..96675e02b707
---
/dev/null+++
b/samples/bpf/trace_ns_info_user_kern.c(quoted diff) +14
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include <linux/version.h> +#include <uapi/linux/bpf.h> +#include "bpf_helpers.h" + +typedef __u64 u64;Review
Quoted 10 lines
(quoted diff) +5
-0+typedef __u32 u32; + + +/* kprobe is NOT a stable ABI + * kernel functions can be removed, renamed or completely changesemantics.
kernel/bpf/helpers.c
Quoted 9 lines
+ * Number of arguments and their positions can change, etc.
+ * In such case this bpf+kprobe example will no longer be meaningful
+ */
kernel/bpf/helpers.c +2
-0+ +/* This will call bpf_get_current_pidns_info() to display pid and ns values
Quoted 1 line
+ * as seen by the current namespace, on the far left you will see
the pid as
Review
Quoted 39 lines
+ * seen as by the root namespace.
+ */
samples/bpf/trace_ns_info_user_kern.c new file +17
-0+ +SEC("kprobe/__netif_receive_skb_core") +int bpf_prog1 (struct pt_regs *ctx) +{ + char fmt[] = "nsid:%u, dev: %u, pid:%u\n"; + struct bpf_pidns_info nsinfo; + int ok = 0; + + ok = bpf_get_current_pidns_info(&nsinfo, sizeof(nsinfo)); + if (ok == 0) + bpf_trace_printk(fmt, sizeof(fmt), (u32)nsinfo.nsid, + (u32) nsinfo.dev, (u32)nsinfo.pid); + + return 0; +} +char _license[] SEC("license") = "GPL"; +u32 _version SEC("version") = LINUX_VERSION_CODE;(quoted diff) +0
-0
b/tools/include/uapi/linux/bpf.hReview union bpf_attr { · line 2742
Quoted 9 lines
index
4393bd4b2419..b0d4869fb860100644---
a/tools/include/uapi/linux/bpf.h+++
b/tools/include/uapi/linux/bpf.h(quoted diff) +0
-0@@ -2741,6 +2741,24 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does not enableSYN cookies
Review union bpf_attr {
Quoted 7 lines
(quoted diff) +2
-0* * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 + * + * int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
+ * Description
+ * Copies into *pidns* pid, namespace id and tgid as
seen by the
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if *size_of_pidns* is not valid or unable
to get ns, pid
Quoted 30 lines
+ * or tgid of the current task.
+ *
+ * **-ENOMEM** if allocation fails.
+ *
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
(quoted diff) +2
-1@@ -2853,7 +2871,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_current_pidns_info),Quoted 1 line
/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
Quoted 22 lines
* function eBPF program intends to call
include/uapi/linux/bpf.h +6
-0@@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};Review
Quoted 3 lines
#endif /* _UAPI__LINUX_BPF_H__ */
(quoted diff) +0
-0b/tools/testing/selftests/bpf/Makefile
Review TEST_GEN_PROGS = test_verifier test_tag test_maps
Quoted 7 lines
index
3bd0f4a0336a..1f97b571b581100644--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
(quoted diff) +0
-0@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps
test_lru_maptest_lpm_maptestQuoted 3 lines
tools/testing/selftests/bpf/Makefile +0
-0test_cgroup_storage test_select_reuseport test_section_names \
test_netcnttest_tcpnotify_usertest_sock_fieldstest_sysctl
test_hashmap\Quoted 1 line
test_btf_dumptest_cgroup_attachxdpingtest_sockopt
test_sockopt_sk\Review
Quoted 11 lines
-
test_sockopt_multitest_tcp_rtt+
test_sockopt_multitest_tcp_rtttest_pidns
BPF_OBJ_FILES= $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
TEST_GEN_FILES= $(BPF_OBJ_FILES)(quoted diff) +0
-0
b/tools/testing/selftests/bpf/bpf_helpers.hReview static int (*bpf_send_signal)(unsigned sig) =
Quoted 7 lines
index
120aa86c58d3..c96795a9d983100644---
a/tools/testing/selftests/bpf/bpf_helpers.h+++
b/tools/testing/selftests/bpf/bpf_helpers.h(quoted diff) +0
-0@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) =(void *)BPF_FUNC_send_signal;
Quoted 3 lines
tools/testing/selftests/bpf/bpf_helpers.h +0
-0static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk, void *ip,int
ip_len, void *tcp, int
tcp_len) =Quoted 10 lines
(void *)
BPF_FUNC_tcp_gen_syncookie;+static int (*bpf_get_current_pidns_info)(struct
bpf_pidns_info*buf,+ unsigned int
buf_size) =+ (void *)
BPF_FUNC_get_current_pidns_info;Review
Quoted 5 lines
/* llvm builtin functions that eBPF C program may use to
* emit
BPF_LD_ABSandBPF_LD_INDinstructions(quoted diff) +0
-0
b/tools/testing/selftests/bpf/progs/test_pidns_kern.cReview
Quoted 113 lines
new file mode 100644
index 000000000000..e1d2facfa762
---
/dev/null+++
b/tools/testing/selftests/bpf/progs/test_pidns_kern.ctools/testing/selftests/bpf/progs/test_pidns_kern.c new file +51
-0@@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <linux/bpf.h> +#include <errno.h> +#include "bpf_helpers.h" + +struct bpf_map_def SEC("maps") nsidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +struct bpf_map_def SEC("maps") pidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +SEC("tracepoint/syscalls/sys_enter_nanosleep") +int trace (void *ctx) +{ + struct bpf_pidns_info nsinfo; + __u32 key = 0, *expected_pid, *val; + char fmt[] = "ERROR nspid:%d\n"; + + if (bpf_get_current_pidns_info(&nsinfo, sizeof(nsinfo))) + return -EINVAL; + + expected_pid = bpf_map_lookup_elem(&pidmap, &key); + + + if (!expected_pid || *expected_pid != nsinfo.pid) + return 0; + + val = bpf_map_lookup_elem(&nsidmap, &key); + if (val) + *val = nsinfo.nsid; + + return 0; +} + +char _license[] SEC("license") = "GPL"; +__u32 _version SEC("version") = 1;(quoted diff) +0
-0
b/tools/testing/selftests/bpf/test_pidns.cQuoted 131 lines
new file mode 100644
index 000000000000..a7254055f294
---
/dev/null+++
b/tools/testing/selftests/bpf/test_pidns.c(quoted diff) +61
-0@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <syscall.h> +#include <unistd.h> +#include <linux/perf_event.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include <linux/bpf.h> +#include <bpf/bpf.h> +#include <bpf/libbpf.h> + +#include "cgroup_helpers.h" +#include "bpf_rlimit.h" + +#define CHECK(condition, tag, format...) ({ \ + int __ret = !!(condition); \ + if (__ret) { \ + printf("%s:FAIL:%s ", __func__, tag); \ + printf(format); \ + } else { \ + printf("%s:PASS:%s\n", __func__, tag); \ + } \ + __ret; \ +}) + +static int bpf_find_map(const char *test, struct bpf_object *obj, + const char *name) +{ + struct bpf_map *map; + + map = bpf_object__find_map_by_name(obj, name); + if (!map) + return -1; + return bpf_map__fd(map); +} + + +int main(int argc, char **argv) +{ + const char *probe_name = "syscalls/sys_enter_nanosleep"; + const char *file = "test_pidns_kern.o"; + int err, bytes, efd, prog_fd, pmu_fd; + int pidmap_fd, nsidmap_fd; + struct perf_event_attr attr = {}; + struct bpf_object *obj; + __u32 knsid = 0; + __u32 key = 0, pid;Review
Quoted 10 lines
(quoted diff) +5
-0+ int exit_code = 1; + struct stat st; + char buf[256]; + + err = bpf_prog_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj,
&prog_fd);Quoted 57 lines
+ if (
CHECK(err, "bpf_prog_load", "err %d errno %d\n", err, errno))+ goto
cleanup_cgroup_env;(quoted diff) +27
-0+ + nsidmap_fd = bpf_find_map(__func__, obj, "nsidmap"); + if (CHECK(nsidmap_fd < 0, "bpf_find_map", "err %d errno %d\n", + nsidmap_fd, errno)) + goto close_prog; + + pidmap_fd = bpf_find_map(__func__, obj, "pidmap"); + if (CHECK(pidmap_fd < 0, "bpf_find_map", "err %d errno %d\n", + pidmap_fd, errno)) + goto close_prog; + + pid = getpid(); + bpf_map_update_elem(pidmap_fd, &key, &pid, 0); + + snprintf(buf, sizeof(buf), + "/sys/kernel/debug/tracing/events/%s/id", probe_name); + efd = open(buf, O_RDONLY, 0); + if (CHECK(efd < 0, "open", "err %d errno %d\n", efd, errno)) + goto close_prog; + bytes = read(efd, buf, sizeof(buf)); + close(efd); + if (CHECK(bytes <= 0 || bytes >= sizeof(buf), "read", + "bytes %d errno %d\n", bytes, errno)) + goto close_prog; + + attr.config = strtol(buf, NULL, 0); + attr.type = PERF_TYPE_TRACEPOINT;Review
Quoted 10 lines
(quoted diff) +5
-0+ attr.sample_type = PERF_SAMPLE_RAW; + attr.sample_period = 1; + attr.wakeup_events = 1; + + pmu_fd = syscall(__NR_perf_event_open, &attr, getpid(), -1,-1, 0);
Quoted 1 line
+ if (CHECK(pmu_fd < 0, "
perf_event_open", "err %d errno %d\n",
pmu_fd,Quoted 9 lines
+ errno))
+ goto
close_prog;(quoted diff) +3
-0+ + err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0); + if (CHECK(err, "perf_event_ioc_enable", "err %d errno %d\n", err,Review
Quoted 10 lines
(quoted diff) +5
-0+ errno)) + goto close_pmu; + + err = ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd); + if (CHECK(err, "perf_event_ioc_set_bpf", "err %d errno %d\n",err,
Quoted 5 lines
+ errno))
+ goto
close_pmu;(quoted diff) +1
-0+Review
Quoted 10 lines
(quoted diff) +5
-0+ /* trigger some syscalls */ + sleep(1); + + err = bpf_map_lookup_elem(nsidmap_fd, &key, &knsid); + if (CHECK(err, "bpf_map_lookup_elem", "err %d errno %d\n",err, errno))
Review
Quoted 13 lines
+ goto
close_pmu;(quoted diff) +6
-0+ + if (stat("/proc/self/ns/pid", &st)) + goto close_pmu; + + if (CHECK(knsid != (__u32) st.st_ino, "compare_namespace_id", + "kern knsid %u user unsid %u\n", knsid, (__u32)st.st_ino))
Quoted 40 lines
+ goto
close_pmu;(quoted diff) +11
-1+ + exit_code = 0; + printf("%s:PASS\n", argv[0]); + +close_pmu: + close(pmu_fd); +close_prog: + bpf_object__close(obj); +cleanup_cgroup_env: + return exit_code; +} --2.11.0
Quoted 15 lines
Quoted 13 lines · Yonghong Song
Quoted 7 lines · Carlos Antonio Neira Bustos
The code has been modified to avoid syscalls that could sleep.
Please let me know if any other modification is needed.
From
be0384c0fa209a78c1567936e8db4e35b9a7c0f8Mon Sep 1700:00:00 2001
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain
namespace data
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
from current task
This helper obtains the active namespace from current and returns
pid, tgid,
Quoted 1 line
Quoted 1 line
Quoted 1 line
device and namespace id as seen from that namespace, allowing to
instrument
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
a process inside a container.
Device is read from
/proc/self/ns/pid, as in the future it'spossible that
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
different
pid_nsfiles may belong to different devices, accordingto the discussion between Eric Biederman and Yonghong in 2017
linux plumbers
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
conference.
Currently
bpf_get_current_pid_tgid(), is used to do pid filteringin bcc's
Quoted 1 line
Quoted 1 line
Quoted 1 line
scripts but this helper returns the pid as seen by the root
namespace which is
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
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
Quoted 1 line
Quoted 1 line
Quoted 1 line
if
bpf_get_current_pid_tgid()is used. This helper addresses thislimitation
Quoted 1 line
Quoted 1 line
Quoted 1 line
returning the pid as it's seen by the current namespace where the
script is
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
executing.
This helper has the same use cases as
bpf_get_current_pid_tgid()as it can be
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
used to do pid filtering even inside a container.
For example a bcc script using
bpf_get_current_pid_tgid()(
tools/funccount.py):Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
u32 pid =
bpf_get_current_pid_tgid()>> 32;if (pid != <
pid_arg_passed_in>)return 0;
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Could be modified to use
bpf_get_current_pidns_info()as follows:struct
bpf_pidnspidns;bpf_get_current_pidns_info(&pidns, sizeof(struct
bpf_pidns));Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <
pid_arg_passed_in>) && (nsid !=<
nsid_arg_passed_in>))Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
return 0;
To find out the name PID namespace id of a process, you could use
this command:
Quoted 22 lines
Quoted 21 lines
Quoted 21 lines
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>---
fs/namei.c | 2 +-
include/linux/bpf.h | 1 +
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
include/linux/namei.h | 4 +
include/uapi/linux/bpf.h | 29 ++++-
kernel/bpf/core.c | 1 +
kernel/bpf/helpers.c | 78
++++++++++++
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
kernel/trace/bpf_trace.c | 2 +
samples/bpf/Makefile | 3 +
samples/bpf/trace_ns_info_user.c | 35 ++++++
samples/bpf/trace_ns_info_user_kern.c | 44 +++++++
tools/include/uapi/linux/bpf.h | 29 ++++-
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
tools/testing/selftests/bpf/Makefile | 2 +-
tools/testing/selftests/bpf/bpf_helpers.h | 3 +
.../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++
tools/testing/selftests/bpf/test_pidns.c | 138
+++++++++++++++++++++
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
15 files changed, 418 insertions(+), 4 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.ccreate mode 100644
samples/bpf/trace_ns_info_user_kern.ccreate mode 100644
tools/testing/selftests/bpf/progs/test_pidns_kern.cQuoted 22 lines
Quoted 21 lines
Quoted 21 lines
create mode 100644
tools/testing/selftests/bpf/test_pidns.cfs/namei.c +0
-0index
209c51a5226c..d1eca36972d2100644---
a/fs/namei.c+++
b/fs/namei.cfs/namei.c +0
-1@@ -19,7 +19,6 @@ #include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> Quoted 7 lines
Quoted 7 lines
fs/namei.c int filename_lookup(int dfd, struct
Quoted 7 lines
#include <
linux/namei.h>#include <
linux/pagemap.h>#include <
linux/fsnotify.h>fs/namei.c +0
-0@@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, structfilename *name, unsigned flags,
Quoted 12 lines
Quoted 11 lines
fs/namei.c int filename_lookup(int dfd, struct · line 2360
Quoted 7 lines
fs/namei.c +1
-0putname(name); return retval; } +EXPORT_SYMBOL (filename_lookup);No need to export symbols. bpf uses it and bpf is in the core, not in
Quoted 7 lines
Quoted 7 lines
modules.
Quoted 3 lines
/* Returns 0 and nd will be valid on success; Retuns error,
otherwise. */
Quoted 11 lines
Quoted 11 lines
include/linux/bpf.h extern const struct bpf_func_proto
Quoted 11 lines
static int path_parentat(struct nameidata *nd, unsigned flags,
include/linux/bpf.h +0
-0index
f9a506147c8a..e4adf5e05afd100644---
a/include/linux/bpf.h+++
b/include/linux/bpf.hinclude/linux/bpf.h +0
-0@@ -1050,6 +1050,7 @@ extern const struct bpf_func_proto
bpf_get_local_storage_proto;Quoted 34 lines
Quoted 33 lines
Quoted 33 lines
include/linux/bpf.h +1
-0extern 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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */
void
bpf_user_rnd_init_once(void);include/linux/namei.h +0
-0index
9138b4471dbf..2c24e8c71d46100644---
a/include/linux/namei.h+++
b/include/linux/namei.hinclude/linux/namei.h +1
-0@@ -6,6 +6,7 @@ #include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> Quoted 5 lines
Quoted 5 lines
include/linux/namei.h extern void unlock_rename(struct dentry *,
Quoted 5 lines
enum {
MAX_NESTED_LINKS= 8 };include/linux/namei.h +0
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *,struct dentry *);
Quoted 7 lines
Quoted 7 lines
include/linux/namei.h extern void unlock_rename(struct dentry *, · line 102
Quoted 7 lines
include/linux/namei.h +1
-0extern void nd_jump_link(struct path *path); +extern int filename_lookup(int dfd, struct filename *name,unsigned int flags,
Quoted 11 lines
Quoted 11 lines
include/linux/namei.h extern void unlock_rename(struct dentry *, struct dentry *); · line 102
Quoted 1 line
include/linux/namei.h +1
-0+ struct path *path, struct path *root);The previous definition in
fs/internal.hshould be removed.Quoted 3 lines
include/linux/namei.h +1
-0+ static inline void nd_terminate_link(void *name, size_t len,
size_tmaxlen)Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
{
((char *) name)[min(len, maxlen)] = '\0';
include/uapi/linux/bpf.h +0
-0index
4393bd4b2419..6f601f7106e2100644Quoted 7 lines
Quoted 7 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2742
Quoted 7 lines
---
a/include/uapi/linux/bpf.h+++
b/include/uapi/linux/bpf.hinclude/uapi/linux/bpf.h +0
-0@@ -2741,6 +2741,26 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does notenable SYN cookies
Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2745
Quoted 3 lines
include/uapi/linux/bpf.h +0
-0* * **-EPROTONOSUPPORT** IP packet version is not4 or 6
Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2748
Quoted 3 lines
include/uapi/linux/bpf.h +2
-0+* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr {
Quoted 3 lines
include/uapi/linux/bpf.h +2
-0+ * Description + * Copies into *pidns* pid, namespace id and tgid asseen by the
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if unable to get ns, pid or tgid of
current task.
Quoted 18 lines
Quoted 17 lines
Quoted 1 line
+ * Or if
size_of_pidnsis not valid.Maybe reword by following the code sequence.
if *size_of_pidns* is not valid or unable to get ns, pid or tgid of
the current task.
Quoted 3 lines
+ *
+ * **-ENOMEM** if allocation fails.
Quoted 7 lines
Quoted 7 lines
Maybe some other error codes in
filename_lookup()function?Quoted 3 lines
+ *
+ * If unable to get the inode from
/proc/self/ns/pidanerror code
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
+ * will be returned.
You do not need this. The description of error code cases should
cover this.
Quoted 18 lines
Quoted 17 lines
Quoted 17 lines
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
include/uapi/linux/bpf.h +0
-1@@ -2853,7 +2873,8 @@ union bpf_attr { FN(sk_storage_get), \ FN(sk_storage_delete), \ FN(send_signal), \ - FN(tcp_gen_syncookie),Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
+ FN(tcp_gen_syncookie), \
+
FN(get_current_pidns_info),/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
Quoted 26 lines
Quoted 25 lines
Quoted 25 lines
* function eBPF program intends to call
include/uapi/linux/bpf.h +6
-0@@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +0
-0Quoted 7 lines
Quoted 7 lines
kernel/bpf/core.c const struct bpf_func_proto
Quoted 7 lines
index
8191a7db2777..3159f2a0188c100644---
a/kernel/bpf/core.c+++
b/kernel/bpf/core.ckernel/bpf/core.c +0
-0@@ -2038,6 +2038,7 @@ const struct bpf_func_proto
bpf_get_current_uid_gid_proto__weak;Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
kernel/bpf/core.c +1
-0const 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_current_pidns_info__weak ;const struct
bpf_func_proto*__weak
bpf_get_trace_printk_proto(void)Quoted 32 lines
Quoted 31 lines
Quoted 31 lines
{
kernel/bpf/helpers.c +0
-0index
5e28718928ca..571f24077db2100644---
a/kernel/bpf/helpers.c+++
b/kernel/bpf/helpers.ckernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@ #include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +Quoted 5 lines
Quoted 5 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map
Quoted 5 lines
#include "
../../lib/kstrtox.h"kernel/bpf/helpers.c +0
-0@@ -312,6 +318,78 @@ void copy_map_value_locked(struct bpf_map*map, void *dst, void *src,
Quoted 7 lines
Quoted 7 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map · line 324
Quoted 7 lines
kernel/bpf/helpers.c +1
-0preempt_enable(); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *,
pidns_info, u32,Quoted 190 lines
Quoted 189 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map
Quoted 5 lines
kernel/bpf/helpers.c +3
-0+ size) +{ + const char *name = "/proc/self/ns/pid";maybe rename this variable to
pidns_path?Quoted 3 lines
+ struct
pid_namespace*pidns = NULL;+ struct filename *tmp = NULL;
Maybe rename this variable to name?
Quoted 1 line
+ int len = strlen(name) + 1;
We can delay this assignment later until it is needed.
Quoted 11 lines
+ struct inode *inode;
+ struct path kp;
+
pid_ttgid = 0;+
pid_tpid = 0;+ int ret;
kernel/bpf/helpers.c +1
-0+kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ if (unlikely(size != sizeof(struct bpf_pidns_info))) + return -EINVAL; + + pidns = task_active_pid_ns(current); +we can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 370
Quoted 11 lines
+ if (unlikely(!pidns))
+ goto clear;
kernel/bpf/helpers.c +4
-0+ + pidns_info->nsid = pidns->ns.inum; + pid = task_pid_nr_ns(current, pidns); +We can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 370
Quoted 9 lines
+ if (unlikely(!pid))
+ goto clear;
kernel/bpf/helpers.c +3
-0+ + tgid = task_tgid_nr_ns(current, pidns); +ditto. save an empty line.
Quoted 23 lines
+ if (unlikely(!tgid))
+ goto clear;
kernel/bpf/helpers.c +10
-0+ + pidns_info->tgid = (u32) tgid; + pidns_info->pid = (u32) pid; + + tmp = kmem_cache_alloc(names_cachep, GFP_ATOMIC); + if (unlikely(!tmp)) { + memset((void *)pidns_info, 0, (size_t) size); + return -ENOMEM; + } +kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ memcpy((char *)tmp->name, name, len); + tmp->uptr = NULL; + tmp->aname = NULL; + tmp->refcnt = 1; +ditto. save an empty line.
Quoted 3 lines
+ ret =
filename_lookup(AT_FDCWD, tmp, 0, &kp, NULL);+
ditto. save an empty line.
Quoted 15 lines
+ if (ret) {
+ memset((void *)pidns_info, 0, (
size_t) size);+ return ret;
+ }
kernel/bpf/helpers.c +4
-0+ + inode = d_backing_inode(kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; +kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ return 0; + +clear: + memset((void *)pidns_info, 0, (size_t) size); +save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 372
Quoted 9 lines
+ return
-EINVAL;kernel/bpf/helpers.c +4
-0+} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info,make the "= " aligned with others?
Quoted 19 lines
+ .gpl_only = false,
+ .ret_type =
RET_INTEGER,+ .arg1_type =
ARG_PTR_TO_UNINIT_MEM,+ .arg2_type =
ARG_CONST_SIZE,kernel/bpf/helpers.c +2
-0+}; +#ifdef
CONFIG_CGROUPS
BPF_CALL_0(bpf_get_current_cgroup_id){
kernel/trace/bpf_trace.c +0
-0Quoted 7 lines
Quoted 7 lines
kernel/trace/bpf_trace.c tracing_func_proto(enum bpf_func_id func_id,
Quoted 7 lines
index
ca1255d14576..5e1dc22765a5100644---
a/kernel/trace/bpf_trace.c+++
b/kernel/trace/bpf_trace.ckernel/trace/bpf_trace.c +0
-0@@ -709,6 +709,8 @@ tracing_func_proto(enum bpf_func_id func_id,const struct
bpf_prog*prog)Quoted 35 lines
Quoted 35 lines
Quoted 33 lines
kernel/trace/bpf_trace.c +0
-0#endifcase
BPF_FUNC_send_signal:return
&bpf_send_signal_proto;+ case
BPF_FUNC_get_current_pidns_info:+ return
&bpf_get_current_pidns_info_proto;default:
return NULL;
}
samples/bpf/Makefile +0
-0index
1d9be26b4edd..238453ff27d2100644--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
samples/bpf/Makefile +0
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_queryhostprogs-y +=
xdp_sample_pktshostprogs-y += ibumad
hostprogs-y += hbm
+hostprogs-y +=
trace_ns_info[...]
Re: [PATCH v5 bpf-next] BPF: helpers: New helper to obtain namespacedata from current task
Thanks a lot, Yonghong. I'll fix and split up the patch. Thanks again for your help.
Bests
Quoted 2,257 lines · Yonghong Song
Quoted 4 lines · carlos antonio neira bustos
Hi Yonghong,
I’m sorry, just to be sure, I’m just missing the error codes from
filename_lookup()right ?.From kernel functionality point of view. Yes, I am talking about
error codes returned byfilename_lookup().
For example, ifCONFIG_PID_NSorCONFIG_NAMESPACESis not defined in the config, the path "/proc/self/ns/pid" will not exist, the error code will return. It may be-ENOTDIR
ifCONFIG_NAMESPACESnot defined or-ECHILDifCONFIG_PID_NSis not defined. Please double check.Please do follow the advice in
to break the single patch to multiple patches.
I only reviewed the kernel code. Will review
tools/code in the next properly-formatted (broken-up) commits.Also, please also cc commits to bpf mailing list at [email protected]
Quoted 2,231 lines
Bests
Maybe some other error codes in
filename_lookup()function?Quoted 3 lines
+ *
+ * If unable to get the inode from
/proc/self/ns/pidan error codeQuoted 1 line
+ * will be returned.
*From: *Y Song <mailto:[email protected]>
*Sent: *08 August 2019 15:44
*To: *Carlos Antonio Neira Bustos <mailto:[email protected]> *Cc: *Yonghong Song <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>
*Subject: *Re: [PATCH v5 bpf-next] BPF: helpers: New helper to obtain namespacedata from current taskOn Thu, Aug 8, 2019 at 10:52 AM Carlos Antonio Neira Bustos
Quoted 9 lines · <[email protected]> wrote:
Yonghong,
I have modified the patch following your feedback.
Let me know if I'm missing something.
Yes, I have some other requests about formating.
https://lore.kernel.org/netdev/20190808174848.poybtaagg5ctle7t@dev00/T/#t
Could you address it as well?
Quoted 6 lines
Bests
Quoted 7 lines
From
70f8d5584700c9cfc82c006901d8ee9595c53f15Mon Sep 17 00:00:00 2001From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v6 bpf-next] BPF: New helper to obtain
namespace data
Quoted 5 lines
from current task
This helper obtains the active namespace from current and returns
pid, tgid,
Quoted 1 line
device and namespace id as seen from that namespace, allowing to
instrument
Quoted 3 lines
a process inside a container.
Device is read from
/proc/self/ns/pid, as in the future it's possiblethat
Quoted 3 lines
different
pid_nsfiles may belong to different devices, accordingto the discussion between Eric Biederman and Yonghong in 2017 linux
plumbers
Quoted 3 lines
conference.
Currently
bpf_get_current_pid_tgid(), is used to do pid filtering inbcc's
Quoted 1 line
scripts but this helper returns the pid as seen by the root namespace
which is
Quoted 3 lines
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
Quoted 1 line
if
bpf_get_current_pid_tgid()is used. This helper addresses thislimitation
Quoted 1 line
returning the pid as it's seen by the current namespace where the
script is
Quoted 5 lines
executing.
This helper has the same use cases as
bpf_get_current_pid_tgid()asit can be
Quoted 5 lines
used to do pid filtering even inside a container.
For example a bcc script using
bpf_get_current_pid_tgid()(
tools/funccount.py):Quoted 14 lines
u32 pid =
bpf_get_current_pid_tgid()>> 32;if (pid != <
pid_arg_passed_in>)return 0;
Could be modified to use
bpf_get_current_pidns_info()as follows:struct
bpf_pidnspidns;Quoted 7 lines
bpf_get_current_pidns_info(&pidns,
sizeof(struct bpf_pidns));u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <
pid_arg_passed_in>) && (nsid !=<
nsid_arg_passed_in>))Quoted 5 lines
return 0;
To find out the name PID namespace id of a process, you could use
this command:
Quoted 42 lines
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>---
fs/internal.h | 2 -
fs/namei.c | 1 -
include/linux/bpf.h | 1 +
include/linux/namei.h | 4 +
include/uapi/linux/bpf.h | 27 +++-
kernel/bpf/core.c | 1 +
kernel/bpf/helpers.c | 64 ++++++++++
kernel/trace/bpf_trace.c | 2 +
samples/bpf/Makefile | 3 +
samples/bpf/trace_ns_info_user.c | 35 ++++++
samples/bpf/trace_ns_info_user_kern.c | 44 +++++++
tools/include/uapi/linux/bpf.h | 27 +++-
Quoted 7 lines
tools/testing/selftests/bpf/Makefile | 2 +-
tools/testing/selftests/bpf/bpf_helpers.h | 3 +
.../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++
tools/testing/selftests/bpf/test_pidns.c | 138
+++++++++++++++++++++
Quoted 21 lines
16 files changed, 399 insertions(+), 6 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.ccreate mode 100644
samples/bpf/trace_ns_info_user_kern.ccreate mode 100644
tools/testing/selftests/bpf/progs/test_pidns_kern.ccreate mode 100644
tools/testing/selftests/bpf/test_pidns.cfs/internal.h +0
-0index
315fcd8d237c..6647e15dd419100644---
a/fs/internal.h+++
b/fs/internal.hfs/internal.h extern int finish_clean_context(struct fs_context *fc);
Quoted 8 lines
fs/internal.h +0
-1@@ -59,8 +59,6 @@ extern int finish_clean_context(struct fs_context *fc); /** namei.c */ -extern int filename_lookup(int dfd, struct filename *name, unsignedflags,
Quoted 3 lines
- struct path *path, struct path *root);
extern int user_path_mountpoint_at(int, const char
__user*,unsigned int, struct path *);
include/linux/bpf.h extern const struct bpf_func_proto
Quoted 37 lines
extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
const char *, unsigned int, struct path *);
fs/namei.c +0
-0index
209c51a5226c..a89fc72a4a10100644---
a/fs/namei.c+++
b/fs/namei.cfs/namei.c +0
-1@@ -19,7 +19,6 @@ #include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <
linux/namei.h>#include <
linux/pagemap.h>#include <
linux/fsnotify.h>include/linux/bpf.h +0
-0index
f9a506147c8a..e4adf5e05afd100644---
a/include/linux/bpf.h+++
b/include/linux/bpf.hinclude/linux/bpf.h +0
-0@@ -1050,6 +1050,7 @@ extern const struct bpf_func_proto
bpf_get_local_storage_proto;include/linux/namei.h extern void unlock_rename(struct dentry *, struct
Quoted 39 lines
include/linux/bpf.h +1
-0extern 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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */
void
bpf_user_rnd_init_once(void);include/linux/namei.h +0
-0index
9138b4471dbf..b45c8b6f7cb4100644---
a/include/linux/namei.h+++
b/include/linux/namei.hinclude/linux/namei.h +1
-0@@ -6,6 +6,7 @@ #include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {
MAX_NESTED_LINKS= 8 };include/linux/namei.h +0
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, structdentry *);
include/linux/namei.h extern void unlock_rename(struct dentry *, struct · line 102
Quoted 7 lines
include/linux/namei.h +1
-0extern void nd_jump_link(struct path *path); +extern int filename_lookup(int dfd, struct filename *name, unsignedflags,
Quoted 5 lines
include/linux/namei.h +2
-0+ struct path *path, struct path *root); +static inline void nd_terminate_link(void *name,
size_tlen,size_tmaxlen)
Quoted 13 lines
{
((char *) name)[min(len, maxlen)] = '\0';
include/uapi/linux/bpf.h +0
-0index
4393bd4b2419..b0d4869fb860100644---
a/include/uapi/linux/bpf.h+++
b/include/uapi/linux/bpf.hinclude/uapi/linux/bpf.h union bpf_attr { · line 2742
Quoted 2 lines
include/uapi/linux/bpf.h +0
-0@@ -2741,6 +2741,24 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does not enableSYN cookies
include/uapi/linux/bpf.h union bpf_attr {
Quoted 7 lines
include/uapi/linux/bpf.h +2
-0* * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 + * + * int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
+ * Description
+ * Copies into *pidns* pid, namespace id and tgid as
seen by the
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if *size_of_pidns* is not valid or unable
to get ns, pid
Quoted 30 lines
+ * or tgid of the current task.
+ *
+ * **-ENOMEM** if allocation fails.
+ *
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
include/uapi/linux/bpf.h +2
-1@@ -2853,7 +2871,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_current_pidns_info),Quoted 1 line
/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
kernel/bpf/core.c const struct bpf_func_proto
Quoted 33 lines
* function eBPF program intends to call
include/uapi/linux/bpf.h +6
-0@@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +0
-0index
8191a7db2777..3159f2a0188c100644---
a/kernel/bpf/core.c+++
b/kernel/bpf/core.ckernel/bpf/core.c +0
-0@@ -2038,6 +2038,7 @@ const struct bpf_func_proto
bpf_get_current_uid_gid_proto__weak;kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map,
Quoted 49 lines
kernel/bpf/core.c +1
-0const 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_current_pidns_info__weak ;const struct
bpf_func_proto*__weakbpf_get_trace_printk_proto(void){
kernel/bpf/helpers.c +0
-0index
5e28718928ca..41fbf1f28a48100644---
a/kernel/bpf/helpers.c+++
b/kernel/bpf/helpers.ckernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@ #include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "
../../lib/kstrtox.h"kernel/bpf/helpers.c +0
-0@@ -312,6 +318,64 @@ void copy_map_value_locked(struct bpf_map *map,void *dst, void *src,
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, · line 324
Quoted 7 lines
kernel/bpf/helpers.c +1
-0preempt_enable(); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *,
pidns_info, u32,kernel/trace/bpf_trace.c tracing_func_proto(enum bpf_func_id func_id,
Quoted 129 lines
kernel/bpf/helpers.c +57
-0+ size) +{ + const char *pidns_path = "/proc/self/ns/pid"; + struct pid_namespace *pidns = NULL; + struct filename *tmp = NULL; + struct inode *inode; + struct path kp; + pid_t tgid = 0; + pid_t pid = 0; + int ret; + int len; + + if (unlikely(size != sizeof(struct bpf_pidns_info))) + return -EINVAL; + pidns = task_active_pid_ns(current); + if (unlikely(!pidns)) + goto clear; + pidns_info->nsid = pidns->ns.inum; + pid = task_pid_nr_ns(current, pidns); + if (unlikely(!pid)) + goto clear; + tgid = task_tgid_nr_ns(current, pidns); + if (unlikely(!tgid)) + goto clear; + pidns_info->tgid = (u32) tgid; + pidns_info->pid = (u32) pid; + tmp = kmem_cache_alloc(names_cachep, GFP_ATOMIC); + if (unlikely(!tmp)) { + memset((void *)pidns_info, 0, (size_t) size); + return -ENOMEM; + } + len = strlen(pidns_path) + 1; + memcpy((char *)tmp->name, pidns_path, len); + tmp->uptr = NULL; + tmp->aname = NULL; + tmp->refcnt = 1; + ret = filename_lookup(AT_FDCWD, tmp, 0, &kp, NULL); + if (ret) { + memset((void *)pidns_info, 0, (size_t) size); + return ret; + } + inode = d_backing_inode(kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; + return 0; +clear: + memset((void *)pidns_info, 0, (size_t) size); + return -EINVAL; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE, +}; +#ifdef
CONFIG_CGROUPS
BPF_CALL_0(bpf_get_current_cgroup_id){
kernel/trace/bpf_trace.c +0
-0index
ca1255d14576..5e1dc22765a5100644---
a/kernel/trace/bpf_trace.c+++
b/kernel/trace/bpf_trace.ckernel/trace/bpf_trace.c +0
-0@@ -709,6 +709,8 @@ tracing_func_proto(enum bpf_func_id func_id,const struct
bpf_prog*prog)samples/bpf/Makefile task_fd_query-objs := bpf_load.o
Quoted 41 lines
kernel/trace/bpf_trace.c +0
-0#endifcase
BPF_FUNC_send_signal:return
&bpf_send_signal_proto;+ case
BPF_FUNC_get_current_pidns_info:+ return
&bpf_get_current_pidns_info_proto;default:
return NULL;
}
samples/bpf/Makefile +0
-0index
1d9be26b4edd..238453ff27d2100644--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
samples/bpf/Makefile +0
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_queryhostprogs-y +=
xdp_sample_pktshostprogs-y += ibumad
hostprogs-y += hbm
+hostprogs-y +=
trace_ns_info# Libbpf dependencies
LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a
samples/bpf/Makefile +0
-0@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.otask_fd_query_user.o $(TRACE_HELPERS)
Quoted 26 lines
samples/bpf/Makefile +1
-0xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o# Tell kbuild to always build the programs
always := $(hostprogs-y)
samples/bpf/Makefile +0
-0@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.oalways += ibumad_kern.o
always += hbm_out_kern.o
always += hbm_edt_kern.o
+always += trace_ns_info_user_kern.o
Review
Quoted 5 lines
KBUILD_HOSTCFLAGS+= -I$(objtree)/usr/include
KBUILD_HOSTCFLAGS+= -I$(srctree)/tools/lib/bpf/(quoted diff) +0
-0
b/samples/bpf/trace_ns_info_user.cReview
Quoted 81 lines
new file mode 100644
index 000000000000..e06d08db6f30
---
/dev/null+++
b/samples/bpf/trace_ns_info_user.csamples/bpf/Makefile +35
-0@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used + * to exercize bpf_get_current_pidns_info() helper call. + */ +int main(int ac, char **argv) +{ + FILE *f; + char filename[256]; + + snprintf(filename, sizeof(filename), "%s_user_kern.o", argv[0]); + printf("loading %s\n", filename); + + if (load_bpf_file(filename)) { + printf("%s", bpf_log_buf); + return 1; + } + + f = popen("taskset 1 ping localhost", "r"); + (void) f; + read_trace_pipe(); + return 0; +}(quoted diff) +0
-0
b/samples/bpf/trace_ns_info_user_kern.cQuoted 37 lines
new file mode 100644
index 000000000000..96675e02b707
---
/dev/null+++
b/samples/bpf/trace_ns_info_user_kern.c(quoted diff) +14
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include <linux/version.h> +#include <uapi/linux/bpf.h> +#include "bpf_helpers.h" + +typedef __u64 u64;Review
Quoted 10 lines
(quoted diff) +5
-0+typedef __u32 u32; + + +/* kprobe is NOT a stable ABI + * kernel functions can be removed, renamed or completely changesemantics.
kernel/bpf/helpers.c
Quoted 9 lines
+ * Number of arguments and their positions can change, etc.
+ * In such case this bpf+kprobe example will no longer be meaningful
+ */
kernel/bpf/helpers.c +2
-0+ +/* This will call bpf_get_current_pidns_info() to display pid and ns values
Quoted 1 line
+ * as seen by the current namespace, on the far left you will see
the pid as
Review
Quoted 39 lines
+ * seen as by the root namespace.
+ */
samples/bpf/trace_ns_info_user_kern.c new file +17
-0+ +SEC("kprobe/__netif_receive_skb_core") +int bpf_prog1 (struct pt_regs *ctx) +{ + char fmt[] = "nsid:%u, dev: %u, pid:%u\n"; + struct bpf_pidns_info nsinfo; + int ok = 0; + + ok = bpf_get_current_pidns_info(&nsinfo, sizeof(nsinfo)); + if (ok == 0) + bpf_trace_printk(fmt, sizeof(fmt), (u32)nsinfo.nsid, + (u32) nsinfo.dev, (u32)nsinfo.pid); + + return 0; +} +char _license[] SEC("license") = "GPL"; +u32 _version SEC("version") = LINUX_VERSION_CODE;(quoted diff) +0
-0
b/tools/include/uapi/linux/bpf.hReview union bpf_attr { · line 2742
Quoted 9 lines
index
4393bd4b2419..b0d4869fb860100644---
a/tools/include/uapi/linux/bpf.h+++
b/tools/include/uapi/linux/bpf.h(quoted diff) +0
-0@@ -2741,6 +2741,24 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does not enableSYN cookies
Review union bpf_attr {
Quoted 7 lines
(quoted diff) +2
-0* * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 + * + * int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
+ * Description
+ * Copies into *pidns* pid, namespace id and tgid as
seen by the
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if *size_of_pidns* is not valid or unable
to get ns, pid
Quoted 30 lines
+ * or tgid of the current task.
+ *
+ * **-ENOMEM** if allocation fails.
+ *
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
(quoted diff) +2
-1@@ -2853,7 +2871,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_current_pidns_info),Quoted 1 line
/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
Quoted 22 lines
* function eBPF program intends to call
include/uapi/linux/bpf.h +6
-0@@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};Review
Quoted 3 lines
#endif /* _UAPI__LINUX_BPF_H__ */
(quoted diff) +0
-0b/tools/testing/selftests/bpf/Makefile
Review TEST_GEN_PROGS = test_verifier test_tag test_maps
Quoted 7 lines
index
3bd0f4a0336a..1f97b571b581100644--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
(quoted diff) +0
-0@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps
test_lru_maptest_lpm_maptestQuoted 3 lines
tools/testing/selftests/bpf/Makefile +0
-0test_cgroup_storage test_select_reuseport test_section_names \
test_netcnttest_tcpnotify_usertest_sock_fieldstest_sysctl
test_hashmap\Quoted 1 line
test_btf_dumptest_cgroup_attachxdpingtest_sockopt
test_sockopt_sk\Review
Quoted 11 lines
-
test_sockopt_multitest_tcp_rtt+
test_sockopt_multitest_tcp_rtttest_pidns
BPF_OBJ_FILES= $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
TEST_GEN_FILES= $(BPF_OBJ_FILES)(quoted diff) +0
-0
b/tools/testing/selftests/bpf/bpf_helpers.hReview static int (*bpf_send_signal)(unsigned sig) =
Quoted 7 lines
index
120aa86c58d3..c96795a9d983100644---
a/tools/testing/selftests/bpf/bpf_helpers.h+++
b/tools/testing/selftests/bpf/bpf_helpers.h(quoted diff) +0
-0@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) =(void *)BPF_FUNC_send_signal;
Quoted 3 lines
tools/testing/selftests/bpf/bpf_helpers.h +0
-0static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk, void *ip,int
ip_len, void *tcp, int
tcp_len) =Quoted 10 lines
(void *)
BPF_FUNC_tcp_gen_syncookie;+static int (*bpf_get_current_pidns_info)(struct
bpf_pidns_info*buf,+ unsigned int
buf_size) =+ (void *)
BPF_FUNC_get_current_pidns_info;Review
Quoted 5 lines
/* llvm builtin functions that eBPF C program may use to
* emit
BPF_LD_ABSandBPF_LD_INDinstructions(quoted diff) +0
-0
b/tools/testing/selftests/bpf/progs/test_pidns_kern.cReview
Quoted 113 lines
new file mode 100644
index 000000000000..e1d2facfa762
---
/dev/null+++
b/tools/testing/selftests/bpf/progs/test_pidns_kern.ctools/testing/selftests/bpf/progs/test_pidns_kern.c new file +51
-0@@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <linux/bpf.h> +#include <errno.h> +#include "bpf_helpers.h" + +struct bpf_map_def SEC("maps") nsidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +struct bpf_map_def SEC("maps") pidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +SEC("tracepoint/syscalls/sys_enter_nanosleep") +int trace (void *ctx) +{ + struct bpf_pidns_info nsinfo; + __u32 key = 0, *expected_pid, *val; + char fmt[] = "ERROR nspid:%d\n"; + + if (bpf_get_current_pidns_info(&nsinfo, sizeof(nsinfo))) + return -EINVAL; + + expected_pid = bpf_map_lookup_elem(&pidmap, &key); + + + if (!expected_pid || *expected_pid != nsinfo.pid) + return 0; + + val = bpf_map_lookup_elem(&nsidmap, &key); + if (val) + *val = nsinfo.nsid; + + return 0; +} + +char _license[] SEC("license") = "GPL"; +__u32 _version SEC("version") = 1;(quoted diff) +0
-0
b/tools/testing/selftests/bpf/test_pidns.cQuoted 131 lines
new file mode 100644
index 000000000000..a7254055f294
---
/dev/null+++
b/tools/testing/selftests/bpf/test_pidns.c(quoted diff) +61
-0@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <syscall.h> +#include <unistd.h> +#include <linux/perf_event.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include <linux/bpf.h> +#include <bpf/bpf.h> +#include <bpf/libbpf.h> + +#include "cgroup_helpers.h" +#include "bpf_rlimit.h" + +#define CHECK(condition, tag, format...) ({ \ + int __ret = !!(condition); \ + if (__ret) { \ + printf("%s:FAIL:%s ", __func__, tag); \ + printf(format); \ + } else { \ + printf("%s:PASS:%s\n", __func__, tag); \ + } \ + __ret; \ +}) + +static int bpf_find_map(const char *test, struct bpf_object *obj, + const char *name) +{ + struct bpf_map *map; + + map = bpf_object__find_map_by_name(obj, name); + if (!map) + return -1; + return bpf_map__fd(map); +} + + +int main(int argc, char **argv) +{ + const char *probe_name = "syscalls/sys_enter_nanosleep"; + const char *file = "test_pidns_kern.o"; + int err, bytes, efd, prog_fd, pmu_fd; + int pidmap_fd, nsidmap_fd; + struct perf_event_attr attr = {}; + struct bpf_object *obj; + __u32 knsid = 0; + __u32 key = 0, pid;Review
Quoted 10 lines
(quoted diff) +5
-0+ int exit_code = 1; + struct stat st; + char buf[256]; + + err = bpf_prog_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj,
&prog_fd);Quoted 57 lines
+ if (
CHECK(err, "bpf_prog_load", "err %d errno %d\n", err, errno))+ goto
cleanup_cgroup_env;(quoted diff) +27
-0+ + nsidmap_fd = bpf_find_map(__func__, obj, "nsidmap"); + if (CHECK(nsidmap_fd < 0, "bpf_find_map", "err %d errno %d\n", + nsidmap_fd, errno)) + goto close_prog; + + pidmap_fd = bpf_find_map(__func__, obj, "pidmap"); + if (CHECK(pidmap_fd < 0, "bpf_find_map", "err %d errno %d\n", + pidmap_fd, errno)) + goto close_prog; + + pid = getpid(); + bpf_map_update_elem(pidmap_fd, &key, &pid, 0); + + snprintf(buf, sizeof(buf), + "/sys/kernel/debug/tracing/events/%s/id", probe_name); + efd = open(buf, O_RDONLY, 0); + if (CHECK(efd < 0, "open", "err %d errno %d\n", efd, errno)) + goto close_prog; + bytes = read(efd, buf, sizeof(buf)); + close(efd); + if (CHECK(bytes <= 0 || bytes >= sizeof(buf), "read", + "bytes %d errno %d\n", bytes, errno)) + goto close_prog; + + attr.config = strtol(buf, NULL, 0); + attr.type = PERF_TYPE_TRACEPOINT;Review
Quoted 10 lines
(quoted diff) +5
-0+ attr.sample_type = PERF_SAMPLE_RAW; + attr.sample_period = 1; + attr.wakeup_events = 1; + + pmu_fd = syscall(__NR_perf_event_open, &attr, getpid(), -1,-1, 0);
Quoted 1 line
+ if (CHECK(pmu_fd < 0, "
perf_event_open", "err %d errno %d\n",
pmu_fd,Quoted 9 lines
+ errno))
+ goto
close_prog;(quoted diff) +3
-0+ + err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0); + if (CHECK(err, "perf_event_ioc_enable", "err %d errno %d\n", err,Review
Quoted 10 lines
(quoted diff) +5
-0+ errno)) + goto close_pmu; + + err = ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd); + if (CHECK(err, "perf_event_ioc_set_bpf", "err %d errno %d\n",err,
Quoted 5 lines
+ errno))
+ goto
close_pmu;(quoted diff) +1
-0+Review
Quoted 10 lines
(quoted diff) +5
-0+ /* trigger some syscalls */ + sleep(1); + + err = bpf_map_lookup_elem(nsidmap_fd, &key, &knsid); + if (CHECK(err, "bpf_map_lookup_elem", "err %d errno %d\n",err, errno))
Review
Quoted 13 lines
+ goto
close_pmu;(quoted diff) +6
-0+ + if (stat("/proc/self/ns/pid", &st)) + goto close_pmu; + + if (CHECK(knsid != (__u32) st.st_ino, "compare_namespace_id", + "kern knsid %u user unsid %u\n", knsid, (__u32)st.st_ino))
Quoted 40 lines
+ goto
close_pmu;(quoted diff) +11
-1+ + exit_code = 0; + printf("%s:PASS\n", argv[0]); + +close_pmu: + close(pmu_fd); +close_prog: + bpf_object__close(obj); +cleanup_cgroup_env: + return exit_code; +} --2.11.0
Quoted 15 lines
Quoted 13 lines · Yonghong Song
Quoted 7 lines · Carlos Antonio Neira Bustos
The code has been modified to avoid syscalls that could sleep.
Please let me know if any other modification is needed.
From
be0384c0fa209a78c1567936e8db4e35b9a7c0f8Mon Sep 1700:00:00 2001
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain
namespace data
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
from current task
This helper obtains the active namespace from current and returns
pid, tgid,
Quoted 1 line
Quoted 1 line
Quoted 1 line
device and namespace id as seen from that namespace, allowing to
instrument
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
a process inside a container.
Device is read from
/proc/self/ns/pid, as in the future it'spossible that
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
different
pid_nsfiles may belong to different devices, accordingto the discussion between Eric Biederman and Yonghong in 2017
linux plumbers
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
conference.
Currently
bpf_get_current_pid_tgid(), is used to do pid filteringin bcc's
Quoted 1 line
Quoted 1 line
Quoted 1 line
scripts but this helper returns the pid as seen by the root
namespace which is
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
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
Quoted 1 line
Quoted 1 line
Quoted 1 line
if
bpf_get_current_pid_tgid()is used. This helper addresses thislimitation
Quoted 1 line
Quoted 1 line
Quoted 1 line
returning the pid as it's seen by the current namespace where the
script is
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
executing.
This helper has the same use cases as
bpf_get_current_pid_tgid()as it can be
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
used to do pid filtering even inside a container.
For example a bcc script using
bpf_get_current_pid_tgid()(
tools/funccount.py):Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
u32 pid =
bpf_get_current_pid_tgid()>> 32;if (pid != <
pid_arg_passed_in>)return 0;
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Could be modified to use
bpf_get_current_pidns_info()as follows:struct
bpf_pidnspidns;bpf_get_current_pidns_info(&pidns, sizeof(struct
bpf_pidns));Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <
pid_arg_passed_in>) && (nsid !=<
nsid_arg_passed_in>))Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
return 0;
To find out the name PID namespace id of a process, you could use
this command:
Quoted 22 lines
Quoted 21 lines
Quoted 21 lines
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>---
fs/namei.c | 2 +-
include/linux/bpf.h | 1 +
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
include/linux/namei.h | 4 +
include/uapi/linux/bpf.h | 29 ++++-
kernel/bpf/core.c | 1 +
kernel/bpf/helpers.c | 78
++++++++++++
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
kernel/trace/bpf_trace.c | 2 +
samples/bpf/Makefile | 3 +
samples/bpf/trace_ns_info_user.c | 35 ++++++
samples/bpf/trace_ns_info_user_kern.c | 44 +++++++
tools/include/uapi/linux/bpf.h | 29 ++++-
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
tools/testing/selftests/bpf/Makefile | 2 +-
tools/testing/selftests/bpf/bpf_helpers.h | 3 +
.../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++
tools/testing/selftests/bpf/test_pidns.c | 138
+++++++++++++++++++++
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
15 files changed, 418 insertions(+), 4 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.ccreate mode 100644
samples/bpf/trace_ns_info_user_kern.ccreate mode 100644
tools/testing/selftests/bpf/progs/test_pidns_kern.cQuoted 22 lines
Quoted 21 lines
Quoted 21 lines
create mode 100644
tools/testing/selftests/bpf/test_pidns.cfs/namei.c +0
-0index
209c51a5226c..d1eca36972d2100644---
a/fs/namei.c+++
b/fs/namei.cfs/namei.c +0
-1@@ -19,7 +19,6 @@ #include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> Quoted 7 lines
Quoted 7 lines
fs/namei.c int filename_lookup(int dfd, struct
Quoted 7 lines
#include <
linux/namei.h>#include <
linux/pagemap.h>#include <
linux/fsnotify.h>fs/namei.c +0
-0@@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, structfilename *name, unsigned flags,
Quoted 12 lines
Quoted 11 lines
fs/namei.c int filename_lookup(int dfd, struct · line 2360
Quoted 7 lines
fs/namei.c +1
-0putname(name); return retval; } +EXPORT_SYMBOL (filename_lookup);No need to export symbols. bpf uses it and bpf is in the core, not in
Quoted 7 lines
Quoted 7 lines
modules.
Quoted 3 lines
/* Returns 0 and nd will be valid on success; Retuns error,
otherwise. */
Quoted 11 lines
Quoted 11 lines
include/linux/bpf.h extern const struct bpf_func_proto
Quoted 11 lines
static int path_parentat(struct nameidata *nd, unsigned flags,
include/linux/bpf.h +0
-0index
f9a506147c8a..e4adf5e05afd100644---
a/include/linux/bpf.h+++
b/include/linux/bpf.hinclude/linux/bpf.h +0
-0@@ -1050,6 +1050,7 @@ extern const struct bpf_func_proto
bpf_get_local_storage_proto;Quoted 34 lines
Quoted 33 lines
Quoted 33 lines
include/linux/bpf.h +1
-0extern 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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */
void
bpf_user_rnd_init_once(void);include/linux/namei.h +0
-0index
9138b4471dbf..2c24e8c71d46100644---
a/include/linux/namei.h+++
b/include/linux/namei.hinclude/linux/namei.h +1
-0@@ -6,6 +6,7 @@ #include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> Quoted 5 lines
Quoted 5 lines
include/linux/namei.h extern void unlock_rename(struct dentry *,
Quoted 5 lines
enum {
MAX_NESTED_LINKS= 8 };include/linux/namei.h +0
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *,struct dentry *);
Quoted 7 lines
Quoted 7 lines
include/linux/namei.h extern void unlock_rename(struct dentry *, · line 102
Quoted 7 lines
include/linux/namei.h +1
-0extern void nd_jump_link(struct path *path); +extern int filename_lookup(int dfd, struct filename *name,unsigned int flags,
Quoted 11 lines
Quoted 11 lines
include/linux/namei.h extern void unlock_rename(struct dentry *, struct dentry *); · line 102
Quoted 1 line
include/linux/namei.h +1
-0+ struct path *path, struct path *root);The previous definition in
fs/internal.hshould be removed.Quoted 3 lines
include/linux/namei.h +1
-0+ static inline void nd_terminate_link(void *name, size_t len,
size_tmaxlen)Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
{
((char *) name)[min(len, maxlen)] = '\0';
include/uapi/linux/bpf.h +0
-0index
4393bd4b2419..6f601f7106e2100644Quoted 7 lines
Quoted 7 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2742
Quoted 7 lines
---
a/include/uapi/linux/bpf.h+++
b/include/uapi/linux/bpf.hinclude/uapi/linux/bpf.h +0
-0@@ -2741,6 +2741,26 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does notenable SYN cookies
Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2745
Quoted 3 lines
include/uapi/linux/bpf.h +0
-0* * **-EPROTONOSUPPORT** IP packet version is not4 or 6
Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2748
Quoted 3 lines
include/uapi/linux/bpf.h +2
-0+* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr {
Quoted 3 lines
include/uapi/linux/bpf.h +2
-0+ * Description + * Copies into *pidns* pid, namespace id and tgid asseen by the
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if unable to get ns, pid or tgid of
current task.
Quoted 18 lines
Quoted 17 lines
Quoted 1 line
+ * Or if
size_of_pidnsis not valid.Maybe reword by following the code sequence.
if *size_of_pidns* is not valid or unable to get ns, pid or tgid of
the current task.
Quoted 3 lines
+ *
+ * **-ENOMEM** if allocation fails.
Quoted 7 lines
Quoted 7 lines
Maybe some other error codes in
filename_lookup()function?Quoted 3 lines
+ *
+ * If unable to get the inode from
/proc/self/ns/pidanerror code
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
+ * will be returned.
You do not need this. The description of error code cases should
cover this.
Quoted 18 lines
Quoted 17 lines
Quoted 17 lines
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
include/uapi/linux/bpf.h +0
-1@@ -2853,7 +2873,8 @@ union bpf_attr { FN(sk_storage_get), \ FN(sk_storage_delete), \ FN(send_signal), \ - FN(tcp_gen_syncookie),Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
+ FN(tcp_gen_syncookie), \
+
FN(get_current_pidns_info),/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
Quoted 26 lines
Quoted 25 lines
Quoted 25 lines
* function eBPF program intends to call
include/uapi/linux/bpf.h +6
-0@@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +0
-0Quoted 7 lines
Quoted 7 lines
kernel/bpf/core.c const struct bpf_func_proto
Quoted 7 lines
index
8191a7db2777..3159f2a0188c100644---
a/kernel/bpf/core.c+++
b/kernel/bpf/core.ckernel/bpf/core.c +0
-0@@ -2038,6 +2038,7 @@ const struct bpf_func_proto
bpf_get_current_uid_gid_proto__weak;Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
kernel/bpf/core.c +1
-0const 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_current_pidns_info__weak ;const struct
bpf_func_proto*__weak
bpf_get_trace_printk_proto(void)Quoted 32 lines
Quoted 31 lines
Quoted 31 lines
{
kernel/bpf/helpers.c +0
-0index
5e28718928ca..571f24077db2100644---
a/kernel/bpf/helpers.c+++
b/kernel/bpf/helpers.ckernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@ #include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +Quoted 5 lines
Quoted 5 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map
Quoted 5 lines
#include "
../../lib/kstrtox.h"kernel/bpf/helpers.c +0
-0@@ -312,6 +318,78 @@ void copy_map_value_locked(struct bpf_map*map, void *dst, void *src,
Quoted 7 lines
Quoted 7 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map · line 324
Quoted 7 lines
kernel/bpf/helpers.c +1
-0preempt_enable(); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *,
pidns_info, u32,Quoted 190 lines
Quoted 189 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map
Quoted 5 lines
kernel/bpf/helpers.c +3
-0+ size) +{ + const char *name = "/proc/self/ns/pid";maybe rename this variable to
pidns_path?Quoted 3 lines
+ struct
pid_namespace*pidns = NULL;+ struct filename *tmp = NULL;
Maybe rename this variable to name?
Quoted 1 line
+ int len = strlen(name) + 1;
We can delay this assignment later until it is needed.
Quoted 11 lines
+ struct inode *inode;
+ struct path kp;
+
pid_ttgid = 0;+
pid_tpid = 0;+ int ret;
kernel/bpf/helpers.c +1
-0+kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ if (unlikely(size != sizeof(struct bpf_pidns_info))) + return -EINVAL; + + pidns = task_active_pid_ns(current); +we can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 370
Quoted 11 lines
+ if (unlikely(!pidns))
+ goto clear;
kernel/bpf/helpers.c +4
-0+ + pidns_info->nsid = pidns->ns.inum; + pid = task_pid_nr_ns(current, pidns); +We can save an empty line here.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 370
Quoted 9 lines
+ if (unlikely(!pid))
+ goto clear;
kernel/bpf/helpers.c +3
-0+ + tgid = task_tgid_nr_ns(current, pidns); +ditto. save an empty line.
Quoted 23 lines
+ if (unlikely(!tgid))
+ goto clear;
kernel/bpf/helpers.c +10
-0+ + pidns_info->tgid = (u32) tgid; + pidns_info->pid = (u32) pid; + + tmp = kmem_cache_alloc(names_cachep, GFP_ATOMIC); + if (unlikely(!tmp)) { + memset((void *)pidns_info, 0, (size_t) size); + return -ENOMEM; + } +kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ memcpy((char *)tmp->name, name, len); + tmp->uptr = NULL; + tmp->aname = NULL; + tmp->refcnt = 1; +ditto. save an empty line.
Quoted 3 lines
+ ret =
filename_lookup(AT_FDCWD, tmp, 0, &kp, NULL);+
ditto. save an empty line.
Quoted 15 lines
+ if (ret) {
+ memset((void *)pidns_info, 0, (
size_t) size);+ return ret;
+ }
kernel/bpf/helpers.c +4
-0+ + inode = d_backing_inode(kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; +kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ return 0; + +clear: + memset((void *)pidns_info, 0, (size_t) size); +save an empty line.
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, void *dst, void *src, · line 372
Quoted 9 lines
+ return
-EINVAL;kernel/bpf/helpers.c +4
-0+} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info,make the "= " aligned with others?
Quoted 19 lines
+ .gpl_only = false,
+ .ret_type =
RET_INTEGER,+ .arg1_type =
ARG_PTR_TO_UNINIT_MEM,+ .arg2_type =
ARG_CONST_SIZE,kernel/bpf/helpers.c +2
-0+}; +#ifdef
CONFIG_CGROUPS
BPF_CALL_0(bpf_get_current_cgroup_id){
kernel/trace/bpf_trace.c +0
-0Quoted 7 lines
Quoted 7 lines
kernel/trace/bpf_trace.c tracing_func_proto(enum bpf_func_id func_id,
Quoted 7 lines
index
ca1255d14576..5e1dc22765a5100644---
a/kernel/trace/bpf_trace.c+++
b/kernel/trace/bpf_trace.ckernel/trace/bpf_trace.c +0
-0@@ -709,6 +709,8 @@ tracing_func_proto(enum bpf_func_id func_id,const struct
bpf_prog*prog)Quoted 35 lines
Quoted 35 lines
Quoted 33 lines
kernel/trace/bpf_trace.c +0
-0#endifcase
BPF_FUNC_send_signal:return
&bpf_send_signal_proto;+ case
BPF_FUNC_get_current_pidns_info:+ return
&bpf_get_current_pidns_info_proto;default:
return NULL;
}
samples/bpf/Makefile +0
-0index
1d9be26b4edd..238453ff27d2100644--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
samples/bpf/Makefile +0
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_queryhostprogs-y +=
xdp_sample_pktshostprogs-y += ibumad
hostprogs-y += hbm
+hostprogs-y +=
trace_ns_info[...]
Re: [PATCH v5 bpf-next] BPF: helpers: New helper to obtain namespacedata from current task
Yonghong,
I have splitted the patch in 2 :
- bpf_helper introduction :
From 40ec0781525b82d5235c45f5066a7a79dea71065 Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Fri, 9 Aug 2019 12:20:52 -0700
Subject: [PATCH 1/2] [PATCH v8 bpf-next 1/2] BPF: New helper to obtain
namespace data from current task
This helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from /proc/self/ns/pid, as in the future it's possible that different pid_ns files may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
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.
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.
For example a bcc script using bpf_get_current_pid_tgid() (tools/funccount.py):
u32 pid = bpf_get_current_pid_tgid() >> 32;
if (pid != <pid_arg_passed_in>)
return 0;Could be modified to use bpf_get_current_pidns_info() as follows:
struct bpf_pidns pidns;
bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns));
u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>))
return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>
Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pid
--- fs/internal.h | 2 -- fs/namei.c | 1 - include/linux/bpf.h | 1 + include/linux/namei.h | 4 +++ include/uapi/linux/bpf.h | 31 +++++++++++++++++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 64 ++++++++++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 2 ++ tools/include/uapi/linux/bpf.h | 31 +++++++++++++++++++- 9 files changed, 132 insertions(+), 5 deletions(-)
fs/internal.h +0 -2
@@ -59,8 +59,6 @@ extern int finish_clean_context(struct fs_context *fc);/* * namei.c */ -extern int filename_lookup (int dfd,struct filename *name,unsigned flags, -struct path *path,struct path *root);extern int user_path_mountpoint_at (int ,const char __user *,unsigned int ,struct path *);extern int vfs_path_lookup (struct dentry *,struct vfsmount *,const char *,unsigned int ,struct path *);
fs/namei.c +0 -1
@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h>
include/linux/bpf.h +1 -0
@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );
include/linux/namei.h +4 -0
@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };
@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned flags, +struct path *path,struct path *root); +static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;
include/uapi/linux/bpf.h +30 -1
@@ -2741,6 +2741,28 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ECHILD** if /proc/self/ns/pid does not exists. +* +* **-ENOTDIR** if /proc/self/ns does not exists. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2853,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -3604,4 +3627,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +1 -0
@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {
kernel/bpf/helpers.c +64 -0
76 lines not on this page · raw message
kernel/trace/bpf_trace.c +2 -0
@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }
tools/include/uapi/linux/bpf.h +30 -1
@@ -2741,6 +2741,28 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ECHILD** if /proc/self/ns/pid does not exists. +* +* **-ENOTDIR** if /proc/self/ns does not exists. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2853,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -3604,4 +3627,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
Signature · 27 lines
2.11.0 - BPF helper samples and selftests From a87df8b026c6374c21b2af03d83471c258ff6038 Mon Sep 17 00:00:00 2001 From: Carlos <[email protected]> Date: Fri, 9 Aug 2019 12:23:27 -0700 Subject: [PATCH 2/2] [PATCH v8 bpf-next 2/2] BPF: New helper to obtain namespace data from current task Samples and selftests for new helper. Signed-off-by: Carlos Neira <[email protected]> --- samples/bpf/Makefile | 3 + samples/bpf/trace_ns_info_user.c | 35 ++++++ samples/bpf/trace_ns_info_user_kern.c | 44 +++++++ tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_helpers.h | 3 + .../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++ tools/testing/selftests/bpf/test_pidns.c | 138 +++++++++++++++++++++ 7 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 samples/bpf/trace_ns_info_user.c create mode 100644 samples/bpf/trace_ns_info_user_kern.c create mode 100644 tools/testing/selftests/bpf/progs/test_pidns_kern.c create mode 100644 tools/testing/selftests/bpf/test_pidns.c
samples/bpf/Makefile +3 -0
@@ -53,6 +53,7 @@ hostprogs-y += task_fd_query hostprogs-y += xdp_sample_pkts hostprogs-y += ibumad hostprogs-y += hbm +hostprogs-y += trace_ns_info # Libbpf dependencies LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a
@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.o task_fd_query_user.o $(TRACE_HELPERS) xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o # Tell kbuild to always build the programs always := $(hostprogs-y)
@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.o always += ibumad_kern.o always += hbm_out_kern.o always += hbm_edt_kern.o +always += trace_ns_info_user_kern.o KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/bpf/
samples/bpf/trace_ns_info_user.c new file +35 -0
@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of version 2 of the GNU General Public +* License as published by the Free Software Foundation. +*/ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used +* to exercize bpf_get_current_pidns_info() helper call. +*/ +int main (int ac,char **argv) +{ +FILE *f; +char filename[256 ]; + +snprintf (filename,sizeof (filename),"%s_user_kern.o" , argv[0 ]); +printf ("loading %s\n" , filename); + +if (load_bpf_file (filename)) { +printf ("%s" , bpf_log_buf); +return 1 ; + } + + f =popen ("taskset 1 ping localhost" ,"r" ); + (void ) f; +read_trace_pipe (); +return 0 ; +}
samples/bpf/trace_ns_info_user_kern.c new file +44 -0
44 lines not on this page · raw message
tools/testing/selftests/bpf/Makefile +1 -1
@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \ - test_sockopt_multi test_tcp_rtt + test_sockopt_multi test_tcp_rtt test_pidns BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES)
tools/testing/selftests/bpf/bpf_helpers.h +3 -0
@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) = (void *)BPF_FUNC_send_signal;static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk,void *ip,int ip_len,void *tcp,int tcp_len) = (void *) BPF_FUNC_tcp_gen_syncookie; +static int (*bpf_get_current_pidns_info)(struct bpf_pidns_info *buf, +unsigned int buf_size) = + (void *) BPF_FUNC_get_current_pidns_info;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions
tools/testing/selftests/bpf/progs/test_pidns_kern.c new file +51 -0
51 lines not on this page · raw message
tools/testing/selftests/bpf/test_pidns.c new file +138 -0
138 lines not on this page · raw message
Signature · 5 lines
2.11.0 Thanks for your help. Bests
Quoted 2,263 lines · Carlos Antonio Neira Bustos
Thanks a lot, Yonghong. I'll fix and split up the patch. Thanks again for your help.
Bests
Quoted 2,257 lines · Yonghong Song
Quoted 4 lines · carlos antonio neira bustos
Hi Yonghong,
I’m sorry, just to be sure, I’m just missing the error codes from
filename_lookup()right ?.From kernel functionality point of view. Yes, I am talking about
error codes returned byfilename_lookup().
For example, ifCONFIG_PID_NSorCONFIG_NAMESPACESis not defined in the config, the path "/proc/self/ns/pid" will not exist, the error code will return. It may be-ENOTDIR
ifCONFIG_NAMESPACESnot defined or-ECHILDifCONFIG_PID_NSis not defined. Please double check.Please do follow the advice in
to break the single patch to multiple patches.
I only reviewed the kernel code. Will review
tools/code in the next properly-formatted (broken-up) commits.Also, please also cc commits to bpf mailing list at [email protected]
Quoted 2,231 lines
Bests
Maybe some other error codes in
filename_lookup()function?Quoted 3 lines
+ *
+ * If unable to get the inode from
/proc/self/ns/pidan error codeQuoted 1 line
+ * will be returned.
*From: *Y Song <mailto:[email protected]>
*Sent: *08 August 2019 15:44
*To: *Carlos Antonio Neira Bustos <mailto:[email protected]> *Cc: *Yonghong Song <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>; [email protected] <mailto:[email protected]>
*Subject: *Re: [PATCH v5 bpf-next] BPF: helpers: New helper to obtain namespacedata from current taskOn Thu, Aug 8, 2019 at 10:52 AM Carlos Antonio Neira Bustos
Quoted 9 lines · <[email protected]> wrote:
Yonghong,
I have modified the patch following your feedback.
Let me know if I'm missing something.
Yes, I have some other requests about formating.
https://lore.kernel.org/netdev/20190808174848.poybtaagg5ctle7t@dev00/T/#t
Could you address it as well?
Quoted 6 lines
Bests
Quoted 7 lines
From
70f8d5584700c9cfc82c006901d8ee9595c53f15Mon Sep 17 00:00:00 2001From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v6 bpf-next] BPF: New helper to obtain
namespace data
Quoted 5 lines
from current task
This helper obtains the active namespace from current and returns
pid, tgid,
Quoted 1 line
device and namespace id as seen from that namespace, allowing to
instrument
Quoted 3 lines
a process inside a container.
Device is read from
/proc/self/ns/pid, as in the future it's possiblethat
Quoted 3 lines
different
pid_nsfiles may belong to different devices, accordingto the discussion between Eric Biederman and Yonghong in 2017 linux
plumbers
Quoted 3 lines
conference.
Currently
bpf_get_current_pid_tgid(), is used to do pid filtering inbcc's
Quoted 1 line
scripts but this helper returns the pid as seen by the root namespace
which is
Quoted 3 lines
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
Quoted 1 line
if
bpf_get_current_pid_tgid()is used. This helper addresses thislimitation
Quoted 1 line
returning the pid as it's seen by the current namespace where the
script is
Quoted 5 lines
executing.
This helper has the same use cases as
bpf_get_current_pid_tgid()asit can be
Quoted 5 lines
used to do pid filtering even inside a container.
For example a bcc script using
bpf_get_current_pid_tgid()(
tools/funccount.py):Quoted 14 lines
u32 pid =
bpf_get_current_pid_tgid()>> 32;if (pid != <
pid_arg_passed_in>)return 0;
Could be modified to use
bpf_get_current_pidns_info()as follows:struct
bpf_pidnspidns;Quoted 7 lines
bpf_get_current_pidns_info(&pidns,
sizeof(struct bpf_pidns));u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <
pid_arg_passed_in>) && (nsid !=<
nsid_arg_passed_in>))Quoted 5 lines
return 0;
To find out the name PID namespace id of a process, you could use
this command:
Quoted 42 lines
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>---
fs/internal.h | 2 -
fs/namei.c | 1 -
include/linux/bpf.h | 1 +
include/linux/namei.h | 4 +
include/uapi/linux/bpf.h | 27 +++-
kernel/bpf/core.c | 1 +
kernel/bpf/helpers.c | 64 ++++++++++
kernel/trace/bpf_trace.c | 2 +
samples/bpf/Makefile | 3 +
samples/bpf/trace_ns_info_user.c | 35 ++++++
samples/bpf/trace_ns_info_user_kern.c | 44 +++++++
tools/include/uapi/linux/bpf.h | 27 +++-
Quoted 7 lines
tools/testing/selftests/bpf/Makefile | 2 +-
tools/testing/selftests/bpf/bpf_helpers.h | 3 +
.../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++
tools/testing/selftests/bpf/test_pidns.c | 138
+++++++++++++++++++++
Quoted 21 lines
16 files changed, 399 insertions(+), 6 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.ccreate mode 100644
samples/bpf/trace_ns_info_user_kern.ccreate mode 100644
tools/testing/selftests/bpf/progs/test_pidns_kern.ccreate mode 100644
tools/testing/selftests/bpf/test_pidns.cfs/internal.h +0
-0index
315fcd8d237c..6647e15dd419100644---
a/fs/internal.h+++
b/fs/internal.hfs/internal.h extern int finish_clean_context(struct fs_context *fc);
Quoted 8 lines
fs/internal.h +0
-1@@ -59,8 +59,6 @@ extern int finish_clean_context(struct fs_context *fc); /** namei.c */ -extern int filename_lookup(int dfd, struct filename *name, unsignedflags,
Quoted 3 lines
- struct path *path, struct path *root);
extern int user_path_mountpoint_at(int, const char
__user*,unsigned int, struct path *);
include/linux/bpf.h extern const struct bpf_func_proto
Quoted 37 lines
extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
const char *, unsigned int, struct path *);
fs/namei.c +0
-0index
209c51a5226c..a89fc72a4a10100644---
a/fs/namei.c+++
b/fs/namei.cfs/namei.c +0
-1@@ -19,7 +19,6 @@ #include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <
linux/namei.h>#include <
linux/pagemap.h>#include <
linux/fsnotify.h>include/linux/bpf.h +0
-0index
f9a506147c8a..e4adf5e05afd100644---
a/include/linux/bpf.h+++
b/include/linux/bpf.hinclude/linux/bpf.h +0
-0@@ -1050,6 +1050,7 @@ extern const struct bpf_func_proto
bpf_get_local_storage_proto;include/linux/namei.h extern void unlock_rename(struct dentry *, struct
Quoted 39 lines
include/linux/bpf.h +1
-0extern 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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */
void
bpf_user_rnd_init_once(void);include/linux/namei.h +0
-0index
9138b4471dbf..b45c8b6f7cb4100644---
a/include/linux/namei.h+++
b/include/linux/namei.hinclude/linux/namei.h +1
-0@@ -6,6 +6,7 @@ #include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {
MAX_NESTED_LINKS= 8 };include/linux/namei.h +0
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, structdentry *);
include/linux/namei.h extern void unlock_rename(struct dentry *, struct · line 102
Quoted 7 lines
include/linux/namei.h +1
-0extern void nd_jump_link(struct path *path); +extern int filename_lookup(int dfd, struct filename *name, unsignedflags,
Quoted 5 lines
include/linux/namei.h +2
-0+ struct path *path, struct path *root); +static inline void nd_terminate_link(void *name,
size_tlen,size_tmaxlen)
Quoted 13 lines
{
((char *) name)[min(len, maxlen)] = '\0';
include/uapi/linux/bpf.h +0
-0index
4393bd4b2419..b0d4869fb860100644---
a/include/uapi/linux/bpf.h+++
b/include/uapi/linux/bpf.hinclude/uapi/linux/bpf.h union bpf_attr { · line 2742
Quoted 2 lines
include/uapi/linux/bpf.h +0
-0@@ -2741,6 +2741,24 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does not enableSYN cookies
include/uapi/linux/bpf.h union bpf_attr {
Quoted 7 lines
include/uapi/linux/bpf.h +2
-0* * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 + * + * int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
+ * Description
+ * Copies into *pidns* pid, namespace id and tgid as
seen by the
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if *size_of_pidns* is not valid or unable
to get ns, pid
Quoted 30 lines
+ * or tgid of the current task.
+ *
+ * **-ENOMEM** if allocation fails.
+ *
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
include/uapi/linux/bpf.h +2
-1@@ -2853,7 +2871,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_current_pidns_info),Quoted 1 line
/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
kernel/bpf/core.c const struct bpf_func_proto
Quoted 33 lines
* function eBPF program intends to call
include/uapi/linux/bpf.h +6
-0@@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +0
-0index
8191a7db2777..3159f2a0188c100644---
a/kernel/bpf/core.c+++
b/kernel/bpf/core.ckernel/bpf/core.c +0
-0@@ -2038,6 +2038,7 @@ const struct bpf_func_proto
bpf_get_current_uid_gid_proto__weak;kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map,
Quoted 49 lines
kernel/bpf/core.c +1
-0const 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_current_pidns_info__weak ;const struct
bpf_func_proto*__weakbpf_get_trace_printk_proto(void){
kernel/bpf/helpers.c +0
-0index
5e28718928ca..41fbf1f28a48100644---
a/kernel/bpf/helpers.c+++
b/kernel/bpf/helpers.ckernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@ #include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "
../../lib/kstrtox.h"kernel/bpf/helpers.c +0
-0@@ -312,6 +318,64 @@ void copy_map_value_locked(struct bpf_map *map,void *dst, void *src,
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map *map, · line 324
Quoted 7 lines
kernel/bpf/helpers.c +1
-0preempt_enable(); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *,
pidns_info, u32,kernel/trace/bpf_trace.c tracing_func_proto(enum bpf_func_id func_id,
Quoted 129 lines
kernel/bpf/helpers.c +57
-0+ size) +{ + const char *pidns_path = "/proc/self/ns/pid"; + struct pid_namespace *pidns = NULL; + struct filename *tmp = NULL; + struct inode *inode; + struct path kp; + pid_t tgid = 0; + pid_t pid = 0; + int ret; + int len; + + if (unlikely(size != sizeof(struct bpf_pidns_info))) + return -EINVAL; + pidns = task_active_pid_ns(current); + if (unlikely(!pidns)) + goto clear; + pidns_info->nsid = pidns->ns.inum; + pid = task_pid_nr_ns(current, pidns); + if (unlikely(!pid)) + goto clear; + tgid = task_tgid_nr_ns(current, pidns); + if (unlikely(!tgid)) + goto clear; + pidns_info->tgid = (u32) tgid; + pidns_info->pid = (u32) pid; + tmp = kmem_cache_alloc(names_cachep, GFP_ATOMIC); + if (unlikely(!tmp)) { + memset((void *)pidns_info, 0, (size_t) size); + return -ENOMEM; + } + len = strlen(pidns_path) + 1; + memcpy((char *)tmp->name, pidns_path, len); + tmp->uptr = NULL; + tmp->aname = NULL; + tmp->refcnt = 1; + ret = filename_lookup(AT_FDCWD, tmp, 0, &kp, NULL); + if (ret) { + memset((void *)pidns_info, 0, (size_t) size); + return ret; + } + inode = d_backing_inode(kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; + return 0; +clear: + memset((void *)pidns_info, 0, (size_t) size); + return -EINVAL; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE, +}; +#ifdef
CONFIG_CGROUPS
BPF_CALL_0(bpf_get_current_cgroup_id){
kernel/trace/bpf_trace.c +0
-0index
ca1255d14576..5e1dc22765a5100644---
a/kernel/trace/bpf_trace.c+++
b/kernel/trace/bpf_trace.ckernel/trace/bpf_trace.c +0
-0@@ -709,6 +709,8 @@ tracing_func_proto(enum bpf_func_id func_id,const struct
bpf_prog*prog)samples/bpf/Makefile task_fd_query-objs := bpf_load.o
Quoted 41 lines
kernel/trace/bpf_trace.c +0
-0#endifcase
BPF_FUNC_send_signal:return
&bpf_send_signal_proto;+ case
BPF_FUNC_get_current_pidns_info:+ return
&bpf_get_current_pidns_info_proto;default:
return NULL;
}
samples/bpf/Makefile +0
-0index
1d9be26b4edd..238453ff27d2100644--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
samples/bpf/Makefile +0
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_queryhostprogs-y +=
xdp_sample_pktshostprogs-y += ibumad
hostprogs-y += hbm
+hostprogs-y +=
trace_ns_info# Libbpf dependencies
LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a
samples/bpf/Makefile +0
-0@@ -109,6 +110,7 @@ task_fd_query-objs := bpf_load.otask_fd_query_user.o $(TRACE_HELPERS)
Quoted 26 lines
samples/bpf/Makefile +1
-0xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) +trace_ns_info-objs := bpf_load.o trace_ns_info_user.o# Tell kbuild to always build the programs
always := $(hostprogs-y)
samples/bpf/Makefile +0
-0@@ -170,6 +172,7 @@ always += xdp_sample_pkts_kern.oalways += ibumad_kern.o
always += hbm_out_kern.o
always += hbm_edt_kern.o
+always += trace_ns_info_user_kern.o
Review
Quoted 5 lines
KBUILD_HOSTCFLAGS+= -I$(objtree)/usr/include
KBUILD_HOSTCFLAGS+= -I$(srctree)/tools/lib/bpf/(quoted diff) +0
-0
b/samples/bpf/trace_ns_info_user.cReview
Quoted 81 lines
new file mode 100644
index 000000000000..e06d08db6f30
---
/dev/null+++
b/samples/bpf/trace_ns_info_user.csamples/bpf/Makefile +35
-0@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ + +#include <stdio.h> +#include <linux/bpf.h> +#include <unistd.h> +#include "bpf/libbpf.h" +#include "bpf_load.h" + +/* This code was taken verbatim from tracex1_user.c, it's used + * to exercize bpf_get_current_pidns_info() helper call. + */ +int main(int ac, char **argv) +{ + FILE *f; + char filename[256]; + + snprintf(filename, sizeof(filename), "%s_user_kern.o", argv[0]); + printf("loading %s\n", filename); + + if (load_bpf_file(filename)) { + printf("%s", bpf_log_buf); + return 1; + } + + f = popen("taskset 1 ping localhost", "r"); + (void) f; + read_trace_pipe(); + return 0; +}(quoted diff) +0
-0
b/samples/bpf/trace_ns_info_user_kern.cQuoted 37 lines
new file mode 100644
index 000000000000..96675e02b707
---
/dev/null+++
b/samples/bpf/trace_ns_info_user_kern.c(quoted diff) +14
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include <linux/version.h> +#include <uapi/linux/bpf.h> +#include "bpf_helpers.h" + +typedef __u64 u64;Review
Quoted 10 lines
(quoted diff) +5
-0+typedef __u32 u32; + + +/* kprobe is NOT a stable ABI + * kernel functions can be removed, renamed or completely changesemantics.
Review
Quoted 9 lines
+ * Number of arguments and their positions can change, etc.
+ * In such case this bpf+kprobe example will no longer be meaningful
+ */
(quoted diff) +2
-0+ +/* This will call bpf_get_current_pidns_info() to display pid and nsvalues
Quoted 1 line
+ * as seen by the current namespace, on the far left you will see
the pid as
Review
Quoted 39 lines
+ * seen as by the root namespace.
+ */
(quoted diff) +17
-0+ +SEC("kprobe/__netif_receive_skb_core") +int bpf_prog1(struct pt_regs *ctx) +{ + char fmt[] = "nsid:%u, dev: %u, pid:%u\n"; + struct bpf_pidns_info nsinfo; + int ok = 0; + + ok = bpf_get_current_pidns_info(&nsinfo, sizeof(nsinfo)); + if (ok == 0) + bpf_trace_printk(fmt, sizeof(fmt), (u32)nsinfo.nsid, + (u32) nsinfo.dev, (u32)nsinfo.pid); + + return 0; +} +char _license[] SEC("license") = "GPL"; +u32 _version SEC("version") = LINUX_VERSION_CODE;(quoted diff) +0
-0
b/tools/include/uapi/linux/bpf.hReview union bpf_attr { · line 2742
Quoted 9 lines
index
4393bd4b2419..b0d4869fb860100644---
a/tools/include/uapi/linux/bpf.h+++
b/tools/include/uapi/linux/bpf.h(quoted diff) +0
-0@@ -2741,6 +2741,24 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does not enableSYN cookies
Review union bpf_attr {
Quoted 7 lines
(quoted diff) +2
-0* * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 + * + * int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
+ * Description
+ * Copies into *pidns* pid, namespace id and tgid as
seen by the
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if *size_of_pidns* is not valid or unable
to get ns, pid
Quoted 30 lines
+ * or tgid of the current task.
+ *
+ * **-ENOMEM** if allocation fails.
+ *
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
(quoted diff) +2
-1@@ -2853,7 +2871,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_current_pidns_info),Quoted 1 line
/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
Quoted 22 lines
* function eBPF program intends to call
(quoted diff) +6
-0@@ -3604,4 +3623,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};Review
Quoted 3 lines
#endif /* _UAPI__LINUX_BPF_H__ */
(quoted diff) +0
-0b/tools/testing/selftests/bpf/Makefile
Review TEST_GEN_PROGS = test_verifier test_tag test_maps
Quoted 7 lines
index
3bd0f4a0336a..1f97b571b581100644--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
(quoted diff) +0
-0@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps
test_lru_maptest_lpm_maptestQuoted 3 lines
(quoted diff) +0
-0test_cgroup_storage test_select_reuseport test_section_names \
test_netcnttest_tcpnotify_usertest_sock_fieldstest_sysctl
test_hashmap\Quoted 1 line
test_btf_dumptest_cgroup_attachxdpingtest_sockopt
test_sockopt_sk\Review
Quoted 11 lines
-
test_sockopt_multitest_tcp_rtt+
test_sockopt_multitest_tcp_rtttest_pidns
BPF_OBJ_FILES= $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
TEST_GEN_FILES= $(BPF_OBJ_FILES)(quoted diff) +0
-0
b/tools/testing/selftests/bpf/bpf_helpers.hReview static int (*bpf_send_signal)(unsigned sig) =
Quoted 7 lines
index
120aa86c58d3..c96795a9d983100644---
a/tools/testing/selftests/bpf/bpf_helpers.h+++
b/tools/testing/selftests/bpf/bpf_helpers.h(quoted diff) +0
-0@@ -231,6 +231,9 @@ static int (*bpf_send_signal)(unsigned sig) =(void *)BPF_FUNC_send_signal;
Quoted 3 lines
(quoted diff) +0
-0static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk, void *ip,int
ip_len, void *tcp, int
tcp_len) =Quoted 10 lines
(void *)
BPF_FUNC_tcp_gen_syncookie;+static int (*bpf_get_current_pidns_info)(struct
bpf_pidns_info*buf,+ unsigned int
buf_size) =+ (void *)
BPF_FUNC_get_current_pidns_info;Review
Quoted 5 lines
/* llvm builtin functions that eBPF C program may use to
* emit
BPF_LD_ABSandBPF_LD_INDinstructions(quoted diff) +0
-0
b/tools/testing/selftests/bpf/progs/test_pidns_kern.cReview
Quoted 113 lines
new file mode 100644
index 000000000000..e1d2facfa762
---
/dev/null+++
b/tools/testing/selftests/bpf/progs/test_pidns_kern.c(quoted diff) +51
-0@@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ + +#include <linux/bpf.h> +#include <errno.h> +#include "bpf_helpers.h" + +struct bpf_map_def SEC("maps") nsidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +struct bpf_map_def SEC("maps") pidmap = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(__u32), + .value_size = sizeof(__u32), + .max_entries = 1, +}; + +SEC("tracepoint/syscalls/sys_enter_nanosleep") +int trace(void *ctx) +{ + struct bpf_pidns_info nsinfo; + __u32 key = 0, *expected_pid, *val; + char fmt[] = "ERROR nspid:%d\n"; + + if (bpf_get_current_pidns_info(&nsinfo, sizeof(nsinfo))) + return -EINVAL; + + expected_pid = bpf_map_lookup_elem(&pidmap, &key); + + + if (!expected_pid || *expected_pid != nsinfo.pid) + return 0; + + val = bpf_map_lookup_elem(&nsidmap, &key); + if (val) + *val = nsinfo.nsid; + + return 0; +} + +char _license[] SEC("license") = "GPL"; +__u32 _version SEC("version") = 1;(quoted diff) +0
-0
b/tools/testing/selftests/bpf/test_pidns.cQuoted 131 lines
new file mode 100644
index 000000000000..a7254055f294
---
/dev/null+++
b/tools/testing/selftests/bpf/test_pidns.c(quoted diff) +61
-0@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Carlos Neira [email protected] + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <syscall.h> +#include <unistd.h> +#include <linux/perf_event.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include <linux/bpf.h> +#include <bpf/bpf.h> +#include <bpf/libbpf.h> + +#include "cgroup_helpers.h" +#include "bpf_rlimit.h" + +#define CHECK(condition, tag, format...) ({ \ + int __ret = !!(condition); \ + if (__ret) { \ + printf("%s:FAIL:%s ", __func__, tag); \ + printf(format); \ + } else { \ + printf("%s:PASS:%s\n", __func__, tag); \ + } \ + __ret; \ +}) + +static int bpf_find_map(const char *test, struct bpf_object *obj, + const char *name) +{ + struct bpf_map *map; + + map = bpf_object__find_map_by_name(obj, name); + if (!map) + return -1; + return bpf_map__fd(map); +} + + +int main(int argc, char **argv) +{ + const char *probe_name = "syscalls/sys_enter_nanosleep"; + const char *file = "test_pidns_kern.o"; + int err, bytes, efd, prog_fd, pmu_fd; + int pidmap_fd, nsidmap_fd; + struct perf_event_attr attr = {}; + struct bpf_object *obj; + __u32 knsid = 0; + __u32 key = 0, pid;Review
Quoted 10 lines
(quoted diff) +5
-0+ int exit_code = 1; + struct stat st; + char buf[256]; + + err = bpf_prog_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj,
&prog_fd);Quoted 57 lines
+ if (
CHECK(err, "bpf_prog_load", "err %d errno %d\n", err, errno))+ goto
cleanup_cgroup_env;(quoted diff) +27
-0+ + nsidmap_fd = bpf_find_map(__func__, obj, "nsidmap"); + if (CHECK(nsidmap_fd < 0, "bpf_find_map", "err %d errno %d\n", + nsidmap_fd, errno)) + goto close_prog; + + pidmap_fd = bpf_find_map(__func__, obj, "pidmap"); + if (CHECK(pidmap_fd < 0, "bpf_find_map", "err %d errno %d\n", + pidmap_fd, errno)) + goto close_prog; + + pid = getpid(); + bpf_map_update_elem(pidmap_fd, &key, &pid, 0); + + snprintf(buf, sizeof(buf), + "/sys/kernel/debug/tracing/events/%s/id", probe_name); + efd = open(buf, O_RDONLY, 0); + if (CHECK(efd < 0, "open", "err %d errno %d\n", efd, errno)) + goto close_prog; + bytes = read(efd, buf, sizeof(buf)); + close(efd); + if (CHECK(bytes <= 0 || bytes >= sizeof(buf), "read", + "bytes %d errno %d\n", bytes, errno)) + goto close_prog; + + attr.config = strtol(buf, NULL, 0); + attr.type = PERF_TYPE_TRACEPOINT;Review
Quoted 10 lines
(quoted diff) +5
-0+ attr.sample_type = PERF_SAMPLE_RAW; + attr.sample_period = 1; + attr.wakeup_events = 1; + + pmu_fd = syscall(__NR_perf_event_open, &attr, getpid(), -1,-1, 0);
Quoted 1 line
+ if (CHECK(pmu_fd < 0, "
perf_event_open", "err %d errno %d\n",
pmu_fd,Quoted 9 lines
+ errno))
+ goto
close_prog;(quoted diff) +3
-0+ + err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0); + if (CHECK(err, "perf_event_ioc_enable", "err %d errno %d\n", err,Review
Quoted 10 lines
(quoted diff) +5
-0+ errno)) + goto close_pmu; + + err = ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd); + if (CHECK(err, "perf_event_ioc_set_bpf", "err %d errno %d\n",err,
Quoted 5 lines
+ errno))
+ goto
close_pmu;(quoted diff) +1
-0+Review
Quoted 10 lines
(quoted diff) +5
-0+ /* trigger some syscalls */ + sleep(1); + + err = bpf_map_lookup_elem(nsidmap_fd, &key, &knsid); + if (CHECK(err, "bpf_map_lookup_elem", "err %d errno %d\n",err, errno))
Review
Quoted 13 lines
+ goto
close_pmu;(quoted diff) +6
-0+ + if (stat("/proc/self/ns/pid", &st)) + goto close_pmu; + + if (CHECK(knsid != (__u32) st.st_ino, "compare_namespace_id", + "kern knsid %u user unsid %u\n", knsid, (__u32)st.st_ino))
Quoted 40 lines
+ goto
close_pmu;(quoted diff) +11
-1+ + exit_code = 0; + printf("%s:PASS\n", argv[0]); + +close_pmu: + close(pmu_fd); +close_prog: + bpf_object__close(obj); +cleanup_cgroup_env: + return exit_code; +} --2.11.0
Quoted 15 lines
Quoted 13 lines · Yonghong Song
Quoted 7 lines · Carlos Antonio Neira Bustos
The code has been modified to avoid syscalls that could sleep.
Please let me know if any other modification is needed.
From
be0384c0fa209a78c1567936e8db4e35b9a7c0f8Mon Sep 1700:00:00 2001
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
From: Carlos <[email protected]>
Date: Wed, 7 Aug 2019 20:04:30 -0400
Subject: [PATCH] [PATCH v5 bpf-next] BPF: New helper to obtain
namespace data
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
from current task
This helper obtains the active namespace from current and returns
pid, tgid,
Quoted 1 line
Quoted 1 line
Quoted 1 line
device and namespace id as seen from that namespace, allowing to
instrument
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
a process inside a container.
Device is read from
/proc/self/ns/pid, as in the future it'spossible that
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
different
pid_nsfiles may belong to different devices, accordingto the discussion between Eric Biederman and Yonghong in 2017
linux plumbers
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
conference.
Currently
bpf_get_current_pid_tgid(), is used to do pid filteringin bcc's
Quoted 1 line
Quoted 1 line
Quoted 1 line
scripts but this helper returns the pid as seen by the root
namespace which is
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
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
Quoted 1 line
Quoted 1 line
Quoted 1 line
if
bpf_get_current_pid_tgid()is used. This helper addresses thislimitation
Quoted 1 line
Quoted 1 line
Quoted 1 line
returning the pid as it's seen by the current namespace where the
script is
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
executing.
This helper has the same use cases as
bpf_get_current_pid_tgid()as it can be
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
used to do pid filtering even inside a container.
For example a bcc script using
bpf_get_current_pid_tgid()(
tools/funccount.py):Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
u32 pid =
bpf_get_current_pid_tgid()>> 32;if (pid != <
pid_arg_passed_in>)return 0;
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Could be modified to use
bpf_get_current_pidns_info()as follows:struct
bpf_pidnspidns;bpf_get_current_pidns_info(&pidns, sizeof(struct
bpf_pidns));Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
u32 pid = pidns.tgid;
u32 nsid = pidns.nsid;
if ((pid != <
pid_arg_passed_in>) && (nsid !=<
nsid_arg_passed_in>))Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
return 0;
To find out the name PID namespace id of a process, you could use
this command:
Quoted 22 lines
Quoted 21 lines
Quoted 21 lines
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>---
fs/namei.c | 2 +-
include/linux/bpf.h | 1 +
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
include/linux/namei.h | 4 +
include/uapi/linux/bpf.h | 29 ++++-
kernel/bpf/core.c | 1 +
kernel/bpf/helpers.c | 78
++++++++++++
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
kernel/trace/bpf_trace.c | 2 +
samples/bpf/Makefile | 3 +
samples/bpf/trace_ns_info_user.c | 35 ++++++
samples/bpf/trace_ns_info_user_kern.c | 44 +++++++
tools/include/uapi/linux/bpf.h | 29 ++++-
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
tools/testing/selftests/bpf/Makefile | 2 +-
tools/testing/selftests/bpf/bpf_helpers.h | 3 +
.../testing/selftests/bpf/progs/test_pidns_kern.c | 51 ++++++++
tools/testing/selftests/bpf/test_pidns.c | 138
+++++++++++++++++++++
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
15 files changed, 418 insertions(+), 4 deletions(-)create mode 100644
samples/bpf/trace_ns_info_user.ccreate mode 100644
samples/bpf/trace_ns_info_user_kern.ccreate mode 100644
tools/testing/selftests/bpf/progs/test_pidns_kern.cQuoted 22 lines
Quoted 21 lines
Quoted 21 lines
create mode 100644
tools/testing/selftests/bpf/test_pidns.cfs/namei.c +0
-0index
209c51a5226c..d1eca36972d2100644---
a/fs/namei.c+++
b/fs/namei.cfs/namei.c +0
-1@@ -19,7 +19,6 @@ #include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> Quoted 7 lines
Quoted 7 lines
fs/namei.c int filename_lookup(int dfd, struct
Quoted 7 lines
#include <
linux/namei.h>#include <
linux/pagemap.h>#include <
linux/fsnotify.h>fs/namei.c +0
-0@@ -2355,6 +2354,7 @@ int filename_lookup(int dfd, structfilename *name, unsigned flags,
Quoted 12 lines
Quoted 11 lines
fs/namei.c int filename_lookup(int dfd, struct · line 2360
Quoted 7 lines
fs/namei.c +1
-0putname(name); return retval; } +EXPORT_SYMBOL (filename_lookup);No need to export symbols. bpf uses it and bpf is in the core, not in
Quoted 7 lines
Quoted 7 lines
modules.
Quoted 3 lines
/* Returns 0 and nd will be valid on success; Retuns error,
otherwise. */
Quoted 11 lines
Quoted 11 lines
include/linux/bpf.h extern const struct bpf_func_proto
Quoted 11 lines
static int path_parentat(struct nameidata *nd, unsigned flags,
include/linux/bpf.h +0
-0index
f9a506147c8a..e4adf5e05afd100644---
a/include/linux/bpf.h+++
b/include/linux/bpf.hinclude/linux/bpf.h +0
-0@@ -1050,6 +1050,7 @@ extern const struct bpf_func_proto
bpf_get_local_storage_proto;Quoted 34 lines
Quoted 33 lines
Quoted 33 lines
include/linux/bpf.h +1
-0extern 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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */
void
bpf_user_rnd_init_once(void);include/linux/namei.h +0
-0index
9138b4471dbf..2c24e8c71d46100644---
a/include/linux/namei.h+++
b/include/linux/namei.hinclude/linux/namei.h +1
-0@@ -6,6 +6,7 @@ #include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> Quoted 5 lines
Quoted 5 lines
include/linux/namei.h extern void unlock_rename(struct dentry *,
Quoted 5 lines
enum {
MAX_NESTED_LINKS= 8 };include/linux/namei.h +0
-0@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *,struct dentry *);
Quoted 7 lines
Quoted 7 lines
include/linux/namei.h extern void unlock_rename(struct dentry *, · line 102
Quoted 7 lines
include/linux/namei.h +1
-0extern void nd_jump_link(struct path *path); +extern int filename_lookup(int dfd, struct filename *name,unsigned int flags,
Quoted 11 lines
Quoted 11 lines
include/linux/namei.h extern void unlock_rename(struct dentry *, · line 103
Quoted 1 line
include/linux/namei.h +1
-0+ struct path *path, struct path *root);The previous definition in
fs/internal.hshould be removed.Quoted 3 lines
include/linux/namei.h +1
-0+ static inline void nd_terminate_link(void *name, size_t len,
size_tmaxlen)Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
{
((char *) name)[min(len, maxlen)] = '\0';
include/uapi/linux/bpf.h +0
-0index
4393bd4b2419..6f601f7106e2100644Quoted 7 lines
Quoted 7 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2742
Quoted 7 lines
---
a/include/uapi/linux/bpf.h+++
b/include/uapi/linux/bpf.hinclude/uapi/linux/bpf.h +0
-0@@ -2741,6 +2741,26 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does notenable SYN cookies
Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2745
Quoted 3 lines
include/uapi/linux/bpf.h +0
-0* * **-EPROTONOSUPPORT** IP packet version is not4 or 6
Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr { · line 2748
Quoted 3 lines
include/uapi/linux/bpf.h +2
-0+* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32
size_of_pidns)Quoted 3 lines
Quoted 3 lines
include/uapi/linux/bpf.h union bpf_attr {
Quoted 3 lines
include/uapi/linux/bpf.h +2
-0+ * Description + * Copies into *pidns* pid, namespace id and tgid asseen by the
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
+ * current namespace and also device from
/proc/self/ns/pid.+ * *size_of_pidns* must be the size of *pidns*
+ *
+ * This helper is used when pid filtering is needed inside a
+ * container as
bpf_get_current_tgid()helper returnsalways the
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
+ * pid id as seen by the root namespace.
+ * Return
+ * 0 on success
+ *
+ * **-EINVAL** if unable to get ns, pid or tgid of
current task.
Quoted 18 lines
Quoted 17 lines
Quoted 1 line
+ * Or if
size_of_pidnsis not valid.Maybe reword by following the code sequence.
if *size_of_pidns* is not valid or unable to get ns, pid or tgid of
the current task.
Quoted 3 lines
+ *
+ * **-ENOMEM** if allocation fails.
Quoted 7 lines
Quoted 7 lines
Maybe some other error codes in
filename_lookup()function?Quoted 3 lines
+ *
+ * If unable to get the inode from
/proc/self/ns/pidanerror code
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
+ * will be returned.
You do not need this. The description of error code cases should
cover this.
Quoted 18 lines
Quoted 17 lines
Quoted 17 lines
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
include/uapi/linux/bpf.h +0
-1@@ -2853,7 +2873,8 @@ union bpf_attr { FN(sk_storage_get), \ FN(sk_storage_delete), \ FN(send_signal), \ - FN(tcp_gen_syncookie),Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
+ FN(tcp_gen_syncookie), \
+
FN(get_current_pidns_info),/* integer value in 'imm' field of
BPF_CALLinstruction selectswhich helper
Quoted 26 lines
Quoted 25 lines
Quoted 25 lines
* function eBPF program intends to call
include/uapi/linux/bpf.h +6
-0@@ -3604,4 +3625,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 dev; + __u32 nsid; + __u32 tgid; + __u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/core.c +0
-0Quoted 7 lines
Quoted 7 lines
kernel/bpf/core.c const struct bpf_func_proto
Quoted 7 lines
index
8191a7db2777..3159f2a0188c100644---
a/kernel/bpf/core.c+++
b/kernel/bpf/core.ckernel/bpf/core.c +0
-0@@ -2038,6 +2038,7 @@ const struct bpf_func_proto
bpf_get_current_uid_gid_proto__weak;Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
kernel/bpf/core.c +1
-0const 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_current_pidns_info__weak ;const struct
bpf_func_proto*__weak
bpf_get_trace_printk_proto(void)Quoted 32 lines
Quoted 31 lines
Quoted 31 lines
{
kernel/bpf/helpers.c +0
-0index
5e28718928ca..571f24077db2100644---
a/kernel/bpf/helpers.c+++
b/kernel/bpf/helpers.ckernel/bpf/helpers.c +6
-0@@ -11,6 +11,12 @@ #include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +Quoted 5 lines
Quoted 5 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map
Quoted 5 lines
#include "
../../lib/kstrtox.h"kernel/bpf/helpers.c +0
-0@@ -312,6 +318,78 @@ void copy_map_value_locked(struct bpf_map*map, void *dst, void *src,
Quoted 7 lines
Quoted 7 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map · line 324
Quoted 7 lines
kernel/bpf/helpers.c +1
-0preempt_enable(); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *,
pidns_info, u32,Quoted 190 lines
Quoted 189 lines
kernel/bpf/helpers.c void copy_map_value_locked(struct bpf_map
Quoted 5 lines
kernel/bpf/helpers.c +3
-0+ size) +{ + const char *name = "/proc/self/ns/pid";maybe rename this variable to
pidns_path?Quoted 3 lines
+ struct
pid_namespace*pidns = NULL;+ struct filename *tmp = NULL;
Maybe rename this variable to name?
Quoted 1 line
+ int len = strlen(name) + 1;
We can delay this assignment later until it is needed.
Quoted 11 lines
+ struct inode *inode;
+ struct path kp;
+
pid_ttgid = 0;+
pid_tpid = 0;+ int ret;
kernel/bpf/helpers.c +1
-0+kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ if (unlikely(size != sizeof(struct bpf_pidns_info))) + return -EINVAL; + + pidns = task_active_pid_ns(current); +we can save an empty line here.
kernel/bpf/helpers.c
Quoted 11 lines
+ if (unlikely(!pidns))
+ goto clear;
kernel/bpf/helpers.c +4
-0+ + pidns_info->nsid = pidns->ns.inum; + pid = task_pid_nr_ns(current, pidns); +We can save an empty line here.
kernel/bpf/helpers.c
Quoted 9 lines
+ if (unlikely(!pid))
+ goto clear;
kernel/bpf/helpers.c +3
-0+ + tgid = task_tgid_nr_ns(current, pidns); +ditto. save an empty line.
Quoted 23 lines
+ if (unlikely(!tgid))
+ goto clear;
kernel/bpf/helpers.c +10
-0+ + pidns_info->tgid = (u32) tgid; + pidns_info->pid = (u32) pid; + + tmp = kmem_cache_alloc(names_cachep, GFP_ATOMIC); + if (unlikely(!tmp)) { + memset((void *)pidns_info, 0, (size_t) size); + return -ENOMEM; + } +kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ memcpy((char *)tmp->name, name, len); + tmp->uptr = NULL; + tmp->aname = NULL; + tmp->refcnt = 1; +ditto. save an empty line.
Quoted 3 lines
+ ret =
filename_lookup(AT_FDCWD, tmp, 0, &kp, NULL);+
ditto. save an empty line.
Quoted 15 lines
+ if (ret) {
+ memset((void *)pidns_info, 0, (
size_t) size);+ return ret;
+ }
kernel/bpf/helpers.c +4
-0+ + inode = d_backing_inode(kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; +kernel/bpf/helpers.c
Quoted 10 lines
kernel/bpf/helpers.c +5
-0+ return 0; + +clear: + memset((void *)pidns_info, 0, (size_t) size); +save an empty line.
kernel/bpf/helpers.c
Quoted 9 lines
+ return
-EINVAL;kernel/bpf/helpers.c +4
-0+} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info,make the "= " aligned with others?
Quoted 19 lines
+ .gpl_only = false,
+ .ret_type =
RET_INTEGER,+ .arg1_type =
ARG_PTR_TO_UNINIT_MEM,+ .arg2_type =
ARG_CONST_SIZE,kernel/bpf/helpers.c +2
-0+}; +#ifdef
CONFIG_CGROUPS
BPF_CALL_0(bpf_get_current_cgroup_id){
kernel/trace/bpf_trace.c +0
-0Quoted 7 lines
Quoted 7 lines
kernel/trace/bpf_trace.c tracing_func_proto(enum bpf_func_id func_id,
Quoted 7 lines
index
ca1255d14576..5e1dc22765a5100644---
a/kernel/trace/bpf_trace.c+++
b/kernel/trace/bpf_trace.ckernel/trace/bpf_trace.c +0
-0@@ -709,6 +709,8 @@ tracing_func_proto(enum bpf_func_id func_id,const struct
bpf_prog*prog)Quoted 35 lines
Quoted 35 lines
Quoted 33 lines
kernel/trace/bpf_trace.c +0
-0#endifcase
BPF_FUNC_send_signal:return
&bpf_send_signal_proto;+ case
BPF_FUNC_get_current_pidns_info:+ return
&bpf_get_current_pidns_info_proto;default:
return NULL;
}
samples/bpf/Makefile +0
-0index
1d9be26b4edd..238453ff27d2100644--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
samples/bpf/Makefile +0
-0@@ -53,6 +53,7 @@ hostprogs-y += task_fd_queryhostprogs-y +=
xdp_sample_pktshostprogs-y += ibumad
hostprogs-y += hbm
+hostprogs-y +=
trace_ns_info[...]
Re: [PATCH v5 bpf-next] BPF: helpers: New helper to obtain namespacedata from current task
Quoted 4 lines · Carlos Antonio Neira Bustos
Yonghong,
I have splitted the patch in 2 :
Quoted 8 lines
-
bpf_helperintroduction :From
40ec0781525b82d5235c45f5066a7a79dea71065Mon Sep 17 00:00:00 2001
From: Carlos <[email protected]>
Date: Fri, 9 Aug 2019 12:20:52 -0700
Subject: [PATCH 1/2] [PATCH v8 bpf-next 1/2] BPF: New helper to obtain
namespace data from current task
Such a submission is not what kernel developer typically do. You can read through the following docs for more details.
https://www.kernel.org/doc/html/v4.17/process/submitting-patches.html
Typically, I am using
git format-patch --cover-letter --subject-prefix="PATCH bpf-next
<version>" ...
to generate the patch set, you need edit patchset 0 with proper contents.
After patch set is properly prepared, you can use
git send-email --to <...> --to <...> --cc <...> --cc <...> <All your
patches>
to submit the patch.
I still prefer you to further split the patch into more than two with my original suggestions. It might be difficult to do if you try to attach the patches like below.
But it should become easier when you use the above
"git format-patch ..." and "git send-email ..." approach.
Quoted 329 lines
This helper obtains the active namespace from current and returns pid, tgid, device and namespace id as seen from that namespace, allowing to instrument a process inside a container.
Device is read from/proc/self/ns/pid, as in the future it's possible that differentpid_nsfiles may belong to different devices, according to the discussion between Eric Biederman and Yonghong in 2017 linux plumbers conference.
Currentlybpf_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 ifbpf_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.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.For example a bcc script using
bpf_get_current_pid_tgid()(tools/funccount.py):u32 pid = bpf_get_current_pid_tgid() >> 32; if (pid != <pid_arg_passed_in>) return 0;Could be modified to use
bpf_get_current_pidns_info()as follows:struct bpf_pidns pidns; bpf_get_current_pidns_info(&pidns, sizeof(struct bpf_pidns)); u32 pid = pidns.tgid; u32 nsid = pidns.nsid; if ((pid != <pid_arg_passed_in>) && (nsid != <nsid_arg_passed_in>)) return 0;To find out the name PID namespace id of a process, you could use this command:
$ ps -h -o pidns -p <pid_of_interest>Or this other command:
$ ls -Li /proc/<pid_of_interest>/ns/pidSigned-off-by Carlos Neira <[email protected]>--- fs/internal.h | 2 -- fs/namei.c | 1 - include/linux/bpf.h | 1 + include/linux/namei.h | 4 +++ include/uapi/linux/bpf.h | 31 +++++++++++++++++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 64 ++++++++++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 2 ++ tools/include/uapi/linux/bpf.h | 31 +++++++++++++++++++- 9 files changed, 132 insertions(+), 5 deletions(-)fs/internal.h +0
-2@@ -59,8 +59,6 @@ extern int finish_clean_context(struct fs_context *fc);/* * namei.c */ -extern int filename_lookup (int dfd,struct filename *name,unsigned flags, -struct path *path,struct path *root);extern int user_path_mountpoint_at (int ,const char __user *,unsigned int ,struct path *);extern int vfs_path_lookup (struct dentry *,struct vfsmount *,const char *,unsigned int ,struct path *);fs/namei.c +0
-1@@ -19,7 +19,6 @@#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/fs.h> #include <linux/namei.h> #include <linux/pagemap.h> #include <linux/fsnotify.h> include/linux/bpf.h +1
-0@@ -1050,6 +1050,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_current_pidns_info_proto;/* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once (void );include/linux/namei.h +4
-0@@ -6,6 +6,7 @@#include <linux/path.h> #include <linux/fcntl.h> #include <linux/errno.h> +#include <linux/fs.h> enum {MAX_NESTED_LINKS =8 };@@ -97,6 +98,9 @@ extern void unlock_rename(struct dentry *, struct dentry *);extern void nd_jump_link (struct path *path); +extern int filename_lookup (int dfd,struct filename *name,unsigned flags, +struct path *path,struct path *root); +static inline void nd_terminate_link (void *name,size_t len,size_t maxlen) { ((char *) name)[min (len, maxlen)] ='\0' ;include/uapi/linux/bpf.h +30
-1@@ -2741,6 +2741,28 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ECHILD** if /proc/self/ns/pid does not exists. +* +* **-ENOTDIR** if /proc/self/ns does not exists. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3627,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/core.c +1
-0@@ -2038,6 +2038,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_current_pidns_info__weak ;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {kernel/bpf/helpers.c +64
-0@@ -11,6 +11,12 @@#include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/pid_namespace.h> +#include <linux/major.h> +#include <linux/stat.h> +#include <linux/namei.h> +#include <linux/version.h> +#include "../../lib/kstrtox.h" @@ -312,6 +318,64 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,preempt_enable (); } +BPF_CALL_2(bpf_get_current_pidns_info, struct bpf_pidns_info *, pidns_info, u32, + size) +{ +const char *pidns_path ="/proc/self/ns/pid" ; +struct pid_namespace *pidns =NULL ; +struct filename *tmp =NULL ; +struct inode *inode; +struct path kp; +pid_t tgid =0 ; +pid_t pid =0 ; +int ret; +int len; + +if (unlikely (size !=sizeof (struct bpf_pidns_info ))) +return -EINVAL ; + pidns =task_active_pid_ns (current); +if (unlikely (!pidns)) + goto clear; + pidns_info->nsid = pidns->ns.inum; + pid =task_pid_nr_ns (current, pidns); +if (unlikely (!pid)) + goto clear; + tgid =task_tgid_nr_ns (current, pidns); +if (unlikely (!tgid)) + goto clear; + pidns_info->tgid = (u32 ) tgid; + pidns_info->pid = (u32 ) pid; + tmp =kmem_cache_alloc (names_cachep,GFP_ATOMIC ); +if (unlikely (!tmp)) { +memset ((void *)pidns_info,0 , (size_t ) size); +return -ENOMEM ; + } + len =strlen (pidns_path) +1 ; +memcpy ((char *)tmp->name, pidns_path, len); + tmp->uptr =NULL ; + tmp->aname =NULL ; + tmp->refcnt =1 ; + ret =filename_lookup (AT_FDCWD , tmp,0 , &kp,NULL ); +if (ret) { +memset ((void *)pidns_info,0 , (size_t ) size); +return ret; + } + inode =d_backing_inode (kp.dentry); + pidns_info->dev = inode->i_sb->s_dev; +return 0 ; +clear: +memset ((void *)pidns_info,0 , (size_t ) size); +return -EINVAL ; +} + +const struct bpf_func_proto bpf_get_current_pidns_info_proto = { + .func = bpf_get_current_pidns_info, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_UNINIT_MEM , + .arg2_type =ARG_CONST_SIZE , +}; +#ifdef CONFIG_CGROUPS BPF_CALL_0 (bpf_get_current_cgroup_id) {kernel/trace/bpf_trace.c +2
-0@@ -709,6 +709,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_current_pidns_info: +return &bpf_get_current_pidns_info_proto;default :return NULL ; }tools/include/uapi/linux/bpf.h +30
-1@@ -2741,6 +2741,28 @@ union bpf_attr {* **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 +* +* int bpf_get_current_pidns_info(struct bpf_pidns_info *pidns, u32 size_of_pidns) +* Description +* Copies into *pidns* pid, namespace id and tgid as seen by the +* current namespace and also device from /proc/self/ns/pid. +* *size_of_pidns* must be the size of *pidns* +* +* This helper is used when pid filtering is needed inside a +* container as bpf_get_current_tgid() helper returns always the +* pid id as seen by the root namespace. +* Return +* 0 on success +* +* **-EINVAL** if *size_of_pidns* is not valid or unable to get ns, pid +* or tgid of the current task. +* +* **-ECHILD** if /proc/self/ns/pid does not exists. +* +* **-ENOTDIR** if /proc/self/ns does not exists. +* +* **-ENOMEM** if allocation fails. +* */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -2853,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_current_pidns_info),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3604,4 +3627,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { +__u32 dev; +__u32 nsid; +__u32 tgid; +__u32 pid; +};#endif /* _UAPI__LINUX_BPF_H__ */