DPDK Trace support
Subsystems (6)
cover DPDK Trace support
From: Jerin Jacob <[email protected]>
It is the v1 version of the DPDK trace support based on the following RFC
https://www.mail-archive.com/[email protected]/msg154457.html
This patch set contains
~~~~~~~~~~~~~~~~~~~~~~~~
# The native implementation of common trace format(CTF)[1] based tracer # Public API to create the trace points.
# Add tracepoints to eal, ethdev, mempool, eventdev and cryptodev library for tracing support
# A unit test case
# Performance test case to measure the trace overhead. (See eal/trace:
# add trace performance test cases, patch) # Programmers guide for Trace support(See doc: add trace library guide, # patch)
# Tested OS:
~~~~~~~~~~~
- Linux
- FreeBSD
# Tested open source CTF trace viewers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Babeltrace
- Tracecompass
# Trace overhead comparison with LTTng
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
trace overhead data on x86:[2]
# 236 cycles with LTTng(>100ns)
# 18 cycles(7ns) with Native DPDK CTF emitter.(See eal/trace: add trace
# performance test cases patch)
trace overhead data on arm64:
# 312 cycles to 1100 cycles with LTTng based on the class of arm64 # CPU. # 11 cycles to 13 cycles with Native DPDK CTF emitter based on the
class of arm64 CPU.
18 cycles(on x86) vs 11 cycles(on arm64) is due to rdtsc() overhead in x86. It seems rdtsc takes around 15cycles in x86.
Items that needs to be sort it out
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Checkpatch script reports errors for macros which emit events.
Library exports set of macros(rte_trace_ctf_*) to emit events
for various datatypes.
Checkpatch scripts reports error for these macros, to be part of
EXPERIMENTAL section,
even symbols are updated in EXPERIMENTAL section in
rte_eal_version.map file.
# Makefile and meson.build are updated to allow experimental APIs.
As multiple EXPERIMENTAL symbols, exported by trace library, are
used in various
drivers, lib, app and examples. So to fix compilation
warning/error, Makefile and
meson.build are updated for all required components to support
EXPERIMENTAL APIs.
It results same code changes at multiple components as well as
increases source
code line changes in patchset too.
Suggestions are welcome to resolve this issue with lesser code
changes
More details:
~~~~~~~~~~~~~
# The Native DPDK CTF trace support does not have any dependency on third-party library.
The generated output file is compatible with LTTng as both are using CTF trace format.
The performance gain comes from:
1) exploit dpdk worker thread usage model to avoid atomics and use per core variables
2) use hugepage,
3) avoid a lot function pointers in fast-path etc
4) avoid unaligned store for arm64 etc
Features:
~~~~~~~~~
- APIs and Features are similar to rte_log dynamic framework API(expect log prints on stdout vs it dumps on trace file)
- No specific limit on the events. A string-based event like rte_log for pattern matching
- Dynamic enable/disable support.
- Instructmention overhead is ~1 cycle. i.e cost of adding the code wth out using trace feature.
- Timestamp support for all the events using DPDK rte_rtdsc
- No dependency on another library. Clean room native implementation of CTF.
Functional test case:
a) echo "trace_autotest" | sudo ./build/app/test/dpdk-test -c 0x3 --trace-level=8
The above command emits the following trace events <code>
uint8_t i;
rte_trace_lib_eal_generic_void();
rte_trace_lib_eal_generic_u64(0x10000000000000);
rte_trace_lib_eal_generic_u32(0x10000000);
rte_trace_lib_eal_generic_u16(0xffee);
rte_trace_lib_eal_generic_u8(0xc);
rte_trace_lib_eal_generic_i64(-1234);
rte_trace_lib_eal_generic_i32(-1234567);
rte_trace_lib_eal_generic_i16(12);
rte_trace_lib_eal_generic_i8(-3);
rte_trace_lib_eal_generic_string("my string");
rte_trace_lib_eal_generic_function(__func__);
for (i = 0; i < 128; i++)
rte_trace_lib_eal_generic_u8(i);</code>
Install babeltrace package in Linux and point the generated trace file to babel trace. By default trace file created under <user>/dpdk-traces/time_stamp/
example:
# babeltrace /root/dpdk-traces/rte-2020-02-15-PM-02-56-51 | more
[13:27:36.138468807] (+?.?????????) lib.eal.generic.void: { cpu_id = 0, name = "dpdk-test" }, { }
[13:27:36.138468851] (+0.000000044) lib.eal.generic.u64: { cpu_id = 0, name = "dpdk-test" }, { in = 4503599627370496 } [13:27:36.138468860] (+0.000000009) lib.eal.generic.u32: { cpu_id = 0, name = "dpdk-test" }, { in = 268435456 } [13:27:36.138468934] (+0.000000074) lib.eal.generic.u16: { cpu_id = 0, name = "dpdk-test" }, { in = 65518 }
[13:27:36.138468949] (+0.000000015) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 12 }
[13:27:36.138468956] (+0.000000007) lib.eal.generic.i64: { cpu_id = 0, name = "dpdk-test" }, { in = -1234 }
[13:27:36.138468963] (+0.000000007) lib.eal.generic.i32: { cpu_id = 0, name = "dpdk-test" }, { in = -1234567 } [13:27:36.138469024] (+0.000000061) lib.eal.generic.i16: { cpu_id = 0, name = "dpdk-test" }, { in = 12 }
[13:27:36.138469044] (+0.000000020) lib.eal.generic.i8: { cpu_id = 0, name = "dpdk-test" }, { in = -3 }
[13:27:36.138469051] (+0.000000007) lib.eal.generic.string: { cpu_id = 0, name = "dpdk-test" }, { str = "my string" } [13:27:36.138469203] (+0.000000152) lib.eal.generic.func: { cpu_id = 0, name = "dpdk-test" }, { func = "test_trace_points" } [13:27:36.138469239] (+0.000000036) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 0 }
[13:27:36.138469246] (+0.000000007) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 1 }
[13:27:36.138469252] (+0.000000006) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 2 }
[13:27:36.138469262] (+0.000000010) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 3 }
[13:27:36.138469269] (+0.000000007) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 4 }
[13:27:36.138469276] (+0.000000007) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 5 }
# There is a GUI based trace viewer available in Windows, Linux and # Mac.
It is called as tracecompass.(https://www.eclipse.org/tracecompass/)
The example screenshot and Histogram of above DPDK trace using Tracecompass.
https://github.com/jerinjacobk/share/blob/master/dpdk_trace.JPG
File walk through:
~~~~~~~~~~~~~~~~~~
lib/librte_eal/common/include/rte_trace.h - Public API for Trace provider and Trace control lib/librte_eal/common/eal_common_trace.c - main trace implementation lib/librte_eal/common/eal_common_trace_ctf.c - CTF metadata spec implementation lib/librte_eal/common/eal_common_trace_utils.c - command line utils and filesystem operations. lib/librte_eal/common/eal_common_trace_points.c - trace points for EAL librarylib/librte_eal/common/include/rte_trace_eal.h - EAL tracepoint public API.lib/librte_eal/common/eal_trace.h - Private trace header file.
[2] The above test is ported to LTTng for finding the LTTng trace overhead. It available at
https://github.com/jerinjacobk/lttng-overhead
https://github.com/jerinjacobk/lttng-overhead/blob/master/README
Jerin Jacob (21):
eal: introduce API for getting thread name
eal: define the public API for trace support eal/trace: implement trace register API eal/trace: implement trace operation APIs eal/trace: add internal trace init and fini interface eal/trace: get bootup timestamp for trace eal/trace: create CTF TDSL metadata in memory eal/trace: implement trace memory allocation eal/trace: implement debug dump function eal/trace: implement trace save
eal/trace: implement registration payload eal/trace: implement provider payload eal/trace: hook internal trace APIs to Linux eal/trace: hook internal trace APIs to FreeBSD eal/trace: add generic tracepoints eal/trace: add alarm tracepoints
eal/trace: add memory tracepoints
eal/trace: add memzone tracepoints eal/trace: add thread tracepoints
eal/trace: add interrupt tracepoints eal/trace: add trace performance test cases
Sunil Kumar Kori (11):
eal/trace: handle CTF keyword collision eal/trace: add trace level configuration parameter eal/trace: add trace dir configuration parameter eal/trace: add trace bufsize configuration parameter eal/trace: add trace mode configuration parameter eal/trace: add unit test cases
ethdev: add tracepoints
eventdev: add tracepoints
cryptodev: add tracepoints
mempool: add tracepoints
doc: add trace library guide
MAINTAINERS | 15 + app/pdump/Makefile | 1 + app/pdump/meson.build | 1 + app/proc-info/Makefile | 1 + app/proc-info/meson.build | 1 + app/test-acl/Makefile | 1 + app/test-acl/meson.build | 1 + app/test-cmdline/Makefile | 1 + app/test-cmdline/meson.build | 1 + app/test-eventdev/Makefile | 1 + app/test-eventdev/meson.build | 1 + app/test-pipeline/Makefile | 1 + app/test-pipeline/meson.build | 1 + app/test/Makefile | 4 +- app/test/meson.build | 3 + app/test/test_trace.c | 618 ++++++++++++++++++ app/test/test_trace.h | 52 ++ app/test/test_trace_perf.c | 179 +++++ app/test/test_trace_register.c | 46 ++ config/common_base | 1 + config/rte_config.h | 1 + doc/api/doxy-api-index.md | 3 +- doc/guides/linux_gsg/eal_args.include.rst | 55 ++ doc/guides/prog_guide/index.rst | 1 + doc/guides/prog_guide/trace_lib.rst | 264 ++++++++ doc/guides/rel_notes/release_20_05.rst | 4 + drivers/common/cpt/Makefile | 1 + drivers/crypto/ccp/Makefile | 1 + drivers/crypto/ccp/meson.build | 2 + drivers/crypto/mvsam/Makefile | 1 + drivers/crypto/mvsam/meson.build | 1 + drivers/crypto/null/Makefile | 1 + drivers/crypto/null/meson.build | 1 + drivers/crypto/scheduler/Makefile | 1 + drivers/crypto/scheduler/meson.build | 1 + drivers/crypto/virtio/Makefile | 1 + drivers/crypto/virtio/meson.build | 1 + drivers/event/octeontx/Makefile | 1 + drivers/event/octeontx/meson.build | 1 + drivers/event/skeleton/Makefile | 1 + drivers/event/skeleton/meson.build | 1 + drivers/event/sw/Makefile | 1 + drivers/event/sw/meson.build | 1 + drivers/mempool/ring/Makefile | 1 + drivers/mempool/ring/meson.build | 1 + drivers/net/af_packet/Makefile | 1 + drivers/net/af_packet/meson.build | 1 + drivers/net/af_xdp/Makefile | 1 + drivers/net/af_xdp/meson.build | 1 + drivers/net/ark/Makefile | 1 + drivers/net/ark/meson.build | 1 + drivers/net/bnxt/Makefile | 1 + drivers/net/bnxt/meson.build | 1 + drivers/net/cxgbe/Makefile | 1 + drivers/net/cxgbe/meson.build | 1 + drivers/net/enetc/Makefile | 1 + drivers/net/enetc/meson.build | 1 + drivers/net/hinic/Makefile | 1 + drivers/net/hinic/base/meson.build | 3 +- drivers/net/hinic/meson.build | 1 + drivers/net/ionic/ionic_dev.c | 1 + drivers/net/ionic/ionic_dev.h | 2 + drivers/net/ionic/ionic_mac_api.c | 1 + drivers/net/ionic/ionic_main.c | 1 + drivers/net/ionic/ionic_osdep.h | 6 - drivers/net/ionic/ionic_rx_filter.c | 1 + drivers/net/kni/Makefile | 1 + drivers/net/kni/meson.build | 1 + drivers/net/liquidio/Makefile | 1 + drivers/net/liquidio/meson.build | 1 + drivers/net/mvneta/Makefile | 1 + drivers/net/mvneta/meson.build | 1 + drivers/net/mvpp2/Makefile | 1 + drivers/net/mvpp2/meson.build | 1 + drivers/net/nfb/Makefile | 1 + drivers/net/nfb/meson.build | 1 + drivers/net/null/Makefile | 1 + drivers/net/null/meson.build | 1 + drivers/net/octeontx/Makefile | 1 + drivers/net/octeontx2/Makefile | 1 + drivers/net/octeontx2/meson.build | 1 + drivers/net/pcap/Makefile | 1 + drivers/net/pcap/meson.build | 1 + drivers/net/ring/Makefile | 1 + drivers/net/ring/meson.build | 1 + drivers/net/szedata2/Makefile | 1 + drivers/net/szedata2/meson.build | 1 + drivers/net/thunderx/base/meson.build | 1 + drivers/net/vhost/Makefile | 1 + drivers/net/vhost/meson.build | 1 + drivers/raw/ioat/Makefile | 1 + drivers/raw/ioat/meson.build | 1 + drivers/raw/octeontx2_dma/Makefile | 1 + drivers/raw/octeontx2_dma/meson.build | 1 + drivers/raw/octeontx2_ep/Makefile | 1 + drivers/raw/octeontx2_ep/meson.build | 1 + drivers/raw/skeleton/Makefile | 1 + drivers/raw/skeleton/meson.build | 1 + examples/cmdline/Makefile | 1 + examples/cmdline/meson.build | 1 + examples/distributor/Makefile | 1 + examples/distributor/meson.build | 1 + examples/ethtool/ethtool-app/Makefile | 1 + examples/flow_filtering/Makefile | 1 + examples/flow_filtering/meson.build | 1 + examples/helloworld/Makefile | 1 + examples/helloworld/meson.build | 1 + examples/ioat/Makefile | 1 + examples/ioat/meson.build | 1 + examples/ip_reassembly/Makefile | 1 + examples/ip_reassembly/meson.build | 1 + examples/ipv4_multicast/Makefile | 1 + examples/ipv4_multicast/meson.build | 1 + examples/l2fwd-cat/Makefile | 1 + examples/l2fwd-cat/meson.build | 1 + examples/l2fwd-event/Makefile | 1 + examples/l2fwd-event/meson.build | 1 + examples/l2fwd-jobstats/Makefile | 1 + examples/l2fwd-jobstats/meson.build | 1 + examples/l2fwd-keepalive/Makefile | 1 + examples/l2fwd-keepalive/ka-agent/Makefile | 1 + examples/l2fwd-keepalive/meson.build | 1 + examples/l3fwd-acl/Makefile | 1 + examples/l3fwd-acl/meson.build | 1 + examples/l3fwd/Makefile | 1 + examples/l3fwd/meson.build | 1 + examples/link_status_interrupt/Makefile | 1 + examples/link_status_interrupt/meson.build | 1 + .../client_server_mp/mp_client/Makefile | 1 + .../client_server_mp/mp_client/meson.build | 1 + .../client_server_mp/mp_server/meson.build | 1 + examples/multi_process/hotplug_mp/Makefile | 1 + examples/multi_process/hotplug_mp/meson.build | 1 + examples/multi_process/simple_mp/Makefile | 1 + examples/multi_process/simple_mp/meson.build | 1 + examples/multi_process/symmetric_mp/Makefile | 1 + .../multi_process/symmetric_mp/meson.build | 1 + examples/packet_ordering/Makefile | 1 + examples/packet_ordering/meson.build | 1 + .../performance-thread/l3fwd-thread/Makefile | 1 + .../l3fwd-thread/meson.build | 1 + .../performance-thread/pthread_shim/Makefile | 1 + .../pthread_shim/meson.build | 1 + examples/ptpclient/Makefile | 1 + examples/ptpclient/meson.build | 1 + examples/qos_meter/Makefile | 1 + examples/qos_meter/meson.build | 1 + examples/qos_sched/Makefile | 1 + examples/qos_sched/meson.build | 1 + examples/server_node_efd/node/Makefile | 1 + examples/server_node_efd/node/meson.build | 1 + examples/server_node_efd/server/Makefile | 1 + examples/server_node_efd/server/meson.build | 1 + examples/service_cores/Makefile | 1 + examples/service_cores/meson.build | 1 + examples/skeleton/Makefile | 1 + examples/skeleton/meson.build | 1 + examples/timer/Makefile | 1 + examples/timer/meson.build | 1 + examples/vm_power_manager/Makefile | 1 + examples/vm_power_manager/meson.build | 1 + examples/vmdq/Makefile | 1 + examples/vmdq/meson.build | 1 + examples/vmdq_dcb/Makefile | 1 + examples/vmdq_dcb/meson.build | 1 + lib/librte_bitratestats/Makefile | 1 + lib/librte_bitratestats/meson.build | 1 + lib/librte_cryptodev/Makefile | 4 +- lib/librte_cryptodev/cryptodev_trace_points.c | 70 ++ lib/librte_cryptodev/meson.build | 7 +- lib/librte_cryptodev/rte_cryptodev.c | 18 + lib/librte_cryptodev/rte_cryptodev.h | 6 + .../rte_cryptodev_version.map | 18 + lib/librte_cryptodev/rte_trace_cryptodev.h | 133 ++++ lib/librte_cryptodev/rte_trace_cryptodev_fp.h | 34 + lib/librte_distributor/Makefile | 1 + lib/librte_distributor/meson.build | 1 + lib/librte_eal/common/Makefile | 1 + lib/librte_eal/common/eal_common_log.c | 9 +- lib/librte_eal/common/eal_common_memzone.c | 9 + lib/librte_eal/common/eal_common_options.c | 68 +- lib/librte_eal/common/eal_common_thread.c | 3 +- lib/librte_eal/common/eal_common_trace.c | 616 +++++++++++++++++ lib/librte_eal/common/eal_common_trace_ctf.c | 488 ++++++++++++++ .../common/eal_common_trace_points.c | 115 ++++ .../common/eal_common_trace_utils.c | 518 +++++++++++++++ lib/librte_eal/common/eal_options.h | 8 + lib/librte_eal/common/eal_private.h | 11 + lib/librte_eal/common/eal_trace.h | 122 ++++ lib/librte_eal/common/include/rte_lcore.h | 17 + lib/librte_eal/common/include/rte_trace.h | 587 +++++++++++++++++ lib/librte_eal/common/include/rte_trace_eal.h | 247 +++++++ .../common/include/rte_trace_provider.h | 130 ++++ .../common/include/rte_trace_register.h | 70 ++ lib/librte_eal/common/meson.build | 8 + lib/librte_eal/common/rte_malloc.c | 60 +- lib/librte_eal/freebsd/eal/Makefile | 4 + lib/librte_eal/freebsd/eal/eal.c | 10 + lib/librte_eal/freebsd/eal/eal_alarm.c | 3 + lib/librte_eal/freebsd/eal/eal_interrupts.c | 52 +- lib/librte_eal/freebsd/eal/eal_thread.c | 21 +- lib/librte_eal/linux/eal/Makefile | 4 + lib/librte_eal/linux/eal/eal.c | 9 + lib/librte_eal/linux/eal/eal_alarm.c | 4 + lib/librte_eal/linux/eal/eal_interrupts.c | 84 ++- lib/librte_eal/linux/eal/eal_thread.c | 27 +- lib/librte_eal/rte_eal_version.map | 61 ++ lib/librte_ethdev/Makefile | 3 + lib/librte_ethdev/ethdev_trace_points.c | 43 ++ lib/librte_ethdev/meson.build | 5 +- lib/librte_ethdev/rte_ethdev.c | 12 + lib/librte_ethdev/rte_ethdev.h | 5 + lib/librte_ethdev/rte_ethdev_version.map | 10 + lib/librte_ethdev/rte_trace_ethdev.h | 90 +++ lib/librte_ethdev/rte_trace_ethdev_fp.h | 40 ++ lib/librte_eventdev/Makefile | 3 + lib/librte_eventdev/eventdev_trace_points.c | 173 +++++ lib/librte_eventdev/meson.build | 3 + .../rte_event_crypto_adapter.c | 10 + .../rte_event_eth_rx_adapter.c | 11 + .../rte_event_eth_tx_adapter.c | 13 +- .../rte_event_eth_tx_adapter.h | 2 + lib/librte_eventdev/rte_event_timer_adapter.c | 8 +- lib/librte_eventdev/rte_event_timer_adapter.h | 8 + lib/librte_eventdev/rte_eventdev.c | 9 + lib/librte_eventdev/rte_eventdev.h | 5 +- lib/librte_eventdev/rte_eventdev_version.map | 42 ++ lib/librte_eventdev/rte_trace_eventdev.h | 278 ++++++++ lib/librte_eventdev/rte_trace_eventdev_fp.h | 75 +++ lib/librte_gro/Makefile | 1 + lib/librte_gro/meson.build | 1 + lib/librte_gso/Makefile | 1 + lib/librte_gso/meson.build | 1 + lib/librte_ip_frag/Makefile | 1 + lib/librte_ip_frag/meson.build | 1 + lib/librte_kni/Makefile | 1 + lib/librte_kni/meson.build | 1 + lib/librte_latencystats/Makefile | 1 + lib/librte_latencystats/meson.build | 1 + lib/librte_mempool/Makefile | 3 + lib/librte_mempool/mempool_trace_points.c | 108 +++ lib/librte_mempool/meson.build | 7 +- lib/librte_mempool/rte_mempool.c | 16 + lib/librte_mempool/rte_mempool.h | 13 + lib/librte_mempool/rte_mempool_ops.c | 7 + lib/librte_mempool/rte_mempool_version.map | 26 + lib/librte_mempool/rte_trace_mempool.h | 148 +++++ lib/librte_mempool/rte_trace_mempool_fp.h | 102 +++ lib/librte_port/Makefile | 1 + lib/librte_port/meson.build | 1 + lib/librte_reorder/Makefile | 1 + lib/librte_reorder/meson.build | 1 + lib/librte_sched/Makefile | 1 + lib/librte_sched/meson.build | 1 + lib/librte_security/Makefile | 1 + lib/librte_security/meson.build | 1 + lib/librte_table/Makefile | 1 + lib/librte_table/meson.build | 1 + 258 files changed, 6276 insertions(+), 88 deletions(-) create mode 100644 app/test/test_trace.c create mode 100644 app/test/test_trace.h create mode 100644 app/test/test_trace_perf.c create mode 100644 app/test/test_trace_register.c create mode 100644 doc/guides/prog_guide/trace_lib.rst create mode 100644 lib/librte_cryptodev/cryptodev_trace_points.c create mode 100644 lib/librte_cryptodev/rte_trace_cryptodev.h create mode 100644 lib/librte_cryptodev/rte_trace_cryptodev_fp.h create mode 100644 lib/librte_eal/common/eal_common_trace.c create mode 100644 lib/librte_eal/common/eal_common_trace_ctf.c create mode 100644 lib/librte_eal/common/eal_common_trace_points.c create mode 100644 lib/librte_eal/common/eal_common_trace_utils.c create mode 100644 lib/librte_eal/common/eal_trace.h create mode 100644 lib/librte_eal/common/include/rte_trace.h create mode 100644 lib/librte_eal/common/include/rte_trace_eal.h create mode 100644 lib/librte_eal/common/include/rte_trace_provider.h create mode 100644 lib/librte_eal/common/include/rte_trace_register.h create mode 100644 lib/librte_ethdev/ethdev_trace_points.c create mode 100644 lib/librte_ethdev/rte_trace_ethdev.h create mode 100644 lib/librte_ethdev/rte_trace_ethdev_fp.h create mode 100644 lib/librte_eventdev/eventdev_trace_points.c create mode 100644 lib/librte_eventdev/rte_trace_eventdev.h create mode 100644 lib/librte_eventdev/rte_trace_eventdev_fp.h create mode 100644 lib/librte_mempool/mempool_trace_points.c create mode 100644 lib/librte_mempool/rte_trace_mempool.h create mode 100644 lib/librte_mempool/rte_trace_mempool_fp.h
Signature · 1 line
2.25.1
PATCH 1/32 eal: introduce API for getting thread name
From: Jerin Jacob <[email protected]>
Introduce rte_thread_getname() API to get the thread name and implement it for Linux and FreeBSD.
FreeBSD does not support getting the thread name.
One of the consumers of this API will be the trace subsystem where it used as an informative purpose.
--- lib/librte_eal/common/include/rte_lcore.h | 17 +++++++++++++++++ lib/librte_eal/freebsd/eal/eal_thread.c | 9 +++++++++ lib/librte_eal/linux/eal/eal_thread.c | 15 +++++++++++++++ lib/librte_eal/rte_eal_version.map | 3 +++ 4 files changed, 44 insertions(+)
lib/librte_eal/common/include/rte_lcore.h +17 -0
@@ -240,6 +240,23 @@ void rte_thread_get_affinity(rte_cpuset_t *cpusetp);*/ int rte_thread_setname (pthread_t id,const char *name); +/** +* Get thread name. +* +* @note It fails with glibc < 2.12. +* +* @param id +* Thread id. +* @param name +* Thread name to set. +* @param len +* Thread name buffer length. +* @return +* On success, return 0; otherwise return a negative value. +*/ +__rte_experimental +int rte_thread_getname(pthread_t id, char *name, size_t len); +/** * Create a control thread. *
lib/librte_eal/freebsd/eal/eal_thread.c +9 -0
@@ -175,3 +175,12 @@ int rte_thread_setname(pthread_t id, const char *name)pthread_set_name_np (id, name);return 0 ; } + +int rte_thread_getname (pthread_t id,char *name,size_t len) +{ +RTE_SET_USED (id); +RTE_SET_USED (name); +RTE_SET_USED (len); + +return -ENOTSUP ; +}
lib/librte_eal/linux/eal/eal_thread.c +15 -0
@@ -186,3 +186,18 @@ int rte_thread_setname(pthread_t id, const char *name)RTE_SET_USED (name);return -ret; } + +int rte_thread_getname (pthread_t id,char *name,size_t len) +{ +int ret =ENOSYS ; +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) +#if __GLIBC_PREREQ (2 ,12 ) + ret =pthread_getname_np (id, name, len); +#endif +#endif +RTE_SET_USED (id); +RTE_SET_USED (name); +RTE_SET_USED (len); +return -ret; + +}
lib/librte_eal/rte_eal_version.map +3 -0
@@ -335,4 +335,7 @@ EXPERIMENTAL { # added in 20.02 rte_thread_is_intr; + + # added in 20.05 + rte_thread_getname; };
Signature · 1 line
2.25.1
PATCH 2/32 eal: define the public API for trace support
In reply to [email protected]From: Jerin Jacob <[email protected]>
Define the public API for trace support.
This patch also adds support for the build infrastructure and update the MAINTAINERS file for the trace subsystem.
--- MAINTAINERS | 6 + config/common_base | 1 + config/rte_config.h | 1 + doc/api/doxy-api-index.md | 3 +- lib/librte_eal/common/Makefile | 1 + lib/librte_eal/common/eal_common_trace.c | 6 + lib/librte_eal/common/include/rte_trace.h | 525 ++++++++++++++++++++++ lib/librte_eal/common/meson.build | 2 + lib/librte_eal/freebsd/eal/Makefile | 1 + lib/librte_eal/linux/eal/Makefile | 1 + 10 files changed, 546 insertions(+), 1 deletion(-) create mode 100644 lib/librte_eal/common/eal_common_trace.c create mode 100644 lib/librte_eal/common/include/rte_trace.h
MAINTAINERS +6 -0
@@ -196,6 +196,12 @@ F: app/test/test_string_fns.c F: app/test/test_tailq.c F: app/test/test_version.c +Trace +M: Jerin Jacob <[email protected]> +M: Sunil Kumar Kori <[email protected]> +F: lib/librte_eal/common/include/rte_trace*.h +F: lib/librte_eal/common/eal_common_trace*.c + Memory Allocation M: Anatoly Burakov <[email protected]> F: lib/librte_eal/common/include/rte_fbarray.h
config/common_base +1 -0
@@ -99,6 +99,7 @@ CONFIG_RTE_MAX_MEMZONE=2560 CONFIG_RTE_MAX_TAILQ=32 CONFIG_RTE_ENABLE_ASSERT=n CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO +CONFIG_RTE_ENABLE_TRACE_DP=n CONFIG_RTE_LOG_HISTORY=256 CONFIG_RTE_BACKTRACE=y CONFIG_RTE_LIBEAL_USE_HPET=n
config/rte_config.h +1 -0
@@ -42,6 +42,7 @@#define RTE_MAX_MEMZONE 2560#define RTE_MAX_TAILQ 32#define RTE_LOG_DP_LEVEL RTE_LOG_INFO +#define RTE_ENABLE_TRACE_DP 0#define RTE_BACKTRACE 1#define RTE_MAX_VFIO_CONTAINERS 64
doc/api/doxy-api-index.md +2 -1
@@ -174,7 +174,8 @@ The public API headers are grouped by topics: [hexdump] (@ref rte_hexdump.h), [debug] (@ref rte_debug.h), [log] (@ref rte_log.h), - [errno] (@ref rte_errno.h) + [errno] (@ref rte_errno.h), + [trace] (@ref rte_trace.h) - **misc**: [EAL config] (@ref rte_eal.h),
lib/librte_eal/common/Makefile +1 -0
@@ -9,6 +9,7 @@ INC += rte_debug.h rte_eal.h rte_eal_interrupts.h INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h +INC += rte_trace.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h INC += rte_string_fns.h rte_version.h INC += rte_eal_memconfig.h
lib/librte_eal/common/eal_common_trace.c new file +6 -0
@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#include <rte_trace.h> +
lib/librte_eal/common/include/rte_trace.h new file +525 -0
525 lines not on this page · raw message
lib/librte_eal/common/meson.build +2 -0
@@ -28,6 +28,7 @@ common_sources = files( 'eal_common_tailqs.c', 'eal_common_thread.c', 'eal_common_timer.c', + 'eal_common_trace.c', 'eal_common_uuid.c', 'hotplug_mp.c', 'malloc_elem.c',
@@ -84,6 +85,7 @@ common_headers = files( 'include/rte_service_component.h', 'include/rte_string_fns.h', 'include/rte_tailq.h', + 'include/rte_trace.h', 'include/rte_time.h', 'include/rte_uuid.h', 'include/rte_version.h',
lib/librte_eal/freebsd/eal/Makefile +1 -0
@@ -60,6 +60,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_thread.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c +SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c
lib/librte_eal/linux/eal/Makefile +1 -0
@@ -68,6 +68,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 02/32] eal: define the public API for trace support
Quoted 128 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
Define the public API for trace support.
This patch also adds support for the build infrastructure and update theMAINTAINERSfile for the trace subsystem.Signed-off-by Jerin Jacob <[email protected]>Signed-off-by Sunil Kumar Kori <[email protected]>--- MAINTAINERS | 6 + config/common_base | 1 + config/rte_config.h | 1 + doc/api/doxy-api-index.md | 3 +- lib/librte_eal/common/Makefile | 1 + lib/librte_eal/common/eal_common_trace.c | 6 + lib/librte_eal/common/include/rte_trace.h | 525 ++++++++++++++++++++++ lib/librte_eal/common/meson.build | 2 + lib/librte_eal/freebsd/eal/Makefile | 1 + lib/librte_eal/linux/eal/Makefile | 1 + 10 files changed, 546 insertions(+), 1 deletion(-)create mode 100644
lib/librte_eal/common/eal_common_trace.ccreate mode 100644lib/librte_eal/common/include/rte_trace.hMAINTAINERS +6
-0@@ -196,6 +196,12 @@ F: app/test/test_string_fns.c F: app/test/test_tailq.c F: app/test/test_version.c +Trace +M: Jerin Jacob <[email protected]> +M: Sunil Kumar Kori <[email protected]> +F: lib/librte_eal/common/include/rte_trace*.h +F: lib/librte_eal/common/eal_common_trace*.c + Memory Allocation M: Anatoly Burakov <[email protected]> F: lib/librte_eal/common/include/rte_fbarray.hconfig/common_base +1
-0@@ -99,6 +99,7 @@ CONFIG_RTE_MAX_MEMZONE=2560 CONFIG_RTE_MAX_TAILQ=32 CONFIG_RTE_ENABLE_ASSERT=n CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO +CONFIG_RTE_ENABLE_TRACE_DP=n CONFIG_RTE_LOG_HISTORY=256 CONFIG_RTE_BACKTRACE=y CONFIG_RTE_LIBEAL_USE_HPET=nconfig/rte_config.h +1
-0@@ -42,6 +42,7 @@#define RTE_MAX_MEMZONE 2560#define RTE_MAX_TAILQ 32#define RTE_LOG_DP_LEVEL RTE_LOG_INFO +#define RTE_ENABLE_TRACE_DP 0#define RTE_BACKTRACE 1#define RTE_MAX_VFIO_CONTAINERS 64doc/api/doxy-api-index.md +2
-1@@ -174,7 +174,8 @@ The public API headers are grouped by topics: [hexdump] (@ref rte_hexdump.h), [debug] (@ref rte_debug.h), [log] (@ref rte_log.h), - [errno] (@ref rte_errno.h) + [errno] (@ref rte_errno.h), + [trace] (@ref rte_trace.h) - **misc**: [EAL config] (@ref rte_eal.h),lib/librte_eal/common/Makefile +1
-0@@ -9,6 +9,7 @@ INC += rte_debug.h rte_eal.h rte_eal_interrupts.h INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h +INC += rte_trace.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h INC += rte_string_fns.h rte_version.h INC += rte_eal_memconfig.hlib/librte_eal/common/eal_common_trace.c new file +6
-0@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#include <rte_trace.h> +lib/librte_eal/common/include/rte_trace.h new file +20
-0@@ -0,0 +1,525 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_H_ +#define _RTE_TRACE_H_ + +/** + * @file + * + * RTE Trace API + * + * This file provides the trace API to RTE applications. + * + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + */ + +#ifdef __cplusplus +extern "C" {
lib/librte_eal/common/include/rte_trace.h line 30
Quoted 10 lines
lib/librte_eal/common/include/rte_trace.h new file +10
-0+#endif + +#include <stdbool.h> +#include <stdio.h> + +#include <rte_common.h> +#include <rte_compat.h> + +/** The trace object. The trace APIs are based on this opaque object. */ +typedef uint64_t *rte_trace_t ;
Wouldn't a forward-declared struct, with the definition hidden from the user, be more appropriate? As a bonus, you'll get some type checking.
"struct rte_trace;" here and "struct rte_trace*" in all the APIs. "struct rte_trace { uint64_t val; }; in the implementation. Or just cast it to a uint64_t *.
typdef:ing pointers is generally considered a no-no, at least if you follow the Linux kernel coding conventions.
Quoted 9 lines
lib/librte_eal/common/include/rte_trace.h new file +9
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enumerate trace mode operation. +*/ +enum rte_trace_mode_e { +/**
lib/librte_eal/common/include/rte_trace.h line 49
Quoted 10 lines
lib/librte_eal/common/include/rte_trace.h new file +10
-0+* In this mode, When no space left in trace buffer, the subsequent +* events overwrite the old events in the trace buffer. +*/ +RTE_TRACE_MODE_OVERWRITE , +/** +* In this mode, When no space left on trace buffer, the subsequent +* events shall not be recorded in the trace buffer. +*/ + RTE_TRACE_MODE_DISCARD, +};
Have you considered having a blocking mode as well, where the thread will just wait for space to be freed?
Remove the "_e" from the name. "enum" already tells us it's an enumeration.
lib/librte_eal/common/include/rte_trace.h line 61
Quoted 12 lines
lib/librte_eal/common/include/rte_trace.h new file +12
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Test if global trace is enabled. +* +* @return +* true if global trace is enabled, false otherwise. +*/ +__rte_experimental +bool rte_trace_global_is_enabled(void);
My impression is that DPDK does:
__rte_experimental bool
rte_trace_global_is_enabled(void);
Now when I check the coding conventions, that's only for function definition. Why declaration and definition should be different, I don't know.
Quoted 30 lines
lib/librte_eal/common/include/rte_trace.h new file +30
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Test if global trace is disabled. +* +* @return +* true if global trace is disabled, false otherwise. +*/ +__rte_experimental +bool rte_trace_global_is_disabled(void); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Test if a given trace is invalid. +* @param trace +* The trace object. +* @return +* true if global trace is invalid, false otherwise. +*/ +__rte_experimental +bool rte_trace_is_id_invalid(rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +*
lib/librte_eal/common/include/rte_trace.h line 101
Quoted 10 lines
lib/librte_eal/common/include/rte_trace.h new file +10
-0+* Set the global trace level. +* +* After this call, trace with a level lower or equal than the level +* passed as argument will be captured in the trace buffer. +* +* @param level +* Trace level. A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8). +*/ +__rte_experimental +void rte_trace_global_level_set(uint32_t level);
uint32_t means a lot of levels.
Quoted 161 lines
lib/librte_eal/common/include/rte_trace.h new file +161
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Get the global trace level. +* +* @return +* The current global trace level. +*/ +__rte_experimental +uint32_t rte_trace_global_level_get(void); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Set the global trace mode. +* +* After this call, All tracepoints will be switched to new mode. +* +* @param mode +* Trace mode. +*/ +__rte_experimental +void rte_trace_global_mode_set(enum rte_trace_mode_e mode); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Get the global trace mode. +* +* @return +* The current global trace mode. +*/ +__rte_experimental +enum rte_trace_mode_e rte_trace_global_mode_get(void); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enable recording of the given tracepoint in the trace buffer. +* +* @param trace +* The tracepoint object to enable. +* @return +* - 0: Success. +* - (-ERANGE): Trace object is not registered. +* - (-EACCES): Trace object level is less than the global trace level. +*/ +__rte_experimental +int rte_trace_enable(rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Disable recording of the given tracepoint in the trace buffer. +* +* @param trace +* The tracepoint object to disable. +* @return +* - 0: Success. +* - (-ERANGE): Trace object is not registered. +*/ +__rte_experimental +int rte_trace_disable(rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Test if given trace is enabled. +* +* @param trace +* The trace object. +* @return +* true if trace is enabled, false otherwise. +*/ +__rte_experimental +bool rte_trace_is_enabled(rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Test if given trace is disabled. +* +* @param trace +* The trace object. +* @return +* true if trace is disabled, false otherwise. +*/ +__rte_experimental +bool rte_trace_is_disabled(rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Set the trace level for the given tracepoint. +* +* After this call, if passed trace level lower or equal than the global trace +* level and this trace is enabled then trace will be captured in the +* trace buffer. +* +* @param trace +* The trace object. +* @param level +* Trace level. A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8). +* @return +* - 0: Success. +* - (-EINVAL): Trace object is not registered or invalid trace level. +*/ +__rte_experimental +int rte_trace_level_set(rte_trace_t trace, uint32_t level); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Get the trace level for the given tracepoint. +* +* @param trace +* The trace object. +* @return +* - A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8). +* - 0: Trace object is not registered. +*/ +__rte_experimental +uint32_t rte_trace_level_get(rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Set the trace mode for the given tracepoint. +* +* @param trace +* The trace object. +* @param mode +* Trace mode. +* @return +* - 0: Success. +* - (-EINVAL): Trace object is not registered or invalid trace level. +*/ +__rte_experimental +int rte_trace_mode_set(rte_trace_t trace, enum rte_trace_mode_e mode); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Get the trace mode for the given tracepoint. +* +* @param trace +* The trace object. +* @return +* - Zero or positive: Mode encoded as enum rte_trace_mode_e.
lib/librte_eal/common/include/rte_trace.h line 272
Quoted 10 lines
lib/librte_eal/common/include/rte_trace.h new file +10
-0+* - (-EINVAL): Trace object is not registered. +*/ +__rte_experimental +int rte_trace_mode_get(rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enable/Disable a set of tracepoints based on shell pattern.
Shell pattern means what I think is usually referred to as a glob?
Quoted 16 lines
lib/librte_eal/common/include/rte_trace.h new file +16
-0+* +* @param pattern +* The match pattern identifying the tracepoint. +* @param enable +* true to enable tracepoint, false to disable the tracepoint, upon match. +* @param[out] found +* NULL value allowed, if not NULL, true if match found, false otherwise. +* @return +* - 0: Success. +* - (-ERANGE): Trace object is not registered. +*/ +__rte_experimental +int rte_trace_pattern(const char *pattern, bool enable, bool *found); + +/** +* @warning
lib/librte_eal/common/include/rte_trace.h line 298
Quoted 10 lines
lib/librte_eal/common/include/rte_trace.h new file +10
-0+* @b EXPERIMENTAL: this API may change without prior notice +* +* Enable/Disable a set of tracepoints based on regular expression. +* +* @param regex +* A regular expression identifying the tracepoint. +* @param enable +* true to enable tracepoint, false to disable the tracepoint, upon match. +* @param[out] found +* NULL value allowed, if not NULL, true if match found, false otherwise.
What's the reason of having this output parameter, as opposed to coding the information into the return code?
Quoted 27 lines
lib/librte_eal/common/include/rte_trace.h new file +27
-0+* @return +* - 0: Success. +* - (-ERANGE): Trace object is not registered. +* - (-EINVAL): Invalid regular expression rule. +*/ +__rte_experimental +int rte_trace_regexp(const char *regex, bool enable, bool *found); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Save the trace buffer to the trace directory. +* +* By default, trace directory will be created at HOME directory and this can be +* overridden by --trace-dir EAL parameter. +* +* @return +* - 0: Success. +* - <0 : Failure. +*/ +__rte_experimental +int rte_trace_save(void); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice
lib/librte_eal/common/include/rte_trace.h line 335
Quoted 10 lines
lib/librte_eal/common/include/rte_trace.h new file +10
-0+* +* Search a trace object from its name. +* +* @param name +* The name of the tracepoint. +* @return +* The tracepoint object or NULL if not found. +*/ +__rte_experimental +rte_trace_t rte_trace_from_name(const char *name);
Would "rte_trace_by_name" be a better name?
Quoted 25 lines
lib/librte_eal/common/include/rte_trace.h new file +25
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Dump the trace metadata to a file. +* +* @param f +* A pointer to a file for output +* @return +* - 0: Success. +* - <0 : Failure. +*/ +__rte_experimental +int rte_trace_metadata_dump(FILE *f); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* Dump the trace subsystem status to a file. +* +* @param f +* A pointer to a file for output +*/ +__rte_experimental
lib/librte_eal/common/include/rte_trace.h line 370
Quoted 10 lines
lib/librte_eal/common/include/rte_trace.h new file +10
-0+void rte_trace_dump (FILE *f); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Test if the trace datapath compile-time option is enabled. +* +* @return +* A positive value if trace datapath enabled, value zero otherwise.
Switch to a bool return type.
Quoted 199 lines
lib/librte_eal/common/include/rte_trace.h new file +155
-0+*/ +static __rte_always_inline int +rte_trace_is_dp_enabled (void ) +{ +#ifdef RTE_ENABLE_TRACE_DP +return RTE_ENABLE_TRACE_DP ; +#else +return 0 ; +#endif +} + +/** Macro to define the tracepoint. */ +#define RTE_TRACE_POINT_DEFINE (tp)\ +uint64_t __attribute__((section("__rte_trace_point"))) __##tp + +/** +* Macro to define the tracepoint arguments in RTE_TRACE_POINT macro. + +* @see RTE_TRACE_POINT RTE_TRACE_POINT_DP +*/ +#define RTE_TRACE_POINT_ARGS + +/** @internal Helper Macro to support RTE_TRACE_POINT and RTE_TRACE_POINT_DP */ +#define __RTE_TRACE_POINT (_mode, _tp, _args, ...)\ +extern uint64_t __##_tp;\ +static __rte_always_inline void \ +_tp _args \ +{\ + __rte_trace_emit_header_##_mode(&__##_tp);\ + __VA_ARGS__\ +} + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Create a tracepoint definition. +* +* A tracepoint definition defines, for a given tracepoint: +* - Its input arguments. They are the C function style parameters to define +* the arguments of tracepoint function. These input arguments embedded using +* RTE_TRACE_POINT_ARGS macro. +* - Its output event fields. They are the sources of event fields that form +* the payload of any event that the execution of the tracepoint macro emits +* for this particular tracepoint. The application uses rte_trace_ctf_* macros +* to emit the output event fields. +* +* @param tp +* Tracepoint object. Before using the tracepoint, an application needs to +* define the tracepoint using RTE_TRACE_POINT_DEFINE() macro. +* @param args +* C function style input arguments to define the arguments to tracepoint +* function. +* @param ... +* Define the payload of trace function. The payload will be formed using +* rte_trace_ctf_* macros, Use ";" delimiter between two payloads. +* +* @see RTE_TRACE_POINT_ARGS, RTE_TRACE_POINT_DEFINE, rte_trace_ctf_* +*/ +#define RTE_TRACE_POINT (tp, args, ...)\ + __RTE_TRACE_POINT(generic, tp, args, __VA_ARGS__) + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Create a tracepoint definition for the data path. +* +* Similar to RTE_TRACE_POINT(), except that it is removed at compilation time +* using RTE_ENABLE_TRACE_DP configuration parameter. +* +* @param tp +* Tracepoint object. Before using the tracepoint, an application needs to +* define the tracepoint using RTE_TRACE_POINT_DEFINE() macro. +* @param args +* C function style input arguments to define the arguments to tracepoint +* function. +* @param ... +* Define the payload of trace function. The payload will be formed using +* rte_trace_ctf_* macros, Use ";" delimiter between two payloads. +* +* @see rte_trace_is_dp_enabled, RTE_TRACE_POINT() +*/ +#define RTE_TRACE_POINT_DP (tp, args, ...)\ + __RTE_TRACE_POINT(dp, tp, args, __VA_ARGS__) + +#ifdef __DOXYGEN__ + +/** +* Macro to select rte_trace_ctf_* definition for trace register function. +* +* rte_trace_ctf_* emits different definitions for trace function. +* Application must define RTE_TRACE_POINT_REGISTER_SELECT before including +* rte_trace.h in the C file where RTE_TRACE_POINT_REGISTER() used. +* +* @see RTE_TRACE_POINT_REGISTER() +*/ +#define RTE_TRACE_POINT_REGISTER_SELECT + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Register a dynamic tracepoint. +* +* @param trace +* The tracepoint object created using RTE_TRACE_POINT_DEFINE(). +* @param name +* The name of the tracepoint object. +* @param level +* Trace level. A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8). +* @return +* - 0: Successfully registered the tracepoint. +* - <0: Failure to register the tracepoint. +* +* @see RTE_TRACE_POINT_REGISTER_SELECT +*/ +#define RTE_TRACE_POINT_REGISTER (trace, name, level) + +/** Tracepoint function payload for uint64_t datatype */ +#define rte_trace_ctf_u64 (val) +/** Tracepoint function payload for int64_t datatype */ +#define rte_trace_ctf_i64 (val) +/** Tracepoint function payload for uint32_t datatype */ +#define rte_trace_ctf_u32 (val) +/** Tracepoint function payload for int32_t datatype */ +#define rte_trace_ctf_i32 (val) +/** Tracepoint function payload for uint16_t datatype */ +#define rte_trace_ctf_u16 (val) +/** Tracepoint function payload for int16_t datatype */ +#define rte_trace_ctf_i16 (val) +/** Tracepoint function payload for uint8_t datatype */ +#define rte_trace_ctf_u8 (val) +/** Tracepoint function payload for int8_t datatype */ +#define rte_trace_ctf_i8 (val) +/** Tracepoint function payload for int datatype */ +#define rte_trace_ctf_int (val) +/** Tracepoint function payload for long datatype */ +#define rte_trace_ctf_long (val) +/** Tracepoint function payload for float datatype */ +#define rte_trace_ctf_float (val) +/** Tracepoint function payload for double datatype */ +#define rte_trace_ctf_double (val) +/** Tracepoint function payload for pointer datatype */ +#define rte_trace_ctf_ptr (val) +/** Tracepoint function payload for string datatype */ +#define rte_trace_ctf_string (val) + +#endif /* __DOXYGEN__ */ + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_TRACE_H_ */ lib/librte_eal/common/meson.build +2
-0@@ -28,6 +28,7 @@ common_sources = files( 'eal_common_tailqs.c', 'eal_common_thread.c', 'eal_common_timer.c', + 'eal_common_trace.c', 'eal_common_uuid.c', 'hotplug_mp.c', 'malloc_elem.c',@@ -84,6 +85,7 @@ common_headers = files( 'include/rte_service_component.h', 'include/rte_string_fns.h', 'include/rte_tailq.h', + 'include/rte_trace.h', 'include/rte_time.h', 'include/rte_uuid.h', 'include/rte_version.h',lib/librte_eal/freebsd/eal/Makefile +1
-0@@ -60,6 +60,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_thread.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c +SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.clib/librte_eal/linux/eal/Makefile +1
-0@@ -68,6 +68,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c
Re: [dpdk-dev] [PATCH v1 02/32] eal: define the public API for trace support
Quoted 14 lines · Mattias Rönnblom
lib/librte_eal/common/include/rte_trace.h line 30
Quoted 8 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
lib/librte_eal/common/include/rte_trace.h new file +6
-0+ +#include <rte_common.h> +#include <rte_compat.h> + +/** The trace object. The trace APIs are based on this opaque object. */ +typedef uint64_t *rte_trace_t ;Wouldn't a forward-declared struct, with the definition hidden from the user, be more appropriate? As a bonus, you'll get some type checking.
Quoted 3 lines
"struct
rte_trace;" here and "struct rte_trace*" in all the APIs. "structrte_trace{uint64_tval; }; in the implementation. Or just cast it to auint64_t*.
OK. I will remove the typedef then.
Quoted 18 lines
typdef:ing pointers is generally considered a no-no, at least if you follow the Linux kernel coding conventions.
Quoted 14 lines
lib/librte_eal/common/include/rte_trace.h new file +14
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enumerate trace mode operation. +*/ +enum rte_trace_mode_e { +/** +* In this mode, When no space left in trace buffer, the subsequent +* events overwrite the old events in the trace buffer. +*/ +RTE_TRACE_MODE_OVERWRITE , +/**
Quoted 8 lines
lib/librte_eal/common/include/rte_trace.h line 49
Quoted 5 lines
lib/librte_eal/common/include/rte_trace.h new file +5
-0+* In this mode, When no space left on trace buffer, the subsequent +* events shall not be recorded in the trace buffer. +*/ + RTE_TRACE_MODE_DISCARD, +};Have you considered having a blocking mode as well, where the thread will just wait for space to be freed?
The trace buffer is per thread. So there is no waiting.
The new features can be added later as needed by extending the mode.
Quoted 2 lines
Remove the "_e" from the name. "enum" already tells us it's an enumeration.
OK. I will remove it in v2.
Quoted 17 lines
lib/librte_eal/common/include/rte_trace.h line 61
Quoted 13 lines
lib/librte_eal/common/include/rte_trace.h new file +12
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Test if global trace is enabled. +* +* @return +* true if global trace is enabled, false otherwise. +*/ +__rte_experimental +bool rte_trace_global_is_enabled(void);My impression is that DPDK does:
Quoted 8 lines
__rte_experimentalbool
rte_trace_global_is_enabled(void);Now when I check the coding conventions, that's only for function definition. Why declaration and definition should be different, I don't know.
I see two patterns.(Both cases __rte_experimental in a new line)
__rte_experimental
boolrte_trace_global_is_enabled(void);
or
__rte_experimental
bool rte_trace_global_is_enabled(void);
For the prototype case, I prefer a later option and for definition case the first option.
If there are no specific opinions, I would like to stick to this model
Quoted 7 lines
Quoted 7 lines
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * Set the global trace level.
+ *
+ * After this call, trace with a level lower or equal than the level
+ * passed as argument will be captured in the trace buffer.
Quoted 8 lines
Review
Quoted 6 lines
+ *
+ * @param level
+ * Trace level. A value betweenRTE_LOG_EMERG(1) andRTE_LOG_DEBUG(8).
+ */(quoted diff) +2
-0+__rte_experimental +void rte_trace_global_level_set(uint32_t level);
uint32_tmeans a lot of levels.
Yes. I did this to make compatibly with rte_log level datatype.
Quoted 8 lines
Quoted 8 lines
+ *
+ * @param trace
+ * The trace object.
+ * @return
+ * - Zero or positive: Mode encoded as enumrte_trace_mode_e.
+ * - (-EINVAL): Trace object is not registered.
+ */
+__rte_experimental
Quoted 8 lines
lib/librte_eal/common/include/rte_trace.h line 272
Quoted 7 lines
lib/librte_eal/common/include/rte_trace.h new file +7
-0+int rte_trace_mode_get (rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enable/Disable a set of tracepoints based on shell pattern. Shell pattern means what I think is usually referred to as a glob?
According, "man 3 fnmatch", it can be both.
No preference here, The rte_log is using shell pattern as the comment so I thought of
using the same.
Thoughts?
Quoted 20 lines
Quoted 20 lines
+ *
+ * @param pattern
+ * The match pattern identifying the tracepoint.
+ * @param enable
+ * true to enable tracepoint, false to disable the tracepoint, upon match.
+ * @param[out] found
+ * NULL value allowed, if not NULL, true if match found, false otherwise.
+ * @return
+ * - 0: Success.
+ * - (-ERANGE): Trace object is not registered.
+ */lib/librte_eal/common/include/rte_trace.h new file +9
-0+__rte_experimental +int rte_trace_pattern(const char *pattern, bool enable, bool *found); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enable/Disable a set of tracepoints based on regular expression. +*
Quoted 8 lines
Quoted 6 lines
+ * @param regex
+ * A regular expression identifying the tracepoint.
+ * @param enable
+ * true to enable tracepoint, false to disable the tracepoint, upon match.
+ * @param[out] found
+ * NULL value allowed, if not NULL, true if match found, false otherwise.What's the reason of having this output parameter, as opposed to coding the information into the return code?
I thought making explicit is good . No strong opinion here. How about?
0: Success but no pattern found
Quoted 1 line
0: Sucess and pattern found
<0: error
Quoted 7 lines
Quoted 7 lines
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * Search a trace object from its name.
+ *
+ * @param name
Quoted 8 lines
Review
Quoted 6 lines
+ * The name of the tracepoint.
+ * @return
+ * The tracepoint object or NULL if not found.
+ */(quoted diff) +2
-0+__rte_experimental +rte_trace_t rte_trace_from_name(const char *name);Would "
rte_trace_by_name" be a better name?
No strong preference. I will change to rte_trace_by_name().
Quoted 29 lines
Quoted 29 lines
lib/librte_eal/common/include/rte_trace.h new file +28
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Dump the trace metadata to a file. +* +* @param f +* A pointer to a file for output +* @return +* - 0: Success. +* - <0 : Failure. +*/ +__rte_experimental +int rte_trace_metadata_dump(FILE *f); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* Dump the trace subsystem status to a file. +* +* @param f +* A pointer to a file for output +*/ +__rte_experimental +void rte_trace_dump(FILE *f); + +/**
Quoted 8 lines
Quoted 7 lines
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * Test if the trace datapath compile-time option is enabled.
+ *
+ * @return
+ * A positive value if trace datapath enabled, value zero otherwise.Switch to a bool return type.
I thought of avoiding "bool" in fastpath, I will change to bool if there is no performance
impact.
Quoted 11 lines
Quoted 11 lines
+ */
lib/librte_eal/common/include/rte_trace.h new file +10
-0+static __rte_always_inline int +rte_trace_is_dp_enabled (void ) +{ +#ifdef RTE_ENABLE_TRACE_DP +return RTE_ENABLE_TRACE_DP ; +#else +return 0 ; +#endif +} +
Re: [dpdk-dev] [PATCH v1 02/32] eal: define the public API for trace support
Quoted 122 lines · Jerin Jacob
Quoted 11 lines · Mattias Rönnblom
lib/librte_eal/common/include/rte_trace.h line 30
Quoted 7 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
lib/librte_eal/common/include/rte_trace.h new file +6
-0+ +#include <rte_common.h> +#include <rte_compat.h> + +/** The trace object. The trace APIs are based on this opaque object. */ +typedef uint64_t *rte_trace_t ;Wouldn't a forward-declared struct, with the definition hidden from the user, be more appropriate? As a bonus, you'll get some type checking.
Quoted 3 lines
"struct
rte_trace;" here and "struct rte_trace*" in all the APIs. "structrte_trace{uint64_tval; }; in the implementation. Or just cast it to auint64_t*.OK. I will remove the typedef then.
Quoted 16 lines
typdef:ing pointers is generally considered a no-no, at least if you follow the Linux kernel coding conventions.
Quoted 13 lines
lib/librte_eal/common/include/rte_trace.h new file +13
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enumerate trace mode operation. +*/ +enum rte_trace_mode_e { +/** +* In this mode, When no space left in trace buffer, the subsequent +* events overwrite the old events in the trace buffer. +*/ +RTE_TRACE_MODE_OVERWRITE ,Quoted 8 lines
lib/librte_eal/common/include/rte_trace.h line 49
Quoted 6 lines
lib/librte_eal/common/include/rte_trace.h new file +6
-0+/** +* In this mode, When no space left on trace buffer, the subsequent +* events shall not be recorded in the trace buffer. +*/ + RTE_TRACE_MODE_DISCARD, +};Have you considered having a blocking mode as well, where the thread will just wait for space to be freed?
The trace buffer is per thread. So there is no waiting.
The new features can be added later as needed by extending the mode.
Quoted 1 line
Remove the "_e" from the name. "enum" already tells us it's an enumeration.
OK. I will remove it in v2.
Quoted 15 lines
lib/librte_eal/common/include/rte_trace.h line 61
Quoted 12 lines
lib/librte_eal/common/include/rte_trace.h new file +12
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Test if global trace is enabled. +* +* @return +* true if global trace is enabled, false otherwise. +*/ +__rte_experimental +bool rte_trace_global_is_enabled(void);My impression is that DPDK does:
Quoted 8 lines
__rte_experimentalbool
rte_trace_global_is_enabled(void);Now when I check the coding conventions, that's only for function definition. Why declaration and definition should be different, I don't know.
I see two patterns.(Both cases
__rte_experimentalin a new line)
__rte_experimental
boolrte_trace_global_is_enabled(void);or
__rte_experimental
boolrte_trace_global_is_enabled(void);For the prototype case, I prefer a later option and for definition case the first option.
If there are no specific opinions, I would like to stick to this modelQuoted 6 lines
Quoted 6 lines
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * Set the global trace level.
+ *
+ * After this call, trace with a level lower or equal than the levelQuoted 8 lines
Review
Quoted 7 lines
+ * passed as argument will be captured in the trace buffer.
+ *
+ * @param level
+ * Trace level. A value betweenRTE_LOG_EMERG(1) andRTE_LOG_DEBUG(8).
+ */(quoted diff) +2
-0+__rte_experimental +void rte_trace_global_level_set(uint32_t level);
uint32_tmeans a lot of levels.Yes. I did this to make compatibly with
rte_loglevel datatype.Quoted 8 lines
Quoted 8 lines
+ *
+ * @param trace
+ * The trace object.
+ * @return
+ * - Zero or positive: Mode encoded as enumrte_trace_mode_e.
+ * - (-EINVAL): Trace object is not registered.
+ */
+__rte_experimentalQuoted 8 lines
lib/librte_eal/common/include/rte_trace.h line 272
Quoted 7 lines
lib/librte_eal/common/include/rte_trace.h new file +7
-0+int rte_trace_mode_get (rte_trace_t trace); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enable/Disable a set of tracepoints based on shell pattern. Shell pattern means what I think is usually referred to as a glob?
Quoted 7 lines
According, "man 3 fnmatch", it can be both.
No preference here, Therte_logis using shell pattern as the comment so I thought of
using the same.Thoughts?
If we're using "shell pattern" already, it would make sense to stick with this.
Quoted 28 lines
Quoted 20 lines
Quoted 20 lines
+ *
+ * @param pattern
+ * The match pattern identifying the tracepoint.
+ * @param enable
+ * true to enable tracepoint, false to disable the tracepoint, upon match.
+ * @param[out] found
+ * NULL value allowed, if not NULL, true if match found, false otherwise.
+ * @return
+ * - 0: Success.
+ * - (-ERANGE): Trace object is not registered.
+ */lib/librte_eal/common/include/rte_trace.h new file +9
-0+__rte_experimental +int rte_trace_pattern(const char *pattern, bool enable, bool *found); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Enable/Disable a set of tracepoints based on regular expression. +* Quoted 8 lines
Quoted 6 lines
+ * @param regex
+ * A regular expression identifying the tracepoint.
+ * @param enable
+ * true to enable tracepoint, false to disable the tracepoint, upon match.
+ * @param[out] found
+ * NULL value allowed, if not NULL, true if match found, false otherwise.What's the reason of having this output parameter, as opposed to coding the information into the return code?
Quoted 7 lines
I thought making explicit is good . No strong opinion here. How about?
0: Success but no pattern found
Quoted 1 line
0: Sucess and pattern found
<0: error
Sounds like an improvement to me.
Quoted 69 lines
Quoted 15 lines
Quoted 4 lines
lib/librte_eal/common/include/rte_trace.h new file +3
-0+/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice lib/librte_eal/common/include/rte_trace.h line 335
Quoted 10 lines
lib/librte_eal/common/include/rte_trace.h new file +10
-0+* +* Search a trace object from its name. +* +* @param name +* The name of the tracepoint. +* @return +* The tracepoint object or NULL if not found. +*/ +__rte_experimental +rte_trace_t rte_trace_from_name(const char *name);Would "
rte_trace_by_name" be a better name?No strong preference. I will change to
rte_trace_by_name().Quoted 28 lines
Quoted 28 lines
lib/librte_eal/common/include/rte_trace.h new file +28
-0+ +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Dump the trace metadata to a file. +* +* @param f +* A pointer to a file for output +* @return +* - 0: Success. +* - <0 : Failure. +*/ +__rte_experimental +int rte_trace_metadata_dump(FILE *f); + +/** +* @warning +* @b EXPERIMENTAL: this API may change without prior notice +* Dump the trace subsystem status to a file. +* +* @param f +* A pointer to a file for output +*/ +__rte_experimental +void rte_trace_dump(FILE *f); + +/** Quoted 8 lines
Quoted 7 lines
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * Test if the trace datapath compile-time option is enabled.
+ *
+ * @return
+ * A positive value if trace datapath enabled, value zero otherwise.Switch to a bool return type.
I thought of avoiding "bool" in fastpath, I will change to bool if there is no performance
impact.Quoted 11 lines
Quoted 11 lines
+ */
lib/librte_eal/common/include/rte_trace.h new file +10
-0+static __rte_always_inline int +rte_trace_is_dp_enabled (void ) +{ +#ifdef RTE_ENABLE_TRACE_DP +return RTE_ENABLE_TRACE_DP ; +#else +return 0 ; +#endif +} +
PATCH 3/32 eal/trace: implement trace register API
In reply to [email protected]From: Jerin Jacob <[email protected]>
The consumers of trace API defines the tracepoint and registers to eal. Internally these tracepoints will be stored in STAILQ for future use. This patch implements the tracepoint registration function.
--- MAINTAINERS | 1 + lib/librte_eal/common/Makefile | 2 +- lib/librte_eal/common/eal_common_trace.c | 107 +++++++++++++++++- lib/librte_eal/common/eal_trace.h | 36 ++++++ lib/librte_eal/common/include/rte_trace.h | 29 +++++ .../common/include/rte_trace_provider.h | 24 ++++ .../common/include/rte_trace_register.h | 20 ++++ lib/librte_eal/common/meson.build | 2 + lib/librte_eal/rte_eal_version.map | 1 + 9 files changed, 220 insertions(+), 2 deletions(-) create mode 100644 lib/librte_eal/common/eal_trace.h create mode 100644 lib/librte_eal/common/include/rte_trace_provider.h create mode 100644 lib/librte_eal/common/include/rte_trace_register.h
MAINTAINERS +1 -0
@@ -201,6 +201,7 @@ M: Jerin Jacob <[email protected]> M: Sunil Kumar Kori <[email protected]> F: lib/librte_eal/common/include/rte_trace*.h F: lib/librte_eal/common/eal_common_trace*.c +F: lib/librte_eal/common/eal_trace.h Memory Allocation M: Anatoly Burakov <[email protected]>
lib/librte_eal/common/Makefile +1 -1
@@ -9,7 +9,7 @@ INC += rte_debug.h rte_eal.h rte_eal_interrupts.h INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h -INC += rte_trace.h +INC += rte_trace.h rte_trace_provider.h rte_trace_register.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h INC += rte_string_fns.h rte_version.h INC += rte_eal_memconfig.h
lib/librte_eal/common/eal_common_trace.c +106 -1
111 lines not on this page · raw message
lib/librte_eal/common/eal_trace.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef __EAL_TRACE_H +#define __EAL_TRACE_H + +#include <rte_trace.h> + +#define trace_err(fmt, args...)\ + RTE_LOG(ERR, EAL, "%s():%u " fmt "\n",\ + __func__, __LINE__, ## args) + +#define trace_crit(fmt, args...)\ + RTE_LOG(CRIT, EAL, "%s():%u " fmt "\n",\ + __func__, __LINE__, ## args) + +#define TRACE_CTF_FIELD_SIZE 384 +#define TRACE_POINT_NAME_SIZE 64 + +struct trace_point { +STAILQ_ENTRY (trace_point) next; +rte_trace_t handle; +char name[TRACE_POINT_NAME_SIZE ]; +char ctf_field[TRACE_CTF_FIELD_SIZE ]; +}; + +struct trace { +int register_errno; +uint32_t nb_trace_points; +}; + +/* Trace point list functions */ +STAILQ_HEAD (trace_point_head, trace_point); + +#endif /* __EAL_TRACE_H */
lib/librte_eal/common/include/rte_trace.h +29 -0
@@ -518,6 +518,35 @@ _tp _args \#endif /* __DOXYGEN__ */ +/** +* @internal @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Helper function to register a dynamic tracepoint. +* Use RTE_TRACE_POINT_REGISTER() macro for tracepoint registration. +* +* @param trace +* The tracepoint object created using RTE_TRACE_POINT_DEFINE(). +* @param name +* The name of the tracepoint object. +* @param level +* Trace level. A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8). +* @param f +* Trace registration function. +* @return +* - 0: Successfully registered the tracepoint. +* - <0: Failure to register the tracepoint. +*/ +__rte_experimental +int __rte_trace_point_register(rte_trace_t trace, const char *name, +uint32_t level,void (*fn)(void )); + +#ifdef RTE_TRACE_POINT_REGISTER_SELECT +#include <rte_trace_register.h> +#else +#include <rte_trace_provider.h> +#endif + #ifdef __cplusplus }#endif
lib/librte_eal/common/include/rte_trace_provider.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_H_ +#error do not include this file directly, use <rte_trace.h> instead +#endif + +#ifndef _RTE_TRACE_PROVIDER_H_ +#define _RTE_TRACE_PROVIDER_H_ + +#define __RTE_TRACE_EVENT_HEADER_ID_SHIFT (48) + +#define __RTE_TRACE_FIELD_ENABLE_MASK (1ULL << 63) +#define __RTE_TRACE_FIELD_ENABLE_DISCARD (1ULL << 62) +#define __RTE_TRACE_FIELD_SIZE_SHIFT 0 +#define __RTE_TRACE_FIELD_SIZE_MASK (0xffffULL << __RTE_TRACE_FIELD_SIZE_SHIFT) +#define __RTE_TRACE_FIELD_ID_SHIFT (16) +#define __RTE_TRACE_FIELD_ID_MASK (0xffffULL << __RTE_TRACE_FIELD_ID_SHIFT) +#define __RTE_TRACE_FIELD_LEVEL_SHIFT (32) +#define __RTE_TRACE_FIELD_LEVEL_MASK (0xffULL << __RTE_TRACE_FIELD_LEVEL_SHIFT) + + +#endif /* _RTE_TRACE_PROVIDER_H_ */
lib/librte_eal/common/include/rte_trace_register.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_H_ +#error do not include this file directly, use <rte_trace.h> instead +#endif + +#ifndef _RTE_TRACE_REGISTER_H_ +#define _RTE_TRACE_REGISTER_H_ + +#include <rte_per_lcore.h> + +RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); + +#define RTE_TRACE_POINT_REGISTER (trace, name, level)\ + __rte_trace_point_register(&__##trace, RTE_STR(name),\ + RTE_LOG_ ## level, (void (*)(void)) trace) + +#endif /* _RTE_TRACE_REGISTER_H_ */
lib/librte_eal/common/meson.build +2 -0
@@ -86,6 +86,8 @@ common_headers = files( 'include/rte_string_fns.h', 'include/rte_tailq.h', 'include/rte_trace.h', + 'include/rte_trace_provider.h', + 'include/rte_trace_register.h', 'include/rte_time.h', 'include/rte_uuid.h', 'include/rte_version.h',
lib/librte_eal/rte_eal_version.map +1 -0
@@ -338,4 +338,5 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; + __rte_trace_point_register; };
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 03/32] eal/trace: implement trace register API
Quoted 68 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
The consumers of trace API defines the tracepoint and registers to eal. Internally these tracepoints will be stored in STAILQ for future use. This patch implements the tracepoint registration function.
Signed-off-by Jerin Jacob <[email protected]>--- MAINTAINERS | 1 + lib/librte_eal/common/Makefile | 2 +- lib/librte_eal/common/eal_common_trace.c | 107 +++++++++++++++++- lib/librte_eal/common/eal_trace.h | 36 ++++++ lib/librte_eal/common/include/rte_trace.h | 29 +++++ .../common/include/rte_trace_provider.h | 24 ++++ .../common/include/rte_trace_register.h | 20 ++++ lib/librte_eal/common/meson.build | 2 + lib/librte_eal/rte_eal_version.map | 1 + 9 files changed, 220 insertions(+), 2 deletions(-)create mode 100644
lib/librte_eal/common/eal_trace.hcreate mode 100644lib/librte_eal/common/include/rte_trace_provider.hcreate mode 100644lib/librte_eal/common/include/rte_trace_register.hMAINTAINERS +1
-0@@ -201,6 +201,7 @@ M: Jerin Jacob <[email protected]> M: Sunil Kumar Kori <[email protected]> F: lib/librte_eal/common/include/rte_trace*.h F: lib/librte_eal/common/eal_common_trace*.c +F: lib/librte_eal/common/eal_trace.h Memory Allocation M: Anatoly Burakov <[email protected]>lib/librte_eal/common/Makefile +1
-1@@ -9,7 +9,7 @@ INC += rte_debug.h rte_eal.h rte_eal_interrupts.h INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h -INC += rte_trace.h +INC += rte_trace.h rte_trace_provider.h rte_trace_register.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h INC += rte_string_fns.h rte_version.h INC += rte_eal_memconfig.hlib/librte_eal/common/eal_common_trace.c +10
-1@@ -2,5 +2,110 @@* Copyright(C) 2020 Marvell International Ltd. */ -#include <rte_trace.h> +#include <inttypes.h> +#include <sys/queue.h> +#include <rte_common.h> +#include <rte_errno.h> +#include <rte_lcore.h> +#include <rte_per_lcore.h> +#include <rte_string_fns.h> + +#include "eal_trace.h" +
lib/librte_eal/common/eal_common_trace.c line 25
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+RTE_DEFINE_PER_LCORE(volatile int, trace_point_sz); +RTE_DEFINE_PER_LCORE (char, ctf_field[TRACE_CTF_FIELD_SIZE ]); +RTE_DEFINE_PER_LCORE (int, ctf_count); + +static struct trace_point_head tp_list =STAILQ_HEAD_INITIALIZER (tp_list); +static struct trace trace; + +int +__rte_trace_point_register (rte_trace_t handle,const char *name,uint32_t level, +void (*fn)(void ))
Maybe a more descriptive name than 'fn' would be in order.
lib/librte_eal/common/eal_common_trace.c line 38
Quoted 13 lines
lib/librte_eal/common/eal_common_trace.c +13
-0+{ +char *field =RTE_PER_LCORE (ctf_field); +struct trace_point *tp; +uint16_t sz; + +/* Sanity checks of arguments */ +if (name ==NULL || fn ==NULL || handle ==NULL ) { +trace_err ("invalid arguments" ); + rte_errno =EINVAL ; goto fail; + } + +/* Sanity check of level */ +if (level >RTE_LOG_DEBUG || level >UINT8_MAX ) {
Consider a #define for the max level. If the type was uint8_t, you wouldn't need to check max at all.
Quoted 19 lines
lib/librte_eal/common/eal_common_trace.c +19
-0+trace_err ("invalid log level=%d" , level); + rte_errno =EINVAL ; goto fail; + + } + +/* Check the size of the trace point object */ +RTE_PER_LCORE (trace_point_sz) =0 ; +RTE_PER_LCORE (ctf_count) =0 ; +fn (); +if (RTE_PER_LCORE (trace_point_sz) ==0 ) { +trace_err ("missing rte_trace_emit_header() in register fn" ); + rte_errno =EBADF ; goto fail; + } + +/* Is size overflowed */ +if (RTE_PER_LCORE (trace_point_sz) >UINT16_MAX ) { +trace_err ("trace point size overflowed" ); + rte_errno =ENOSPC ; goto fail; + }
lib/librte_eal/common/eal_common_trace.c line 67
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+ +/* Are we running out of space to store trace points? */ +if (trace.nb_trace_points >UINT16_MAX ) { +trace_err ("trace point exceeds the max count" ); + rte_errno =ENOSPC ; goto fail; + } + +/* Get the size of the trace point */ + sz =RTE_PER_LCORE (trace_point_sz); + tp =calloc (1 ,sizeof (struct trace_point ));
Not rte_zmalloc()? Are secondary processes accessing this memory?
lib/librte_eal/common/eal_common_trace.c line 70
Quoted 3 lines
lib/librte_eal/common/eal_common_trace.c +3
-0+if (tp ==NULL ) { +trace_err ("fail to allocate trace point memory" ); + rte_errno =ENOMEM ; goto fail;
Missing newline.
Quoted 13 lines
lib/librte_eal/common/eal_common_trace.c +13
-0+ } + +/* Initialize the trace point */ +if (rte_strscpy (tp->name, name,TRACE_POINT_NAME_SIZE ) <0 ) { +trace_err ("name is too long" ); + rte_errno =E2BIG ; + goto free; + } + +/* Copy the field data for future use */ +if (rte_strscpy (tp->ctf_field, field,TRACE_CTF_FIELD_SIZE ) <0 ) { +trace_err ("CTF field size is too long" ); + rte_errno =E2BIG ;
lib/librte_eal/common/eal_common_trace.c line 93
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+ goto free; + } + +/* Clear field memory for the next event */ +memset (field,0 ,TRACE_CTF_FIELD_SIZE ); + +/* Form the trace handle */ + *handle = sz; + *handle |= trace.nb_trace_points << __RTE_TRACE_FIELD_ID_SHIFT; + *handle |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT;
If *handle would be a struct, you could use a bitfield instead, and much simplify this code.
Quoted 179 lines
lib/librte_eal/common/eal_common_trace.c +18
-0+ + trace.nb_trace_points++; + tp->handle = handle; + +/* Add the trace point at tail */ +STAILQ_INSERT_TAIL (&tp_list, tp, next); +__atomic_thread_fence (__ATOMIC_RELEASE); + +/* All Good !!! */ +return 0 ; +free: +free (tp); +fail: +if (trace.register_errno ==0 ) + trace.register_errno = rte_errno; + +return -rte_errno; +}lib/librte_eal/common/eal_trace.h new file +36
-0@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef __EAL_TRACE_H +#define __EAL_TRACE_H + +#include <rte_trace.h> + +#define trace_err(fmt, args...)\ + RTE_LOG(ERR, EAL, "%s():%u " fmt "\n",\ + __func__, __LINE__, ## args) + +#define trace_crit(fmt, args...)\ + RTE_LOG(CRIT, EAL, "%s():%u " fmt "\n",\ + __func__, __LINE__, ## args) + +#define TRACE_CTF_FIELD_SIZE 384 +#define TRACE_POINT_NAME_SIZE 64 + +struct trace_point { +STAILQ_ENTRY (trace_point) next; +rte_trace_t handle; +char name[TRACE_POINT_NAME_SIZE ]; +char ctf_field[TRACE_CTF_FIELD_SIZE ]; +}; + +struct trace { +int register_errno; +uint32_t nb_trace_points; +}; + +/* Trace point list functions */ +STAILQ_HEAD (trace_point_head, trace_point); + +#endif /* __EAL_TRACE_H */ lib/librte_eal/common/include/rte_trace.h +29
-0@@ -518,6 +518,35 @@ _tp _args \#endif /* __DOXYGEN__ */ +/** +* @internal @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Helper function to register a dynamic tracepoint. +* Use RTE_TRACE_POINT_REGISTER() macro for tracepoint registration. +* +* @param trace +* The tracepoint object created using RTE_TRACE_POINT_DEFINE(). +* @param name +* The name of the tracepoint object. +* @param level +* Trace level. A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8). +* @param f +* Trace registration function. +* @return +* - 0: Successfully registered the tracepoint. +* - <0: Failure to register the tracepoint. +*/ +__rte_experimental +int __rte_trace_point_register(rte_trace_t trace, const char *name, +uint32_t level,void (*fn)(void )); + +#ifdef RTE_TRACE_POINT_REGISTER_SELECT +#include <rte_trace_register.h> +#else +#include <rte_trace_provider.h> +#endif + #ifdef __cplusplus }#endif lib/librte_eal/common/include/rte_trace_provider.h new file +24
-0@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_H_ +#error do not include this file directly, use <rte_trace.h> instead +#endif + +#ifndef _RTE_TRACE_PROVIDER_H_ +#define _RTE_TRACE_PROVIDER_H_ + +#define __RTE_TRACE_EVENT_HEADER_ID_SHIFT (48) + +#define __RTE_TRACE_FIELD_ENABLE_MASK (1ULL << 63) +#define __RTE_TRACE_FIELD_ENABLE_DISCARD (1ULL << 62) +#define __RTE_TRACE_FIELD_SIZE_SHIFT 0 +#define __RTE_TRACE_FIELD_SIZE_MASK (0xffffULL << __RTE_TRACE_FIELD_SIZE_SHIFT) +#define __RTE_TRACE_FIELD_ID_SHIFT (16) +#define __RTE_TRACE_FIELD_ID_MASK (0xffffULL << __RTE_TRACE_FIELD_ID_SHIFT) +#define __RTE_TRACE_FIELD_LEVEL_SHIFT (32) +#define __RTE_TRACE_FIELD_LEVEL_MASK (0xffULL << __RTE_TRACE_FIELD_LEVEL_SHIFT) + + +#endif /* _RTE_TRACE_PROVIDER_H_ */ lib/librte_eal/common/include/rte_trace_register.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_H_ +#error do not include this file directly, use <rte_trace.h> instead +#endif + +#ifndef _RTE_TRACE_REGISTER_H_ +#define _RTE_TRACE_REGISTER_H_ + +#include <rte_per_lcore.h> + +RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); + +#define RTE_TRACE_POINT_REGISTER (trace, name, level)\ + __rte_trace_point_register(&__##trace, RTE_STR(name),\ + RTE_LOG_ ## level, (void (*)(void)) trace) + +#endif /* _RTE_TRACE_REGISTER_H_ */ lib/librte_eal/common/meson.build +2
-0@@ -86,6 +86,8 @@ common_headers = files( 'include/rte_string_fns.h', 'include/rte_tailq.h', 'include/rte_trace.h', + 'include/rte_trace_provider.h', + 'include/rte_trace_register.h', 'include/rte_time.h', 'include/rte_uuid.h', 'include/rte_version.h',lib/librte_eal/rte_eal_version.map +1
-0@@ -338,4 +338,5 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; + __rte_trace_point_register; };
Re: [dpdk-dev] [PATCH v1 03/32] eal/trace: implement trace register API
Quoted 9 lines · Mattias Rönnblom
lib/librte_eal/common/eal_common_trace.c line 25
Quoted 6 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
lib/librte_eal/common/eal_common_trace.c +3
-0+int +__rte_trace_point_register (rte_trace_t handle,const char *name,uint32_t level, +void (*fn)(void ))Maybe a more descriptive name than 'fn' would be in order.
OK. I will change to "register_fn" in v2.
Quoted 8 lines
Quoted 8 lines
lib/librte_eal/common/eal_common_trace.c +8
-0+{ +char *field =RTE_PER_LCORE (ctf_field); +struct trace_point *tp; +uint16_t sz; + +/* Sanity checks of arguments */ +if (name ==NULL || fn ==NULL || handle ==NULL ) { +trace_err ("invalid arguments" );
Quoted 8 lines
lib/librte_eal/common/eal_common_trace.c line 38
Quoted 5 lines
lib/librte_eal/common/eal_common_trace.c +5
-0+ rte_errno =EINVAL ; goto fail; + } + +/* Sanity check of level */ +if (level >RTE_LOG_DEBUG || level >UINT8_MAX ) {Consider a #define for the max level. If the type was
uint8_t, you wouldn't need to check max at all.
The reason for keeping level as uint32_t to keep compatibility with rte_log level datatype. For some reason, rte_log defined level as uint32_t, So I thought of sticking to that so that we can migrate the rte_log to rte_trace in future if needed and also making semantics similar to rte_log.
Quoted 23 lines
Quoted 23 lines
lib/librte_eal/common/eal_common_trace.c +22
-0+trace_err ("invalid log level=%d" , level); + rte_errno =EINVAL ; goto fail; + + } + +/* Check the size of the trace point object */ +RTE_PER_LCORE (trace_point_sz) =0 ; +RTE_PER_LCORE (ctf_count) =0 ; +fn (); +if (RTE_PER_LCORE (trace_point_sz) ==0 ) { +trace_err ("missing rte_trace_emit_header() in register fn" ); + rte_errno =EBADF ; goto fail; + } + +/* Is size overflowed */ +if (RTE_PER_LCORE (trace_point_sz) >UINT16_MAX ) { +trace_err ("trace point size overflowed" ); + rte_errno =ENOSPC ; goto fail; + } + +/* Are we running out of space to store trace points? */ +if (trace.nb_trace_points >UINT16_MAX ) {
Quoted 8 lines
lib/librte_eal/common/eal_common_trace.c line 67
Quoted 7 lines
lib/librte_eal/common/eal_common_trace.c +7
-0+trace_err ("trace point exceeds the max count" ); + rte_errno =ENOSPC ; goto fail; + } + +/* Get the size of the trace point */ + sz =RTE_PER_LCORE (trace_point_sz); + tp =calloc (1 ,sizeof (struct trace_point ));Not
rte_zmalloc()? Are secondary processes accessing this memory?
This been called by the constructor at that time memory services are not enabled and it is for the per-process like rte_log scheme.
Quoted 4 lines
lib/librte_eal/common/eal_common_trace.c line 70
Quoted 3 lines
lib/librte_eal/common/eal_common_trace.c +3
-0+if (tp ==NULL ) { +trace_err ("fail to allocate trace point memory" ); + rte_errno =ENOMEM ; goto fail;Missing newline.
I will fix it in v2.
Quoted 17 lines
Quoted 17 lines
lib/librte_eal/common/eal_common_trace.c +17
-0+ } + +/* Initialize the trace point */ +if (rte_strscpy (tp->name, name,TRACE_POINT_NAME_SIZE ) <0 ) { +trace_err ("name is too long" ); + rte_errno =E2BIG ; + goto free; + } + +/* Copy the field data for future use */ +if (rte_strscpy (tp->ctf_field, field,TRACE_CTF_FIELD_SIZE ) <0 ) { +trace_err ("CTF field size is too long" ); + rte_errno =E2BIG ; + goto free; + } + +/* Clear field memory for the next event */
Quoted 8 lines
lib/librte_eal/common/eal_common_trace.c line 93
Quoted 6 lines
lib/librte_eal/common/eal_common_trace.c +6
-0+memset (field,0 ,TRACE_CTF_FIELD_SIZE ); + +/* Form the trace handle */ + *handle = sz; + *handle |= trace.nb_trace_points << __RTE_TRACE_FIELD_ID_SHIFT; + *handle |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT;If *handle would be a struct, you could use a bitfield instead, and much simplify this code.
I thought that initially, Two reasons why I did not do that
1) The flags have been used in fastpath, I prefer to work with flags in fastpath so that
there is no performance impact using bitfields from the compiler _if any_.
2) In some of the places, I can simply operate on APIs like __atomic_and_fetch() with flags.
Re: [dpdk-dev] [PATCH v1 03/32] eal/trace: implement trace register API
Quoted 25 lines · Jerin Jacob
Quoted 17 lines
Quoted 17 lines
lib/librte_eal/common/eal_common_trace.c +17
-0+ } + +/* Initialize the trace point */ +if (rte_strscpy (tp->name, name,TRACE_POINT_NAME_SIZE ) <0 ) { +trace_err ("name is too long" ); + rte_errno =E2BIG ; + goto free; + } + +/* Copy the field data for future use */ +if (rte_strscpy (tp->ctf_field, field,TRACE_CTF_FIELD_SIZE ) <0 ) { +trace_err ("CTF field size is too long" ); + rte_errno =E2BIG ; + goto free; + } + +/* Clear field memory for the next event */ Quoted 8 lines
lib/librte_eal/common/eal_common_trace.c line 93
Quoted 6 lines
lib/librte_eal/common/eal_common_trace.c +6
-0+memset (field,0 ,TRACE_CTF_FIELD_SIZE ); + +/* Form the trace handle */ + *handle = sz; + *handle |= trace.nb_trace_points << __RTE_TRACE_FIELD_ID_SHIFT; + *handle |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT;If *handle would be a struct, you could use a bitfield instead, and much simplify this code.
Quoted 3 lines
I thought that initially, Two reasons why I did not do that
1) The flags have been used in fastpath, I prefer to work with flags in fastpath so that
Is it really that obvious that flags are faster than bitfield operations? I think most modern architectures have machine instructions for bitfield manipulation.
Quoted 3 lines
there is no performance impact using bitfields from the compiler
_ifany_.
2) In some of the places, I can simply operate on APIs like__atomic_and_fetch()with flags.
I think you may still use such atomic operations. Just convert the struct to a uint64_t, which will essentially be a no-operation, and fire away.
static uint64_t
__rte_trace_raw(struct trace *t)
{
uint64_t raw;
memcpy(&raw, t, sizeof(struct trace));
return raw;
}
Re: [dpdk-dev] [PATCH v1 03/32] eal/trace: implement trace register API
Quoted 27 lines · Mattias Rönnblom
Quoted 25 lines · Jerin Jacob
Quoted 25 lines
Quoted 13 lines
lib/librte_eal/common/eal_common_trace.c +13
-0+ } + +/* Initialize the trace point */ +if (rte_strscpy (tp->name, name,TRACE_POINT_NAME_SIZE ) <0 ) { +trace_err ("name is too long" ); + rte_errno =E2BIG ; + goto free; + } + +/* Copy the field data for future use */ +if (rte_strscpy (tp->ctf_field, field,TRACE_CTF_FIELD_SIZE ) <0 ) { +trace_err ("CTF field size is too long" ); + rte_errno =E2BIG ;lib/librte_eal/common/eal_common_trace.c line 93
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+ goto free; + } + +/* Clear field memory for the next event */ +memset (field,0 ,TRACE_CTF_FIELD_SIZE ); + +/* Form the trace handle */ + *handle = sz; + *handle |= trace.nb_trace_points << __RTE_TRACE_FIELD_ID_SHIFT; + *handle |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT;If *handle would be a struct, you could use a bitfield instead, and much simplify this code.
Quoted 6 lines
Quoted 3 lines
I thought that initially, Two reasons why I did not do that
1) The flags have been used in fastpath, I prefer to work with flags in fastpath so thatIs it really that obvious that flags are faster than bitfield operations? I think most modern architectures have machine instructions for bitfield manipulation.
Add x86 maintainers.
There were comments in ml about bitfield inefficiency usage with x86.
http://patches.dpdk.org/patch/16482/
Search for: Bitfileds are efficient on Octeon. What's about other CPUs you have in
mind? x86 is not as efficient.
Thoughts from x86 folks.
Quoted 7 lines
Quoted 3 lines
there is no performance impact using bitfields from the compiler
_ifany_.
2) In some of the places, I can simply operate on APIs like__atomic_and_fetch()with flags.I think you may still use such atomic operations. Just convert the struct to a
uint64_t, which will essentially be a no-operation, and fire away.
Not sure, We think about the atomic "and" and fetch here. That memcpy may translate additional load/store based on the compiler optimization level.(say compiled with -O0)
Quoted 17 lines
static
uint64_t
__rte_trace_raw(struct trace *t){
uint64_t raw; memcpy(&raw, t, sizeof(struct trace)); return raw;}
Re: [dpdk-dev] [PATCH v1 03/32] eal/trace: implement trace register API
Quoted 36 lines · Jerin Jacob
Quoted 26 lines · Mattias Rönnblom
Quoted 25 lines · Jerin Jacob
Quoted 25 lines
Quoted 13 lines
lib/librte_eal/common/eal_common_trace.c +13
-0+ } + +/* Initialize the trace point */ +if (rte_strscpy (tp->name, name,TRACE_POINT_NAME_SIZE ) <0 ) { +trace_err ("name is too long" ); + rte_errno =E2BIG ; + goto free; + } + +/* Copy the field data for future use */ +if (rte_strscpy (tp->ctf_field, field,TRACE_CTF_FIELD_SIZE ) <0 ) { +trace_err ("CTF field size is too long" ); + rte_errno =E2BIG ;lib/librte_eal/common/eal_common_trace.c line 93
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+ goto free; + } + +/* Clear field memory for the next event */ +memset (field,0 ,TRACE_CTF_FIELD_SIZE ); + +/* Form the trace handle */ + *handle = sz; + *handle |= trace.nb_trace_points << __RTE_TRACE_FIELD_ID_SHIFT; + *handle |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT;If *handle would be a struct, you could use a bitfield instead, and much simplify this code.
Quoted 6 lines
Quoted 3 lines
I thought that initially, Two reasons why I did not do that
1) The flags have been used in fastpath, I prefer to work with flags in fastpath so thatIs it really that obvious that flags are faster than bitfield operations? I think most modern architectures have machine instructions for bitfield manipulation.
Add x86 maintainers.
Quoted 7 lines
There were comments in ml about bitfield inefficiency usage with x86.
Search for: Bitfileds are efficient on Octeon. What's about other CPUs you have in
mind? x86 is not as efficient.
I thought both ARM and x86 had bitfield access instructions, but it looks like I was wrong about x86. x86_64 GCC seems to convert bitfield read to 'shr' and 'and', just like an open-coded bitfield. Bitfield write requires more instructions.
Quoted 11 lines
Thoughts from x86 folks.
Quoted 6 lines
Quoted 3 lines
there is no performance impact using bitfields from the compiler
_ifany_.
2) In some of the places, I can simply operate on APIs like__atomic_and_fetch()with flags.I think you may still use such atomic operations. Just convert the struct to a
uint64_t, which will essentially be a no-operation, and fire away.Not sure, We think about the atomic "and" and fetch here. That memcpy may translate additional load/store based on the compiler optimization level.(say compiled with -O0)
I would be surprised if that happened on anything but -O0. At least modern GCC on ARM and x86_64 don't seem to add any loads or stores.
I assume you are not suggesting we should optimize for -O0.
Quoted 16 lines
Quoted 16 lines
static
uint64_t
__rte_trace_raw(struct trace *t){
uint64_t raw; memcpy(&raw, t, sizeof(struct trace)); return raw;}
Re: [dpdk-dev] [PATCH v1 03/32] eal/trace: implement trace register API
Quoted 47 lines · Mattias Rönnblom
Quoted 36 lines · Jerin Jacob
Quoted 26 lines · Mattias Rönnblom
Quoted 25 lines · Jerin Jacob
Quoted 25 lines
Quoted 13 lines
lib/librte_eal/common/eal_common_trace.c +13
-0+ } + +/* Initialize the trace point */ +if (rte_strscpy (tp->name, name,TRACE_POINT_NAME_SIZE ) <0 ) { +trace_err ("name is too long" ); + rte_errno =E2BIG ; + goto free; + } + +/* Copy the field data for future use */ +if (rte_strscpy (tp->ctf_field, field,TRACE_CTF_FIELD_SIZE ) <0 ) { +trace_err ("CTF field size is too long" ); + rte_errno =E2BIG ;lib/librte_eal/common/eal_common_trace.c line 93
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+ goto free; + } + +/* Clear field memory for the next event */ +memset (field,0 ,TRACE_CTF_FIELD_SIZE ); + +/* Form the trace handle */ + *handle = sz; + *handle |= trace.nb_trace_points << __RTE_TRACE_FIELD_ID_SHIFT; + *handle |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT;If *handle would be a struct, you could use a bitfield instead, and much simplify this code.
Quoted 6 lines
Quoted 3 lines
I thought that initially, Two reasons why I did not do that
1) The flags have been used in fastpath, I prefer to work with flags in fastpath so thatIs it really that obvious that flags are faster than bitfield operations? I think most modern architectures have machine instructions for bitfield manipulation.
Add x86 maintainers.
Quoted 7 lines
There were comments in ml about bitfield inefficiency usage with x86.
Search for: Bitfileds are efficient on Octeon. What's about other CPUs you have in
mind? x86 is not as efficient.
Quoted 4 lines
I thought both ARM and x86 had bitfield access instructions, but it looks like I was wrong about x86.
x86_64GCC seems to convert bitfield read to 'shr' and 'and', just like an open-coded bitfield. Bitfield write requires more instructions.
Yes. ARM64 has bitfield access instructions. considering x86, it is better to avoid bitfields.
See below,
Quoted 15 lines
Quoted 7 lines
Thoughts from x86 folks.
Quoted 3 lines
Quoted 3 lines
there is no performance impact using bitfields from the compiler
_ifany_.
2) In some of the places, I can simply operate on APIs like__atomic_and_fetch()with flags.Quoted 6 lines
Quoted 3 lines
I think you may still use such atomic operations. Just convert the struct to a
uint64_t, which will essentially be a no-operation, and fire away.Not sure, We think about the atomic "and" and fetch here. That memcpy may translate additional load/store based on the compiler optimization level.(say compiled with -O0)
Quoted 5 lines
I would be surprised if that happened on anything but -O0. At least modern GCC on ARM and
x86_64don't seem to add any loads or stores.I assume you are not suggesting we should optimize for -O0.
No. I was just mentining that, we can not assume the code generation with -O0. Anyway considering the above point, lets use flags.
PATCH 4/32 eal/trace: implement trace operation APIs
In reply to [email protected]From: Jerin Jacob <[email protected]>
This patch implements the following public trace APIs.
- rte_trace_global_is_enabled()
- rte_trace_global_is_disabled()
- rte_trace_is_id_invalid()
- rte_trace_global_level_set()
- rte_trace_global_level_get()
- rte_trace_global_mode_set()
- rte_trace_global_mode_get()
- rte_trace_enable()
- rte_trace_disable()
- rte_trace_is_enabled()
- rte_trace_is_disabled()
- rte_trace_level_set()
- rte_trace_level_get()
- rte_trace_mode_set()
- rte_trace_mode_get()
- rte_trace_pattern()
- rte_trace_regexp()
- rte_trace_from_name()
--- lib/librte_eal/common/eal_common_trace.c | 249 +++++++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 11 + lib/librte_eal/rte_eal_version.map | 18 ++ 3 files changed, 278 insertions(+)
lib/librte_eal/common/eal_common_trace.c +249 -0
@@ -3,7 +3,9 @@*/ #include <inttypes.h> +#include <fnmatch.h> #include <sys/queue.h> +#include <regex.h> #include <rte_common.h> #include <rte_errno.h>
@@ -20,6 +22,253 @@ RTE_DEFINE_PER_LCORE(int, ctf_count);static struct trace_point_head tp_list =STAILQ_HEAD_INITIALIZER (tp_list);static struct trace trace; +bool +rte_trace_global_is_enabled (void ) +{ +return trace.global_status; +} + +bool +rte_trace_global_is_disabled (void ) +{ +return !trace.global_status; +} + +void +rte_trace_global_level_set (uint32_t level) +{ +struct trace_point *tp; + + trace.level = level; + +if (rte_trace_global_is_disabled ()) +return ; + + STAILQ_FOREACH(tp, &tp_list, next) { +if (level >=rte_trace_level_get (tp->handle)) +rte_trace_enable (tp->handle); +else +rte_trace_disable (tp->handle); + } +} + +uint32_t +rte_trace_global_level_get (void ) +{ +return trace.level; +} + +void +rte_trace_global_mode_set (enum rte_trace_mode_e mode) +{ +struct trace_point *tp; + +if (rte_trace_global_is_disabled ()) +return ; + + STAILQ_FOREACH(tp, &tp_list, next) +rte_trace_mode_set (tp->handle, mode); + + trace.mode = mode; +} + +enum +rte_trace_mode_e rte_trace_global_mode_get (void ) +{ +return trace.mode; +} + +bool +rte_trace_is_id_invalid (rte_trace_t t) +{ +if (trace_id_get (t) >= trace.nb_trace_points) +return true; + +return false; +} + +bool +rte_trace_is_enabled (rte_trace_t trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return false; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); +return !!(val & __RTE_TRACE_FIELD_ENABLE_MASK); +} + +bool +rte_trace_is_disabled (rte_trace_t trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return true; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); +return !!!(val & __RTE_TRACE_FIELD_ENABLE_MASK); +} + +int +rte_trace_enable (rte_trace_t trace) +{ +if (rte_trace_is_id_invalid (trace)) +return -ERANGE ; + +if (rte_trace_level_get (trace) >rte_trace_global_level_get ()) +return -EACCES ; + +__atomic_or_fetch (trace, __RTE_TRACE_FIELD_ENABLE_MASK, + __ATOMIC_RELEASE); +return 0 ; +} + +int +rte_trace_disable (rte_trace_t trace) +{ +if (rte_trace_is_id_invalid (trace)) +return -ERANGE ; + +__atomic_and_fetch (trace, ~__RTE_TRACE_FIELD_ENABLE_MASK, + __ATOMIC_RELEASE); +return 0 ; +} + +uint32_t +rte_trace_level_get (rte_trace_t trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return 0 ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + val &= __RTE_TRACE_FIELD_LEVEL_MASK; + val = val >> __RTE_TRACE_FIELD_LEVEL_SHIFT; + +return val; +} + +int +rte_trace_level_set (rte_trace_t trace,uint32_t level) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace) || level >RTE_LOG_DEBUG ) +return -EINVAL ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + val &= ~__RTE_TRACE_FIELD_LEVEL_MASK; + val |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT; +__atomic_store_n (trace, val, __ATOMIC_RELEASE); + +if (level <=rte_trace_global_level_get ()) +rte_trace_enable (trace); +else +rte_trace_disable (trace); + +return 0 ; +} + +int +rte_trace_mode_get (rte_trace_t trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return -EINVAL ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + +return !!(val & __RTE_TRACE_FIELD_ENABLE_DISCARD); +} + +int +rte_trace_mode_set (rte_trace_t trace,enum rte_trace_mode_e mode) +{ +if (rte_trace_is_id_invalid (trace) || mode >RTE_TRACE_MODE_DISCARD ) +return -EINVAL ; + +if (mode ==RTE_TRACE_MODE_OVERWRITE ) +__atomic_and_fetch (trace, ~__RTE_TRACE_FIELD_ENABLE_DISCARD, + __ATOMIC_RELEASE); +else +__atomic_or_fetch (trace, __RTE_TRACE_FIELD_ENABLE_DISCARD, + __ATOMIC_RELEASE); + +return 0 ; +} + +int +rte_trace_pattern (const char *pattern,bool enable,bool *found) +{ +struct trace_point *tp; +int rc; + +if (found) + *found = false; + + STAILQ_FOREACH(tp, &tp_list, next) { +if (fnmatch (pattern, tp->name,0 ) ==0 ) { +if (found) + *found = true; +if (enable) + rc =rte_trace_enable (tp->handle); +else + rc =rte_trace_disable (tp->handle); + } +if (rc <0 ) +return rc; + } +return 0 ; +} + +int +rte_trace_regexp (const char *regex,bool enable,bool *found) +{ +struct trace_point *tp; +regex_t r; +int rc; + +if (regcomp (&r, regex,0 ) !=0 ) +return -EINVAL ; + +if (found) + *found = false; + + STAILQ_FOREACH(tp, &tp_list, next) { +if (regexec (&r, tp->name,0 ,NULL ,0 ) ==0 ) { +if (found) + *found = true; +if (enable) + rc =rte_trace_enable (tp->handle); +else + rc =rte_trace_disable (tp->handle); + } +if (rc <0 ) +return rc; + } +regfree (&r); +return 0 ; +} + +rte_trace_t +rte_trace_from_name (const char *name) +{ +struct trace_point *tp; + +if (name ==NULL ) +return NULL ; + + STAILQ_FOREACH(tp, &tp_list, next) +if (strncmp (tp->name, name,TRACE_POINT_NAME_SIZE ) ==0 ) +return tp->handle; + +return NULL ; +} +int __rte_trace_point_register (rte_trace_t handle,const char *name,uint32_t level,void (*fn)(void ))
lib/librte_eal/common/eal_trace.h +11 -0
@@ -27,9 +27,20 @@ struct trace_point {struct trace {int register_errno; +bool global_status; +enum rte_trace_mode_e mode; +uint32_t level;uint32_t nb_trace_points; }; +/* Helper functions */ +static inline uint16_t +trace_id_get (rte_trace_t trace) +{ +return (*trace & __RTE_TRACE_FIELD_ID_MASK) >> + __RTE_TRACE_FIELD_ID_SHIFT; +} +/* Trace point list functions */ STAILQ_HEAD (trace_point_head, trace_point);
lib/librte_eal/rte_eal_version.map +18 -0
@@ -339,4 +339,22 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; __rte_trace_point_register; + rte_trace_global_is_enabled; + rte_trace_global_is_disabled; + rte_trace_is_id_invalid; + rte_trace_global_level_set; + rte_trace_global_level_get; + rte_trace_global_mode_set; + rte_trace_global_mode_get; + rte_trace_enable; + rte_trace_disable; + rte_trace_is_enabled; + rte_trace_is_disabled; + rte_trace_level_set; + rte_trace_level_get; + rte_trace_mode_set; + rte_trace_mode_get; + rte_trace_pattern; + rte_trace_regexp; + rte_trace_from_name; };
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 04/32] eal/trace: implement trace operation APIs
Quoted 114 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
This patch implements the following public trace APIs.
-
rte_trace_global_is_enabled()
-rte_trace_global_is_disabled()
-rte_trace_is_id_invalid()
-rte_trace_global_level_set()
-rte_trace_global_level_get()
-rte_trace_global_mode_set()
-rte_trace_global_mode_get()
-rte_trace_enable()
-rte_trace_disable()
-rte_trace_is_enabled()
-rte_trace_is_disabled()
-rte_trace_level_set()
-rte_trace_level_get()
-rte_trace_mode_set()
-rte_trace_mode_get()
-rte_trace_pattern()
-rte_trace_regexp()
-rte_trace_from_name()Signed-off-by Jerin Jacob <[email protected]>Signed-off-by Sunil Kumar Kori <[email protected]>--- lib/librte_eal/common/eal_common_trace.c | 249 +++++++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 11 + lib/librte_eal/rte_eal_version.map | 18 ++ 3 files changed, 278 insertions(+)lib/librte_eal/common/eal_common_trace.c +67
-0@@ -3,7 +3,9 @@*/ #include <inttypes.h> +#include <fnmatch.h> #include <sys/queue.h> +#include <regex.h> #include <rte_common.h> #include <rte_errno.h> @@ -20,6 +22,253 @@ RTE_DEFINE_PER_LCORE(int, ctf_count);static struct trace_point_head tp_list =STAILQ_HEAD_INITIALIZER (tp_list);static struct trace trace; +bool +rte_trace_global_is_enabled (void ) +{ +return trace.global_status; +} + +bool +rte_trace_global_is_disabled (void ) +{ +return !trace.global_status; +} + +void +rte_trace_global_level_set (uint32_t level) +{ +struct trace_point *tp; + + trace.level = level; + +if (rte_trace_global_is_disabled ()) +return ; + + STAILQ_FOREACH(tp, &tp_list, next) { +if (level >=rte_trace_level_get (tp->handle)) +rte_trace_enable (tp->handle); +else +rte_trace_disable (tp->handle); + } +} + +uint32_t +rte_trace_global_level_get (void ) +{ +return trace.level; +} + +void +rte_trace_global_mode_set (enum rte_trace_mode_e mode) +{ +struct trace_point *tp; + +if (rte_trace_global_is_disabled ()) +return ; + + STAILQ_FOREACH(tp, &tp_list, next) +rte_trace_mode_set (tp->handle, mode); + + trace.mode = mode; +} + +enum +rte_trace_mode_e rte_trace_global_mode_get (void ) +{ +return trace.mode; +} + +bool +rte_trace_is_id_invalid (rte_trace_t t) +{ +if (trace_id_get (t) >= trace.nb_trace_points) +return true; + +return false; +} +
lib/librte_eal/common/eal_common_trace.c RTE_DEFINE_PER_LCORE(int, ctf_count); · line 99
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+bool +rte_trace_is_enabled (rte_trace_t trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return false; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); +return !!(val & __RTE_TRACE_FIELD_ENABLE_MASK);
The function has a bool return type, so no need to do a double negation.
Quoted 4 lines
lib/librte_eal/common/eal_common_trace.c +4
-0+} + +bool +rte_trace_is_disabled (rte_trace_t trace)
lib/librte_eal/common/eal_common_trace.c RTE_DEFINE_PER_LCORE(int, ctf_count); · line 113
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return true; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); +return !!!(val & __RTE_TRACE_FIELD_ENABLE_MASK); +} +
Same here.
Quoted 128 lines
lib/librte_eal/common/eal_common_trace.c +128
-0+int +rte_trace_enable (rte_trace_t trace) +{ +if (rte_trace_is_id_invalid (trace)) +return -ERANGE ; + +if (rte_trace_level_get (trace) >rte_trace_global_level_get ()) +return -EACCES ; + +__atomic_or_fetch (trace, __RTE_TRACE_FIELD_ENABLE_MASK, + __ATOMIC_RELEASE); +return 0 ; +} + +int +rte_trace_disable (rte_trace_t trace) +{ +if (rte_trace_is_id_invalid (trace)) +return -ERANGE ; + +__atomic_and_fetch (trace, ~__RTE_TRACE_FIELD_ENABLE_MASK, + __ATOMIC_RELEASE); +return 0 ; +} + +uint32_t +rte_trace_level_get (rte_trace_t trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return 0 ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + val &= __RTE_TRACE_FIELD_LEVEL_MASK; + val = val >> __RTE_TRACE_FIELD_LEVEL_SHIFT; + +return val; +} + +int +rte_trace_level_set (rte_trace_t trace,uint32_t level) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace) || level >RTE_LOG_DEBUG ) +return -EINVAL ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + val &= ~__RTE_TRACE_FIELD_LEVEL_MASK; + val |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT; +__atomic_store_n (trace, val, __ATOMIC_RELEASE); + +if (level <=rte_trace_global_level_get ()) +rte_trace_enable (trace); +else +rte_trace_disable (trace); + +return 0 ; +} + +int +rte_trace_mode_get (rte_trace_t trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return -EINVAL ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + +return !!(val & __RTE_TRACE_FIELD_ENABLE_DISCARD); +} + +int +rte_trace_mode_set (rte_trace_t trace,enum rte_trace_mode_e mode) +{ +if (rte_trace_is_id_invalid (trace) || mode >RTE_TRACE_MODE_DISCARD ) +return -EINVAL ; + +if (mode ==RTE_TRACE_MODE_OVERWRITE ) +__atomic_and_fetch (trace, ~__RTE_TRACE_FIELD_ENABLE_DISCARD, + __ATOMIC_RELEASE); +else +__atomic_or_fetch (trace, __RTE_TRACE_FIELD_ENABLE_DISCARD, + __ATOMIC_RELEASE); + +return 0 ; +} + +int +rte_trace_pattern (const char *pattern,bool enable,bool *found) +{ +struct trace_point *tp; +int rc; + +if (found) + *found = false; + + STAILQ_FOREACH(tp, &tp_list, next) { +if (fnmatch (pattern, tp->name,0 ) ==0 ) { +if (found) + *found = true; +if (enable) + rc =rte_trace_enable (tp->handle); +else + rc =rte_trace_disable (tp->handle); + } +if (rc <0 ) +return rc; + } +return 0 ; +} + +int +rte_trace_regexp (const char *regex,bool enable,bool *found) +{ +struct trace_point *tp; +regex_t r; +int rc; + +if (regcomp (&r, regex,0 ) !=0 ) +return -EINVAL ; + +if (found) + *found = false; + + STAILQ_FOREACH(tp, &tp_list, next) {
lib/librte_eal/common/eal_common_trace.c RTE_DEFINE_PER_LCORE(int, ctf_count); · line 251
Quoted 10 lines
lib/librte_eal/common/eal_common_trace.c +10
-0+if (regexec (&r, tp->name,0 ,NULL ,0 ) ==0 ) { +if (found) + *found = true; +if (enable) + rc =rte_trace_enable (tp->handle); +else + rc =rte_trace_disable (tp->handle); + } +if (rc <0 ) +return rc;
In case of a non-match, rc may not be initialized.
Quoted 75 lines
lib/librte_eal/common/eal_common_trace.c +20
-0+ } +regfree (&r); +return 0 ; +} + +rte_trace_t +rte_trace_from_name (const char *name) +{ +struct trace_point *tp; + +if (name ==NULL ) +return NULL ; + + STAILQ_FOREACH(tp, &tp_list, next) +if (strncmp (tp->name, name,TRACE_POINT_NAME_SIZE ) ==0 ) +return tp->handle; + +return NULL ; +} +int __rte_trace_point_register (rte_trace_t handle,const char *name,uint32_t level,void (*fn)(void ))lib/librte_eal/common/eal_trace.h +11
-0@@ -27,9 +27,20 @@ struct trace_point {struct trace {int register_errno; +bool global_status; +enum rte_trace_mode_e mode; +uint32_t level;uint32_t nb_trace_points; }; +/* Helper functions */ +static inline uint16_t +trace_id_get (rte_trace_t trace) +{ +return (*trace & __RTE_TRACE_FIELD_ID_MASK) >> + __RTE_TRACE_FIELD_ID_SHIFT; +} +/* Trace point list functions */ STAILQ_HEAD (trace_point_head, trace_point);lib/librte_eal/rte_eal_version.map +18
-0@@ -339,4 +339,22 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; __rte_trace_point_register; + rte_trace_global_is_enabled; + rte_trace_global_is_disabled; + rte_trace_is_id_invalid; + rte_trace_global_level_set; + rte_trace_global_level_get; + rte_trace_global_mode_set; + rte_trace_global_mode_get; + rte_trace_enable; + rte_trace_disable; + rte_trace_is_enabled; + rte_trace_is_disabled; + rte_trace_level_set; + rte_trace_level_get; + rte_trace_mode_set; + rte_trace_mode_get; + rte_trace_pattern; + rte_trace_regexp; + rte_trace_from_name; };
Re: [dpdk-dev] [PATCH v1 04/32] eal/trace: implement trace operation APIs
Quoted 5 lines · Mattias Rönnblom
Quoted 3 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
This patch implements the following public trace APIs.
All the comments in this patch will be fixed in v2.
PATCH 5/32 eal/trace: add internal trace init and fini interface
In reply to [email protected]From: Jerin Jacob <[email protected]>
Define eal_trace_init() and eal_trace_fini() EAL interface functions that rte_eal_init() and rte_eal_cleanup() function can be use to initialize and finalize the trace subsystem. eal_trace_init() function will add the following functionality if trace is enabled through EAL command line param.
- Test for trace registration failure.
- Test for duplicate trace name registration
- Generate UUID ver 4.
- Create a trace directory
--- lib/librte_eal/common/eal_common_trace.c | 54 ++++++ .../common/eal_common_trace_utils.c | 173 ++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 21 +++ lib/librte_eal/common/meson.build | 1 + lib/librte_eal/freebsd/eal/Makefile | 1 + lib/librte_eal/linux/eal/Makefile | 1 + 6 files changed, 251 insertions(+) create mode 100644 lib/librte_eal/common/eal_common_trace_utils.c
lib/librte_eal/common/eal_common_trace.c +54 -0
@@ -22,6 +22,60 @@ RTE_DEFINE_PER_LCORE(int, ctf_count);static struct trace_point_head tp_list =STAILQ_HEAD_INITIALIZER (tp_list);static struct trace trace; +struct trace * +trace_obj_get (void ) +{ +return &trace; +} + +struct trace_point_head * +trace_list_head_get (void ) +{ +return &tp_list; +} + +int +eal_trace_init (void ) +{ +/* One of the Trace registration failed */ +if (trace.register_errno) { + rte_errno = trace.register_errno; + goto fail; + } + +if (rte_trace_global_is_disabled ()) +return 0 ; + +rte_spinlock_init (&trace.lock); + +/* Is duplicate trace name registered */ +if (trace_has_duplicate_entry ()) + goto fail; + +/* Generate UUID ver 4 with total size of events and number of events */ +trace_uuid_generate (); + +/* Create trace directory */ +if (trace_mkdir ()) + goto fail; + + +rte_trace_global_mode_set (trace.mode); + +return 0 ; + +fail: +trace_err ("failed to initialize trace [%s]" ,rte_strerror (rte_errno)); +return -rte_errno; +} + +void +eal_trace_fini (void ) +{ +if (rte_trace_global_is_disabled ()) +return ; +} +bool rte_trace_global_is_enabled (void ) {
lib/librte_eal/common/eal_common_trace_utils.c new file +173 -0
173 lines not on this page · raw message
lib/librte_eal/common/eal_trace.h +21 -0
@@ -5,7 +5,9 @@#ifndef __EAL_TRACE_H#define __EAL_TRACE_H +#include <rte_spinlock.h> #include <rte_trace.h> +#include <rte_uuid.h> #define trace_err(fmt, args...)\ RTE_LOG(ERR, EAL, "%s():%u " fmt "\n",\
@@ -15,6 +17,8 @@RTE_LOG (CRIT ,EAL ,"%s():%u " fmt"\n" ,\ __func__, __LINE__, ## args) +#define TRACE_PREFIX_LEN 12 +#define TRACE_DIR_STR_LEN (sizeof("YYYY-mm-dd-AM-HH-MM-SS") + TRACE_PREFIX_LEN) #define TRACE_CTF_FIELD_SIZE 384 #define TRACE_POINT_NAME_SIZE 64
@@ -26,11 +30,15 @@ struct trace_point { };struct trace { +char dir[PATH_MAX ]; +int dir_offset;int register_errno;bool global_status;enum rte_trace_mode_e mode; +rte_uuid_t uuid;uint32_t level;uint32_t nb_trace_points; +rte_spinlock_t lock; };/* Helper functions */
@@ -41,7 +49,20 @@ trace_id_get(rte_trace_t trace) __RTE_TRACE_FIELD_ID_SHIFT; } +/* Trace object functions */ +struct trace *trace_obj_get (void ); +/* Trace point list functions */ STAILQ_HEAD (trace_point_head, trace_point); +struct trace_point_head *trace_list_head_get (void ); + +/* Util functions */ +bool trace_has_duplicate_entry (void ); +void trace_uuid_generate (void ); +int trace_mkdir (void ); + +/* EAL interface */ +int eal_trace_init (void ); +void eal_trace_fini (void );#endif /* __EAL_TRACE_H */
lib/librte_eal/common/meson.build +1 -0
@@ -29,6 +29,7 @@ common_sources = files( 'eal_common_thread.c', 'eal_common_timer.c', 'eal_common_trace.c', + 'eal_common_trace_utils.c', 'eal_common_uuid.c', 'hotplug_mp.c', 'malloc_elem.c',
lib/librte_eal/freebsd/eal/Makefile +1 -0
@@ -61,6 +61,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c +SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c
lib/librte_eal/linux/eal/Makefile +1 -0
@@ -69,6 +69,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 05/32] eal/trace: add internal trace init and fini interface
Quoted 116 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
Define
eal_trace_init()andeal_trace_fini()EAL interface functions thatrte_eal_init()andrte_eal_cleanup()function can be use to initialize and finalize the trace subsystem.eal_trace_init()function will add the following functionality if trace is enabled through EAL command line param.- Test for trace registration failure.
- Test for duplicate trace name registration
- Generate UUID ver 4.
- Create a trace directorySigned-off-by Jerin Jacob <[email protected]>Signed-off-by Sunil Kumar Kori <[email protected]>--- lib/librte_eal/common/eal_common_trace.c | 54 ++++++ .../common/eal_common_trace_utils.c | 173 ++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 21 +++ lib/librte_eal/common/meson.build | 1 + lib/librte_eal/freebsd/eal/Makefile | 1 + lib/librte_eal/linux/eal/Makefile | 1 + 6 files changed, 251 insertions(+)create mode 100644
lib/librte_eal/common/eal_common_trace_utils.clib/librte_eal/common/eal_common_trace.c +54
-0@@ -22,6 +22,60 @@ RTE_DEFINE_PER_LCORE(int, ctf_count);static struct trace_point_head tp_list =STAILQ_HEAD_INITIALIZER (tp_list);static struct trace trace; +struct trace * +trace_obj_get (void ) +{ +return &trace; +} + +struct trace_point_head * +trace_list_head_get (void ) +{ +return &tp_list; +} + +int +eal_trace_init (void ) +{ +/* One of the Trace registration failed */ +if (trace.register_errno) { + rte_errno = trace.register_errno; + goto fail; + } + +if (rte_trace_global_is_disabled ()) +return 0 ; + +rte_spinlock_init (&trace.lock); + +/* Is duplicate trace name registered */ +if (trace_has_duplicate_entry ()) + goto fail; + +/* Generate UUID ver 4 with total size of events and number of events */ +trace_uuid_generate (); + +/* Create trace directory */ +if (trace_mkdir ()) + goto fail; + + +rte_trace_global_mode_set (trace.mode); + +return 0 ; + +fail: +trace_err ("failed to initialize trace [%s]" ,rte_strerror (rte_errno)); +return -rte_errno; +} + +void +eal_trace_fini (void ) +{ +if (rte_trace_global_is_disabled ()) +return ; +} +bool rte_trace_global_is_enabled (void ) {lib/librte_eal/common/eal_common_trace_utils.c new file +20
-0@@ -0,0 +1,173 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#include <fnmatch.h> +#include <pwd.h> +#include <sys/stat.h> +#include <time.h> + +#include <rte_common.h> +#include <rte_errno.h> +#include <rte_string_fns.h> + +#include "eal_filesystem.h" +#include "eal_trace.h" + +static bool +trace_entry_compare (const char *name) +{ +struct trace_point_head *tp_list =trace_list_head_get ();
lib/librte_eal/common/eal_common_trace_utils.c line 30
Quoted 10 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +10
-0+struct trace_point *tp; +int count =0 ; + + STAILQ_FOREACH(tp, tp_list, next) { +if (strncmp (tp->name, name,TRACE_POINT_NAME_SIZE ) ==0 ) + count++; +if (count >1 ) { +trace_err ("found duplicate entry %s" , name); + rte_errno =EEXIST ; +return 1 ;
Maybe an assertion would be better here, especially since the caller doesn't seem to care about the fact the list is inconsistent.
Change 1 -> true.
lib/librte_eal/common/eal_common_trace_utils.c line 33
Quoted 3 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +3
-0+ } + } +return 0 ;
return false;
Quoted 67 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +67
-0+} + +bool +trace_has_duplicate_entry (void ) +{ +struct trace_point_head *tp_list =trace_list_head_get (); +struct trace_point *tp; + +/* Is duplicate trace name registered */ + STAILQ_FOREACH(tp, tp_list, next) +if (trace_entry_compare (tp->name)) +return true; + +return false; +} + +void +trace_uuid_generate (void ) +{ +struct trace_point_head *tp_list =trace_list_head_get (); +struct trace *trace =trace_obj_get (); +struct trace_point *tp; +uint64_t sz_total =0 ; + +/* Go over the registered trace points to get total size of events */ + STAILQ_FOREACH(tp, tp_list, next) { +const uint16_t sz = *tp->handle & __RTE_TRACE_FIELD_SIZE_MASK; + sz_total += sz; + } + +rte_uuid_t uuid =RTE_UUID_INIT (sz_total, trace->nb_trace_points, +0x4370 ,0x8f50 ,0x222ddd514176ULL ); +rte_uuid_copy (trace->uuid, uuid); +} + +static int +trace_session_name_generate (char *trace_dir) +{ +struct tm *tm_result; +time_t tm; +int rc; + + tm =time (NULL ); +if ((int )tm ==-1 ) + goto fail; + + tm_result =localtime (&tm); +if (tm_result ==NULL ) + goto fail; + + rc =rte_strscpy (trace_dir, +eal_get_hugefile_prefix (),TRACE_PREFIX_LEN ); +if (rc == -E2BIG ) + rc =TRACE_PREFIX_LEN ; + trace_dir[rc++] ='-' ; + + rc =strftime (trace_dir + rc,TRACE_DIR_STR_LEN - rc, +"%Y-%m-%d-%p-%I-%M-%S" , tm_result); +if (rc ==0 ) + goto fail; + +return rc; +fail: + rte_errno = errno; +return -rte_errno; +} +
lib/librte_eal/common/eal_common_trace_utils.c line 110
Quoted 10 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +10
-0+static int +trace_dir_default_path_get (char *dir_path) +{ +struct trace *trace =trace_obj_get (); +uint32_t size =sizeof (trace->dir); +struct passwd *pwd; +char *home_dir; + +/* First check for shell environment variable */ + home_dir =getenv ("HOME" );
In case of the application being started with 'sudo', $HOME will not be "/root", but rather the original user. This sounds like a bug to me.
Quoted 16 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +16
-0+if (home_dir ==NULL ) { +/* Fallback to password file entry */ + pwd =getpwuid (getuid ()); +if (pwd ==NULL ) +return -EINVAL ; + + home_dir = pwd->pw_dir; + } + +/* Append dpdk-traces to directory */ +if (snprintf (dir_path, size,"%s/dpdk-traces/" , home_dir) <0 ) +return -ENAMETOOLONG ; + +return 0 ; +} +
lib/librte_eal/common/eal_common_trace_utils.c line 136
Quoted 10 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +10
-0+int +trace_mkdir (void ) +{ +struct trace *trace =trace_obj_get (); +char session[TRACE_DIR_STR_LEN ]; +char *dir_path; +int rc; + +if (!trace->dir_offset) { + dir_path = (char *)calloc (1 ,sizeof (trace->dir));
calloc() returns a void pointer, so no need to cast it.
Quoted 25 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +25
-0+if (dir_path ==NULL ) { +trace_err ("fail to allocate memory\n" ); +return -ENOMEM ; + } + + rc =trace_dir_default_path_get (dir_path); +if (rc <0 ) { +trace_err ("fail to get default path\n" ); +free (dir_path); +return rc; + } + + } + +/* Create the path if it t exist, no "mkdir -p" available here */ + rc =mkdir (trace->dir,0700 ); +if (rc <0 && errno !=EEXIST ) { +trace_err ("mkdir %s failed [%s]" , trace->dir,strerror (errno)); + rte_errno = errno; +return -rte_errno; + } + + rc =trace_session_name_generate (session); +if (rc <0 ) +return rc;
lib/librte_eal/common/eal_common_trace_utils.c line 171
Quoted 10 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +10
-0+ + rc =mkdir (trace->dir,0700 ); +if (rc <0 ) { +trace_err ("mkdir %s failed [%s]" , trace->dir,strerror (errno)); + rte_errno = errno; +return -rte_errno; + } + +RTE_LOG (INFO ,EAL ,"Trace dir: %s\n" , trace->dir); +return 0 ;
Is dir_path leaked? I can't find a free(), except in one of the error cases.
Quoted 98 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +2
-0+} +lib/librte_eal/common/eal_trace.h +21
-0@@ -5,7 +5,9 @@#ifndef __EAL_TRACE_H#define __EAL_TRACE_H +#include <rte_spinlock.h> #include <rte_trace.h> +#include <rte_uuid.h> #define trace_err(fmt, args...)\ RTE_LOG(ERR, EAL, "%s():%u " fmt "\n",\@@ -15,6 +17,8 @@RTE_LOG (CRIT ,EAL ,"%s():%u " fmt"\n" ,\ __func__, __LINE__, ## args) +#define TRACE_PREFIX_LEN 12 +#define TRACE_DIR_STR_LEN (sizeof("YYYY-mm-dd-AM-HH-MM-SS") + TRACE_PREFIX_LEN) #define TRACE_CTF_FIELD_SIZE 384 #define TRACE_POINT_NAME_SIZE 64@@ -26,11 +30,15 @@ struct trace_point { };struct trace { +char dir[PATH_MAX ]; +int dir_offset;int register_errno;bool global_status;enum rte_trace_mode_e mode; +rte_uuid_t uuid;uint32_t level;uint32_t nb_trace_points; +rte_spinlock_t lock; };/* Helper functions */ @@ -41,7 +49,20 @@ trace_id_get(rte_trace_t trace) __RTE_TRACE_FIELD_ID_SHIFT; } +/* Trace object functions */ +struct trace *trace_obj_get (void ); +/* Trace point list functions */ STAILQ_HEAD (trace_point_head, trace_point); +struct trace_point_head *trace_list_head_get (void ); + +/* Util functions */ +bool trace_has_duplicate_entry (void ); +void trace_uuid_generate (void ); +int trace_mkdir (void ); + +/* EAL interface */ +int eal_trace_init (void ); +void eal_trace_fini (void );#endif /* __EAL_TRACE_H */ lib/librte_eal/common/meson.build +1
-0@@ -29,6 +29,7 @@ common_sources = files( 'eal_common_thread.c', 'eal_common_timer.c', 'eal_common_trace.c', + 'eal_common_trace_utils.c', 'eal_common_uuid.c', 'hotplug_mp.c', 'malloc_elem.c',lib/librte_eal/freebsd/eal/Makefile +1
-0@@ -61,6 +61,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c +SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.clib/librte_eal/linux/eal/Makefile +1
-0@@ -69,6 +69,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c
Re: [dpdk-dev] [PATCH v1 05/32] eal/trace: add internal trace init and fini interface
Quoted 13 lines · Mattias Rönnblom
Quoted 11 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
lib/librte_eal/common/eal_common_trace_utils.c new file +9
-0+static bool +trace_entry_compare (const char *name) +{ +struct trace_point_head *tp_list =trace_list_head_get (); +struct trace_point *tp; +int count =0 ; + + STAILQ_FOREACH(tp, tp_list, next) { +if (strncmp (tp->name, name,TRACE_POINT_NAME_SIZE ) ==0 )
Quoted 8 lines
lib/librte_eal/common/eal_common_trace_utils.c line 30
Quoted 5 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +5
-0+ count++; +if (count >1 ) { +trace_err ("found duplicate entry %s" , name); + rte_errno =EEXIST ; +return 1 ;Maybe an assertion would be better here, especially since the caller doesn't seem to care about the fact the list is inconsistent.
assertion/panic are getting removed from the libraries. This error propagates up to rte_eal_init() failure. So, the current scheme is OK.
Quoted 2 lines
Change 1 -> true.
Will fix it in v2.
Quoted 5 lines
lib/librte_eal/common/eal_common_trace.c RTE_DEFINE_PER_LCORE(int, ctf_count); · line 47
Quoted 4 lines
lib/librte_eal/common/eal_common_trace.c +3
-0+ } + } +return 0 ;return false;
Will fix it in v2.
Quoted 15 lines
lib/librte_eal/common/eal_common_trace_utils.c line 110
Quoted 13 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +12
-0+} + +static int +trace_dir_default_path_get (char *dir_path) +{ +struct trace *trace =trace_obj_get (); +uint32_t size =sizeof (trace->dir); +struct passwd *pwd; +char *home_dir; + +/* First check for shell environment variable */ + home_dir =getenv ("HOME" );In case of the application being started with 'sudo', $HOME will not be "/root", but rather the original user. This sounds like a bug to me.
When the application started with sudo, the trace will be written by the "root" user. Probably it is not good to have some file whose ownership as root in /home/user/dpdk-trace/ where the user can not delete it.
A similar scheme followed in LTTng for trace directory. I am open to a better scheme if any.
Quoted 19 lines
Quoted 19 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +19
-0+if (home_dir ==NULL ) { +/* Fallback to password file entry */ + pwd =getpwuid (getuid ()); +if (pwd ==NULL ) +return -EINVAL ; + + home_dir = pwd->pw_dir; + } + +/* Append dpdk-traces to directory */ +if (snprintf (dir_path, size,"%s/dpdk-traces/" , home_dir) <0 ) +return -ENAMETOOLONG ; + +return 0 ; +} + +int +trace_mkdir (void ) +{
Quoted 8 lines
lib/librte_eal/common/eal_common_trace_utils.c line 136
Quoted 7 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +7
-0+struct trace *trace =trace_obj_get (); +char session[TRACE_DIR_STR_LEN ]; +char *dir_path; +int rc; + +if (!trace->dir_offset) { + dir_path = (char *)calloc (1 ,sizeof (trace->dir));
calloc()returns a void pointer, so no need to cast it.
Will fix it in v2.
Quoted 29 lines
Quoted 29 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +29
-0+if (dir_path ==NULL ) { +trace_err ("fail to allocate memory\n" ); +return -ENOMEM ; + } + + rc =trace_dir_default_path_get (dir_path); +if (rc <0 ) { +trace_err ("fail to get default path\n" ); +free (dir_path); +return rc; + } + + } + +/* Create the path if it t exist, no "mkdir -p" available here */ + rc =mkdir (trace->dir,0700 ); +if (rc <0 && errno !=EEXIST ) { +trace_err ("mkdir %s failed [%s]" , trace->dir,strerror (errno)); + rte_errno = errno; +return -rte_errno; + } + + rc =trace_session_name_generate (session); +if (rc <0 ) +return rc; + + rc =mkdir (trace->dir,0700 ); +if (rc <0 ) { +trace_err ("mkdir %s failed [%s]" , trace->dir,strerror (errno));
Quoted 8 lines
lib/librte_eal/common/eal_common_trace_utils.c line 171
Quoted 6 lines
lib/librte_eal/common/eal_common_trace_utils.c new file +6
-0+ rte_errno = errno; +return -rte_errno; + } + +RTE_LOG (INFO ,EAL ,"Trace dir: %s\n" , trace->dir); +return 0 ;Is
dir_pathleaked? I can't find afree(), except in one of the error cases.
Not is in "struct trace" as memory.
struct trace {
char dir[PATH_MAX];..
}
PATCH 6/32 eal/trace: get bootup timestamp for trace
In reply to [email protected]From: Jerin Jacob <[email protected]>
Find epoch_sec, epoch_nsec and uptime_ticks time information on eal_trace_init()/bootup to derive the time in the trace.
--- lib/librte_eal/common/eal_common_trace.c | 3 +++ .../common/eal_common_trace_utils.c | 22 +++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 5 +++++ 3 files changed, 30 insertions(+)
lib/librte_eal/common/eal_common_trace.c +3 -0
@@ -59,6 +59,9 @@ eal_trace_init(void)if (trace_mkdir ()) goto fail; +/* Save current epoch timestamp for future use */ +if (trace_epoch_time_save ()) + goto fail;rte_trace_global_mode_set (trace.mode);
lib/librte_eal/common/eal_common_trace_utils.c +22 -0
@@ -98,6 +98,28 @@ trace_session_name_generate(char *trace_dir)return -rte_errno; } +int +trace_epoch_time_save (void ) +{ +struct trace *trace =trace_obj_get (); +struct timespec epoch = {0 ,0 }; +uint64_t avg, start, end; + + start =rte_get_tsc_cycles (); +if (clock_gettime (CLOCK_REALTIME , &epoch) <0 ) { +trace_err ("failed to get the epoch time" ); +return -1 ; + } + end =rte_get_tsc_cycles (); + avg = (start + end) >>1 ; + + trace->epoch_sec = (uint64_t ) epoch.tv_sec; + trace->epoch_nsec = (uint64_t ) epoch.tv_nsec; + trace->uptime_ticks = avg; + +return 0 ; +} +static int trace_dir_default_path_get (char *dir_path) {
lib/librte_eal/common/eal_trace.h +5 -0
@@ -5,6 +5,7 @@#ifndef __EAL_TRACE_H#define __EAL_TRACE_H +#include <rte_cycles.h> #include <rte_spinlock.h> #include <rte_trace.h> #include <rte_uuid.h>
@@ -38,6 +39,9 @@ struct trace {rte_uuid_t uuid;uint32_t level;uint32_t nb_trace_points; +uint64_t epoch_sec; +uint64_t epoch_nsec; +uint64_t uptime_ticks;rte_spinlock_t lock; };
@@ -60,6 +64,7 @@ struct trace_point_head *trace_list_head_get(void);bool trace_has_duplicate_entry (void );void trace_uuid_generate (void );int trace_mkdir (void ); +int trace_epoch_time_save (void );/* EAL interface */ int eal_trace_init (void );
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 06/32] eal/trace: get bootup timestamp for trace
Quoted 17 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
Find
epoch_sec,epoch_nsecanduptime_tickstime information on eal_trace_init()/bootup to derive the time in the trace.Signed-off-by Jerin Jacob <[email protected]>--- lib/librte_eal/common/eal_common_trace.c | 3 +++ .../common/eal_common_trace_utils.c | 22 +++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 5 +++++ 3 files changed, 30 insertions(+)lib/librte_eal/common/eal_common_trace.c +0
-0
lib/librte_eal/common/eal_common_trace.c eal_trace_init(void) · line 64
Quoted 6 lines
lib/librte_eal/common/eal_common_trace.c +3
-0@@ -59,6 +59,9 @@ eal_trace_init(void)if (trace_mkdir ()) goto fail; +/* Save current epoch timestamp for future use */ +if (trace_epoch_time_save ()) + goto fail;
< 0 looks cleaner.
Quoted 8 lines
lib/librte_eal/common/eal_common_trace.c +0
-0rte_trace_global_mode_set (trace.mode);lib/librte_eal/common/eal_common_trace_utils.c +0
-0
lib/librte_eal/common/eal_common_trace_utils.c trace_session_name_generate(char *trace_dir) · line 105
Quoted 8 lines
lib/librte_eal/common/eal_common_trace_utils.c +5
-0@@ -98,6 +98,28 @@ trace_session_name_generate(char *trace_dir)return -rte_errno; } +int +trace_epoch_time_save (void ) +{ +struct trace *trace =trace_obj_get (); +struct timespec epoch = {0 ,0 };
= {} also works.
lib/librte_eal/common/eal_common_trace_utils.c trace_session_name_generate(char *trace_dir) · line 117
Quoted 12 lines
lib/librte_eal/common/eal_common_trace_utils.c +12
-0+uint64_t avg, start, end; + + start =rte_get_tsc_cycles (); +if (clock_gettime (CLOCK_REALTIME , &epoch) <0 ) { +trace_err ("failed to get the epoch time" ); +return -1 ; + } + end =rte_get_tsc_cycles (); + avg = (start + end) >>1 ; + + trace->epoch_sec = (uint64_t ) epoch.tv_sec; + trace->epoch_nsec = (uint64_t ) epoch.tv_nsec;
If you would settle with keeping the time offset in microseconds, you would only need "epoch_offset_usec".
Quoted 38 lines
lib/librte_eal/common/eal_common_trace_utils.c +5
-0+ trace->uptime_ticks = avg; + +return 0 ; +} +static int trace_dir_default_path_get (char *dir_path) {lib/librte_eal/common/eal_trace.h +5
-0@@ -5,6 +5,7 @@#ifndef __EAL_TRACE_H#define __EAL_TRACE_H +#include <rte_cycles.h> #include <rte_spinlock.h> #include <rte_trace.h> #include <rte_uuid.h> @@ -38,6 +39,9 @@ struct trace {rte_uuid_t uuid;uint32_t level;uint32_t nb_trace_points; +uint64_t epoch_sec; +uint64_t epoch_nsec; +uint64_t uptime_ticks;rte_spinlock_t lock; };@@ -60,6 +64,7 @@ struct trace_point_head *trace_list_head_get(void);bool trace_has_duplicate_entry (void );void trace_uuid_generate (void );int trace_mkdir (void ); +int trace_epoch_time_save (void );/* EAL interface */ int eal_trace_init (void );
Re: [dpdk-dev] [PATCH v1 06/32] eal/trace: get bootup timestamp for trace
Quoted 22 lines · Mattias Rönnblom
Quoted 20 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
Find
epoch_sec,epoch_nsecanduptime_tickstime information on eal_trace_init()/bootup to derive the time in the trace.Signed-off-by Jerin Jacob <[email protected]>--- lib/librte_eal/common/eal_common_trace.c | 3 +++ .../common/eal_common_trace_utils.c | 22 +++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 5 +++++ 3 files changed, 30 insertions(+)lib/librte_eal/common/eal_common_trace.c +0
-0@@ -59,6 +59,9 @@ eal_trace_init(void)if (trace_mkdir ()) goto fail;
Quoted 4 lines
lib/librte_eal/common/eal_common_trace.c eal_trace_init(void) · line 64
Quoted 3 lines
lib/librte_eal/common/eal_common_trace.c +3
-0+/* Save current epoch timestamp for future use */ +if (trace_epoch_time_save ()) + goto fail;< 0 looks cleaner.
OK. I will change it in v2.
Quoted 17 lines
Quoted 8 lines
lib/librte_eal/common/eal_common_trace.c +0
-0rte_trace_global_mode_set (trace.mode);lib/librte_eal/common/eal_common_trace_utils.c +0
-0lib/librte_eal/common/eal_common_trace_utils.c trace_session_name_generate(char *trace_dir) · line 105
Quoted 8 lines
lib/librte_eal/common/eal_common_trace_utils.c +5
-0@@ -98,6 +98,28 @@ trace_session_name_generate(char *trace_dir)return -rte_errno; } +int +trace_epoch_time_save (void ) +{ +struct trace *trace =trace_obj_get (); +struct timespec epoch = {0 ,0 };= {} also works.
Quoted 14 lines
lib/librte_eal/common/eal_common_trace_utils.c trace_session_name_generate(char *trace_dir) · line 117
Quoted 12 lines
lib/librte_eal/common/eal_common_trace_utils.c +12
-0+uint64_t avg, start, end; + + start =rte_get_tsc_cycles (); +if (clock_gettime (CLOCK_REALTIME , &epoch) <0 ) { +trace_err ("failed to get the epoch time" ); +return -1 ; + } + end =rte_get_tsc_cycles (); + avg = (start + end) >>1 ; + + trace->epoch_sec = (uint64_t ) epoch.tv_sec; + trace->epoch_nsec = (uint64_t ) epoch.tv_nsec;If you would settle with keeping the time offset in microseconds, you would only need "
epoch_offset_usec".
ctf spec[1] uses offset_s and offset in clock definition. Storing both to avoid conversion in the future.
PATCH 7/32 eal/trace: create CTF TDSL metadata in memory
In reply to [email protected]From: Jerin Jacob <[email protected]>
Common trace format(CTF) defines the metadata[1][2] for trace events, This patch creates the metadata for the DPDK events in memory and latter this will be saved to trace directory on rte_trace_save() invocation.
[1] https://diamon.org/ctf/#specification
[2] https://diamon.org/ctf/#examples
--- lib/librte_eal/common/eal_common_trace.c | 11 +- lib/librte_eal/common/eal_common_trace_ctf.c | 302 +++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 7 + lib/librte_eal/common/meson.build | 1 + lib/librte_eal/freebsd/eal/Makefile | 1 + lib/librte_eal/linux/eal/Makefile | 1 + 6 files changed, 321 insertions(+), 2 deletions(-) create mode 100644 lib/librte_eal/common/eal_common_trace_ctf.c
lib/librte_eal/common/eal_common_trace.c +9 -2
@@ -55,18 +55,24 @@ eal_trace_init(void)/* Generate UUID ver 4 with total size of events and number of events */ trace_uuid_generate (); +/* Generate CTF TDSL metadata */ +if (trace_metadata_create ()) + goto fail; +/* Create trace directory */ if (trace_mkdir ()) - goto fail; + goto free_meta;/* Save current epoch timestamp for future use */ if (trace_epoch_time_save ()) - goto fail; + goto free_meta;rte_trace_global_mode_set (trace.mode);return 0 ; +free_meta: +trace_metadata_destroy (); fail:trace_err ("failed to initialize trace [%s]" ,rte_strerror (rte_errno));return -rte_errno;
@@ -77,6 +83,7 @@ eal_trace_fini(void) {if (rte_trace_global_is_disabled ())return ; +trace_metadata_destroy (); }bool
lib/librte_eal/common/eal_common_trace_ctf.c new file +302 -0
302 lines not on this page · raw message
lib/librte_eal/common/eal_trace.h +7 -0
@@ -42,6 +42,11 @@ struct trace {uint64_t epoch_sec;uint64_t epoch_nsec;uint64_t uptime_ticks; +char *ctf_meta; +uint32_t ctf_meta_offset_freq; +uint32_t ctf_meta_offset_freq_off_s; +uint32_t ctf_meta_offset_freq_off; +uint16_t ctf_fixup_done;rte_spinlock_t lock; };
@@ -63,6 +68,8 @@ struct trace_point_head *trace_list_head_get(void);/* Util functions */ bool trace_has_duplicate_entry (void );void trace_uuid_generate (void ); +int trace_metadata_create (void ); +void trace_metadata_destroy (void );int trace_mkdir (void );int trace_epoch_time_save (void );
lib/librte_eal/common/meson.build +1 -0
@@ -29,6 +29,7 @@ common_sources = files( 'eal_common_thread.c', 'eal_common_timer.c', 'eal_common_trace.c', + 'eal_common_trace_ctf.c', 'eal_common_trace_utils.c', 'eal_common_uuid.c', 'hotplug_mp.c',
lib/librte_eal/freebsd/eal/Makefile +1 -0
@@ -61,6 +61,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c +SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_ctf.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c
lib/librte_eal/linux/eal/Makefile +1 -0
@@ -69,6 +69,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_ctf.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c
Signature · 1 line
2.25.1
PATCH 8/32 eal/trace: handle CTF keyword collision
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Some of the keyword like align, event, "." and "->" etc will be used in CTF metadata syntax. This patch support for handling those keywords with DPDK events name.
--- lib/librte_eal/common/eal_common_trace_ctf.c | 119 +++++++++++++++++++ 1 file changed, 119 insertions(+)
lib/librte_eal/common/eal_common_trace_ctf.c +119 -0
@@ -215,12 +215,131 @@ meta_stream_emit(char **meta, int *offset)return meta_copy (meta, offset, str, rc); } +static void +string_fixed_replace (char *input,const char *search,const char *replace) +{ +char *found; +size_t len; + + found =strstr (input, search); +if (found ==NULL ) +return ; + +if (strlen (found) !=strlen (search)) +return ; + + len =strlen (replace); +memcpy (found, replace, len); + found[len] ='\0' ; +} + +static void +ctf_fixup_align (char *str) +{ +string_fixed_replace (str,"align" ,"_align" ); +} + +static void +ctf_fixup_arrow_deref (char *str) +{ +const char *replace ="_" ; +const char *search ="->" ; +char *found; +size_t len; + + found =strstr (str, search); +if (found ==NULL ) +return ; + +do { +memcpy (found, replace,strlen (replace)); + len =strlen (found +2 ); +memcpy (found +1 , found +2 , len); + found[len +1 ] ='\0' ; + found =strstr (str, search); + }while (found !=NULL ); +} + +static void +ctf_fixup_dot_deref (char *str) +{ +const char *replace ="_" ; +const char *search ="." ; +char *found; +size_t len; + + found =strstr (str, search); +if (found ==NULL ) +return ; + + len =strlen (replace); +do { +memcpy (found, replace, len); + found =strstr (str, search); + }while (found !=NULL ); +} + +static void +ctf_fixup_event (char *str) +{ +string_fixed_replace (str,"event" ,"_event" ); +} + +static int +ctf_fixup_keyword (char *str) +{ +char dup_str[TRACE_CTF_FIELD_SIZE ]; +char input[TRACE_CTF_FIELD_SIZE ]; +const char *delim =";" ; +char *from; +int len; + +if (str ==NULL ) +return 0 ; + + len =strlen (str); +if (len >=TRACE_CTF_FIELD_SIZE ) { +trace_err ("ctf_field reached its maximum limit" ); +return -EMSGSIZE ; + } + +/* Create duplicate string */ +strcpy (dup_str, str); + + len =0 ; + from =strtok (dup_str, delim); +while (from !=NULL ) { +strcpy (input, from); +ctf_fixup_align (input); +ctf_fixup_dot_deref (input); +ctf_fixup_arrow_deref (input); +ctf_fixup_event (input); + +strcpy (&input[strlen (input)], delim); +if ((len +strlen (input)) >=TRACE_CTF_FIELD_SIZE ) { +trace_err ("ctf_field reached its maximum limit" ); +return -EMSGSIZE ; + } + +strcpy (str + len, input); + len +=strlen (input); + from =strtok (NULL , delim); + } + +return 0 ; +} +static int meta_event_emit (char **meta,int *offset,struct trace_point *tp) {char *str =NULL ;int rc; +/* Fixup ctf field string in case it using reserved ctf keywords */ + rc =ctf_fixup_keyword (tp->ctf_field); +if (rc) +return rc; + rc =metadata_printf (&str,"event {\n" " id = %d;\n"
Signature · 1 line
2.25.1
PATCH 9/32 eal/trace: implement trace memory allocation
In reply to [email protected]From: Jerin Jacob <[email protected]>
Trace memory will be allocated per thread to enable lockless trace events updates to the memory. The allocator will first attempt to allocate from hugepage, if not available from hugepage then fallback to malloc memory.
Later in the patches series, This API will be hooked to DPDK fastpath and control plane thread creation API. It is possible for non DPDK thread to use trace events, in that case, trace memory will be allocated on the first event emission.
--- lib/librte_eal/common/eal_common_trace.c | 97 +++++++++++++++++++ .../common/eal_common_trace_utils.c | 20 ++++ lib/librte_eal/common/eal_trace.h | 29 ++++++ lib/librte_eal/common/include/rte_trace.h | 13 +++ .../common/include/rte_trace_provider.h | 19 ++++ lib/librte_eal/rte_eal_version.map | 2 + 6 files changed, 180 insertions(+)
lib/librte_eal/common/eal_common_trace.c +97 -0
@@ -16,6 +16,7 @@#include "eal_trace.h" RTE_DEFINE_PER_LCORE(volatile int, trace_point_sz); +RTE_DEFINE_PER_LCORE(void *, trace_mem);RTE_DEFINE_PER_LCORE (char, ctf_field[TRACE_CTF_FIELD_SIZE ]);RTE_DEFINE_PER_LCORE (int, ctf_count);
@@ -37,6 +38,9 @@ trace_list_head_get(void)int eal_trace_init (void ) { +/* Trace memory should start with 8B aligned for natural alignment */ +RTE_BUILD_BUG_ON ((offsetof(struct __rte_trace_header , mem) %8 ) !=0 ); +/* One of the Trace registration failed */ if (trace.register_errno) { rte_errno = trace.register_errno;
@@ -83,6 +87,7 @@ eal_trace_fini(void) {if (rte_trace_global_is_disabled ())return ; +trace_mem_per_thread_free ();trace_metadata_destroy (); }
@@ -333,6 +338,98 @@ rte_trace_from_name(const char *name)return NULL ; } +static inline size_t +list_sz (uint32_t index) +{ +return sizeof (struct thread_mem_meta ) * (index +1 ); +} + +void +__rte_trace_mem_per_thread_alloc (void ) +{ +struct trace *trace =trace_obj_get (); +struct __rte_trace_header *header; +uint32_t count; + +if (rte_trace_global_is_disabled ()) +return ; + +if (RTE_PER_LCORE (trace_mem)) +return ; + +rte_spinlock_lock (&trace->lock); + + count = trace->nb_trace_mem_list; + +/* Allocate room for storing the thread trace mem meta */ + trace->lcore_meta =realloc (trace->lcore_meta,list_sz (count)); + +/* Provide dummy space for fastpath to consume */ +if (trace->lcore_meta ==NULL ) { +trace_crit ("trace mem meta memory realloc failed" ); + header =NULL ; goto fail; + } + +/* First attempt from huge page */ + header =rte_malloc (NULL ,trace_mem_sz (trace->buff_len),8 ); +if (header) { + trace->lcore_meta[count].area =TRACE_AREA_HUGEPAGE ; + goto found; + } + +/* Second attempt from heap */ + header =malloc (trace_mem_sz (trace->buff_len)); +if (header ==NULL ) { +trace_crit ("trace mem malloc attempt failed" ); + header =NULL ; goto fail; + + } + +/* Second attempt from heap is success */ + trace->lcore_meta[count].area =TRACE_AREA_HEAP ; + +/* Initialize the trace header */ +found: + header->offset =0 ; + header->len = trace->buff_len; + header->stream_header.magic =TRACE_CTF_MAGIC ; +rte_uuid_copy (header->stream_header.uuid, trace->uuid); + header->stream_header.lcore_id =rte_lcore_id (); + +/* Store the thread name */ +char *name = header->stream_header.thread_name; +memset (name,0 , __RTE_TRACE_EMIT_STRING_LEN_MAX); +rte_thread_getname (pthread_self (), name, + __RTE_TRACE_EMIT_STRING_LEN_MAX); + + trace->lcore_meta[count].mem = header; + trace->nb_trace_mem_list++; +fail: +RTE_PER_LCORE (trace_mem) = header; +rte_spinlock_unlock (&trace->lock); +} + +void +trace_mem_per_thread_free (void ) +{ +struct trace *trace =trace_obj_get (); +uint32_t count; +void *mem; + +if (rte_trace_global_is_disabled ()) +return ; + +rte_spinlock_lock (&trace->lock); +for (count =0 ; count < trace->nb_trace_mem_list; count++) { + mem = trace->lcore_meta[count].mem; +if (trace->lcore_meta[count].area ==TRACE_AREA_HUGEPAGE ) +rte_free (mem); +else if (trace->lcore_meta[count].area ==TRACE_AREA_HEAP ) +free (mem); + } +rte_spinlock_unlock (&trace->lock); +} +int __rte_trace_point_register (rte_trace_t handle,const char *name,uint32_t level,void (*fn)(void ))
lib/librte_eal/common/eal_common_trace_utils.c +20 -0
@@ -14,6 +14,26 @@#include "eal_filesystem.h" #include "eal_trace.h" +const char * +trace_mode_to_string (enum rte_trace_mode_e mode) +{ +switch (mode) { +case RTE_TRACE_MODE_OVERWRITE :return "overwrite" ; +case RTE_TRACE_MODE_DISCARD :return "discard" ; +default :return "unknown" ; + } +} + +const char * +trace_area_to_string (enum trace_area_e area) +{ +switch (area) { +case TRACE_AREA_HEAP :return "heap" ; +case TRACE_AREA_HUGEPAGE :return "hugepage" ; +default :return "unknown" ; + } +} +static bool trace_entry_compare (const char *name) {
lib/librte_eal/common/eal_trace.h +29 -0
@@ -6,10 +6,15 @@#define __EAL_TRACE_H#include <rte_cycles.h> +#include <rte_log.h> +#include <rte_malloc.h> #include <rte_spinlock.h> #include <rte_trace.h> #include <rte_uuid.h> +#include "eal_private.h" +#include "eal_thread.h" + #define trace_err(fmt, args...)\ RTE_LOG(ERR, EAL, "%s():%u " fmt "\n",\ __func__, __LINE__, ## args)
@@ -22,6 +27,8 @@#define TRACE_DIR_STR_LEN (sizeof("YYYY-mm-dd-AM-HH-MM-SS") + TRACE_PREFIX_LEN)#define TRACE_CTF_FIELD_SIZE 384#define TRACE_POINT_NAME_SIZE 64 +#define TRACE_CTF_MAGIC 0xC1FC1FC1 +struct trace_point {STAILQ_ENTRY (trace_point) next;
@@ -30,6 +37,16 @@ struct trace_point {char ctf_field[TRACE_CTF_FIELD_SIZE ]; }; +enum trace_area_e { +TRACE_AREA_HEAP , +TRACE_AREA_HUGEPAGE , +}; + +struct thread_mem_meta { +void *mem; +enum trace_area_e area; +}; +struct trace {char dir[PATH_MAX ];int dir_offset;
@@ -37,8 +54,11 @@ struct trace {bool global_status;enum rte_trace_mode_e mode;rte_uuid_t uuid; +uint32_t buff_len;uint32_t level;uint32_t nb_trace_points; +uint32_t nb_trace_mem_list; +struct thread_mem_meta *lcore_meta;uint64_t epoch_sec;uint64_t epoch_nsec;uint64_t uptime_ticks;
@@ -58,6 +78,12 @@ trace_id_get(rte_trace_t trace) __RTE_TRACE_FIELD_ID_SHIFT; } +static inline size_t +trace_mem_sz (uint32_t len) +{ +return len +sizeof (struct __rte_trace_header ); +} +/* Trace object functions */ struct trace *trace_obj_get (void );
@@ -66,12 +92,15 @@ STAILQ_HEAD(trace_point_head, trace_point);struct trace_point_head *trace_list_head_get (void );/* Util functions */ +const char *trace_mode_to_string (enum rte_trace_mode_e mode); +const char *trace_area_to_string (enum trace_area_e area);bool trace_has_duplicate_entry (void );void trace_uuid_generate (void );int trace_metadata_create (void );void trace_metadata_destroy (void );int trace_mkdir (void );int trace_epoch_time_save (void ); +void trace_mem_per_thread_free (void );/* EAL interface */ int eal_trace_init (void );
lib/librte_eal/common/include/rte_trace.h +13 -0
@@ -518,6 +518,19 @@ _tp _args \#endif /* __DOXYGEN__ */ +/** @internal Macro to define maximum emit length of string datatype. */ +#define __RTE_TRACE_EMIT_STRING_LEN_MAX 32 + +/** +* @internal @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Allocate trace memory buffer per thread. +* +*/ +__rte_experimental +void __rte_trace_mem_per_thread_alloc(void); +/** * @internal @warning * @b EXPERIMENTAL: this API may change without prior notice
lib/librte_eal/common/include/rte_trace_provider.h +19 -0
@@ -9,6 +9,10 @@#ifndef _RTE_TRACE_PROVIDER_H_#define _RTE_TRACE_PROVIDER_H_ +#include <rte_per_lcore.h> +#include <rte_string_fns.h> +#include <rte_uuid.h> +#define __RTE_TRACE_EVENT_HEADER_ID_SHIFT (48)#define __RTE_TRACE_FIELD_ENABLE_MASK (1ULL << 63)
@@ -20,5 +24,20 @@#define __RTE_TRACE_FIELD_LEVEL_SHIFT (32)#define __RTE_TRACE_FIELD_LEVEL_MASK (0xffULL << __RTE_TRACE_FIELD_LEVEL_SHIFT) +struct __rte_trace_stream_header { +uint32_t magic; +rte_uuid_t uuid; +uint32_t lcore_id; +char thread_name[__RTE_TRACE_EMIT_STRING_LEN_MAX]; +} __rte_packed; + +struct __rte_trace_header { +uint32_t offset; +uint32_t len; +struct __rte_trace_stream_header stream_header; +uint8_t mem[]; +}; + +RTE_DECLARE_PER_LCORE(void *, trace_mem);#endif /* _RTE_TRACE_PROVIDER_H_ */
lib/librte_eal/rte_eal_version.map +2 -0
@@ -338,7 +338,9 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; + __rte_trace_mem_per_thread_alloc; __rte_trace_point_register; + per_lcore_trace_mem; rte_trace_global_is_enabled; rte_trace_global_is_disabled; rte_trace_is_id_invalid;
Signature · 1 line
2.25.1
PATCH 10/32 eal/trace: implement debug dump function
In reply to [email protected]From: Jerin Jacob <[email protected]>
Implement rte_trace_metadata_dump() and rte_trace_dump() functions. Former one used to dump the CTF metadata file and the latter one to dump all the registered events and its status.
--- lib/librte_eal/common/eal_common_log.c | 9 +-- lib/librte_eal/common/eal_common_trace.c | 63 ++++++++++++++++++ lib/librte_eal/common/eal_common_trace_ctf.c | 67 ++++++++++++++++++++ lib/librte_eal/common/eal_private.h | 3 + lib/librte_eal/rte_eal_version.map | 2 + 5 files changed, 140 insertions(+), 4 deletions(-)
lib/librte_eal/common/eal_common_log.c +5 -4
@@ -372,8 +372,8 @@ RTE_INIT_PRIO(rte_log_init, LOG) rte_logs.dynamic_types_len =RTE_LOGTYPE_FIRST_EXT_ID ; } -static const char * -loglevel_to_string (uint32_t level) +const char * +eal_loglevel_to_string (uint32_t level) {switch (level) {case 0 :return "disabled" ;
@@ -396,14 +396,15 @@ rte_log_dump(FILE *f)size_t i;fprintf (f,"global log level is %s\n" , -loglevel_to_string (rte_log_get_global_level ())); +eal_loglevel_to_string (rte_log_get_global_level ()));for (i =0 ; i < rte_logs.dynamic_types_len; i++) {if (rte_logs.dynamic_types[i].name ==NULL )continue ;fprintf (f,"id %zu: %s, level is %s\n" , i, rte_logs.dynamic_types[i].name, -loglevel_to_string (rte_logs.dynamic_types[i].loglevel)); +eal_loglevel_to_string ( + rte_logs.dynamic_types[i].loglevel)); } }
lib/librte_eal/common/eal_common_trace.c +63 -0
69 lines not on this page · raw message
lib/librte_eal/common/eal_common_trace_ctf.c +67 -0
70 lines not on this page · raw message
lib/librte_eal/common/eal_private.h +3 -0
@@ -443,4 +443,7 @@ rte_option_usage(void);uint64_t eal_get_baseaddr (void ); +const char * +eal_loglevel_to_string (uint32_t level); +#endif /* _EAL_PRIVATE_H_ */
lib/librte_eal/rte_eal_version.map +2 -0
@@ -359,4 +359,6 @@ EXPERIMENTAL { rte_trace_pattern; rte_trace_regexp; rte_trace_from_name; + rte_trace_metadata_dump; + rte_trace_dump; };
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 10/32] eal/trace: implement debug dump function
Quoted 25 lines
From: dev [mailto:[email protected]] On Behalf Of [email protected]
Sent: Wednesday, March 18, 2020 8:02 PMFrom: Jerin Jacob <[email protected]>
Implement
rte_trace_metadata_dump()andrte_trace_dump()functions. Former one used to dump the CTF metadata file and the latter one to dump all the registered events and its status.Signed-off-by Jerin Jacob <[email protected]>Signed-off-by Sunil Kumar Kori <[email protected]>--- lib/librte_eal/common/eal_common_log.c | 9 +-- lib/librte_eal/common/eal_common_trace.c | 63 ++++++++++++++++++ lib/librte_eal/common/eal_common_trace_ctf.c | 67 ++++++++++++++++++++ lib/librte_eal/common/eal_private.h | 3 + lib/librte_eal/rte_eal_version.map | 2 + 5 files changed, 140 insertions(+), 4 deletions(-)lib/librte_eal/common/eal_common_log.c +0
-0
lib/librte_eal/common/eal_common_log.c RTE_INIT_PRIO(rte_log_init, LOG) · line 376
Quoted 7 lines
lib/librte_eal/common/eal_common_log.c +2
-2@@ -372,8 +372,8 @@ RTE_INIT_PRIO(rte_log_init, LOG) rte_logs.dynamic_types_len =RTE_LOGTYPE_FIRST_EXT_ID ; } -static const char * -loglevel_to_string (uint32_t level) +const char * +eal_loglevel_to_string (uint32_t level)
Making this function public, rte_ is probably a better prefix than eal_.
There are some functions missing rte_ prefix in eal_private.h, but there's no need to add more.
-Morten
Re: [dpdk-dev] [PATCH v1 10/32] eal/trace: implement debug dump function
Quoted 29 lines · Morten Brørup
Quoted 29 lines
From: dev [mailto:[email protected]] On Behalf Of [email protected]
Sent: Wednesday, March 18, 2020 8:02 PMFrom: Jerin Jacob <[email protected]>
Implement
rte_trace_metadata_dump()andrte_trace_dump()functions. Former one used to dump the CTF metadata file and the latter one to dump all the registered events and its status.Signed-off-by Jerin Jacob <[email protected]>Signed-off-by Sunil Kumar Kori <[email protected]>--- lib/librte_eal/common/eal_common_log.c | 9 +-- lib/librte_eal/common/eal_common_trace.c | 63 ++++++++++++++++++ lib/librte_eal/common/eal_common_trace_ctf.c | 67 ++++++++++++++++++++ lib/librte_eal/common/eal_private.h | 3 + lib/librte_eal/rte_eal_version.map | 2 + 5 files changed, 140 insertions(+), 4 deletions(-)lib/librte_eal/common/eal_common_log.c +0
-0@@ -372,8 +372,8 @@ RTE_INIT_PRIO(rte_log_init, LOG) rte_logs.dynamic_types_len =RTE_LOGTYPE_FIRST_EXT_ID ; }
Quoted 6 lines
lib/librte_eal/common/eal_common_log.c RTE_INIT_PRIO(rte_log_init, LOG) · line 376
Quoted 4 lines
lib/librte_eal/common/eal_common_log.c +2
-2-static const char * -loglevel_to_string (uint32_t level) +const char * +eal_loglevel_to_string (uint32_t level)Making this function public,
rte_is probably a better prefix thaneal_.
Not making it as public function(i.e not updated in .map file). It is an EAL private function, whose scope is limited only to the EAL library.
Quoted 4 lines
There are some functions missing
rte_prefix ineal_private.h, but there's no need to add more.-Morten
PATCH 11/32 eal/trace: implement trace save
In reply to [email protected]From: Jerin Jacob <[email protected]>
Implement rte_trace_save(), which will save the metadata file and trace memory snapshot to the trace directory.
--- .../common/eal_common_trace_utils.c | 75 +++++++++++++++++++ lib/librte_eal/rte_eal_version.map | 1 + 2 files changed, 76 insertions(+)
lib/librte_eal/common/eal_common_trace_utils.c +75 -0
@@ -213,3 +213,78 @@ trace_mkdir(void)return 0 ; } +static int +trace_meta_save (struct trace *trace) +{ +char file_name[PATH_MAX ]; +FILE *f; +int rc; + + rc =snprintf (file_name,PATH_MAX ,"%s/metadata" , trace->dir); +if (rc <0 ) +return rc; + + f =fopen (file_name,"w" ); +if (f ==NULL ) +return -errno; + + rc =rte_trace_metadata_dump (f); + +fclose (f); +return rc; +} + + +static inline int +trace_file_sz (struct __rte_trace_header *hdr) +{ +return sizeof (struct __rte_trace_stream_header ) + hdr->offset; +} + +static int +trace_mem_save (struct trace *trace,struct __rte_trace_header *hdr, +uint32_t cnt) +{ +char file_name[PATH_MAX ]; +FILE *f; +int rc; + + rc =snprintf (file_name,PATH_MAX ,"%s/channel0_%d" , trace->dir, cnt); +if (rc <0 ) +return rc; + + f =fopen (file_name,"w" ); +if (f ==NULL ) +return -errno; + + rc =fwrite (&hdr->stream_header,trace_file_sz (hdr),1 , f); +fclose (f); + +return rc ==1 ?0 : -EACCES ; +} + +int +rte_trace_save (void ) +{ +struct trace *trace =trace_obj_get (); +struct __rte_trace_header *header; +uint32_t count; +int rc =0 ; + +if (trace->nb_trace_mem_list ==0 ) +return rc; + + rc =trace_meta_save (trace); +if (rc) +return rc; + +rte_spinlock_lock (&trace->lock); +for (count =0 ; count < trace->nb_trace_mem_list; count++) { + header = trace->lcore_meta[count].mem; + rc =trace_mem_save (trace, header, count); +if (rc) +break ; + } +rte_spinlock_unlock (&trace->lock); +return rc; +}
lib/librte_eal/rte_eal_version.map +1 -0
@@ -358,6 +358,7 @@ EXPERIMENTAL { rte_trace_mode_get; rte_trace_pattern; rte_trace_regexp; + rte_trace_save; rte_trace_from_name; rte_trace_metadata_dump; rte_trace_dump;
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 11/32] eal/trace: implement trace save
Quoted 27 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
Implement
rte_trace_save(), which will save the metadata file and trace memory snapshot to the trace directory.Signed-off-by Jerin Jacob <[email protected]>--- .../common/eal_common_trace_utils.c | 75 +++++++++++++++++++ lib/librte_eal/rte_eal_version.map | 1 + 2 files changed, 76 insertions(+)lib/librte_eal/common/eal_common_trace_utils.c +8
-0@@ -213,3 +213,78 @@ trace_mkdir(void)return 0 ; } +static int +trace_meta_save (struct trace *trace) +{ +char file_name[PATH_MAX ]; +FILE *f; +int rc; + + rc =snprintf (file_name,PATH_MAX ,"%s/metadata" , trace->dir);
lib/librte_eal/common/eal_common_trace_utils.c trace_mkdir(void) · line 233
Quoted 10 lines
lib/librte_eal/common/eal_common_trace_utils.c +10
-0+if (rc <0 ) +return rc; + + f =fopen (file_name,"w" ); +if (f ==NULL ) +return -errno; + + rc =rte_trace_metadata_dump (f); + +fclose (f);
Check fclose() return code.
Quoted 18 lines
lib/librte_eal/common/eal_common_trace_utils.c +18
-0+return rc; +} + + +static inline int +trace_file_sz (struct __rte_trace_header *hdr) +{ +return sizeof (struct __rte_trace_stream_header ) + hdr->offset; +} + +static int +trace_mem_save (struct trace *trace,struct __rte_trace_header *hdr, +uint32_t cnt) +{ +char file_name[PATH_MAX ]; +FILE *f; +int rc; +
lib/librte_eal/common/eal_common_trace_utils.c trace_mkdir(void) · line 261
Quoted 10 lines
lib/librte_eal/common/eal_common_trace_utils.c +10
-0+ rc =snprintf (file_name,PATH_MAX ,"%s/channel0_%d" , trace->dir, cnt); +if (rc <0 ) +return rc; + + f =fopen (file_name,"w" ); +if (f ==NULL ) +return -errno; + + rc =fwrite (&hdr->stream_header,trace_file_sz (hdr),1 , f); +fclose (f);
Again, check return code.
Quoted 41 lines
lib/librte_eal/common/eal_common_trace_utils.c +29
-0+ +return rc ==1 ?0 : -EACCES ; +} + +int +rte_trace_save (void ) +{ +struct trace *trace =trace_obj_get (); +struct __rte_trace_header *header; +uint32_t count; +int rc =0 ; + +if (trace->nb_trace_mem_list ==0 ) +return rc; + + rc =trace_meta_save (trace); +if (rc) +return rc; + +rte_spinlock_lock (&trace->lock); +for (count =0 ; count < trace->nb_trace_mem_list; count++) { + header = trace->lcore_meta[count].mem; + rc =trace_mem_save (trace, header, count); +if (rc) +break ; + } +rte_spinlock_unlock (&trace->lock); +return rc; +}lib/librte_eal/rte_eal_version.map +1
-0@@ -358,6 +358,7 @@ EXPERIMENTAL { rte_trace_mode_get; rte_trace_pattern; rte_trace_regexp; + rte_trace_save; rte_trace_from_name; rte_trace_metadata_dump; rte_trace_dump;
Re: [dpdk-dev] [PATCH v1 11/32] eal/trace: implement trace save
Quoted 15 lines · Mattias Rönnblom
Quoted 13 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
lib/librte_eal/common/eal_common_trace_utils.c +11
-0+static int +trace_meta_save (struct trace *trace) +{ +char file_name[PATH_MAX ]; +FILE *f; +int rc; + + rc =snprintf (file_name,PATH_MAX ,"%s/metadata" , trace->dir); +if (rc <0 ) +return rc; +
Quoted 8 lines
lib/librte_eal/common/eal_common_trace_utils.c trace_mkdir(void) · line 233
Quoted 7 lines
lib/librte_eal/common/eal_common_trace_utils.c +7
-0+ f =fopen (file_name,"w" ); +if (f ==NULL ) +return -errno; + + rc =rte_trace_metadata_dump (f); + +fclose (f);Check
fclose()return code.
Ack. Will fix it v2.
Quoted 21 lines
Quoted 21 lines
lib/librte_eal/common/eal_common_trace_utils.c +21
-0+return rc; +} + + +static inline int +trace_file_sz (struct __rte_trace_header *hdr) +{ +return sizeof (struct __rte_trace_stream_header ) + hdr->offset; +} + +static int +trace_mem_save (struct trace *trace,struct __rte_trace_header *hdr, +uint32_t cnt) +{ +char file_name[PATH_MAX ]; +FILE *f; +int rc; + + rc =snprintf (file_name,PATH_MAX ,"%s/channel0_%d" , trace->dir, cnt); +if (rc <0 ) +return rc;
Quoted 8 lines
lib/librte_eal/common/eal_common_trace_utils.c trace_mkdir(void) · line 261
Quoted 7 lines
lib/librte_eal/common/eal_common_trace_utils.c +7
-0+ + f =fopen (file_name,"w" ); +if (f ==NULL ) +return -errno; + + rc =fwrite (&hdr->stream_header,trace_file_sz (hdr),1 , f); +fclose (f);Again, check return code.
Ack. Will fix it v2.
PATCH 12/32 eal/trace: implement registration payload
In reply to [email protected]From: Jerin Jacob <[email protected]>
The trace function payloads such as rte_trace_ctf_* have dual functions. The first to emit the payload for the registration function and the second one to act as trace memory emitters.
When it used as registration payload, it will do the following to fulfill the registration job.
- Find out the size of the event
- Generate metadata field string using __rte_trace_emit_ctf_field().
--- lib/librte_eal/common/eal_common_trace.c | 19 +++++++ lib/librte_eal/common/include/rte_trace.h | 20 ++++++++ .../common/include/rte_trace_register.h | 50 +++++++++++++++++++ lib/librte_eal/rte_eal_version.map | 2 + 4 files changed, 91 insertions(+)
lib/librte_eal/common/eal_common_trace.c +19 -0
@@ -493,6 +493,25 @@ trace_mem_per_thread_free(void)rte_spinlock_unlock (&trace->lock); } +void +__rte_trace_emit_ctf_field (size_t sz,const char *in,const char *datatype) +{ +char *field =RTE_PER_LCORE (ctf_field); +int count =RTE_PER_LCORE (ctf_count); +int rc; + +RTE_PER_LCORE (trace_point_sz) += sz; + rc =snprintf (RTE_PTR_ADD (field, count), +RTE_MAX (0 ,TRACE_CTF_FIELD_SIZE -1 - count), +"%s %s;" , datatype, in); +if (rc <=0 ) { +RTE_PER_LCORE (trace_point_sz) =0 ; +trace_crit ("CTF field is too long" ); +return ; + } +RTE_PER_LCORE (ctf_count) += rc; +} +int __rte_trace_point_register (rte_trace_t handle,const char *name,uint32_t level,void (*fn)(void ))
lib/librte_eal/common/include/rte_trace.h +20 -0
@@ -520,6 +520,8 @@ _tp _args \/** @internal Macro to define maximum emit length of string datatype. */ #define __RTE_TRACE_EMIT_STRING_LEN_MAX 32 +/** @internal Macro to define event header size. */ +#define __RTE_TRACE_EVENT_HEADER_SZ sizeof(uint64_t)/** * @internal @warning
@@ -553,6 +555,24 @@ void __rte_trace_mem_per_thread_alloc(void);__rte_experimental int __rte_trace_point_register(rte_trace_t trace, const char *name,uint32_t level,void (*fn)(void )); +/** +* @internal @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Helper function to emit ctf field. +* +* @param sz +* The tracepoint size. +* @param field +* The name of the trace event. +* @param type +* The datatype of the trace event as string. +* @return +* - 0: Success. +* - <0: Failure. +*/ +__rte_experimental +void __rte_trace_emit_ctf_field(size_t sz, const char *field, const char *type);#ifdef RTE_TRACE_POINT_REGISTER_SELECT #include <rte_trace_register.h>
lib/librte_eal/common/include/rte_trace_register.h +50 -0
60 lines not on this page · raw message
lib/librte_eal/rte_eal_version.map +2 -0
@@ -339,7 +339,9 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; __rte_trace_mem_per_thread_alloc; + __rte_trace_emit_ctf_field; __rte_trace_point_register; + per_lcore_trace_point_sz; per_lcore_trace_mem; rte_trace_global_is_enabled; rte_trace_global_is_disabled;
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 12/32] eal/trace: implement registration payload
Quoted 102 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
The trace function payloads such as rte_trace_ctf_* have dual functions. The first to emit the payload for the registration function and the second one to act as trace memory emitters.
When it used as registration payload, it will do the following to fulfill the registration job.
- Find out the size of the event
- Generate metadata field string using__rte_trace_emit_ctf_field().Signed-off-by Jerin Jacob <[email protected]>Signed-off-by Sunil Kumar Kori <[email protected]>--- lib/librte_eal/common/eal_common_trace.c | 19 +++++++ lib/librte_eal/common/include/rte_trace.h | 20 ++++++++ .../common/include/rte_trace_register.h | 50 +++++++++++++++++++ lib/librte_eal/rte_eal_version.map | 2 + 4 files changed, 91 insertions(+)lib/librte_eal/common/eal_common_trace.c +19
-0@@ -493,6 +493,25 @@ trace_mem_per_thread_free(void)rte_spinlock_unlock (&trace->lock); } +void +__rte_trace_emit_ctf_field (size_t sz,const char *in,const char *datatype) +{ +char *field =RTE_PER_LCORE (ctf_field); +int count =RTE_PER_LCORE (ctf_count); +int rc; + +RTE_PER_LCORE (trace_point_sz) += sz; + rc =snprintf (RTE_PTR_ADD (field, count), +RTE_MAX (0 ,TRACE_CTF_FIELD_SIZE -1 - count), +"%s %s;" , datatype, in); +if (rc <=0 ) { +RTE_PER_LCORE (trace_point_sz) =0 ; +trace_crit ("CTF field is too long" ); +return ; + } +RTE_PER_LCORE (ctf_count) += rc; +} +int __rte_trace_point_register (rte_trace_t handle,const char *name,uint32_t level,void (*fn)(void ))lib/librte_eal/common/include/rte_trace.h +20
-0@@ -520,6 +520,8 @@ _tp _args \/** @internal Macro to define maximum emit length of string datatype. */ #define __RTE_TRACE_EMIT_STRING_LEN_MAX 32 +/** @internal Macro to define event header size. */ +#define __RTE_TRACE_EVENT_HEADER_SZ sizeof(uint64_t)/** * @internal @warning @@ -553,6 +555,24 @@ void __rte_trace_mem_per_thread_alloc(void);__rte_experimental int __rte_trace_point_register(rte_trace_t trace, const char *name,uint32_t level,void (*fn)(void )); +/** +* @internal @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Helper function to emit ctf field. +* +* @param sz +* The tracepoint size. +* @param field +* The name of the trace event. +* @param type +* The datatype of the trace event as string. +* @return +* - 0: Success. +* - <0: Failure. +*/ +__rte_experimental +void __rte_trace_emit_ctf_field(size_t sz, const char *field, const char *type);#ifdef RTE_TRACE_POINT_REGISTER_SELECT #include <rte_trace_register.h> lib/librte_eal/common/include/rte_trace_register.h +1
-0@@ -10,6 +10,7 @@#define _RTE_TRACE_REGISTER_H_#include <rte_per_lcore.h> +#include <rte_log.h> RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz);@@ -17,4 +18,53 @@ RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); __rte_trace_point_register(&__##trace, RTE_STR(name),\
lib/librte_eal/common/include/rte_trace_register.h RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); · line 28
Quoted 10 lines
lib/librte_eal/common/include/rte_trace_register.h +8
-0RTE_LOG_ ## level, (void (*)(void)) trace) +#define __rte_trace_emit_header_generic (t)\ + RTE_PER_LCORE(trace_point_sz) = __RTE_TRACE_EVENT_HEADER_SZ + +#define __rte_trace_emit_header_dp (t) __rte_trace_emit_header_generic(t) + +#define rte_trace_ctf_u64 (in)\ + RTE_BUILD_BUG_ON(sizeof(uint64_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(uint64_t), RTE_STR(in), "uint64_t")
Delegate to a generic macro, to which you pass the type and the "in" parameter.
Quoted 56 lines
lib/librte_eal/common/include/rte_trace_register.h +41
-0+#define rte_trace_ctf_i64 (in)\ + RTE_BUILD_BUG_ON(sizeof(int64_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(int64_t), RTE_STR(in), "int64_t") +#define rte_trace_ctf_u32 (in)\ + RTE_BUILD_BUG_ON(sizeof(uint32_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(uint32_t), RTE_STR(in), "uint32_t") +#define rte_trace_ctf_i32 (in)\ + RTE_BUILD_BUG_ON(sizeof(int32_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(int32_t), RTE_STR(in), "int32_t") +#define rte_trace_ctf_u16 (in)\ + RTE_BUILD_BUG_ON(sizeof(uint16_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(uint16_t), RTE_STR(in), "uint16_t") +#define rte_trace_ctf_i16 (in)\ + RTE_BUILD_BUG_ON(sizeof(int16_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(int16_t), RTE_STR(in), "int16_t") +#define rte_trace_ctf_u8 (in)\ + RTE_BUILD_BUG_ON(sizeof(uint8_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(uint8_t), RTE_STR(in), "uint8_t") +#define rte_trace_ctf_i8 (in)\ + RTE_BUILD_BUG_ON(sizeof(int8_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(int8_t), RTE_STR(in), "int8_t") +#define rte_trace_ctf_int (in)\ + RTE_BUILD_BUG_ON(sizeof(int) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(int), RTE_STR(in), "int32_t") +#define rte_trace_ctf_long (in)\ + RTE_BUILD_BUG_ON(sizeof(long) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(long), RTE_STR(in), "long") +#define rte_trace_ctf_float (in)\ + RTE_BUILD_BUG_ON(sizeof(float) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(float), RTE_STR(in), "float") +#define rte_trace_ctf_double (in)\ + RTE_BUILD_BUG_ON(sizeof(double) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(double), RTE_STR(in), "double") +#define rte_trace_ctf_ptr (in)\ + RTE_BUILD_BUG_ON(sizeof(void *) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(void *), RTE_STR(in), "uintptr_t") +#define rte_trace_ctf_string (in)\ + RTE_SET_USED(in);\ + __rte_trace_emit_ctf_field(__RTE_TRACE_EMIT_STRING_LEN_MAX,\ + RTE_STR(in)"[32]", "string_bounded_t") +#endif /* _RTE_TRACE_REGISTER_H_ */ lib/librte_eal/rte_eal_version.map +2
-0@@ -339,7 +339,9 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; __rte_trace_mem_per_thread_alloc; + __rte_trace_emit_ctf_field; __rte_trace_point_register; + per_lcore_trace_point_sz; per_lcore_trace_mem; rte_trace_global_is_enabled; rte_trace_global_is_disabled;
Re: [dpdk-dev] [PATCH v1 12/32] eal/trace: implement registration payload
Quoted 5 lines · Mattias Rönnblom
Quoted 2 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
Quoted 7 lines
lib/librte_eal/common/include/rte_trace_register.h RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); · line 28
Quoted 4 lines
lib/librte_eal/common/include/rte_trace_register.h +4
-0+ +#define rte_trace_ctf_u64 (in)\ + RTE_BUILD_BUG_ON(sizeof(uint64_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(uint64_t), RTE_STR(in), "uint64_t")Delegate to a generic macro, to which you pass the type and the "in" parameter.
Not delegated to have a generic patch to catch the following error in compile time.
uint32_t val = 12;
rte_trace_ctf_u64(val)
Re: [dpdk-dev] [PATCH v1 12/32] eal/trace: implement registration payload
Quoted 11 lines · Jerin Jacob
Quoted 9 lines · Mattias Rönnblom
lib/librte_eal/common/include/rte_trace_register.h RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); · line 28
Quoted 6 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
lib/librte_eal/common/include/rte_trace_register.h +4
-0+ +#define rte_trace_ctf_u64 (in)\ + RTE_BUILD_BUG_ON(sizeof(uint64_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(uint64_t), RTE_STR(in), "uint64_t")Delegate to a generic macro, to which you pass the type and the "in" parameter.
Quoted 6 lines
Not delegated to have a generic patch to catch the following error in compile time.
uint32_tval = 12;
rte_trace_ctf_u64(val)
If you pass the type as I suggested, is there something preventing generating exactly the same code as the non-delegating macros?
#define __rte_trace_cft(in, in_type) \
RTE_BUILD_BUG_ON(sizeof(in_type), != sizeof(typeof(in)));
__rte_trace_emit_cft_field(sizeof(in_type), RTE_STR(in),RTE_STR(in_type))
#define rte_trace_cft_u64(in) \
__rte_trace_ctf(in, uint64_t)
Re: [dpdk-dev] [PATCH v1 12/32] eal/trace: implement registration payload
Quoted 26 lines · Mattias Rönnblom
Quoted 11 lines · Jerin Jacob
Quoted 9 lines · Mattias Rönnblom
lib/librte_eal/common/include/rte_trace_register.h RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); · line 28
Quoted 6 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
lib/librte_eal/common/include/rte_trace_register.h +4
-0+ +#define rte_trace_ctf_u64 (in)\ + RTE_BUILD_BUG_ON(sizeof(uint64_t) != sizeof(typeof(in)));\ + __rte_trace_emit_ctf_field(sizeof(uint64_t), RTE_STR(in), "uint64_t")Delegate to a generic macro, to which you pass the type and the "in" parameter.
Quoted 6 lines
Not delegated to have a generic patch to catch the following error in compile time.
uint32_tval = 12;
rte_trace_ctf_u64(val)If you pass the type as I suggested, is there something preventing generating exactly the same code as the non-delegating macros?
#define
__rte_trace_cft(in, in_type)\
Quoted 8 lines
RTE_BUILD_BUG_ON(sizeof(in_type), != sizeof(typeof(in))); __rte_trace_emit_cft_field(sizeof(in_type), RTE_STR(in),
RTE_STR(in_type))#define
rte_trace_cft_u64(in)\__rte_trace_ctf(in, uint64_t)
This will work. I will change to this scheme in v2.
Quoted 2 lines
PATCH 13/32 eal/trace: implement provider payload
In reply to [email protected]From: Jerin Jacob <[email protected]>
The trace function payloads such as rte_trace_ctf_* have dual functions. The first to emit the payload for the registration function and the second one to act as trace mem emitters aka provider payload.
When it used as provider payload, those function copy the trace field to trace memory based on the tracing mode.
--- .../common/include/rte_trace_provider.h | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+)
lib/librte_eal/common/include/rte_trace_provider.h +87 -0
@@ -9,6 +9,9 @@#ifndef _RTE_TRACE_PROVIDER_H_#define _RTE_TRACE_PROVIDER_H_ +#include <rte_branch_prediction.h> +#include <rte_cycles.h> +#include <rte_log.h> #include <rte_per_lcore.h> #include <rte_string_fns.h> #include <rte_uuid.h>
@@ -40,4 +43,88 @@ struct __rte_trace_header { RTE_DECLARE_PER_LCORE(void *, trace_mem); +static __rte_always_inline void* +__rte_trace_mem_get (uint64_t in) +{ +struct __rte_trace_header *trace =RTE_PER_LCORE (trace_mem); +const uint16_t sz = in & __RTE_TRACE_FIELD_SIZE_MASK; + +/* Trace memory is not initialized for this thread */ +if (unlikely (trace ==NULL )) { +__rte_trace_mem_per_thread_alloc (); + trace =RTE_PER_LCORE (trace_mem); +if (unlikely (trace ==NULL )) +return NULL ; + } +/* Check the wrap around case */ +uint32_t offset = trace->offset; +if (unlikely ((offset + sz) >= trace->len)) { +/* Disable the trace event if it in DISCARD mode */ +if (unlikely (in & __RTE_TRACE_FIELD_ENABLE_DISCARD)) +return NULL ; + + offset =0 ; + } +/* Align to event header size */ + offset =RTE_ALIGN_CEIL (offset, __RTE_TRACE_EVENT_HEADER_SZ); +void *mem =RTE_PTR_ADD (&trace->mem[0 ], offset); + offset += sz; + trace->offset = offset; + +return mem; +} + +static __rte_always_inline void* +__rte_trace_emit_ev_header (void *mem,uint64_t in) +{ +uint64_t val; + +/* Event header [63:0] = id [63:48] | timestamp [47:0] */ + val =rte_get_tsc_cycles () & + ~(0xffffULL << __RTE_TRACE_EVENT_HEADER_ID_SHIFT); + val |= ((in & __RTE_TRACE_FIELD_ID_MASK) << + (__RTE_TRACE_EVENT_HEADER_ID_SHIFT - __RTE_TRACE_FIELD_ID_SHIFT)); + + *(uint64_t *)mem = val; +return RTE_PTR_ADD (mem, __RTE_TRACE_EVENT_HEADER_SZ); +} + +#define __rte_trace_emit_header_generic (t)\ + const uint64_t val = __atomic_load_n(t, __ATOMIC_ACQUIRE);\ + if (likely(!(val & __RTE_TRACE_FIELD_ENABLE_MASK)))\ + return;\ + void *mem = __rte_trace_mem_get(val);\ + if (unlikely(mem == NULL)) \ + return;\ + mem = __rte_trace_emit_ev_header(mem, val) + +#define __rte_trace_emit_header_dp (t)\ + if (!rte_trace_is_dp_enabled())\ + return;\ + __rte_trace_emit_header_generic(t); + +#define __rte_trace_emit_datatype (in)\ + memcpy(mem, &(in), sizeof(in));\ + mem = RTE_PTR_ADD(mem, sizeof(in)) + +#define rte_trace_ctf_u64 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_i64 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_u32 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_i32 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_u16 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_i16 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_u8 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_i8 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_int (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_long (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_float (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_ptr (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_double (in) __rte_trace_emit_datatype(in) + +#define rte_trace_ctf_string (in)\ + if (unlikely(in == NULL))\ + return;\ + rte_strscpy(mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX);\ + mem = RTE_PTR_ADD(mem, __RTE_TRACE_EMIT_STRING_LEN_MAX) +#endif /* _RTE_TRACE_PROVIDER_H_ */
Signature · 1 line
2.25.1
Re: [dpdk-dev] [PATCH v1 13/32] eal/trace: implement provider payload
Quoted 89 lines · On 2020-03-18 20:02, [email protected] wrote:
From: Jerin Jacob <[email protected]>
The trace function payloads such as rte_trace_ctf_* have dual functions. The first to emit the payload for the registration function and the second one to act as trace mem emitters aka provider payload.
When it used as provider payload, those function copy the trace field to trace memory based on the tracing mode.
Signed-off-by Jerin Jacob <[email protected]>Signed-off-by Sunil Kumar Kori <[email protected]>--- .../common/include/rte_trace_provider.h | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+)lib/librte_eal/common/include/rte_trace_provider.h +58
-0@@ -9,6 +9,9 @@#ifndef _RTE_TRACE_PROVIDER_H_#define _RTE_TRACE_PROVIDER_H_ +#include <rte_branch_prediction.h> +#include <rte_cycles.h> +#include <rte_log.h> #include <rte_per_lcore.h> #include <rte_string_fns.h> #include <rte_uuid.h> @@ -40,4 +43,88 @@ struct __rte_trace_header { RTE_DECLARE_PER_LCORE(void *, trace_mem); +static __rte_always_inline void* +__rte_trace_mem_get (uint64_t in) +{ +struct __rte_trace_header *trace =RTE_PER_LCORE (trace_mem); +const uint16_t sz = in & __RTE_TRACE_FIELD_SIZE_MASK; + +/* Trace memory is not initialized for this thread */ +if (unlikely (trace ==NULL )) { +__rte_trace_mem_per_thread_alloc (); + trace =RTE_PER_LCORE (trace_mem); +if (unlikely (trace ==NULL )) +return NULL ; + } +/* Check the wrap around case */ +uint32_t offset = trace->offset; +if (unlikely ((offset + sz) >= trace->len)) { +/* Disable the trace event if it in DISCARD mode */ +if (unlikely (in & __RTE_TRACE_FIELD_ENABLE_DISCARD)) +return NULL ; + + offset =0 ; + } +/* Align to event header size */ + offset =RTE_ALIGN_CEIL (offset, __RTE_TRACE_EVENT_HEADER_SZ); +void *mem =RTE_PTR_ADD (&trace->mem[0 ], offset); + offset += sz; + trace->offset = offset; + +return mem; +} + +static __rte_always_inline void* +__rte_trace_emit_ev_header (void *mem,uint64_t in) +{ +uint64_t val; + +/* Event header [63:0] = id [63:48] | timestamp [47:0] */ + val =rte_get_tsc_cycles () & + ~(0xffffULL << __RTE_TRACE_EVENT_HEADER_ID_SHIFT); + val |= ((in & __RTE_TRACE_FIELD_ID_MASK) << + (__RTE_TRACE_EVENT_HEADER_ID_SHIFT - __RTE_TRACE_FIELD_ID_SHIFT)); + + *(uint64_t *)mem = val; +return RTE_PTR_ADD (mem, __RTE_TRACE_EVENT_HEADER_SZ); +} + +#define __rte_trace_emit_header_generic (t)\ + const uint64_t val = __atomic_load_n(t, __ATOMIC_ACQUIRE);\ + if (likely(!(val & __RTE_TRACE_FIELD_ENABLE_MASK)))\ + return;\ + void *mem = __rte_trace_mem_get(val);\ + if (unlikely(mem == NULL)) \ + return;\ + mem = __rte_trace_emit_ev_header(mem, val) +
lib/librte_eal/common/include/rte_trace_provider.h struct __rte_trace_header { · line 110
Quoted 10 lines
lib/librte_eal/common/include/rte_trace_provider.h +10
-0+#define __rte_trace_emit_header_dp (t)\ + if (!rte_trace_is_dp_enabled())\ + return;\ + __rte_trace_emit_header_generic(t); + +#define __rte_trace_emit_datatype (in)\ + memcpy(mem, &(in), sizeof(in));\ + mem = RTE_PTR_ADD(mem, sizeof(in)) + +#define rte_trace_ctf_u64 (in) __rte_trace_emit_datatype(in)
Would it be worth to do a type check here? To avoid having someone do something like:
uint32_t v = 42;
rte_trace_ctf_u64(v);
which would spew out a 32-bit number, where there should be 64 bits.
Or maybe better: do an assignment, allowing type conversion (promotion at least), and type-checking, of sorts. The macro-generated code could look something like:
do {
uint64_t _in = in;
__rte_trace_emit_datatype(_in);
} while (0)
If you add a type parameter to __rte_trace_emit_datatype(), it can do the job.
Quoted 4 lines
lib/librte_eal/common/include/rte_trace_provider.h +4
-0+#define rte_trace_ctf_i64 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_u32 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_i32 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_u16 (in) __rte_trace_emit_datatype(in)
lib/librte_eal/common/include/rte_trace_provider.h struct __rte_trace_header { · line 124
Quoted 10 lines
lib/librte_eal/common/include/rte_trace_provider.h +10
-0+#define rte_trace_ctf_i16 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_u8 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_i8 (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_int (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_long (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_float (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_ptr (in) __rte_trace_emit_datatype(in) +#define rte_trace_ctf_double (in) __rte_trace_emit_datatype(in) + +#define rte_trace_ctf_string (in)\
Add the usual do { /../ } while (0) here?
Quoted 6 lines
lib/librte_eal/common/include/rte_trace_provider.h +5
-0+if (unlikely (in ==NULL ))\ +return ;\ +rte_strscpy (mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX);\ + mem = RTE_PTR_ADD(mem, __RTE_TRACE_EMIT_STRING_LEN_MAX) +#endif /* _RTE_TRACE_PROVIDER_H_ */
Re: [dpdk-dev] [PATCH v1 13/32] eal/trace: implement provider payload
On Fri, Mar 20, 2020 at 12:58 AM Mattias Rönnblom
<[email protected]> wrote:
Thanks for the review.
Quoted 15 lines · On 2020-03-18 20:02, [email protected] wrote:
Review
Quoted 9 lines
From: Jerin Jacob <[email protected]>
The trace function payloads such as rte_trace_ctf_* have dual functions. The first to emit the payload for the registration function and the second one to act as trace mem emitters aka provider payload.
(quoted diff) +2
-0+ +#define rte_trace_ctf_u64(in) __rte_trace_emit_datatype(in)Would it be worth to do a type check here? To avoid having someone do something like:
Quoted 5 lines
uint32_tv = 42;
rte_trace_ctf_u64(v);which would spew out a 32-bit number, where there should be 64 bits.
It is taken care with the register version of this macro by adding RTE_BUILD_BUG_ON.
http://patches.dpdk.org/patch/66861/
See:
#define rte_trace_ctf_i64(in)\
RTE_BUILD_BUG_ON(sizeof(int64_t) != sizeof(typeof(in)));\
__rte_trace_emit_ctf_field(sizeof(int64_t), RTE_STR(in), "int64_t")Quoted 13 lines
Or maybe better: do an assignment, allowing type conversion (promotion at least), and type-checking, of sorts. The macro-generated code could look something like:
do {
uint64_t _in = in; __rte_trace_emit_datatype(_in);} while (0)
Quoted 7 lines
If you add a type parameter to
__rte_trace_emit_datatype(), it can do the job.Review
Quoted 2 lines
(quoted diff) +2
-0+ +#define rte_trace_ctf_string(in)\Add the usual do { /../ } while (0) here?
Ack. Will add it in the place where do { /../ } while (0) can be added in v2.
Quoted 8 lines
Quoted 6 lines
lib/librte_eal/common/include/rte_trace_provider.h +5
-0+if (unlikely (in ==NULL ))\ +return ;\ +rte_strscpy (mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX);\ + mem = RTE_PTR_ADD(mem, __RTE_TRACE_EMIT_STRING_LEN_MAX) +#endif /* _RTE_TRACE_PROVIDER_H_ */
PATCH 14/32 eal/trace: hook internal trace APIs to Linux
In reply to [email protected]From: Jerin Jacob <[email protected]>
Connect the internal trace interface API to Linux EAL.
--- lib/librte_eal/common/eal_common_thread.c | 3 ++- lib/librte_eal/linux/eal/eal.c | 9 +++++++++ lib/librte_eal/linux/eal/eal_thread.c | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-)
lib/librte_eal/common/eal_common_thread.c +2 -1
@@ -15,6 +15,7 @@#include <rte_lcore.h> #include <rte_memory.h> #include <rte_log.h> +#include <rte_trace.h> #include "eal_internal_cfg.h" #include "eal_private.h"
@@ -161,7 +162,7 @@ static void *rte_thread_init(void *arg)pthread_barrier_destroy (¶ms->configured);free (params); } - +__rte_trace_mem_per_thread_alloc ();return start_routine (routine_arg); }
lib/librte_eal/linux/eal/eal.c +9 -0
@@ -58,6 +58,7 @@#include "eal_filesystem.h" #include "eal_hugepages.h" #include "eal_memcfg.h" +#include "eal_trace.h" #include "eal_options.h" #include "eal_vfio.h" #include "hotplug_mp.h"
@@ -1012,6 +1013,12 @@ rte_eal_init(int argc, char **argv)return -1 ; } +if (eal_trace_init () <0 ) { +rte_eal_init_alert ("Cannot init trace" ); + rte_errno =EFAULT ; +return -1 ; + } +if (eal_option_device_parse ()) { rte_errno =ENODEV ;rte_atomic32_clear (&run_once);
@@ -1327,6 +1334,8 @@ rte_eal_cleanup(void)rte_memseg_walk (mark_freeable,NULL );rte_service_finalize ();rte_mp_channel_cleanup (); +rte_trace_save (); +eal_trace_fini ();eal_cleanup_config (&internal_config);return 0 ; }
lib/librte_eal/linux/eal/eal_thread.c +3 -0
@@ -20,6 +20,7 @@#include <rte_per_lcore.h> #include <rte_eal.h> #include <rte_lcore.h> +#include <rte_trace.h> #include "eal_private.h" #include "eal_thread.h"
@@ -124,6 +125,8 @@ eal_thread_loop(__attribute__((unused)) void *arg)RTE_LOG (DEBUG ,EAL ,"lcore %u is ready (tid=%zx;cpuset=[%s%s])\n" , lcore_id, (uintptr_t )thread_id, cpuset, ret ==0 ?"" :"..." ); +__rte_trace_mem_per_thread_alloc (); +/* read on our pipe to get commands */ while (1 ) {void *fct_arg;
Signature · 1 line
2.25.1
PATCH 15/32 eal/trace: hook internal trace APIs to FreeBSD
In reply to [email protected]From: Jerin Jacob <[email protected]>
Connect the internal trace interface API to FreeBSD EAL.
--- lib/librte_eal/freebsd/eal/eal.c | 10 ++++++++++ lib/librte_eal/freebsd/eal/eal_thread.c | 3 +++ 2 files changed, 13 insertions(+)
lib/librte_eal/freebsd/eal/eal.c +10 -0
@@ -52,6 +52,7 @@#include "eal_hugepages.h" #include "eal_options.h" #include "eal_memcfg.h" +#include "eal_trace.h" #define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
@@ -751,6 +752,13 @@ rte_eal_init(int argc, char **argv)return -1 ; } +if (eal_trace_init () <0 ) { +rte_eal_init_alert ("Cannot init trace" ); + rte_errno =EFAULT ; +rte_atomic32_clear (&run_once); +return -1 ; + } +if (eal_option_device_parse ()) { rte_errno =ENODEV ;rte_atomic32_clear (&run_once);
@@ -966,6 +974,8 @@ rte_eal_cleanup(void) {rte_service_finalize ();rte_mp_channel_cleanup (); +rte_trace_save (); +eal_trace_fini ();eal_cleanup_config (&internal_config);return 0 ; }
lib/librte_eal/freebsd/eal/eal_thread.c +3 -0
@@ -20,6 +20,7 @@#include <rte_per_lcore.h> #include <rte_eal.h> #include <rte_lcore.h> +#include <rte_trace.h> #include "eal_private.h" #include "eal_thread.h"
@@ -124,6 +125,8 @@ eal_thread_loop(__attribute__((unused)) void *arg)RTE_LOG (DEBUG ,EAL ,"lcore %u is ready (tid=%p;cpuset=[%s%s])\n" , lcore_id, thread_id, cpuset, ret ==0 ?"" :"..." ); +__rte_trace_mem_per_thread_alloc (); +/* read on our pipe to get commands */ while (1 ) {void *fct_arg;
Signature · 1 line
2.25.1
PATCH 16/32 eal/trace: add generic tracepoints
In reply to [email protected]From: Jerin Jacob <[email protected]>
This patch creates the following generic tracepoint for generic tracing when there is no dedicated tracepoint is available.
rte_trace_lib_eal_generic_void()rte_trace_lib_eal_generic_u64()rte_trace_lib_eal_generic_u32()rte_trace_lib_eal_generic_u16()rte_trace_lib_eal_generic_u8()rte_trace_lib_eal_generic_i64()rte_trace_lib_eal_generic_i32()rte_trace_lib_eal_generic_i16()rte_trace_lib_eal_generic_i8()rte_trace_lib_eal_generic_int()rte_trace_lib_eal_generic_long()rte_trace_lib_eal_generic_float()rte_trace_lib_eal_generic_double()rte_trace_lib_eal_generic_ptr()rte_trace_lib_eal_generic_str()
For example, if an application wishes to emit an int datatype, it can call rte_trace_lib_eal_generic_int(val) to emit the trace.
--- lib/librte_eal/common/Makefile | 2 +- .../common/eal_common_trace_points.c | 60 +++++++++ lib/librte_eal/common/include/rte_trace_eal.h | 122 ++++++++++++++++++ lib/librte_eal/common/meson.build | 2 + lib/librte_eal/freebsd/eal/Makefile | 1 + lib/librte_eal/linux/eal/Makefile | 1 + lib/librte_eal/rte_eal_version.map | 17 +++ 7 files changed, 204 insertions(+), 1 deletion(-) create mode 100644 lib/librte_eal/common/eal_common_trace_points.c create mode 100644 lib/librte_eal/common/include/rte_trace_eal.h
lib/librte_eal/common/Makefile +1 -1
@@ -9,7 +9,7 @@ INC += rte_debug.h rte_eal.h rte_eal_interrupts.h INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h -INC += rte_trace.h rte_trace_provider.h rte_trace_register.h +INC += rte_trace.h rte_trace_eal.h rte_trace_provider.h rte_trace_register.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h INC += rte_string_fns.h rte_version.h INC += rte_eal_memconfig.h
lib/librte_eal/common/eal_common_trace_points.c new file +60 -0
60 lines not on this page · raw message
lib/librte_eal/common/include/rte_trace_eal.h new file +122 -0
122 lines not on this page · raw message
lib/librte_eal/common/meson.build +2 -0
@@ -30,6 +30,7 @@ common_sources = files( 'eal_common_timer.c', 'eal_common_trace.c', 'eal_common_trace_ctf.c', + 'eal_common_trace_points.c', 'eal_common_trace_utils.c', 'eal_common_uuid.c', 'hotplug_mp.c',
@@ -88,6 +89,7 @@ common_headers = files( 'include/rte_string_fns.h', 'include/rte_tailq.h', 'include/rte_trace.h', + 'include/rte_trace_eal.h', 'include/rte_trace_provider.h', 'include/rte_trace_register.h', 'include/rte_time.h',
lib/librte_eal/freebsd/eal/Makefile +1 -0
@@ -62,6 +62,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_ctf.c +SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_points.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c
lib/librte_eal/linux/eal/Makefile +1 -0
@@ -70,6 +70,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_ctf.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_points.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c
lib/librte_eal/rte_eal_version.map +17 -0
@@ -364,4 +364,21 @@ EXPERIMENTAL { rte_trace_from_name; rte_trace_metadata_dump; rte_trace_dump; + + __rte_trace_lib_eal_generic_void; + __rte_trace_lib_eal_generic_u64; + __rte_trace_lib_eal_generic_u32; + __rte_trace_lib_eal_generic_u16; + __rte_trace_lib_eal_generic_u8; + __rte_trace_lib_eal_generic_i64; + __rte_trace_lib_eal_generic_i32; + __rte_trace_lib_eal_generic_i16; + __rte_trace_lib_eal_generic_i8; + __rte_trace_lib_eal_generic_int; + __rte_trace_lib_eal_generic_long; + __rte_trace_lib_eal_generic_float; + __rte_trace_lib_eal_generic_double; + __rte_trace_lib_eal_generic_ptr; + __rte_trace_lib_eal_generic_str; + __rte_trace_lib_eal_generic_func; };
Signature · 1 line
2.25.1
PATCH 17/32 eal/trace: add alarm tracepoints
In reply to [email protected]From: Jerin Jacob <[email protected]>
Add following alarm related trace points.
rte_trace_lib_eal_alarm_set()rte_trace_lib_eal_alarm_cancel()
--- .../common/eal_common_trace_points.c | 9 +++++++++ lib/librte_eal/common/include/rte_trace_eal.h | 18 ++++++++++++++++++ lib/librte_eal/freebsd/eal/eal_alarm.c | 3 +++ lib/librte_eal/linux/eal/eal_alarm.c | 4 ++++ lib/librte_eal/rte_eal_version.map | 2 ++ 5 files changed, 36 insertions(+)
lib/librte_eal/common/eal_common_trace_points.c +9 -0
@@ -23,6 +23,9 @@ RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_generic_ptr);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_generic_str);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_generic_func); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_alarm_set); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_alarm_cancel); +RTE_INIT (eal_trace_init) { RTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_generic_void,
@@ -57,4 +60,10 @@ RTE_INIT(eal_trace_init) lib.eal.generic.string, INFO);RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_generic_func, lib.eal.generic.func,INFO ); + +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_alarm_set, + lib.eal.alarm.set,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_alarm_cancel, + lib.eal.alarm.cancel,INFO ); + }
lib/librte_eal/common/include/rte_trace_eal.h +18 -0
@@ -15,6 +15,7 @@extern "C" {#endif +#include <rte_alarm.h> #include <rte_trace.h> /* Generic */
@@ -115,6 +116,23 @@ RTE_TRACE_POINT(#define RTE_TRACE_LIB_EAL_GENERIC_FUNC rte_trace_lib_eal_generic_func(__func__) +/* Alarm */ +RTE_TRACE_POINT ( + rte_trace_lib_eal_alarm_set, + RTE_TRACE_POINT_ARGS(uint64_t us, rte_eal_alarm_callback cb_fn, + void *cb_arg, int rc), + rte_trace_ctf_u64(us); rte_trace_ctf_ptr(cb_fn); +rte_trace_ctf_ptr (cb_arg);rte_trace_ctf_int (rc); +) + +RTE_TRACE_POINT ( + rte_trace_lib_eal_alarm_cancel, + RTE_TRACE_POINT_ARGS(rte_eal_alarm_callback cb_fn, void *cb_arg, + int count), + rte_trace_ctf_ptr(cb_fn); rte_trace_ctf_ptr(cb_arg); +rte_trace_ctf_int (count); +) + #ifdef __cplusplus }#endif
lib/librte_eal/freebsd/eal/eal_alarm.c +3 -0
@@ -17,6 +17,7 @@#include <rte_errno.h> #include <rte_interrupts.h> #include <rte_spinlock.h> +#include <rte_trace_eal.h> #include "eal_private.h" #include "eal_alarm_private.h"
@@ -223,6 +224,7 @@ rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg)rte_spinlock_unlock (&alarm_list_lk); +rte_trace_lib_eal_alarm_set (us, cb_fn, cb_arg, ret);return ret; }
@@ -310,5 +312,6 @@ rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn, void *cb_arg)rte_spinlock_unlock (&alarm_list_lk); +rte_trace_lib_eal_alarm_cancel (cb_fn, cb_arg, count);return count; }
lib/librte_eal/linux/eal/eal_alarm.c +4 -0
@@ -20,6 +20,8 @@#include <rte_lcore.h> #include <rte_errno.h> #include <rte_spinlock.h> +#include <rte_trace_eal.h> +#include <eal_private.h> #ifndef TFD_NONBLOCK
@@ -172,6 +174,7 @@ rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg) }rte_spinlock_unlock (&alarm_list_lk); +rte_trace_lib_eal_alarm_set (us, cb_fn, cb_arg, ret);return ret; }
@@ -240,5 +243,6 @@ rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn, void *cb_arg)else if (err) rte_errno = err; +rte_trace_lib_eal_alarm_cancel (cb_fn, cb_arg, count);return count; }
lib/librte_eal/rte_eal_version.map +2 -0
@@ -381,4 +381,6 @@ EXPERIMENTAL { __rte_trace_lib_eal_generic_ptr; __rte_trace_lib_eal_generic_str; __rte_trace_lib_eal_generic_func; + __rte_trace_lib_eal_alarm_set; + __rte_trace_lib_eal_alarm_cancel; };
Signature · 1 line
2.25.1
PATCH 18/32 eal/trace: add memory tracepoints
In reply to [email protected]From: Jerin Jacob <[email protected]>
Add the following memory-related tracepoints.
rte_trace_lib_eal_mem_zmalloc;rte_trace_lib_eal_mem_malloc;rte_trace_lib_eal_mem_realloc;rte_trace_lib_eal_mem_free;
rte_malloc() and rte_free() has been used in the trace implementation, in order to avoid tracing implementation specific events, added an internal no trace version rte_malloc() and rte_free().
--- lib/librte_eal/common/eal_common_trace.c | 4 +- .../common/eal_common_trace_points.c | 14 +++++ lib/librte_eal/common/eal_private.h | 5 ++ lib/librte_eal/common/include/rte_trace_eal.h | 33 ++++++++++ lib/librte_eal/common/rte_malloc.c | 60 ++++++++++++++++--- lib/librte_eal/rte_eal_version.map | 4 ++ 6 files changed, 109 insertions(+), 11 deletions(-)
lib/librte_eal/common/eal_common_trace.c +2 -2
@@ -434,7 +434,7 @@ __rte_trace_mem_per_thread_alloc(void) }/* First attempt from huge page */ - header =rte_malloc (NULL ,trace_mem_sz (trace->buff_len),8 ); + header =eal_malloc_no_trace (NULL ,trace_mem_sz (trace->buff_len),8 );if (header) { trace->lcore_meta[count].area =TRACE_AREA_HUGEPAGE ; goto found;
@@ -486,7 +486,7 @@ trace_mem_per_thread_free(void)for (count =0 ; count < trace->nb_trace_mem_list; count++) { mem = trace->lcore_meta[count].mem;if (trace->lcore_meta[count].area ==TRACE_AREA_HUGEPAGE ) -rte_free (mem); +eal_free_no_trace (mem);else if (trace->lcore_meta[count].area ==TRACE_AREA_HEAP )free (mem); }
lib/librte_eal/common/eal_common_trace_points.c +14 -0
@@ -26,6 +26,11 @@ RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_generic_func);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_alarm_set);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_alarm_cancel); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_mem_zmalloc); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_mem_malloc); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_mem_realloc); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_mem_free); +RTE_INIT (eal_trace_init) { RTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_generic_void,
@@ -66,4 +71,13 @@ RTE_INIT(eal_trace_init)RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_alarm_cancel, lib.eal.alarm.cancel,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_mem_zmalloc, + lib.eal.mem.zmalloc,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_mem_malloc, + lib.eal.mem.malloc,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_mem_realloc, + lib.eal.mem.realloc,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_mem_free, + lib.eal.mem.free,INFO ); + }
lib/librte_eal/common/eal_private.h +5 -0
@@ -446,4 +446,9 @@ eal_get_baseaddr(void);const char *eal_loglevel_to_string (uint32_t level); +void * +eal_malloc_no_trace (const char *type,size_t size,unsigned int align); + +void eal_free_no_trace (void *addr); +#endif /* _EAL_PRIVATE_H_ */
lib/librte_eal/common/include/rte_trace_eal.h +33 -0
@@ -133,6 +133,39 @@ RTE_TRACE_POINT(rte_trace_ctf_int (count); ) +/* Memory */ +RTE_TRACE_POINT ( + rte_trace_lib_eal_mem_zmalloc, + RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align, + int socket, void *ptr), + rte_trace_ctf_string(type); rte_trace_ctf_long(size); +rte_trace_ctf_u32 (align),rte_trace_ctf_int (socket); +rte_trace_ctf_ptr (ptr); +) + +RTE_TRACE_POINT ( + rte_trace_lib_eal_mem_malloc, + RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align, + int socket, void *ptr), + rte_trace_ctf_string(type); rte_trace_ctf_long(size); +rte_trace_ctf_u32 (align),rte_trace_ctf_int (socket); +rte_trace_ctf_ptr (ptr); +) + +RTE_TRACE_POINT ( + rte_trace_lib_eal_mem_realloc, + RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, + int socket, void *ptr), + rte_trace_ctf_long(size); rte_trace_ctf_u32(align), +rte_trace_ctf_int (socket);rte_trace_ctf_ptr (ptr); +) + +RTE_TRACE_POINT( + rte_trace_lib_eal_mem_free, + RTE_TRACE_POINT_ARGS(void *ptr), + rte_trace_ctf_ptr(ptr); +) + #ifdef __cplusplus }#endif
lib/librte_eal/common/rte_malloc.c +51 -9
105 lines not on this page · raw message
lib/librte_eal/rte_eal_version.map +4 -0
@@ -383,4 +383,8 @@ EXPERIMENTAL { __rte_trace_lib_eal_generic_func; __rte_trace_lib_eal_alarm_set; __rte_trace_lib_eal_alarm_cancel; + __rte_trace_lib_eal_mem_zmalloc; + __rte_trace_lib_eal_mem_malloc; + __rte_trace_lib_eal_mem_realloc; + __rte_trace_lib_eal_mem_free; };
Signature · 1 line
2.25.1
PATCH 19/32 eal/trace: add memzone tracepoints
In reply to [email protected]From: Jerin Jacob <[email protected]>
Add the following memzone related tracepoints.
rte_trace_lib_eal_memzone_reserverte_trace_lib_eal_memzone_lookuprte_trace_lib_eal_memzone_free
--- lib/librte_eal/common/eal_common_memzone.c | 9 +++++++ .../common/eal_common_trace_points.c | 10 +++++++ lib/librte_eal/common/include/rte_trace_eal.h | 26 +++++++++++++++++++ lib/librte_eal/rte_eal_version.map | 3 +++ 4 files changed, 48 insertions(+)
lib/librte_eal/common/eal_common_memzone.c +9 -0
@@ -19,6 +19,7 @@#include <rte_errno.h> #include <rte_string_fns.h> #include <rte_common.h> +#include <rte_trace_eal.h> #include "malloc_heap.h" #include "malloc_elem.h"
@@ -201,6 +202,9 @@ rte_memzone_reserve_thread_safe(const char *name, size_t len, int socket_id, mz =memzone_reserve_aligned_thread_unsafe ( name, len, socket_id, flags, align, bound); +rte_trace_lib_eal_memzone_reserve (name, len, socket_id, flags, align, + bound, mz); +rte_rwlock_write_unlock (&mcfg->mlock);return mz;
@@ -246,6 +250,7 @@ rte_memzone_reserve(const char *name, size_t len, int socket_id,int rte_memzone_free (const struct rte_memzone *mz) { +char name[RTE_MEMZONE_NAMESIZE ];struct rte_mem_config *mcfg;struct rte_fbarray *arr;struct rte_memzone *found_mz;
@@ -256,6 +261,7 @@ rte_memzone_free(const struct rte_memzone *mz)if (mz ==NULL )return -EINVAL ; +rte_strlcpy (name, mz->name,RTE_MEMZONE_NAMESIZE ); mcfg =rte_eal_get_configuration ()->mem_config; arr = &mcfg->memzones;
@@ -280,6 +286,8 @@ rte_memzone_free(const struct rte_memzone *mz)if (addr !=NULL )rte_free (addr); +rte_trace_lib_eal_memzone_free (name, addr, ret); +return ret; }
@@ -300,6 +308,7 @@ rte_memzone_lookup(const char *name)rte_rwlock_read_unlock (&mcfg->mlock); +rte_trace_lib_eal_memzone_lookup (name, memzone);return memzone; }
lib/librte_eal/common/eal_common_trace_points.c +10 -0
@@ -31,6 +31,10 @@ RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_mem_malloc);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_mem_realloc);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_mem_free); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_memzone_reserve); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_memzone_lookup); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_memzone_free); +RTE_INIT (eal_trace_init) { RTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_generic_void,
@@ -80,4 +84,10 @@ RTE_INIT(eal_trace_init)RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_mem_free, lib.eal.mem.free,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_memzone_reserve, + lib.eal.memzone.reserve,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_memzone_lookup, + lib.eal.memzone.lookup,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_memzone_free, + lib.eal.memzone.free,INFO ); }
lib/librte_eal/common/include/rte_trace_eal.h +26 -0
@@ -166,6 +166,32 @@ RTE_TRACE_POINT(rte_trace_ctf_ptr (ptr); ) +/* Memzone */ +RTE_TRACE_POINT ( + rte_trace_lib_eal_memzone_reserve, + RTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id, + unsigned int flags, unsigned int align, + unsigned int bound, const void *mz), + rte_trace_ctf_string(name); rte_trace_ctf_long(len); +rte_trace_ctf_int (socket_id);rte_trace_ctf_u32 (flags); +rte_trace_ctf_u32 (align);rte_trace_ctf_u32 (bound); +rte_trace_ctf_ptr (mz); +) + +RTE_TRACE_POINT ( + rte_trace_lib_eal_memzone_lookup, + RTE_TRACE_POINT_ARGS(const char *name, const void *memzone), + rte_trace_ctf_string(name); rte_trace_ctf_ptr(memzone); +) + +RTE_TRACE_POINT ( + rte_trace_lib_eal_memzone_free, + RTE_TRACE_POINT_ARGS(const char *name, void *addr, int rc), + rte_trace_ctf_string(name); rte_trace_ctf_ptr(addr); +rte_trace_ctf_int (rc); +) + + #ifdef __cplusplus }#endif
lib/librte_eal/rte_eal_version.map +3 -0
@@ -387,4 +387,7 @@ EXPERIMENTAL { __rte_trace_lib_eal_mem_malloc; __rte_trace_lib_eal_mem_realloc; __rte_trace_lib_eal_mem_free; + __rte_trace_lib_eal_memzone_reserve; + __rte_trace_lib_eal_memzone_lookup; + __rte_trace_lib_eal_memzone_free; };
Signature · 1 line
2.25.1
PATCH 20/32 eal/trace: add thread tracepoints
In reply to [email protected]From: Jerin Jacob <[email protected]>
Add the following thread related tracepoints.
rte_trace_lib_eal_thread_remote_launch;rte_trace_lib_eal_thread_lcore_ready;
--- lib/librte_eal/common/eal_common_trace_points.c | 9 +++++++++ lib/librte_eal/common/include/rte_trace_eal.h | 14 ++++++++++++++ lib/librte_eal/freebsd/eal/eal_thread.c | 11 ++++++++--- lib/librte_eal/linux/eal/eal_thread.c | 11 ++++++++--- lib/librte_eal/rte_eal_version.map | 2 ++ 5 files changed, 41 insertions(+), 6 deletions(-)
lib/librte_eal/common/eal_common_trace_points.c +9 -0
@@ -35,6 +35,9 @@ RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_memzone_reserve);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_memzone_lookup);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_memzone_free); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_thread_remote_launch); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_thread_lcore_ready); +RTE_INIT (eal_trace_init) { RTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_generic_void,
@@ -90,4 +93,10 @@ RTE_INIT(eal_trace_init) lib.eal.memzone.lookup, INFO);RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_memzone_free, lib.eal.memzone.free,INFO ); + +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_thread_remote_launch, + lib.eal.thread.remote.launch,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_thread_lcore_ready, + lib.eal.thread.lcore.ready,INFO ); + }
lib/librte_eal/common/include/rte_trace_eal.h +14 -0
@@ -191,6 +191,20 @@ RTE_TRACE_POINT(rte_trace_ctf_int (rc); ) +/* Thread */ +RTE_TRACE_POINT ( + rte_trace_lib_eal_thread_remote_launch, + RTE_TRACE_POINT_ARGS(int (*f)(void *), void *arg, + unsigned int slave_id, int rc), + rte_trace_ctf_ptr(f); rte_trace_ctf_ptr(arg); +rte_trace_ctf_u32 (slave_id);rte_trace_ctf_int (rc); +) +RTE_TRACE_POINT ( + rte_trace_lib_eal_thread_lcore_ready, + RTE_TRACE_POINT_ARGS(unsigned int lcore_id, const char *cpuset), + rte_trace_ctf_u32(lcore_id); rte_trace_ctf_string(cpuset); +) + #ifdef __cplusplus }
lib/librte_eal/freebsd/eal/eal_thread.c +8 -3
@@ -20,7 +20,7 @@#include <rte_per_lcore.h> #include <rte_eal.h> #include <rte_lcore.h> -#include <rte_trace.h> +#include <rte_trace_eal.h> #include "eal_private.h" #include "eal_thread.h"
@@ -41,9 +41,10 @@ rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)char c =0 ;int m2s = lcore_config[slave_id].pipe_master2slave[1 ];int s2m = lcore_config[slave_id].pipe_slave2master[0 ]; +int rc = -EBUSY ;if (lcore_config[slave_id].state !=WAIT ) -return -EBUSY ; + goto finish; lcore_config[slave_id].f = f; lcore_config[slave_id].arg = arg;
@@ -63,7 +64,10 @@ rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)if (n <=0 )rte_panic ("cannot read on configuration pipe\n" ); -return 0 ; + rc =0 ; +finish: +rte_trace_lib_eal_thread_remote_launch (f, arg, slave_id, rc); +return rc; }/* set affinity for current thread */
@@ -126,6 +130,7 @@ eal_thread_loop(__attribute__((unused)) void *arg) lcore_id, thread_id, cpuset, ret == 0 ? "" : "...");__rte_trace_mem_per_thread_alloc (); +rte_trace_lib_eal_thread_lcore_ready (lcore_id, cpuset);/* read on our pipe to get commands */ while (1 ) {
lib/librte_eal/linux/eal/eal_thread.c +8 -3
@@ -20,7 +20,7 @@#include <rte_per_lcore.h> #include <rte_eal.h> #include <rte_lcore.h> -#include <rte_trace.h> +#include <rte_trace_eal.h> #include "eal_private.h" #include "eal_thread.h"
@@ -41,9 +41,10 @@ rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)char c =0 ;int m2s = lcore_config[slave_id].pipe_master2slave[1 ];int s2m = lcore_config[slave_id].pipe_slave2master[0 ]; +int rc = -EBUSY ;if (lcore_config[slave_id].state !=WAIT ) -return -EBUSY ; + goto finish; lcore_config[slave_id].f = f; lcore_config[slave_id].arg = arg;
@@ -63,7 +64,10 @@ rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)if (n <=0 )rte_panic ("cannot read on configuration pipe\n" ); -return 0 ; + rc =0 ; +finish: +rte_trace_lib_eal_thread_remote_launch (f, arg, slave_id, rc); +return rc; }/* set affinity for current EAL thread */
@@ -126,6 +130,7 @@ eal_thread_loop(__attribute__((unused)) void *arg) lcore_id, (uintptr_t)thread_id, cpuset, ret == 0 ? "" : "...");__rte_trace_mem_per_thread_alloc (); +rte_trace_lib_eal_thread_lcore_ready (lcore_id, cpuset);/* read on our pipe to get commands */ while (1 ) {
lib/librte_eal/rte_eal_version.map +2 -0
@@ -390,4 +390,6 @@ EXPERIMENTAL { __rte_trace_lib_eal_memzone_reserve; __rte_trace_lib_eal_memzone_lookup; __rte_trace_lib_eal_memzone_free; + __rte_trace_lib_eal_thread_remote_launch; + __rte_trace_lib_eal_thread_lcore_ready; };
Signature · 1 line
2.25.1
PATCH 21/32 eal/trace: add interrupt tracepoints
In reply to [email protected]From: Jerin Jacob <[email protected]>
Add the following interrupt related tracepoints.
rte_trace_lib_eal_intr_callback_register;rte_trace_lib_eal_intr_callback_unregister;rte_trace_lib_eal_intr_enable;rte_trace_lib_eal_intr_disable;
--- .../common/eal_common_trace_points.c | 13 +++ lib/librte_eal/common/include/rte_trace_eal.h | 34 ++++++++ lib/librte_eal/freebsd/eal/eal_interrupts.c | 52 ++++++++---- lib/librte_eal/linux/eal/eal_interrupts.c | 84 ++++++++++++------- lib/librte_eal/rte_eal_version.map | 4 + 5 files changed, 139 insertions(+), 48 deletions(-)
lib/librte_eal/common/eal_common_trace_points.c +13 -0
@@ -38,6 +38,11 @@ RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_memzone_free);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_thread_remote_launch);RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_thread_lcore_ready); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_intr_callback_register); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_intr_callback_unregister); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_intr_enable); +RTE_TRACE_POINT_DEFINE (rte_trace_lib_eal_intr_disable); +RTE_INIT (eal_trace_init) { RTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_generic_void,
@@ -99,4 +104,12 @@ RTE_INIT(eal_trace_init)RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_thread_lcore_ready, lib.eal.thread.lcore.ready,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_intr_callback_register, + lib.eal.intr.register,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_intr_callback_unregister, + lib.eal.intr.unregister,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_intr_enable, + lib.eal.intr.enable,INFO ); +RTE_TRACE_POINT_REGISTER (rte_trace_lib_eal_intr_disable, + lib.eal.intr.disable,INFO ); }
lib/librte_eal/common/include/rte_trace_eal.h +34 -0
@@ -16,6 +16,7 @@ extern "C" {#endif #include <rte_alarm.h> +#include <rte_interrupts.h> #include <rte_trace.h> /* Generic */
@@ -205,6 +206,39 @@ RTE_TRACE_POINT(rte_trace_ctf_u32 (lcore_id);rte_trace_ctf_string (cpuset); ) +/* Interrupt */ +RTE_TRACE_POINT ( + rte_trace_lib_eal_intr_callback_register, + RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, + rte_intr_callback_fn cb, void *cb_arg, int rc), + rte_trace_ctf_int(rc); rte_trace_ctf_int(handle->vfio_dev_fd); +rte_trace_ctf_int (handle->fd);rte_trace_ctf_int (handle->type); +rte_trace_ctf_u32 (handle->max_intr);rte_trace_ctf_u32 (handle->nb_efd); +rte_trace_ctf_ptr (cb);rte_trace_ctf_ptr (cb_arg); +) +RTE_TRACE_POINT ( + rte_trace_lib_eal_intr_callback_unregister, + RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, + rte_intr_callback_fn cb, void *cb_arg, int rc), + rte_trace_ctf_int(rc); rte_trace_ctf_int(handle->vfio_dev_fd); +rte_trace_ctf_int (handle->fd);rte_trace_ctf_int (handle->type); +rte_trace_ctf_u32 (handle->max_intr);rte_trace_ctf_u32 (handle->nb_efd); +rte_trace_ctf_ptr (cb);rte_trace_ctf_ptr (cb_arg); +) +RTE_TRACE_POINT ( + rte_trace_lib_eal_intr_enable, + RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc), + rte_trace_ctf_int(rc); rte_trace_ctf_int(handle->vfio_dev_fd); +rte_trace_ctf_int (handle->fd);rte_trace_ctf_int (handle->type); +rte_trace_ctf_u32 (handle->max_intr);rte_trace_ctf_u32 (handle->nb_efd); +) +RTE_TRACE_POINT ( + rte_trace_lib_eal_intr_disable, + RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc), + rte_trace_ctf_int(rc); rte_trace_ctf_int(handle->vfio_dev_fd); +rte_trace_ctf_int (handle->fd);rte_trace_ctf_int (handle->type); +rte_trace_ctf_u32 (handle->max_intr);rte_trace_ctf_u32 (handle->nb_efd); +) #ifdef __cplusplus }
lib/librte_eal/freebsd/eal/eal_interrupts.c +35 -17
114 lines not on this page · raw message
lib/librte_eal/linux/eal/eal_interrupts.c +53 -31
187 lines not on this page · raw message
lib/librte_eal/rte_eal_version.map +4 -0
@@ -392,4 +392,8 @@ EXPERIMENTAL { __rte_trace_lib_eal_memzone_free; __rte_trace_lib_eal_thread_remote_launch; __rte_trace_lib_eal_thread_lcore_ready; + __rte_trace_lib_eal_intr_callback_register; + __rte_trace_lib_eal_intr_callback_unregister; + __rte_trace_lib_eal_intr_enable; + __rte_trace_lib_eal_intr_disable; };
Signature · 1 line
2.25.1
PATCH 22/32 eal/trace: add trace level configuration parameter
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Trace library exposes --trace-level EAL parameter to configure global and trace point specific level.
--- doc/guides/linux_gsg/eal_args.include.rst | 19 ++++ lib/librte_eal/common/eal_common_options.c | 19 +++- lib/librte_eal/common/eal_common_trace.c | 10 ++ .../common/eal_common_trace_utils.c | 104 ++++++++++++++++++ lib/librte_eal/common/eal_options.h | 2 + lib/librte_eal/common/eal_private.h | 3 + lib/librte_eal/common/eal_trace.h | 11 +- 7 files changed, 166 insertions(+), 2 deletions(-)
doc/guides/linux_gsg/eal_args.include.rst +19 -0
@@ -136,6 +136,25 @@ Debugging options Can be specified multiple times. +* ``--trace-level=<val> | <*type*:val> | <type, val>`` + + Specify trace level for global or specific component, based on pattern or + regular expression matching. For example: + + Global trace level configuration:: + + --trace-level=8 + + Global trace level configuration for EAL only using pattern match:: + + --trace-level=*eal*:8 + + Global trace level configuration for EAL only using regexp match:: + + --trace-level=eal,8 + + Can be specified multiple times up to 32 times. + Other options ~~~~~~~~~~~~~
lib/librte_eal/common/eal_common_options.c +18 -1
@@ -34,6 +34,7 @@#include "eal_options.h" #include "eal_filesystem.h" #include "eal_private.h" +#include "eal_trace.h" #define BITS_PER_HEX 4#define LCORE_OPT_LST 1
@@ -67,6 +68,7 @@ eal_long_options[] = { {OPT_IOVA_MODE, 1, NULL, OPT_IOVA_MODE_NUM }, {OPT_LCORES, 1, NULL, OPT_LCORES_NUM }, {OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM }, + {OPT_TRACE_LEVEL, 1, NULL, OPT_TRACE_LEVEL_NUM }, {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM }, {OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM}, {OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },
@@ -976,7 +978,7 @@ eal_parse_syslog(const char *facility, struct internal_config *conf) }#endif -static int +int eal_parse_log_priority (const char *level) {static const char *const levels[] = {
@@ -1418,6 +1420,16 @@ eal_parse_common_option(int opt, const char *optarg, }break ; } + +case OPT_TRACE_LEVEL_NUM : { +if (eal_trace_level_args_save (optarg) <0 ) { +RTE_LOG (ERR ,EAL ,"invalid parameters for --" +OPT_TRACE_LEVEL "\n" ); +return -1 ; + } +break ; + } +case OPT_LCORES_NUM :if (eal_parse_lcores (optarg) <0 ) { RTE_LOG(ERR, EAL, "invalid parameter for --"
@@ -1693,6 +1705,11 @@ eal_common_usage(void)" --" OPT_LOG_LEVEL "=<int> Set global log level\n" " --" OPT_LOG_LEVEL "=<type-match>:<int>\n" " Set specific log level\n" +" --" OPT_TRACE_LEVEL "=<int> Set global trace level\n" +" --" OPT_TRACE_LEVEL "=<type-match>:<int>\n" +" Set trace level specific to component\n" +" Default, there is no trace level enabled\n" +" User must specify this option if required\n" " -v Display version information on startup\n" " -h, --help This help\n" " --" OPT_IN_MEMORY " Operate entirely in memory. This will\n"
lib/librte_eal/common/eal_common_trace.c +10 -0
@@ -38,6 +38,8 @@ trace_list_head_get(void)int eal_trace_init (void ) { +uint8_t i; +/* Trace memory should start with 8B aligned for natural alignment */ RTE_BUILD_BUG_ON ((offsetof(struct __rte_trace_header , mem) %8 ) !=0 );
@@ -47,6 +49,9 @@ eal_trace_init(void) goto fail; } +if (trace.args.nb_args) + trace.global_status = true; +if (rte_trace_global_is_disabled ())return 0 ;
@@ -71,6 +76,10 @@ eal_trace_init(void)if (trace_epoch_time_save ()) goto free_meta; +/* Apply global configurations */ +for (i =0 ; i < trace.args.nb_args; i++) +trace_level_args_apply (trace.args.args[i]); +rte_trace_global_mode_set (trace.mode);return 0 ;
@@ -89,6 +98,7 @@ eal_trace_fini(void)return ;trace_mem_per_thread_free ();trace_metadata_destroy (); +eal_trace_level_args_free (); }bool
lib/librte_eal/common/eal_common_trace_utils.c +104 -0
110 lines not on this page · raw message
lib/librte_eal/common/eal_options.h +2 -0
@@ -33,6 +33,8 @@ enum {OPT_LCORES_NUM , #define OPT_LOG_LEVEL "log-level"OPT_LOG_LEVEL_NUM , +#define OPT_TRACE_LEVEL "trace-level" +OPT_TRACE_LEVEL_NUM , #define OPT_MASTER_LCORE "master-lcore"OPT_MASTER_LCORE_NUM , #define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name"
lib/librte_eal/common/eal_private.h +3 -0
@@ -446,6 +446,9 @@ eal_get_baseaddr(void);const char *eal_loglevel_to_string (uint32_t level); +int +eal_parse_log_priority (const char *level); +void *eal_malloc_no_trace (const char *type,size_t size,unsigned int align);
lib/librte_eal/common/eal_trace.h +10 -1
@@ -28,7 +28,7 @@#define TRACE_CTF_FIELD_SIZE 384#define TRACE_POINT_NAME_SIZE 64#define TRACE_CTF_MAGIC 0xC1FC1FC1 - +#define TRACE_LEVEL_MAX_ARGS 32struct trace_point {STAILQ_ENTRY (trace_point) next;
@@ -47,6 +47,11 @@ struct thread_mem_meta {enum trace_area_e area; }; +struct trace_args { +uint8_t nb_args; +char *args[TRACE_LEVEL_MAX_ARGS ]; +}; +struct trace {char dir[PATH_MAX ];int dir_offset;
@@ -56,6 +61,7 @@ struct trace {rte_uuid_t uuid;uint32_t buff_len;uint32_t level; +struct trace_args args;uint32_t nb_trace_points;uint32_t nb_trace_mem_list;struct thread_mem_meta *lcore_meta;
@@ -94,6 +100,7 @@ struct trace_point_head *trace_list_head_get(void);/* Util functions */ const char *trace_mode_to_string (enum rte_trace_mode_e mode);const char *trace_area_to_string (enum trace_area_e area); +int trace_level_args_apply (const char *arg);bool trace_has_duplicate_entry (void );void trace_uuid_generate (void );int trace_metadata_create (void );
@@ -105,5 +112,7 @@ void trace_mem_per_thread_free(void);/* EAL interface */ int eal_trace_init (void );void eal_trace_fini (void ); +int eal_trace_level_args_save (const char *optarg); +void eal_trace_level_args_free (void );#endif /* __EAL_TRACE_H */
Signature · 1 line
2.25.1
PATCH 23/32 eal/trace: add trace dir configuration parameter
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Trace library exposes --trace-dir EAL parameter to configure directory where traces will be generated.
--- doc/guides/linux_gsg/eal_args.include.rst | 11 ++++ lib/librte_eal/common/eal_common_options.c | 15 ++++++ .../common/eal_common_trace_utils.c | 54 +++++++++++++++++++ lib/librte_eal/common/eal_options.h | 2 + lib/librte_eal/common/eal_trace.h | 1 + 5 files changed, 83 insertions(+)
doc/guides/linux_gsg/eal_args.include.rst +11 -0
@@ -155,6 +155,17 @@ Debugging options Can be specified multiple times up to 32 times. +* ``--trace-dir=<directory path>`` + + Specify trace directory for trace output. For example: + + Configuring ``/tmp/`` as a trace output directory:: + + --trace-dir=/tmp + + By default, trace output will created at ``home`` directory and parameter + must be specified once only. + Other options ~~~~~~~~~~~~~
lib/librte_eal/common/eal_common_options.c +15 -0
@@ -69,6 +69,7 @@ eal_long_options[] = { {OPT_LCORES, 1, NULL, OPT_LCORES_NUM }, {OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM }, {OPT_TRACE_LEVEL, 1, NULL, OPT_TRACE_LEVEL_NUM }, + {OPT_TRACE_DIR, 1, NULL, OPT_TRACE_DIR_NUM }, {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM }, {OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM}, {OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },
@@ -1430,6 +1431,15 @@ eal_parse_common_option(int opt, const char *optarg,break ; } +case OPT_TRACE_DIR_NUM : { +if (eal_trace_dir_args_save (optarg) <0 ) { +RTE_LOG (ERR ,EAL ,"invalid parameters for --" +OPT_TRACE_DIR "\n" ); +return -1 ; + } +break ; + } +case OPT_LCORES_NUM :if (eal_parse_lcores (optarg) <0 ) { RTE_LOG(ERR, EAL, "invalid parameter for --"
@@ -1710,6 +1720,11 @@ eal_common_usage(void)" Set trace level specific to component\n" " Default, there is no trace level enabled\n" " User must specify this option if required\n" +" --" OPT_TRACE_DIR "=<directory path>\n" +" Specify trace directory for trace output.\n" +" By default, trace output will created at\n" +" HOME directory and parameter must be\n" +" specified once only\n" " -v Display version information on startup\n" " -h, --help This help\n" " --" OPT_IN_MEMORY " Operate entirely in memory. This will\n"
lib/librte_eal/common/eal_common_trace_utils.c +54 -0
78 lines not on this page · raw message
lib/librte_eal/common/eal_options.h +2 -0
@@ -35,6 +35,8 @@ enum {OPT_LOG_LEVEL_NUM , #define OPT_TRACE_LEVEL "trace-level"OPT_TRACE_LEVEL_NUM , +#define OPT_TRACE_DIR "trace-dir" +OPT_TRACE_DIR_NUM , #define OPT_MASTER_LCORE "master-lcore"OPT_MASTER_LCORE_NUM , #define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name"
lib/librte_eal/common/eal_trace.h +1 -0
@@ -114,5 +114,6 @@ int eal_trace_init(void);void eal_trace_fini (void );int eal_trace_level_args_save (const char *optarg);void eal_trace_level_args_free (void ); +int eal_trace_dir_args_save (const char *optarg);#endif /* __EAL_TRACE_H */
Signature · 1 line
2.25.1
PATCH 24/32 eal/trace: add trace bufsize configuration parameter
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Trace library exposes --trace-bufsz EAL parameter to configure maximum size of ring buffer where events are to be stored.
--- doc/guides/linux_gsg/eal_args.include.rst | 13 ++++++++ lib/librte_eal/common/eal_common_options.c | 17 +++++++++++ lib/librte_eal/common/eal_common_trace.c | 3 ++ .../common/eal_common_trace_utils.c | 30 +++++++++++++++++++ lib/librte_eal/common/eal_options.h | 2 ++ lib/librte_eal/common/eal_trace.h | 2 ++ 6 files changed, 67 insertions(+)
doc/guides/linux_gsg/eal_args.include.rst +13 -0
@@ -166,6 +166,19 @@ Debugging options By default, trace output will created at ``home`` directory and parameter must be specified once only. +* ``--trace-bufsz=<val>`` + + Specify maximum size of allocated memory for trace output for each thread. + Valid unit can be either ``B`` or ``K`` or ``M`` for ``Bytes``, ``KBytes`` + and ``MBytes`` respectively. For example: + + Configuring ``2MB`` as a maximum size for trace output file:: + + --trace-bufsz=2M + + By default, size of trace output file is ``1MB`` and parameter + must be specified once only. + Other options ~~~~~~~~~~~~~
lib/librte_eal/common/eal_common_options.c +17 -0
@@ -70,6 +70,7 @@ eal_long_options[] = { {OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM }, {OPT_TRACE_LEVEL, 1, NULL, OPT_TRACE_LEVEL_NUM }, {OPT_TRACE_DIR, 1, NULL, OPT_TRACE_DIR_NUM }, + {OPT_TRACE_BUF_SIZE, 1, NULL, OPT_TRACE_BUF_SIZE_NUM }, {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM }, {OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM}, {OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },
@@ -1440,6 +1441,15 @@ eal_parse_common_option(int opt, const char *optarg,break ; } +case OPT_TRACE_BUF_SIZE_NUM : { +if (eal_trace_bufsz_args_save (optarg) <0 ) { +RTE_LOG (ERR ,EAL ,"invalid parameters for --" +OPT_TRACE_BUF_SIZE "\n" ); +return -1 ; + } +break ; + } +case OPT_LCORES_NUM :if (eal_parse_lcores (optarg) <0 ) { RTE_LOG(ERR, EAL, "invalid parameter for --"
@@ -1725,6 +1735,13 @@ eal_common_usage(void)" By default, trace output will created at\n" " HOME directory and parameter must be\n" " specified once only\n" +" --" OPT_TRACE_BUF_SIZE "=<int>\n" +" Specify maximum size of allocated memory\n" +" for trace output for each thread. Valid\n" +" unit can be either 'B|K|M' for 'Bytes',\n" +" 'KBytes' and 'MBytes' respectively.\n" +" Default is 1MB and parameter must be\n" +" specified once only\n" " -v Display version information on startup\n" " -h, --help This help\n" " --" OPT_IN_MEMORY " Operate entirely in memory. This will\n"
lib/librte_eal/common/eal_common_trace.c +3 -0
@@ -64,6 +64,9 @@ eal_trace_init(void)/* Generate UUID ver 4 with total size of events and number of events */ trace_uuid_generate (); +/* Apply buffer size configuration for trace output */ +trace_bufsz_args_apply (); +/* Generate CTF TDSL metadata */ if (trace_metadata_create ()) goto fail;
lib/librte_eal/common/eal_common_trace_utils.c +30 -0
@@ -238,6 +238,36 @@ trace_level_args_apply(const char *arg)return -1 ; } +int +eal_trace_bufsz_args_save (char const *optarg) +{ +struct trace *trace =trace_obj_get (); +uint64_t bufsz; + +if (optarg ==NULL ) { +trace_err ("no optarg is passed\n" ); +return -EINVAL ; + } + + bufsz =rte_str_to_size (optarg); +if (bufsz ==0 ) { +trace_err ("buffer size cannot be zero\n" ); +return -EINVAL ; + } + + trace->buff_len = bufsz; +return 0 ; +} + +void +trace_bufsz_args_apply (void ) +{ +struct trace *trace =trace_obj_get (); + +if (trace->buff_len ==0 ) + trace->buff_len =1024 *1024 ;/* 1MB */ +} +int eal_trace_dir_args_save (char const *optarg) {
lib/librte_eal/common/eal_options.h +2 -0
@@ -37,6 +37,8 @@ enum {OPT_TRACE_LEVEL_NUM , #define OPT_TRACE_DIR "trace-dir"OPT_TRACE_DIR_NUM , +#define OPT_TRACE_BUF_SIZE "trace-bufsz" +OPT_TRACE_BUF_SIZE_NUM , #define OPT_MASTER_LCORE "master-lcore"OPT_MASTER_LCORE_NUM , #define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name"
lib/librte_eal/common/eal_trace.h +2 -0
@@ -101,6 +101,7 @@ struct trace_point_head *trace_list_head_get(void);const char *trace_mode_to_string (enum rte_trace_mode_e mode);const char *trace_area_to_string (enum trace_area_e area);int trace_level_args_apply (const char *arg); +void trace_bufsz_args_apply (void );bool trace_has_duplicate_entry (void );void trace_uuid_generate (void );int trace_metadata_create (void );
@@ -115,5 +116,6 @@ void eal_trace_fini(void);int eal_trace_level_args_save (const char *optarg);void eal_trace_level_args_free (void );int eal_trace_dir_args_save (const char *optarg); +int eal_trace_bufsz_args_save (const char *optarg);#endif /* __EAL_TRACE_H */
Signature · 1 line
2.25.1
PATCH 25/32 eal/trace: add trace mode configuration parameter
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Trace library exposes --trace-mode eal parameter to configure event record mode when ring buffers are full.
--- doc/guides/linux_gsg/eal_args.include.rst | 12 ++++++ lib/librte_eal/common/eal_common_options.c | 17 ++++++++ .../common/eal_common_trace_utils.c | 40 +++++++++++++++++++ lib/librte_eal/common/eal_options.h | 2 + lib/librte_eal/common/eal_trace.h | 1 + 5 files changed, 72 insertions(+)
doc/guides/linux_gsg/eal_args.include.rst +12 -0
@@ -179,6 +179,18 @@ Debugging options By default, size of trace output file is ``1MB`` and parameter must be specified once only. +* ``--trace-mode=<o[verwrite] | d[iscard] >`` + + Specify the mode of update of trace output file. Either update on a file + can be wrapped or discarded when file size reaches its maximum limit. + For example: + + To ``discard`` update on trace output file:: + + --trace-mode=d or --trace-mode=discard + + Default mode is ``overwrite`` and parameter must be specified once only. + Other options ~~~~~~~~~~~~~
lib/librte_eal/common/eal_common_options.c +17 -0
@@ -71,6 +71,7 @@ eal_long_options[] = { {OPT_TRACE_LEVEL, 1, NULL, OPT_TRACE_LEVEL_NUM }, {OPT_TRACE_DIR, 1, NULL, OPT_TRACE_DIR_NUM }, {OPT_TRACE_BUF_SIZE, 1, NULL, OPT_TRACE_BUF_SIZE_NUM }, + {OPT_TRACE_MODE, 1, NULL, OPT_TRACE_MODE_NUM }, {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM }, {OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM}, {OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },
@@ -1450,6 +1451,15 @@ eal_parse_common_option(int opt, const char *optarg,break ; } +case OPT_TRACE_MODE_NUM : { +if (eal_trace_mode_args_save (optarg) <0 ) { +RTE_LOG (ERR ,EAL ,"invalid parameters for --" +OPT_TRACE_MODE "\n" ); +return -1 ; + } +break ; + } +case OPT_LCORES_NUM :if (eal_parse_lcores (optarg) <0 ) { RTE_LOG(ERR, EAL, "invalid parameter for --"
@@ -1742,6 +1752,13 @@ eal_common_usage(void)" 'KBytes' and 'MBytes' respectively.\n" " Default is 1MB and parameter must be\n" " specified once only\n" +" --" OPT_TRACE_MODE "=<o[verwrite] | d[iscard]>\n" +" Specify the mode of update of trace\n" +" output file. Either update on a file can\n" +" be wrapped or discarded when file size\n" +" reaches its maximum limit.\n" +" Default mode is 'overwrite' and parameter\n" +" must be specified once only\n" " -v Display version information on startup\n" " -h, --help This help\n" " --" OPT_IN_MEMORY " Operate entirely in memory. This will\n"
lib/librte_eal/common/eal_common_trace_utils.c +40 -0
@@ -268,6 +268,46 @@ trace_bufsz_args_apply(void) trace->buff_len =1024 *1024 ;/* 1MB */ } +int +eal_trace_mode_args_save (const char *optarg) +{ +struct trace *trace =trace_obj_get (); +size_t len =strlen (optarg); +unsigned long tmp; +char *pattern; + +if (optarg ==NULL ) { +trace_err ("no optarg is passed\n" ); +return -EINVAL ; + } + +if (len ==0 ) { +trace_err ("value is not provided with option\n" ); +return -EINVAL ; + } + + pattern = (char *)calloc (1 , len +2 ); +if (pattern ==NULL ) { +trace_err ("fail to allocate memory\n" ); +return -ENOMEM ; + } + +sprintf (pattern,"%s*" , optarg); + +if (fnmatch (pattern,"overwrite" ,0 ) ==0 ) + tmp =RTE_TRACE_MODE_OVERWRITE ; +else if (fnmatch (pattern,"discard" ,0 ) ==0 ) + tmp =RTE_TRACE_MODE_DISCARD ; +else { +free (pattern); +return -EINVAL ; + } + + trace->mode = tmp; +free (pattern); +return 0 ; +} +int eal_trace_dir_args_save (char const *optarg) {
lib/librte_eal/common/eal_options.h +2 -0
@@ -39,6 +39,8 @@ enum {OPT_TRACE_DIR_NUM , #define OPT_TRACE_BUF_SIZE "trace-bufsz"OPT_TRACE_BUF_SIZE_NUM , +#define OPT_TRACE_MODE "trace-mode" +OPT_TRACE_MODE_NUM , #define OPT_MASTER_LCORE "master-lcore"OPT_MASTER_LCORE_NUM , #define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name"
lib/librte_eal/common/eal_trace.h +1 -0
@@ -116,6 +116,7 @@ void eal_trace_fini(void);int eal_trace_level_args_save (const char *optarg);void eal_trace_level_args_free (void );int eal_trace_dir_args_save (const char *optarg); +int eal_trace_mode_args_save (const char *optarg);int eal_trace_bufsz_args_save (const char *optarg);#endif /* __EAL_TRACE_H */
Signature · 1 line
2.25.1
PATCH 26/32 eal/trace: add unit test cases
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Example commands to run UT and check the traces with babeltrace viewer.
- Delete the existing /root/dpdk-traces/ directory if needed.
Quoted 1 line
sudo rm -rf
/root/dpdk-traces/
- Start the dpdk-test
Quoted 1 line
sudo ./build/app/test/dpdk-test -c
0x3- --trace-level=8
- Run trace_autotest
Quoted 1 line
trace_autotest
- View the traces with babletrace viewer.
Quoted 1 line
sudo babeltrace
/root/dpdk-traces/
--- app/test/Makefile | 3 +- app/test/meson.build | 2 + app/test/test_trace.c | 618 +++++++++++++++++++++++++++++++++ app/test/test_trace.h | 52 +++ app/test/test_trace_register.c | 46 +++ 5 files changed, 720 insertions(+), 1 deletion(-) create mode 100644 app/test/test_trace.c create mode 100644 app/test/test_trace.h create mode 100644 app/test/test_trace_register.c
app/test/Makefile +2 -1
@@ -148,7 +148,8 @@ SRCS-y += test_alarm.c SRCS-y += test_interrupts.c SRCS-y += test_version.c SRCS-y += test_func_reentrancy.c - +SRCS-y += test_trace.c +SRCS-y += test_trace_register.c SRCS-y += test_service_cores.c ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
app/test/meson.build +2 -0
@@ -121,6 +121,8 @@ test_sources = files('commands.c', 'test_timer_racecond.c', 'test_timer_secondary.c', 'test_ticketlock.c', + 'test_trace.c', + 'test_trace_register.c', 'test_version.c', 'virtual_pmd.c' )
app/test/test_trace.c new file +618 -0
618 lines not on this page · raw message
app/test/test_trace.h new file +52 -0
52 lines not on this page · raw message
app/test/test_trace_register.c new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 27/32 eal/trace: add trace performance test cases
In reply to [email protected]From: Jerin Jacob <[email protected]>
This test case shall be used to measure the trace overhead.
Example command to run the performance test case.
echo "trace_perf" | ./build/app/test/dpdk-test -c 0x3 --trace-level=8
--- app/test/Makefile | 1 + app/test/meson.build | 1 + app/test/test_trace_perf.c | 179 +++++++++++++++++++++++++++++++++++++ 3 files changed, 181 insertions(+) create mode 100644 app/test/test_trace_perf.c
app/test/Makefile +1 -0
@@ -150,6 +150,7 @@ SRCS-y += test_version.c SRCS-y += test_func_reentrancy.c SRCS-y += test_trace.c SRCS-y += test_trace_register.c +SRCS-y += test_trace_perf.c SRCS-y += test_service_cores.c ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
app/test/meson.build +1 -0
@@ -123,6 +123,7 @@ test_sources = files('commands.c', 'test_ticketlock.c', 'test_trace.c', 'test_trace_register.c', + 'test_trace_perf.c', 'test_version.c', 'virtual_pmd.c' )
app/test/test_trace_perf.c new file +179 -0
179 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 28/32 ethdev: add tracepoints
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Add tracepoints at important and mandatory APIs for tracing support.
--- MAINTAINERS | 2 + app/pdump/Makefile | 1 + app/pdump/meson.build | 1 + app/proc-info/Makefile | 1 + app/proc-info/meson.build | 1 + app/test-acl/Makefile | 1 + app/test-acl/meson.build | 1 + app/test-cmdline/Makefile | 1 + app/test-cmdline/meson.build | 1 + app/test-eventdev/Makefile | 1 + app/test-eventdev/meson.build | 1 + app/test-pipeline/Makefile | 1 + app/test-pipeline/meson.build | 1 + drivers/event/octeontx/Makefile | 1 + drivers/event/octeontx/meson.build | 1 + drivers/event/sw/Makefile | 1 + drivers/event/sw/meson.build | 1 + drivers/net/af_packet/Makefile | 1 + drivers/net/af_packet/meson.build | 1 + drivers/net/af_xdp/Makefile | 1 + drivers/net/af_xdp/meson.build | 1 + drivers/net/ark/Makefile | 1 + drivers/net/ark/meson.build | 1 + drivers/net/bnxt/Makefile | 1 + drivers/net/bnxt/meson.build | 1 + drivers/net/cxgbe/Makefile | 1 + drivers/net/cxgbe/meson.build | 1 + drivers/net/enetc/Makefile | 1 + drivers/net/enetc/meson.build | 1 + drivers/net/hinic/Makefile | 1 + drivers/net/hinic/base/meson.build | 3 +- drivers/net/hinic/meson.build | 1 + drivers/net/ionic/ionic_dev.c | 1 + drivers/net/ionic/ionic_dev.h | 2 + drivers/net/ionic/ionic_mac_api.c | 1 + drivers/net/ionic/ionic_main.c | 1 + drivers/net/ionic/ionic_osdep.h | 6 -- drivers/net/ionic/ionic_rx_filter.c | 1 + drivers/net/kni/Makefile | 1 + drivers/net/kni/meson.build | 1 + drivers/net/liquidio/Makefile | 1 + drivers/net/liquidio/meson.build | 1 + drivers/net/mvneta/Makefile | 1 + drivers/net/mvneta/meson.build | 1 + drivers/net/mvpp2/Makefile | 1 + drivers/net/mvpp2/meson.build | 1 + drivers/net/nfb/Makefile | 1 + drivers/net/nfb/meson.build | 1 + drivers/net/null/Makefile | 1 + drivers/net/null/meson.build | 1 + drivers/net/octeontx/Makefile | 1 + drivers/net/octeontx2/Makefile | 1 + drivers/net/octeontx2/meson.build | 1 + drivers/net/pcap/Makefile | 1 + drivers/net/pcap/meson.build | 1 + drivers/net/ring/Makefile | 1 + drivers/net/ring/meson.build | 1 + drivers/net/szedata2/Makefile | 1 + drivers/net/szedata2/meson.build | 1 + drivers/net/thunderx/base/meson.build | 1 + drivers/net/vhost/Makefile | 1 + drivers/net/vhost/meson.build | 1 + examples/cmdline/Makefile | 1 + examples/cmdline/meson.build | 1 + examples/distributor/Makefile | 1 + examples/distributor/meson.build | 1 + examples/ethtool/ethtool-app/Makefile | 1 + examples/flow_filtering/Makefile | 1 + examples/flow_filtering/meson.build | 1 + examples/helloworld/Makefile | 1 + examples/helloworld/meson.build | 1 + examples/ioat/Makefile | 1 + examples/ioat/meson.build | 1 + examples/ip_reassembly/Makefile | 1 + examples/ip_reassembly/meson.build | 1 + examples/ipv4_multicast/Makefile | 1 + examples/ipv4_multicast/meson.build | 1 + examples/l2fwd-cat/Makefile | 1 + examples/l2fwd-cat/meson.build | 1 + examples/l2fwd-event/Makefile | 1 + examples/l2fwd-event/meson.build | 1 + examples/l2fwd-jobstats/Makefile | 1 + examples/l2fwd-jobstats/meson.build | 1 + examples/l2fwd-keepalive/Makefile | 1 + examples/l2fwd-keepalive/ka-agent/Makefile | 1 + examples/l2fwd-keepalive/meson.build | 1 + examples/l3fwd-acl/Makefile | 1 + examples/l3fwd-acl/meson.build | 1 + examples/l3fwd/Makefile | 1 + examples/l3fwd/meson.build | 1 + examples/link_status_interrupt/Makefile | 1 + examples/link_status_interrupt/meson.build | 1 + .../client_server_mp/mp_client/Makefile | 1 + .../client_server_mp/mp_client/meson.build | 1 + .../client_server_mp/mp_server/meson.build | 1 + examples/multi_process/hotplug_mp/Makefile | 1 + examples/multi_process/hotplug_mp/meson.build | 1 + examples/multi_process/simple_mp/Makefile | 1 + examples/multi_process/simple_mp/meson.build | 1 + examples/multi_process/symmetric_mp/Makefile | 1 + .../multi_process/symmetric_mp/meson.build | 1 + examples/packet_ordering/Makefile | 1 + examples/packet_ordering/meson.build | 1 + .../performance-thread/l3fwd-thread/Makefile | 1 + .../l3fwd-thread/meson.build | 1 + .../performance-thread/pthread_shim/Makefile | 1 + .../pthread_shim/meson.build | 1 + examples/ptpclient/Makefile | 1 + examples/ptpclient/meson.build | 1 + examples/qos_meter/Makefile | 1 + examples/qos_meter/meson.build | 1 + examples/qos_sched/Makefile | 1 + examples/qos_sched/meson.build | 1 + examples/server_node_efd/node/Makefile | 1 + examples/server_node_efd/node/meson.build | 1 + examples/server_node_efd/server/Makefile | 1 + examples/server_node_efd/server/meson.build | 1 + examples/service_cores/Makefile | 1 + examples/service_cores/meson.build | 1 + examples/skeleton/Makefile | 1 + examples/skeleton/meson.build | 1 + examples/timer/Makefile | 1 + examples/timer/meson.build | 1 + examples/vm_power_manager/Makefile | 1 + examples/vm_power_manager/meson.build | 1 + examples/vmdq/Makefile | 1 + examples/vmdq/meson.build | 1 + examples/vmdq_dcb/Makefile | 1 + examples/vmdq_dcb/meson.build | 1 + lib/librte_bitratestats/Makefile | 1 + lib/librte_bitratestats/meson.build | 1 + lib/librte_ethdev/Makefile | 3 + lib/librte_ethdev/ethdev_trace_points.c | 43 +++++++++ lib/librte_ethdev/meson.build | 5 +- lib/librte_ethdev/rte_ethdev.c | 12 +++ lib/librte_ethdev/rte_ethdev.h | 5 ++ lib/librte_ethdev/rte_ethdev_version.map | 10 +++ lib/librte_ethdev/rte_trace_ethdev.h | 90 +++++++++++++++++++ lib/librte_ethdev/rte_trace_ethdev_fp.h | 40 +++++++++ lib/librte_gro/Makefile | 1 + lib/librte_gro/meson.build | 1 + lib/librte_gso/Makefile | 1 + lib/librte_gso/meson.build | 1 + lib/librte_kni/Makefile | 1 + lib/librte_kni/meson.build | 1 + lib/librte_latencystats/Makefile | 1 + lib/librte_latencystats/meson.build | 1 + lib/librte_port/Makefile | 1 + lib/librte_port/meson.build | 1 + 149 files changed, 350 insertions(+), 8 deletions(-) create mode 100644 lib/librte_ethdev/ethdev_trace_points.c create mode 100644 lib/librte_ethdev/rte_trace_ethdev.h create mode 100644 lib/librte_ethdev/rte_trace_ethdev_fp.h
MAINTAINERS +2 -0
@@ -202,6 +202,8 @@ M: Sunil Kumar Kori <[email protected]> F: lib/librte_eal/common/include/rte_trace*.h F: lib/librte_eal/common/eal_common_trace*.c F: lib/librte_eal/common/eal_trace.h +F: lib/librte_ethdev/ethdev_trace_points.c +F: lib/librte_ethdev/rte_trace_ethdev*.h Memory Allocation M: Anatoly Burakov <[email protected]>
app/pdump/Makefile +1 -0
@@ -8,6 +8,7 @@ ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) APP = dpdk-pdump CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # all source are stored in SRCS-y
app/pdump/meson.build +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +allow_experimental_apis = true sources = files('main.c') deps += ['ethdev', 'kvargs', 'pdump']
app/proc-info/Makefile +1 -0
@@ -6,6 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk APP = dpdk-procinfo CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # all source are stored in SRCS-y
app/proc-info/meson.build +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +allow_experimental_apis = true sources = files('main.c') deps += ['ethdev', 'metrics', 'security']
app/test-acl/Makefile +1 -0
@@ -8,6 +8,7 @@ ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) APP = testacl CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # all source are stored in SRCS-y SRCS-y := main.c
app/test-acl/meson.build +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation +allow_experimental_apis = true sources = files('main.c') deps += ['acl', 'net']
app/test-cmdline/Makefile +1 -0
@@ -18,6 +18,7 @@ SRCS-y += commands.c CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.app.mk
app/test-cmdline/meson.build +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation +allow_experimental_apis = true sources = files('commands.c', 'cmdline_test.c') deps += 'cmdline'
app/test-eventdev/Makefile +1 -0
@@ -8,6 +8,7 @@ APP = dpdk-test-eventdev CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # # all source are stored in SRCS-y
app/test-eventdev/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +allow_experimental_apis = true sources = files('evt_main.c', 'evt_options.c', 'evt_test.c',
app/test-pipeline/Makefile +1 -0
@@ -12,6 +12,7 @@ APP = testpipeline CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # # all source are stored in SRCS-y
app/test-pipeline/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation +allow_experimental_apis = true sources = files( 'config.c', 'init.c',
drivers/event/octeontx/Makefile +1 -0
@@ -10,6 +10,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_pmd_octeontx_ssovf.a CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx/
drivers/event/octeontx/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +allow_experimental_apis = true sources = files('ssovf_worker.c', 'ssovf_evdev.c', 'ssovf_evdev_selftest.c',
drivers/event/sw/Makefile +1 -0
@@ -9,6 +9,7 @@ LIB = librte_pmd_sw_event.a # build flags CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -lrte_ring LDLIBS += -lrte_mempool -lrte_mbuf LDLIBS += -lrte_bus_vdev
drivers/event/sw/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('sw_evdev_scheduler.c', 'sw_evdev_selftest.c', 'sw_evdev_worker.c',
drivers/net/af_packet/Makefile +1 -0
@@ -15,6 +15,7 @@ EXPORT_MAP := rte_pmd_af_packet_version.map CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_vdev
drivers/net/af_packet/meson.build +1 -0
@@ -5,4 +5,5 @@ if not is_linux build = false reason = 'only supported on linux' endif +allow_experimental_apis = true sources = files('rte_eth_af_packet.c')
drivers/net/af_xdp/Makefile +1 -0
@@ -13,6 +13,7 @@ EXPORT_MAP := rte_pmd_af_xdp_version.map CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_vdev
drivers/net/af_xdp/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation +allow_experimental_apis = true sources = files('rte_eth_af_xdp.c') bpf_dep = dependency('libbpf', required: false)
drivers/net/ark/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_ark.a CFLAGS += -O3 -I./ CFLAGS += $(WERROR_FLAGS) -Werror +CFLAGS += -DALLOW_EXPERIMENTAL_API EXPORT_MAP := rte_pmd_ark_version.map
drivers/net/ark/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +allow_experimental_apis = true sources = files('ark_ddm.c', 'ark_ethdev.c', 'ark_ethdev_rx.c',
drivers/net/bnxt/Makefile +1 -0
@@ -15,6 +15,7 @@ EXPORT_MAP := rte_pmd_bnxt_version.map CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_pci
drivers/net/bnxt/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +allow_experimental_apis = true install_headers('rte_pmd_bnxt.h') sources = files('bnxt_cpr.c', 'bnxt_ethdev.c',
drivers/net/cxgbe/Makefile +1 -0
@@ -11,6 +11,7 @@ LIB = librte_pmd_cxgbe.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API EXPORT_MAP := rte_pmd_cxgbe_version.map
drivers/net/cxgbe/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +allow_experimental_apis = true sources = files('cxgbe_ethdev.c', 'cxgbe_main.c', 'cxgbevf_ethdev.c',
drivers/net/enetc/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_enetc.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax EXPORT_MAP := rte_pmd_enetc_version.map SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c
drivers/net/enetc/meson.build +1 -0
@@ -6,6 +6,7 @@ if not is_linux reason = 'only supported on linux' endif +allow_experimental_apis = true deps += ['common_dpaax'] sources = files('enetc_ethdev.c', 'enetc_rxtx.c')
drivers/net/hinic/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_hinic.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API ifeq ($(CONFIG_RTE_ARCH_ARM64),y) CFLAGS += -D__ARM64_NEON__
drivers/net/hinic/base/meson.build +2 -1
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Huawei Technologies Co., Ltd +allow_experimental_apis = true sources = [ 'hinic_pmd_api_cmd.c', 'hinic_pmd_cfg.c',
@@ -29,7 +30,7 @@ endforeach deps += ['hash'] -c_args = cflags +c_args += cflags base_lib = static_library('hinic_base', sources, dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
drivers/net/hinic/meson.build +1 -0
@@ -4,6 +4,7 @@ subdir('base') objs = [base_objs] +allow_experimental_apis = true sources = files( 'hinic_pmd_ethdev.c', 'hinic_pmd_rx.c',
drivers/net/ionic/ionic_dev.c +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. */ +#include <stdbool.h> #include <rte_malloc.h>
drivers/net/ionic/ionic_dev.h +2 -0
@@ -5,6 +5,8 @@#ifndef _IONIC_DEV_H_#define _IONIC_DEV_H_ +#include <stdbool.h> +#include "ionic_osdep.h" #include "ionic_if.h" #include "ionic_regs.h"
drivers/net/ionic/ionic_mac_api.c +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. */ +#include <stdbool.h> #include "ionic_mac_api.h"
drivers/net/ionic/ionic_main.c +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. */ +#include <stdbool.h> #include <rte_memzone.h>
drivers/net/ionic/ionic_osdep.h +0 -6
@@ -44,12 +44,6 @@ typedef uint16_t __le16;typedef uint32_t __le32 ;typedef uint64_t __le64 ; -#ifndef __cplusplus -typedef uint8_t bool ; -#define false 0 -#define true 1 -#endif -static inline uint32_t div_round_up (uint32_t n,uint32_t d) {return (n + d -1 ) / d;
drivers/net/ionic/ionic_rx_filter.c +1 -0
@@ -3,6 +3,7 @@*/ #include <errno.h> +#include <stdbool.h> #include <rte_malloc.h>
drivers/net/kni/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_kni.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lpthread LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_kni
drivers/net/kni/meson.build +1 -0
@@ -4,5 +4,6 @@ # this driver can be built if-and-only-if KNI library is buildable build = dpdk_conf.has('RTE_LIBRTE_KNI') reason = 'missing dependency, DPDK KNI library' +allow_experimental_apis = true sources = files('rte_eth_kni.c') deps += 'kni'
drivers/net/liquidio/Makefile +1 -0
@@ -11,6 +11,7 @@ LIB = librte_pmd_lio.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/base -I$(SRCDIR) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_pci
drivers/net/liquidio/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +allow_experimental_apis = true sources = files('base/lio_23xx_vf.c', 'base/lio_mbox.c', 'lio_ethdev.c',
drivers/net/mvneta/Makefile +1 -0
@@ -27,6 +27,7 @@ CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_SIZE=64 CFLAGS += $(WERROR_FLAGS) CFLAGS += -O3 +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -L$(LIBMUSDK_PATH)/lib LDLIBS += -lmusdk LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
drivers/net/mvneta/meson.build +1 -0
@@ -21,6 +21,7 @@ else ] endif +allow_experimental_apis = true sources = files( 'mvneta_ethdev.c', 'mvneta_rxtx.c'
drivers/net/mvpp2/Makefile +1 -0
@@ -26,6 +26,7 @@ CFLAGS += -DMVCONF_TYPES_PUBLIC CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC CFLAGS += $(WERROR_FLAGS) CFLAGS += -O3 +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -L$(LIBMUSDK_PATH)/lib LDLIBS += -lmusdk LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
drivers/net/mvpp2/meson.build +1 -0
@@ -17,6 +17,7 @@ else cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC'] endif +allow_experimental_apis = true sources = files( 'mrvl_ethdev.c', 'mrvl_flow.c',
drivers/net/nfb/Makefile +1 -0
@@ -15,6 +15,7 @@ INCLUDES :=-I$(SRCDIR) CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags netcope-common) LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs LDLIBS += -lrte_ethdev -lrte_net
drivers/net/nfb/meson.build +1 -0
@@ -7,5 +7,6 @@ dep = dependency('netcope-common', required: false) reason = 'missing dependency, "libnfb"' build = dep.found() ext_deps += dep +allow_experimental_apis = true sources = files('nfb_rx.c', 'nfb_tx.c', 'nfb_stats.c', 'nfb_ethdev.c', 'nfb_rxmode.c')
drivers/net/null/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_null.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_vdev
drivers/net/null/meson.build +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_eth_null.c')
drivers/net/octeontx/Makefile +1 -0
@@ -10,6 +10,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_pmd_octeontx.a CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/
drivers/net/octeontx2/Makefile +1 -0
@@ -20,6 +20,7 @@ ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) CFLAGS += -flax-vector-conversions endif +CFLAGS += -DALLOW_EXPERIMENTAL_API ifneq ($(CONFIG_RTE_ARCH_64),y) CFLAGS += -Wno-int-to-pointer-cast CFLAGS += -Wno-pointer-to-int-cast
drivers/net/octeontx2/meson.build +1 -0
@@ -2,6 +2,7 @@ # Copyright(C) 2019 Marvell International Ltd. # +allow_experimental_apis = true sources = files('otx2_rx.c', 'otx2_tx.c', 'otx2_tm.c',
drivers/net/pcap/Makefile +1 -0
@@ -12,6 +12,7 @@ LIB = librte_pmd_pcap.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lpcap LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
drivers/net/pcap/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true if not dpdk_conf.has('RTE_PORT_PCAP') build = false reason = 'missing dependency, "libpcap"'
drivers/net/ring/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_ring.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_vdev
drivers/net/ring/meson.build +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_eth_ring.c') install_headers('rte_eth_ring.h')
drivers/net/szedata2/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_szedata2.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lsze2 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
drivers/net/szedata2/meson.build +1 -0
@@ -5,4 +5,5 @@ dep = dependency('libsze2', required: false) build = dep.found() reason = 'missing dependency, "libsze2"' ext_deps += dep +allow_experimental_apis = true sources = files('rte_eth_szedata2.c')
drivers/net/thunderx/base/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +allow_experimental_apis = true sources = [ 'nicvf_hw.c', 'nicvf_mbox.c',
drivers/net/vhost/Makefile +1 -0
@@ -15,6 +15,7 @@ LDLIBS += -lrte_bus_vdev CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API EXPORT_MAP := rte_pmd_vhost_version.map
drivers/net/vhost/meson.build +1 -0
@@ -3,6 +3,7 @@ build = dpdk_conf.has('RTE_LIBRTE_VHOST') reason = 'missing dependency, DPDK vhost library' +allow_experimental_apis = true sources = files('rte_eth_vhost.c') install_headers('rte_eth_vhost.h') deps += 'vhost'
examples/cmdline/Makefile +1 -0
@@ -57,6 +57,7 @@ SRCS-y := main.c commands.c parse_obj_list.c CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/cmdline/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'commands.c', 'main.c', 'parse_obj_list.c' )
examples/distributor/Makefile +1 -0
@@ -50,6 +50,7 @@ RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.conf include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/distributor/meson.build +1 -0
@@ -9,6 +9,7 @@ # require the power library build = dpdk_conf.has('RTE_LIBRTE_POWER') +allow_experimental_apis = true deps += ['distributor', 'power'] sources = files( 'main.c'
examples/ethtool/ethtool-app/Makefile +1 -0
@@ -18,6 +18,7 @@ SRCS-y := main.c ethapp.c CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib LDLIBS += -lrte_ethtool
examples/flow_filtering/Makefile +1 -0
@@ -49,6 +49,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/flow_filtering/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'main.c', )
examples/helloworld/Makefile +1 -0
@@ -51,6 +51,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/helloworld/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'main.c' )
examples/ioat/Makefile +1 -0
@@ -51,6 +51,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk endif
examples/ioat/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true build = dpdk_conf.has('RTE_LIBRTE_PMD_IOAT_RAWDEV') deps += ['rawdev_ioat']
examples/ip_reassembly/Makefile +1 -0
@@ -52,6 +52,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/ip_reassembly/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += ['lpm', 'ip_frag'] sources = files( 'main.c'
examples/ipv4_multicast/Makefile +1 -0
@@ -52,6 +52,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/ipv4_multicast/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += 'hash' sources = files( 'main.c'
examples/l2fwd-cat/Makefile +1 -0
@@ -56,6 +56,7 @@ RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.conf include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/l2fwd-cat/meson.build +1 -0
@@ -9,6 +9,7 @@ pqos = cc.find_library('pqos', required: false) build = pqos.found() ext_deps += pqos +allow_experimental_apis = true cflags += '-I/usr/local/include' # assume pqos lib installed in /usr/local sources = files( 'cat.c', 'l2fwd-cat.c'
examples/l2fwd-event/Makefile +1 -0
@@ -57,6 +57,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk endif
examples/l2fwd-event/meson.build +1 -0
@@ -7,6 +7,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += 'eventdev' sources = files( 'main.c',
examples/l2fwd-jobstats/Makefile +1 -0
@@ -52,6 +52,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk endif
examples/l2fwd-jobstats/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += ['jobstats', 'timer'] sources = files( 'main.c'
examples/l2fwd-keepalive/Makefile +1 -0
@@ -53,6 +53,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDFLAGS += -lrt include $(RTE_SDK)/mk/rte.extapp.mk
examples/l2fwd-keepalive/ka-agent/Makefile +1 -0
@@ -17,5 +17,6 @@ APP = ka-agent SRCS-y := main.c CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/../ +CFLAGS += -DALLOW_EXPERIMENTAL_API LDFLAGS += -lrt include $(RTE_SDK)/mk/rte.extapp.mk
examples/l2fwd-keepalive/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true ext_deps += cc.find_library('rt') deps += 'timer' sources = files(
examples/l3fwd-acl/Makefile +1 -0
@@ -51,6 +51,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/l3fwd-acl/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += ['acl', 'lpm', 'hash'] sources = files( 'main.c'
examples/l3fwd/Makefile +1 -0
@@ -53,6 +53,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -I$(SRCDIR) CFLAGS += -O3 $(USER_FLAGS) CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk endif
examples/l3fwd/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += ['hash', 'lpm', 'eventdev'] sources = files( 'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_event.c',
examples/link_status_interrupt/Makefile +1 -0
@@ -51,6 +51,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk endif
examples/link_status_interrupt/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'main.c' )
examples/multi_process/client_server_mp/mp_client/Makefile +1 -0
@@ -16,5 +16,6 @@ SRCS-y := client.c CFLAGS += $(WERROR_FLAGS) -O3 CFLAGS += -I$(SRCDIR)/../shared +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/multi_process/client_server_mp/mp_client/meson.build +1 -0
@@ -8,6 +8,7 @@ includes += include_directories('../shared') +allow_experimental_apis = true sources = files( 'client.c' )
examples/multi_process/client_server_mp/mp_server/meson.build +1 -0
@@ -8,6 +8,7 @@ includes += include_directories('../shared') +allow_experimental_apis = true sources = files( 'args.c', 'init.c', 'main.c' )
examples/multi_process/hotplug_mp/Makefile +1 -0
@@ -18,5 +18,6 @@ SRCS-y := main.c commands.c CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/multi_process/hotplug_mp/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'commands.c', 'main.c' )
examples/multi_process/simple_mp/Makefile +1 -0
@@ -18,5 +18,6 @@ SRCS-y := main.c mp_commands.c CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/multi_process/simple_mp/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'mp_commands.c', 'main.c' )
examples/multi_process/symmetric_mp/Makefile +1 -0
@@ -18,5 +18,6 @@ SRCS-y := main.c CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/multi_process/symmetric_mp/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'main.c' )
examples/packet_ordering/Makefile +1 -0
@@ -51,6 +51,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk endif
examples/packet_ordering/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += 'reorder' sources = files( 'main.c'
examples/performance-thread/l3fwd-thread/Makefile +1 -0
@@ -19,5 +19,6 @@ SRCS-y := main.c include $(RTE_SDK)/examples/performance-thread/common/common.mk CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/performance-thread/l3fwd-thread/meson.build +1 -0
@@ -8,6 +8,7 @@ build = dpdk_conf.has('RTE_ARCH_X86_64') deps += ['timer', 'lpm'] +allow_experimental_apis = true # get the performance thread (pt) architecture subdir if dpdk_conf.has('RTE_ARCH_ARM64')
examples/performance-thread/pthread_shim/Makefile +1 -0
@@ -20,6 +20,7 @@ include $(RTE_SDK)/examples/performance-thread/common/common.mk CFLAGS += -g -O3 $(USER_FLAGS) $(INCLUDES) CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDFLAGS += -lpthread
examples/performance-thread/pthread_shim/meson.build +1 -0
@@ -8,6 +8,7 @@ build = dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64') deps += ['timer'] +allow_experimental_apis = true # get the performance thread (pt) architecture subdir if dpdk_conf.has('RTE_ARCH_ARM64')
examples/ptpclient/Makefile +1 -0
@@ -51,6 +51,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/ptpclient/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'ptpclient.c' )
examples/qos_meter/Makefile +1 -0
@@ -53,6 +53,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/qos_meter/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += 'meter' sources = files( 'main.c', 'rte_policer.c'
examples/qos_sched/Makefile +1 -0
@@ -58,6 +58,7 @@ else CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/qos_sched/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += ['sched', 'cfgfile'] sources = files( 'app_thread.c', 'args.c', 'cfg_file.c', 'cmdline.c',
examples/server_node_efd/node/Makefile +1 -0
@@ -16,5 +16,6 @@ SRCS-y := node.c CFLAGS += $(WERROR_FLAGS) -O3 CFLAGS += -I$(SRCDIR)/../shared +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/server_node_efd/node/meson.build +1 -0
@@ -8,6 +8,7 @@ name = 'efd_node' +allow_experimental_apis = true deps += ['hash'] sources += files('node.c') includes += include_directories('../shared')
examples/server_node_efd/server/Makefile +1 -0
@@ -25,5 +25,6 @@ INC := $(sort $(wildcard *.h)) CFLAGS += $(WERROR_FLAGS) -O3 CFLAGS += -I$(SRCDIR)/../shared +CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk
examples/server_node_efd/server/meson.build +1 -0
@@ -8,6 +8,7 @@ name = 'efd_server' +allow_experimental_apis = true deps += 'efd' sources += files('args.c', 'init.c', 'main.c') includes += include_directories('../shared')
examples/service_cores/Makefile +1 -0
@@ -50,6 +50,7 @@ RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.conf include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/service_cores/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'main.c' )
examples/skeleton/Makefile +1 -0
@@ -50,6 +50,7 @@ RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.conf include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/skeleton/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'basicfwd.c' )
examples/timer/Makefile +1 -0
@@ -51,6 +51,7 @@ include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/timer/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true deps += 'timer' sources = files( 'main.c'
examples/vm_power_manager/Makefile +1 -0
@@ -28,6 +28,7 @@ endif CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lvirt
examples/vm_power_manager/meson.build +1 -0
@@ -25,6 +25,7 @@ if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') deps += ['pmd_ixgbe'] endif +allow_experimental_apis = true sources = files( 'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c' )
examples/vmdq/Makefile +1 -0
@@ -50,6 +50,7 @@ RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.conf include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API EXTRA_CFLAGS += -O3
examples/vmdq/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'main.c' )
examples/vmdq_dcb/Makefile +1 -0
@@ -50,6 +50,7 @@ RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.conf include $(RTE_SDK)/mk/rte.vars.mk CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
examples/vmdq_dcb/meson.build +1 -0
@@ -6,6 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +allow_experimental_apis = true sources = files( 'main.c' )
lib/librte_bitratestats/Makefile +1 -0
@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_bitratestats.a CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev EXPORT_MAP := rte_bitratestats_version.map
lib/librte_bitratestats/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_bitrate.c') headers = files('rte_bitrate.h') deps += ['ethdev', 'metrics']
lib/librte_ethdev/Makefile +3 -0
@@ -23,6 +23,7 @@ SRCS-y += rte_flow.c SRCS-y += rte_tm.c SRCS-y += rte_mtr.c SRCS-y += ethdev_profile.c +SRCS-y += ethdev_trace_points.c # # Export include files
@@ -40,5 +41,7 @@ SYMLINK-y-include += rte_tm.h SYMLINK-y-include += rte_tm_driver.h SYMLINK-y-include += rte_mtr.h SYMLINK-y-include += rte_mtr_driver.h +SYMLINK-y-include += rte_trace_ethdev.h +SYMLINK-y-include += rte_trace_ethdev_fp.h include $(RTE_SDK)/mk/rte.lib.mk
lib/librte_ethdev/ethdev_trace_points.c new file +43 -0
43 lines not on this page · raw message
lib/librte_ethdev/meson.build +4 -1
@@ -5,6 +5,7 @@ name = 'ethdev' allow_experimental_apis = true sources = files('ethdev_private.c', 'ethdev_profile.c', + 'ethdev_trace_points.c', 'rte_class_eth.c', 'rte_ethdev.c', 'rte_flow.c',
@@ -23,6 +24,8 @@ headers = files('rte_ethdev.h', 'rte_mtr.h', 'rte_mtr_driver.h', 'rte_tm.h', - 'rte_tm_driver.h') + 'rte_tm_driver.h', + 'rte_trace_ethdev.h', + 'rte_trace_ethdev_fp.h') deps += ['net', 'kvargs', 'meter']
lib/librte_ethdev/rte_ethdev.c +12 -0
@@ -39,6 +39,7 @@#include <rte_class.h> #include <rte_ether.h> +#include "rte_trace_ethdev.h" #include "rte_ethdev.h" #include "rte_ethdev_driver.h" #include "ethdev_profile.h"
@@ -1470,6 +1471,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, goto reset_queues; } +rte_trace_lib_ethdev_configure (port_id, nb_rx_q, nb_tx_q, dev_conf,0 );return 0 ; reset_queues:rte_eth_dev_rx_queue_config (dev,0 );
@@ -1477,6 +1479,8 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, rollback:memcpy (&dev->data->dev_conf, &orig_conf,sizeof (dev->data->dev_conf)); +rte_trace_lib_ethdev_configure (port_id, nb_rx_q, nb_tx_q, dev_conf, + ret);return ret; }
@@ -1647,6 +1651,8 @@ rte_eth_dev_start(uint16_t port_id)RTE_FUNC_PTR_OR_ERR_RET (*dev->dev_ops->link_update, -ENOTSUP ); (*dev->dev_ops->link_update)(dev,0 ); } + +rte_trace_lib_ethdev_start (port_id);return 0 ; }
@@ -1669,6 +1675,7 @@ rte_eth_dev_stop(uint16_t port_id) dev->data->dev_started =0 ; (*dev->dev_ops->dev_stop)(dev); +rte_trace_lib_ethdev_stop (port_id); }int
@@ -1709,6 +1716,7 @@ rte_eth_dev_close(uint16_t port_id) dev->data->dev_started =0 ; (*dev->dev_ops->dev_close)(dev); +rte_trace_lib_ethdev_close (port_id);/* check behaviour flag - temporary for PMD migration */ if ((dev->data->dev_flags &RTE_ETH_DEV_CLOSE_REMOVE ) !=0 ) {/* new behaviour: send event + reset state + free all data */
@@ -1918,6 +1926,8 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, dev->data->min_rx_buf_size = mbp_buf_size; } +rte_trace_lib_ethdev_rxq_setup (port_id, rx_queue_id, nb_rx_desc, mp, + rx_conf, ret);return eth_err (port_id, ret); }
@@ -2088,6 +2098,8 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,return -EINVAL ; } +rte_trace_lib_ethdev_txq_setup (port_id, tx_queue_id, nb_tx_desc, + tx_conf);return eth_err (port_id, (*dev->dev_ops->tx_queue_setup)(dev, tx_queue_id, nb_tx_desc, socket_id, &local_conf)); }
lib/librte_ethdev/rte_ethdev.h +5 -0
@@ -158,6 +158,7 @@ extern "C" {#include <rte_config.h> #include <rte_ether.h> +#include "rte_trace_ethdev_fp.h" #include "rte_dev_info.h" extern int rte_eth_dev_logtype;
@@ -4400,6 +4401,8 @@ rte_eth_rx_burst(uint16_t port_id, uint16_t queue_id, }#endif +rte_trace_lib_ethdev_rx_burst (port_id, queue_id, (void **)rx_pkts, + nb_rx);return nb_rx; }
@@ -4663,6 +4666,8 @@ rte_eth_tx_burst(uint16_t port_id, uint16_t queue_id, }#endif +rte_trace_lib_ethdev_tx_burst (port_id, queue_id, (void **)tx_pkts, + nb_pkts);return (*dev->tx_pkt_burst)(dev->data->tx_queues[queue_id], tx_pkts, nb_pkts); }
lib/librte_ethdev/rte_ethdev_version.map +10 -0
@@ -230,4 +230,14 @@ EXPERIMENTAL { # added in 20.02 rte_flow_dev_dump; + + # added in 20.05 + __rte_trace_lib_ethdev_configure; + __rte_trace_lib_ethdev_rxq_setup; + __rte_trace_lib_ethdev_txq_setup; + __rte_trace_lib_ethdev_start; + __rte_trace_lib_ethdev_stop; + __rte_trace_lib_ethdev_close; + __rte_trace_lib_ethdev_rx_burst; + __rte_trace_lib_ethdev_tx_burst; };
lib/librte_ethdev/rte_trace_ethdev.h new file +90 -0
90 lines not on this page · raw message
lib/librte_ethdev/rte_trace_ethdev_fp.h new file +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_ETHDEV_FP_H_ +#define _RTE_TRACE_ETHDEV_FP_H_ + +/** +* @file +* +* API for ethdev trace support +*/ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rte_trace.h> + +RTE_TRACE_POINT_DP ( + rte_trace_lib_ethdev_rx_burst, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint16_t queue_id, + void **pkt_tbl, uint16_t nb_rx), + rte_trace_ctf_u16(port_id); rte_trace_ctf_u16(queue_id); +rte_trace_ctf_ptr (pkt_tbl);rte_trace_ctf_u16 (nb_rx); +) + +RTE_TRACE_POINT_DP ( + rte_trace_lib_ethdev_tx_burst, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint16_t queue_id, + void **pkts_tbl, uint16_t nb_pkts), + rte_trace_ctf_u16(port_id); rte_trace_ctf_u16(queue_id); +rte_trace_ctf_ptr (pkts_tbl);rte_trace_ctf_u16 (nb_pkts); +) + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_TRACE_ETHDEV_FP_H_ */
lib/librte_gro/Makefile +1 -0
@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_gro.a CFLAGS += -O3 +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net
lib/librte_gro/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_gro.c', 'gro_tcp4.c', 'gro_vxlan_tcp4.c') headers = files('rte_gro.h') deps += ['ethdev']
lib/librte_gso/Makefile +1 -0
@@ -6,6 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_gso.a +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net LDLIBS += -lrte_mempool
lib/librte_gso/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('gso_common.c', 'gso_tcp4.c', 'gso_udp4.c', 'gso_tunnel_tcp4.c', 'rte_gso.c') headers = files('rte_gso.h')
lib/librte_kni/Makefile +1 -0
@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_kni.a CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev EXPORT_MAP := rte_kni_version.map
lib/librte_kni/meson.build +1 -0
@@ -5,6 +5,7 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64') build = false reason = 'only supported on 64-bit linux' endif +allow_experimental_apis = true sources = files('rte_kni.c') headers = files('rte_kni.h') deps += ['ethdev', 'pci']
lib/librte_latencystats/Makefile +1 -0
@@ -6,6 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_latencystats.a +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 LDLIBS += -lm LDLIBS += -lpthread
lib/librte_latencystats/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_latencystats.c') headers = files('rte_latencystats.h') deps += ['metrics', 'ethdev']
lib/librte_port/Makefile +1 -0
@@ -18,6 +18,7 @@ endif CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API EXPORT_MAP := rte_port_version.map
lib/librte_port/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files( 'rte_port_ethdev.c', 'rte_port_fd.c',
Signature · 1 line
2.25.1
PATCH 29/32 eventdev: add tracepoints
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Add tracepoints at important and mandatory APIs for tracing support.
--- MAINTAINERS | 2 + drivers/event/skeleton/Makefile | 1 + drivers/event/skeleton/meson.build | 1 + lib/librte_eventdev/Makefile | 3 + lib/librte_eventdev/eventdev_trace_points.c | 173 +++++++++++ lib/librte_eventdev/meson.build | 3 + .../rte_event_crypto_adapter.c | 10 + .../rte_event_eth_rx_adapter.c | 11 + .../rte_event_eth_tx_adapter.c | 13 +- .../rte_event_eth_tx_adapter.h | 2 + lib/librte_eventdev/rte_event_timer_adapter.c | 8 +- lib/librte_eventdev/rte_event_timer_adapter.h | 8 + lib/librte_eventdev/rte_eventdev.c | 9 + lib/librte_eventdev/rte_eventdev.h | 5 +- lib/librte_eventdev/rte_eventdev_version.map | 42 +++ lib/librte_eventdev/rte_trace_eventdev.h | 278 ++++++++++++++++++ lib/librte_eventdev/rte_trace_eventdev_fp.h | 75 +++++ 17 files changed, 640 insertions(+), 4 deletions(-) create mode 100644 lib/librte_eventdev/eventdev_trace_points.c create mode 100644 lib/librte_eventdev/rte_trace_eventdev.h create mode 100644 lib/librte_eventdev/rte_trace_eventdev_fp.h
MAINTAINERS +2 -0
@@ -204,6 +204,8 @@ F: lib/librte_eal/common/eal_common_trace*.c F: lib/librte_eal/common/eal_trace.h F: lib/librte_ethdev/ethdev_trace_points.c F: lib/librte_ethdev/rte_trace_ethdev*.h +F: lib/librte_eventdev/eventdev_trace_points.c +F: lib/librte_eventdev/rte_trace_eventdev*.h Memory Allocation M: Anatoly Burakov <[email protected]>
drivers/event/skeleton/Makefile +1 -0
@@ -10,6 +10,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_pmd_skeleton_event.a CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_eventdev LDLIBS += -lrte_pci -lrte_bus_pci LDLIBS += -lrte_bus_vdev
drivers/event/skeleton/meson.build +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('skeleton_eventdev.c') deps += ['bus_pci', 'bus_vdev']
lib/librte_eventdev/Makefile +3 -0
@@ -22,6 +22,7 @@ LDLIBS += -lrte_mbuf -lrte_cryptodev -lpthread # library source files SRCS-y += rte_eventdev.c SRCS-y += rte_event_ring.c +SRCS-y += eventdev_trace_points.c SRCS-y += rte_event_eth_rx_adapter.c SRCS-y += rte_event_timer_adapter.c SRCS-y += rte_event_crypto_adapter.c
@@ -30,6 +31,8 @@ SRCS-y += rte_event_eth_tx_adapter.c # export include files SYMLINK-y-include += rte_eventdev.h SYMLINK-y-include += rte_eventdev_pmd.h +SYMLINK-y-include += rte_trace_eventdev.h +SYMLINK-y-include += rte_trace_eventdev_fp.h SYMLINK-y-include += rte_eventdev_pmd_pci.h SYMLINK-y-include += rte_eventdev_pmd_vdev.h SYMLINK-y-include += rte_event_ring.h
lib/librte_eventdev/eventdev_trace_points.c new file +173 -0
173 lines not on this page · raw message
lib/librte_eventdev/meson.build +3 -0
@@ -11,12 +11,15 @@ endif sources = files('rte_eventdev.c', 'rte_event_ring.c', + 'eventdev_trace_points.c', 'rte_event_eth_rx_adapter.c', 'rte_event_timer_adapter.c', 'rte_event_crypto_adapter.c', 'rte_event_eth_tx_adapter.c') headers = files('rte_eventdev.h', 'rte_eventdev_pmd.h', + 'rte_trace_eventdev.h', + 'rte_trace_eventdev_fp.h', 'rte_eventdev_pmd_pci.h', 'rte_eventdev_pmd_vdev.h', 'rte_event_ring.h',
lib/librte_eventdev/rte_event_crypto_adapter.c +10 -0
@@ -16,6 +16,7 @@#include "rte_eventdev.h" #include "rte_eventdev_pmd.h" +#include "rte_trace_eventdev.h" #include "rte_event_crypto_adapter.h" #define BATCH_SIZE 32
@@ -267,6 +268,8 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id, event_crypto_adapter[id] = adapter; +rte_trace_lib_event_crypto_adapter_create (id, dev_id, adapter, conf_arg, + mode);return 0 ; }
@@ -314,6 +317,7 @@ rte_event_crypto_adapter_free(uint8_t id)return -EBUSY ; } +rte_trace_lib_event_crypto_adapter_free (id, adapter);if (adapter->default_cb_arg)rte_free (adapter->conf_arg);rte_free (adapter->cdevs);
@@ -874,6 +878,8 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id,rte_service_component_runstate_set (adapter->service_id,1 ); } +rte_trace_lib_event_crypto_adapter_queue_pair_add (id, cdev_id, event, + queue_pair_id);return 0 ; }
@@ -959,6 +965,8 @@ rte_event_crypto_adapter_queue_pair_del(uint8_t id, uint8_t cdev_id, adapter->nb_qps); } +rte_trace_lib_event_crypto_adapter_queue_pair_del (id, cdev_id, + queue_pair_id, ret);return ret; }
@@ -1014,12 +1022,14 @@ rte_event_crypto_adapter_start(uint8_t id)if (adapter ==NULL )return -EINVAL ; +rte_trace_lib_event_crypto_adapter_start (id, adapter);return eca_adapter_ctrl (id,1 ); }int rte_event_crypto_adapter_stop (uint8_t id) { +rte_trace_lib_event_crypto_adapter_stop (id);return eca_adapter_ctrl (id,0 ); }
lib/librte_eventdev/rte_event_eth_rx_adapter.c +11 -0
@@ -20,6 +20,7 @@#include "rte_eventdev.h" #include "rte_eventdev_pmd.h" +#include "rte_trace_eventdev.h" #include "rte_event_eth_rx_adapter.h" #define BATCH_SIZE 32
@@ -1998,6 +1999,8 @@ rte_event_eth_rx_adapter_create_ext(uint8_t id, uint8_t dev_id, event_eth_rx_adapter[id] = rx_adapter;if (conf_cb == rxa_default_conf_cb) rx_adapter->default_cb_arg =1 ; +rte_trace_lib_event_eth_rx_adapter_create (id, dev_id, conf_cb, + conf_arg);return 0 ; }
@@ -2047,6 +2050,7 @@ rte_event_eth_rx_adapter_free(uint8_t id)rte_free (rx_adapter); event_eth_rx_adapter[id] =NULL ; +rte_trace_lib_event_eth_rx_adapter_free (id);return 0 ; }
@@ -2142,6 +2146,9 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id,rte_spinlock_unlock (&rx_adapter->rx_lock); } +rte_trace_lib_event_eth_rx_adapter_queue_add (id, eth_dev_id, + rx_queue_id, queue_conf, + ret);if (ret)return ret;
@@ -2263,18 +2270,22 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, uint16_t eth_dev_id, rxa_sw_adapter_queue_count(rx_adapter)); } +rte_trace_lib_event_eth_rx_adapter_queue_del (id, eth_dev_id, + rx_queue_id, ret);return ret; }int rte_event_eth_rx_adapter_start (uint8_t id) { +rte_trace_lib_event_eth_rx_adapter_start (id);return rxa_ctrl (id,1 ); }int rte_event_eth_rx_adapter_stop (uint8_t id) { +rte_trace_lib_event_eth_rx_adapter_stop (id);return rxa_ctrl (id,0 ); }
lib/librte_eventdev/rte_event_eth_tx_adapter.c +12 -1
@@ -6,6 +6,7 @@#include <rte_ethdev.h> #include "rte_eventdev_pmd.h" +#include "rte_trace_eventdev.h" #include "rte_event_eth_tx_adapter.h" #define TXA_BATCH_SIZE 32
@@ -942,7 +943,8 @@ rte_event_eth_tx_adapter_create(uint8_t id, uint8_t dev_id, txa_dev_id_array[id] =TXA_INVALID_DEV_ID ;return ret; } - +rte_trace_lib_event_eth_tx_adapter_create (id, dev_id,NULL , port_conf, + ret); txa_dev_id_array[id] = dev_id;return 0 ; }
@@ -984,6 +986,8 @@ rte_event_eth_tx_adapter_create_ext(uint8_t id, uint8_t dev_id,return ret; } +rte_trace_lib_event_eth_tx_adapter_create (id, dev_id, conf_cb, conf_arg, + ret); txa_dev_id_array[id] = dev_id;return 0 ; }
@@ -1012,6 +1016,7 @@ rte_event_eth_tx_adapter_free(uint8_t id) ret =txa_service_adapter_free (id); txa_dev_id_array[id] =TXA_INVALID_DEV_ID ; +rte_trace_lib_event_eth_tx_adapter_free (id, ret);return ret; }
@@ -1043,6 +1048,8 @@ rte_event_eth_tx_adapter_queue_add(uint8_t id,else ret =txa_service_queue_add (id,txa_evdev (id), eth_dev, queue); +rte_trace_lib_event_eth_tx_adapter_queue_add (id, eth_dev_id, queue, + ret);return ret; }
@@ -1073,6 +1080,8 @@ rte_event_eth_tx_adapter_queue_del(uint8_t id,else ret =txa_service_queue_del (id, eth_dev, queue); +rte_trace_lib_event_eth_tx_adapter_queue_del (id, eth_dev_id, queue, + ret);return ret; }
@@ -1094,6 +1103,7 @@ rte_event_eth_tx_adapter_start(uint8_t id) ret =txa_dev_start (id) ?txa_dev_start (id)(id,txa_evdev (id)) :0 ;if (ret ==0 ) ret =txa_service_start (id); +rte_trace_lib_event_eth_tx_adapter_start (id, ret);return ret; }
@@ -1154,5 +1164,6 @@ rte_event_eth_tx_adapter_stop(uint8_t id) ret =txa_dev_stop (id) ?txa_dev_stop (id)(id,txa_evdev (id)) :0 ;if (ret ==0 ) ret =txa_service_stop (id); +rte_trace_lib_event_eth_tx_adapter_stop (id, ret);return ret; }
lib/librte_eventdev/rte_event_eth_tx_adapter.h +2 -0
@@ -369,6 +369,8 @@ rte_event_eth_tx_adapter_enqueue(uint8_t dev_id, return 0; }#endif +rte_trace_lib_event_eth_tx_adapter_enqueue (dev_id, port_id, ev, + nb_events, flags);if (flags)return dev->txa_enqueue_same_dest (dev->data->ports[port_id], ev, nb_events);
lib/librte_eventdev/rte_event_timer_adapter.c +6 -2
@@ -22,6 +22,7 @@#include "rte_eventdev.h" #include "rte_eventdev_pmd.h" +#include "rte_trace_eventdev.h" #include "rte_event_timer_adapter.h" #include "rte_event_timer_adapter_pmd.h"
@@ -228,6 +229,8 @@ rte_event_timer_adapter_create_ext( adapter->allocated =1 ; +rte_trace_lib_event_timer_adapter_create (adapter_id, adapter, conf, + conf_cb);return adapter; free_memzone:
@@ -272,7 +275,7 @@ rte_event_timer_adapter_start(const struct rte_event_timer_adapter *adapter)return ret; adapter->data->started =1 ; - +rte_trace_lib_event_timer_adapter_start (adapter);return 0 ; }
@@ -295,7 +298,7 @@ rte_event_timer_adapter_stop(const struct rte_event_timer_adapter *adapter)return ret; adapter->data->started =0 ; - +rte_trace_lib_event_timer_adapter_stop (adapter);return 0 ; }
@@ -379,6 +382,7 @@ rte_event_timer_adapter_free(struct rte_event_timer_adapter *adapter) adapter->data =NULL ; adapter->allocated =0 ; +rte_trace_lib_event_timer_adapter_free (adapter);return 0 ; }
lib/librte_eventdev/rte_event_timer_adapter.h +8 -0
@@ -115,6 +115,7 @@ extern "C" {#include <rte_memory.h> #include "rte_eventdev.h" +#include "rte_trace_eventdev_fp.h" /** * Timer adapter clock source
@@ -579,6 +580,8 @@ rte_event_timer_arm_burst(const struct rte_event_timer_adapter *adapter,ADAPTER_VALID_OR_ERR_RET (adapter, -EINVAL );FUNC_PTR_OR_ERR_RET (adapter->arm_burst, -EINVAL );#endif +rte_trace_lib_event_timer_arm_burst (adapter, (void **)evtims, + nb_evtims);return adapter->arm_burst (adapter, evtims, nb_evtims); }
@@ -622,6 +625,9 @@ rte_event_timer_arm_tmo_tick_burst(ADAPTER_VALID_OR_ERR_RET (adapter, -EINVAL );FUNC_PTR_OR_ERR_RET (adapter->arm_tmo_tick_burst, -EINVAL );#endif +rte_trace_lib_event_timer_arm_tmo_tick_burst (adapter, timeout_ticks, + (void **)evtims, + nb_evtims);return adapter->arm_tmo_tick_burst (adapter, evtims, timeout_ticks, nb_evtims); }
@@ -655,6 +661,8 @@ rte_event_timer_cancel_burst(const struct rte_event_timer_adapter *adapter,ADAPTER_VALID_OR_ERR_RET (adapter, -EINVAL );FUNC_PTR_OR_ERR_RET (adapter->cancel_burst, -EINVAL );#endif +rte_trace_lib_event_timer_cancel_burst (adapter, (void **)evtims, + nb_evtims);return adapter->cancel_burst (adapter, evtims, nb_evtims); }
lib/librte_eventdev/rte_eventdev.c +9 -0
@@ -35,6 +35,7 @@#include "rte_eventdev.h" #include "rte_eventdev_pmd.h" +#include "rte_trace_eventdev.h" static struct rte_eventdev rte_event_devices[RTE_EVENT_MAX_DEVS ];
@@ -524,6 +525,7 @@ rte_event_dev_configure(uint8_t dev_id, } dev->data->event_dev_cap = info.event_dev_cap; +rte_trace_lib_eventdev_configure (dev_id, dev_conf, diag);return diag; }
@@ -650,6 +652,7 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id, } dev->data->queues_cfg[queue_id] = *queue_conf; +rte_trace_lib_event_queue_setup (dev_id, queue_id, queue_conf);return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf); }
@@ -766,6 +769,7 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,if (!diag) diag =rte_event_port_unlink (dev_id, port_id,NULL ,0 ); +rte_trace_lib_event_port_setup (dev_id, port_id, port_conf, diag);if (diag <0 )return diag;
@@ -936,6 +940,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,for (i =0 ; i < diag; i++) links_map[queues[i]] = (uint8_t )priorities[i]; +rte_trace_lib_event_port_link (dev_id, port_id, nb_links, diag);return diag; }
@@ -1001,6 +1006,7 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,for (i =0 ; i < diag; i++) links_map[queues[i]] =EVENT_QUEUE_SERVICE_PRIORITY_INVALID ; +rte_trace_lib_event_port_unlink (dev_id, port_id, nb_unlinks, diag);return diag; }
@@ -1213,6 +1219,7 @@ rte_event_dev_start(uint8_t dev_id) } diag = (*dev->dev_ops->dev_start)(dev); +rte_trace_lib_eventdev_start (dev_id, diag);if (diag ==0 ) dev->data->dev_started =1 ;else
@@ -1257,6 +1264,7 @@ rte_event_dev_stop(uint8_t dev_id) dev->data->dev_started =0 ; (*dev->dev_ops->dev_stop)(dev); +rte_trace_lib_eventdev_stop (dev_id); }int
@@ -1275,6 +1283,7 @@ rte_event_dev_close(uint8_t dev_id)return -EBUSY ; } +rte_trace_lib_eventdev_close (dev_id);return (*dev->dev_ops->dev_close)(dev); }
lib/librte_eventdev/rte_eventdev.h +4 -1
@@ -215,6 +215,8 @@ extern "C" {#include <rte_memory.h> #include <rte_errno.h> +#include "rte_trace_eventdev_fp.h" +struct rte_mbuf ;/* we just use mbuf pointers; no need to include rte_mbuf.h */ struct rte_event ;
@@ -1343,6 +1345,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, return 0; }#endif +rte_trace_lib_event_enq_burst (dev_id, port_id, ev, nb_events, fn);/* * Allow zero cost non burst mode routine invocation if application * requests nb_events as const one
@@ -1620,7 +1623,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[], return 0; }#endif - +rte_trace_lib_event_deq_burst (dev_id, port_id, ev, nb_events);/* * Allow zero cost non burst mode routine invocation if application * requests nb_events as const one
lib/librte_eventdev/rte_eventdev_version.map +42 -0
45 lines not on this page · raw message
lib/librte_eventdev/rte_trace_eventdev.h new file +278 -0
278 lines not on this page · raw message
lib/librte_eventdev/rte_trace_eventdev_fp.h new file +75 -0
75 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 30/32 cryptodev: add tracepoints
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Add tracepoints at important and mandatory APIs for tracing support.
--- MAINTAINERS | 2 + drivers/crypto/ccp/Makefile | 1 + drivers/crypto/ccp/meson.build | 2 + drivers/crypto/mvsam/Makefile | 1 + drivers/crypto/mvsam/meson.build | 1 + drivers/crypto/null/Makefile | 1 + drivers/crypto/null/meson.build | 1 + drivers/crypto/scheduler/Makefile | 1 + drivers/crypto/scheduler/meson.build | 1 + drivers/crypto/virtio/Makefile | 1 + drivers/crypto/virtio/meson.build | 1 + lib/librte_cryptodev/Makefile | 4 +- lib/librte_cryptodev/cryptodev_trace_points.c | 70 +++++++++ lib/librte_cryptodev/meson.build | 7 +- lib/librte_cryptodev/rte_cryptodev.c | 18 +++ lib/librte_cryptodev/rte_cryptodev.h | 6 + .../rte_cryptodev_version.map | 18 +++ lib/librte_cryptodev/rte_trace_cryptodev.h | 133 ++++++++++++++++++ lib/librte_cryptodev/rte_trace_cryptodev_fp.h | 34 +++++ 19 files changed, 300 insertions(+), 3 deletions(-) create mode 100644 lib/librte_cryptodev/cryptodev_trace_points.c create mode 100644 lib/librte_cryptodev/rte_trace_cryptodev.h create mode 100644 lib/librte_cryptodev/rte_trace_cryptodev_fp.h
MAINTAINERS +2 -0
@@ -206,6 +206,8 @@ F: lib/librte_ethdev/ethdev_trace_points.c F: lib/librte_ethdev/rte_trace_ethdev*.h F: lib/librte_eventdev/eventdev_trace_points.c F: lib/librte_eventdev/rte_trace_eventdev*.h +F: lib/librte_cryptodev/cryptodev_trace_points.c +F: lib/librte_cryptodev/rte_trace_cryptodev*.h Memory Allocation M: Anatoly Burakov <[email protected]>
drivers/crypto/ccp/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_ccp.a CFLAGS += -O3 CFLAGS += -I$(SRCDIR) CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API # external library include paths LDLIBS += -lcrypto
drivers/crypto/ccp/meson.build +2 -0
@@ -5,6 +5,8 @@ if not is_linux build = false reason = 'only supported on linux' endif + +allow_experimental_apis = true dep = dependency('libcrypto', required: false) if not dep.found() build = false
drivers/crypto/mvsam/Makefile +1 -0
@@ -22,6 +22,7 @@ CFLAGS += $(WERROR_FLAGS) CFLAGS += -I$(RTE_SDK)/drivers/common/mvep CFLAGS += -I$(LIBMUSDK_PATH)/include CFLAGS += -DMVCONF_TYPES_PUBLIC +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC # versioning export map
drivers/crypto/mvsam/meson.build +1 -0
@@ -17,6 +17,7 @@ else cflags += ['-DMVCONF_TYPES_PUBLIC', '-DMVCONF_DMA_PHYS_ADDR_T_PUBLIC'] endif +allow_experimental_apis = true sources = files('rte_mrvl_pmd.c', 'rte_mrvl_pmd_ops.c') deps += ['bus_vdev', 'common_mvep']
drivers/crypto/null/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_pmd_null_crypto.a # build flags CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_cryptodev LDLIBS += -lrte_bus_vdev
drivers/crypto/null/meson.build +1 -0
@@ -3,4 +3,5 @@ deps += 'bus_vdev' name = 'null_crypto' +allow_experimental_apis = true sources = files('null_crypto_pmd.c', 'null_crypto_pmd_ops.c')
drivers/crypto/scheduler/Makefile +1 -0
@@ -9,6 +9,7 @@ LIB = librte_pmd_crypto_scheduler.a # build flags CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_cryptodev -lrte_kvargs -lrte_reorder LDLIBS += -lrte_bus_vdev
drivers/crypto/scheduler/meson.build +1 -0
@@ -3,6 +3,7 @@ deps += ['bus_vdev', 'reorder'] name = 'crypto_scheduler' +allow_experimental_apis = true sources = files( 'rte_cryptodev_scheduler.c', 'scheduler_failover.c',
drivers/crypto/virtio/Makefile +1 -0
@@ -14,6 +14,7 @@ LIB = librte_pmd_virtio_crypto.a CFLAGS += -I$(RTE_SDK)/lib/librte_vhost CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API EXPORT_MAP := rte_pmd_virtio_crypto_version.map
drivers/crypto/virtio/meson.build +1 -0
@@ -4,5 +4,6 @@ includes += include_directories('../../../lib/librte_vhost') deps += 'bus_pci' name = 'virtio_crypto' +allow_experimental_apis = true sources = files('virtio_cryptodev.c', 'virtio_pci.c', 'virtio_rxtx.c', 'virtqueue.c')
lib/librte_cryptodev/Makefile +3 -1
@@ -14,7 +14,7 @@ LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf LDLIBS += -lrte_kvargs # library source files -SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c +SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c cryptodev_trace_points.c # export include files SYMLINK-y-include += rte_crypto.h
@@ -22,6 +22,8 @@ SYMLINK-y-include += rte_crypto_sym.h SYMLINK-y-include += rte_cryptodev.h SYMLINK-y-include += rte_cryptodev_pmd.h SYMLINK-y-include += rte_crypto_asym.h +SYMLINK-y-include += rte_trace_cryptodev.h +SYMLINK-y-include += rte_trace_cryptodev_fp.h # versioning export map EXPORT_MAP := rte_cryptodev_version.map
lib/librte_cryptodev/cryptodev_trace_points.c new file +70 -0
70 lines not on this page · raw message
lib/librte_cryptodev/meson.build +5 -2
@@ -2,10 +2,13 @@ # Copyright(c) 2017-2019 Intel Corporation allow_experimental_apis = true -sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c') +sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c', + 'cryptodev_trace_points.c') headers = files('rte_cryptodev.h', 'rte_cryptodev_pmd.h', 'rte_crypto.h', 'rte_crypto_sym.h', - 'rte_crypto_asym.h') + 'rte_crypto_asym.h', + 'rte_trace_cryptodev.h', + 'rte_trace_cryptodev_fp.h') deps += ['kvargs', 'mbuf']
lib/librte_cryptodev/rte_cryptodev.c +18 -0
@@ -40,6 +40,7 @@#include "rte_crypto.h" #include "rte_cryptodev.h" #include "rte_cryptodev_pmd.h" +#include "rte_trace_cryptodev.h" static uint8_t nb_drivers;
@@ -905,6 +906,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)return diag; } +rte_trace_lib_cryptodev_configure (dev_id, config);return (*dev->dev_ops->dev_configure)(dev, config); }
@@ -933,6 +935,7 @@ rte_cryptodev_start(uint8_t dev_id) } diag = (*dev->dev_ops->dev_start)(dev); +rte_trace_lib_cryptodev_start (dev_id, diag);if (diag ==0 ) dev->data->dev_started =1 ;else
@@ -962,6 +965,7 @@ rte_cryptodev_stop(uint8_t dev_id) } (*dev->dev_ops->dev_stop)(dev); +rte_trace_lib_cryptodev_stop (dev_id); dev->data->dev_started =0 ; }
@@ -998,6 +1002,7 @@ rte_cryptodev_close(uint8_t dev_id)RTE_FUNC_PTR_OR_ERR_RET (*dev->dev_ops->dev_close, -ENOTSUP ); retval = (*dev->dev_ops->dev_close)(dev); +rte_trace_lib_cryptodev_close (dev_id, retval);if (retval <0 )return retval;
@@ -1067,6 +1072,8 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,RTE_FUNC_PTR_OR_ERR_RET (*dev->dev_ops->queue_pair_setup, -ENOTSUP ); +rte_trace_lib_cryptodev_queue_pair_setup (dev_id, queue_pair_id, + qp_conf);return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf, socket_id); }
@@ -1283,6 +1290,7 @@ rte_cryptodev_sym_session_init(uint8_t dev_id, } } +rte_trace_lib_cryptodev_sym_session_init (dev_id, sess, xforms, mp); sess->sess_data[index].refcnt++;return 0 ; }
@@ -1319,6 +1327,7 @@ rte_cryptodev_asym_session_init(uint8_t dev_id, } } +rte_trace_lib_cryptodev_asym_session_init (dev_id, sess, xforms, mp);return 0 ; }
@@ -1359,6 +1368,9 @@ rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts, pool_priv->nb_drivers = nb_drivers; pool_priv->user_data_sz = user_data_size; +rte_trace_lib_cryptodev_sym_session_pool_create (name, nb_elts, + elt_size, cache_size, + user_data_size, mp);return mp; }
@@ -1403,6 +1415,7 @@ rte_cryptodev_sym_session_create(struct rte_mempool *mp)memset (sess->sess_data,0 ,rte_cryptodev_sym_session_data_size (sess)); +rte_trace_lib_cryptodev_sym_session_create (mp, sess);return sess; }
@@ -1422,6 +1435,7 @@ rte_cryptodev_asym_session_create(struct rte_mempool *mp)*/ memset (sess,0 , (sizeof (void *) * nb_drivers) +sizeof (uint8_t )); +rte_trace_lib_cryptodev_asym_session_create (mp, sess);return sess; }
@@ -1447,6 +1461,7 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id, dev->dev_ops->sym_session_clear (dev, sess); +rte_trace_lib_cryptodev_sym_session_clear (dev_id, sess);return 0 ; }
@@ -1465,6 +1480,7 @@ rte_cryptodev_asym_session_clear(uint8_t dev_id, dev->dev_ops->asym_session_clear (dev, sess); +rte_trace_lib_cryptodev_sym_session_clear (dev_id, sess);return 0 ; }
@@ -1487,6 +1503,7 @@ rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess) sess_mp =rte_mempool_from_obj (sess);rte_mempool_put (sess_mp, sess); +rte_trace_lib_cryptodev_sym_session_free (sess);return 0 ; }
@@ -1511,6 +1528,7 @@ rte_cryptodev_asym_session_free(struct rte_cryptodev_asym_session *sess) sess_mp =rte_mempool_from_obj (sess);rte_mempool_put (sess_mp, sess); +rte_trace_lib_cryptodev_asym_session_free (sess);return 0 ; }
lib/librte_cryptodev/rte_cryptodev.h +6 -0
@@ -24,6 +24,8 @@ extern "C" {#include <rte_common.h> #include <rte_config.h> +#include "rte_trace_cryptodev_fp.h" +extern const char **rte_cyptodev_names;/* Logging Macros */
@@ -924,6 +926,8 @@ rte_cryptodev_dequeue_burst(uint8_t dev_id, uint16_t qp_id, nb_ops = (*dev->dequeue_burst) (dev->data->queue_pairs[qp_id], ops, nb_ops); +rte_trace_lib_cryptodev_dequeue_burst (dev_id, qp_id, (void **)ops, + nb_ops);return nb_ops; }
@@ -964,6 +968,8 @@ rte_cryptodev_enqueue_burst(uint8_t dev_id, uint16_t qp_id, {struct rte_cryptodev *dev = &rte_cryptodevs[dev_id]; +rte_trace_lib_cryptodev_enqueue_burst (dev_id, qp_id, (void **)ops, + nb_ops);return (*dev->enqueue_burst)( dev->data->queue_pairs[qp_id], ops, nb_ops); }
lib/librte_cryptodev/rte_cryptodev_version.map +18 -0
@@ -78,4 +78,22 @@ EXPERIMENTAL { rte_cryptodev_sym_session_set_user_data; rte_crypto_asym_op_strings; rte_crypto_asym_xform_strings; + + # added in 20.05 + __rte_trace_lib_cryptodev_configure; + __rte_trace_lib_cryptodev_start; + __rte_trace_lib_cryptodev_stop; + __rte_trace_lib_cryptodev_close; + __rte_trace_lib_cryptodev_queue_pair_setup; + __rte_trace_lib_cryptodev_sym_session_pool_create; + __rte_trace_lib_cryptodev_sym_session_create; + __rte_trace_lib_cryptodev_asym_session_create; + __rte_trace_lib_cryptodev_sym_session_free; + __rte_trace_lib_cryptodev_asym_session_free; + __rte_trace_lib_cryptodev_sym_session_init; + __rte_trace_lib_cryptodev_asym_session_init; + __rte_trace_lib_cryptodev_sym_session_clear; + __rte_trace_lib_cryptodev_asym_session_clear; + __rte_trace_lib_cryptodev_dequeue_burst; + __rte_trace_lib_cryptodev_enqueue_burst; };
lib/librte_cryptodev/rte_trace_cryptodev.h new file +133 -0
133 lines not on this page · raw message
lib/librte_cryptodev/rte_trace_cryptodev_fp.h new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_CRYPTODEV_FP_H_ +#define _RTE_TRACE_CRYPTODEV_FP_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rte_trace.h> + +RTE_TRACE_POINT_DP ( + rte_trace_lib_cryptodev_enqueue_burst, + RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t qp_id, void **ops, + uint16_t nb_ops), + rte_trace_ctf_u8(dev_id); rte_trace_ctf_u16(qp_id); +rte_trace_ctf_ptr (ops);rte_trace_ctf_u16 (nb_ops); +) + +RTE_TRACE_POINT_DP ( + rte_trace_lib_cryptodev_dequeue_burst, + RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t qp_id, void **ops, + uint16_t nb_ops), + rte_trace_ctf_u8(dev_id); rte_trace_ctf_u16(qp_id); +rte_trace_ctf_ptr (ops);rte_trace_ctf_u16 (nb_ops); +) + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_TRACE_CRYPTODEV_FP_H_ */
Signature · 1 line
2.25.1
PATCH 31/32 mempool: add tracepoints
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Add tracepoints at important and mandatory APIs for tracing support.
--- MAINTAINERS | 2 + drivers/common/cpt/Makefile | 1 + drivers/mempool/ring/Makefile | 1 + drivers/mempool/ring/meson.build | 1 + drivers/raw/ioat/Makefile | 1 + drivers/raw/ioat/meson.build | 1 + drivers/raw/octeontx2_dma/Makefile | 1 + drivers/raw/octeontx2_dma/meson.build | 1 + drivers/raw/octeontx2_ep/Makefile | 1 + drivers/raw/octeontx2_ep/meson.build | 1 + drivers/raw/skeleton/Makefile | 1 + drivers/raw/skeleton/meson.build | 1 + lib/librte_distributor/Makefile | 1 + lib/librte_distributor/meson.build | 1 + lib/librte_ip_frag/Makefile | 1 + lib/librte_ip_frag/meson.build | 1 + lib/librte_mempool/Makefile | 3 + lib/librte_mempool/mempool_trace_points.c | 108 +++++++++++++++ lib/librte_mempool/meson.build | 7 +- lib/librte_mempool/rte_mempool.c | 16 +++ lib/librte_mempool/rte_mempool.h | 13 ++ lib/librte_mempool/rte_mempool_ops.c | 7 + lib/librte_mempool/rte_mempool_version.map | 26 ++++ lib/librte_mempool/rte_trace_mempool.h | 148 +++++++++++++++++++++ lib/librte_mempool/rte_trace_mempool_fp.h | 102 ++++++++++++++ lib/librte_reorder/Makefile | 1 + lib/librte_reorder/meson.build | 1 + lib/librte_sched/Makefile | 1 + lib/librte_sched/meson.build | 1 + lib/librte_security/Makefile | 1 + lib/librte_security/meson.build | 1 + lib/librte_table/Makefile | 1 + lib/librte_table/meson.build | 1 + 33 files changed, 451 insertions(+), 4 deletions(-) create mode 100644 lib/librte_mempool/mempool_trace_points.c create mode 100644 lib/librte_mempool/rte_trace_mempool.h create mode 100644 lib/librte_mempool/rte_trace_mempool_fp.h
MAINTAINERS +2 -0
@@ -208,6 +208,8 @@ F: lib/librte_eventdev/eventdev_trace_points.c F: lib/librte_eventdev/rte_trace_eventdev*.h F: lib/librte_cryptodev/cryptodev_trace_points.c F: lib/librte_cryptodev/rte_trace_cryptodev*.h +F: lib/librte_mempool/mempool_trace_points.c +F: lib/librte_mempool/rte_trace_mempool*.h Memory Allocation M: Anatoly Burakov <[email protected]>
drivers/common/cpt/Makefile +1 -0
@@ -10,6 +10,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_common_cpt.a CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -I$(RTE_SDK)/drivers/bus/pci EXPORT_MAP := rte_common_cpt_version.map
drivers/mempool/ring/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_mempool_ring.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mempool -lrte_ring EXPORT_MAP := rte_mempool_ring_version.map
drivers/mempool/ring/meson.build +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_mempool_ring.c')
drivers/raw/ioat/Makefile +1 -0
@@ -9,6 +9,7 @@ LIB = librte_rawdev_ioat.a # build flags CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_rawdev LDLIBS += -lrte_pci -lrte_bus_pci
drivers/raw/ioat/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2019 Intel Corporation +allow_experimental_apis = true build = dpdk_conf.has('RTE_ARCH_X86') reason = 'only supported on x86' sources = files('ioat_rawdev.c',
drivers/raw/octeontx2_dma/Makefile +1 -0
@@ -8,6 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_rawdev_octeontx2_dma.a CFLAGS += -O3 $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2/ CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_dma/
drivers/raw/octeontx2_dma/meson.build +1 -0
@@ -2,6 +2,7 @@ # Copyright(C) 2019 Marvell International Ltd. # +allow_experimental_apis = true deps += ['bus_pci', 'common_octeontx2', 'rawdev'] sources = files('otx2_dpi_rawdev.c', 'otx2_dpi_msg.c', 'otx2_dpi_test.c')
drivers/raw/octeontx2_ep/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_rawdev_octeontx2_ep.a # Build flags CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_ep/
drivers/raw/octeontx2_ep/meson.build +1 -0
@@ -2,6 +2,7 @@ # Copyright(C) 2019 Marvell International Ltd. # +allow_experimental_apis = true deps += ['bus_pci', 'common_octeontx2', 'rawdev'] sources = files('otx2_ep_rawdev.c', 'otx2_ep_enqdeq.c',
drivers/raw/skeleton/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_rawdev_skeleton.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal LDLIBS += -lrte_rawdev LDLIBS += -lrte_bus_vdev
drivers/raw/skeleton/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP +allow_experimental_apis = true deps += ['rawdev', 'kvargs', 'mbuf', 'bus_vdev'] sources = files('skeleton_rawdev.c', 'skeleton_rawdev_test.c')
lib/librte_distributor/Makefile +1 -0
@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_distributor.a CFLAGS += -O3 +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev
lib/librte_distributor/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_distributor.c', 'rte_distributor_single.c') if arch_subdir == 'x86' sources += files('rte_distributor_match_sse.c')
lib/librte_ip_frag/Makefile +1 -0
@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_ip_frag.a CFLAGS += -O3 +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev LDLIBS += -lrte_hash
lib/librte_ip_frag/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_ipv4_fragmentation.c', 'rte_ipv6_fragmentation.c', 'rte_ipv4_reassembly.c',
lib/librte_mempool/Makefile +3 -0
@@ -19,7 +19,10 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool.c SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops.c SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops_default.c +SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += mempool_trace_points.c # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h +SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_trace_mempool.h +SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_trace_mempool_fp.h include $(RTE_SDK)/mk/rte.lib.mk
lib/librte_mempool/mempool_trace_points.c new file +108 -0
108 lines not on this page · raw message
lib/librte_mempool/meson.build +3 -4
@@ -1,8 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -allow_experimental_apis = true - extra_flags = [] foreach flag: extra_flags
@@ -12,8 +10,9 @@ foreach flag: extra_flags endforeach sources = files('rte_mempool.c', 'rte_mempool_ops.c', - 'rte_mempool_ops_default.c') -headers = files('rte_mempool.h') + 'rte_mempool_ops_default.c', 'mempool_trace_points.c') +headers = files('rte_mempool.h', 'rte_trace_mempool.h', + 'rte_trace_mempool_fp.h') deps += ['ring'] # memseg walk is not yet part of stable API
lib/librte_mempool/rte_mempool.c +16 -0
@@ -33,6 +33,7 @@#include <rte_tailq.h> #include "rte_mempool.h" +#include "rte_trace_mempool.h" TAILQ_HEAD (rte_mempool_list, rte_tailq_entry);
@@ -377,6 +378,8 @@ rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,if (ret ==0 ) ret = -EINVAL ; +rte_trace_lib_mempool_populate_iova (mp, vaddr, iova, len, free_cb, + opaque);return ret; }
@@ -444,6 +447,8 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,if (cnt ==0 )return -EINVAL ; +rte_trace_lib_mempool_populate_virt (mp, addr, len, pg_sz, free_cb, + opaque);return cnt; fail:
@@ -473,6 +478,7 @@ rte_mempool_get_page_size(struct rte_mempool *mp, size_t *pg_sz)else *pg_sz =getpagesize (); +rte_trace_lib_mempool_get_page_size (mp, *pg_sz);return 0 ; }
@@ -611,6 +617,7 @@ rte_mempool_populate_default(struct rte_mempool *mp) } } +rte_trace_lib_mempool_populate_default (mp);return mp->size; fail:
@@ -701,6 +708,7 @@ rte_mempool_populate_anon(struct rte_mempool *mp) goto fail; } +rte_trace_lib_mempool_populate_anon (mp);return mp->populated_size; fail:
@@ -732,6 +740,7 @@ rte_mempool_free(struct rte_mempool *mp) }rte_mcfg_tailq_write_unlock (); +rte_trace_lib_mempool_free (mp);rte_mempool_free_memchunks (mp);rte_mempool_ops_free (mp);rte_memzone_free (mp->mz);
@@ -770,6 +779,7 @@ rte_mempool_cache_create(uint32_t size, int socket_id)mempool_cache_init (cache, size); +rte_trace_lib_mempool_cache_create (size, socket_id, cache);return cache; }
@@ -781,6 +791,7 @@ rte_mempool_cache_create(uint32_t size, int socket_id)void rte_mempool_cache_free (struct rte_mempool_cache *cache) { +rte_trace_lib_mempool_cache_free (cache);rte_free (cache); }
@@ -911,6 +922,8 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,rte_mcfg_tailq_write_unlock ();rte_mcfg_mempool_write_unlock (); +rte_trace_lib_mempool_create_empty (name, n, elt_size, cache_size, + private_data_size, flags, mp);return mp; exit_unlock:
@@ -963,6 +976,9 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,if (obj_init)rte_mempool_obj_iter (mp, obj_init, obj_init_arg); +rte_trace_lib_mempool_create (name, n, elt_size, cache_size, + private_data_size, mp_init, mp_init_arg, + obj_init, obj_init_arg, flags, mp);return mp; fail:
lib/librte_mempool/rte_mempool.h +13 -0
@@ -51,6 +51,8 @@#include <rte_memcpy.h> #include <rte_common.h> +#include "rte_trace_mempool_fp.h" +#ifdef __cplusplusextern "C" {#endif
@@ -736,6 +738,7 @@ rte_mempool_ops_dequeue_bulk(struct rte_mempool *mp, {struct rte_mempool_ops *ops; +rte_trace_lib_mempool_ops_dequeue_bulk (mp, obj_table, n); ops =rte_mempool_get_ops (mp->ops_index);return ops->dequeue (mp, obj_table, n); }
@@ -761,6 +764,7 @@ rte_mempool_ops_dequeue_contig_blocks(struct rte_mempool *mp, ops =rte_mempool_get_ops (mp->ops_index);RTE_ASSERT (ops->dequeue_contig_blocks !=NULL ); +rte_trace_lib_mempool_ops_dequeue_contig_blocks (mp, first_obj_table, n);return ops->dequeue_contig_blocks (mp, first_obj_table, n); }
@@ -783,6 +787,7 @@ rte_mempool_ops_enqueue_bulk(struct rte_mempool *mp, void * const *obj_table, {struct rte_mempool_ops *ops; +rte_trace_lib_mempool_ops_enqueue_bulk (mp, obj_table, n); ops =rte_mempool_get_ops (mp->ops_index);return ops->enqueue (mp, obj_table, n); }
@@ -1264,6 +1269,8 @@ rte_mempool_default_cache(struct rte_mempool *mp, unsigned lcore_id)if (lcore_id >=RTE_MAX_LCORE )return NULL ; +rte_trace_lib_mempool_default_cache (mp, lcore_id, + &mp->local_cache[lcore_id]);return &mp->local_cache[lcore_id]; }
@@ -1283,6 +1290,7 @@ rte_mempool_cache_flush(struct rte_mempool_cache *cache, cache =rte_mempool_default_cache (mp,rte_lcore_id ());if (cache ==NULL || cache->len ==0 )return ; +rte_trace_lib_mempool_cache_flush (cache, mp);rte_mempool_ops_enqueue_bulk (mp, cache->objs, cache->len); cache->len =0 ; }
@@ -1362,6 +1370,7 @@ static __rte_always_inline void rte_mempool_generic_put(struct rte_mempool *mp, void * const *obj_table, unsigned int n, struct rte_mempool_cache *cache) { +rte_trace_lib_mempool_generic_put (mp, obj_table, n, cache);__mempool_check_cookies (mp, obj_table, n,0 );__mempool_generic_put (mp, obj_table, n, cache); }
@@ -1386,6 +1395,7 @@ rte_mempool_put_bulk(struct rte_mempool *mp, void * const *obj_table, {struct rte_mempool_cache *cache; cache =rte_mempool_default_cache (mp,rte_lcore_id ()); +rte_trace_lib_mempool_put_bulk (mp, obj_table, n, cache);rte_mempool_generic_put (mp, obj_table, n, cache); }
@@ -1507,6 +1517,7 @@ rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table, ret =__mempool_generic_get (mp, obj_table, n, cache);if (ret ==0 )__mempool_check_cookies (mp, obj_table, n,1 ); +rte_trace_lib_mempool_generic_get (mp, obj_table, n, cache);return ret; }
@@ -1537,6 +1548,7 @@ rte_mempool_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned int n) {struct rte_mempool_cache *cache; cache =rte_mempool_default_cache (mp,rte_lcore_id ()); +rte_trace_lib_mempool_get_bulk (mp, obj_table, n, cache);return rte_mempool_generic_get (mp, obj_table, n, cache); }
@@ -1606,6 +1618,7 @@ rte_mempool_get_contig_blocks(struct rte_mempool *mp,__MEMPOOL_CONTIG_BLOCKS_STAT_ADD (mp, get_fail, n); } +rte_trace_lib_mempool_get_contig_blocks (mp, first_obj_table, n);return ret; }
lib/librte_mempool/rte_mempool_ops.c +7 -0
@@ -11,6 +11,8 @@#include <rte_errno.h> #include <rte_dev.h> +#include "rte_trace_mempool.h" +/* indirect jump table to support external memory pools. */ struct rte_mempool_ops_table rte_mempool_ops_table = { .sl =RTE_SPINLOCK_INITIALIZER ,
@@ -74,6 +76,7 @@ rte_mempool_ops_alloc(struct rte_mempool *mp) {struct rte_mempool_ops *ops; +rte_trace_lib_mempool_ops_alloc (mp); ops =rte_mempool_get_ops (mp->ops_index);return ops->alloc (mp); }
@@ -84,6 +87,7 @@ rte_mempool_ops_free(struct rte_mempool *mp) {struct rte_mempool_ops *ops; +rte_trace_lib_mempool_ops_free (mp); ops =rte_mempool_get_ops (mp->ops_index);if (ops->free ==NULL )return ;
@@ -130,6 +134,8 @@ rte_mempool_ops_populate(struct rte_mempool *mp, unsigned int max_objs, ops =rte_mempool_get_ops (mp->ops_index); +rte_trace_lib_mempool_ops_populate (mp, max_objs, vaddr, iova, len, + obj_cb, obj_cb_arg);if (ops->populate ==NULL ) return rte_mempool_op_populate_default(mp, max_objs, vaddr, iova, len, obj_cb,
@@ -178,5 +184,6 @@ rte_mempool_set_ops_byname(struct rte_mempool *mp, const char *name, mp->ops_index = i; mp->pool_config = pool_config; +rte_trace_lib_mempool_set_ops_byname (mp, name, pool_config);return 0 ; }
lib/librte_mempool/rte_mempool_version.map +26 -0
@@ -45,4 +45,30 @@ EXPERIMENTAL { rte_mempool_get_page_size; rte_mempool_op_calc_mem_size_helper; rte_mempool_op_populate_helper; + + # added in 20.05 + __rte_trace_lib_mempool_ops_dequeue_bulk; + __rte_trace_lib_mempool_ops_dequeue_contig_blocks; + __rte_trace_lib_mempool_ops_enqueue_bulk; + __rte_trace_lib_mempool_generic_put; + __rte_trace_lib_mempool_put_bulk; + __rte_trace_lib_mempool_generic_get; + __rte_trace_lib_mempool_get_bulk; + __rte_trace_lib_mempool_get_contig_blocks; + __rte_trace_lib_mempool_create; + __rte_trace_lib_mempool_create_empty; + __rte_trace_lib_mempool_free; + __rte_trace_lib_mempool_populate_iova; + __rte_trace_lib_mempool_populate_virt; + __rte_trace_lib_mempool_populate_default; + __rte_trace_lib_mempool_populate_anon; + __rte_trace_lib_mempool_cache_create; + __rte_trace_lib_mempool_cache_free; + __rte_trace_lib_mempool_default_cache; + __rte_trace_lib_mempool_get_page_size; + __rte_trace_lib_mempool_cache_flush; + __rte_trace_lib_mempool_ops_populate; + __rte_trace_lib_mempool_ops_alloc; + __rte_trace_lib_mempool_ops_free; + __rte_trace_lib_mempool_set_ops_byname; };
lib/librte_mempool/rte_trace_mempool.h new file +148 -0
148 lines not on this page · raw message
lib/librte_mempool/rte_trace_mempool_fp.h new file +102 -0
102 lines not on this page · raw message
lib/librte_reorder/Makefile +1 -0
@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_reorder.a CFLAGS += -O3 +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf
lib/librte_reorder/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_reorder.c') headers = files('rte_reorder.h') deps += ['mbuf']
lib/librte_sched/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_sched.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lm LDLIBS += -lrt
lib/librte_sched/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_sched.c', 'rte_red.c', 'rte_approx.c') headers = files('rte_sched.h', 'rte_sched_common.h', 'rte_red.h', 'rte_approx.h')
lib/librte_security/Makefile +1 -0
@@ -9,6 +9,7 @@ LIB = librte_security.a # build flags CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mempool # library source files
lib/librte_security/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation +allow_experimental_apis = true sources = files('rte_security.c') headers = files('rte_security.h', 'rte_security_driver.h') deps += ['mempool', 'cryptodev']
lib/librte_table/Makefile +1 -0
@@ -10,6 +10,7 @@ LIB = librte_table.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_port LDLIBS += -lrte_lpm -lrte_hash ifeq ($(CONFIG_RTE_LIBRTE_ACL),y)
lib/librte_table/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +allow_experimental_apis = true sources = files('rte_table_acl.c', 'rte_table_lpm.c', 'rte_table_lpm_ipv6.c',
Signature · 1 line
2.25.1
PATCH 32/32 doc: add trace library guide
In reply to [email protected]From: Sunil Kumar Kori <[email protected]>
Add programmar's guide for trace library support.
--- doc/guides/prog_guide/index.rst | 1 + doc/guides/prog_guide/trace_lib.rst | 264 +++++++++++++++++++++++++ doc/guides/rel_notes/release_20_05.rst | 4 + 3 files changed, 269 insertions(+) create mode 100644 doc/guides/prog_guide/trace_lib.rst
doc/guides/prog_guide/index.rst +1 -0
@@ -35,6 +35,7 @@ Programmer's Guide lpm_lib lpm6_lib flow_classify_lib + trace_lib packet_distrib_lib reorder_lib ip_fragment_reassembly_lib
doc/guides/prog_guide/trace_lib.rst new file +264 -0
264 lines not on this page · raw message
doc/guides/rel_notes/release_20_05.rst +4 -0
@@ -56,6 +56,10 @@ New Features Also, make sure to start the actual text at the margin. ========================================================= +* **Added Trace Library.** + + A new library is added to record CTF based trace events to debug/analyze + DPDK application for slow and fast path APIs at run time. Removed Items -------------
Signature · 1 line
2.25.1
v2 cover DPDK Trace support
In reply to [email protected]From: Jerin Jacob <[email protected]>
v2:
Addressed the following review comments from Mattias Rönnblom:
1) Changed
from:
typedef uint64_t* rte_trace_t;
to
typedef uint64_t rte_trace_t;
Initially thought to make the handle as
struct rte_trace {
uint64_t val;
}but changed to uint64_t for the following reasons
a) It is opaque to the application and it will fix the compile-time type check as well.
b) The handle has an index that will point to an internal slow-path structure so no ABI change required in the future.
c) RTE_TRACE_POINT_DEFINE need to expose trace object. So it is better to keep as uint64_t and avoid one more indirection for no use.
2)
Changed:
from:
enum rte_trace_mode_e {
to:
enum rte_trace_mode {
3) removed [out] "found" param from rte_trace_pattern() and rte_trace_regexp()
4) Changed rte_trace_from_name to rte_trace_by_name
5) rte_trace_is_dp_enabled() return bool now
6) in __rte_trace_point_register() the argument fn change to register_fn
7) removed !! from rte_trace_is_enabled()
8) Remove uninitialized "rc warning" from rte_trace_pattern() and rte_trace_regexp()
9) fixup bool return type for trace_entry_compare()
10) fixup calloc casting in trace_mkdir()
11) check fclose() return in trace_meta_save() and trace_mem_save()
12) rte_trace_ctf_* macro cleanup
13) added release notes
14) fix build issues reported by CI
http://mails.dpdk.org/archives/test-report/2020-March/121235.html
This patch set contains
~~~~~~~~~~~~~~~~~~~~~~~~
# The native implementation of common trace format(CTF)[1] based tracer # Public API to create the trace points.
# Add tracepoints to eal, ethdev, mempool, eventdev and cryptodev library for tracing support
# A unit test case
# Performance test case to measure the trace overhead. (See eal/trace:
# add trace performance test cases, patch) # Programmers guide for Trace support(See doc: add trace library guide, # patch)
# Tested OS:
~~~~~~~~~~~
- Linux
- FreeBSD
# Tested open source CTF trace viewers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Babeltrace
- Tracecompass
# Trace overhead comparison with LTTng
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
trace overhead data on x86:[2]
# 236 cycles with LTTng(>100ns)
# 18 cycles(7ns) with Native DPDK CTF emitter.(See eal/trace: add trace
# performance test cases patch)
trace overhead data on arm64:
# 312 cycles to 1100 cycles with LTTng based on the class of arm64 # CPU. # 11 cycles to 13 cycles with Native DPDK CTF emitter based on the
class of arm64 CPU.
18 cycles(on x86) vs 11 cycles(on arm64) is due to rdtsc() overhead in x86. It seems rdtsc takes around 15cycles in x86.
Items that needs to be sort it out
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Makefile and meson.build are updated to allow experimental APIs.
As multiple EXPERIMENTAL symbols, exported by trace library, are used in various drivers, lib, app and examples. So to fix compilation warning/error, Makefile and meson.build are updated for all required components to support EXPERIMENTAL APIs.
It results same code changes at multiple components as well as increases source code line changes in patchset too. Suggestions are welcome to resolve this issue with lesser code changes.
More details:
~~~~~~~~~~~~~
# The Native DPDK CTF trace support does not have any dependency on third-party library.
The generated output file is compatible with LTTng as both are using CTF trace format.
The performance gain comes from:
1) exploit dpdk worker thread usage model to avoid atomics and use per core variables
2) use hugepage,
3) avoid a lot function pointers in fast-path etc
4) avoid unaligned store for arm64 etc
Features:
~~~~~~~~~
- APIs and Features are similar to rte_log dynamic framework API(expect log prints on stdout vs it dumps on trace file)
- No specific limit on the events. A string-based event like rte_log for pattern matching
- Dynamic enable/disable support.
- Instructmention overhead is ~1 cycle. i.e cost of adding the code wth out using trace feature.
- Timestamp support for all the events using DPDK rte_rtdsc
- No dependency on another library. Clean room native implementation of CTF.
Functional test case:
a) echo "trace_autotest" | sudo ./build/app/test/dpdk-test -c 0x3 --trace-level=8
The above command emits the following trace events <code>
uint8_t i;
rte_trace_lib_eal_generic_void();
rte_trace_lib_eal_generic_u64(0x10000000000000);
rte_trace_lib_eal_generic_u32(0x10000000);
rte_trace_lib_eal_generic_u16(0xffee);
rte_trace_lib_eal_generic_u8(0xc);
rte_trace_lib_eal_generic_i64(-1234);
rte_trace_lib_eal_generic_i32(-1234567);
rte_trace_lib_eal_generic_i16(12);
rte_trace_lib_eal_generic_i8(-3);
rte_trace_lib_eal_generic_string("my string");
rte_trace_lib_eal_generic_function(__func__);
for (i = 0; i < 128; i++)
rte_trace_lib_eal_generic_u8(i);</code>
Install babeltrace package in Linux and point the generated trace file to babel trace. By default trace file created under <user>/dpdk-traces/time_stamp/
example:
# babeltrace /root/dpdk-traces/rte-2020-02-15-PM-02-56-51 | more
[13:27:36.138468807] (+?.?????????) lib.eal.generic.void: { cpu_id = 0, name = "dpdk-test" }, { }
[13:27:36.138468851] (+0.000000044) lib.eal.generic.u64: { cpu_id = 0, name = "dpdk-test" }, { in = 4503599627370496 } [13:27:36.138468860] (+0.000000009) lib.eal.generic.u32: { cpu_id = 0, name = "dpdk-test" }, { in = 268435456 } [13:27:36.138468934] (+0.000000074) lib.eal.generic.u16: { cpu_id = 0, name = "dpdk-test" }, { in = 65518 }
[13:27:36.138468949] (+0.000000015) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 12 }
[13:27:36.138468956] (+0.000000007) lib.eal.generic.i64: { cpu_id = 0, name = "dpdk-test" }, { in = -1234 }
[13:27:36.138468963] (+0.000000007) lib.eal.generic.i32: { cpu_id = 0, name = "dpdk-test" }, { in = -1234567 } [13:27:36.138469024] (+0.000000061) lib.eal.generic.i16: { cpu_id = 0, name = "dpdk-test" }, { in = 12 }
[13:27:36.138469044] (+0.000000020) lib.eal.generic.i8: { cpu_id = 0, name = "dpdk-test" }, { in = -3 }
[13:27:36.138469051] (+0.000000007) lib.eal.generic.string: { cpu_id = 0, name = "dpdk-test" }, { str = "my string" } [13:27:36.138469203] (+0.000000152) lib.eal.generic.func: { cpu_id = 0, name = "dpdk-test" }, { func = "test_trace_points" } [13:27:36.138469239] (+0.000000036) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 0 }
[13:27:36.138469246] (+0.000000007) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 1 }
[13:27:36.138469252] (+0.000000006) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 2 }
[13:27:36.138469262] (+0.000000010) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 3 }
[13:27:36.138469269] (+0.000000007) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 4 }
[13:27:36.138469276] (+0.000000007) lib.eal.generic.u8: { cpu_id = 0, name = "dpdk-test" }, { in = 5 }
# There is a GUI based trace viewer available in Windows, Linux and # Mac.
It is called as tracecompass.(https://www.eclipse.org/tracecompass/)
The example screenshot and Histogram of above DPDK trace using Tracecompass.
https://github.com/jerinjacobk/share/blob/master/dpdk_trace.JPG
File walk through:
~~~~~~~~~~~~~~~~~~
lib/librte_eal/common/include/rte_trace.h - Public API for Trace provider and Trace control lib/librte_eal/common/eal_common_trace.c - main trace implementation lib/librte_eal/common/eal_common_trace_ctf.c - CTF metadata spec implementation lib/librte_eal/common/eal_common_trace_utils.c - command line utils and filesystem operations. lib/librte_eal/common/eal_common_trace_points.c - trace points for EAL librarylib/librte_eal/common/include/rte_trace_eal.h - EAL tracepoint public API.lib/librte_eal/common/eal_trace.h - Private trace header file.
[2] The above test is ported to LTTng for finding the LTTng trace overhead. It available at
https://github.com/jerinjacobk/lttng-overhead
https://github.com/jerinjacobk/lttng-overhead/blob/master/README
Jerin Jacob (21):
eal: introduce API for getting thread name
eal: define the public API for trace support eal/trace: implement trace register API eal/trace: implement trace operation APIs eal/trace: add internal trace init and fini interface eal/trace: get bootup timestamp for trace eal/trace: create CTF TDSL metadata in memory eal/trace: implement trace memory allocation eal/trace: implement debug dump function eal/trace: implement trace save
eal/trace: implement registration payload eal/trace: implement provider payload eal/trace: hook internal trace APIs to Linux eal/trace: hook internal trace APIs to FreeBSD eal/trace: add generic tracepoints eal/trace: add alarm tracepoints
eal/trace: add memory tracepoints
eal/trace: add memzone tracepoints eal/trace: add thread tracepoints
eal/trace: add interrupt tracepoints eal/trace: add trace performance test cases
Sunil Kumar Kori (11):
eal/trace: handle CTF keyword collision eal/trace: add trace level configuration parameter eal/trace: add trace dir configuration parameter eal/trace: add trace bufsize configuration parameter eal/trace: add trace mode configuration parameter eal/trace: add unit test cases
ethdev: add tracepoints
eventdev: add tracepoints
cryptodev: add tracepoints
mempool: add tracepoints
doc: add trace library guide
MAINTAINERS | 15 + app/pdump/Makefile | 1 + app/pdump/meson.build | 1 + app/proc-info/Makefile | 1 + app/proc-info/meson.build | 1 + app/test-acl/Makefile | 1 + app/test-acl/meson.build | 1 + app/test-cmdline/Makefile | 1 + app/test-cmdline/meson.build | 1 + app/test-eventdev/Makefile | 1 + app/test-eventdev/meson.build | 1 + app/test-pipeline/Makefile | 1 + app/test-pipeline/meson.build | 1 + app/test/Makefile | 4 +- app/test/meson.build | 3 + app/test/test_trace.c | 618 ++++++++++++++++++ app/test/test_trace.h | 52 ++ app/test/test_trace_perf.c | 179 +++++ app/test/test_trace_register.c | 46 ++ config/common_base | 1 + config/rte_config.h | 1 + doc/api/doxy-api-index.md | 3 +- doc/guides/linux_gsg/eal_args.include.rst | 55 ++ doc/guides/prog_guide/index.rst | 1 + doc/guides/prog_guide/trace_lib.rst | 265 ++++++++ doc/guides/rel_notes/release_20_05.rst | 9 + drivers/common/cpt/Makefile | 1 + drivers/crypto/ccp/Makefile | 1 + drivers/crypto/ccp/meson.build | 2 + drivers/crypto/mvsam/Makefile | 1 + drivers/crypto/mvsam/meson.build | 1 + drivers/crypto/null/Makefile | 1 + drivers/crypto/null/meson.build | 1 + drivers/crypto/scheduler/Makefile | 1 + drivers/crypto/scheduler/meson.build | 1 + drivers/crypto/virtio/Makefile | 1 + drivers/crypto/virtio/meson.build | 1 + drivers/event/octeontx/Makefile | 1 + drivers/event/octeontx/meson.build | 1 + drivers/event/skeleton/Makefile | 1 + drivers/event/skeleton/meson.build | 1 + drivers/event/sw/Makefile | 1 + drivers/event/sw/meson.build | 1 + drivers/mempool/ring/Makefile | 1 + drivers/mempool/ring/meson.build | 1 + drivers/net/af_packet/Makefile | 1 + drivers/net/af_packet/meson.build | 1 + drivers/net/af_xdp/Makefile | 1 + drivers/net/af_xdp/meson.build | 1 + drivers/net/ark/Makefile | 1 + drivers/net/ark/meson.build | 1 + drivers/net/bnxt/Makefile | 1 + drivers/net/bnxt/meson.build | 1 + drivers/net/cxgbe/Makefile | 1 + drivers/net/cxgbe/meson.build | 1 + drivers/net/enetc/Makefile | 1 + drivers/net/enetc/meson.build | 1 + drivers/net/hinic/Makefile | 1 + drivers/net/hinic/base/meson.build | 3 +- drivers/net/hinic/meson.build | 1 + drivers/net/ionic/ionic_dev.c | 1 + drivers/net/ionic/ionic_mac_api.c | 1 + drivers/net/ionic/ionic_main.c | 1 + drivers/net/kni/Makefile | 1 + drivers/net/kni/meson.build | 1 + drivers/net/liquidio/Makefile | 1 + drivers/net/liquidio/meson.build | 1 + drivers/net/mvneta/Makefile | 1 + drivers/net/mvneta/meson.build | 1 + drivers/net/mvpp2/Makefile | 1 + drivers/net/mvpp2/meson.build | 1 + drivers/net/nfb/Makefile | 1 + drivers/net/nfb/meson.build | 1 + drivers/net/null/Makefile | 1 + drivers/net/null/meson.build | 1 + drivers/net/octeontx/Makefile | 1 + drivers/net/octeontx2/Makefile | 1 + drivers/net/octeontx2/meson.build | 1 + drivers/net/pcap/Makefile | 1 + drivers/net/pcap/meson.build | 1 + drivers/net/ring/Makefile | 1 + drivers/net/ring/meson.build | 1 + drivers/net/szedata2/Makefile | 1 + drivers/net/szedata2/meson.build | 1 + drivers/net/thunderx/base/meson.build | 1 + drivers/net/vhost/Makefile | 1 + drivers/net/vhost/meson.build | 1 + drivers/raw/ioat/Makefile | 1 + drivers/raw/ioat/meson.build | 1 + drivers/raw/octeontx2_dma/Makefile | 1 + drivers/raw/octeontx2_dma/meson.build | 1 + drivers/raw/octeontx2_ep/Makefile | 1 + drivers/raw/octeontx2_ep/meson.build | 1 + drivers/raw/skeleton/Makefile | 1 + drivers/raw/skeleton/meson.build | 1 + examples/cmdline/Makefile | 1 + examples/cmdline/meson.build | 1 + examples/distributor/Makefile | 1 + examples/distributor/meson.build | 1 + examples/ethtool/ethtool-app/Makefile | 1 + examples/eventdev_pipeline/meson.build | 1 + examples/flow_filtering/Makefile | 1 + examples/flow_filtering/meson.build | 1 + examples/helloworld/Makefile | 1 + examples/helloworld/meson.build | 1 + examples/ioat/Makefile | 1 + examples/ioat/meson.build | 1 + examples/ip_fragmentation/Makefile | 2 + examples/ip_fragmentation/meson.build | 1 + examples/ip_reassembly/Makefile | 1 + examples/ip_reassembly/meson.build | 1 + examples/ipv4_multicast/Makefile | 1 + examples/ipv4_multicast/meson.build | 1 + examples/l2fwd-cat/Makefile | 1 + examples/l2fwd-cat/meson.build | 1 + examples/l2fwd-event/Makefile | 1 + examples/l2fwd-event/meson.build | 1 + examples/l2fwd-jobstats/Makefile | 1 + examples/l2fwd-jobstats/meson.build | 1 + examples/l2fwd-keepalive/Makefile | 1 + examples/l2fwd-keepalive/ka-agent/Makefile | 1 + examples/l2fwd-keepalive/meson.build | 1 + examples/l3fwd-acl/Makefile | 1 + examples/l3fwd-acl/meson.build | 1 + examples/l3fwd/Makefile | 1 + examples/l3fwd/meson.build | 1 + examples/link_status_interrupt/Makefile | 1 + examples/link_status_interrupt/meson.build | 1 + .../client_server_mp/mp_client/Makefile | 1 + .../client_server_mp/mp_client/meson.build | 1 + .../client_server_mp/mp_server/meson.build | 1 + examples/multi_process/hotplug_mp/Makefile | 1 + examples/multi_process/hotplug_mp/meson.build | 1 + examples/multi_process/simple_mp/Makefile | 1 + examples/multi_process/simple_mp/meson.build | 1 + examples/multi_process/symmetric_mp/Makefile | 1 + .../multi_process/symmetric_mp/meson.build | 1 + examples/ntb/Makefile | 1 + examples/ntb/meson.build | 1 + examples/packet_ordering/Makefile | 1 + examples/packet_ordering/meson.build | 1 + .../performance-thread/l3fwd-thread/Makefile | 1 + .../l3fwd-thread/meson.build | 1 + .../performance-thread/pthread_shim/Makefile | 1 + .../pthread_shim/meson.build | 1 + examples/ptpclient/Makefile | 1 + examples/ptpclient/meson.build | 1 + examples/qos_meter/Makefile | 1 + examples/qos_meter/meson.build | 1 + examples/qos_sched/Makefile | 1 + examples/qos_sched/meson.build | 1 + examples/server_node_efd/node/Makefile | 1 + examples/server_node_efd/node/meson.build | 1 + examples/server_node_efd/server/Makefile | 1 + examples/server_node_efd/server/meson.build | 1 + examples/service_cores/Makefile | 1 + examples/service_cores/meson.build | 1 + examples/skeleton/Makefile | 1 + examples/skeleton/meson.build | 1 + examples/timer/Makefile | 1 + examples/timer/meson.build | 1 + examples/vm_power_manager/Makefile | 1 + examples/vm_power_manager/meson.build | 1 + examples/vmdq/Makefile | 1 + examples/vmdq/meson.build | 1 + examples/vmdq_dcb/Makefile | 1 + examples/vmdq_dcb/meson.build | 1 + lib/librte_bitratestats/Makefile | 1 + lib/librte_bitratestats/meson.build | 1 + lib/librte_cryptodev/Makefile | 4 +- lib/librte_cryptodev/cryptodev_trace_points.c | 70 ++ lib/librte_cryptodev/meson.build | 7 +- lib/librte_cryptodev/rte_cryptodev.c | 18 + lib/librte_cryptodev/rte_cryptodev.h | 6 + .../rte_cryptodev_version.map | 18 + lib/librte_cryptodev/rte_trace_cryptodev.h | 133 ++++ lib/librte_cryptodev/rte_trace_cryptodev_fp.h | 34 + lib/librte_distributor/Makefile | 1 + lib/librte_distributor/meson.build | 1 + lib/librte_eal/common/Makefile | 1 + lib/librte_eal/common/eal_common_log.c | 9 +- lib/librte_eal/common/eal_common_memzone.c | 9 + lib/librte_eal/common/eal_common_options.c | 68 +- lib/librte_eal/common/eal_common_thread.c | 3 +- lib/librte_eal/common/eal_common_trace.c | 610 +++++++++++++++++ lib/librte_eal/common/eal_common_trace_ctf.c | 488 ++++++++++++++ .../common/eal_common_trace_points.c | 115 ++++ .../common/eal_common_trace_utils.c | 523 +++++++++++++++ lib/librte_eal/common/eal_options.h | 8 + lib/librte_eal/common/eal_private.h | 11 + lib/librte_eal/common/eal_trace.h | 122 ++++ lib/librte_eal/common/include/rte_lcore.h | 17 + lib/librte_eal/common/include/rte_trace.h | 584 +++++++++++++++++ lib/librte_eal/common/include/rte_trace_eal.h | 247 +++++++ .../common/include/rte_trace_provider.h | 137 ++++ .../common/include/rte_trace_register.h | 53 ++ lib/librte_eal/common/meson.build | 8 + lib/librte_eal/common/rte_malloc.c | 60 +- lib/librte_eal/freebsd/eal/Makefile | 4 + lib/librte_eal/freebsd/eal/eal.c | 10 + lib/librte_eal/freebsd/eal/eal_alarm.c | 3 + lib/librte_eal/freebsd/eal/eal_interrupts.c | 52 +- lib/librte_eal/freebsd/eal/eal_thread.c | 21 +- lib/librte_eal/linux/eal/Makefile | 4 + lib/librte_eal/linux/eal/eal.c | 9 + lib/librte_eal/linux/eal/eal_alarm.c | 4 + lib/librte_eal/linux/eal/eal_interrupts.c | 84 ++- lib/librte_eal/linux/eal/eal_thread.c | 27 +- lib/librte_eal/rte_eal_version.map | 61 ++ lib/librte_ethdev/Makefile | 3 + lib/librte_ethdev/ethdev_trace_points.c | 43 ++ lib/librte_ethdev/meson.build | 5 +- lib/librte_ethdev/rte_ethdev.c | 12 + lib/librte_ethdev/rte_ethdev.h | 5 + lib/librte_ethdev/rte_ethdev_version.map | 10 + lib/librte_ethdev/rte_trace_ethdev.h | 90 +++ lib/librte_ethdev/rte_trace_ethdev_fp.h | 40 ++ lib/librte_eventdev/Makefile | 3 + lib/librte_eventdev/eventdev_trace_points.c | 173 +++++ lib/librte_eventdev/meson.build | 3 + .../rte_event_crypto_adapter.c | 10 + .../rte_event_eth_rx_adapter.c | 11 + .../rte_event_eth_tx_adapter.c | 13 +- .../rte_event_eth_tx_adapter.h | 2 + lib/librte_eventdev/rte_event_timer_adapter.c | 8 +- lib/librte_eventdev/rte_event_timer_adapter.h | 8 + lib/librte_eventdev/rte_eventdev.c | 9 + lib/librte_eventdev/rte_eventdev.h | 5 +- lib/librte_eventdev/rte_eventdev_version.map | 42 ++ lib/librte_eventdev/rte_trace_eventdev.h | 278 ++++++++ lib/librte_eventdev/rte_trace_eventdev_fp.h | 75 +++ lib/librte_gro/Makefile | 1 + lib/librte_gro/meson.build | 1 + lib/librte_gso/Makefile | 1 + lib/librte_gso/meson.build | 1 + lib/librte_ip_frag/Makefile | 1 + lib/librte_ip_frag/meson.build | 1 + lib/librte_kni/Makefile | 1 + lib/librte_kni/meson.build | 1 + lib/librte_latencystats/Makefile | 1 + lib/librte_latencystats/meson.build | 1 + lib/librte_mempool/Makefile | 3 + lib/librte_mempool/mempool_trace_points.c | 108 +++ lib/librte_mempool/meson.build | 7 +- lib/librte_mempool/rte_mempool.c | 16 + lib/librte_mempool/rte_mempool.h | 13 + lib/librte_mempool/rte_mempool_ops.c | 7 + lib/librte_mempool/rte_mempool_version.map | 26 + lib/librte_mempool/rte_trace_mempool.h | 148 +++++ lib/librte_mempool/rte_trace_mempool_fp.h | 102 +++ lib/librte_port/Makefile | 1 + lib/librte_port/meson.build | 1 + lib/librte_reorder/Makefile | 1 + lib/librte_reorder/meson.build | 1 + lib/librte_sched/Makefile | 1 + lib/librte_sched/meson.build | 1 + lib/librte_security/Makefile | 1 + lib/librte_security/meson.build | 1 + lib/librte_table/Makefile | 1 + lib/librte_table/meson.build | 1 + 260 files changed, 6271 insertions(+), 82 deletions(-) create mode 100644 app/test/test_trace.c create mode 100644 app/test/test_trace.h create mode 100644 app/test/test_trace_perf.c create mode 100644 app/test/test_trace_register.c create mode 100644 doc/guides/prog_guide/trace_lib.rst create mode 100644 lib/librte_cryptodev/cryptodev_trace_points.c create mode 100644 lib/librte_cryptodev/rte_trace_cryptodev.h create mode 100644 lib/librte_cryptodev/rte_trace_cryptodev_fp.h create mode 100644 lib/librte_eal/common/eal_common_trace.c create mode 100644 lib/librte_eal/common/eal_common_trace_ctf.c create mode 100644 lib/librte_eal/common/eal_common_trace_points.c create mode 100644 lib/librte_eal/common/eal_common_trace_utils.c create mode 100644 lib/librte_eal/common/eal_trace.h create mode 100644 lib/librte_eal/common/include/rte_trace.h create mode 100644 lib/librte_eal/common/include/rte_trace_eal.h create mode 100644 lib/librte_eal/common/include/rte_trace_provider.h create mode 100644 lib/librte_eal/common/include/rte_trace_register.h create mode 100644 lib/librte_ethdev/ethdev_trace_points.c create mode 100644 lib/librte_ethdev/rte_trace_ethdev.h create mode 100644 lib/librte_ethdev/rte_trace_ethdev_fp.h create mode 100644 lib/librte_eventdev/eventdev_trace_points.c create mode 100644 lib/librte_eventdev/rte_trace_eventdev.h create mode 100644 lib/librte_eventdev/rte_trace_eventdev_fp.h create mode 100644 lib/librte_mempool/mempool_trace_points.c create mode 100644 lib/librte_mempool/rte_trace_mempool.h create mode 100644 lib/librte_mempool/rte_trace_mempool_fp.h
Signature · 1 line
2.25.1
PATCH v2 1/32 eal: introduce API for getting thread name
From: Jerin Jacob <[email protected]>
Introduce rte_thread_getname() API to get the thread name and implement it for Linux and FreeBSD.
FreeBSD does not support getting the thread name.
One of the consumers of this API will be the trace subsystem where it used as an informative purpose.
--- lib/librte_eal/common/include/rte_lcore.h | 17 +++++++++++++++++ lib/librte_eal/freebsd/eal/eal_thread.c | 9 +++++++++ lib/librte_eal/linux/eal/eal_thread.c | 15 +++++++++++++++ lib/librte_eal/rte_eal_version.map | 3 +++ 4 files changed, 44 insertions(+)
lib/librte_eal/common/include/rte_lcore.h +17 -0
@@ -240,6 +240,23 @@ void rte_thread_get_affinity(rte_cpuset_t *cpusetp);*/ int rte_thread_setname (pthread_t id,const char *name); +/** +* Get thread name. +* +* @note It fails with glibc < 2.12. +* +* @param id +* Thread id. +* @param name +* Thread name to set. +* @param len +* Thread name buffer length. +* @return +* On success, return 0; otherwise return a negative value. +*/ +__rte_experimental +int rte_thread_getname(pthread_t id, char *name, size_t len); +/** * Create a control thread. *
lib/librte_eal/freebsd/eal/eal_thread.c +9 -0
@@ -175,3 +175,12 @@ int rte_thread_setname(pthread_t id, const char *name)pthread_set_name_np (id, name);return 0 ; } + +int rte_thread_getname (pthread_t id,char *name,size_t len) +{ +RTE_SET_USED (id); +RTE_SET_USED (name); +RTE_SET_USED (len); + +return -ENOTSUP ; +}
lib/librte_eal/linux/eal/eal_thread.c +15 -0
@@ -186,3 +186,18 @@ int rte_thread_setname(pthread_t id, const char *name)RTE_SET_USED (name);return -ret; } + +int rte_thread_getname (pthread_t id,char *name,size_t len) +{ +int ret =ENOSYS ; +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) +#if __GLIBC_PREREQ (2 ,12 ) + ret =pthread_getname_np (id, name, len); +#endif +#endif +RTE_SET_USED (id); +RTE_SET_USED (name); +RTE_SET_USED (len); +return -ret; + +}
lib/librte_eal/rte_eal_version.map +3 -0
@@ -335,4 +335,7 @@ EXPERIMENTAL { # added in 20.02 rte_thread_is_intr; + + # added in 20.05 + rte_thread_getname; };
Signature · 1 line
2.25.1
PATCH v2 2/32 eal: define the public API for trace support
In reply to [email protected]From: Jerin Jacob <[email protected]>
Define the public API for trace support.
This patch also adds support for the build infrastructure and update the MAINTAINERS file for the trace subsystem.
--- MAINTAINERS | 6 + config/common_base | 1 + config/rte_config.h | 1 + doc/api/doxy-api-index.md | 3 +- lib/librte_eal/common/Makefile | 1 + lib/librte_eal/common/eal_common_trace.c | 6 + lib/librte_eal/common/include/rte_trace.h | 522 ++++++++++++++++++++++ lib/librte_eal/common/meson.build | 2 + lib/librte_eal/freebsd/eal/Makefile | 1 + lib/librte_eal/linux/eal/Makefile | 1 + 10 files changed, 543 insertions(+), 1 deletion(-) create mode 100644 lib/librte_eal/common/eal_common_trace.c create mode 100644 lib/librte_eal/common/include/rte_trace.h
MAINTAINERS +6 -0
@@ -196,6 +196,12 @@ F: app/test/test_string_fns.c F: app/test/test_tailq.c F: app/test/test_version.c +Trace +M: Jerin Jacob <[email protected]> +M: Sunil Kumar Kori <[email protected]> +F: lib/librte_eal/common/include/rte_trace*.h +F: lib/librte_eal/common/eal_common_trace*.c + Memory Allocation M: Anatoly Burakov <[email protected]> F: lib/librte_eal/common/include/rte_fbarray.h
config/common_base +1 -0
@@ -99,6 +99,7 @@ CONFIG_RTE_MAX_MEMZONE=2560 CONFIG_RTE_MAX_TAILQ=32 CONFIG_RTE_ENABLE_ASSERT=n CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO +CONFIG_RTE_ENABLE_TRACE_DP=n CONFIG_RTE_LOG_HISTORY=256 CONFIG_RTE_BACKTRACE=y CONFIG_RTE_LIBEAL_USE_HPET=n
config/rte_config.h +1 -0
@@ -42,6 +42,7 @@#define RTE_MAX_MEMZONE 2560#define RTE_MAX_TAILQ 32#define RTE_LOG_DP_LEVEL RTE_LOG_INFO +#define RTE_ENABLE_TRACE_DP 0#define RTE_BACKTRACE 1#define RTE_MAX_VFIO_CONTAINERS 64
doc/api/doxy-api-index.md +2 -1
@@ -174,7 +174,8 @@ The public API headers are grouped by topics: [hexdump] (@ref rte_hexdump.h), [debug] (@ref rte_debug.h), [log] (@ref rte_log.h), - [errno] (@ref rte_errno.h) + [errno] (@ref rte_errno.h), + [trace] (@ref rte_trace.h) - **misc**: [EAL config] (@ref rte_eal.h),
lib/librte_eal/common/Makefile +1 -0
@@ -9,6 +9,7 @@ INC += rte_debug.h rte_eal.h rte_eal_interrupts.h INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h +INC += rte_trace.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h INC += rte_string_fns.h rte_version.h INC += rte_eal_memconfig.h
lib/librte_eal/common/eal_common_trace.c new file +6 -0
@@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#include <rte_trace.h> +
lib/librte_eal/common/include/rte_trace.h new file +522 -0
522 lines not on this page · raw message
lib/librte_eal/common/meson.build +2 -0
@@ -28,6 +28,7 @@ common_sources = files( 'eal_common_tailqs.c', 'eal_common_thread.c', 'eal_common_timer.c', + 'eal_common_trace.c', 'eal_common_uuid.c', 'hotplug_mp.c', 'malloc_elem.c',
@@ -84,6 +85,7 @@ common_headers = files( 'include/rte_service_component.h', 'include/rte_string_fns.h', 'include/rte_tailq.h', + 'include/rte_trace.h', 'include/rte_time.h', 'include/rte_uuid.h', 'include/rte_version.h',
lib/librte_eal/freebsd/eal/Makefile +1 -0
@@ -60,6 +60,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_thread.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c +SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c
lib/librte_eal/linux/eal/Makefile +1 -0
@@ -68,6 +68,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c
Signature · 1 line
2.25.1
PATCH v2 3/32 eal/trace: implement trace register API
In reply to [email protected]From: Jerin Jacob <[email protected]>
The consumers of trace API defines the tracepoint and registers to eal. Internally these tracepoints will be stored in STAILQ for future use. This patch implements the tracepoint registration function.
--- MAINTAINERS | 1 + lib/librte_eal/common/Makefile | 2 +- lib/librte_eal/common/eal_common_trace.c | 107 +++++++++++++++++- lib/librte_eal/common/eal_trace.h | 36 ++++++ lib/librte_eal/common/include/rte_trace.h | 29 +++++ .../common/include/rte_trace_provider.h | 24 ++++ .../common/include/rte_trace_register.h | 20 ++++ lib/librte_eal/common/meson.build | 2 + lib/librte_eal/rte_eal_version.map | 1 + 9 files changed, 220 insertions(+), 2 deletions(-) create mode 100644 lib/librte_eal/common/eal_trace.h create mode 100644 lib/librte_eal/common/include/rte_trace_provider.h create mode 100644 lib/librte_eal/common/include/rte_trace_register.h
MAINTAINERS +1 -0
@@ -201,6 +201,7 @@ M: Jerin Jacob <[email protected]> M: Sunil Kumar Kori <[email protected]> F: lib/librte_eal/common/include/rte_trace*.h F: lib/librte_eal/common/eal_common_trace*.c +F: lib/librte_eal/common/eal_trace.h Memory Allocation M: Anatoly Burakov <[email protected]>
lib/librte_eal/common/Makefile +1 -1
@@ -9,7 +9,7 @@ INC += rte_debug.h rte_eal.h rte_eal_interrupts.h INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h -INC += rte_trace.h +INC += rte_trace.h rte_trace_provider.h rte_trace_register.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h INC += rte_string_fns.h rte_version.h INC += rte_eal_memconfig.h
lib/librte_eal/common/eal_common_trace.c +106 -1
111 lines not on this page · raw message
lib/librte_eal/common/eal_trace.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef __EAL_TRACE_H +#define __EAL_TRACE_H + +#include <rte_trace.h> + +#define trace_err(fmt, args...)\ + RTE_LOG(ERR, EAL, "%s():%u " fmt "\n",\ + __func__, __LINE__, ## args) + +#define trace_crit(fmt, args...)\ + RTE_LOG(CRIT, EAL, "%s():%u " fmt "\n",\ + __func__, __LINE__, ## args) + +#define TRACE_CTF_FIELD_SIZE 384 +#define TRACE_POINT_NAME_SIZE 64 + +struct trace_point { +STAILQ_ENTRY (trace_point) next; +rte_trace_t *handle; +char name[TRACE_POINT_NAME_SIZE ]; +char ctf_field[TRACE_CTF_FIELD_SIZE ]; +}; + +struct trace { +int register_errno; +uint32_t nb_trace_points; +}; + +/* Trace point list functions */ +STAILQ_HEAD (trace_point_head, trace_point); + +#endif /* __EAL_TRACE_H */
lib/librte_eal/common/include/rte_trace.h +29 -0
@@ -515,6 +515,35 @@ _tp _args \#endif /* __DOXYGEN__ */ +/** +* @internal @warning +* @b EXPERIMENTAL: this API may change without prior notice +* +* Helper function to register a dynamic tracepoint. +* Use RTE_TRACE_POINT_REGISTER() macro for tracepoint registration. +* +* @param trace +* The tracepoint object created using RTE_TRACE_POINT_DEFINE(). +* @param name +* The name of the tracepoint object. +* @param level +* Trace level. A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8). +* @param register_fn +* Trace registration function. +* @return +* - 0: Successfully registered the tracepoint. +* - <0: Failure to register the tracepoint. +*/ +__rte_experimental +int __rte_trace_point_register(rte_trace_t *trace, const char *name, +uint32_t level,void (*register_fn)(void )); + +#ifdef RTE_TRACE_POINT_REGISTER_SELECT +#include <rte_trace_register.h> +#else +#include <rte_trace_provider.h> +#endif + #ifdef __cplusplus }#endif
lib/librte_eal/common/include/rte_trace_provider.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_H_ +#error do not include this file directly, use <rte_trace.h> instead +#endif + +#ifndef _RTE_TRACE_PROVIDER_H_ +#define _RTE_TRACE_PROVIDER_H_ + +#define __RTE_TRACE_EVENT_HEADER_ID_SHIFT (48) + +#define __RTE_TRACE_FIELD_ENABLE_MASK (1ULL << 63) +#define __RTE_TRACE_FIELD_ENABLE_DISCARD (1ULL << 62) +#define __RTE_TRACE_FIELD_SIZE_SHIFT 0 +#define __RTE_TRACE_FIELD_SIZE_MASK (0xffffULL << __RTE_TRACE_FIELD_SIZE_SHIFT) +#define __RTE_TRACE_FIELD_ID_SHIFT (16) +#define __RTE_TRACE_FIELD_ID_MASK (0xffffULL << __RTE_TRACE_FIELD_ID_SHIFT) +#define __RTE_TRACE_FIELD_LEVEL_SHIFT (32) +#define __RTE_TRACE_FIELD_LEVEL_MASK (0xffULL << __RTE_TRACE_FIELD_LEVEL_SHIFT) + + +#endif /* _RTE_TRACE_PROVIDER_H_ */
lib/librte_eal/common/include/rte_trace_register.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(C) 2020 Marvell International Ltd. +*/ + +#ifndef _RTE_TRACE_H_ +#error do not include this file directly, use <rte_trace.h> instead +#endif + +#ifndef _RTE_TRACE_REGISTER_H_ +#define _RTE_TRACE_REGISTER_H_ + +#include <rte_per_lcore.h> + +RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); + +#define RTE_TRACE_POINT_REGISTER (trace, name, level)\ + __rte_trace_point_register(&__##trace, RTE_STR(name),\ + RTE_LOG_ ## level, (void (*)(void)) trace) + +#endif /* _RTE_TRACE_REGISTER_H_ */
lib/librte_eal/common/meson.build +2 -0
@@ -86,6 +86,8 @@ common_headers = files( 'include/rte_string_fns.h', 'include/rte_tailq.h', 'include/rte_trace.h', + 'include/rte_trace_provider.h', + 'include/rte_trace_register.h', 'include/rte_time.h', 'include/rte_uuid.h', 'include/rte_version.h',
lib/librte_eal/rte_eal_version.map +1 -0
@@ -338,4 +338,5 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; + __rte_trace_point_register; };
Signature · 1 line
2.25.1
PATCH v2 4/32 eal/trace: implement trace operation APIs
In reply to [email protected]From: Jerin Jacob <[email protected]>
This patch implements the following public trace APIs.
- rte_trace_global_is_enabled()
- rte_trace_global_is_disabled()
- rte_trace_is_id_invalid()
- rte_trace_global_level_set()
- rte_trace_global_level_get()
- rte_trace_global_mode_set()
- rte_trace_global_mode_get()
- rte_trace_enable()
- rte_trace_disable()
- rte_trace_is_enabled()
- rte_trace_is_disabled()
- rte_trace_level_set()
- rte_trace_level_get()
- rte_trace_mode_set()
- rte_trace_mode_get()
- rte_trace_pattern()
- rte_trace_regexp()
- rte_trace_by_name()
--- lib/librte_eal/common/eal_common_trace.c | 243 +++++++++++++++++++++++ lib/librte_eal/common/eal_trace.h | 11 + lib/librte_eal/rte_eal_version.map | 18 ++ 3 files changed, 272 insertions(+)
lib/librte_eal/common/eal_common_trace.c +243 -0
@@ -3,7 +3,9 @@*/ #include <inttypes.h> +#include <fnmatch.h> #include <sys/queue.h> +#include <regex.h> #include <rte_common.h> #include <rte_errno.h>
@@ -20,6 +22,247 @@ RTE_DEFINE_PER_LCORE(int, ctf_count);static struct trace_point_head tp_list =STAILQ_HEAD_INITIALIZER (tp_list);static struct trace trace; +bool +rte_trace_global_is_enabled (void ) +{ +return trace.global_status; +} + +bool +rte_trace_global_is_disabled (void ) +{ +return !trace.global_status; +} + +void +rte_trace_global_level_set (uint32_t level) +{ +struct trace_point *tp; + + trace.level = level; + +if (rte_trace_global_is_disabled ()) +return ; + + STAILQ_FOREACH(tp, &tp_list, next) { +if (level >=rte_trace_level_get (tp->handle)) +rte_trace_enable (tp->handle); +else +rte_trace_disable (tp->handle); + } +} + +uint32_t +rte_trace_global_level_get (void ) +{ +return trace.level; +} + +void +rte_trace_global_mode_set (enum rte_trace_mode mode) +{ +struct trace_point *tp; + +if (rte_trace_global_is_disabled ()) +return ; + + STAILQ_FOREACH(tp, &tp_list, next) +rte_trace_mode_set (tp->handle, mode); + + trace.mode = mode; +} + +enum +rte_trace_mode rte_trace_global_mode_get (void ) +{ +return trace.mode; +} + +bool +rte_trace_is_id_invalid (rte_trace_t *t) +{ +if (trace_id_get (t) >= trace.nb_trace_points) +return true; + +return false; +} + +bool +rte_trace_is_enabled (rte_trace_t *trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return false; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); +return val & __RTE_TRACE_FIELD_ENABLE_MASK; +} + +bool +rte_trace_is_disabled (rte_trace_t *trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return true; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); +return !(val & __RTE_TRACE_FIELD_ENABLE_MASK); +} + +int +rte_trace_enable (rte_trace_t *trace) +{ +if (rte_trace_is_id_invalid (trace)) +return -ERANGE ; + +if (rte_trace_level_get (trace) >rte_trace_global_level_get ()) +return -EACCES ; + +__atomic_or_fetch (trace, __RTE_TRACE_FIELD_ENABLE_MASK, + __ATOMIC_RELEASE); +return 0 ; +} + +int +rte_trace_disable (rte_trace_t *trace) +{ +if (rte_trace_is_id_invalid (trace)) +return -ERANGE ; + +__atomic_and_fetch (trace, ~__RTE_TRACE_FIELD_ENABLE_MASK, + __ATOMIC_RELEASE); +return 0 ; +} + +uint32_t +rte_trace_level_get (rte_trace_t *trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return 0 ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + val &= __RTE_TRACE_FIELD_LEVEL_MASK; + val = val >> __RTE_TRACE_FIELD_LEVEL_SHIFT; + +return val; +} + +int +rte_trace_level_set (rte_trace_t *trace,uint32_t level) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace) || level >RTE_LOG_DEBUG ) +return -EINVAL ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + val &= ~__RTE_TRACE_FIELD_LEVEL_MASK; + val |= (uint64_t )level << __RTE_TRACE_FIELD_LEVEL_SHIFT; +__atomic_store_n (trace, val, __ATOMIC_RELEASE); + +if (level <=rte_trace_global_level_get ()) +rte_trace_enable (trace); +else +rte_trace_disable (trace); + +return 0 ; +} + +int +rte_trace_mode_get (rte_trace_t *trace) +{ +uint64_t val; + +if (rte_trace_is_id_invalid (trace)) +return -EINVAL ; + + val =__atomic_load_n (trace, __ATOMIC_ACQUIRE); + +return !!(val & __RTE_TRACE_FIELD_ENABLE_DISCARD); +} + +int +rte_trace_mode_set (rte_trace_t *trace,enum rte_trace_mode mode) +{ +if (rte_trace_is_id_invalid (trace) || mode >RTE_TRACE_MODE_DISCARD ) +return -EINVAL ; + +if (mode ==RTE_TRACE_MODE_OVERWRITE ) +__atomic_and_fetch (trace, ~__RTE_TRACE_FIELD_ENABLE_DISCARD, + __ATOMIC_RELEASE); +else +__atomic_or_fetch (trace, __RTE_TRACE_FIELD_ENABLE_DISCARD, + __ATOMIC_RELEASE); + +return 0 ; +} + +int +rte_trace_pattern (const char *pattern,bool enable) +{ +struct trace_point *tp; +int rc =0 , found =0 ; + + STAILQ_FOREACH(tp, &tp_list, next) { +if (fnmatch (pattern, tp->name,0 ) ==0 ) { +if (enable) + rc =rte_trace_enable (tp->handle); +else + rc =rte_trace_disable (tp->handle); + found =1 ; + } +if (rc <0 ) +return rc; + } + +return rc | found; +} + +int +rte_trace_regexp (const char *regex,bool enable) +{ +struct trace_point *tp; +int rc =0 , found =0 ; +regex_t r; + +if (regcomp (&r, regex,0 ) !=0 ) +return -EINVAL ; + + STAILQ_FOREACH(tp, &tp_list, next) { +if (regexec (&r, tp->name,0 ,NULL ,0 ) ==0 ) { +if (enable) + rc =rte_trace_enable (tp->handle); +else + rc =rte_trace_disable (tp->handle); + found =1 ; + } +if (rc <0 ) +return rc; + } +regfree (&r); + +return rc | found; +} + +rte_trace_t * +rte_trace_by_name (const char *name) +{ +struct trace_point *tp; + +if (name ==NULL ) +return NULL ; + + STAILQ_FOREACH(tp, &tp_list, next) +if (strncmp (tp->name, name,TRACE_POINT_NAME_SIZE ) ==0 ) +return tp->handle; + +return NULL ; +} +int __rte_trace_point_register (rte_trace_t *handle,const char *name,uint32_t level,void (*register_fn)(void ))
lib/librte_eal/common/eal_trace.h +11 -0
@@ -27,9 +27,20 @@ struct trace_point {struct trace {int register_errno; +bool global_status; +enum rte_trace_mode mode; +uint32_t level;uint32_t nb_trace_points; }; +/* Helper functions */ +static inline uint16_t +trace_id_get (rte_trace_t *trace) +{ +return (*trace & __RTE_TRACE_FIELD_ID_MASK) >> + __RTE_TRACE_FIELD_ID_SHIFT; +} +/* Trace point list functions */ STAILQ_HEAD (trace_point_head, trace_point);
lib/librte_eal/rte_eal_version.map +18 -0
@@ -339,4 +339,22 @@ EXPERIMENTAL { # added in 20.05 rte_thread_getname; __rte_trace_point_register; + rte_trace_global_is_enabled; + rte_trace_global_is_disabled; + rte_trace_is_id_invalid; + rte_trace_global_level_set; + rte_trace_global_level_get; + rte_trace_global_mode_set; + rte_trace_global_mode_get; + rte_trace_enable; + rte_trace_disable; + rte_trace_is_enabled; + rte_trace_is_disabled; + rte_trace_level_set; + rte_trace_level_get; + rte_trace_mode_set; + rte_trace_mode_get; + rte_trace_pattern; + rte_trace_regexp; + rte_trace_by_name; };
Signature · 1 line
2.25.1