From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE3F53F4112; Fri, 15 May 2026 00:12:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778803964; cv=none; b=YtIl737rlaxmYiPyWYaXcqteyznZHsswjKxS4zwtvedsrxJNc4rYQy7Z/DGI1YWSPwBtcPKm7Dq1EMUGIkak23EXHgMhgm/QsjavujCIVAw7gSDfaJysqJNxGz13ga/hjs8EfoZFbDSrXGUE9QIuTzY+avCnKBzvqyBr+qPaUHg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778803964; c=relaxed/simple; bh=oIma0XbaHYrL6wVyXkT/yUci4CgCDvPlVnahgbXD6rg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ivYyIHx1hAT1ovtN1p3L8H6+Bo+Qhw00gcDuWvk0XNgDc5edpl27TksBhP2mbe2S5OymIZCAi2Fcjv5gtNh2B7JE/bMdotAmLfo/+ue38Qkc7oZ7xDbOYR48Q5wYpjjwCdfj3nnBd/BzG743hyCRQs2RY4SQ+BcFuOgfGQfTXBk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BSf4LmmB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BSf4LmmB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF984C2BCB3; Fri, 15 May 2026 00:12:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778803964; bh=oIma0XbaHYrL6wVyXkT/yUci4CgCDvPlVnahgbXD6rg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BSf4LmmBBrp4Fm8NqrS99qRGLVyDH/T1orqBBJr9CMZ8Se/jijQlj0lvvcbj2maiI uCjW44+KSVuyf7nU78JU/EdwwmbT9QwxPACG9OWf1eR7C+SIgoUBD8up1A/ls/FDlY CKIE5xiYYoKTop+z3q5wY5RlngquG+3LacxkkvHxA+yQbo6S18iX0UYdWKqIgBZRYX 4paSs8JpsuPKAZMgIUGbgtqx27H6N+6fomxulyyM9T0ygTckefucAvXgMG6rxoIAt3 bo4DbDJoGx8bDUoAwZZuhDkNptD3IEgzBPV4x+5P+9werV8e6l1TzHS9HomX16YW4O Ve6NePI8I9Jzw== Date: Thu, 14 May 2026 21:12:40 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: adrian.hunter@intel.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, namhyung@kernel.org, Florian Fainelli , Li Guan , 9erthalion6@gmail.com, alex@ghiti.fr, alexander.shishkin@linux.intel.com, andrew.jones@oss.qualcomm.com, aou@eecs.berkeley.edu, atrajeev@linux.ibm.com, howardchu95@gmail.com, john.g.garry@oracle.com, jolsa@kernel.org, leo.yan@linux.dev, libunwind-devel@nongnu.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-riscv@lists.infradead.org, mingo@redhat.com, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, shimin.guo@skydio.com, tglozar@redhat.com, tmricht@linux.ibm.com, will@kernel.org Subject: Re: [PATCH v5 1/7] perf unwind: Refactor get_entries to allow dynamic libdw/libunwind selection Message-ID: References: <20260413024805.1316480-1-irogers@google.com> <20260513233151.572332-1-irogers@google.com> <20260513233151.572332-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260513233151.572332-2-irogers@google.com> On Wed, May 13, 2026 at 04:31:45PM -0700, Ian Rogers wrote: > Currently, both libdw and libunwind define 'unwind__get_entries'. This > causes a duplicate symbol build failure when both are compiled into > perf. > > This commit refactors the DWARF unwind post-processing to be > configurable at runtime via the .perfconfig file option > 'unwind.style', or using the argument '--unwind-style' in the commands > 'perf report', 'perf script' and 'perf inject', in a similar manner to > the addr2line or the disassembler style. > > The file 'tools/perf/util/unwind.c' adds the top-level dispatch > function 'unwind__get_entries'. The backend implementations are > renamed to 'libdw__get_entries' and 'libunwind__get_entries'. Both are > attempted as fallbacks if not configured, or if the primary backend > fails. > > Fixes: 2e9191573a69 ("perf build: Remove NO_LIBDW_DWARF_UNWIND option") > Signed-off-by: Ian Rogers > --- > tools/perf/builtin-inject.c | 4 + > tools/perf/builtin-report.c | 4 + > tools/perf/builtin-script.c | 4 + > tools/perf/util/Build | 1 + > tools/perf/util/config.c | 4 + > tools/perf/util/symbol_conf.h | 10 +++ > tools/perf/util/unwind-libdw.c | 18 +++- > tools/perf/util/unwind-libunwind-local.c | 27 ++++-- > tools/perf/util/unwind-libunwind.c | 2 +- > tools/perf/util/unwind.c | 104 +++++++++++++++++++++++ > tools/perf/util/unwind.h | 61 ++++++++----- > 11 files changed, 207 insertions(+), 32 deletions(-) > create mode 100644 tools/perf/util/unwind.c > > diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c > index 6ab20df358c4..a2493f1097df 100644 > --- a/tools/perf/builtin-inject.c > +++ b/tools/perf/builtin-inject.c > @@ -26,6 +26,7 @@ > #include "util/synthetic-events.h" > #include "util/thread.h" > #include "util/namespaces.h" > +#include "util/unwind.h" > #include "util/util.h" > #include "util/tsc.h" > > @@ -2563,6 +2564,9 @@ int cmd_inject(int argc, const char **argv) > OPT_STRING(0, "guestmount", &symbol_conf.guestmount, "directory", > "guest mount directory under which every guest os" > " instance has a subdir"), > + OPT_CALLBACK(0, "unwind-style", NULL, "unwind style", > + "unwind styles (libdw,libunwind)", > + unwind__option), > OPT_BOOLEAN(0, "convert-callchain", &inject.convert_callchain, > "Generate callchains using DWARF and drop register/stack data"), > OPT_END() > diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c > index 95c0bdba6b11..0b0966d94128 100644 > --- a/tools/perf/builtin-report.c > +++ b/tools/perf/builtin-report.c > @@ -48,6 +48,7 @@ > #include "util/time-utils.h" > #include "util/auxtrace.h" > #include "util/units.h" > +#include "util/unwind.h" > #include "util/util.h" // perf_tip() > #include "ui/ui.h" > #include "ui/progress.h" > @@ -1449,6 +1450,9 @@ int cmd_report(int argc, const char **argv) > OPT_CALLBACK(0, "addr2line-style", NULL, "addr2line style", > "addr2line styles (libdw,llvm,libbfd,addr2line)", > report_parse_addr2line_config), > + OPT_CALLBACK(0, "unwind-style", NULL, "unwind style", > + "unwind styles (libdw,libunwind)", > + unwind__option), > OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle, > "Symbol demangling. Enabled by default, use --no-demangle to disable."), > OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel, > diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c > index c8ac9f01a36b..fd0b4609516b 100644 > --- a/tools/perf/builtin-script.c > +++ b/tools/perf/builtin-script.c > @@ -63,6 +63,7 @@ > #include > #include "util/dlfilter.h" > #include "util/record.h" > +#include "util/unwind.h" > #include "util/util.h" > #include "util/cgroup.h" > #include "util/annotate.h" > @@ -4159,6 +4160,9 @@ int cmd_script(int argc, const char **argv) > "Enable symbol demangling"), > OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel, > "Enable kernel symbol demangling"), > + OPT_CALLBACK(0, "unwind-style", NULL, "unwind style", > + "unwind styles (libdw,libunwind)", > + unwind__option), > OPT_STRING(0, "addr2line", &symbol_conf.addr2line_path, "path", > "addr2line binary to use for line numbers"), > OPT_STRING(0, "time", &script.time_str, "str", > diff --git a/tools/perf/util/Build b/tools/perf/util/Build > index 70cc91d00804..01edfccebb88 100644 > --- a/tools/perf/util/Build > +++ b/tools/perf/util/Build > @@ -216,6 +216,7 @@ ifndef CONFIG_SETNS > perf-util-y += setns.o > endif > > +perf-util-y += unwind.o > perf-util-$(CONFIG_LIBDW) += probe-finder.o > perf-util-$(CONFIG_LIBDW) += dwarf-aux.o > perf-util-$(CONFIG_LIBDW) += dwarf-regs.o > diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c > index 087002fb1b9b..7988149dc7ed 100644 > --- a/tools/perf/util/config.c > +++ b/tools/perf/util/config.c > @@ -23,6 +23,7 @@ > #include "build-id.h" > #include "debug.h" > #include "config.h" > +#include "unwind.h" > #include > #include > #include > @@ -525,6 +526,9 @@ int perf_default_config(const char *var, const char *value, > if (strstarts(var, "addr2line.")) > return addr2line_configure(var, value, dummy); > > + if (strstarts(var, "unwind.")) > + return unwind__configure(var, value, dummy); > + > /* Add other config variables here. */ > return 0; > } > diff --git a/tools/perf/util/symbol_conf.h b/tools/perf/util/symbol_conf.h > index 6cd454d7c98e..0dee5aa6a534 100644 > --- a/tools/perf/util/symbol_conf.h > +++ b/tools/perf/util/symbol_conf.h > @@ -9,6 +9,15 @@ > struct strlist; > struct intlist; > > +enum unwind_style { > + UNWIND_STYLE_UNKNOWN = 0, > + UNWIND_STYLE_LIBDW, > + UNWIND_STYLE_LIBUNWIND, > +}; > + > +#define MAX_UNWIND_STYLE (UNWIND_STYLE_LIBUNWIND + 1) > + > + > enum a2l_style { > A2L_STYLE_UNKNOWN = 0, > A2L_STYLE_LIBDW, > @@ -81,6 +90,7 @@ struct symbol_conf { > const char *addr2line_path; > enum a2l_style addr2line_style[MAX_A2L_STYLE]; > int addr2line_timeout_ms; > + enum unwind_style unwind_style[MAX_UNWIND_STYLE]; > unsigned long time_quantum; > struct strlist *dso_list, > *comm_list, > diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c > index 05e8e68bd49c..21171a6a878c 100644 > --- a/tools/perf/util/unwind-libdw.c > +++ b/tools/perf/util/unwind-libdw.c > @@ -339,7 +339,7 @@ frame_callback(Dwfl_Frame *state, void *arg) > DWARF_CB_ABORT : DWARF_CB_OK; > } > > -int unwind__get_entries(unwind_entry_cb_t cb, void *arg, > +int libdw__get_entries(unwind_entry_cb_t cb, void *arg, > struct thread *thread, > struct perf_sample *data, > int max_stack, > @@ -356,7 +356,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, > int err = -EINVAL, i; > > if (!data->user_regs || !data->user_regs->regs) > - return -EINVAL; > + return 0; > > ui = zalloc(sizeof(*ui) + sizeof(ui->entries[0]) * max_stack); > if (!ui) > @@ -430,6 +430,18 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, > map_symbol__exit(&ui->entries[i].ms); > > dwfl_ui_ti->ui = NULL; > + int entries = (int)ui->idx; Moved this 'entries' variable to the stgart of the function to address this on fedora 44: CC /tmp/build/perf-tools-next/util/bpf-event.o CC /tmp/build/perf-tools-next/util/pfm.o util/unwind-libdw.c: In function ‘libdw__get_entries’: util/unwind-libdw.c:433:9: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 433 | int entries = (int)ui->idx; | ^~~ cc1: all warnings being treated as errors make[4]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:95: /tmp/build/perf-tools-next/util/unwind-libdw.o] Error 1 - Arnaldo > free(ui); > - return 0; > + /* > + * Unwinder return contract: > + * > 0 : unwinding succeeded (stops fallback). If we found frames but hit an error > + * (e.g. truncated stack), report success to preserve existing frames. > + * 0 : unwinding failed without yielding frames. Ignore non-fatal errors > + * (e.g. missing debug info, DWARF corruption) to allow fallback unwinder or > + * kernel callchain resolution to proceed. > + * < 0 : fatal error (e.g. -ENOMEM). Aborts unwinding entirely. > + */ > + if (err) > + return (err == -ENOMEM) ? -ENOMEM : (entries > 0 ? 1 : 0); > + return entries; > } > diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c > index 87d496e9dfa6..27e2f7b31789 100644 > --- a/tools/perf/util/unwind-libunwind-local.c > +++ b/tools/perf/util/unwind-libunwind-local.c > @@ -744,7 +744,7 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb, > ret = perf_reg_value(&val, perf_sample__user_regs(ui->sample), > perf_arch_reg_ip(e_machine)); > if (ret) > - return ret; > + return 0; > > ips[i++] = (unw_word_t) val; > > @@ -757,7 +757,7 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb, > addr_space = maps__addr_space(thread__maps(ui->thread)); > > if (addr_space == NULL) > - return -1; > + return 0; > > ret = unw_init_remote(&c, addr_space, ui); > if (ret && !ui->best_effort) > @@ -785,15 +785,30 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb, > /* > * Display what we got based on the order setup. > */ > + int entries = 0; > for (i = 0; i < max_stack && !ret; i++) { > int j = i; > > if (callchain_param.order == ORDER_CALLER) > j = max_stack - i - 1; > - ret = ips[j] ? entry(ips[j], ui->thread, cb, arg) : 0; > + if (ips[j]) { > + ret = entry(ips[j], ui->thread, cb, arg); > + if (ret) > + break; > + entries++; > + } > } > > - return ret; > + /* > + * Unwinder return contract: > + * > 0 : unwinding succeeded (stops fallback). > + * 0 : unwinding failed without yielding frames. Ignore non-fatal errors > + * (e.g. stepping failure) to allow fallback unwinder or kernel callchains. > + * < 0 : fatal error (e.g. -ENOMEM). Aborts unwinding entirely. > + */ > + if (ret == -ENOMEM) > + return -ENOMEM; > + return (entries > 0 || ret == 0) ? entries : 0; > } > > static int _unwind__get_entries(unwind_entry_cb_t cb, void *arg, > @@ -809,10 +824,10 @@ static int _unwind__get_entries(unwind_entry_cb_t cb, void *arg, > }; > > if (!data->user_regs || !data->user_regs->regs) > - return -EINVAL; > + return 0; > > if (max_stack <= 0) > - return -EINVAL; > + return 0; > > return get_entries(&ui, cb, arg, max_stack); > } > diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c > index cb8be6acfb6f..a0016b897dae 100644 > --- a/tools/perf/util/unwind-libunwind.c > +++ b/tools/perf/util/unwind-libunwind.c > @@ -79,7 +79,7 @@ void unwind__finish_access(struct maps *maps) > ops->finish_access(maps); > } > > -int unwind__get_entries(unwind_entry_cb_t cb, void *arg, > +int libunwind__get_entries(unwind_entry_cb_t cb, void *arg, > struct thread *thread, > struct perf_sample *data, int max_stack, > bool best_effort) > diff --git a/tools/perf/util/unwind.c b/tools/perf/util/unwind.c > new file mode 100644 > index 000000000000..4ed4b1d55c69 > --- /dev/null > +++ b/tools/perf/util/unwind.c > @@ -0,0 +1,104 @@ > +// SPDX-License-Identifier: GPL-2.0 > +#include "debug.h" > +#include "symbol_conf.h" > +#include "unwind.h" > +#include > +#include > +#include > + > +int unwind__get_entries(unwind_entry_cb_t cb __maybe_unused, void *arg __maybe_unused, > + struct thread *thread __maybe_unused, > + struct perf_sample *data __maybe_unused, > + int max_stack __maybe_unused, > + bool best_effort __maybe_unused) > +{ > + int ret = 0; > + > +#if defined(HAVE_LIBDW_SUPPORT) || defined(HAVE_LIBUNWIND_SUPPORT) > + if (symbol_conf.unwind_style[0] == UNWIND_STYLE_UNKNOWN) { > + int i = 0; > +#ifdef HAVE_LIBDW_SUPPORT > + symbol_conf.unwind_style[i++] = UNWIND_STYLE_LIBDW; > +#endif > +#ifdef HAVE_LIBUNWIND_SUPPORT > + symbol_conf.unwind_style[i++] = UNWIND_STYLE_LIBUNWIND; > +#endif > + } > +#endif //defined(HAVE_LIBDW_SUPPORT) || defined(HAVE_LIBUNWIND_SUPPORT) > + > + for (size_t i = 0; i < ARRAY_SIZE(symbol_conf.unwind_style); i++) { > + switch (symbol_conf.unwind_style[i]) { > + case UNWIND_STYLE_LIBDW: > + ret = libdw__get_entries(cb, arg, thread, data, max_stack, best_effort); > + break; > + case UNWIND_STYLE_LIBUNWIND: > + ret = libunwind__get_entries(cb, arg, thread, data, max_stack, best_effort); > + break; > + case UNWIND_STYLE_UNKNOWN: > + default: > +#if !defined(HAVE_LIBDW_SUPPORT) && !defined(HAVE_LIBUNWIND_SUPPORT) > + pr_warning_once( > + "Error: dwarf unwinding not supported, build perf with libdw or libunwind.\n"); > +#endif > + ret = 0; > + break; > + } > + if (ret > 0) { > + ret = 0; > + break; > + } > + if (ret < 0) > + break; > + } > + return ret; > +} > + > +int unwind__configure(const char *var, const char *value, void *cb __maybe_unused) > +{ > + static const char * const unwind_style_names[] = { > + [UNWIND_STYLE_LIBDW] = "libdw", > + [UNWIND_STYLE_LIBUNWIND] = "libunwind", > + NULL > + }; > + char *s, *p, *saveptr; > + size_t i = 0; > + > + if (strcmp(var, "unwind.style")) > + return 0; > + > + if (!value) > + return -1; > + > + s = strdup(value); > + if (!s) > + return -1; > + > + memset(symbol_conf.unwind_style, 0, sizeof(symbol_conf.unwind_style)); > + > + p = strtok_r(s, ",", &saveptr); > + while (p && i < ARRAY_SIZE(symbol_conf.unwind_style)) { > + bool found = false; > + char *q = strim(p); > + > + for (size_t j = UNWIND_STYLE_LIBDW; j < MAX_UNWIND_STYLE; j++) { > + if (!strcasecmp(q, unwind_style_names[j])) { > + symbol_conf.unwind_style[i++] = j; > + found = true; > + break; > + } > + } > + if (!found) > + pr_warning("Unknown unwind style: %s\n", q); > + p = strtok_r(NULL, ",", &saveptr); > + } > + > + free(s); > + return 0; > +} > + > +int unwind__option(const struct option *opt __maybe_unused, > + const char *arg, > + int unset __maybe_unused) > +{ > + return unwind__configure("unwind.style", arg, NULL); > +} > diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h > index 9f7164c6d9aa..28db3e3b9b51 100644 > --- a/tools/perf/util/unwind.h > +++ b/tools/perf/util/unwind.h > @@ -4,9 +4,10 @@ > > #include > #include > -#include "util/map_symbol.h" > +#include "map_symbol.h" > > struct maps; > +struct option; > struct perf_sample; > struct thread; > > @@ -26,7 +27,9 @@ struct unwind_libunwind_ops { > struct perf_sample *data, int max_stack, bool best_effort); > }; > > -#ifdef HAVE_DWARF_UNWIND_SUPPORT > +int unwind__configure(const char *var, const char *value, void *cb); > +int unwind__option(const struct option *opt, const char *arg, int unset); > + > /* > * When best_effort is set, don't report errors and fail silently. This could > * be expanded in the future to be more permissive about things other than > @@ -36,8 +39,31 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, > struct thread *thread, > struct perf_sample *data, int max_stack, > bool best_effort); > -/* libunwind specific */ > + > +#ifdef HAVE_LIBDW_SUPPORT > +int libdw__get_entries(unwind_entry_cb_t cb, void *arg, > + struct thread *thread, > + struct perf_sample *data, int max_stack, > + bool best_effort); > +#else > +#include "debug.h" > +static inline int libdw__get_entries(unwind_entry_cb_t cb __maybe_unused, void *arg __maybe_unused, > + struct thread *thread __maybe_unused, > + struct perf_sample *data __maybe_unused, > + int max_stack __maybe_unused, > + bool best_effort __maybe_unused) > +{ > + pr_err("Error: libdw dwarf unwinding not built into perf\n"); > + return 0; > +} > +#endif > + > #ifdef HAVE_LIBUNWIND_SUPPORT > +/* libunwind specific */ > +int libunwind__get_entries(unwind_entry_cb_t cb, void *arg, > + struct thread *thread, > + struct perf_sample *data, int max_stack, > + bool best_effort); > #ifndef LIBUNWIND__ARCH_REG_ID > #define LIBUNWIND__ARCH_REG_ID(regnum) libunwind__arch_reg_id(regnum) > #endif > @@ -47,25 +73,15 @@ int unwind__prepare_access(struct maps *maps, struct map *map, bool *initialized > void unwind__flush_access(struct maps *maps); > void unwind__finish_access(struct maps *maps); > #else > -static inline int unwind__prepare_access(struct maps *maps __maybe_unused, > - struct map *map __maybe_unused, > - bool *initialized __maybe_unused) > -{ > - return 0; > -} > - > -static inline void unwind__flush_access(struct maps *maps __maybe_unused) {} > -static inline void unwind__finish_access(struct maps *maps __maybe_unused) {} > -#endif > -#else > -static inline int > -unwind__get_entries(unwind_entry_cb_t cb __maybe_unused, > - void *arg __maybe_unused, > - struct thread *thread __maybe_unused, > - struct perf_sample *data __maybe_unused, > - int max_stack __maybe_unused, > - bool best_effort __maybe_unused) > +#include "debug.h" > +static inline int libunwind__get_entries(unwind_entry_cb_t cb __maybe_unused, > + void *arg __maybe_unused, > + struct thread *thread __maybe_unused, > + struct perf_sample *data __maybe_unused, > + int max_stack __maybe_unused, > + bool best_effort __maybe_unused) > { > + pr_err("Error: libunwind dwarf unwinding not built into perf\n"); > return 0; > } > > @@ -78,5 +94,6 @@ static inline int unwind__prepare_access(struct maps *maps __maybe_unused, > > static inline void unwind__flush_access(struct maps *maps __maybe_unused) {} > static inline void unwind__finish_access(struct maps *maps __maybe_unused) {} > -#endif /* HAVE_DWARF_UNWIND_SUPPORT */ > +#endif > + > #endif /* __UNWIND_H */ > -- > 2.54.0.563.g4f69b47b94-goog > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57DC9CD4F25 for ; Fri, 15 May 2026 00:12:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=z8n3XIqSxhpd8v/NW2Yi0cjiqHEWrs9m+WlUZDIj4cs=; b=4L4xJIlmdMCRSq /h90fbhy2eTF4VHHTyItz0fj1KPtOM7s4p4gVeGzTXD6sTJzyXsE5uXQSOSnDnRu8RgCdr6tYU3XF bD77yGWsDFcfeAHxVgPCz+mhCEs6KhEE1qUV4BPCsPBflCvmQdQdPMFEkiga6w4a8y/b19nAlNHir pxA0HuAtV95OKrgj0fpp/4dhKmTazBy+2drxI42ZR3cuZ4BmcnDpisWronx+GSBDw/GlzCG+65lEz Xytc2jRdRAobjiP6XedEYd6mtj13fF405+q/sTYmiYQTyTOBTj/cO1Ii3tZLb985LDHIrugSWdIcx uDO0eEz1ruGcqrZ8FVig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wNgAa-00000006t8E-28Np; Fri, 15 May 2026 00:12:48 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wNgAX-00000006t7O-3Dwu; Fri, 15 May 2026 00:12:47 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 80D4040583; Fri, 15 May 2026 00:12:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF984C2BCB3; Fri, 15 May 2026 00:12:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778803964; bh=oIma0XbaHYrL6wVyXkT/yUci4CgCDvPlVnahgbXD6rg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BSf4LmmBBrp4Fm8NqrS99qRGLVyDH/T1orqBBJr9CMZ8Se/jijQlj0lvvcbj2maiI uCjW44+KSVuyf7nU78JU/EdwwmbT9QwxPACG9OWf1eR7C+SIgoUBD8up1A/ls/FDlY CKIE5xiYYoKTop+z3q5wY5RlngquG+3LacxkkvHxA+yQbo6S18iX0UYdWKqIgBZRYX 4paSs8JpsuPKAZMgIUGbgtqx27H6N+6fomxulyyM9T0ygTckefucAvXgMG6rxoIAt3 bo4DbDJoGx8bDUoAwZZuhDkNptD3IEgzBPV4x+5P+9werV8e6l1TzHS9HomX16YW4O Ve6NePI8I9Jzw== Date: Thu, 14 May 2026 21:12:40 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: adrian.hunter@intel.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, namhyung@kernel.org, Florian Fainelli , Li Guan , 9erthalion6@gmail.com, alex@ghiti.fr, alexander.shishkin@linux.intel.com, andrew.jones@oss.qualcomm.com, aou@eecs.berkeley.edu, atrajeev@linux.ibm.com, howardchu95@gmail.com, john.g.garry@oracle.com, jolsa@kernel.org, leo.yan@linux.dev, libunwind-devel@nongnu.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-riscv@lists.infradead.org, mingo@redhat.com, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, shimin.guo@skydio.com, tglozar@redhat.com, tmricht@linux.ibm.com, will@kernel.org Subject: Re: [PATCH v5 1/7] perf unwind: Refactor get_entries to allow dynamic libdw/libunwind selection Message-ID: References: <20260413024805.1316480-1-irogers@google.com> <20260513233151.572332-1-irogers@google.com> <20260513233151.572332-2-irogers@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20260513233151.572332-2-irogers@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260514_171245_869185_1EA0E1BE X-CRM114-Status: GOOD ( 37.63 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org T24gV2VkLCBNYXkgMTMsIDIwMjYgYXQgMDQ6MzE6NDVQTSAtMDcwMCwgSWFuIFJvZ2VycyB3cm90 ZToKPiBDdXJyZW50bHksIGJvdGggbGliZHcgYW5kIGxpYnVud2luZCBkZWZpbmUgJ3Vud2luZF9f Z2V0X2VudHJpZXMnLiBUaGlzCj4gY2F1c2VzIGEgZHVwbGljYXRlIHN5bWJvbCBidWlsZCBmYWls dXJlIHdoZW4gYm90aCBhcmUgY29tcGlsZWQgaW50bwo+IHBlcmYuCj4gCj4gVGhpcyBjb21taXQg cmVmYWN0b3JzIHRoZSBEV0FSRiB1bndpbmQgcG9zdC1wcm9jZXNzaW5nIHRvIGJlCj4gY29uZmln dXJhYmxlIGF0IHJ1bnRpbWUgdmlhIHRoZSAucGVyZmNvbmZpZyBmaWxlIG9wdGlvbgo+ICd1bndp bmQuc3R5bGUnLCBvciB1c2luZyB0aGUgYXJndW1lbnQgJy0tdW53aW5kLXN0eWxlJyBpbiB0aGUg Y29tbWFuZHMKPiAncGVyZiByZXBvcnQnLCAncGVyZiBzY3JpcHQnIGFuZCAncGVyZiBpbmplY3Qn LCBpbiBhIHNpbWlsYXIgbWFubmVyIHRvCj4gdGhlIGFkZHIybGluZSBvciB0aGUgZGlzYXNzZW1i bGVyIHN0eWxlLgo+IAo+IFRoZSBmaWxlICd0b29scy9wZXJmL3V0aWwvdW53aW5kLmMnIGFkZHMg dGhlIHRvcC1sZXZlbCBkaXNwYXRjaAo+IGZ1bmN0aW9uICd1bndpbmRfX2dldF9lbnRyaWVzJy4g VGhlIGJhY2tlbmQgaW1wbGVtZW50YXRpb25zIGFyZQo+IHJlbmFtZWQgdG8gJ2xpYmR3X19nZXRf ZW50cmllcycgYW5kICdsaWJ1bndpbmRfX2dldF9lbnRyaWVzJy4gQm90aCBhcmUKPiBhdHRlbXB0 ZWQgYXMgZmFsbGJhY2tzIGlmIG5vdCBjb25maWd1cmVkLCBvciBpZiB0aGUgcHJpbWFyeSBiYWNr ZW5kCj4gZmFpbHMuCj4gCj4gRml4ZXM6IDJlOTE5MTU3M2E2OSAoInBlcmYgYnVpbGQ6IFJlbW92 ZSBOT19MSUJEV19EV0FSRl9VTldJTkQgb3B0aW9uIikKPiBTaWduZWQtb2ZmLWJ5OiBJYW4gUm9n ZXJzIDxpcm9nZXJzQGdvb2dsZS5jb20+Cj4gLS0tCj4gIHRvb2xzL3BlcmYvYnVpbHRpbi1pbmpl Y3QuYyAgICAgICAgICAgICAgfCAgIDQgKwo+ICB0b29scy9wZXJmL2J1aWx0aW4tcmVwb3J0LmMg ICAgICAgICAgICAgIHwgICA0ICsKPiAgdG9vbHMvcGVyZi9idWlsdGluLXNjcmlwdC5jICAgICAg ICAgICAgICB8ICAgNCArCj4gIHRvb2xzL3BlcmYvdXRpbC9CdWlsZCAgICAgICAgICAgICAgICAg ICAgfCAgIDEgKwo+ICB0b29scy9wZXJmL3V0aWwvY29uZmlnLmMgICAgICAgICAgICAgICAgIHwg ICA0ICsKPiAgdG9vbHMvcGVyZi91dGlsL3N5bWJvbF9jb25mLmggICAgICAgICAgICB8ICAxMCAr KysKPiAgdG9vbHMvcGVyZi91dGlsL3Vud2luZC1saWJkdy5jICAgICAgICAgICB8ICAxOCArKyst Cj4gIHRvb2xzL3BlcmYvdXRpbC91bndpbmQtbGlidW53aW5kLWxvY2FsLmMgfCAgMjcgKysrKy0t Cj4gIHRvb2xzL3BlcmYvdXRpbC91bndpbmQtbGlidW53aW5kLmMgICAgICAgfCAgIDIgKy0KPiAg dG9vbHMvcGVyZi91dGlsL3Vud2luZC5jICAgICAgICAgICAgICAgICB8IDEwNCArKysrKysrKysr KysrKysrKysrKysrKwo+ICB0b29scy9wZXJmL3V0aWwvdW53aW5kLmggICAgICAgICAgICAgICAg IHwgIDYxICsrKysrKysrLS0tLS0KPiAgMTEgZmlsZXMgY2hhbmdlZCwgMjA3IGluc2VydGlvbnMo KyksIDMyIGRlbGV0aW9ucygtKQo+ICBjcmVhdGUgbW9kZSAxMDA2NDQgdG9vbHMvcGVyZi91dGls L3Vud2luZC5jCj4gCj4gZGlmZiAtLWdpdCBhL3Rvb2xzL3BlcmYvYnVpbHRpbi1pbmplY3QuYyBi L3Rvb2xzL3BlcmYvYnVpbHRpbi1pbmplY3QuYwo+IGluZGV4IDZhYjIwZGYzNThjNC4uYTI0OTNm MTA5N2RmIDEwMDY0NAo+IC0tLSBhL3Rvb2xzL3BlcmYvYnVpbHRpbi1pbmplY3QuYwo+ICsrKyBi L3Rvb2xzL3BlcmYvYnVpbHRpbi1pbmplY3QuYwo+IEBAIC0yNiw2ICsyNiw3IEBACj4gICNpbmNs dWRlICJ1dGlsL3N5bnRoZXRpYy1ldmVudHMuaCIKPiAgI2luY2x1ZGUgInV0aWwvdGhyZWFkLmgi Cj4gICNpbmNsdWRlICJ1dGlsL25hbWVzcGFjZXMuaCIKPiArI2luY2x1ZGUgInV0aWwvdW53aW5k LmgiCj4gICNpbmNsdWRlICJ1dGlsL3V0aWwuaCIKPiAgI2luY2x1ZGUgInV0aWwvdHNjLmgiCj4g IAo+IEBAIC0yNTYzLDYgKzI1NjQsOSBAQCBpbnQgY21kX2luamVjdChpbnQgYXJnYywgY29uc3Qg Y2hhciAqKmFyZ3YpCj4gIAkJT1BUX1NUUklORygwLCAiZ3Vlc3Rtb3VudCIsICZzeW1ib2xfY29u Zi5ndWVzdG1vdW50LCAiZGlyZWN0b3J5IiwKPiAgCQkJICAgImd1ZXN0IG1vdW50IGRpcmVjdG9y eSB1bmRlciB3aGljaCBldmVyeSBndWVzdCBvcyIKPiAgCQkJICAgIiBpbnN0YW5jZSBoYXMgYSBz dWJkaXIiKSwKPiArCQlPUFRfQ0FMTEJBQ0soMCwgInVud2luZC1zdHlsZSIsIE5VTEwsICJ1bndp bmQgc3R5bGUiLAo+ICsJCQkgICAgICJ1bndpbmQgc3R5bGVzIChsaWJkdyxsaWJ1bndpbmQpIiwK PiArCQkJICAgICB1bndpbmRfX29wdGlvbiksCj4gIAkJT1BUX0JPT0xFQU4oMCwgImNvbnZlcnQt Y2FsbGNoYWluIiwgJmluamVjdC5jb252ZXJ0X2NhbGxjaGFpbiwKPiAgCQkJICAgICJHZW5lcmF0 ZSBjYWxsY2hhaW5zIHVzaW5nIERXQVJGIGFuZCBkcm9wIHJlZ2lzdGVyL3N0YWNrIGRhdGEiKSwK PiAgCQlPUFRfRU5EKCkKPiBkaWZmIC0tZ2l0IGEvdG9vbHMvcGVyZi9idWlsdGluLXJlcG9ydC5j IGIvdG9vbHMvcGVyZi9idWlsdGluLXJlcG9ydC5jCj4gaW5kZXggOTVjMGJkYmE2YjExLi4wYjA5 NjZkOTQxMjggMTAwNjQ0Cj4gLS0tIGEvdG9vbHMvcGVyZi9idWlsdGluLXJlcG9ydC5jCj4gKysr IGIvdG9vbHMvcGVyZi9idWlsdGluLXJlcG9ydC5jCj4gQEAgLTQ4LDYgKzQ4LDcgQEAKPiAgI2lu Y2x1ZGUgInV0aWwvdGltZS11dGlscy5oIgo+ICAjaW5jbHVkZSAidXRpbC9hdXh0cmFjZS5oIgo+ ICAjaW5jbHVkZSAidXRpbC91bml0cy5oIgo+ICsjaW5jbHVkZSAidXRpbC91bndpbmQuaCIKPiAg I2luY2x1ZGUgInV0aWwvdXRpbC5oIiAvLyBwZXJmX3RpcCgpCj4gICNpbmNsdWRlICJ1aS91aS5o Igo+ICAjaW5jbHVkZSAidWkvcHJvZ3Jlc3MuaCIKPiBAQCAtMTQ0OSw2ICsxNDUwLDkgQEAgaW50 IGNtZF9yZXBvcnQoaW50IGFyZ2MsIGNvbnN0IGNoYXIgKiphcmd2KQo+ICAJT1BUX0NBTExCQUNL KDAsICJhZGRyMmxpbmUtc3R5bGUiLCBOVUxMLCAiYWRkcjJsaW5lIHN0eWxlIiwKPiAgCQkgICAg ICJhZGRyMmxpbmUgc3R5bGVzIChsaWJkdyxsbHZtLGxpYmJmZCxhZGRyMmxpbmUpIiwKPiAgCQkg ICAgIHJlcG9ydF9wYXJzZV9hZGRyMmxpbmVfY29uZmlnKSwKPiArCU9QVF9DQUxMQkFDSygwLCAi dW53aW5kLXN0eWxlIiwgTlVMTCwgInVud2luZCBzdHlsZSIsCj4gKwkJICAgICAidW53aW5kIHN0 eWxlcyAobGliZHcsbGlidW53aW5kKSIsCj4gKwkJICAgICB1bndpbmRfX29wdGlvbiksCj4gIAlP UFRfQk9PTEVBTigwLCAiZGVtYW5nbGUiLCAmc3ltYm9sX2NvbmYuZGVtYW5nbGUsCj4gIAkJICAg ICJTeW1ib2wgZGVtYW5nbGluZy4gRW5hYmxlZCBieSBkZWZhdWx0LCB1c2UgLS1uby1kZW1hbmds ZSB0byBkaXNhYmxlLiIpLAo+ICAJT1BUX0JPT0xFQU4oMCwgImRlbWFuZ2xlLWtlcm5lbCIsICZz eW1ib2xfY29uZi5kZW1hbmdsZV9rZXJuZWwsCj4gZGlmZiAtLWdpdCBhL3Rvb2xzL3BlcmYvYnVp bHRpbi1zY3JpcHQuYyBiL3Rvb2xzL3BlcmYvYnVpbHRpbi1zY3JpcHQuYwo+IGluZGV4IGM4YWM5 ZjAxYTM2Yi4uZmQwYjQ2MDk1MTZiIDEwMDY0NAo+IC0tLSBhL3Rvb2xzL3BlcmYvYnVpbHRpbi1z Y3JpcHQuYwo+ICsrKyBiL3Rvb2xzL3BlcmYvYnVpbHRpbi1zY3JpcHQuYwo+IEBAIC02Myw2ICs2 Myw3IEBACj4gICNpbmNsdWRlIDxsaW51eC9lcnIuaD4KPiAgI2luY2x1ZGUgInV0aWwvZGxmaWx0 ZXIuaCIKPiAgI2luY2x1ZGUgInV0aWwvcmVjb3JkLmgiCj4gKyNpbmNsdWRlICJ1dGlsL3Vud2lu ZC5oIgo+ICAjaW5jbHVkZSAidXRpbC91dGlsLmgiCj4gICNpbmNsdWRlICJ1dGlsL2Nncm91cC5o Igo+ICAjaW5jbHVkZSAidXRpbC9hbm5vdGF0ZS5oIgo+IEBAIC00MTU5LDYgKzQxNjAsOSBAQCBp bnQgY21kX3NjcmlwdChpbnQgYXJnYywgY29uc3QgY2hhciAqKmFyZ3YpCj4gIAkJCSJFbmFibGUg c3ltYm9sIGRlbWFuZ2xpbmciKSwKPiAgCU9QVF9CT09MRUFOKDAsICJkZW1hbmdsZS1rZXJuZWwi LCAmc3ltYm9sX2NvbmYuZGVtYW5nbGVfa2VybmVsLAo+ICAJCQkiRW5hYmxlIGtlcm5lbCBzeW1i b2wgZGVtYW5nbGluZyIpLAo+ICsJT1BUX0NBTExCQUNLKDAsICJ1bndpbmQtc3R5bGUiLCBOVUxM LCAidW53aW5kIHN0eWxlIiwKPiArCQkgICAgICJ1bndpbmQgc3R5bGVzIChsaWJkdyxsaWJ1bndp bmQpIiwKPiArCQkgICAgIHVud2luZF9fb3B0aW9uKSwKPiAgCU9QVF9TVFJJTkcoMCwgImFkZHIy bGluZSIsICZzeW1ib2xfY29uZi5hZGRyMmxpbmVfcGF0aCwgInBhdGgiLAo+ICAJCQkiYWRkcjJs aW5lIGJpbmFyeSB0byB1c2UgZm9yIGxpbmUgbnVtYmVycyIpLAo+ICAJT1BUX1NUUklORygwLCAi dGltZSIsICZzY3JpcHQudGltZV9zdHIsICJzdHIiLAo+IGRpZmYgLS1naXQgYS90b29scy9wZXJm L3V0aWwvQnVpbGQgYi90b29scy9wZXJmL3V0aWwvQnVpbGQKPiBpbmRleCA3MGNjOTFkMDA4MDQu LjAxZWRmY2NlYmI4OCAxMDA2NDQKPiAtLS0gYS90b29scy9wZXJmL3V0aWwvQnVpbGQKPiArKysg Yi90b29scy9wZXJmL3V0aWwvQnVpbGQKPiBAQCAtMjE2LDYgKzIxNiw3IEBAIGlmbmRlZiBDT05G SUdfU0VUTlMKPiAgcGVyZi11dGlsLXkgKz0gc2V0bnMubwo+ICBlbmRpZgo+ICAKPiArcGVyZi11 dGlsLXkgKz0gdW53aW5kLm8KPiAgcGVyZi11dGlsLSQoQ09ORklHX0xJQkRXKSArPSBwcm9iZS1m aW5kZXIubwo+ICBwZXJmLXV0aWwtJChDT05GSUdfTElCRFcpICs9IGR3YXJmLWF1eC5vCj4gIHBl cmYtdXRpbC0kKENPTkZJR19MSUJEVykgKz0gZHdhcmYtcmVncy5vCj4gZGlmZiAtLWdpdCBhL3Rv b2xzL3BlcmYvdXRpbC9jb25maWcuYyBiL3Rvb2xzL3BlcmYvdXRpbC9jb25maWcuYwo+IGluZGV4 IDA4NzAwMmZiMWI5Yi4uNzk4ODE0OWRjN2VkIDEwMDY0NAo+IC0tLSBhL3Rvb2xzL3BlcmYvdXRp bC9jb25maWcuYwo+ICsrKyBiL3Rvb2xzL3BlcmYvdXRpbC9jb25maWcuYwo+IEBAIC0yMyw2ICsy Myw3IEBACj4gICNpbmNsdWRlICJidWlsZC1pZC5oIgo+ICAjaW5jbHVkZSAiZGVidWcuaCIKPiAg I2luY2x1ZGUgImNvbmZpZy5oIgo+ICsjaW5jbHVkZSAidW53aW5kLmgiCj4gICNpbmNsdWRlIDxz eXMvdHlwZXMuaD4KPiAgI2luY2x1ZGUgPHN5cy9zdGF0Lmg+Cj4gICNpbmNsdWRlIDxzdGRsaWIu aD4KPiBAQCAtNTI1LDYgKzUyNiw5IEBAIGludCBwZXJmX2RlZmF1bHRfY29uZmlnKGNvbnN0IGNo YXIgKnZhciwgY29uc3QgY2hhciAqdmFsdWUsCj4gIAlpZiAoc3Ryc3RhcnRzKHZhciwgImFkZHIy bGluZS4iKSkKPiAgCQlyZXR1cm4gYWRkcjJsaW5lX2NvbmZpZ3VyZSh2YXIsIHZhbHVlLCBkdW1t eSk7Cj4gIAo+ICsJaWYgKHN0cnN0YXJ0cyh2YXIsICJ1bndpbmQuIikpCj4gKwkJcmV0dXJuIHVu d2luZF9fY29uZmlndXJlKHZhciwgdmFsdWUsIGR1bW15KTsKPiArCj4gIAkvKiBBZGQgb3RoZXIg Y29uZmlnIHZhcmlhYmxlcyBoZXJlLiAqLwo+ICAJcmV0dXJuIDA7Cj4gIH0KPiBkaWZmIC0tZ2l0 IGEvdG9vbHMvcGVyZi91dGlsL3N5bWJvbF9jb25mLmggYi90b29scy9wZXJmL3V0aWwvc3ltYm9s X2NvbmYuaAo+IGluZGV4IDZjZDQ1NGQ3Yzk4ZS4uMGRlZTVhYTZhNTM0IDEwMDY0NAo+IC0tLSBh L3Rvb2xzL3BlcmYvdXRpbC9zeW1ib2xfY29uZi5oCj4gKysrIGIvdG9vbHMvcGVyZi91dGlsL3N5 bWJvbF9jb25mLmgKPiBAQCAtOSw2ICs5LDE1IEBACj4gIHN0cnVjdCBzdHJsaXN0Owo+ICBzdHJ1 Y3QgaW50bGlzdDsKPiAgCj4gK2VudW0gdW53aW5kX3N0eWxlIHsKPiArCVVOV0lORF9TVFlMRV9V TktOT1dOID0gMCwKPiArCVVOV0lORF9TVFlMRV9MSUJEVywKPiArCVVOV0lORF9TVFlMRV9MSUJV TldJTkQsCj4gK307Cj4gKwo+ICsjZGVmaW5lIE1BWF9VTldJTkRfU1RZTEUgKFVOV0lORF9TVFlM RV9MSUJVTldJTkQgKyAxKQo+ICsKPiArCj4gIGVudW0gYTJsX3N0eWxlIHsKPiAgCUEyTF9TVFlM RV9VTktOT1dOID0gMCwKPiAgCUEyTF9TVFlMRV9MSUJEVywKPiBAQCAtODEsNiArOTAsNyBAQCBz dHJ1Y3Qgc3ltYm9sX2NvbmYgewo+ICAJY29uc3QgY2hhcgkJKmFkZHIybGluZV9wYXRoOwo+ICAJ ZW51bSBhMmxfc3R5bGUJYWRkcjJsaW5lX3N0eWxlW01BWF9BMkxfU1RZTEVdOwo+ICAJaW50ICAg ICAgICAgICAgIGFkZHIybGluZV90aW1lb3V0X21zOwo+ICsJZW51bSB1bndpbmRfc3R5bGUgdW53 aW5kX3N0eWxlW01BWF9VTldJTkRfU1RZTEVdOwo+ICAJdW5zaWduZWQgbG9uZwl0aW1lX3F1YW50 dW07Cj4gICAgICAgICBzdHJ1Y3Qgc3RybGlzdAkqZHNvX2xpc3QsCj4gIAkJCSpjb21tX2xpc3Qs Cj4gZGlmZiAtLWdpdCBhL3Rvb2xzL3BlcmYvdXRpbC91bndpbmQtbGliZHcuYyBiL3Rvb2xzL3Bl cmYvdXRpbC91bndpbmQtbGliZHcuYwo+IGluZGV4IDA1ZThlNjhiZDQ5Yy4uMjExNzFhNmE4Nzhj IDEwMDY0NAo+IC0tLSBhL3Rvb2xzL3BlcmYvdXRpbC91bndpbmQtbGliZHcuYwo+ICsrKyBiL3Rv b2xzL3BlcmYvdXRpbC91bndpbmQtbGliZHcuYwo+IEBAIC0zMzksNyArMzM5LDcgQEAgZnJhbWVf Y2FsbGJhY2soRHdmbF9GcmFtZSAqc3RhdGUsIHZvaWQgKmFyZykKPiAgCSAgICAgICBEV0FSRl9D Ql9BQk9SVCA6IERXQVJGX0NCX09LOwo+ICB9Cj4gIAo+IC1pbnQgdW53aW5kX19nZXRfZW50cmll cyh1bndpbmRfZW50cnlfY2JfdCBjYiwgdm9pZCAqYXJnLAo+ICtpbnQgbGliZHdfX2dldF9lbnRy aWVzKHVud2luZF9lbnRyeV9jYl90IGNiLCB2b2lkICphcmcsCj4gIAkJCXN0cnVjdCB0aHJlYWQg KnRocmVhZCwKPiAgCQkJc3RydWN0IHBlcmZfc2FtcGxlICpkYXRhLAo+ICAJCQlpbnQgbWF4X3N0 YWNrLAo+IEBAIC0zNTYsNyArMzU2LDcgQEAgaW50IHVud2luZF9fZ2V0X2VudHJpZXModW53aW5k X2VudHJ5X2NiX3QgY2IsIHZvaWQgKmFyZywKPiAgCWludCBlcnIgPSAtRUlOVkFMLCBpOwo+ICAK PiAgCWlmICghZGF0YS0+dXNlcl9yZWdzIHx8ICFkYXRhLT51c2VyX3JlZ3MtPnJlZ3MpCj4gLQkJ cmV0dXJuIC1FSU5WQUw7Cj4gKwkJcmV0dXJuIDA7Cj4gIAo+ICAJdWkgPSB6YWxsb2Moc2l6ZW9m KCp1aSkgKyBzaXplb2YodWktPmVudHJpZXNbMF0pICogbWF4X3N0YWNrKTsKPiAgCWlmICghdWkp Cj4gQEAgLTQzMCw2ICs0MzAsMTggQEAgaW50IHVud2luZF9fZ2V0X2VudHJpZXModW53aW5kX2Vu dHJ5X2NiX3QgY2IsIHZvaWQgKmFyZywKPiAgCQltYXBfc3ltYm9sX19leGl0KCZ1aS0+ZW50cmll c1tpXS5tcyk7Cj4gIAo+ICAJZHdmbF91aV90aS0+dWkgPSBOVUxMOwo+ICsJaW50IGVudHJpZXMg PSAoaW50KXVpLT5pZHg7CgpNb3ZlZCB0aGlzICdlbnRyaWVzJyB2YXJpYWJsZSB0byB0aGUgc3Rn YXJ0IG9mIHRoZSBmdW5jdGlvbiB0byBhZGRyZXNzCnRoaXMgb24gZmVkb3JhIDQ0OgoKICBDQyAg ICAgIC90bXAvYnVpbGQvcGVyZi10b29scy1uZXh0L3V0aWwvYnBmLWV2ZW50Lm8KICBDQyAgICAg IC90bXAvYnVpbGQvcGVyZi10b29scy1uZXh0L3V0aWwvcGZtLm8KdXRpbC91bndpbmQtbGliZHcu YzogSW4gZnVuY3Rpb24g4oCYbGliZHdfX2dldF9lbnRyaWVz4oCZOgp1dGlsL3Vud2luZC1saWJk dy5jOjQzMzo5OiBlcnJvcjogSVNPIEM5MCBmb3JiaWRzIG1peGVkIGRlY2xhcmF0aW9ucyBhbmQg Y29kZSBbLVdlcnJvcj1kZWNsYXJhdGlvbi1hZnRlci1zdGF0ZW1lbnRdCiAgNDMzIHwgICAgICAg ICBpbnQgZW50cmllcyA9IChpbnQpdWktPmlkeDsKICAgICAgfCAgICAgICAgIF5+fgpjYzE6IGFs bCB3YXJuaW5ncyBiZWluZyB0cmVhdGVkIGFzIGVycm9ycwptYWtlWzRdOiAqKiogWy9ob21lL2Fj bWUvZ2l0L3BlcmYtdG9vbHMtbmV4dC90b29scy9idWlsZC9NYWtlZmlsZS5idWlsZDo5NTogL3Rt cC9idWlsZC9wZXJmLXRvb2xzLW5leHQvdXRpbC91bndpbmQtbGliZHcub10gRXJyb3IgMQoKLSBB cm5hbGRvCgo+ICAJZnJlZSh1aSk7Cj4gLQlyZXR1cm4gMDsKPiArCS8qCj4gKwkgKiBVbndpbmRl ciByZXR1cm4gY29udHJhY3Q6Cj4gKwkgKiAgPiAwIDogdW53aW5kaW5nIHN1Y2NlZWRlZCAoc3Rv cHMgZmFsbGJhY2spLiBJZiB3ZSBmb3VuZCBmcmFtZXMgYnV0IGhpdCBhbiBlcnJvcgo+ICsJICog ICAgICAgIChlLmcuIHRydW5jYXRlZCBzdGFjayksIHJlcG9ydCBzdWNjZXNzIHRvIHByZXNlcnZl IGV4aXN0aW5nIGZyYW1lcy4KPiArCSAqICAgIDAgOiB1bndpbmRpbmcgZmFpbGVkIHdpdGhvdXQg eWllbGRpbmcgZnJhbWVzLiBJZ25vcmUgbm9uLWZhdGFsIGVycm9ycwo+ICsJICogICAgICAgIChl LmcuIG1pc3NpbmcgZGVidWcgaW5mbywgRFdBUkYgY29ycnVwdGlvbikgdG8gYWxsb3cgZmFsbGJh Y2sgdW53aW5kZXIgb3IKPiArCSAqICAgICAgICBrZXJuZWwgY2FsbGNoYWluIHJlc29sdXRpb24g dG8gcHJvY2VlZC4KPiArCSAqICA8IDAgOiBmYXRhbCBlcnJvciAoZS5nLiAtRU5PTUVNKS4gQWJv cnRzIHVud2luZGluZyBlbnRpcmVseS4KPiArCSAqLwo+ICsJaWYgKGVycikKPiArCQlyZXR1cm4g KGVyciA9PSAtRU5PTUVNKSA/IC1FTk9NRU0gOiAoZW50cmllcyA+IDAgPyAxIDogMCk7Cj4gKwly ZXR1cm4gZW50cmllczsKPiAgfQo+IGRpZmYgLS1naXQgYS90b29scy9wZXJmL3V0aWwvdW53aW5k LWxpYnVud2luZC1sb2NhbC5jIGIvdG9vbHMvcGVyZi91dGlsL3Vud2luZC1saWJ1bndpbmQtbG9j YWwuYwo+IGluZGV4IDg3ZDQ5NmU5ZGZhNi4uMjdlMmY3YjMxNzg5IDEwMDY0NAo+IC0tLSBhL3Rv b2xzL3BlcmYvdXRpbC91bndpbmQtbGlidW53aW5kLWxvY2FsLmMKPiArKysgYi90b29scy9wZXJm L3V0aWwvdW53aW5kLWxpYnVud2luZC1sb2NhbC5jCj4gQEAgLTc0NCw3ICs3NDQsNyBAQCBzdGF0 aWMgaW50IGdldF9lbnRyaWVzKHN0cnVjdCB1bndpbmRfaW5mbyAqdWksIHVud2luZF9lbnRyeV9j Yl90IGNiLAo+ICAJcmV0ID0gcGVyZl9yZWdfdmFsdWUoJnZhbCwgcGVyZl9zYW1wbGVfX3VzZXJf cmVncyh1aS0+c2FtcGxlKSwKPiAgCQkJICAgICBwZXJmX2FyY2hfcmVnX2lwKGVfbWFjaGluZSkp Owo+ICAJaWYgKHJldCkKPiAtCQlyZXR1cm4gcmV0Owo+ICsJCXJldHVybiAwOwo+ICAKPiAgCWlw c1tpKytdID0gKHVud193b3JkX3QpIHZhbDsKPiAgCj4gQEAgLTc1Nyw3ICs3NTcsNyBAQCBzdGF0 aWMgaW50IGdldF9lbnRyaWVzKHN0cnVjdCB1bndpbmRfaW5mbyAqdWksIHVud2luZF9lbnRyeV9j Yl90IGNiLAo+ICAJCWFkZHJfc3BhY2UgPSBtYXBzX19hZGRyX3NwYWNlKHRocmVhZF9fbWFwcyh1 aS0+dGhyZWFkKSk7Cj4gIAo+ICAJCWlmIChhZGRyX3NwYWNlID09IE5VTEwpCj4gLQkJCXJldHVy biAtMTsKPiArCQkJcmV0dXJuIDA7Cj4gIAo+ICAJCXJldCA9IHVud19pbml0X3JlbW90ZSgmYywg YWRkcl9zcGFjZSwgdWkpOwo+ICAJCWlmIChyZXQgJiYgIXVpLT5iZXN0X2VmZm9ydCkKPiBAQCAt Nzg1LDE1ICs3ODUsMzAgQEAgc3RhdGljIGludCBnZXRfZW50cmllcyhzdHJ1Y3QgdW53aW5kX2lu Zm8gKnVpLCB1bndpbmRfZW50cnlfY2JfdCBjYiwKPiAgCS8qCj4gIAkgKiBEaXNwbGF5IHdoYXQg d2UgZ290IGJhc2VkIG9uIHRoZSBvcmRlciBzZXR1cC4KPiAgCSAqLwo+ICsJaW50IGVudHJpZXMg PSAwOwo+ICAJZm9yIChpID0gMDsgaSA8IG1heF9zdGFjayAmJiAhcmV0OyBpKyspIHsKPiAgCQlp bnQgaiA9IGk7Cj4gIAo+ICAJCWlmIChjYWxsY2hhaW5fcGFyYW0ub3JkZXIgPT0gT1JERVJfQ0FM TEVSKQo+ICAJCQlqID0gbWF4X3N0YWNrIC0gaSAtIDE7Cj4gLQkJcmV0ID0gaXBzW2pdID8gZW50 cnkoaXBzW2pdLCB1aS0+dGhyZWFkLCBjYiwgYXJnKSA6IDA7Cj4gKwkJaWYgKGlwc1tqXSkgewo+ ICsJCQlyZXQgPSBlbnRyeShpcHNbal0sIHVpLT50aHJlYWQsIGNiLCBhcmcpOwo+ICsJCQlpZiAo cmV0KQo+ICsJCQkJYnJlYWs7Cj4gKwkJCWVudHJpZXMrKzsKPiArCQl9Cj4gIAl9Cj4gIAo+IC0J cmV0dXJuIHJldDsKPiArCS8qCj4gKwkgKiBVbndpbmRlciByZXR1cm4gY29udHJhY3Q6Cj4gKwkg KiAgPiAwIDogdW53aW5kaW5nIHN1Y2NlZWRlZCAoc3RvcHMgZmFsbGJhY2spLgo+ICsJICogICAg MCA6IHVud2luZGluZyBmYWlsZWQgd2l0aG91dCB5aWVsZGluZyBmcmFtZXMuIElnbm9yZSBub24t ZmF0YWwgZXJyb3JzCj4gKwkgKiAgICAgICAgKGUuZy4gc3RlcHBpbmcgZmFpbHVyZSkgdG8gYWxs b3cgZmFsbGJhY2sgdW53aW5kZXIgb3Iga2VybmVsIGNhbGxjaGFpbnMuCj4gKwkgKiAgPCAwIDog ZmF0YWwgZXJyb3IgKGUuZy4gLUVOT01FTSkuIEFib3J0cyB1bndpbmRpbmcgZW50aXJlbHkuCj4g KwkgKi8KPiArCWlmIChyZXQgPT0gLUVOT01FTSkKPiArCQlyZXR1cm4gLUVOT01FTTsKPiArCXJl dHVybiAoZW50cmllcyA+IDAgfHwgcmV0ID09IDApID8gZW50cmllcyA6IDA7Cj4gIH0KPiAgCj4g IHN0YXRpYyBpbnQgX3Vud2luZF9fZ2V0X2VudHJpZXModW53aW5kX2VudHJ5X2NiX3QgY2IsIHZv aWQgKmFyZywKPiBAQCAtODA5LDEwICs4MjQsMTAgQEAgc3RhdGljIGludCBfdW53aW5kX19nZXRf ZW50cmllcyh1bndpbmRfZW50cnlfY2JfdCBjYiwgdm9pZCAqYXJnLAo+ICAJfTsKPiAgCj4gIAlp ZiAoIWRhdGEtPnVzZXJfcmVncyB8fCAhZGF0YS0+dXNlcl9yZWdzLT5yZWdzKQo+IC0JCXJldHVy biAtRUlOVkFMOwo+ICsJCXJldHVybiAwOwo+ICAKPiAgCWlmIChtYXhfc3RhY2sgPD0gMCkKPiAt CQlyZXR1cm4gLUVJTlZBTDsKPiArCQlyZXR1cm4gMDsKPiAgCj4gIAlyZXR1cm4gZ2V0X2VudHJp ZXMoJnVpLCBjYiwgYXJnLCBtYXhfc3RhY2spOwo+ICB9Cj4gZGlmZiAtLWdpdCBhL3Rvb2xzL3Bl cmYvdXRpbC91bndpbmQtbGlidW53aW5kLmMgYi90b29scy9wZXJmL3V0aWwvdW53aW5kLWxpYnVu d2luZC5jCj4gaW5kZXggY2I4YmU2YWNmYjZmLi5hMDAxNmI4OTdkYWUgMTAwNjQ0Cj4gLS0tIGEv dG9vbHMvcGVyZi91dGlsL3Vud2luZC1saWJ1bndpbmQuYwo+ICsrKyBiL3Rvb2xzL3BlcmYvdXRp bC91bndpbmQtbGlidW53aW5kLmMKPiBAQCAtNzksNyArNzksNyBAQCB2b2lkIHVud2luZF9fZmlu aXNoX2FjY2VzcyhzdHJ1Y3QgbWFwcyAqbWFwcykKPiAgCQlvcHMtPmZpbmlzaF9hY2Nlc3MobWFw cyk7Cj4gIH0KPiAgCj4gLWludCB1bndpbmRfX2dldF9lbnRyaWVzKHVud2luZF9lbnRyeV9jYl90 IGNiLCB2b2lkICphcmcsCj4gK2ludCBsaWJ1bndpbmRfX2dldF9lbnRyaWVzKHVud2luZF9lbnRy eV9jYl90IGNiLCB2b2lkICphcmcsCj4gIAkJCSBzdHJ1Y3QgdGhyZWFkICp0aHJlYWQsCj4gIAkJ CSBzdHJ1Y3QgcGVyZl9zYW1wbGUgKmRhdGEsIGludCBtYXhfc3RhY2ssCj4gIAkJCSBib29sIGJl c3RfZWZmb3J0KQo+IGRpZmYgLS1naXQgYS90b29scy9wZXJmL3V0aWwvdW53aW5kLmMgYi90b29s cy9wZXJmL3V0aWwvdW53aW5kLmMKPiBuZXcgZmlsZSBtb2RlIDEwMDY0NAo+IGluZGV4IDAwMDAw MDAwMDAwMC4uNGVkNGIxZDU1YzY5Cj4gLS0tIC9kZXYvbnVsbAo+ICsrKyBiL3Rvb2xzL3BlcmYv dXRpbC91bndpbmQuYwo+IEBAIC0wLDAgKzEsMTA0IEBACj4gKy8vIFNQRFgtTGljZW5zZS1JZGVu dGlmaWVyOiBHUEwtMi4wCj4gKyNpbmNsdWRlICJkZWJ1Zy5oIgo+ICsjaW5jbHVkZSAic3ltYm9s X2NvbmYuaCIKPiArI2luY2x1ZGUgInVud2luZC5oIgo+ICsjaW5jbHVkZSA8bGludXgvc3RyaW5n Lmg+Cj4gKyNpbmNsdWRlIDxzdHJpbmcuaD4KPiArI2luY2x1ZGUgPHN0ZGxpYi5oPgo+ICsKPiAr aW50IHVud2luZF9fZ2V0X2VudHJpZXModW53aW5kX2VudHJ5X2NiX3QgY2IgX19tYXliZV91bnVz ZWQsIHZvaWQgKmFyZyBfX21heWJlX3VudXNlZCwKPiArCQkJc3RydWN0IHRocmVhZCAqdGhyZWFk IF9fbWF5YmVfdW51c2VkLAo+ICsJCQlzdHJ1Y3QgcGVyZl9zYW1wbGUgKmRhdGEgX19tYXliZV91 bnVzZWQsCj4gKwkJCWludCBtYXhfc3RhY2sgX19tYXliZV91bnVzZWQsCj4gKwkJCWJvb2wgYmVz dF9lZmZvcnQgX19tYXliZV91bnVzZWQpCj4gK3sKPiArCWludCByZXQgPSAwOwo+ICsKPiArI2lm IGRlZmluZWQoSEFWRV9MSUJEV19TVVBQT1JUKSB8fCBkZWZpbmVkKEhBVkVfTElCVU5XSU5EX1NV UFBPUlQpCj4gKwlpZiAoc3ltYm9sX2NvbmYudW53aW5kX3N0eWxlWzBdID09IFVOV0lORF9TVFlM RV9VTktOT1dOKSB7Cj4gKwkJaW50IGkgPSAwOwo+ICsjaWZkZWYgSEFWRV9MSUJEV19TVVBQT1JU Cj4gKwkJc3ltYm9sX2NvbmYudW53aW5kX3N0eWxlW2krK10gPSBVTldJTkRfU1RZTEVfTElCRFc7 Cj4gKyNlbmRpZgo+ICsjaWZkZWYgSEFWRV9MSUJVTldJTkRfU1VQUE9SVAo+ICsJCXN5bWJvbF9j b25mLnVud2luZF9zdHlsZVtpKytdID0gVU5XSU5EX1NUWUxFX0xJQlVOV0lORDsKPiArI2VuZGlm Cj4gKwl9Cj4gKyNlbmRpZiAvL2RlZmluZWQoSEFWRV9MSUJEV19TVVBQT1JUKSB8fCBkZWZpbmVk KEhBVkVfTElCVU5XSU5EX1NVUFBPUlQpCj4gKwo+ICsJZm9yIChzaXplX3QgaSA9IDA7IGkgPCBB UlJBWV9TSVpFKHN5bWJvbF9jb25mLnVud2luZF9zdHlsZSk7IGkrKykgewo+ICsJCXN3aXRjaCAo c3ltYm9sX2NvbmYudW53aW5kX3N0eWxlW2ldKSB7Cj4gKwkJY2FzZSBVTldJTkRfU1RZTEVfTElC RFc6Cj4gKwkJCXJldCA9IGxpYmR3X19nZXRfZW50cmllcyhjYiwgYXJnLCB0aHJlYWQsIGRhdGEs IG1heF9zdGFjaywgYmVzdF9lZmZvcnQpOwo+ICsJCQlicmVhazsKPiArCQljYXNlIFVOV0lORF9T VFlMRV9MSUJVTldJTkQ6Cj4gKwkJCXJldCA9IGxpYnVud2luZF9fZ2V0X2VudHJpZXMoY2IsIGFy ZywgdGhyZWFkLCBkYXRhLCBtYXhfc3RhY2ssIGJlc3RfZWZmb3J0KTsKPiArCQkJYnJlYWs7Cj4g KwkJY2FzZSBVTldJTkRfU1RZTEVfVU5LTk9XTjoKPiArCQlkZWZhdWx0Ogo+ICsjaWYgIWRlZmlu ZWQoSEFWRV9MSUJEV19TVVBQT1JUKSAmJiAhZGVmaW5lZChIQVZFX0xJQlVOV0lORF9TVVBQT1JU KQo+ICsJCQlwcl93YXJuaW5nX29uY2UoCj4gKwkJCQkiRXJyb3I6IGR3YXJmIHVud2luZGluZyBu b3Qgc3VwcG9ydGVkLCBidWlsZCBwZXJmIHdpdGggbGliZHcgb3IgbGlidW53aW5kLlxuIik7Cj4g KyNlbmRpZgo+ICsJCQlyZXQgPSAwOwo+ICsJCQlicmVhazsKPiArCQl9Cj4gKwkJaWYgKHJldCA+ IDApIHsKPiArCQkJcmV0ID0gMDsKPiArCQkJYnJlYWs7Cj4gKwkJfQo+ICsJCWlmIChyZXQgPCAw KQo+ICsJCQlicmVhazsKPiArCX0KPiArCXJldHVybiByZXQ7Cj4gK30KPiArCj4gK2ludCB1bndp bmRfX2NvbmZpZ3VyZShjb25zdCBjaGFyICp2YXIsIGNvbnN0IGNoYXIgKnZhbHVlLCB2b2lkICpj YiBfX21heWJlX3VudXNlZCkKPiArewo+ICsJc3RhdGljIGNvbnN0IGNoYXIgKiBjb25zdCB1bndp bmRfc3R5bGVfbmFtZXNbXSA9IHsKPiArCQlbVU5XSU5EX1NUWUxFX0xJQkRXXSA9ICJsaWJkdyIs Cj4gKwkJW1VOV0lORF9TVFlMRV9MSUJVTldJTkRdID0gImxpYnVud2luZCIsCj4gKwkJTlVMTAo+ ICsJfTsKPiArCWNoYXIgKnMsICpwLCAqc2F2ZXB0cjsKPiArCXNpemVfdCBpID0gMDsKPiArCj4g KwlpZiAoc3RyY21wKHZhciwgInVud2luZC5zdHlsZSIpKQo+ICsJCXJldHVybiAwOwo+ICsKPiAr CWlmICghdmFsdWUpCj4gKwkJcmV0dXJuIC0xOwo+ICsKPiArCXMgPSBzdHJkdXAodmFsdWUpOwo+ ICsJaWYgKCFzKQo+ICsJCXJldHVybiAtMTsKPiArCj4gKwltZW1zZXQoc3ltYm9sX2NvbmYudW53 aW5kX3N0eWxlLCAwLCBzaXplb2Yoc3ltYm9sX2NvbmYudW53aW5kX3N0eWxlKSk7Cj4gKwo+ICsJ cCA9IHN0cnRva19yKHMsICIsIiwgJnNhdmVwdHIpOwo+ICsJd2hpbGUgKHAgJiYgaSA8IEFSUkFZ X1NJWkUoc3ltYm9sX2NvbmYudW53aW5kX3N0eWxlKSkgewo+ICsJCWJvb2wgZm91bmQgPSBmYWxz ZTsKPiArCQljaGFyICpxID0gc3RyaW0ocCk7Cj4gKwo+ICsJCWZvciAoc2l6ZV90IGogPSBVTldJ TkRfU1RZTEVfTElCRFc7IGogPCBNQVhfVU5XSU5EX1NUWUxFOyBqKyspIHsKPiArCQkJaWYgKCFz dHJjYXNlY21wKHEsIHVud2luZF9zdHlsZV9uYW1lc1tqXSkpIHsKPiArCQkJCXN5bWJvbF9jb25m LnVud2luZF9zdHlsZVtpKytdID0gajsKPiArCQkJCWZvdW5kID0gdHJ1ZTsKPiArCQkJCWJyZWFr Owo+ICsJCQl9Cj4gKwkJfQo+ICsJCWlmICghZm91bmQpCj4gKwkJCXByX3dhcm5pbmcoIlVua25v d24gdW53aW5kIHN0eWxlOiAlc1xuIiwgcSk7Cj4gKwkJcCA9IHN0cnRva19yKE5VTEwsICIsIiwg JnNhdmVwdHIpOwo+ICsJfQo+ICsKPiArCWZyZWUocyk7Cj4gKwlyZXR1cm4gMDsKPiArfQo+ICsK PiAraW50IHVud2luZF9fb3B0aW9uKGNvbnN0IHN0cnVjdCBvcHRpb24gKm9wdCBfX21heWJlX3Vu dXNlZCwKPiArCQkgICBjb25zdCBjaGFyICphcmcsCj4gKwkJICAgaW50IHVuc2V0IF9fbWF5YmVf dW51c2VkKQo+ICt7Cj4gKwlyZXR1cm4gdW53aW5kX19jb25maWd1cmUoInVud2luZC5zdHlsZSIs IGFyZywgTlVMTCk7Cj4gK30KPiBkaWZmIC0tZ2l0IGEvdG9vbHMvcGVyZi91dGlsL3Vud2luZC5o IGIvdG9vbHMvcGVyZi91dGlsL3Vud2luZC5oCj4gaW5kZXggOWY3MTY0YzZkOWFhLi4yOGRiM2Uz YjliNTEgMTAwNjQ0Cj4gLS0tIGEvdG9vbHMvcGVyZi91dGlsL3Vud2luZC5oCj4gKysrIGIvdG9v bHMvcGVyZi91dGlsL3Vud2luZC5oCj4gQEAgLTQsOSArNCwxMCBAQAo+ICAKPiAgI2luY2x1ZGUg PGxpbnV4L2NvbXBpbGVyLmg+Cj4gICNpbmNsdWRlIDxsaW51eC90eXBlcy5oPgo+IC0jaW5jbHVk ZSAidXRpbC9tYXBfc3ltYm9sLmgiCj4gKyNpbmNsdWRlICJtYXBfc3ltYm9sLmgiCj4gIAo+ICBz dHJ1Y3QgbWFwczsKPiArc3RydWN0IG9wdGlvbjsKPiAgc3RydWN0IHBlcmZfc2FtcGxlOwo+ICBz dHJ1Y3QgdGhyZWFkOwo+ICAKPiBAQCAtMjYsNyArMjcsOSBAQCBzdHJ1Y3QgdW53aW5kX2xpYnVu d2luZF9vcHMgewo+ICAJCQkgICBzdHJ1Y3QgcGVyZl9zYW1wbGUgKmRhdGEsIGludCBtYXhfc3Rh Y2ssIGJvb2wgYmVzdF9lZmZvcnQpOwo+ICB9Owo+ICAKPiAtI2lmZGVmIEhBVkVfRFdBUkZfVU5X SU5EX1NVUFBPUlQKPiAraW50IHVud2luZF9fY29uZmlndXJlKGNvbnN0IGNoYXIgKnZhciwgY29u c3QgY2hhciAqdmFsdWUsIHZvaWQgKmNiKTsKPiAraW50IHVud2luZF9fb3B0aW9uKGNvbnN0IHN0 cnVjdCBvcHRpb24gKm9wdCwgY29uc3QgY2hhciAqYXJnLCBpbnQgdW5zZXQpOwo+ICsKPiAgLyoK PiAgICogV2hlbiBiZXN0X2VmZm9ydCBpcyBzZXQsIGRvbid0IHJlcG9ydCBlcnJvcnMgYW5kIGZh aWwgc2lsZW50bHkuIFRoaXMgY291bGQKPiAgICogYmUgZXhwYW5kZWQgaW4gdGhlIGZ1dHVyZSB0 byBiZSBtb3JlIHBlcm1pc3NpdmUgYWJvdXQgdGhpbmdzIG90aGVyIHRoYW4KPiBAQCAtMzYsOCAr MzksMzEgQEAgaW50IHVud2luZF9fZ2V0X2VudHJpZXModW53aW5kX2VudHJ5X2NiX3QgY2IsIHZv aWQgKmFyZywKPiAgCQkJc3RydWN0IHRocmVhZCAqdGhyZWFkLAo+ICAJCQlzdHJ1Y3QgcGVyZl9z YW1wbGUgKmRhdGEsIGludCBtYXhfc3RhY2ssCj4gIAkJCWJvb2wgYmVzdF9lZmZvcnQpOwo+IC0v KiBsaWJ1bndpbmQgc3BlY2lmaWMgKi8KPiArCj4gKyNpZmRlZiBIQVZFX0xJQkRXX1NVUFBPUlQK PiAraW50IGxpYmR3X19nZXRfZW50cmllcyh1bndpbmRfZW50cnlfY2JfdCBjYiwgdm9pZCAqYXJn LAo+ICsJCSAgICAgICBzdHJ1Y3QgdGhyZWFkICp0aHJlYWQsCj4gKwkJICAgICAgIHN0cnVjdCBw ZXJmX3NhbXBsZSAqZGF0YSwgaW50IG1heF9zdGFjaywKPiArCQkgICAgICAgYm9vbCBiZXN0X2Vm Zm9ydCk7Cj4gKyNlbHNlCj4gKyNpbmNsdWRlICJkZWJ1Zy5oIgo+ICtzdGF0aWMgaW5saW5lIGlu dCBsaWJkd19fZ2V0X2VudHJpZXModW53aW5kX2VudHJ5X2NiX3QgY2IgX19tYXliZV91bnVzZWQs IHZvaWQgKmFyZyBfX21heWJlX3VudXNlZCwKPiArCQkJCSAgICAgc3RydWN0IHRocmVhZCAqdGhy ZWFkIF9fbWF5YmVfdW51c2VkLAo+ICsJCQkJICAgICBzdHJ1Y3QgcGVyZl9zYW1wbGUgKmRhdGEg X19tYXliZV91bnVzZWQsCj4gKwkJCQkgICAgIGludCBtYXhfc3RhY2sgX19tYXliZV91bnVzZWQs Cj4gKwkJCQkgICAgIGJvb2wgYmVzdF9lZmZvcnQgX19tYXliZV91bnVzZWQpCj4gK3sKPiArCXBy X2VycigiRXJyb3I6IGxpYmR3IGR3YXJmIHVud2luZGluZyBub3QgYnVpbHQgaW50byBwZXJmXG4i KTsKPiArCXJldHVybiAwOwo+ICt9Cj4gKyNlbmRpZgo+ICsKPiAgI2lmZGVmIEhBVkVfTElCVU5X SU5EX1NVUFBPUlQKPiArLyogbGlidW53aW5kIHNwZWNpZmljICovCj4gK2ludCBsaWJ1bndpbmRf X2dldF9lbnRyaWVzKHVud2luZF9lbnRyeV9jYl90IGNiLCB2b2lkICphcmcsCj4gKwkJCSAgIHN0 cnVjdCB0aHJlYWQgKnRocmVhZCwKPiArCQkJICAgc3RydWN0IHBlcmZfc2FtcGxlICpkYXRhLCBp bnQgbWF4X3N0YWNrLAo+ICsJCQkgICBib29sIGJlc3RfZWZmb3J0KTsKPiAgI2lmbmRlZiBMSUJV TldJTkRfX0FSQ0hfUkVHX0lECj4gICNkZWZpbmUgTElCVU5XSU5EX19BUkNIX1JFR19JRChyZWdu dW0pIGxpYnVud2luZF9fYXJjaF9yZWdfaWQocmVnbnVtKQo+ICAjZW5kaWYKPiBAQCAtNDcsMjUg KzczLDE1IEBAIGludCB1bndpbmRfX3ByZXBhcmVfYWNjZXNzKHN0cnVjdCBtYXBzICptYXBzLCBz dHJ1Y3QgbWFwICptYXAsIGJvb2wgKmluaXRpYWxpemVkCj4gIHZvaWQgdW53aW5kX19mbHVzaF9h Y2Nlc3Moc3RydWN0IG1hcHMgKm1hcHMpOwo+ICB2b2lkIHVud2luZF9fZmluaXNoX2FjY2Vzcyhz dHJ1Y3QgbWFwcyAqbWFwcyk7Cj4gICNlbHNlCj4gLXN0YXRpYyBpbmxpbmUgaW50IHVud2luZF9f cHJlcGFyZV9hY2Nlc3Moc3RydWN0IG1hcHMgKm1hcHMgX19tYXliZV91bnVzZWQsCj4gLQkJCQkJ IHN0cnVjdCBtYXAgKm1hcCBfX21heWJlX3VudXNlZCwKPiAtCQkJCQkgYm9vbCAqaW5pdGlhbGl6 ZWQgX19tYXliZV91bnVzZWQpCj4gLXsKPiAtCXJldHVybiAwOwo+IC19Cj4gLQo+IC1zdGF0aWMg aW5saW5lIHZvaWQgdW53aW5kX19mbHVzaF9hY2Nlc3Moc3RydWN0IG1hcHMgKm1hcHMgX19tYXli ZV91bnVzZWQpIHt9Cj4gLXN0YXRpYyBpbmxpbmUgdm9pZCB1bndpbmRfX2ZpbmlzaF9hY2Nlc3Mo c3RydWN0IG1hcHMgKm1hcHMgX19tYXliZV91bnVzZWQpIHt9Cj4gLSNlbmRpZgo+IC0jZWxzZQo+ IC1zdGF0aWMgaW5saW5lIGludAo+IC11bndpbmRfX2dldF9lbnRyaWVzKHVud2luZF9lbnRyeV9j Yl90IGNiIF9fbWF5YmVfdW51c2VkLAo+IC0JCSAgICB2b2lkICphcmcgX19tYXliZV91bnVzZWQs Cj4gLQkJICAgIHN0cnVjdCB0aHJlYWQgKnRocmVhZCBfX21heWJlX3VudXNlZCwKPiAtCQkgICAg c3RydWN0IHBlcmZfc2FtcGxlICpkYXRhIF9fbWF5YmVfdW51c2VkLAo+IC0JCSAgICBpbnQgbWF4 X3N0YWNrIF9fbWF5YmVfdW51c2VkLAo+IC0JCSAgICBib29sIGJlc3RfZWZmb3J0IF9fbWF5YmVf dW51c2VkKQo+ICsjaW5jbHVkZSAiZGVidWcuaCIKPiArc3RhdGljIGlubGluZSBpbnQgbGlidW53 aW5kX19nZXRfZW50cmllcyh1bndpbmRfZW50cnlfY2JfdCBjYiBfX21heWJlX3VudXNlZCwKPiAr CQkJCQkgdm9pZCAqYXJnIF9fbWF5YmVfdW51c2VkLAo+ICsJCQkJCSBzdHJ1Y3QgdGhyZWFkICp0 aHJlYWQgX19tYXliZV91bnVzZWQsCj4gKwkJCQkJIHN0cnVjdCBwZXJmX3NhbXBsZSAqZGF0YSBf X21heWJlX3VudXNlZCwKPiArCQkJCQkgaW50IG1heF9zdGFjayBfX21heWJlX3VudXNlZCwKPiAr CQkJCQkgYm9vbCBiZXN0X2VmZm9ydCBfX21heWJlX3VudXNlZCkKPiAgewo+ICsJcHJfZXJyKCJF cnJvcjogbGlidW53aW5kIGR3YXJmIHVud2luZGluZyBub3QgYnVpbHQgaW50byBwZXJmXG4iKTsK PiAgCXJldHVybiAwOwo+ICB9Cj4gIAo+IEBAIC03OCw1ICs5NCw2IEBAIHN0YXRpYyBpbmxpbmUg aW50IHVud2luZF9fcHJlcGFyZV9hY2Nlc3Moc3RydWN0IG1hcHMgKm1hcHMgX19tYXliZV91bnVz ZWQsCj4gIAo+ICBzdGF0aWMgaW5saW5lIHZvaWQgdW53aW5kX19mbHVzaF9hY2Nlc3Moc3RydWN0 IG1hcHMgKm1hcHMgX19tYXliZV91bnVzZWQpIHt9Cj4gIHN0YXRpYyBpbmxpbmUgdm9pZCB1bndp bmRfX2ZpbmlzaF9hY2Nlc3Moc3RydWN0IG1hcHMgKm1hcHMgX19tYXliZV91bnVzZWQpIHt9Cj4g LSNlbmRpZiAvKiBIQVZFX0RXQVJGX1VOV0lORF9TVVBQT1JUICovCj4gKyNlbmRpZgo+ICsKPiAg I2VuZGlmIC8qIF9fVU5XSU5EX0ggKi8KPiAtLSAKPiAyLjU0LjAuNTYzLmc0ZjY5YjQ3Yjk0LWdv b2cKPiAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxp bnV4LXJpc2N2IG1haWxpbmcgbGlzdApsaW51eC1yaXNjdkBsaXN0cy5pbmZyYWRlYWQub3JnCmh0 dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtcmlzY3YK