trace-cruncher: Add support for event probes
v2 cover trace-cruncher: Add support for event probes
Event probe (eprobe) is a new type of ftrace dynamic events, introduced in the Linux kernel 5.15 version. It is useful to have support for them in trace-cruncher, as it allows more flexibility when printing event's data.
v2 changes:
- Moved unit test in a separate patch.
- Added a check in the unit test if the kernel supports eprobes.
- Renamed the API from PyFtrace_register_eprobe() to PyFtrace_eprobe(), for consistency with the other dynamic events APIs.
Tzvetomir Stoyanov (VMware) (2):
trace-cruncher: Add support for event probes
trace-cruncher: Unit test for event probes API
src/ftracepy-utils.c | 32 ++++++++++++ src/ftracepy-utils.h | 2 + src/ftracepy.c | 5 ++ .../tests/1_unit/test_01_ftracepy_unit.py | 50 +++++++++++++++++++ 4 files changed, 89 insertions(+)
Signature · 1 line
2.34.1
PATCH v2 1/2 trace-cruncher: Add support for event probes
Event probe (eprobe) is a new type of ftrace dynamic events, introduced in the Linux kernel 5.15 version. It is useful to have support for it in trace-cruncher, as it allows more flexibility when printing event's data.
--- src/ftracepy-utils.c | 32 ++++++++++++++++++++++++++++++++ src/ftracepy-utils.h | 2 ++ src/ftracepy.c | 5 +++++ 3 files changed, 39 insertions(+)
src/ftracepy-utils.c +32 -0
@@ -2315,6 +2315,38 @@ struct tep_event *dynevent_get_event(PyDynevent *event,return tep_evt; } +PyObject *PyFtrace_eprobe (PyObject *self,PyObject *args,PyObject *kwargs) +{ +static char *kwlist[] = {"event" ,"target_system" ,"target_event" ,"fetchargs" ,NULL }; +const char *event, *target_system, *target_event, *fetchargs; +struct tracefs_dynevent *eprobe; + +if (!PyArg_ParseTupleAndKeywords (args, + kwargs, +"ssss" , + kwlist, + &event, + &target_system, + &target_event, + &fetchargs)) { +return NULL ; + } + + eprobe =tracefs_eprobe_alloc (TC_SYS , event, target_system, target_event, fetchargs); +if (!eprobe) { +MEM_ERROR ; +return NULL ; + } + +if (tracefs_dynevent_create (eprobe) <0 ) { +TfsError_fmt (NULL ,"Failed to create eprobe '%s'" , event); +tracefs_dynevent_free (eprobe); +return NULL ; + } + +return PyDynevent_New (eprobe); +} +static PyObject *set_filter (PyObject *args,PyObject *kwargs,struct tep_handle *tep,struct tep_event *event)
src/ftracepy-utils.h +2 -0
@@ -251,6 +251,8 @@ PyObject *PyFtrace_register_kprobe(PyObject *self, PyObject *args,PyObject *PyFtrace_register_kretprobe (PyObject *self,PyObject *args,PyObject *kwargs); +PyObject *PyFtrace_eprobe (PyObject *self,PyObject *args,PyObject *kwargs); +PyObject *PyFtrace_hist (PyObject *self,PyObject *args,PyObject *kwargs);
src/ftracepy.c +5 -0
@@ -460,6 +460,11 @@ static PyMethodDef ftracepy_methods[] = {METH_VARARGS |METH_KEYWORDS ,"Define a kretprobe." }, + {"register_eprobe", + (PyCFunction ) PyFtrace_eprobe, +METH_VARARGS |METH_KEYWORDS , +"Define an eprobe." + }, {"hist", (PyCFunction ) PyFtrace_hist, METH_VARARGS | METH_KEYWORDS,
Signature · 1 line
2.34.1
PATCH v2 2/2 trace-cruncher: Unit test for event probes API
In reply to Tzvetomir Stoyanov (VMware)All trace-cruncher APIs should be covered by unit tests. Added a test for newly introduced event probes API.
--- .../tests/1_unit/test_01_ftracepy_unit.py | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+)
tracecruncher/tests/1_unit/test_01_ftracepy_unit.py +50 -0
@@ -14,6 +14,7 @@ import tracecruncher.ft_utils as tc instance_name = 'test_instance1' another_instance_name = 'test_instance2' +kernel_version = tuple(map(int, (os.uname()[2].split('.')[:2]))) class InstanceTestCase(unittest.TestCase): def test_dir(self):
@@ -457,6 +458,55 @@ class KprobeTestCase(unittest.TestCase): ret = kp1.is_enabled(instance=inst) self.assertEqual(ret, '0') +class EprobeTestCase(unittest.TestCase): + def test_register_eprobe(self): + """ Event probes are introduced in Linux kernel 5.15 + """ + if kernel_version < (5, 15): + return + + evt1 = 'sopen_in' + evt1_tsys = 'syscalls' + evt1_tevent = 'sys_enter_openat' + evt1_args = 'file=+0($filename):ustring' + evt2 = 'sopen_out' + evt2_tsys = 'syscalls' + evt2_tevent = 'sys_exit_openat' + evt2_args = 'res=$ret:u64' + + ep1 = ft.register_eprobe(event=evt1, target_system=evt1_tsys, target_event=evt1_tevent, + fetchargs=evt1_args) + self.assertEqual(evt1, ep1.event()) + self.assertEqual("{}.{}".format(evt1_tsys, evt1_tevent), ep1.address()) + self.assertEqual(evt1_args, ep1.probe()) + + ep2 = ft.register_eprobe(event=evt2, target_system=evt2_tsys, target_event=evt2_tevent, + fetchargs=evt2_args) + self.assertEqual(evt2, ep2.event()) + self.assertEqual("{}.{}".format(evt2_tsys, evt2_tevent), ep2.address()) + self.assertEqual(evt2_args, ep2.probe()) + + def test_enable_eprobe(self): + """ Event probes are introduced in Linux kernel 5.15 + """ + if kernel_version < (5, 15): + return + + evt1 = 'sopen_out' + evt1_tsys = 'syscalls' + evt1_tevent = 'sys_exit_openat' + evt1_args = 'res=$ret:u64' + + ep1 = ft.register_eprobe(event=evt1, target_system=evt1_tsys, target_event=evt1_tevent, + fetchargs=evt1_args) + inst = ft.create_instance(instance_name) + ep1.enable(instance=inst) + ret = ep1.is_enabled(instance=inst) + self.assertEqual(ret, '1') + + ep1.disable(instance=inst) + ret = ep1.is_enabled(instance=inst) + self.assertEqual(ret, '0') class TracingOnTestCase(unittest.TestCase): def test_ON_OF(self):
Signature · 1 line
2.34.1