From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="V4V/XV/z" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAC2ED68; Wed, 6 Dec 2023 13:52:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701899568; x=1733435568; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=RoOrPaC4wGotQYU1+cisz2htXHtd3At/YMH6Wdof7a0=; b=V4V/XV/zpWLF9haIRCCRBq6DHAW4lUGqAJkkF771UiDbGd/5Lu7L+nCa yzb5t6KmRA3sn+OwfzUjeppUXmHj6cmnsgsmJzuwnaJaksbKok7fQm0jw x/QH3i7dwG1/eal8WOTQv1hX0JSZCi3IdXQiqQPADujxT+HY8PA9ojx/k 2yL0l+tVj0wXlASLlqFXIp1G5p9YRCp69DiTQNuuUlNvqtLUq8KCUItjR mJw6UzhlkIItf0YELhtFTxmCcMLG49b9rmZMhRKsCLgkphSdSFDGEYU5k JNOiL461hSdCnwMTI300GWiZNv9wP8RATvdhYtPIrytb9lgVLCmBqdzeW A==; X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="1016642" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="1016642" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2023 13:52:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="800486967" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="800486967" Received: from linux.intel.com ([10.54.29.200]) by orsmga008.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2023 13:52:45 -0800 Received: from [10.212.106.4] (kliang2-mobl1.ccr.corp.intel.com [10.212.106.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id C1C59580D2D; Wed, 6 Dec 2023 13:52:42 -0800 (PST) Message-ID: Date: Wed, 6 Dec 2023 16:52:41 -0500 Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/6] perf mem: Clean up perf_mem_events__name() To: Ian Rogers Cc: acme@kernel.org, peterz@infradead.org, mingo@redhat.com, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, john.g.garry@oracle.com, will@kernel.org, james.clark@arm.com, mike.leach@linaro.org, leo.yan@linaro.org, yuhaixin.yhx@linux.alibaba.com, renyu.zj@linux.alibaba.com, tmricht@linux.ibm.com, ravi.bangoria@amd.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <20231206201324.184059-1-kan.liang@linux.intel.com> <20231206201324.184059-4-kan.liang@linux.intel.com> Content-Language: en-US From: "Liang, Kan" In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 2023-12-06 4:07 p.m., Ian Rogers wrote: > On Wed, Dec 6, 2023 at 12:13 PM wrote: >> >> From: Kan Liang >> >> Introduce a generic perf_mem_events__name(). Remove the ARCH-specific >> one. >> >> The mem_load events may have a different format. Add ldlat and aux_event >> in the struct perf_mem_event to indicate the format and the extra aux >> event. >> >> Add perf_mem_events_intel_aux[] to support the extra mem_load_aux event. >> >> Signed-off-by: Kan Liang >> --- >> tools/perf/arch/arm64/util/mem-events.c | 26 ++------- >> tools/perf/arch/powerpc/util/mem-events.c | 13 ++--- >> tools/perf/arch/powerpc/util/mem-events.h | 7 +++ >> tools/perf/arch/powerpc/util/pmu.c | 11 ++++ >> tools/perf/arch/x86/util/mem-events.c | 70 +++++------------------ >> tools/perf/arch/x86/util/mem-events.h | 1 + >> tools/perf/arch/x86/util/pmu.c | 8 ++- >> tools/perf/util/mem-events.c | 56 ++++++++++++------ >> tools/perf/util/mem-events.h | 3 +- >> 9 files changed, 89 insertions(+), 106 deletions(-) >> create mode 100644 tools/perf/arch/powerpc/util/mem-events.h >> create mode 100644 tools/perf/arch/powerpc/util/pmu.c >> >> diff --git a/tools/perf/arch/arm64/util/mem-events.c b/tools/perf/arch/arm64/util/mem-events.c >> index 2602e8688727..eb2ef84f0fc8 100644 >> --- a/tools/perf/arch/arm64/util/mem-events.c >> +++ b/tools/perf/arch/arm64/util/mem-events.c >> @@ -2,28 +2,10 @@ >> #include "map_symbol.h" >> #include "mem-events.h" >> >> -#define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s } >> +#define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a } >> >> struct perf_mem_event perf_mem_events_arm[PERF_MEM_EVENTS__MAX] = { >> - E("spe-load", "arm_spe_0/ts_enable=1,pa_enable=1,load_filter=1,store_filter=0,min_latency=%u/", "arm_spe_0"), >> - E("spe-store", "arm_spe_0/ts_enable=1,pa_enable=1,load_filter=0,store_filter=1/", "arm_spe_0"), >> - E("spe-ldst", "arm_spe_0/ts_enable=1,pa_enable=1,load_filter=1,store_filter=1,min_latency=%u/", "arm_spe_0"), >> + E("spe-load", "%s/ts_enable=1,pa_enable=1,load_filter=1,store_filter=0,min_latency=%u/", "arm_spe_0", true, 0), >> + E("spe-store", "%s/ts_enable=1,pa_enable=1,load_filter=0,store_filter=1/", "arm_spe_0", false, 0), >> + E("spe-ldst", "%s/ts_enable=1,pa_enable=1,load_filter=1,store_filter=1,min_latency=%u/", "arm_spe_0", true, 0), >> }; >> - >> -static char mem_ev_name[100]; >> - >> -const char *perf_mem_events__name(int i, const char *pmu_name __maybe_unused) >> -{ >> - struct perf_mem_event *e = &perf_mem_events_arm[i]; >> - >> - if (i >= PERF_MEM_EVENTS__MAX) >> - return NULL; >> - >> - if (i == PERF_MEM_EVENTS__LOAD || i == PERF_MEM_EVENTS__LOAD_STORE) >> - scnprintf(mem_ev_name, sizeof(mem_ev_name), >> - e->name, perf_mem_events__loads_ldlat); >> - else /* PERF_MEM_EVENTS__STORE */ >> - scnprintf(mem_ev_name, sizeof(mem_ev_name), e->name); >> - >> - return mem_ev_name; >> -} >> diff --git a/tools/perf/arch/powerpc/util/mem-events.c b/tools/perf/arch/powerpc/util/mem-events.c >> index 78b986e5268d..b7883e38950f 100644 >> --- a/tools/perf/arch/powerpc/util/mem-events.c >> +++ b/tools/perf/arch/powerpc/util/mem-events.c >> @@ -2,11 +2,10 @@ >> #include "map_symbol.h" >> #include "mem-events.h" >> >> -/* PowerPC does not support 'ldlat' parameter. */ >> -const char *perf_mem_events__name(int i, const char *pmu_name __maybe_unused) >> -{ >> - if (i == PERF_MEM_EVENTS__LOAD) >> - return "cpu/mem-loads/"; >> +#define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a } >> >> - return "cpu/mem-stores/"; >> -} >> +struct perf_mem_event perf_mem_events_power[PERF_MEM_EVENTS__MAX] = { >> + E("ldlat-loads", "%s/mem-loads/", "cpu/events/mem-loads", false, 0), >> + E("ldlat-stores", "%s/mem-stores/", "cpu/events/mem-stores", false, 0), >> + E(NULL, NULL, NULL, false, 0), >> +}; >> diff --git a/tools/perf/arch/powerpc/util/mem-events.h b/tools/perf/arch/powerpc/util/mem-events.h >> new file mode 100644 >> index 000000000000..6acc3d1b6873 >> --- /dev/null >> +++ b/tools/perf/arch/powerpc/util/mem-events.h >> @@ -0,0 +1,7 @@ >> +/* SPDX-License-Identifier: GPL-2.0 */ >> +#ifndef _POWER_MEM_EVENTS_H >> +#define _POWER_MEM_EVENTS_H >> + >> +extern struct perf_mem_event perf_mem_events_power[PERF_MEM_EVENTS__MAX]; >> + >> +#endif /* _POWER_MEM_EVENTS_H */ >> diff --git a/tools/perf/arch/powerpc/util/pmu.c b/tools/perf/arch/powerpc/util/pmu.c >> new file mode 100644 >> index 000000000000..168173f88ddb >> --- /dev/null >> +++ b/tools/perf/arch/powerpc/util/pmu.c >> @@ -0,0 +1,11 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> + >> +#include >> + >> +#include "../../../util/pmu.h" >> + >> +void perf_pmu__arch_init(struct perf_pmu *pmu) >> +{ >> + if (pmu->is_core) >> + pmu->mem_events = perf_mem_events_power; >> +} >> diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/util/mem-events.c >> index 5fb41d50118d..f0e66a0151a0 100644 >> --- a/tools/perf/arch/x86/util/mem-events.c >> +++ b/tools/perf/arch/x86/util/mem-events.c >> @@ -7,25 +7,26 @@ >> #include "linux/string.h" >> #include "env.h" >> >> -static char mem_loads_name[100]; >> -static bool mem_loads_name__init; >> -static char mem_stores_name[100]; >> - >> #define MEM_LOADS_AUX 0x8203 >> -#define MEM_LOADS_AUX_NAME "{%s/mem-loads-aux/,%s/mem-loads,ldlat=%u/}:P" >> >> -#define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s } >> +#define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a } >> >> struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX] = { >> - E("ldlat-loads", "%s/mem-loads,ldlat=%u/P", "%s/events/mem-loads"), >> - E("ldlat-stores", "%s/mem-stores/P", "%s/events/mem-stores"), >> - E(NULL, NULL, NULL), >> + E("ldlat-loads", "%s/mem-loads,ldlat=%u/P", "%s/events/mem-loads", true, 0), >> + E("ldlat-stores", "%s/mem-stores/P", "%s/events/mem-stores", false, 0), >> + E(NULL, NULL, NULL, false, 0), >> +}; >> + >> +struct perf_mem_event perf_mem_events_intel_aux[PERF_MEM_EVENTS__MAX] = { >> + E("ldlat-loads", "{%s/mem-loads-aux/,%s/mem-loads,ldlat=%u/}:P", "%s/events/mem-loads", true, MEM_LOADS_AUX), >> + E("ldlat-stores", "%s/mem-stores/P", "%s/events/mem-stores", false, 0), >> + E(NULL, NULL, NULL, false, 0), >> }; >> >> struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = { >> - E(NULL, NULL, NULL), >> - E(NULL, NULL, NULL), >> - E("mem-ldst", "ibs_op//", "ibs_op"), >> + E(NULL, NULL, NULL, false, 0), >> + E(NULL, NULL, NULL, false, 0), >> + E("mem-ldst", "%s//", "ibs_op", false, 0), >> }; >> >> bool is_mem_loads_aux_event(struct evsel *leader) >> @@ -40,48 +41,3 @@ bool is_mem_loads_aux_event(struct evsel *leader) >> >> return leader->core.attr.config == MEM_LOADS_AUX; >> } >> - >> -const char *perf_mem_events__name(int i, const char *pmu_name) >> -{ >> - struct perf_mem_event *e; >> - >> - if (x86__is_amd_cpu()) >> - e = &perf_mem_events_amd[i]; >> - else >> - e = &perf_mem_events_intel[i]; >> - >> - if (!e) >> - return NULL; >> - >> - if (i == PERF_MEM_EVENTS__LOAD) { >> - if (mem_loads_name__init && !pmu_name) >> - return mem_loads_name; >> - >> - if (!pmu_name) { >> - mem_loads_name__init = true; >> - pmu_name = "cpu"; >> - } >> - >> - if (perf_pmus__have_event(pmu_name, "mem-loads-aux")) { >> - scnprintf(mem_loads_name, sizeof(mem_loads_name), >> - MEM_LOADS_AUX_NAME, pmu_name, pmu_name, >> - perf_mem_events__loads_ldlat); >> - } else { >> - scnprintf(mem_loads_name, sizeof(mem_loads_name), >> - e->name, pmu_name, >> - perf_mem_events__loads_ldlat); >> - } >> - return mem_loads_name; >> - } >> - >> - if (i == PERF_MEM_EVENTS__STORE) { >> - if (!pmu_name) >> - pmu_name = "cpu"; >> - >> - scnprintf(mem_stores_name, sizeof(mem_stores_name), >> - e->name, pmu_name); >> - return mem_stores_name; >> - } >> - >> - return e->name; >> -} >> diff --git a/tools/perf/arch/x86/util/mem-events.h b/tools/perf/arch/x86/util/mem-events.h >> index 3959e427f482..f55c8d3b7d59 100644 >> --- a/tools/perf/arch/x86/util/mem-events.h >> +++ b/tools/perf/arch/x86/util/mem-events.h >> @@ -3,6 +3,7 @@ >> #define _X86_MEM_EVENTS_H >> >> extern struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX]; >> +extern struct perf_mem_event perf_mem_events_intel_aux[PERF_MEM_EVENTS__MAX]; >> >> extern struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX]; >> >> diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c >> index 7e69f4f2e363..446f8197aae4 100644 >> --- a/tools/perf/arch/x86/util/pmu.c >> +++ b/tools/perf/arch/x86/util/pmu.c >> @@ -35,8 +35,12 @@ void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) >> if (x86__is_amd_cpu()) { >> if (strcmp(pmu->name, "ibs_op")) >> pmu->mem_events = perf_mem_events_amd; >> - } else if (pmu->is_core) >> - pmu->mem_events = perf_mem_events_intel; >> + } else if (pmu->is_core) { >> + if (perf_pmu__have_event(pmu, "mem-loads-aux")) >> + pmu->mem_events = perf_mem_events_intel_aux; >> + else >> + pmu->mem_events = perf_mem_events_intel; >> + } >> } >> >> int perf_pmus__num_mem_pmus(void) >> diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c >> index 887ffdcce338..3a60cbcd6d8e 100644 >> --- a/tools/perf/util/mem-events.c >> +++ b/tools/perf/util/mem-events.c >> @@ -17,17 +17,17 @@ >> >> unsigned int perf_mem_events__loads_ldlat = 30; >> >> -#define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s } >> +#define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a } >> >> struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = { >> - E("ldlat-loads", "cpu/mem-loads,ldlat=%u/P", "cpu/events/mem-loads"), >> - E("ldlat-stores", "cpu/mem-stores/P", "cpu/events/mem-stores"), >> - E(NULL, NULL, NULL), >> + E("ldlat-loads", "%s/mem-loads/,ldlat=%u/P", "cpu/events/mem-loads", true, 0), > > Is there a mistake here "/," looks like it should just be ",". Right, a typo. I will fix it in V2. Thanks, Kan > > Thanks, > Ian > >> + E("ldlat-stores", "%s/mem-stores/P", "cpu/events/mem-stores", false, 0), >> + E(NULL, NULL, NULL, false, 0), >> }; >> #undef E >> >> static char mem_loads_name[100]; >> -static bool mem_loads_name__init; >> +static char mem_stores_name[100]; >> >> struct perf_mem_event *perf_mem_events__ptr(struct perf_pmu *pmu, int i) >> { >> @@ -62,23 +62,45 @@ struct perf_pmu *perf_mem_events_find_pmu(void) >> return perf_pmus__scan_mem(NULL); >> } >> >> -const char * __weak perf_mem_events__name(int i, const char *pmu_name __maybe_unused) >> +static const char *perf_mem_events__name(int i, struct perf_pmu *pmu) >> { >> - struct perf_mem_event *e = &perf_mem_events[i]; >> + struct perf_mem_event *e = &pmu->mem_events[i]; >> >> if (!e) >> return NULL; >> >> - if (i == PERF_MEM_EVENTS__LOAD) { >> - if (!mem_loads_name__init) { >> - mem_loads_name__init = true; >> - scnprintf(mem_loads_name, sizeof(mem_loads_name), >> - e->name, perf_mem_events__loads_ldlat); >> + if (i == PERF_MEM_EVENTS__LOAD || i == PERF_MEM_EVENTS__LOAD_STORE) { >> + if (e->ldlat) { >> + if (!e->aux_event) { >> + /* ARM and Most of Intel */ >> + scnprintf(mem_loads_name, sizeof(mem_loads_name), >> + e->name, pmu->name, >> + perf_mem_events__loads_ldlat); >> + } else { >> + /* Intel with mem-loads-aux event */ >> + scnprintf(mem_loads_name, sizeof(mem_loads_name), >> + e->name, pmu->name, pmu->name, >> + perf_mem_events__loads_ldlat); >> + } >> + } else { >> + if (!e->aux_event) { >> + /* AMD and POWER */ >> + scnprintf(mem_loads_name, sizeof(mem_loads_name), >> + e->name, pmu->name); >> + } else >> + return NULL; >> } >> + >> return mem_loads_name; >> } >> >> - return e->name; >> + if (i == PERF_MEM_EVENTS__STORE) { >> + scnprintf(mem_stores_name, sizeof(mem_stores_name), >> + e->name, pmu->name); >> + return mem_stores_name; >> + } >> + >> + return NULL; >> } >> >> __weak bool is_mem_loads_aux_event(struct evsel *leader __maybe_unused) >> @@ -175,7 +197,7 @@ void perf_mem_events__list(struct perf_pmu *pmu) >> e->tag ? 13 : 0, >> e->tag ? : "", >> e->tag && verbose > 0 ? 25 : 0, >> - e->tag && verbose > 0 ? perf_mem_events__name(j, NULL) : "", >> + e->tag && verbose > 0 ? perf_mem_events__name(j, pmu) : "", >> e->supported ? ": available\n" : ""); >> } >> } >> @@ -198,15 +220,15 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr, >> >> if (!e->supported) { >> pr_err("failed: event '%s' not supported\n", >> - perf_mem_events__name(j, pmu->name)); >> + perf_mem_events__name(j, pmu)); >> return -1; >> } >> >> if (perf_pmus__num_mem_pmus() == 1) { >> rec_argv[i++] = "-e"; >> - rec_argv[i++] = perf_mem_events__name(j, NULL); >> + rec_argv[i++] = perf_mem_events__name(j, pmu); >> } else { >> - const char *s = perf_mem_events__name(j, pmu->name); >> + const char *s = perf_mem_events__name(j, pmu); >> >> if (!perf_mem_event__supported(mnt, pmu, e)) >> continue; >> diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h >> index 59a4303aac96..d257cf67d6d9 100644 >> --- a/tools/perf/util/mem-events.h >> +++ b/tools/perf/util/mem-events.h >> @@ -14,6 +14,8 @@ >> struct perf_mem_event { >> bool record; >> bool supported; >> + bool ldlat; >> + u32 aux_event; >> const char *tag; >> const char *name; >> const char *sysfs_name; >> @@ -39,7 +41,6 @@ extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX]; >> int perf_mem_events__parse(struct perf_pmu *pmu, const char *str); >> int perf_mem_events__init(struct perf_pmu *pmu); >> >> -const char *perf_mem_events__name(int i, const char *pmu_name); >> struct perf_mem_event *perf_mem_events__ptr(struct perf_pmu *pmu, int i); >> struct perf_pmu *perf_mem_events_find_pmu(void); >> bool is_mem_loads_aux_event(struct evsel *leader); >> -- >> 2.35.1 >> 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 79607C4167B for ; Wed, 6 Dec 2023 21:53:23 +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:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wbJC0jyjgGT/O9KuUxufWMLhCu5hc5+b+dUyMJH1RD8=; b=jrhr3RlHAufZp5 VUV6yBuuQKAOiQ3Ed5hVfao3SHSfdyI0GWbqRupbMUafb4sveHXqrkHW3jbMTIJ4g9p6xmMpX3guU aW0N1LJGBA0zlCDdNESPBwZG9B7jmL7RW5j+1foYh1o7RK/yCbXNchX1992oc6h+NqsLhd/gh/jdr ZcaO7ryXyJfAILBYYQikwSJIteSrkN57/zf6tLUj0xqgzt9aHhYuB1ynTMiXyhzfxIHhN92BO71ej avlVBDns3jfxfzTzw7UD+TmDFkZes/F5a5hG/J5JM1Fu5qMwaalrb9EQZAf2agTE1dXXIqbr2hx3U lJxRb5P0T/HzySipLDBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAzp4-00BMLw-2S; Wed, 06 Dec 2023 21:52:50 +0000 Received: from mgamail.intel.com ([192.198.163.9]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAzp0-00BMLJ-2S for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2023 21:52:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701899566; x=1733435566; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=RoOrPaC4wGotQYU1+cisz2htXHtd3At/YMH6Wdof7a0=; b=LQg/ptkZa7P0cQ7JnSj/z6oM13s6zbRR4An+/R91RL/kZeA0Ck/qhGlk OAk4cN7tJZW1r+3Vm4DR3QVA68ckshin0JjXybs6t4QxxtguHKm/VyLJ7 wezJur6ZCc9MaVRIXZZ6QlK1/vdkTSp1efTJYAEMPz4qM+1utCwW9trig PG79LEDXowyuxW8mPOzWVDtZKQ2MJeruA3ZwtiXd0iOB1/lKJQp2tEb1e hvMpD15PtFn7JWKX7GG9hSfecUt4jO6Yv7/EJlNlamGrnMc1fk+izb2Iv 8e0vERHBK6JB16jEz3CMyQD/iOUOVf8ovbVkEhx3HZYi6WUUVxDOa65bZ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="1016639" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="1016639" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2023 13:52:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="800486967" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="800486967" Received: from linux.intel.com ([10.54.29.200]) by orsmga008.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2023 13:52:45 -0800 Received: from [10.212.106.4] (kliang2-mobl1.ccr.corp.intel.com [10.212.106.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id C1C59580D2D; Wed, 6 Dec 2023 13:52:42 -0800 (PST) Message-ID: Date: Wed, 6 Dec 2023 16:52:41 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/6] perf mem: Clean up perf_mem_events__name() To: Ian Rogers Cc: acme@kernel.org, peterz@infradead.org, mingo@redhat.com, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, john.g.garry@oracle.com, will@kernel.org, james.clark@arm.com, mike.leach@linaro.org, leo.yan@linaro.org, yuhaixin.yhx@linux.alibaba.com, renyu.zj@linux.alibaba.com, tmricht@linux.ibm.com, ravi.bangoria@amd.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <20231206201324.184059-1-kan.liang@linux.intel.com> <20231206201324.184059-4-kan.liang@linux.intel.com> Content-Language: en-US From: "Liang, Kan" In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231206_135246_886421_BB320638 X-CRM114-Status: GOOD ( 23.37 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org CgpPbiAyMDIzLTEyLTA2IDQ6MDcgcC5tLiwgSWFuIFJvZ2VycyB3cm90ZToKPiBPbiBXZWQsIERl YyA2LCAyMDIzIGF0IDEyOjEz4oCvUE0gPGthbi5saWFuZ0BsaW51eC5pbnRlbC5jb20+IHdyb3Rl Ogo+Pgo+PiBGcm9tOiBLYW4gTGlhbmcgPGthbi5saWFuZ0BsaW51eC5pbnRlbC5jb20+Cj4+Cj4+ IEludHJvZHVjZSBhIGdlbmVyaWMgcGVyZl9tZW1fZXZlbnRzX19uYW1lKCkuIFJlbW92ZSB0aGUg QVJDSC1zcGVjaWZpYwo+PiBvbmUuCj4+Cj4+IFRoZSBtZW1fbG9hZCBldmVudHMgbWF5IGhhdmUg YSBkaWZmZXJlbnQgZm9ybWF0LiBBZGQgbGRsYXQgYW5kIGF1eF9ldmVudAo+PiBpbiB0aGUgc3Ry dWN0IHBlcmZfbWVtX2V2ZW50IHRvIGluZGljYXRlIHRoZSBmb3JtYXQgYW5kIHRoZSBleHRyYSBh dXgKPj4gZXZlbnQuCj4+Cj4+IEFkZCBwZXJmX21lbV9ldmVudHNfaW50ZWxfYXV4W10gdG8gc3Vw cG9ydCB0aGUgZXh0cmEgbWVtX2xvYWRfYXV4IGV2ZW50Lgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBL YW4gTGlhbmcgPGthbi5saWFuZ0BsaW51eC5pbnRlbC5jb20+Cj4+IC0tLQo+PiAgdG9vbHMvcGVy Zi9hcmNoL2FybTY0L3V0aWwvbWVtLWV2ZW50cy5jICAgfCAyNiArKy0tLS0tLS0KPj4gIHRvb2xz L3BlcmYvYXJjaC9wb3dlcnBjL3V0aWwvbWVtLWV2ZW50cy5jIHwgMTMgKystLS0KPj4gIHRvb2xz L3BlcmYvYXJjaC9wb3dlcnBjL3V0aWwvbWVtLWV2ZW50cy5oIHwgIDcgKysrCj4+ICB0b29scy9w ZXJmL2FyY2gvcG93ZXJwYy91dGlsL3BtdS5jICAgICAgICB8IDExICsrKysKPj4gIHRvb2xzL3Bl cmYvYXJjaC94ODYvdXRpbC9tZW0tZXZlbnRzLmMgICAgIHwgNzAgKysrKystLS0tLS0tLS0tLS0t LS0tLS0KPj4gIHRvb2xzL3BlcmYvYXJjaC94ODYvdXRpbC9tZW0tZXZlbnRzLmggICAgIHwgIDEg Kwo+PiAgdG9vbHMvcGVyZi9hcmNoL3g4Ni91dGlsL3BtdS5jICAgICAgICAgICAgfCAgOCArKy0K Pj4gIHRvb2xzL3BlcmYvdXRpbC9tZW0tZXZlbnRzLmMgICAgICAgICAgICAgIHwgNTYgKysrKysr KysrKysrLS0tLS0tCj4+ICB0b29scy9wZXJmL3V0aWwvbWVtLWV2ZW50cy5oICAgICAgICAgICAg ICB8ICAzICstCj4+ICA5IGZpbGVzIGNoYW5nZWQsIDg5IGluc2VydGlvbnMoKyksIDEwNiBkZWxl dGlvbnMoLSkKPj4gIGNyZWF0ZSBtb2RlIDEwMDY0NCB0b29scy9wZXJmL2FyY2gvcG93ZXJwYy91 dGlsL21lbS1ldmVudHMuaAo+PiAgY3JlYXRlIG1vZGUgMTAwNjQ0IHRvb2xzL3BlcmYvYXJjaC9w b3dlcnBjL3V0aWwvcG11LmMKPj4KPj4gZGlmZiAtLWdpdCBhL3Rvb2xzL3BlcmYvYXJjaC9hcm02 NC91dGlsL21lbS1ldmVudHMuYyBiL3Rvb2xzL3BlcmYvYXJjaC9hcm02NC91dGlsL21lbS1ldmVu dHMuYwo+PiBpbmRleCAyNjAyZTg2ODg3MjcuLmViMmVmODRmMGZjOCAxMDA2NDQKPj4gLS0tIGEv dG9vbHMvcGVyZi9hcmNoL2FybTY0L3V0aWwvbWVtLWV2ZW50cy5jCj4+ICsrKyBiL3Rvb2xzL3Bl cmYvYXJjaC9hcm02NC91dGlsL21lbS1ldmVudHMuYwo+PiBAQCAtMiwyOCArMiwxMCBAQAo+PiAg I2luY2x1ZGUgIm1hcF9zeW1ib2wuaCIKPj4gICNpbmNsdWRlICJtZW0tZXZlbnRzLmgiCj4+Cj4+ IC0jZGVmaW5lIEUodCwgbiwgcykgeyAudGFnID0gdCwgLm5hbWUgPSBuLCAuc3lzZnNfbmFtZSA9 IHMgfQo+PiArI2RlZmluZSBFKHQsIG4sIHMsIGwsIGEpIHsgLnRhZyA9IHQsIC5uYW1lID0gbiwg LnN5c2ZzX25hbWUgPSBzLCAubGRsYXQgPSBsLCAuYXV4X2V2ZW50ID0gYSB9Cj4+Cj4+ICBzdHJ1 Y3QgcGVyZl9tZW1fZXZlbnQgcGVyZl9tZW1fZXZlbnRzX2FybVtQRVJGX01FTV9FVkVOVFNfX01B WF0gPSB7Cj4+IC0gICAgICAgRSgic3BlLWxvYWQiLCAgICJhcm1fc3BlXzAvdHNfZW5hYmxlPTEs cGFfZW5hYmxlPTEsbG9hZF9maWx0ZXI9MSxzdG9yZV9maWx0ZXI9MCxtaW5fbGF0ZW5jeT0ldS8i LCAgICAgICAiYXJtX3NwZV8wIiksCj4+IC0gICAgICAgRSgic3BlLXN0b3JlIiwgICJhcm1fc3Bl XzAvdHNfZW5hYmxlPTEscGFfZW5hYmxlPTEsbG9hZF9maWx0ZXI9MCxzdG9yZV9maWx0ZXI9MS8i LCAgICAgICAgICAgICAgICAgICAgICAiYXJtX3NwZV8wIiksCj4+IC0gICAgICAgRSgic3BlLWxk c3QiLCAgICJhcm1fc3BlXzAvdHNfZW5hYmxlPTEscGFfZW5hYmxlPTEsbG9hZF9maWx0ZXI9MSxz dG9yZV9maWx0ZXI9MSxtaW5fbGF0ZW5jeT0ldS8iLCAgICAgICAiYXJtX3NwZV8wIiksCj4+ICsg ICAgICAgRSgic3BlLWxvYWQiLCAgICIlcy90c19lbmFibGU9MSxwYV9lbmFibGU9MSxsb2FkX2Zp bHRlcj0xLHN0b3JlX2ZpbHRlcj0wLG1pbl9sYXRlbmN5PSV1LyIsICAgICAgImFybV9zcGVfMCIs ICAgIHRydWUsICAgMCksCj4+ICsgICAgICAgRSgic3BlLXN0b3JlIiwgICIlcy90c19lbmFibGU9 MSxwYV9lbmFibGU9MSxsb2FkX2ZpbHRlcj0wLHN0b3JlX2ZpbHRlcj0xLyIsICAgICAgICAgICAg ICAgICAgICAgImFybV9zcGVfMCIsICAgIGZhbHNlLCAgMCksCj4+ICsgICAgICAgRSgic3BlLWxk c3QiLCAgICIlcy90c19lbmFibGU9MSxwYV9lbmFibGU9MSxsb2FkX2ZpbHRlcj0xLHN0b3JlX2Zp bHRlcj0xLG1pbl9sYXRlbmN5PSV1LyIsICAgICAgImFybV9zcGVfMCIsICAgIHRydWUsICAgMCks Cj4+ICB9Owo+PiAtCj4+IC1zdGF0aWMgY2hhciBtZW1fZXZfbmFtZVsxMDBdOwo+PiAtCj4+IC1j b25zdCBjaGFyICpwZXJmX21lbV9ldmVudHNfX25hbWUoaW50IGksIGNvbnN0IGNoYXIgKnBtdV9u YW1lIF9fbWF5YmVfdW51c2VkKQo+PiAtewo+PiAtICAgICAgIHN0cnVjdCBwZXJmX21lbV9ldmVu dCAqZSA9ICZwZXJmX21lbV9ldmVudHNfYXJtW2ldOwo+PiAtCj4+IC0gICAgICAgaWYgKGkgPj0g UEVSRl9NRU1fRVZFTlRTX19NQVgpCj4+IC0gICAgICAgICAgICAgICByZXR1cm4gTlVMTDsKPj4g LQo+PiAtICAgICAgIGlmIChpID09IFBFUkZfTUVNX0VWRU5UU19fTE9BRCB8fCBpID09IFBFUkZf TUVNX0VWRU5UU19fTE9BRF9TVE9SRSkKPj4gLSAgICAgICAgICAgICAgIHNjbnByaW50ZihtZW1f ZXZfbmFtZSwgc2l6ZW9mKG1lbV9ldl9uYW1lKSwKPj4gLSAgICAgICAgICAgICAgICAgICAgICAg ICBlLT5uYW1lLCBwZXJmX21lbV9ldmVudHNfX2xvYWRzX2xkbGF0KTsKPj4gLSAgICAgICBlbHNl IC8qIFBFUkZfTUVNX0VWRU5UU19fU1RPUkUgKi8KPj4gLSAgICAgICAgICAgICAgIHNjbnByaW50 ZihtZW1fZXZfbmFtZSwgc2l6ZW9mKG1lbV9ldl9uYW1lKSwgZS0+bmFtZSk7Cj4+IC0KPj4gLSAg ICAgICByZXR1cm4gbWVtX2V2X25hbWU7Cj4+IC19Cj4+IGRpZmYgLS1naXQgYS90b29scy9wZXJm L2FyY2gvcG93ZXJwYy91dGlsL21lbS1ldmVudHMuYyBiL3Rvb2xzL3BlcmYvYXJjaC9wb3dlcnBj L3V0aWwvbWVtLWV2ZW50cy5jCj4+IGluZGV4IDc4Yjk4NmU1MjY4ZC4uYjc4ODNlMzg5NTBmIDEw MDY0NAo+PiAtLS0gYS90b29scy9wZXJmL2FyY2gvcG93ZXJwYy91dGlsL21lbS1ldmVudHMuYwo+ PiArKysgYi90b29scy9wZXJmL2FyY2gvcG93ZXJwYy91dGlsL21lbS1ldmVudHMuYwo+PiBAQCAt MiwxMSArMiwxMCBAQAo+PiAgI2luY2x1ZGUgIm1hcF9zeW1ib2wuaCIKPj4gICNpbmNsdWRlICJt ZW0tZXZlbnRzLmgiCj4+Cj4+IC0vKiBQb3dlclBDIGRvZXMgbm90IHN1cHBvcnQgJ2xkbGF0JyBw YXJhbWV0ZXIuICovCj4+IC1jb25zdCBjaGFyICpwZXJmX21lbV9ldmVudHNfX25hbWUoaW50IGks IGNvbnN0IGNoYXIgKnBtdV9uYW1lIF9fbWF5YmVfdW51c2VkKQo+PiAtewo+PiAtICAgICAgIGlm IChpID09IFBFUkZfTUVNX0VWRU5UU19fTE9BRCkKPj4gLSAgICAgICAgICAgICAgIHJldHVybiAi Y3B1L21lbS1sb2Fkcy8iOwo+PiArI2RlZmluZSBFKHQsIG4sIHMsIGwsIGEpIHsgLnRhZyA9IHQs IC5uYW1lID0gbiwgLnN5c2ZzX25hbWUgPSBzLCAubGRsYXQgPSBsLCAuYXV4X2V2ZW50ID0gYSB9 Cj4+Cj4+IC0gICAgICAgcmV0dXJuICJjcHUvbWVtLXN0b3Jlcy8iOwo+PiAtfQo+PiArc3RydWN0 IHBlcmZfbWVtX2V2ZW50IHBlcmZfbWVtX2V2ZW50c19wb3dlcltQRVJGX01FTV9FVkVOVFNfX01B WF0gPSB7Cj4+ICsgICAgICAgRSgibGRsYXQtbG9hZHMiLCAgICAgICAgIiVzL21lbS1sb2Fkcy8i LCAgICAgICAgImNwdS9ldmVudHMvbWVtLWxvYWRzIiwgICAgICAgICBmYWxzZSwgIDApLAo+PiAr ICAgICAgIEUoImxkbGF0LXN0b3JlcyIsICAgICAgICIlcy9tZW0tc3RvcmVzLyIsICAgICAgICJj cHUvZXZlbnRzL21lbS1zdG9yZXMiLCAgICAgICAgZmFsc2UsICAwKSwKPj4gKyAgICAgICBFKE5V TEwsICAgICAgICAgICAgICAgICBOVUxMLCAgICAgICAgICAgICAgICAgICBOVUxMLCAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZhbHNlLCAgMCksCj4+ICt9Owo+PiBkaWZmIC0tZ2l0IGEvdG9v bHMvcGVyZi9hcmNoL3Bvd2VycGMvdXRpbC9tZW0tZXZlbnRzLmggYi90b29scy9wZXJmL2FyY2gv cG93ZXJwYy91dGlsL21lbS1ldmVudHMuaAo+PiBuZXcgZmlsZSBtb2RlIDEwMDY0NAo+PiBpbmRl eCAwMDAwMDAwMDAwMDAuLjZhY2MzZDFiNjg3Mwo+PiAtLS0gL2Rldi9udWxsCj4+ICsrKyBiL3Rv b2xzL3BlcmYvYXJjaC9wb3dlcnBjL3V0aWwvbWVtLWV2ZW50cy5oCj4+IEBAIC0wLDAgKzEsNyBA QAo+PiArLyogU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQTC0yLjAgKi8KPj4gKyNpZm5kZWYg X1BPV0VSX01FTV9FVkVOVFNfSAo+PiArI2RlZmluZSBfUE9XRVJfTUVNX0VWRU5UU19ICj4+ICsK Pj4gK2V4dGVybiBzdHJ1Y3QgcGVyZl9tZW1fZXZlbnQgcGVyZl9tZW1fZXZlbnRzX3Bvd2VyW1BF UkZfTUVNX0VWRU5UU19fTUFYXTsKPj4gKwo+PiArI2VuZGlmIC8qIF9QT1dFUl9NRU1fRVZFTlRT X0ggKi8KPj4gZGlmZiAtLWdpdCBhL3Rvb2xzL3BlcmYvYXJjaC9wb3dlcnBjL3V0aWwvcG11LmMg Yi90b29scy9wZXJmL2FyY2gvcG93ZXJwYy91dGlsL3BtdS5jCj4+IG5ldyBmaWxlIG1vZGUgMTAw NjQ0Cj4+IGluZGV4IDAwMDAwMDAwMDAwMC4uMTY4MTczZjg4ZGRiCj4+IC0tLSAvZGV2L251bGwK Pj4gKysrIGIvdG9vbHMvcGVyZi9hcmNoL3Bvd2VycGMvdXRpbC9wbXUuYwo+PiBAQCAtMCwwICsx LDExIEBACj4+ICsvLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMAo+PiArCj4+ICsj aW5jbHVkZSA8c3RyaW5nLmg+Cj4+ICsKPj4gKyNpbmNsdWRlICIuLi8uLi8uLi91dGlsL3BtdS5o Igo+PiArCj4+ICt2b2lkIHBlcmZfcG11X19hcmNoX2luaXQoc3RydWN0IHBlcmZfcG11ICpwbXUp Cj4+ICt7Cj4+ICsgICAgICAgaWYgKHBtdS0+aXNfY29yZSkKPj4gKyAgICAgICAgICAgICAgIHBt dS0+bWVtX2V2ZW50cyA9IHBlcmZfbWVtX2V2ZW50c19wb3dlcjsKPj4gK30KPj4gZGlmZiAtLWdp dCBhL3Rvb2xzL3BlcmYvYXJjaC94ODYvdXRpbC9tZW0tZXZlbnRzLmMgYi90b29scy9wZXJmL2Fy Y2gveDg2L3V0aWwvbWVtLWV2ZW50cy5jCj4+IGluZGV4IDVmYjQxZDUwMTE4ZC4uZjBlNjZhMDE1 MWEwIDEwMDY0NAo+PiAtLS0gYS90b29scy9wZXJmL2FyY2gveDg2L3V0aWwvbWVtLWV2ZW50cy5j Cj4+ICsrKyBiL3Rvb2xzL3BlcmYvYXJjaC94ODYvdXRpbC9tZW0tZXZlbnRzLmMKPj4gQEAgLTcs MjUgKzcsMjYgQEAKPj4gICNpbmNsdWRlICJsaW51eC9zdHJpbmcuaCIKPj4gICNpbmNsdWRlICJl bnYuaCIKPj4KPj4gLXN0YXRpYyBjaGFyIG1lbV9sb2Fkc19uYW1lWzEwMF07Cj4+IC1zdGF0aWMg Ym9vbCBtZW1fbG9hZHNfbmFtZV9faW5pdDsKPj4gLXN0YXRpYyBjaGFyIG1lbV9zdG9yZXNfbmFt ZVsxMDBdOwo+PiAtCj4+ICAjZGVmaW5lIE1FTV9MT0FEU19BVVggICAgICAgICAgMHg4MjAzCj4+ IC0jZGVmaW5lIE1FTV9MT0FEU19BVVhfTkFNRSAgICAgInslcy9tZW0tbG9hZHMtYXV4Lywlcy9t ZW0tbG9hZHMsbGRsYXQ9JXUvfTpQIgo+Pgo+PiAtI2RlZmluZSBFKHQsIG4sIHMpIHsgLnRhZyA9 IHQsIC5uYW1lID0gbiwgLnN5c2ZzX25hbWUgPSBzIH0KPj4gKyNkZWZpbmUgRSh0LCBuLCBzLCBs LCBhKSB7IC50YWcgPSB0LCAubmFtZSA9IG4sIC5zeXNmc19uYW1lID0gcywgLmxkbGF0ID0gbCwg LmF1eF9ldmVudCA9IGEgfQo+Pgo+PiAgc3RydWN0IHBlcmZfbWVtX2V2ZW50IHBlcmZfbWVtX2V2 ZW50c19pbnRlbFtQRVJGX01FTV9FVkVOVFNfX01BWF0gPSB7Cj4+IC0gICAgICAgRSgibGRsYXQt bG9hZHMiLCAgICAgICAgIiVzL21lbS1sb2FkcyxsZGxhdD0ldS9QIiwgICAgICAiJXMvZXZlbnRz L21lbS1sb2FkcyIpLAo+PiAtICAgICAgIEUoImxkbGF0LXN0b3JlcyIsICAgICAgICIlcy9tZW0t c3RvcmVzL1AiLCAgICAgICAgICAgICAgIiVzL2V2ZW50cy9tZW0tc3RvcmVzIiksCj4+IC0gICAg ICAgRShOVUxMLCAgICAgICAgICAgICAgICAgTlVMTCwgICAgICAgICAgICAgICAgICAgICAgICAg ICBOVUxMKSwKPj4gKyAgICAgICBFKCJsZGxhdC1sb2FkcyIsICAgICAgICAiJXMvbWVtLWxvYWRz LGxkbGF0PSV1L1AiLCAgICAgICIlcy9ldmVudHMvbWVtLWxvYWRzIiwgIHRydWUsICAgMCksCj4+ ICsgICAgICAgRSgibGRsYXQtc3RvcmVzIiwgICAgICAgIiVzL21lbS1zdG9yZXMvUCIsICAgICAg ICAgICAgICAiJXMvZXZlbnRzL21lbS1zdG9yZXMiLCBmYWxzZSwgIDApLAo+PiArICAgICAgIEUo TlVMTCwgICAgICAgICAgICAgICAgIE5VTEwsICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVM TCwgICAgICAgICAgICAgICAgICAgZmFsc2UsICAwKSwKPj4gK307Cj4+ICsKPj4gK3N0cnVjdCBw ZXJmX21lbV9ldmVudCBwZXJmX21lbV9ldmVudHNfaW50ZWxfYXV4W1BFUkZfTUVNX0VWRU5UU19f TUFYXSA9IHsKPj4gKyAgICAgICBFKCJsZGxhdC1sb2FkcyIsICAgICAgICAieyVzL21lbS1sb2Fk cy1hdXgvLCVzL21lbS1sb2FkcyxsZGxhdD0ldS99OlAiLCAiJXMvZXZlbnRzL21lbS1sb2FkcyIs ICB0cnVlLCAgIE1FTV9MT0FEU19BVVgpLAo+PiArICAgICAgIEUoImxkbGF0LXN0b3JlcyIsICAg ICAgICIlcy9tZW0tc3RvcmVzL1AiLCAgICAgICAgICAgICAgIiVzL2V2ZW50cy9tZW0tc3RvcmVz IiwgZmFsc2UsICAwKSwKPj4gKyAgICAgICBFKE5VTEwsICAgICAgICAgICAgICAgICBOVUxMLCAg ICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwsICAgICAgICAgICAgICAgICAgIGZhbHNlLCAg MCksCj4+ICB9Owo+Pgo+PiAgc3RydWN0IHBlcmZfbWVtX2V2ZW50IHBlcmZfbWVtX2V2ZW50c19h bWRbUEVSRl9NRU1fRVZFTlRTX19NQVhdID0gewo+PiAtICAgICAgIEUoTlVMTCwgICAgICAgICBO VUxMLCAgICAgICAgICAgTlVMTCksCj4+IC0gICAgICAgRShOVUxMLCAgICAgICAgIE5VTEwsICAg ICAgICAgICBOVUxMKSwKPj4gLSAgICAgICBFKCJtZW0tbGRzdCIsICAgImlic19vcC8vIiwgICAg ICJpYnNfb3AiKSwKPj4gKyAgICAgICBFKE5VTEwsICAgICAgICAgTlVMTCwgICAgICAgICAgIE5V TEwsICAgICAgICAgICBmYWxzZSwgIDApLAo+PiArICAgICAgIEUoTlVMTCwgICAgICAgICBOVUxM LCAgICAgICAgICAgTlVMTCwgICAgICAgICAgIGZhbHNlLCAgMCksCj4+ICsgICAgICAgRSgibWVt LWxkc3QiLCAgICIlcy8vIiwgICAgICAgICAiaWJzX29wIiwgICAgICAgZmFsc2UsICAwKSwKPj4g IH07Cj4+Cj4+ICBib29sIGlzX21lbV9sb2Fkc19hdXhfZXZlbnQoc3RydWN0IGV2c2VsICpsZWFk ZXIpCj4+IEBAIC00MCw0OCArNDEsMyBAQCBib29sIGlzX21lbV9sb2Fkc19hdXhfZXZlbnQoc3Ry dWN0IGV2c2VsICpsZWFkZXIpCj4+Cj4+ICAgICAgICAgcmV0dXJuIGxlYWRlci0+Y29yZS5hdHRy LmNvbmZpZyA9PSBNRU1fTE9BRFNfQVVYOwo+PiAgfQo+PiAtCj4+IC1jb25zdCBjaGFyICpwZXJm X21lbV9ldmVudHNfX25hbWUoaW50IGksIGNvbnN0IGNoYXIgKnBtdV9uYW1lKQo+PiAtewo+PiAt ICAgICAgIHN0cnVjdCBwZXJmX21lbV9ldmVudCAqZTsKPj4gLQo+PiAtICAgICAgIGlmICh4ODZf X2lzX2FtZF9jcHUoKSkKPj4gLSAgICAgICAgICAgICAgIGUgPSAmcGVyZl9tZW1fZXZlbnRzX2Ft ZFtpXTsKPj4gLSAgICAgICBlbHNlCj4+IC0gICAgICAgICAgICAgICBlID0gJnBlcmZfbWVtX2V2 ZW50c19pbnRlbFtpXTsKPj4gLQo+PiAtICAgICAgIGlmICghZSkKPj4gLSAgICAgICAgICAgICAg IHJldHVybiBOVUxMOwo+PiAtCj4+IC0gICAgICAgaWYgKGkgPT0gUEVSRl9NRU1fRVZFTlRTX19M T0FEKSB7Cj4+IC0gICAgICAgICAgICAgICBpZiAobWVtX2xvYWRzX25hbWVfX2luaXQgJiYgIXBt dV9uYW1lKQo+PiAtICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gbWVtX2xvYWRzX25hbWU7 Cj4+IC0KPj4gLSAgICAgICAgICAgICAgIGlmICghcG11X25hbWUpIHsKPj4gLSAgICAgICAgICAg ICAgICAgICAgICAgbWVtX2xvYWRzX25hbWVfX2luaXQgPSB0cnVlOwo+PiAtICAgICAgICAgICAg ICAgICAgICAgICBwbXVfbmFtZSA9ICJjcHUiOwo+PiAtICAgICAgICAgICAgICAgfQo+PiAtCj4+ IC0gICAgICAgICAgICAgICBpZiAocGVyZl9wbXVzX19oYXZlX2V2ZW50KHBtdV9uYW1lLCAibWVt LWxvYWRzLWF1eCIpKSB7Cj4+IC0gICAgICAgICAgICAgICAgICAgICAgIHNjbnByaW50ZihtZW1f bG9hZHNfbmFtZSwgc2l6ZW9mKG1lbV9sb2Fkc19uYW1lKSwKPj4gLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIE1FTV9MT0FEU19BVVhfTkFNRSwgcG11X25hbWUsIHBtdV9uYW1lLAo+ PiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGVyZl9tZW1fZXZlbnRzX19sb2Fk c19sZGxhdCk7Cj4+IC0gICAgICAgICAgICAgICB9IGVsc2Ugewo+PiAtICAgICAgICAgICAgICAg ICAgICAgICBzY25wcmludGYobWVtX2xvYWRzX25hbWUsIHNpemVvZihtZW1fbG9hZHNfbmFtZSks Cj4+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlLT5uYW1lLCBwbXVfbmFtZSwK Pj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBlcmZfbWVtX2V2ZW50c19fbG9h ZHNfbGRsYXQpOwo+PiAtICAgICAgICAgICAgICAgfQo+PiAtICAgICAgICAgICAgICAgcmV0dXJu IG1lbV9sb2Fkc19uYW1lOwo+PiAtICAgICAgIH0KPj4gLQo+PiAtICAgICAgIGlmIChpID09IFBF UkZfTUVNX0VWRU5UU19fU1RPUkUpIHsKPj4gLSAgICAgICAgICAgICAgIGlmICghcG11X25hbWUp Cj4+IC0gICAgICAgICAgICAgICAgICAgICAgIHBtdV9uYW1lID0gImNwdSI7Cj4+IC0KPj4gLSAg ICAgICAgICAgICAgIHNjbnByaW50ZihtZW1fc3RvcmVzX25hbWUsIHNpemVvZihtZW1fc3RvcmVz X25hbWUpLAo+PiAtICAgICAgICAgICAgICAgICAgICAgICAgIGUtPm5hbWUsIHBtdV9uYW1lKTsK Pj4gLSAgICAgICAgICAgICAgIHJldHVybiBtZW1fc3RvcmVzX25hbWU7Cj4+IC0gICAgICAgfQo+ PiAtCj4+IC0gICAgICAgcmV0dXJuIGUtPm5hbWU7Cj4+IC19Cj4+IGRpZmYgLS1naXQgYS90b29s cy9wZXJmL2FyY2gveDg2L3V0aWwvbWVtLWV2ZW50cy5oIGIvdG9vbHMvcGVyZi9hcmNoL3g4Ni91 dGlsL21lbS1ldmVudHMuaAo+PiBpbmRleCAzOTU5ZTQyN2Y0ODIuLmY1NWM4ZDNiN2Q1OSAxMDA2 NDQKPj4gLS0tIGEvdG9vbHMvcGVyZi9hcmNoL3g4Ni91dGlsL21lbS1ldmVudHMuaAo+PiArKysg Yi90b29scy9wZXJmL2FyY2gveDg2L3V0aWwvbWVtLWV2ZW50cy5oCj4+IEBAIC0zLDYgKzMsNyBA QAo+PiAgI2RlZmluZSBfWDg2X01FTV9FVkVOVFNfSAo+Pgo+PiAgZXh0ZXJuIHN0cnVjdCBwZXJm X21lbV9ldmVudCBwZXJmX21lbV9ldmVudHNfaW50ZWxbUEVSRl9NRU1fRVZFTlRTX19NQVhdOwo+ PiArZXh0ZXJuIHN0cnVjdCBwZXJmX21lbV9ldmVudCBwZXJmX21lbV9ldmVudHNfaW50ZWxfYXV4 W1BFUkZfTUVNX0VWRU5UU19fTUFYXTsKPj4KPj4gIGV4dGVybiBzdHJ1Y3QgcGVyZl9tZW1fZXZl bnQgcGVyZl9tZW1fZXZlbnRzX2FtZFtQRVJGX01FTV9FVkVOVFNfX01BWF07Cj4+Cj4+IGRpZmYg LS1naXQgYS90b29scy9wZXJmL2FyY2gveDg2L3V0aWwvcG11LmMgYi90b29scy9wZXJmL2FyY2gv eDg2L3V0aWwvcG11LmMKPj4gaW5kZXggN2U2OWY0ZjJlMzYzLi40NDZmODE5N2FhZTQgMTAwNjQ0 Cj4+IC0tLSBhL3Rvb2xzL3BlcmYvYXJjaC94ODYvdXRpbC9wbXUuYwo+PiArKysgYi90b29scy9w ZXJmL2FyY2gveDg2L3V0aWwvcG11LmMKPj4gQEAgLTM1LDggKzM1LDEyIEBAIHZvaWQgcGVyZl9w bXVfX2FyY2hfaW5pdChzdHJ1Y3QgcGVyZl9wbXUgKnBtdSBfX21heWJlX3VudXNlZCkKPj4gICAg ICAgICBpZiAoeDg2X19pc19hbWRfY3B1KCkpIHsKPj4gICAgICAgICAgICAgICAgIGlmIChzdHJj bXAocG11LT5uYW1lLCAiaWJzX29wIikpCj4+ICAgICAgICAgICAgICAgICAgICAgICAgIHBtdS0+ bWVtX2V2ZW50cyA9IHBlcmZfbWVtX2V2ZW50c19hbWQ7Cj4+IC0gICAgICAgfSBlbHNlIGlmIChw bXUtPmlzX2NvcmUpCj4+IC0gICAgICAgICAgICAgICBwbXUtPm1lbV9ldmVudHMgPSBwZXJmX21l bV9ldmVudHNfaW50ZWw7Cj4+ICsgICAgICAgfSBlbHNlIGlmIChwbXUtPmlzX2NvcmUpIHsKPj4g KyAgICAgICAgICAgICAgIGlmIChwZXJmX3BtdV9faGF2ZV9ldmVudChwbXUsICJtZW0tbG9hZHMt YXV4IikpCj4+ICsgICAgICAgICAgICAgICAgICAgICAgIHBtdS0+bWVtX2V2ZW50cyA9IHBlcmZf bWVtX2V2ZW50c19pbnRlbF9hdXg7Cj4+ICsgICAgICAgICAgICAgICBlbHNlCj4+ICsgICAgICAg ICAgICAgICAgICAgICAgIHBtdS0+bWVtX2V2ZW50cyA9IHBlcmZfbWVtX2V2ZW50c19pbnRlbDsK Pj4gKyAgICAgICB9Cj4+ICB9Cj4+Cj4+ICBpbnQgcGVyZl9wbXVzX19udW1fbWVtX3BtdXModm9p ZCkKPj4gZGlmZiAtLWdpdCBhL3Rvb2xzL3BlcmYvdXRpbC9tZW0tZXZlbnRzLmMgYi90b29scy9w ZXJmL3V0aWwvbWVtLWV2ZW50cy5jCj4+IGluZGV4IDg4N2ZmZGNjZTMzOC4uM2E2MGNiY2Q2ZDhl IDEwMDY0NAo+PiAtLS0gYS90b29scy9wZXJmL3V0aWwvbWVtLWV2ZW50cy5jCj4+ICsrKyBiL3Rv b2xzL3BlcmYvdXRpbC9tZW0tZXZlbnRzLmMKPj4gQEAgLTE3LDE3ICsxNywxNyBAQAo+Pgo+PiAg dW5zaWduZWQgaW50IHBlcmZfbWVtX2V2ZW50c19fbG9hZHNfbGRsYXQgPSAzMDsKPj4KPj4gLSNk ZWZpbmUgRSh0LCBuLCBzKSB7IC50YWcgPSB0LCAubmFtZSA9IG4sIC5zeXNmc19uYW1lID0gcyB9 Cj4+ICsjZGVmaW5lIEUodCwgbiwgcywgbCwgYSkgeyAudGFnID0gdCwgLm5hbWUgPSBuLCAuc3lz ZnNfbmFtZSA9IHMsIC5sZGxhdCA9IGwsIC5hdXhfZXZlbnQgPSBhIH0KPj4KPj4gIHN0cnVjdCBw ZXJmX21lbV9ldmVudCBwZXJmX21lbV9ldmVudHNbUEVSRl9NRU1fRVZFTlRTX19NQVhdID0gewo+ PiAtICAgICAgIEUoImxkbGF0LWxvYWRzIiwgICAgICAgICJjcHUvbWVtLWxvYWRzLGxkbGF0PSV1 L1AiLCAgICAgImNwdS9ldmVudHMvbWVtLWxvYWRzIiksCj4+IC0gICAgICAgRSgibGRsYXQtc3Rv cmVzIiwgICAgICAgImNwdS9tZW0tc3RvcmVzL1AiLCAgICAgICAgICAgICAiY3B1L2V2ZW50cy9t ZW0tc3RvcmVzIiksCj4+IC0gICAgICAgRShOVUxMLCAgICAgICAgICAgICAgICAgTlVMTCwgICAg ICAgICAgICAgICAgICAgICAgICAgICBOVUxMKSwKPj4gKyAgICAgICBFKCJsZGxhdC1sb2FkcyIs ICAgICAgICAiJXMvbWVtLWxvYWRzLyxsZGxhdD0ldS9QIiwgICAgICJjcHUvZXZlbnRzL21lbS1s b2FkcyIsICAgICAgICAgdHJ1ZSwgICAwKSwKPiAKPiBJcyB0aGVyZSBhIG1pc3Rha2UgaGVyZSAi LywiIGxvb2tzIGxpa2UgaXQgc2hvdWxkIGp1c3QgYmUgIiwiLgoKUmlnaHQsIGEgdHlwby4gSSB3 aWxsIGZpeCBpdCBpbiBWMi4KClRoYW5rcywKS2FuCj4gCj4gVGhhbmtzLAo+IElhbgo+IAo+PiAr ICAgICAgIEUoImxkbGF0LXN0b3JlcyIsICAgICAgICIlcy9tZW0tc3RvcmVzL1AiLCAgICAgICAg ICAgICAgImNwdS9ldmVudHMvbWVtLXN0b3JlcyIsICAgICAgICBmYWxzZSwgIDApLAo+PiArICAg ICAgIEUoTlVMTCwgICAgICAgICAgICAgICAgIE5VTEwsICAgICAgICAgICAgICAgICAgICAgICAg ICAgTlVMTCwgICAgICAgICAgICAgICAgICAgICAgICAgICBmYWxzZSwgIDApLAo+PiAgfTsKPj4g ICN1bmRlZiBFCj4+Cj4+ICBzdGF0aWMgY2hhciBtZW1fbG9hZHNfbmFtZVsxMDBdOwo+PiAtc3Rh dGljIGJvb2wgbWVtX2xvYWRzX25hbWVfX2luaXQ7Cj4+ICtzdGF0aWMgY2hhciBtZW1fc3RvcmVz X25hbWVbMTAwXTsKPj4KPj4gIHN0cnVjdCBwZXJmX21lbV9ldmVudCAqcGVyZl9tZW1fZXZlbnRz X19wdHIoc3RydWN0IHBlcmZfcG11ICpwbXUsIGludCBpKQo+PiAgewo+PiBAQCAtNjIsMjMgKzYy LDQ1IEBAIHN0cnVjdCBwZXJmX3BtdSAqcGVyZl9tZW1fZXZlbnRzX2ZpbmRfcG11KHZvaWQpCj4+ ICAgICAgICAgcmV0dXJuIHBlcmZfcG11c19fc2Nhbl9tZW0oTlVMTCk7Cj4+ICB9Cj4+Cj4+IC1j b25zdCBjaGFyICogX193ZWFrIHBlcmZfbWVtX2V2ZW50c19fbmFtZShpbnQgaSwgY29uc3QgY2hh ciAqcG11X25hbWUgIF9fbWF5YmVfdW51c2VkKQo+PiArc3RhdGljIGNvbnN0IGNoYXIgKnBlcmZf bWVtX2V2ZW50c19fbmFtZShpbnQgaSwgc3RydWN0IHBlcmZfcG11ICpwbXUpCj4+ICB7Cj4+IC0g ICAgICAgc3RydWN0IHBlcmZfbWVtX2V2ZW50ICplID0gJnBlcmZfbWVtX2V2ZW50c1tpXTsKPj4g KyAgICAgICBzdHJ1Y3QgcGVyZl9tZW1fZXZlbnQgKmUgPSAmcG11LT5tZW1fZXZlbnRzW2ldOwo+ Pgo+PiAgICAgICAgIGlmICghZSkKPj4gICAgICAgICAgICAgICAgIHJldHVybiBOVUxMOwo+Pgo+ PiAtICAgICAgIGlmIChpID09IFBFUkZfTUVNX0VWRU5UU19fTE9BRCkgewo+PiAtICAgICAgICAg ICAgICAgaWYgKCFtZW1fbG9hZHNfbmFtZV9faW5pdCkgewo+PiAtICAgICAgICAgICAgICAgICAg ICAgICBtZW1fbG9hZHNfbmFtZV9faW5pdCA9IHRydWU7Cj4+IC0gICAgICAgICAgICAgICAgICAg ICAgIHNjbnByaW50ZihtZW1fbG9hZHNfbmFtZSwgc2l6ZW9mKG1lbV9sb2Fkc19uYW1lKSwKPj4g LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGUtPm5hbWUsIHBlcmZfbWVtX2V2ZW50 c19fbG9hZHNfbGRsYXQpOwo+PiArICAgICAgIGlmIChpID09IFBFUkZfTUVNX0VWRU5UU19fTE9B RCB8fCBpID09IFBFUkZfTUVNX0VWRU5UU19fTE9BRF9TVE9SRSkgewo+PiArICAgICAgICAgICAg ICAgaWYgKGUtPmxkbGF0KSB7Cj4+ICsgICAgICAgICAgICAgICAgICAgICAgIGlmICghZS0+YXV4 X2V2ZW50KSB7Cj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogQVJNIGFuZCBN b3N0IG9mIEludGVsICovCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2NucHJp bnRmKG1lbV9sb2Fkc19uYW1lLCBzaXplb2YobWVtX2xvYWRzX25hbWUpLAo+PiArICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlLT5uYW1lLCBwbXUtPm5hbWUsCj4+ICsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBlcmZfbWVtX2V2ZW50c19f bG9hZHNfbGRsYXQpOwo+PiArICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2Ugewo+PiArICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIEludGVsIHdpdGggbWVtLWxvYWRzLWF1eCBl dmVudCAqLwo+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjbnByaW50ZihtZW1f bG9hZHNfbmFtZSwgc2l6ZW9mKG1lbV9sb2Fkc19uYW1lKSwKPj4gKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZS0+bmFtZSwgcG11LT5uYW1lLCBwbXUtPm5hbWUsCj4+ ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBlcmZfbWVtX2V2ZW50 c19fbG9hZHNfbGRsYXQpOwo+PiArICAgICAgICAgICAgICAgICAgICAgICB9Cj4+ICsgICAgICAg ICAgICAgICB9IGVsc2Ugewo+PiArICAgICAgICAgICAgICAgICAgICAgICBpZiAoIWUtPmF1eF9l dmVudCkgewo+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIEFNRCBhbmQgUE9X RVIgKi8KPj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY25wcmludGYobWVtX2xv YWRzX25hbWUsIHNpemVvZihtZW1fbG9hZHNfbmFtZSksCj4+ICsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGUtPm5hbWUsIHBtdS0+bmFtZSk7Cj4+ICsgICAgICAgICAg ICAgICAgICAgICAgIH0gZWxzZQo+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBOVUxMOwo+PiAgICAgICAgICAgICAgICAgfQo+PiArCj4+ICAgICAgICAgICAgICAgICBy ZXR1cm4gbWVtX2xvYWRzX25hbWU7Cj4+ICAgICAgICAgfQo+Pgo+PiAtICAgICAgIHJldHVybiBl LT5uYW1lOwo+PiArICAgICAgIGlmIChpID09IFBFUkZfTUVNX0VWRU5UU19fU1RPUkUpIHsKPj4g KyAgICAgICAgICAgICAgIHNjbnByaW50ZihtZW1fc3RvcmVzX25hbWUsIHNpemVvZihtZW1fc3Rv cmVzX25hbWUpLAo+PiArICAgICAgICAgICAgICAgICAgICAgICAgIGUtPm5hbWUsIHBtdS0+bmFt ZSk7Cj4+ICsgICAgICAgICAgICAgICByZXR1cm4gbWVtX3N0b3Jlc19uYW1lOwo+PiArICAgICAg IH0KPj4gKwo+PiArICAgICAgIHJldHVybiBOVUxMOwo+PiAgfQo+Pgo+PiAgX193ZWFrIGJvb2wg aXNfbWVtX2xvYWRzX2F1eF9ldmVudChzdHJ1Y3QgZXZzZWwgKmxlYWRlciBfX21heWJlX3VudXNl ZCkKPj4gQEAgLTE3NSw3ICsxOTcsNyBAQCB2b2lkIHBlcmZfbWVtX2V2ZW50c19fbGlzdChzdHJ1 Y3QgcGVyZl9wbXUgKnBtdSkKPj4gICAgICAgICAgICAgICAgICAgICAgICAgZS0+dGFnID8gMTMg OiAwLAo+PiAgICAgICAgICAgICAgICAgICAgICAgICBlLT50YWcgPyA6ICIiLAo+PiAgICAgICAg ICAgICAgICAgICAgICAgICBlLT50YWcgJiYgdmVyYm9zZSA+IDAgPyAyNSA6IDAsCj4+IC0gICAg ICAgICAgICAgICAgICAgICAgIGUtPnRhZyAmJiB2ZXJib3NlID4gMCA/IHBlcmZfbWVtX2V2ZW50 c19fbmFtZShqLCBOVUxMKSA6ICIiLAo+PiArICAgICAgICAgICAgICAgICAgICAgICBlLT50YWcg JiYgdmVyYm9zZSA+IDAgPyBwZXJmX21lbV9ldmVudHNfX25hbWUoaiwgcG11KSA6ICIiLAo+PiAg ICAgICAgICAgICAgICAgICAgICAgICBlLT5zdXBwb3J0ZWQgPyAiOiBhdmFpbGFibGVcbiIgOiAi Iik7Cj4+ICAgICAgICAgfQo+PiAgfQo+PiBAQCAtMTk4LDE1ICsyMjAsMTUgQEAgaW50IHBlcmZf bWVtX2V2ZW50c19fcmVjb3JkX2FyZ3MoY29uc3QgY2hhciAqKnJlY19hcmd2LCBpbnQgKmFyZ3Zf bnIsCj4+Cj4+ICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghZS0+c3VwcG9ydGVkKSB7Cj4+ ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJfZXJyKCJmYWlsZWQ6IGV2ZW50ICcl cycgbm90IHN1cHBvcnRlZFxuIiwKPj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHBlcmZfbWVtX2V2ZW50c19fbmFtZShqLCBwbXUtPm5hbWUpKTsKPj4gKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBlcmZfbWVtX2V2ZW50c19fbmFtZShqLCBw bXUpKTsKPj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gLTE7Cj4+ICAg ICAgICAgICAgICAgICAgICAgICAgIH0KPj4KPj4gICAgICAgICAgICAgICAgICAgICAgICAgaWYg KHBlcmZfcG11c19fbnVtX21lbV9wbXVzKCkgPT0gMSkgewo+PiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHJlY19hcmd2W2krK10gPSAiLWUiOwo+PiAtICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHJlY19hcmd2W2krK10gPSBwZXJmX21lbV9ldmVudHNfX25hbWUoaiwgTlVM TCk7Cj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVjX2FyZ3ZbaSsrXSA9IHBl cmZfbWVtX2V2ZW50c19fbmFtZShqLCBwbXUpOwo+PiAgICAgICAgICAgICAgICAgICAgICAgICB9 IGVsc2Ugewo+PiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKnMg PSBwZXJmX21lbV9ldmVudHNfX25hbWUoaiwgcG11LT5uYW1lKTsKPj4gKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpzID0gcGVyZl9tZW1fZXZlbnRzX19uYW1lKGos IHBtdSk7Cj4+Cj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFwZXJmX21l bV9ldmVudF9fc3VwcG9ydGVkKG1udCwgcG11LCBlKSkKPj4gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwo+PiBkaWZmIC0tZ2l0IGEvdG9vbHMvcGVyZi91 dGlsL21lbS1ldmVudHMuaCBiL3Rvb2xzL3BlcmYvdXRpbC9tZW0tZXZlbnRzLmgKPj4gaW5kZXgg NTlhNDMwM2FhYzk2Li5kMjU3Y2Y2N2Q2ZDkgMTAwNjQ0Cj4+IC0tLSBhL3Rvb2xzL3BlcmYvdXRp bC9tZW0tZXZlbnRzLmgKPj4gKysrIGIvdG9vbHMvcGVyZi91dGlsL21lbS1ldmVudHMuaAo+PiBA QCAtMTQsNiArMTQsOCBAQAo+PiAgc3RydWN0IHBlcmZfbWVtX2V2ZW50IHsKPj4gICAgICAgICBi b29sICAgICAgICAgICAgcmVjb3JkOwo+PiAgICAgICAgIGJvb2wgICAgICAgICAgICBzdXBwb3J0 ZWQ7Cj4+ICsgICAgICAgYm9vbCAgICAgICAgICAgIGxkbGF0Owo+PiArICAgICAgIHUzMiAgICAg ICAgICAgICBhdXhfZXZlbnQ7Cj4+ICAgICAgICAgY29uc3QgY2hhciAgICAgICp0YWc7Cj4+ICAg ICAgICAgY29uc3QgY2hhciAgICAgICpuYW1lOwo+PiAgICAgICAgIGNvbnN0IGNoYXIgICAgICAq c3lzZnNfbmFtZTsKPj4gQEAgLTM5LDcgKzQxLDYgQEAgZXh0ZXJuIHN0cnVjdCBwZXJmX21lbV9l dmVudCBwZXJmX21lbV9ldmVudHNbUEVSRl9NRU1fRVZFTlRTX19NQVhdOwo+PiAgaW50IHBlcmZf bWVtX2V2ZW50c19fcGFyc2Uoc3RydWN0IHBlcmZfcG11ICpwbXUsIGNvbnN0IGNoYXIgKnN0cik7 Cj4+ICBpbnQgcGVyZl9tZW1fZXZlbnRzX19pbml0KHN0cnVjdCBwZXJmX3BtdSAqcG11KTsKPj4K Pj4gLWNvbnN0IGNoYXIgKnBlcmZfbWVtX2V2ZW50c19fbmFtZShpbnQgaSwgY29uc3QgY2hhciAq cG11X25hbWUpOwo+PiAgc3RydWN0IHBlcmZfbWVtX2V2ZW50ICpwZXJmX21lbV9ldmVudHNfX3B0 cihzdHJ1Y3QgcGVyZl9wbXUgKnBtdSwgaW50IGkpOwo+PiAgc3RydWN0IHBlcmZfcG11ICpwZXJm X21lbV9ldmVudHNfZmluZF9wbXUodm9pZCk7Cj4+ICBib29sIGlzX21lbV9sb2Fkc19hdXhfZXZl bnQoc3RydWN0IGV2c2VsICpsZWFkZXIpOwo+PiAtLQo+PiAyLjM1LjEKPj4KCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFp bGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlz dHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK