bpf: New bpf helpers to get perf type of [uk]probe
Subsystems (6)
RFC PATCH 1/1 bpf: New bpf helpers to get perf type of [uk]probe
We are utilizing BPF LSM to monitor BPF operations within our container environment. Our goal is to examine the program type and perform the respective audits in our LSM program.
When it comes to the perf_event BPF program, there are no specific definitions for the perf types of kprobe or uprobe. In other words, there is no PERF_TYPE_[UK]PROBE. It appears that defining them as UAPI at this stage would be impractical.
Therefore, if we wish to determine whether a new BPF program created via perf_event_open() is a kprobe or an uprobe, we need to retrieve the type in userspace by reading /sys/bus/event_source/devices/[uk]probe/type and subsequently store it in global variables within the LSM program. This approach proves to be inconvenient.
Here is a short example of LSM program.
static int perf_type_kprobe = -1; // set it from userspace static int perf_type_uprobe = -1; // set it from userspace
SEC("lsm/perf_event_open")
int BPF_PROG(perf_event_audit, struct perf_event_attr *attr, int type)
{
if (attr->type == perf_type_kprobe)
return perf_event_kprobe_audit(attr);
if (attr->type == perf_type_uprobe)
return perf_event_uprobe_audit(attr);
return 0;
}Two new BPF helpers have been introduced to enhance the functionality. These helpers allow us to directly obtain the perf type of a kprobe or uprobe within a BPF program.
After that change, the LSM prog as follows,
static int perf_type_kprobe;
static int perf_type_uprobe;
SEC("lsm/perf_event_open")
int BPF_PROG(perf_event_audit, struct perf_event_attr *attr, int type)
{
if (!perf_type_kprobe)
perf_type_kprobe = bpf_perf_type_kprobe();
if (!perf_type_uprobe)
perf_type_uprobe = bpf_perf_type_uprobe(); if (attr->type == perf_type_kprobe)
return perf_event_kprobe_audit(attr);
if (attr->type == perf_type_uprobe)
return perf_event_uprobe_audit(attr);
return 0;}
Yafang Shao (2):
perf: Add perf_type_[uk]probe()
bpf: Add two new bpf helpers bpf_perf_type_[uk]probe()
include/linux/bpf.h | 2 ++ include/linux/perf_event.h | 3 +++ include/uapi/linux/bpf.h | 18 ++++++++++++++++++ kernel/bpf/core.c | 2 ++ kernel/bpf/helpers.c | 23 +++++++++++++++++++++++ kernel/events/core.c | 18 ++++++++++++++++++ kernel/trace/bpf_trace.c | 4 ++++ tools/include/uapi/linux/bpf.h | 18 ++++++++++++++++++ 8 files changed, 88 insertions(+)
Signature · 1 line
1.8.3.1
RFC PATCH 1/1 perf: Add perf_type_[uk]probe()
Add perf_type_uprobe() to get the perf_type of uprobe and perf_type_kprobe() to get the perf_type of kprobe.
--- include/linux/perf_event.h | 3 +++ kernel/events/core.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+)
include/linux/perf_event.h +3 -0
@@ -1881,4 +1881,7 @@ static inline void perf_lopwr_cb(bool mode) }#endif +int perf_type_kprobe (void ); +int perf_type_uprobe (void ); +#endif /* _LINUX_PERF_EVENT_H */
kernel/events/core.c +18 -0
@@ -10456,6 +10456,24 @@ static inline bool perf_event_is_tracing(struct perf_event *event)return false; } +int perf_type_kprobe (void ) +{ +#ifdef CONFIG_KPROBE_EVENTS +return perf_kprobe.type; +#else +return -EOPNOTSUPP ; +#endif +} + +int perf_type_uprobe (void ) +{ +#ifdef CONFIG_UPROBE_EVENTS +return perf_uprobe.type; +#else +return -EOPNOTSUPP ; +#endif +} +int perf_event_set_bpf_prog (struct perf_event *event,struct bpf_prog *prog,u64 bpf_cookie) {
Signature · 1 line
1.8.3.1
RFC PATCH 1/1 bpf: Add two new bpf helpers bpf_perf_type_[uk]probe()
In reply to Yafang ShaoWe are utilizing BPF LSM to monitor BPF operations within our container environment. Our goal is to examine the program type and perform the respective audits in our LSM program.
When it comes to the perf_event BPF program, there are no specific definitions for the perf types of kprobe or uprobe. In other words, there is no PERF_TYPE_[UK]PROBE. It appears that defining them as UAPI at this stage would be impractical.
Therefore, if we wish to determine whether a new BPF program created via perf_event_open() is a kprobe or an uprobe, we need to retrieve the type in userspace by reading /sys/bus/event_source/devices/[uk]probe/type and subsequently store it in global variables within the LSM program. This approach proves to be inconvenient.
Two new BPF helpers have been introduced to enhance the functionality. These helpers allow us to directly obtain the perf type of a kprobe or uprobe within a BPF program.
--- include/linux/bpf.h | 2 ++ include/uapi/linux/bpf.h | 18 ++++++++++++++++++ kernel/bpf/core.c | 2 ++ kernel/bpf/helpers.c | 23 +++++++++++++++++++++++ kernel/trace/bpf_trace.c | 4 ++++ tools/include/uapi/linux/bpf.h | 18 ++++++++++++++++++ 6 files changed, 67 insertions(+)
include/linux/bpf.h +2 -0
@@ -2909,6 +2909,8 @@ static inline int bpf_fd_reuseport_array_update_elem(struct bpf_map *map,extern const struct bpf_func_proto bpf_user_ringbuf_drain_proto;extern const struct bpf_func_proto bpf_cgrp_storage_get_proto;extern const struct bpf_func_proto bpf_cgrp_storage_delete_proto; +extern const struct bpf_func_proto bpf_perf_type_kprobe_proto; +extern const struct bpf_func_proto bpf_perf_type_uprobe_proto;const struct bpf_func_proto *tracing_prog_func_proto (enum bpf_func_id func_id,const struct bpf_prog *prog);
include/uapi/linux/bpf.h +18 -0
@@ -5572,6 +5572,22 @@ struct bpf_stack_build_id {* 0 on success. * * **-ENOENT** if the bpf_local_storage cannot be found. +* +* int bpf_perf_type_kprobe(void) +* Description +* Get perf_kprobe.type +* Return +* perf_kprobe.type on success. +* +* **-EOPNOTSUPP** if CONFIG_KPROBE_EVENTS is not set. +* +* int bpf_perf_type_uprobe(void) +* Description +* Get perf_uprobe.type +* Return +* perf_uprobe.type on success. +* +* **-EOPNOTSUPP** if CONFIG_UPROBE_EVENTS is not set. */ #define ___BPF_FUNC_MAPPER(FN, ctx...) \ FN(unspec, 0, ##ctx) \
@@ -5786,6 +5802,8 @@ struct bpf_stack_build_id { FN(user_ringbuf_drain, 209, ##ctx) \ FN(cgrp_storage_get, 210, ##ctx) \ FN(cgrp_storage_delete, 211, ##ctx) \ + FN(perf_type_kprobe, 212, ##ctx) \ + FN(perf_type_uprobe, 213, ##ctx) \/* */ /* backwards-compatibility macros for users of __BPF_FUNC_MAPPER that don't
kernel/bpf/core.c +2 -0
@@ -2666,6 +2666,8 @@ void bpf_user_rnd_init_once(void)const struct bpf_func_proto bpf_seq_printf_btf_proto__weak ;const struct bpf_func_proto bpf_set_retval_proto__weak ;const struct bpf_func_proto bpf_get_retval_proto__weak ; +const struct bpf_func_proto bpf_perf_type_kprobe__weak; +const struct bpf_func_proto bpf_perf_type_uprobe__weak;const struct bpf_func_proto *__weak bpf_get_trace_printk_proto (void ) {
kernel/bpf/helpers.c +23 -0
@@ -22,6 +22,7 @@#include <linux/security.h> #include <linux/btf_ids.h> #include <linux/bpf_mem_alloc.h> +#include <linux/perf_event.h> #include "../../lib/kstrtox.h"
@@ -1654,6 +1655,28 @@ static int bpf_dynptr_check_off_len(const struct bpf_dynptr_kern *ptr, u32 offse .arg3_type = ARG_CONST_ALLOC_SIZE_OR_ZERO, }; +BPF_CALL_0 (bpf_perf_type_kprobe) +{ +return perf_type_kprobe (); +} + +const struct bpf_func_proto bpf_perf_type_kprobe_proto = { + .func = bpf_perf_type_kprobe, + .gpl_only = false, + .ret_type =RET_INTEGER , +}; + +BPF_CALL_0 (bpf_perf_type_uprobe) +{ +return perf_type_uprobe (); +} + +const struct bpf_func_proto bpf_perf_type_uprobe_proto = { + .func = bpf_perf_type_uprobe, + .gpl_only = false, + .ret_type =RET_INTEGER , +}; +const struct bpf_func_proto bpf_get_current_task_proto__weak ;const struct bpf_func_proto bpf_get_current_task_btf_proto__weak ;const struct bpf_func_proto bpf_probe_read_user_proto__weak ;
kernel/trace/bpf_trace.c +4 -0
@@ -1510,6 +1510,10 @@ static int __init bpf_key_sig_kfuncs_init(void)return &bpf_find_vma_proto;case BPF_FUNC_trace_vprintk:return bpf_get_trace_vprintk_proto (); +case BPF_FUNC_perf_type_kprobe: +return &bpf_perf_type_kprobe_proto; +case BPF_FUNC_perf_type_uprobe: +return &bpf_perf_type_uprobe_proto;default :return bpf_base_func_proto (func_id); }
tools/include/uapi/linux/bpf.h +18 -0
@@ -5572,6 +5572,22 @@ struct bpf_stack_build_id {* 0 on success. * * **-ENOENT** if the bpf_local_storage cannot be found. +* +* int bpf_perf_type_kprobe(void) +* Description +* Get perf_kprobe.type +* Return +* perf_kprobe.type on success. +* +* **-EOPNOTSUPP** if CONFIG_KPROBE_EVENTS is not set. +* +* int bpf_perf_type_uprobe(void) +* Description +* Get perf_uprobe.type +* Return +* perf_uprobe.type on success. +* +* **-EOPNOTSUPP** if CONFIG_UPROBE_EVENTS is not set. */ #define ___BPF_FUNC_MAPPER(FN, ctx...) \ FN(unspec, 0, ##ctx) \
@@ -5786,6 +5802,8 @@ struct bpf_stack_build_id { FN(user_ringbuf_drain, 209, ##ctx) \ FN(cgrp_storage_get, 210, ##ctx) \ FN(cgrp_storage_delete, 211, ##ctx) \ + FN(perf_type_kprobe, 212, ##ctx) \ + FN(perf_type_uprobe, 213, ##ctx) \/* */ /* backwards-compatibility macros for users of __BPF_FUNC_MAPPER that don't
Signature · 1 line
1.8.3.1
kernel test robot
build botRe: [RFC PATCH bpf-next] bpf: Add two new bpf helpers bpf_perf_type_[uk]probe()
kernel test robot noticed the following build errors:
Hi Yafang,
[This is a private test report for your RFC patch.] kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Yafang-Shao/bpf-Add-two-new-bpf-helpers-bpf_perf_type_-uk-probe/20230621-200309 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20230621120042.3903-3-laoar.shao%40gmail.com patch subject: [RFC PATCH bpf-next] bpf: Add two new bpf helpers bpf_perf_type_[uk]probe() config: x86_64-kexec (https://download.01.org/0day-ci/archive/20230622/[email protected]/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce: (https://download.01.org/0day-ci/archive/20230622/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
kernel/bpf/helpers.c: In function '____bpf_perf_type_kprobe':
>> kernel/bpf/helpers.c:1660:16: error: implicit declaration of function 'perf_type_kprobe'; did you mean 'bpf_perf_type_kprobe'? [-Werror=implicit-function-declaration]
1660 | return perf_type_kprobe();
| ^~~~~~~~~~~~~~~~
| bpf_perf_type_kprobe
kernel/bpf/helpers.c: In function '____bpf_perf_type_uprobe':
>> kernel/bpf/helpers.c:1671:16: error: implicit declaration of function 'perf_type_uprobe'; did you mean 'bpf_perf_type_uprobe'? [-Werror=implicit-function-declaration]
1671 | return perf_type_uprobe();
| ^~~~~~~~~~~~~~~~
| bpf_perf_type_uprobecc1: some warnings being treated as errors
vim +1660 kernel/bpf/helpers.c
1657
1658 BPF_CALL_0(bpf_perf_type_kprobe)
1659 {
> 1660 return perf_type_kprobe();
1661 }
1662
1663 const struct bpf_func_proto bpf_perf_type_kprobe_proto = {
1664 .func = bpf_perf_type_kprobe,
1665 .gpl_only = false,
1666 .ret_type = RET_INTEGER,
1667 };
1668
1669 BPF_CALL_0(bpf_perf_type_uprobe)
1670 {
> 1671 return perf_type_uprobe(); 1672 }
1673
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [RFC PATCH bpf-next] bpf: Add two new bpf helpers bpf_perf_type_[uk]probe()
In reply to Yafang ShaoQuoted 9 lines · Yafang Shao
We are utilizing BPF LSM to monitor BPF operations within our container environment. Our goal is to examine the program type and perform the respective audits in our LSM program.
When it comes to the
perf_eventBPF program, there are no specific definitions for the perf types of kprobe or uprobe. In other words, there is no PERF_TYPE_[UK]PROBE. It appears that defining them as UAPI at this stage would be impractical.
and yet that's what your patch does.
New helpers are uapi too.
So no-go.
Just do in your filtering bpf prog:
is_kprobe = event->tp_event->flags & TRACE_EVENT_FL_KPROBE;
is_uprobe = event->tp_event->flags & TRACE_EVENT_FL_UPROBE;when it's checking perf_ioctl.
Re: [RFC PATCH bpf-next] bpf: Add two new bpf helpers bpf_perf_type_[uk]probe()
Quoted 12 lines · Alexei Starovoitov
Quoted 9 lines · Yafang Shao
We are utilizing BPF LSM to monitor BPF operations within our container environment. Our goal is to examine the program type and perform the respective audits in our LSM program.
When it comes to the
perf_eventBPF program, there are no specific definitions for the perf types of kprobe or uprobe. In other words, there is no PERF_TYPE_[UK]PROBE. It appears that defining them as UAPI at this stage would be impractical.
Quoted 8 lines
and yet that's what your patch does.
New helpers are uapi too.
So no-go.Just do in your filtering bpf prog:
is_kprobe = event->tp_event->flags & TRACE_EVENT_FL_KPROBE; is_uprobe = event->tp_event->flags & TRACE_EVENT_FL_UPROBE;when it's checking
perf_ioctl.
Right. We can hook security_perf_event_write.
Thanks for your suggestion.
Signature · 2 lines
Regards Yafang