From: Jerin Jacob <jer...@marvell.com>
adding optional libwind library dependency to DPDK for
enhanced backtrace based on ucontext.
Signed-off-by: Jerin Jacob <jer...@marvell.com>
---
.github/workflows/build.yml | 2 +-
.travis.yml | 2 +-
config/meson.build | 8 +++++++
lib/eal/unix/eal_oops.c | 45 +++++++++++++++++++++++++++++++++++++
4 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 151641e6fa..de985776ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -93,7 +93,7 @@ jobs:
run: sudo apt install -y ccache libnuma-dev python3-setuptools
python3-wheel python3-pip python3-pyelftools ninja-build libbsd-dev
libpcap-dev libibverbs-dev libcrypto++-dev libfdt-dev libjansson-dev
- libarchive-dev
+ libarchive-dev libunwind-dev
- name: Install libabigail build dependencies if no cache is available
if: env.ABI_CHECKS == 'true' && steps.libabigail-cache.outputs.cache-hit
!= 'true'
run: sudo apt install -y autoconf automake libtool pkg-config libxml2-dev
diff --git a/.travis.yml b/.travis.yml
index 4bb5bf629e..cfb8931d3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ addons:
packages: &required_packages
- [libnuma-dev, python3-setuptools, python3-wheel, python3-pip,
python3-pyelftools, ninja-build]
- [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev,
libjansson-dev]
- - [libarchive-dev]
+ - [libarchive-dev, libunwind-dev]
_aarch64_packages: &aarch64_packages
- *required_packages
diff --git a/config/meson.build b/config/meson.build
index 3b5966ec2f..7f4dd52bc5 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -237,6 +237,14 @@ if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64')
== false
dpdk_extra_ldflags += '-latomic'
endif
+# check for libunwind
+unwind_dep = dependency('libunwind', required: false, method: 'pkg-config')
+if unwind_dep.found() and cc.has_header('libunwind.h', dependencies:
unwind_dep)
+ dpdk_conf.set('RTE_USE_LIBUNWIND', 1)
+ add_project_link_arguments('-lunwind', language: 'c')
+ dpdk_extra_ldflags += '-lunwind'
+endif
+
# add -include rte_config to cflags
add_project_arguments('-include', 'rte_config.h', language: 'c')
diff --git a/lib/eal/unix/eal_oops.c b/lib/eal/unix/eal_oops.c
index a480437f23..9c2d9d99d9 100644
--- a/lib/eal/unix/eal_oops.c
+++ b/lib/eal/unix/eal_oops.c
@@ -28,11 +28,56 @@ struct oops_signal {
static struct oops_signal signals_db[RTE_DIM(oops_signals)];
+#if defined(RTE_USE_LIBUNWIND)
+
+#define BACKTRACE_DEPTH 256
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+
+static void
+back_trace_dump(ucontext_t *context)
+{
+ unw_cursor_t cursor;
+ unw_word_t ip, off;
+ int rc, level = 0;
+ char name[256];
+
+ if (context == NULL)
+ return;
+
+ rc = unw_init_local(&cursor, (unw_context_t *)context);
+ if (rc < 0)
+ goto fail;
+
+ for (;;) {
+ rc = unw_get_reg(&cursor, UNW_REG_IP, &ip);
+ if (rc < 0)
+ goto fail;
+ rc = unw_get_proc_name(&cursor, name, sizeof(name), &off);
+ if (rc == 0)
+ oops_print("[%16p]: %s()+0x%" PRIx64 "\n", (void *)ip,
+ name, (uint64_t)off);
+ else
+ oops_print("[%16p]: <unknown>\n", (void *)ip);
+ rc = unw_step(&cursor);
+ if (rc <= 0 || ++level >= BACKTRACE_DEPTH)
+ break;
+ }
+ return;
+fail:
+ oops_print("libunwind call failed %s\n", unw_strerror(rc));
+}
+
+#else
+
static void
back_trace_dump(ucontext_t *context)
{
RTE_SET_USED(context);
}
+
+#endif
+
static void
siginfo_dump(int sig, siginfo_t *info)
{
--
2.33.0
