bpf, tracing: introduce bpf raw tracepoints
Subsystems (31)
v3 cover bpf, tracing: introduce bpf raw tracepoints
From: Alexei Starovoitov <[email protected]>
v2->v3:
- with Linus's suggestion introduced generic COUNT_ARGS and CONCATENATE macros (or rather moved them from apparmor)
that cleaned up patches 6 and 7
- added patch 4 to refactor trace_iwlwifi_dev_ucode_error() from 17 args to 4 Now any tracepoint with >12 args will have build error
v1->v2:
- simplified api by combing bpf_raw_tp_open(name) + bpf_attach(prog_fd) into bpf_raw_tp_open(name, prog_fd) as suggested by Daniel.
That simplifies bpf_detach as well which is now simple close() of fd.
- fixed memory leak in error path which was spotted by Daniel.
- fixed bpf_get_stackid(), bpf_perf_event_output() called from raw tracepoints
- added more tests
- fixed allyesconfig build caught by buildbot
v1:
This patch set is a different way to address the pressing need to access task_struct pointers in sched tracepoints from bpf programs.
The first approach simply added these pointers to sched tracepoints:
https://lkml.org/lkml/2017/12/14/753
which Peter nacked.
Few options were discussed and eventually the discussion converged on doing bpf specific tracepoint_probe_register() probe functions. Details here:
https://lkml.org/lkml/2017/12/20/929
Patch 1 is kernel wide cleanup of pass-struct-by-value into pass-struct-by-reference into tracepoints.
Patches 2 and 3 are minor cleanups to address allyesconfig build
Patch 4 refactor trace_iwlwifi_dev_ucode_error from 17 to 4 args
Patch 5 introduces COUNT_ARGS macro
Patch 6 minor prep work to expose number of arguments passed into tracepoints.
Patch 7 introduces BPF_RAW_TRACEPOINT api.
the auto-cleanup and multiple concurrent users are must have features of tracing api. For bpf raw tracepoints it looks like:
// load bpf prog with BPF_PROG_TYPE_RAW_TRACEPOINT type prog_fd = bpf_prog_load(...);
// receive anon_inode fd for given bpf_raw_tracepoint // and attach bpf program to it
raw_tp_fd = bpf_raw_tracepoint_open("xdp_exception", prog_fd);
Ctrl-C of tracing daemon or cmdline tool will automatically detach bpf program, unload it and unregister tracepoint probe. More details in patch 7.
Patch 8 - trivial support in libbpf
Patches 9, 10 - user space tests
samples/bpf/test_overhead performance on 1 cpu:
tracepoint base kprobe+bpf tracepoint+bpf raw_tracepoint+bpf task_rename 1.1M 769K 947K 1.0M urandom_read 789K 697K 750K 755K
Alexei Starovoitov (10):
treewide: remove struct-pass-by-value from tracepoints arguments net/mediatek: disambiguate mt76 vs mt7601u trace events net/mac802154: disambiguate mac80215 vs mac802154 trace events net/wireless/iwlwifi: fix iwlwifi_dev_ucode_error tracepoint
macro: introduce COUNT_ARGS() macro
tracepoint: compute num_args at build time
bpf: introduce BPF_RAW_TRACEPOINT
libbpf: add bpf_raw_tracepoint_open helper samples/bpf: raw tracepoint test
selftests/bpf: test for bpf_get_stackid() from raw tracepoints
arch/x86/xen/mmu_pv.c | 16 +- drivers/gpu/drm/i915/i915_trace.h | 13 +- drivers/infiniband/hw/hfi1/file_ops.c | 2 +- drivers/infiniband/hw/hfi1/trace_ctxts.h | 12 +- drivers/net/wireless/intel/iwlwifi/dvm/main.c | 7 +- .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 39 ++- drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c | 1 + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 7 +- drivers/net/wireless/mediatek/mt7601u/trace.h | 6 +- drivers/s390/cio/ioasm.c | 18 +- drivers/s390/cio/trace.h | 50 ++-- fs/dax.c | 2 +- include/linux/bpf_types.h | 1 + include/linux/kernel.h | 7 + include/linux/trace_events.h | 37 +++ include/linux/tracepoint-defs.h | 1 + include/linux/tracepoint.h | 28 ++- include/trace/bpf_probe.h | 82 +++++++ include/trace/define_trace.h | 15 +- include/trace/events/f2fs.h | 2 +- include/trace/events/fs_dax.h | 6 +- include/trace/events/rcu.h | 4 +- include/trace/events/xen.h | 32 +-- include/uapi/linux/bpf.h | 11 + kernel/bpf/syscall.c | 87 +++++++ kernel/rcu/tree.c | 10 +- kernel/trace/bpf_trace.c | 270 +++++++++++++++++++++ kernel/tracepoint.c | 27 ++- net/mac802154/trace.h | 8 +- net/wireless/trace.h | 2 +- samples/bpf/Makefile | 1 + samples/bpf/bpf_load.c | 14 ++ samples/bpf/test_overhead_raw_tp_kern.c | 17 ++ samples/bpf/test_overhead_user.c | 12 + security/apparmor/include/path.h | 7 +- sound/firewire/amdtp-stream-trace.h | 2 +- tools/include/uapi/linux/bpf.h | 11 + tools/lib/bpf/bpf.c | 11 + tools/lib/bpf/bpf.h | 1 + tools/testing/selftests/bpf/test_progs.c | 91 +++++-- 40 files changed, 794 insertions(+), 176 deletions(-) create mode 100644 include/trace/bpf_probe.h create mode 100644 samples/bpf/test_overhead_raw_tp_kern.c
Signature · 1 line
2.9.5
PATCH v3 1/10 treewide: remove struct-pass-by-value from tracepoints arguments
From: Alexei Starovoitov <[email protected]>
Fix all tracepoint arguments to pass structures (large and small) by reference instead of by value.
Avoiding passing large structs by value is a good coding style. Passing small structs sometimes is beneficial, but in all cases it makes no difference vs readability of the code.
The subsequent patch enforces that all tracepoints args are either integers or pointers and fit into 64-bit.
--- arch/x86/xen/mmu_pv.c | 16 +++++----- drivers/gpu/drm/i915/i915_trace.h | 13 +++++++-- drivers/infiniband/hw/hfi1/file_ops.c | 2 +- drivers/infiniband/hw/hfi1/trace_ctxts.h | 12 ++++---- drivers/s390/cio/ioasm.c | 18 ++++++------ drivers/s390/cio/trace.h | 50 ++++++++++++++++---------------- fs/dax.c | 2 +- include/trace/events/f2fs.h | 2 +- include/trace/events/fs_dax.h | 6 ++-- include/trace/events/rcu.h | 4 +-- include/trace/events/xen.h | 32 ++++++++++---------- kernel/rcu/tree.c | 10 +++---- net/wireless/trace.h | 2 +- sound/firewire/amdtp-stream-trace.h | 2 +- 14 files changed, 89 insertions(+), 82 deletions(-)
arch/x86/xen/mmu_pv.c +8 -8
@@ -218,7 +218,7 @@ static void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val)static void xen_set_pmd (pmd_t *ptr,pmd_t val) { -trace_xen_mmu_set_pmd (ptr, val); +trace_xen_mmu_set_pmd (ptr, &val);/* If page is not pinned, we can just update the entry directly */
@@ -277,14 +277,14 @@ static inline void __xen_set_pte(pte_t *ptep, pte_t pteval)static void xen_set_pte (pte_t *ptep,pte_t pteval) { -trace_xen_mmu_set_pte (ptep, pteval); +trace_xen_mmu_set_pte (ptep, &pteval);__xen_set_pte (ptep, pteval); }static void xen_set_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pteval) { -trace_xen_mmu_set_pte_at (mm, addr, ptep, pteval); +trace_xen_mmu_set_pte_at (mm, addr, ptep, &pteval);__xen_set_pte (ptep, pteval); }
@@ -292,7 +292,7 @@ pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep) {/* Just return the pte as-is. We preserve the bits on commit */ - trace_xen_mmu_ptep_modify_prot_start(mm, addr, ptep, *ptep); +trace_xen_mmu_ptep_modify_prot_start (mm ,addr ,ptep ,ptep );return *ptep; }
@@ -301,7 +301,7 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, {struct mmu_update u; -trace_xen_mmu_ptep_modify_prot_commit (mm, addr, ptep, pte); +trace_xen_mmu_ptep_modify_prot_commit (mm, addr, ptep, &pte);xen_mc_batch (); u.ptr =virt_to_machine (ptep).maddr |MMU_PT_UPDATE_PRESERVE_AD ;
@@ -409,7 +409,7 @@ static void xen_set_pud_hyper(pud_t *ptr, pud_t val)static void xen_set_pud (pud_t *ptr,pud_t val) { -trace_xen_mmu_set_pud (ptr, val); +trace_xen_mmu_set_pud (ptr, &val);/* If page is not pinned, we can just update the entry directly */
@@ -424,7 +424,7 @@ static void xen_set_pud(pud_t *ptr, pud_t val)#ifdef CONFIG_X86_PAE static void xen_set_pte_atomic (pte_t *ptep,pte_t pte) { -trace_xen_mmu_set_pte_atomic (ptep, pte); +trace_xen_mmu_set_pte_atomic (ptep, &pte);set_64bit ((u64 *)ptep,native_pte_val (pte)); }
@@ -514,7 +514,7 @@ static void xen_set_p4d(p4d_t *ptr, p4d_t val)pgd_t *user_ptr =xen_get_user_pgd ((pgd_t *)ptr);pgd_t pgd_val; -trace_xen_mmu_set_p4d (ptr, (p4d_t *)user_ptr, val); +trace_xen_mmu_set_p4d (ptr, (p4d_t *)user_ptr, &val);/* If page is not pinned, we can just update the entry directly */
drivers/gpu/drm/i915/i915_trace.h +10 -3
@@ -849,8 +849,8 @@ TRACE_EVENT(i915_flip_complete,TP_printk ("plane=%d, obj=%p" , __entry->plane, __entry->obj) ); -TRACE_EVENT_CONDITION(i915_reg_rw, - TP_PROTO(bool write, i915_reg_t reg, u64 val, int len, bool trace), +TRACE_EVENT_CONDITION(i915_reg_rw__, + TP_PROTO(bool write, u32 reg, u64 val, int len, bool trace), TP_ARGS(write, reg, val, len, trace),
@@ -865,7 +865,7 @@ TRACE_EVENT_CONDITION(i915_reg_rw,TP_fast_assign ( __entry->val = (u64)val; - __entry->reg =i915_mmio_reg_offset (reg); + __entry->reg = reg; __entry->write = write; __entry->len = len; ),
@@ -876,6 +876,13 @@ TRACE_EVENT_CONDITION(i915_reg_rw, (u32)(__entry->val &0xffffffff ), (u32)(__entry->val >> 32)) ); +#if !defined(CREATE_TRACE_POINTS ) && !defined(TRACE_HEADER_MULTI_READ ) +static inline void trace_i915_reg_rw (bool write,i915_reg_t reg,u64 val, +int len,bool trace) +{ +trace_i915_reg_rw__ (write,i915_mmio_reg_offset (reg), val, len, trace); +} +#endif TRACE_EVENT(intel_gpu_freq_change, TP_PROTO(u32 freq),
drivers/infiniband/hw/hfi1/file_ops.c +1 -1
@@ -1153,7 +1153,7 @@ static int get_ctxt_info(struct hfi1_filedata *fd, unsigned long arg, u32 len) cinfo.sdma_ring_size = fd->cq->nentries; cinfo.rcvegr_size = uctxt->egrbufs.rcvtid_size; -trace_hfi1_ctxt_info (uctxt->dd, uctxt->ctxt, fd->subctxt, cinfo); +trace_hfi1_ctxt_info (uctxt->dd, uctxt->ctxt, fd->subctxt, &cinfo);if (copy_to_user ((void __user *)arg, &cinfo, len))return -EFAULT ;
drivers/infiniband/hw/hfi1/trace_ctxts.h +6 -6
@@ -106,7 +106,7 @@ TRACE_EVENT(hfi1_uctxtdata, TRACE_EVENT(hfi1_ctxt_info, TP_PROTO(struct hfi1_devdata *dd, unsigned int ctxt, unsigned int subctxt, - struct hfi1_ctxt_info cinfo), + struct hfi1_ctxt_info *cinfo), TP_ARGS(dd, ctxt, subctxt, cinfo), TP_STRUCT__entry(DD_DEV_ENTRY(dd) __field(unsigned int, ctxt)
@@ -120,11 +120,11 @@ TRACE_EVENT(hfi1_ctxt_info, TP_fast_assign(DD_DEV_ASSIGN(dd); __entry->ctxt = ctxt; __entry->subctxt = subctxt; - __entry->egrtids = cinfo.egrtids; - __entry->rcvhdrq_cnt = cinfo.rcvhdrq_cnt; - __entry->rcvhdrq_size = cinfo.rcvhdrq_entsize; - __entry->sdma_ring_size = cinfo.sdma_ring_size; - __entry->rcvegr_size = cinfo.rcvegr_size; + __entry->egrtids = cinfo->egrtids; + __entry->rcvhdrq_cnt = cinfo->rcvhdrq_cnt; + __entry->rcvhdrq_size = cinfo->rcvhdrq_entsize; + __entry->sdma_ring_size = cinfo->sdma_ring_size; + __entry->rcvegr_size = cinfo->rcvegr_size; ), TP_printk("[%s] ctxt %u:%u " CINFO_FMT, __get_str(dev),
drivers/s390/cio/ioasm.c +9 -9
@@ -35,7 +35,7 @@ int stsch(struct subchannel_id schid, struct schib *addr)int ccode; ccode =__stsch (schid, addr); -trace_s390_cio_stsch (schid, addr, ccode); +trace_s390_cio_stsch (&schid, addr, ccode);return ccode; }
@@ -63,7 +63,7 @@ int msch(struct subchannel_id schid, struct schib *addr)int ccode; ccode =__msch (schid, addr); -trace_s390_cio_msch (schid, addr, ccode); +trace_s390_cio_msch (&schid, addr, ccode);return ccode; }
@@ -88,7 +88,7 @@ int tsch(struct subchannel_id schid, struct irb *addr)int ccode; ccode =__tsch (schid, addr); -trace_s390_cio_tsch (schid, addr, ccode); +trace_s390_cio_tsch (&schid, addr, ccode);return ccode; }
@@ -115,7 +115,7 @@ int ssch(struct subchannel_id schid, union orb *addr)int ccode; ccode =__ssch (schid, addr); -trace_s390_cio_ssch (schid, addr, ccode); +trace_s390_cio_ssch (&schid, addr, ccode);return ccode; }
@@ -141,7 +141,7 @@ int csch(struct subchannel_id schid)int ccode; ccode =__csch (schid); -trace_s390_cio_csch (schid, ccode); +trace_s390_cio_csch (&schid, ccode);return ccode; }
@@ -202,7 +202,7 @@ int rchp(struct chp_id chpid)int ccode; ccode =__rchp (chpid); -trace_s390_cio_rchp (chpid, ccode); +trace_s390_cio_rchp (&chpid, ccode);return ccode; }
@@ -228,7 +228,7 @@ int rsch(struct subchannel_id schid)int ccode; ccode =__rsch (schid); -trace_s390_cio_rsch (schid, ccode); +trace_s390_cio_rsch (&schid, ccode);return ccode; }
@@ -253,7 +253,7 @@ int hsch(struct subchannel_id schid)int ccode; ccode =__hsch (schid); -trace_s390_cio_hsch (schid, ccode); +trace_s390_cio_hsch (&schid, ccode);return ccode; }
@@ -278,7 +278,7 @@ int xsch(struct subchannel_id schid)int ccode; ccode =__xsch (schid); -trace_s390_cio_xsch (schid, ccode); +trace_s390_cio_xsch (&schid, ccode);return ccode; }
drivers/s390/cio/trace.h +25 -25
146 lines not on this page · raw message
fs/dax.c +1 -1
@@ -1429,7 +1429,7 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, goto finish_iomap; } -trace_dax_pmd_insert_mapping (inode, vmf,PMD_SIZE , pfn, entry); +trace_dax_pmd_insert_mapping (inode, vmf,PMD_SIZE , &pfn, entry); result =vmf_insert_pfn_pmd (vma, vmf->address, vmf->pmd, pfn, write);break ;
include/trace/events/f2fs.h +1 -1
@@ -491,7 +491,7 @@ DEFINE_EVENT(f2fs__truncate_node, f2fs_truncate_node, TRACE_EVENT(f2fs_truncate_partial_nodes, - TP_PROTO(struct inode *inode, nid_t nid[], int depth, int err), + TP_PROTO(struct inode *inode, nid_t *nid, int depth, int err), TP_ARGS(inode, nid, depth, err),
include/trace/events/fs_dax.h +3 -3
@@ -104,7 +104,7 @@ DEFINE_PMD_LOAD_HOLE_EVENT(dax_pmd_load_hole_fallback); DECLARE_EVENT_CLASS(dax_pmd_insert_mapping_class, TP_PROTO(struct inode *inode, struct vm_fault *vmf, - long length, pfn_t pfn, void *radix_entry), + long length, pfn_t *pfn, void *radix_entry), TP_ARGS(inode, vmf, length, pfn, radix_entry), TP_STRUCT__entry( __field(unsigned long, ino)
@@ -123,7 +123,7 @@ DECLARE_EVENT_CLASS(dax_pmd_insert_mapping_class, __entry->address = vmf->address; __entry->write = vmf->flags &FAULT_FLAG_WRITE ; __entry->length = length; - __entry->pfn_val = pfn.val; + __entry->pfn_val = pfn->val; __entry->radix_entry = radix_entry; ), TP_printk("dev %d:%d ino %#lx %s %s address %#lx length %#lx "
@@ -145,7 +145,7 @@ DECLARE_EVENT_CLASS(dax_pmd_insert_mapping_class,#define DEFINE_PMD_INSERT_MAPPING_EVENT (name) \ DEFINE_EVENT(dax_pmd_insert_mapping_class, name, \ TP_PROTO(struct inode *inode, struct vm_fault *vmf, \ - long length, pfn_t pfn, void *radix_entry), \ + long length, pfn_t *pfn, void *radix_entry), \ TP_ARGS(inode, vmf, length, pfn, radix_entry))DEFINE_PMD_INSERT_MAPPING_EVENT (dax_pmd_insert_mapping);
include/trace/events/rcu.h +2 -2
@@ -436,7 +436,7 @@ TRACE_EVENT(rcu_fqs,*/ TRACE_EVENT(rcu_dyntick, - TP_PROTO(const char *polarity, long oldnesting, long newnesting, atomic_t dynticks), + TP_PROTO(const char *polarity, long oldnesting, long newnesting, atomic_t *dynticks), TP_ARGS(polarity, oldnesting, newnesting, dynticks),
@@ -451,7 +451,7 @@ TRACE_EVENT(rcu_dyntick, __entry->polarity = polarity; __entry->oldnesting = oldnesting; __entry->newnesting = newnesting; - __entry->dynticks =atomic_read (&dynticks); + __entry->dynticks =atomic_read (dynticks); ), TP_printk("%s %lx %lx %#3x", __entry->polarity,
include/trace/events/xen.h +16 -16
@@ -128,14 +128,14 @@ TRACE_EVENT(xen_mc_extend_args,TRACE_DEFINE_SIZEOF (pteval_t);/* mmu */ DECLARE_EVENT_CLASS(xen_mmu__set_pte, - TP_PROTO(pte_t *ptep, pte_t pteval), + TP_PROTO(pte_t *ptep, pte_t *pteval), TP_ARGS(ptep, pteval), TP_STRUCT__entry( __field(pte_t *, ptep) __field(pteval_t, pteval) ), TP_fast_assign(__entry->ptep = ptep; - __entry->pteval = pteval.pte), + __entry->pteval = pteval->pte), TP_printk("ptep %p pteval %0*llx (raw %0*llx)", __entry->ptep, (int)sizeof(pteval_t) * 2, (unsigned long long)pte_val(native_make_pte(__entry->pteval)),
@@ -144,14 +144,14 @@ DECLARE_EVENT_CLASS(xen_mmu__set_pte,#define DEFINE_XEN_MMU_SET_PTE (name) \ DEFINE_EVENT(xen_mmu__set_pte, name, \ - TP_PROTO(pte_t *ptep, pte_t pteval), \ + TP_PROTO(pte_t *ptep, pte_t *pteval), \ TP_ARGS(ptep, pteval))DEFINE_XEN_MMU_SET_PTE (xen_mmu_set_pte); TRACE_EVENT(xen_mmu_set_pte_at, TP_PROTO(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pteval), + pte_t *ptep, pte_t *pteval), TP_ARGS(mm, addr, ptep, pteval), TP_STRUCT__entry( __field(struct mm_struct *, mm)
@@ -162,7 +162,7 @@ TRACE_EVENT(xen_mmu_set_pte_at, TP_fast_assign(__entry->mm = mm; __entry->addr = addr; __entry->ptep = ptep; - __entry->pteval = pteval.pte), + __entry->pteval = pteval->pte), TP_printk("mm %p addr %lx ptep %p pteval %0*llx (raw %0*llx)", __entry->mm, __entry->addr, __entry->ptep, (int)sizeof(pteval_t) * 2, (unsigned long long)pte_val(native_make_pte(__entry->pteval)),
@@ -172,14 +172,14 @@ TRACE_EVENT(xen_mmu_set_pte_at,TRACE_DEFINE_SIZEOF (pmdval_t); TRACE_EVENT(xen_mmu_set_pmd, - TP_PROTO(pmd_t *pmdp, pmd_t pmdval), + TP_PROTO(pmd_t *pmdp, pmd_t *pmdval), TP_ARGS(pmdp, pmdval), TP_STRUCT__entry( __field(pmd_t *, pmdp) __field(pmdval_t, pmdval) ), TP_fast_assign(__entry->pmdp = pmdp; - __entry->pmdval = pmdval.pmd), + __entry->pmdval = pmdval->pmd), TP_printk("pmdp %p pmdval %0*llx (raw %0*llx)", __entry->pmdp, (int)sizeof(pmdval_t) * 2, (unsigned long long)pmd_val(native_make_pmd(__entry->pmdval)),
@@ -220,14 +220,14 @@ TRACE_EVENT(xen_mmu_pmd_clear,TRACE_DEFINE_SIZEOF (pudval_t); TRACE_EVENT(xen_mmu_set_pud, - TP_PROTO(pud_t *pudp, pud_t pudval), + TP_PROTO(pud_t *pudp, pud_t *pudval), TP_ARGS(pudp, pudval), TP_STRUCT__entry( __field(pud_t *, pudp) __field(pudval_t, pudval) ), TP_fast_assign(__entry->pudp = pudp; - __entry->pudval = native_pud_val(pudval)), + __entry->pudval = native_pud_val(*pudval)), TP_printk("pudp %p pudval %0*llx (raw %0*llx)", __entry->pudp, (int)sizeof(pudval_t) * 2, (unsigned long long)pud_val(native_make_pud(__entry->pudval)),
@@ -237,7 +237,7 @@ TRACE_EVENT(xen_mmu_set_pud,TRACE_DEFINE_SIZEOF (p4dval_t); TRACE_EVENT(xen_mmu_set_p4d, - TP_PROTO(p4d_t *p4dp, p4d_t *user_p4dp, p4d_t p4dval), + TP_PROTO(p4d_t *p4dp, p4d_t *user_p4dp, p4d_t *p4dval), TP_ARGS(p4dp, user_p4dp, p4dval), TP_STRUCT__entry( __field(p4d_t *, p4dp)
@@ -246,7 +246,7 @@ TRACE_EVENT(xen_mmu_set_p4d, ), TP_fast_assign(__entry->p4dp = p4dp; __entry->user_p4dp = user_p4dp; - __entry->p4dval = p4d_val(p4dval)), + __entry->p4dval = p4d_val(*p4dval)), TP_printk("p4dp %p user_p4dp %p p4dval %0*llx (raw %0*llx)", __entry->p4dp, __entry->user_p4dp, (int)sizeof(p4dval_t) * 2, (unsigned long long)pgd_val(native_make_pgd(__entry->p4dval)),
@@ -255,14 +255,14 @@ TRACE_EVENT(xen_mmu_set_p4d,#else TRACE_EVENT(xen_mmu_set_pud, - TP_PROTO(pud_t *pudp, pud_t pudval), + TP_PROTO(pud_t *pudp, pud_t *pudval), TP_ARGS(pudp, pudval), TP_STRUCT__entry( __field(pud_t *, pudp) __field(pudval_t, pudval) ), TP_fast_assign(__entry->pudp = pudp; - __entry->pudval = native_pud_val(pudval)), + __entry->pudval = native_pud_val(*pudval)), TP_printk("pudp %p pudval %0*llx (raw %0*llx)", __entry->pudp, (int)sizeof(pudval_t) * 2, (unsigned long long)pgd_val(native_make_pgd(__entry->pudval)),
@@ -273,7 +273,7 @@ TRACE_EVENT(xen_mmu_set_pud, DECLARE_EVENT_CLASS(xen_mmu_ptep_modify_prot, TP_PROTO(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pteval), + pte_t *ptep, pte_t *pteval), TP_ARGS(mm, addr, ptep, pteval), TP_STRUCT__entry( __field(struct mm_struct *, mm)
@@ -284,7 +284,7 @@ DECLARE_EVENT_CLASS(xen_mmu_ptep_modify_prot, TP_fast_assign(__entry->mm = mm; __entry->addr = addr; __entry->ptep = ptep; - __entry->pteval = pteval.pte), + __entry->pteval = pteval->pte), TP_printk("mm %p addr %lx ptep %p pteval %0*llx (raw %0*llx)", __entry->mm, __entry->addr, __entry->ptep, (int)sizeof(pteval_t) * 2, (unsigned long long)pte_val(native_make_pte(__entry->pteval)),
@@ -293,7 +293,7 @@ DECLARE_EVENT_CLASS(xen_mmu_ptep_modify_prot,#define DEFINE_XEN_MMU_PTEP_MODIFY_PROT (name) \ DEFINE_EVENT(xen_mmu_ptep_modify_prot, name, \ TP_PROTO(struct mm_struct *mm, unsigned long addr, \ - pte_t *ptep, pte_t pteval), \ + pte_t *ptep, pte_t *pteval), \ TP_ARGS(mm, addr, ptep, pteval))DEFINE_XEN_MMU_PTEP_MODIFY_PROT (xen_mmu_ptep_modify_prot_start);
kernel/rcu/tree.c +5 -5
@@ -772,7 +772,7 @@ static void rcu_eqs_enter(bool user) }lockdep_assert_irqs_disabled (); -trace_rcu_dyntick (TPS ("Start" ), rdtp->dynticks_nesting,0 , rdtp->dynticks); +trace_rcu_dyntick (TPS ("Start" ), rdtp->dynticks_nesting,0 , &rdtp->dynticks);WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && !user && !is_idle_task (current));for_each_rcu_flavor (rsp) { rdp =this_cpu_ptr (rsp->rda);
@@ -848,14 +848,14 @@ void rcu_nmi_exit(void)* leave it in non-RCU-idle state. */ if (rdtp->dynticks_nmi_nesting !=1 ) { -trace_rcu_dyntick (TPS ("--=" ), rdtp->dynticks_nmi_nesting, rdtp->dynticks_nmi_nesting -2 , rdtp->dynticks); +trace_rcu_dyntick (TPS ("--=" ), rdtp->dynticks_nmi_nesting, rdtp->dynticks_nmi_nesting -2 , &rdtp->dynticks);WRITE_ONCE (rdtp->dynticks_nmi_nesting,/* No store tearing. */ rdtp->dynticks_nmi_nesting -2 );return ; }/* This NMI interrupted an RCU-idle CPU, restore RCU-idleness. */ -trace_rcu_dyntick (TPS ("Startirq" ), rdtp->dynticks_nmi_nesting,0 , rdtp->dynticks); +trace_rcu_dyntick (TPS ("Startirq" ), rdtp->dynticks_nmi_nesting,0 , &rdtp->dynticks);WRITE_ONCE (rdtp->dynticks_nmi_nesting,0 );/* Avoid store tearing. */ rcu_dynticks_eqs_enter (); }
@@ -930,7 +930,7 @@ static void rcu_eqs_exit(bool user)rcu_dynticks_task_exit ();rcu_dynticks_eqs_exit ();rcu_cleanup_after_idle (); -trace_rcu_dyntick (TPS ("End" ), rdtp->dynticks_nesting,1 , rdtp->dynticks); +trace_rcu_dyntick (TPS ("End" ), rdtp->dynticks_nesting,1 , &rdtp->dynticks);WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && !user && !is_idle_task (current));WRITE_ONCE (rdtp->dynticks_nesting,1 );WRITE_ONCE (rdtp->dynticks_nmi_nesting,DYNTICK_IRQ_NONIDLE );
@@ -1004,7 +1004,7 @@ void rcu_nmi_enter(void) }trace_rcu_dyntick (incby ==1 ?TPS ("Endirq" ) :TPS ("++=" ), rdtp->dynticks_nmi_nesting, - rdtp->dynticks_nmi_nesting + incby, rdtp->dynticks); + rdtp->dynticks_nmi_nesting + incby, &rdtp->dynticks);WRITE_ONCE (rdtp->dynticks_nmi_nesting,/* Prevent store tearing. */ rdtp->dynticks_nmi_nesting + incby);barrier ();
net/wireless/trace.h +1 -1
@@ -3137,7 +3137,7 @@ TRACE_EVENT(rdev_start_radar_detection, TRACE_EVENT(rdev_set_mcast_rate, TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, - int mcast_rate[NUM_NL80211_BANDS]), + int *mcast_rate), TP_ARGS(wiphy, netdev, mcast_rate), TP_STRUCT__entry( WIPHY_ENTRY
sound/firewire/amdtp-stream-trace.h +1 -1
@@ -14,7 +14,7 @@#include <linux/tracepoint.h> TRACE_EVENT(in_packet, - TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 cip_header[2], unsigned int payload_length, unsigned int index), + TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 *cip_header, unsigned int payload_length, unsigned int index), TP_ARGS(s, cycles, cip_header, payload_length, index), TP_STRUCT__entry( __field(unsigned int, second)
Signature · 1 line
2.9.5
Steven Rostedt
maintainerRe: [PATCH v3 bpf-next 01/10] treewide: remove struct-pass-by-value from tracepoints arguments
Quoted 9 lines · On Thu, 22 Mar 2018 11:01:48 -0700 Alexei Starovoitov <[email protected]> wrote:
From: Alexei Starovoitov <[email protected]>
Fix all tracepoint arguments to pass structures (large and small) by reference instead of by value.
Avoiding passing large structs by value is a good coding style. Passing small structs sometimes is beneficial, but in all cases it makes no difference vs readability of the code.
The subsequent patch enforces that all tracepoints args are either integers or pointers and fit into 64-bit.
But some of these structures are used to force type checking, and are just the same size as a number. That's why they don't have "struct" in front of them. Like pmd_t. Will the subsequent patches really break if the structure itself has one element that is of size long? Just seems to add extra code to pass in an address to something that fits into a single register.
-- Steve
Re: [PATCH v3 bpf-next 01/10] treewide: remove struct-pass-by-value from tracepoints arguments
Quoted 13 lines · Steven Rostedt
Quoted 9 lines · On Thu, 22 Mar 2018 11:01:48 -0700 Alexei Starovoitov <[email protected]> wrote:
From: Alexei Starovoitov <[email protected]>
Fix all tracepoint arguments to pass structures (large and small) by reference instead of by value.
Avoiding passing large structs by value is a good coding style. Passing small structs sometimes is beneficial, but in all cases it makes no difference vs readability of the code.
The subsequent patch enforces that all tracepoints args are either integers or pointers and fit into 64-bit.
Quoted 6 lines
But some of these structures are used to force type checking, and are just the same size as a number. That's why they don't have "struct" in front of them. Like
pmd_t. Will the subsequent patches really break if the structure itself has one element that is of size long? Just seems to add extra code to pass in an address to something that fits into a single register.
yeah. C doesn't allow casting of 'struct s { u64 var };' into u64 without massive hacks and aliasing warnings by compiler. CAST_TO_U64 macro in patch 7 will prevent tracepoint arguments to be things like pmd_t. It's not perfect, but doing & of pmd_t variable is imo clean enough as you can see in this patch.
The macro can be tweaked to do the cast like *(sizeof(typeof(arg))*)&arg,
but there is no way to get rid of compiler warning.
Re: [PATCH v3 bpf-next 01/10] treewide: remove struct-pass-by-value from tracepoints arguments
Quoted 3 lines · Alexei Starovoitov
yeah. C doesn't allow casting of 'struct s { u64 var };' into u64 without massive hacks and aliasing warnings by compiler.
Without massive hacks? Yeah, no. But without warnings? You can do it.
#define UINTTYPE(size) \
__typeof__(__builtin_choose_expr(size==1, (u8)1, \
__builtin_choose_expr(size==2, (u16)2, \
__builtin_choose_expr(size==4, (u32)3, \
__builtin_choose_expr(size==8, (u64)4, \
(void)5)))))
#define CAST_TO_U64(x) ({ \
typeof(x) __src = (x); \
UINTTYPE(sizeof(x)) __dst; \
memcpy(&__dst, &__src, sizeof(__dst)); \
(u64)__dst; })Yeah, I'm not proud of the above, but gcc actually seems to do the right thing for it. Doing
struct d {
unsigned char a,b;
};it generates
movzwl %di, %eax
for the CAST_TO_U64() (the above *looks* like it only casts to 32-bit, but it is actually a full cast to 64 bits because movzwl will also clear the top bits of the register).
No warnings.
But is ot "massively hacky"? You be the judge. Probably.
Going the other way is trivial, you just use that same UINTTYPE() again and just the memcpy in reverse.
NOTE! The above obviously only works for things that are actually proper nice easy sizes.
If you want to encode a 6-byte thing in a u64, the sanest thing is likely to use a union, and just accept crap in some bytes of the u64 (and just expect it to be undone by the reversal operation). Honestly, I'd suggest against it, because of just horrible code generation and/or data leakage
Linus
Steven Rostedt
maintainerRe: [PATCH v3 bpf-next 01/10] treewide: remove struct-pass-by-value from tracepoints arguments
In reply to Alexei StarovoitovQuoted 21 lines · On Thu, 22 Mar 2018 12:31:12 -0700 Alexei Starovoitov <[email protected]> wrote:
Quoted 13 lines · Steven Rostedt
Quoted 9 lines · On Thu, 22 Mar 2018 11:01:48 -0700 Alexei Starovoitov <[email protected]> wrote:
From: Alexei Starovoitov <[email protected]>
Fix all tracepoint arguments to pass structures (large and small) by reference instead of by value.
Avoiding passing large structs by value is a good coding style. Passing small structs sometimes is beneficial, but in all cases it makes no difference vs readability of the code.
The subsequent patch enforces that all tracepoints args are either integers or pointers and fit into 64-bit.Quoted 6 lines
But some of these structures are used to force type checking, and are just the same size as a number. That's why they don't have "struct" in front of them. Like
pmd_t. Will the subsequent patches really break if the structure itself has one element that is of size long? Just seems to add extra code to pass in an address to something that fits into a single register.
Quoted 8 lines
yeah. C doesn't allow casting of 'struct s { u64 var };' into u64 without massive hacks and aliasing warnings by compiler.
CAST_TO_U64macro in patch 7 will prevent tracepoint arguments to be things likepmd_t. It's not perfect, but doing & ofpmd_tvariable is imo clean enough as you can see in this patch.
The macro can be tweaked to do the cast like *(sizeof(typeof(arg))*)&arg,
but there is no way to get rid of compiler warning.
OK, but instead of changing it to pass by reference, why not just pass the value. That is:
static void xen_set_pte_atomic(pte_t *ptep, pte_t pte) {
- trace_xen_mmu_set_pte_atomic(ptep, pte);
+ trace_xen_mmu_set_pte_atomic(ptep, native_pte_val(pte));
set_64bit((u64 *)ptep, native_pte_val(pte));
}
It shouldn't add any extra code, as those helper functions are basically just special casts.
-- Steve
Re: [PATCH v3 bpf-next 01/10] treewide: remove struct-pass-by-value from tracepoints arguments
arch/x86/xen/mmu_pv.c static void xen_set_pud(pud_t *ptr, pud_t val) · line 429
Quoted 10 lines · Steven Rostedt
OK, but instead of changing it to pass by reference, why not just pass the value. That is:
static void
xen_set_pte_atomic(pte_t *ptep, pte_t pte){arch/x86/xen/mmu_pv.c +1
-1-trace_xen_mmu_set_pte_atomic (ptep, pte); +trace_xen_mmu_set_pte_atomic (ptep,native_pte_val (pte));set_64bit ((u64 *)ptep,native_pte_val (pte)); }
That looks simple and clean, and makes sense since the function itself then uses that value anyway.
Certainly simpler than my monster define.
Linus
Re: [PATCH v3 bpf-next 01/10] treewide: remove struct-pass-by-value from tracepoints arguments
Quoted 12 lines · Linus Torvalds
arch/x86/xen/mmu_pv.c static void xen_set_pud(pud_t *ptr, pud_t val) · line 429
Quoted 10 lines · Steven Rostedt
OK, but instead of changing it to pass by reference, why not just pass the value. That is:
static void
xen_set_pte_atomic(pte_t *ptep, pte_t pte){arch/x86/xen/mmu_pv.c +1
-1-trace_xen_mmu_set_pte_atomic (ptep, pte); +trace_xen_mmu_set_pte_atomic (ptep,native_pte_val (pte));set_64bit ((u64 *)ptep,native_pte_val (pte)); }
Quoted 4 lines
That looks simple and clean, and makes sense since the function itself then uses that value anyway.
Certainly simpler than my monster define.
memcpy to avoid warning is a nice trick.
Generate code looks good on variety of compilers and architectures. It also works with s390 tracepoints that pass this struct:
struct subchannel_id {
u32 cssid : 8;
u32 : 4;
u32 m : 1;
u32 ssid : 2;
u32 one : 1;
u32 sch_no : 16;
} __attribute__ ((packed, aligned(4)));by value into a bunch of trace_* functions.
So at the end this 'monster define' will reduce patch 1 a lot.
Passing less than 8 byte structs by value is ok.
If we disallow them for tracepoints it would be seen as annoying programming convention, because one dude (me) couldn't figure out how to cast them.
Since you found the way to do this cast, let's go with it. It will be hidden in one file (regardless whether it's ugly or not) whereas small struct dereferences will be everywhere,
so one hack is better.
PATCH v3 2/10 net/mediatek: disambiguate mt76 vs mt7601u trace events
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
two trace events defined with the same name and both unused. They conflict in allyesconfig build. Rename one of them.
--- drivers/net/wireless/mediatek/mt7601u/trace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt7601u/trace.h +3 -3
@@ -34,7 +34,7 @@#define REG_PR_FMT "%04x=%08x"#define REG_PR_ARG __entry->reg, __entry->val -DECLARE_EVENT_CLASS(dev_reg_evt, +DECLARE_EVENT_CLASS(dev_reg_evtu, TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val), TP_ARGS(dev, reg, val), TP_STRUCT__entry(
@@ -51,12 +51,12 @@ DECLARE_EVENT_CLASS(dev_reg_evt, ) ); -DEFINE_EVENT (dev_reg_evt, reg_read, +DEFINE_EVENT (dev_reg_evtu, reg_read, TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val),TP_ARGS (dev, reg, val) ); -DEFINE_EVENT (dev_reg_evt, reg_write, +DEFINE_EVENT (dev_reg_evtu, reg_write, TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val),TP_ARGS (dev, reg, val) );
Signature · 1 line
2.9.5
PATCH v3 3/10 net/mac802154: disambiguate mac80215 vs mac802154 trace events
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
two trace events defined with the same name and both unused. They conflict in allyesconfig build. Rename one of them.
--- net/mac802154/trace.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/mac802154/trace.h +4 -4
@@ -33,7 +33,7 @@/* Tracing for driver callbacks */ -DECLARE_EVENT_CLASS(local_only_evt, +DECLARE_EVENT_CLASS(local_only_evt4, TP_PROTO(struct ieee802154_local *local), TP_ARGS(local), TP_STRUCT__entry(
@@ -45,7 +45,7 @@ DECLARE_EVENT_CLASS(local_only_evt,TP_printk (LOCAL_PR_FMT ,LOCAL_PR_ARG ) ); -DEFINE_EVENT(local_only_evt, 802154_drv_return_void, +DEFINE_EVENT(local_only_evt4, 802154_drv_return_void, TP_PROTO(struct ieee802154_local *local),TP_ARGS (local) );
@@ -65,12 +65,12 @@ TRACE_EVENT(802154_drv_return_int, __entry->ret) ); -DEFINE_EVENT(local_only_evt, 802154_drv_start, +DEFINE_EVENT(local_only_evt4, 802154_drv_start, TP_PROTO(struct ieee802154_local *local),TP_ARGS (local) ); -DEFINE_EVENT(local_only_evt, 802154_drv_stop, +DEFINE_EVENT(local_only_evt4, 802154_drv_stop, TP_PROTO(struct ieee802154_local *local),TP_ARGS (local) );
Signature · 1 line
2.9.5
PATCH v3 4/10 net/wireless/iwlwifi: fix iwlwifi_dev_ucode_error tracepoint
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
fix iwlwifi_dev_ucode_error tracepoint to pass pointer to a table instead of all 17 arguments by value.dvm/main.c and mvm/utils.c have 'struct iwl_error_event_table' defined with very similar yet subtly different fields and offsets. tracepoint is still common and using definition of 'struct iwl_error_event_table' from dvm/commands.h while copying fields.
Long term this tracepoint probably should be split into two.
--- drivers/net/wireless/intel/iwlwifi/dvm/main.c | 7 +--- .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 39 ++++++++++------------ drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c | 1 + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 7 +--- 4 files changed, 21 insertions(+), 33 deletions(-)
drivers/net/wireless/intel/iwlwifi/dvm/main.c +1 -6
@@ -1651,12 +1651,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv) priv->status, table.valid); } -trace_iwlwifi_dev_ucode_error (trans->dev, table.error_id, table.tsf_low, - table.data1, table.data2, table.line, - table.blink2, table.ilink1, table.ilink2, - table.bcon_time, table.gp1, table.gp2, - table.gp3, table.ucode_ver, table.hw_ver, -0 , table.brd_ver); +trace_iwlwifi_dev_ucode_error (trans->dev, &table,0 , table.brd_ver);IWL_ERR (priv,"0x%08X | %-28s\n" , table.error_id,desc_lookup (table.error_id));IWL_ERR (priv,"0x%08X | uPc\n" , table.pc);
drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h +18 -21
@@ -126,14 +126,11 @@ TRACE_EVENT(iwlwifi_dev_tx, __entry->framelen, __entry->skbaddr) ); +struct iwl_error_event_table ; TRACE_EVENT(iwlwifi_dev_ucode_error, - TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low, - u32 data1, u32 data2, u32 line, u32 blink2, u32 ilink1, - u32 ilink2, u32 bcon_time, u32 gp1, u32 gp2, u32 rev_type, - u32 major, u32 minor, u32 hw_ver, u32 brd_ver), - TP_ARGS(dev, desc, tsf_low, data1, data2, line, - blink2, ilink1, ilink2, bcon_time, gp1, gp2, - rev_type, major, minor, hw_ver, brd_ver), + TP_PROTO(const struct device *dev, const struct iwl_error_event_table *table, + u32 hw_ver, u32 brd_ver), + TP_ARGS(dev, table, hw_ver, brd_ver), TP_STRUCT__entry( DEV_ENTRY __field(u32, desc)
@@ -155,20 +152,20 @@ TRACE_EVENT(iwlwifi_dev_ucode_error, ),TP_fast_assign ( DEV_ASSIGN; - __entry->desc = desc; - __entry->tsf_low = tsf_low; - __entry->data1 = data1; - __entry->data2 = data2; - __entry->line = line; - __entry->blink2 = blink2; - __entry->ilink1 = ilink1; - __entry->ilink2 = ilink2; - __entry->bcon_time = bcon_time; - __entry->gp1 = gp1; - __entry->gp2 = gp2; - __entry->rev_type = rev_type; - __entry->major = major; - __entry->minor = minor; + __entry->desc = table->error_id; + __entry->tsf_low = table->tsf_low; + __entry->data1 = table->data1; + __entry->data2 = table->data2; + __entry->line = table->line; + __entry->blink2 = table->blink2; + __entry->ilink1 = table->ilink1; + __entry->ilink2 = table->ilink2; + __entry->bcon_time = table->bcon_time; + __entry->gp1 = table->gp1; + __entry->gp2 = table->gp2; + __entry->rev_type = table->gp3; + __entry->major = table->ucode_ver; + __entry->minor = table->hw_ver; __entry->hw_ver = hw_ver; __entry->brd_ver = brd_ver; ),
drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c +1 -0
@@ -30,6 +30,7 @@#ifndef __CHECKER__#include "iwl-trans.h" +#include "dvm/commands.h" #define CREATE_TRACE_POINTS #include "iwl-devtrace.h"
drivers/net/wireless/intel/iwlwifi/mvm/utils.c +1 -6
@@ -549,12 +549,7 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u32 base)IWL_ERR (mvm,"Loaded firmware version: %s\n" , mvm->fw->fw_version); -trace_iwlwifi_dev_ucode_error (trans->dev, table.error_id, table.tsf_low, - table.data1, table.data2, table.data3, - table.blink2, table.ilink1, - table.ilink2, table.bcon_time, table.gp1, - table.gp2, table.fw_rev_type, table.major, - table.minor, table.hw_ver, table.brd_ver); +trace_iwlwifi_dev_ucode_error (trans->dev, &table, table.hw_ver, table.brd_ver);IWL_ERR (mvm,"0x%08X | %-28s\n" , table.error_id,desc_lookup (table.error_id));IWL_ERR (mvm,"0x%08X | trm_hw_status0\n" , table.trm_hw_status0);
Signature · 1 line
2.9.5
PATCH v3 5/10 macro: introduce COUNT_ARGS() macro
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
move COUNT_ARGS() macro from apparmor to generic header and extend it to count till twelve.
COUNT() was an alternative name for this logic, but it's used for different purpose in many other places.
Similarly for CONCATENATE() macro.
--- include/linux/kernel.h | 7 +++++++ security/apparmor/include/path.h | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-)
include/linux/kernel.h +7 -0
@@ -919,6 +919,13 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }#define swap (a, b) \ do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0) +/* This counts to 12. Any more, it will return 13th argument. */ +#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _n, X...) _n +#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) + +#define __CONCAT (a, b) a ## b +#define CONCATENATE (a, b) __CONCAT(a, b) +/** * container_of - cast a member of a structure out to the containing structure * @ptr: the pointer to the member.
security/apparmor/include/path.h +1 -6
@@ -43,15 +43,10 @@ struct aa_buffers { DECLARE_PER_CPU(struct aa_buffers, aa_buffers); -#define COUNT_ARGS(X...) COUNT_ARGS_HELPER(, ##X, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) -#define COUNT_ARGS_HELPER(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, n, X...) n -#define CONCAT (X ,Y ) X ## Y -#define CONCAT_AFTER (X ,Y ) CONCAT(X, Y) -#define ASSIGN (FN ,X ,N ) ((X) = FN(N))#define EVAL1 (FN ,X ) ASSIGN(FN, X, 0)/*X = FN(0)*/ #define EVAL2(FN, X, Y...) do { ASSIGN(FN, X, 1); EVAL1(FN, Y); } while (0) -#define EVAL(FN, X...) CONCAT_AFTER(EVAL, COUNT_ARGS(X))(FN, X) +#define EVAL(FN, X...) CONCATENATE(EVAL, COUNT_ARGS(X))(FN, X)#define for_each_cpu_buffer (I ) for ((I) = 0; (I) < MAX_PATH_BUFFERS; (I)++)
Signature · 1 line
2.9.5
PATCH v3 6/10 tracepoint: compute num_args at build time
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
add fancy macro to compute number of arguments passed into tracepoint at compile time and store it as part of 'struct tracepoint'. The number is necessary to check safety of bpf program access that is coming in subsequent patch.
for_each_tracepoint_range() api has no users inside the kernel. Make it more useful with ability to stop for_each() loop depending via callback return value.
In such form it's used in subsequent patch.
--- include/linux/tracepoint-defs.h | 1 + include/linux/tracepoint.h | 28 +++++++++++++++++++--------- include/trace/define_trace.h | 14 +++++++------- kernel/tracepoint.c | 27 ++++++++++++++++----------- 4 files changed, 43 insertions(+), 27 deletions(-)
include/linux/tracepoint-defs.h +1 -0
@@ -33,6 +33,7 @@ struct tracepoint {int (*regfunc)(void );void (*unregfunc)(void );struct tracepoint_func __rcu *funcs; + u32 num_args; };#endif
include/linux/tracepoint.h +19 -9
@@ -40,9 +40,19 @@ tracepoint_probe_register_prio(struct tracepoint *tp, void *probe, void *data, int prio);extern int tracepoint_probe_unregister (struct tracepoint *tp,void *probe,void *data); -extern void -for_each_kernel_tracepoint (void (*fct)(struct tracepoint *tp,void *priv), -void *priv); + +#ifdef CONFIG_TRACEPOINTS +void * +for_each_kernel_tracepoint (void *(*fct)(struct tracepoint *tp,void *priv), +void *priv); +#else +static inline void * +for_each_kernel_tracepoint (void *(*fct)(struct tracepoint *tp,void *priv), +void *priv) +{ +return NULL ; +} +#endif #ifdef CONFIG_MODULES struct tp_module {
@@ -230,18 +240,18 @@ extern void syscall_unregfunc(void);* structures, so we create an array of pointers that will be used for iteration * on the tracepoints. */ -#define DEFINE_TRACE_FN (name, reg, unreg) \ +#define DEFINE_TRACE_FN (name, reg, unreg, num_args) \ static const char __tpstrtab_##name[] \ __attribute__((section("__tracepoints_strings"))) = #name; \ struct tracepoint __tracepoint_##name \ __attribute__((section("__tracepoints"))) = \ - { __tpstrtab_##name, STATIC_KEY_INIT_FALSE, reg, unreg, NULL };\ + { __tpstrtab_##name, STATIC_KEY_INIT_FALSE, reg, unreg, NULL, num_args };\ static struct tracepoint * const __tracepoint_ptr_##name __used \ __attribute__((section("__tracepoints_ptrs"))) = \ &__tracepoint_##name; -#define DEFINE_TRACE (name) \ - DEFINE_TRACE_FN(name, NULL, NULL); +#define DEFINE_TRACE (name, num_args) \ + DEFINE_TRACE_FN(name, NULL, NULL, num_args);#define EXPORT_TRACEPOINT_SYMBOL_GPL (name) \ EXPORT_SYMBOL_GPL(__tracepoint_##name)
@@ -275,8 +285,8 @@ extern void syscall_unregfunc(void);return false; \ } -#define DEFINE_TRACE_FN (name, reg, unreg) -#define DEFINE_TRACE (name) +#define DEFINE_TRACE_FN (name, reg, unreg, num_args) +#define DEFINE_TRACE (name, num_args)#define EXPORT_TRACEPOINT_SYMBOL_GPL (name)#define EXPORT_TRACEPOINT_SYMBOL (name)
include/trace/define_trace.h +7 -7
@@ -25,7 +25,7 @@#undef TRACE_EVENT#define TRACE_EVENT (name, proto, args, tstruct, assign, print) \ - DEFINE_TRACE(name) + DEFINE_TRACE(name, COUNT_ARGS(args))#undef TRACE_EVENT_CONDITION#define TRACE_EVENT_CONDITION (name, proto, args, cond, tstruct, assign, print) \
@@ -39,24 +39,24 @@#undef TRACE_EVENT_FN#define TRACE_EVENT_FN (name, proto, args, tstruct, \ assign, print, reg, unreg) \ - DEFINE_TRACE_FN(name, reg, unreg) + DEFINE_TRACE_FN(name, reg, unreg, COUNT_ARGS(args))#undef TRACE_EVENT_FN_COND#define TRACE_EVENT_FN_COND (name, proto, args, cond, tstruct, \ assign, print, reg, unreg) \ - DEFINE_TRACE_FN(name, reg, unreg) + DEFINE_TRACE_FN(name, reg, unreg, COUNT_ARGS(args))#undef DEFINE_EVENT#define DEFINE_EVENT (template, name, proto, args) \ - DEFINE_TRACE(name) + DEFINE_TRACE(name, COUNT_ARGS(args))#undef DEFINE_EVENT_FN#define DEFINE_EVENT_FN (template, name, proto, args, reg, unreg) \ - DEFINE_TRACE_FN(name, reg, unreg) + DEFINE_TRACE_FN(name, reg, unreg, COUNT_ARGS(args))#undef DEFINE_EVENT_PRINT#define DEFINE_EVENT_PRINT (template, name, proto, args, print) \ - DEFINE_TRACE(name) + DEFINE_TRACE(name, COUNT_ARGS(args))#undef DEFINE_EVENT_CONDITION#define DEFINE_EVENT_CONDITION (template, name, proto, args, cond) \
@@ -64,7 +64,7 @@#undef DECLARE_TRACE#define DECLARE_TRACE (name, proto, args) \ - DEFINE_TRACE(name) + DEFINE_TRACE(name, COUNT_ARGS(args))#undef TRACE_INCLUDE#undef __TRACE_INCLUDE
kernel/tracepoint.c +16 -11
@@ -502,17 +502,22 @@ static __init int init_tracepoints(void)__initcall (init_tracepoints);#endif /* CONFIG_MODULES */ -static void for_each_tracepoint_range (struct tracepoint *const *begin, -struct tracepoint *const *end, -void (*fct)(struct tracepoint *tp,void *priv), -void *priv) +static void *for_each_tracepoint_range (struct tracepoint *const *begin, +struct tracepoint *const *end, +void *(*fct)(struct tracepoint *tp,void *priv), +void *priv) {struct tracepoint *const *iter; +void *ret;if (!begin) -return ; -for (iter = begin; iter < end; iter++) -fct (*iter, priv); +return NULL ; +for (iter = begin; iter < end; iter++) { + ret =fct (*iter, priv); +if (ret) +return ret; + } +return NULL ; }/**
@@ -520,11 +525,11 @@ static void for_each_tracepoint_range(struct tracepoint * const *begin,* @fct: callback * @priv: private data */ -void for_each_kernel_tracepoint (void (*fct)(struct tracepoint *tp,void *priv), -void *priv) +void *for_each_kernel_tracepoint (void *(*fct)(struct tracepoint *tp,void *priv), +void *priv) { -for_each_tracepoint_range (__start___tracepoints_ptrs, - __stop___tracepoints_ptrs, fct, priv); +return for_each_tracepoint_range (__start___tracepoints_ptrs, + __stop___tracepoints_ptrs, fct, priv); }EXPORT_SYMBOL_GPL (for_each_kernel_tracepoint);
Signature · 1 line
2.9.5
PATCH v3 7/10 bpf: introduce BPF_RAW_TRACEPOINT
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
Introduce BPF_PROG_TYPE_RAW_TRACEPOINT bpf program type to access kernel internal arguments of the tracepoints in their raw form.
Quoted 1 line
From bpf program point of view the access to the arguments look like:
struct bpf_raw_tracepoint_args {
__u64 args[0];
};int bpf_prog(struct bpf_raw_tracepoint_args *ctx) {
// program can read args[N] where N depends on tracepoint // and statically verified at program load+attach time
}
kprobe+bpf infrastructure allows programs access function arguments. This feature allows programs access raw tracepoint arguments.
Similar to proposed 'dynamic ftrace events' there are no abi guarantees to what the tracepoints arguments are and what their meaning is. The program needs to type cast args properly and use bpf_probe_read() helper to access struct fields when argument is a pointer.
For every tracepoint __bpf_trace_##call function is prepared. In assembler it looks like:
(gdb) disassemble __bpf_trace_xdp_exception
Dump of assembler code for function __bpf_trace_xdp_exception:
0xffffffff81132080 <+0>: mov %ecx,%ecx 0xffffffff81132082 <+2>: jmpq 0xffffffff811231f0 <bpf_trace_run3>
where
TRACE_EVENT(xdp_exception,
TP_PROTO(const struct net_device *dev,
const struct bpf_prog *xdp, u32 act),
The above assembler snippet is casting 32-bit 'act' field into 'u64' to pass into bpf_trace_run3(), while 'dev' and 'xdp' args are passed as-is. All of ~500 of __bpf_trace_*() functions are only 5-10 byte long and in total this approach adds 7k bytes to .text and 8k bytes
to .rodata since the probe funcs need to appear in kallsyms.
The alternative of having __bpf_trace_##call being global in kallsyms could have been to keep them static and add another pointer to these static functions to 'struct trace_event_class' and 'struct trace_event_call', but keeping them global simplifies implementation and keeps it indepedent from the tracing side.
Also such approach gives the lowest possible overhead while calling trace_xdp_exception() from kernel C code and transitioning into bpf land.
Since tracepoint+bpf are used at speeds of 1M+ events per second this is very valuable optimization.
Since ftrace and perf side are not involved the new BPF_RAW_TRACEPOINT_OPEN sys_bpf command is introduced that returns anon_inode FD of 'bpf-raw-tracepoint' object.
The user space looks like:
// load bpf prog with BPF_PROG_TYPE_RAW_TRACEPOINT type prog_fd = bpf_prog_load(...);
// receive anon_inode fd for given bpf_raw_tracepoint with prog attached raw_tp_fd = bpf_raw_tracepoint_open("xdp_exception", prog_fd);
Ctrl-C of tracing daemon or cmdline tool that uses this feature will automatically detach bpf program, unload it and unregister tracepoint probe.
On the kernel side for_each_kernel_tracepoint() is used to find a tracepoint with "xdp_exception" name (that would be __tracepoint_xdp_exception record)
Then kallsyms_lookup_name() is used to find the addr of __bpf_trace_xdp_exception() probe function.
And finally tracepoint_probe_register() is used to connect probe with tracepoint.
Addition of bpf_raw_tracepoint doesn't interfere with ftrace and perf tracepoint mechanisms. perf_event_open() can be used in parallel on the same tracepoint.
Multiple bpf_raw_tracepoint_open("xdp_exception", prog_fd) are permitted. Each with its own bpf program. The kernel will execute
all tracepoint probes and all attached bpf programs.
In the future bpf_raw_tracepoints can be extended with query/introspection logic.
--- include/linux/bpf_types.h | 1 + include/linux/trace_events.h | 37 ++++++ include/trace/bpf_probe.h | 82 +++++++++++++ include/trace/define_trace.h | 1 + include/uapi/linux/bpf.h | 11 ++ kernel/bpf/syscall.c | 87 ++++++++++++++ kernel/trace/bpf_trace.c | 270 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 489 insertions(+) create mode 100644 include/trace/bpf_probe.h
include/linux/bpf_types.h +1 -0
@@ -19,6 +19,7 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_SK_MSG, sk_msg) BPF_PROG_TYPE(BPF_PROG_TYPE_KPROBE, kprobe) BPF_PROG_TYPE(BPF_PROG_TYPE_TRACEPOINT, tracepoint) BPF_PROG_TYPE(BPF_PROG_TYPE_PERF_EVENT, perf_event) +BPF_PROG_TYPE(BPF_PROG_TYPE_RAW_TRACEPOINT, raw_tracepoint)#endif #ifdef CONFIG_CGROUP_BPF BPF_PROG_TYPE (BPF_PROG_TYPE_CGROUP_DEVICE , cg_dev)
include/linux/trace_events.h +37 -0
@@ -468,6 +468,8 @@ unsigned int trace_call_bpf(struct trace_event_call *call, void *ctx);int perf_event_attach_bpf_prog (struct perf_event *event,struct bpf_prog *prog);void perf_event_detach_bpf_prog (struct perf_event *event);int perf_event_query_prog_array (struct perf_event *event,void __user *info); +int bpf_probe_register (struct tracepoint *tp,struct bpf_prog *prog); +int bpf_probe_unregister (struct tracepoint *tp,struct bpf_prog *prog);#else static inline unsigned int trace_call_bpf (struct trace_event_call *call,void *ctx) {
@@ -487,6 +489,14 @@ perf_event_query_prog_array(struct perf_event *event, void __user *info) {return -EOPNOTSUPP ; } +static inline int bpf_probe_register (struct tracepoint *tp,struct bpf_prog *p) +{ +return -EOPNOTSUPP ; +} +static inline int bpf_probe_unregister (struct tracepoint *tp,struct bpf_prog *p) +{ +return -EOPNOTSUPP ; +}#endif enum {
@@ -546,6 +556,33 @@ extern void ftrace_profile_free_filter(struct perf_event *event);void perf_trace_buf_update (void *record,u16 type);void *perf_trace_buf_alloc (int size,struct pt_regs **regs,int *rctxp); +void bpf_trace_run1 (struct bpf_prog *prog,u64 arg1); +void bpf_trace_run2 (struct bpf_prog *prog,u64 arg1,u64 arg2); +void bpf_trace_run3 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3); +void bpf_trace_run4 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4); +void bpf_trace_run5 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4,u64 arg5); +void bpf_trace_run6 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4,u64 arg5,u64 arg6); +void bpf_trace_run7 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4,u64 arg5,u64 arg6,u64 arg7); +void bpf_trace_run8 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4,u64 arg5,u64 arg6,u64 arg7, +u64 arg8); +void bpf_trace_run9 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4,u64 arg5,u64 arg6,u64 arg7, +u64 arg8,u64 arg9); +void bpf_trace_run10 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4,u64 arg5,u64 arg6,u64 arg7, +u64 arg8,u64 arg9,u64 arg10); +void bpf_trace_run11 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4,u64 arg5,u64 arg6,u64 arg7, +u64 arg8,u64 arg9,u64 arg10,u64 arg11); +void bpf_trace_run12 (struct bpf_prog *prog,u64 arg1,u64 arg2, +u64 arg3,u64 arg4,u64 arg5,u64 arg6,u64 arg7, +u64 arg8,u64 arg9,u64 arg10,u64 arg11,u64 arg12); void perf_trace_run_bpf_submit(void *raw_data, int size, int rctx, struct trace_event_call *call, u64 count, struct pt_regs *regs, struct hlist_head *head,
include/trace/bpf_probe.h new file +82 -0
82 lines not on this page · raw message
include/trace/define_trace.h +1 -0
@@ -95,6 +95,7 @@#ifdef TRACEPOINTS_ENABLED #include <trace/trace_events.h> #include <trace/perf.h> +#include <trace/bpf_probe.h> #endif #undef TRACE_EVENT
include/uapi/linux/bpf.h +11 -0
@@ -94,6 +94,7 @@ enum bpf_cmd {BPF_MAP_GET_FD_BY_ID ,BPF_OBJ_GET_INFO_BY_FD ,BPF_PROG_QUERY , + BPF_RAW_TRACEPOINT_OPEN, }; enum bpf_map_type {
@@ -134,6 +135,7 @@ enum bpf_prog_type {BPF_PROG_TYPE_SK_SKB ,BPF_PROG_TYPE_CGROUP_DEVICE ,BPF_PROG_TYPE_SK_MSG , + BPF_PROG_TYPE_RAW_TRACEPOINT, }; enum bpf_attach_type {
@@ -344,6 +346,11 @@ union bpf_attr {__aligned_u64 prog_ids;__u32 prog_cnt; } query; + +struct { +__u64 name; +__u32 prog_fd; + } raw_tracepoint; } __attribute__((aligned(8)));/* BPF helper function descriptions:
@@ -1152,4 +1159,8 @@ struct bpf_cgroup_dev_ctx { __u32 minor; }; +struct bpf_raw_tracepoint_args { +__u64 args[0 ]; +}; +#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/syscall.c +87 -0
99 lines not on this page · raw message
kernel/trace/bpf_trace.c +270 -0
279 lines not on this page · raw message
Signature · 1 line
2.9.5
PATCH v3 8/10 libbpf: add bpf_raw_tracepoint_open helper
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
add bpf_raw_tracepoint_open(const char *name, int prog_fd) api to libbpf
--- tools/include/uapi/linux/bpf.h | 11 +++++++++++ tools/lib/bpf/bpf.c | 11 +++++++++++ tools/lib/bpf/bpf.h | 1 + 3 files changed, 23 insertions(+)
tools/include/uapi/linux/bpf.h +11 -0
@@ -94,6 +94,7 @@ enum bpf_cmd {BPF_MAP_GET_FD_BY_ID ,BPF_OBJ_GET_INFO_BY_FD ,BPF_PROG_QUERY , + BPF_RAW_TRACEPOINT_OPEN, }; enum bpf_map_type {
@@ -134,6 +135,7 @@ enum bpf_prog_type {BPF_PROG_TYPE_SK_SKB ,BPF_PROG_TYPE_CGROUP_DEVICE ,BPF_PROG_TYPE_SK_MSG , + BPF_PROG_TYPE_RAW_TRACEPOINT, }; enum bpf_attach_type {
@@ -344,6 +346,11 @@ union bpf_attr {__aligned_u64 prog_ids;__u32 prog_cnt; } query; + +struct { +__u64 name; +__u32 prog_fd; + } raw_tracepoint; } __attribute__((aligned(8)));/* BPF helper function descriptions:
@@ -1151,4 +1158,8 @@ struct bpf_cgroup_dev_ctx { __u32 minor; }; +struct bpf_raw_tracepoint_args { +__u64 args[0 ]; +}; +#endif /* _UAPI__LINUX_BPF_H__ */
tools/lib/bpf/bpf.c +11 -0
@@ -428,6 +428,17 @@ int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len)return err; } +int bpf_raw_tracepoint_open (const char *name,int prog_fd) +{ +union bpf_attr attr; + +bzero (&attr,sizeof (attr)); + attr.raw_tracepoint.name =ptr_to_u64 (name); + attr.raw_tracepoint.prog_fd = prog_fd; + +return sys_bpf (BPF_RAW_TRACEPOINT_OPEN , &attr,sizeof (attr)); +} +int bpf_set_link_xdp_fd (int ifindex,int fd,__u32 flags) {struct sockaddr_nl sa;
tools/lib/bpf/bpf.h +1 -0
@@ -79,4 +79,5 @@ int bpf_map_get_fd_by_id(__u32 id);int bpf_obj_get_info_by_fd (int prog_fd,void *info,__u32 *info_len);int bpf_prog_query (int target_fd,enum bpf_attach_type type,__u32 query_flags,__u32 *attach_flags,__u32 *prog_ids,__u32 *prog_cnt); +int bpf_raw_tracepoint_open (const char *name,int prog_fd);#endif
Signature · 1 line
2.9.5
PATCH v3 9/10 samples/bpf: raw tracepoint test
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
add empty raw_tracepoint bpf program to test overhead similar to kprobe and traditional tracepoint tests
--- samples/bpf/Makefile | 1 + samples/bpf/bpf_load.c | 14 ++++++++++++++ samples/bpf/test_overhead_raw_tp_kern.c | 17 +++++++++++++++++ samples/bpf/test_overhead_user.c | 12 ++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 samples/bpf/test_overhead_raw_tp_kern.c
samples/bpf/Makefile +1 -0
@@ -119,6 +119,7 @@ always += offwaketime_kern.o always += spintest_kern.o always += map_perf_test_kern.o always += test_overhead_tp_kern.o +always += test_overhead_raw_tp_kern.o always += test_overhead_kprobe_kern.o always += parse_varlen.o parse_simple.o parse_ldabs.o always += test_cgrp2_tc_kern.o
samples/bpf/bpf_load.c +14 -0
@@ -61,6 +61,7 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size)bool is_kprobe =strncmp (event,"kprobe/" ,7 ) ==0 ;bool is_kretprobe =strncmp (event,"kretprobe/" ,10 ) ==0 ;bool is_tracepoint =strncmp (event,"tracepoint/" ,11 ) ==0 ; +bool is_raw_tracepoint =strncmp (event,"raw_tracepoint/" ,15 ) ==0 ;bool is_xdp =strncmp (event,"xdp" ,3 ) ==0 ;bool is_perf_event =strncmp (event,"perf_event" ,10 ) ==0 ;bool is_cgroup_skb =strncmp (event,"cgroup/skb" ,10 ) ==0 ;
@@ -85,6 +86,8 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) prog_type =BPF_PROG_TYPE_KPROBE ; }else if (is_tracepoint) { prog_type =BPF_PROG_TYPE_TRACEPOINT ; + }else if (is_raw_tracepoint) { + prog_type =BPF_PROG_TYPE_RAW_TRACEPOINT ; }else if (is_xdp) { prog_type =BPF_PROG_TYPE_XDP ; }else if (is_perf_event) {
@@ -131,6 +134,16 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size)return populate_prog_array (event, fd); } +if (is_raw_tracepoint) { + efd =bpf_raw_tracepoint_open (event +15 , fd); +if (efd <0 ) { +printf ("tracepoint %s %s\n" , event +15 ,strerror (errno)); +return -1 ; + } + event_fd[prog_cnt -1 ] = efd; +return 0 ; + } +if (is_kprobe || is_kretprobe) {if (is_kprobe) event +=7 ;
@@ -587,6 +600,7 @@ static int do_load_bpf_file(const char *path, fixup_map_cb fixup_map) if (memcmp(shname, "kprobe/", 7) == 0 || memcmp(shname, "kretprobe/", 10) == 0 || memcmp(shname, "tracepoint/", 11) == 0 || + memcmp(shname, "raw_tracepoint/", 15) == 0 || memcmp(shname, "xdp", 3) == 0 || memcmp(shname, "perf_event", 10) == 0 || memcmp(shname, "socket", 6) == 0 ||
samples/bpf/test_overhead_raw_tp_kern.c new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Facebook */ +#include <uapi/linux/bpf.h> +#include "bpf_helpers.h" + +SEC("raw_tracepoint/task_rename") +int prog (struct bpf_raw_tracepoint_args *ctx) +{ +return 0 ; +} + +SEC("raw_tracepoint/urandom_read") +int prog2 (struct bpf_raw_tracepoint_args *ctx) +{ +return 0 ; +} +char _license[] SEC("license") = "GPL";
samples/bpf/test_overhead_user.c +12 -0
@@ -158,5 +158,17 @@ int main(int argc, char **argv)unload_progs (); } +if (test_flags &0xC0 ) { +snprintf (filename,sizeof (filename), +"%s_raw_tp_kern.o" , argv[0 ]); +if (load_bpf_file (filename)) { +printf ("%s" , bpf_log_buf); +return 1 ; + } +printf ("w/RAW_TRACEPOINT\n" ); +run_perf_test (num_cpu, test_flags >>6 ); +unload_progs (); + } +return 0 ; }
Signature · 1 line
2.9.5
PATCH v3 10/10 selftests/bpf: test for bpf_get_stackid() from raw tracepoints
In reply to Alexei StarovoitovFrom: Alexei Starovoitov <[email protected]>
similar to traditional traceopint test add bpf_get_stackid() test from raw tracepoints
and reduce verbosity of existing stackmap test
--- tools/testing/selftests/bpf/test_progs.c | 91 ++++++++++++++++++++++++-------- 1 file changed, 70 insertions(+), 21 deletions(-)
tools/testing/selftests/bpf/test_progs.c +70 -21
@@ -877,7 +877,7 @@ static void test_stacktrace_map() err =bpf_prog_load (file,BPF_PROG_TYPE_TRACEPOINT , &obj, &prog_fd);if (CHECK (err,"prog_load" ,"err %d errno %d\n" , err, errno)) - goto out; +return ;/* Get the ID for the sched/sched_switch tracepoint */ snprintf(buf, sizeof(buf),
@@ -888,8 +888,7 @@ static void test_stacktrace_map() bytes =read (efd, buf,sizeof (buf));close (efd); -if (CHECK (bytes <=0 || bytes >=sizeof (buf), -"read" ,"bytes %d errno %d\n" , bytes, errno)) +if (bytes <=0 || bytes >=sizeof (buf)) goto close_prog;/* Open the perf event and attach bpf progrram */
@@ -906,29 +905,24 @@ static void test_stacktrace_map() 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; +if (err) + goto disable_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)) +if (err) goto disable_pmu;/* find map fds */ control_map_fd =bpf_find_map (__func__, obj,"control_map" ); -if (CHECK (control_map_fd <0 ,"bpf_find_map control_map" , -"err %d errno %d\n" , err, errno)) +if (control_map_fd <0 ) goto disable_pmu; stackid_hmap_fd =bpf_find_map (__func__, obj,"stackid_hmap" ); -if (CHECK (stackid_hmap_fd <0 ,"bpf_find_map stackid_hmap" , -"err %d errno %d\n" , err, errno)) +if (stackid_hmap_fd <0 ) goto disable_pmu; stackmap_fd =bpf_find_map (__func__, obj,"stackmap" ); -if (CHECK (stackmap_fd <0 ,"bpf_find_map stackmap" ,"err %d errno %d\n" , - err, errno)) +if (stackmap_fd <0 ) goto disable_pmu;/* give some time for bpf program run */
@@ -945,24 +939,78 @@ static void test_stacktrace_map() err =compare_map_keys (stackid_hmap_fd, stackmap_fd);if (CHECK (err,"compare_map_keys stackid_hmap vs. stackmap" ,"err %d errno %d\n" , err, errno)) - goto disable_pmu; + goto disable_pmu_noerr; err =compare_map_keys (stackmap_fd, stackid_hmap_fd);if (CHECK (err,"compare_map_keys stackmap vs. stackid_hmap" ,"err %d errno %d\n" , err, errno)) - ;/* fall through */ + goto disable_pmu_noerr; + goto disable_pmu_noerr; disable_pmu: + error_cnt++; +disable_pmu_noerr:ioctl (pmu_fd,PERF_EVENT_IOC_DISABLE ); - -close_pmu:close (pmu_fd); - close_prog:bpf_object__close (obj); +} -out: -return ; +static void test_stacktrace_map_raw_tp () +{ +int control_map_fd, stackid_hmap_fd, stackmap_fd; +const char *file ="./test_stacktrace_map.o" ; +int efd, err, prog_fd; +__u32 key, val, duration =0 ; +struct bpf_object *obj; + + err =bpf_prog_load (file,BPF_PROG_TYPE_RAW_TRACEPOINT , &obj, &prog_fd); +if (CHECK (err,"prog_load raw tp" ,"err %d errno %d\n" , err, errno)) +return ; + + efd =bpf_raw_tracepoint_open ("sched_switch" , prog_fd); +if (CHECK (efd <0 ,"raw_tp_open" ,"err %d errno %d\n" , efd, errno)) + goto close_prog; + +/* find map fds */ + control_map_fd =bpf_find_map (__func__, obj,"control_map" ); +if (control_map_fd <0 ) + goto close_prog; + + stackid_hmap_fd =bpf_find_map (__func__, obj,"stackid_hmap" ); +if (stackid_hmap_fd <0 ) + goto close_prog; + + stackmap_fd =bpf_find_map (__func__, obj,"stackmap" ); +if (stackmap_fd <0 ) + goto close_prog; + +/* give some time for bpf program run */ +sleep (1 ); + +/* disable stack trace collection */ + key =0 ; + val =1 ; +bpf_map_update_elem (control_map_fd, &key, &val,0 ); + +/* for every element in stackid_hmap, we can find a corresponding one +* in stackmap, and vise versa. +*/ + err =compare_map_keys (stackid_hmap_fd, stackmap_fd); +if (CHECK (err,"compare_map_keys stackid_hmap vs. stackmap" , +"err %d errno %d\n" , err, errno)) + goto close_prog; + + err =compare_map_keys (stackmap_fd, stackid_hmap_fd); +if (CHECK (err,"compare_map_keys stackmap vs. stackid_hmap" , +"err %d errno %d\n" , err, errno)) + goto close_prog; + + goto close_prog_noerr; +close_prog: + error_cnt++; +close_prog_noerr: +bpf_object__close (obj); }static int extract_build_id (char *build_id,size_t size)
@@ -1138,6 +1186,7 @@ int main(void)test_tp_attach_query ();test_stacktrace_map ();test_stacktrace_build_id (); +test_stacktrace_map_raw_tp ();printf ("Summary: %d PASSED, %d FAILED\n" , pass_cnt, error_cnt);return error_cnt ?EXIT_FAILURE :EXIT_SUCCESS ;
Signature · 1 line
2.9.5