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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 733BEC77B7E for ; Sat, 27 May 2023 05:58:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229755AbjE0F6Y (ORCPT ); Sat, 27 May 2023 01:58:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231398AbjE0F6V (ORCPT ); Sat, 27 May 2023 01:58:21 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3AF59E for ; Fri, 26 May 2023 22:58:18 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f6a6b9bebdso27985e9.0 for ; Fri, 26 May 2023 22:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685167097; x=1687759097; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=FO/UGkGFNR0JZ32w4keSjzNDju+boE3Juixk0rVaTPg=; b=zjrV9XkDmzk0oBeBSYvZvYdtmOvnr4IIMXuIaajEIKK4GQGBr4Qh9HPOG0ymB862u8 6EXhk5oQgi74Jd+eq8GG7dkXJFAL+j8HZi353w1v+AljXl+z2qsLb1xOM33htRa16uqV d0O46EeSiJ54TZZop48CTq2pD3L2CQcsjJwjJ/OHkY6FYKPM6/sJncx9MG+sCtKUd1bM muSNdF4OHZn3JtcSbqKTPlCDJKDaJ0xNxwaq1tbGqS0bbmFuUHTA85Muue2gxRSw3ZTB 9SpiP3Z+A5Q0J7o3weoi3VgiqWVErCpcLrGCLHPsNkT3i1lY3JCClFTSM72rRjTLgqWG BlQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685167097; x=1687759097; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FO/UGkGFNR0JZ32w4keSjzNDju+boE3Juixk0rVaTPg=; b=Bi1P1cbkFBwQ0VbV3lfrbYMwDowIkmgsAaI315spSB7EDtLQy7bXSK4puoX5a6rzbI Nq1SbY6gKxb5NfBlSs6zDUA7mmVKiyKLHjjz1ULX/oKibBBlVy/0y7k2oeZu9Kv3pqZS KBp1e1QkYUIrcYgWSuXDoc1CqrVAB0UskfIVyKAmrG7D0cu1FqmMCMlWVkdn+28wR393 DKknc6CaDQ4Gr9VhP4ZROEDcvvrUiINhz7dS0ttgosuDGO8705TYA7MUcU2Y+CgRZSIJ mvgtiwMG+GH5LMSPpDEcbuVU4y2A215e+R76f4fJSOXTwakZFaV7T20ioC6T5AElTK/u z/gQ== X-Gm-Message-State: AC+VfDxRL0gMNcRZ5dXyoRX1vwkitksudVOxhgVLVbL/rIkym6qjWzlF kxXQLZsxvOUpk3qouWNRXFVNldTDAJblU8sNLiCKXw== X-Google-Smtp-Source: ACHHUZ7S/5eOdKqV9Jw1XPjO2xR6G/XRxDV5OIZVopVAd7fdwcNwDo9fXEHSAevW7pOPg64tDEsJ1Fqh00h6QGYm/s4= X-Received: by 2002:a05:600c:314c:b0:3f6:f4b:d4a6 with SMTP id h12-20020a05600c314c00b003f60f4bd4a6mr61151wmo.7.1685167097237; Fri, 26 May 2023 22:58:17 -0700 (PDT) MIME-Version: 1.0 References: <20230526215410.2435674-1-irogers@google.com> <20230526215410.2435674-15-irogers@google.com> In-Reply-To: From: Ian Rogers Date: Fri, 26 May 2023 22:58:04 -0700 Message-ID: Subject: Re: [PATCH v4 14/35] perf evlist: Remove __evlist__add_default To: Arnaldo Carvalho de Melo Cc: Suzuki K Poulose , Mike Leach , Leo Yan , John Garry , Will Deacon , James Clark , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kajol Jain , Jing Zhang , Kan Liang , Zhengjun Xing , Ravi Bangoria , Madhavan Srinivasan , Athira Rajeev , Ming Wang , Huacai Chen , Sandipan Das , Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson , Ali Saidi , Rob Herring , Thomas Richter , Kang Minchul , linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 26, 2023 at 6:45=E2=80=AFPM Arnaldo Carvalho de Melo wrote: > > Em Fri, May 26, 2023 at 02:53:49PM -0700, Ian Rogers escreveu: > > __evlist__add_default adds a cycles event to a typically empty evlist > > and was extended for hybrid with evlist__add_default_hybrid, as more > > than 1 PMU was necessary. Rather than have dedicated logic for the > > cycles event, this change switches to parsing 'cycles:P' which will > > handle wildcarding the PMUs appropriately for hybrid. > > I think I reported this earlier, but at this point 'perf test python' > breaks, I fixed it in the tmp.perf-tools-next: > > 19: 'import perf' in python : FA= ILED! > =E2=AC=A2[acme@toolbox perf-tools-next]$ git log --oneline -1 > fe4f622c4fc7a02a (HEAD) perf evlist: Remove __evlist__add_default > =E2=AC=A2[acme@toolbox perf-tools-next]$ > =E2=AC=A2[acme@toolbox perf-tools-next]$ perf test -v python > Couldn't bump rlimit(MEMLOCK), failures may take place when creating BPF = maps, etc > 19: 'import perf' in python : > --- start --- > test child forked, pid 2976621 > python usage test: "echo "import sys ; sys.path.append('/tmp/build/perf-t= ools-next/python'); import perf" | '/usr/bin/python3' " > Traceback (most recent call last): > File "", line 1, in > ImportError: /tmp/build/perf-tools-next/python/perf.cpython-310-x86_64-li= nux-gnu.so: undefined symbol: parse_event > test child finished with -1 > ---- end ---- > 'import perf' in python: FAILED! > =E2=AC=A2[acme@toolbox perf-tools-next]$ > > Probably there will be a few more cases in the next patches, please > check. I'll rebase and resend. I needed to add: https://lore.kernel.org/lkml/20230527055517.2711487-1-irogers@google.com/ to repro the failure. The test was passing without it. Thanks, Ian > - Arnaldo > > > Signed-off-by: Ian Rogers > > Reviewed-by: Kan Liang > > --- > > tools/perf/arch/x86/util/evsel.c | 20 -------------- > > tools/perf/builtin-record.c | 13 +++------ > > tools/perf/builtin-top.c | 10 ++++--- > > tools/perf/util/evlist-hybrid.c | 25 ----------------- > > tools/perf/util/evlist-hybrid.h | 1 - > > tools/perf/util/evlist.c | 22 ++++++--------- > > tools/perf/util/evlist.h | 7 ----- > > tools/perf/util/evsel.c | 46 -------------------------------- > > tools/perf/util/evsel.h | 3 --- > > 9 files changed, 17 insertions(+), 130 deletions(-) > > > > diff --git a/tools/perf/arch/x86/util/evsel.c b/tools/perf/arch/x86/uti= l/evsel.c > > index ea3972d785d1..153cdca94cd4 100644 > > --- a/tools/perf/arch/x86/util/evsel.c > > +++ b/tools/perf/arch/x86/util/evsel.c > > @@ -16,26 +16,6 @@ void arch_evsel__set_sample_weight(struct evsel *evs= el) > > evsel__set_sample_bit(evsel, WEIGHT_STRUCT); > > } > > > > -void arch_evsel__fixup_new_cycles(struct perf_event_attr *attr) > > -{ > > - struct perf_env env =3D { .total_mem =3D 0, } ; > > - > > - if (!perf_env__cpuid(&env)) > > - return; > > - > > - /* > > - * On AMD, precise cycles event sampling internally uses IBS pmu. > > - * But IBS does not have filtering capabilities and perf by defau= lt > > - * sets exclude_guest =3D 1. This makes IBS pmu event init fail a= nd > > - * thus perf ends up doing non-precise sampling. Avoid it by clea= ring > > - * exclude_guest. > > - */ > > - if (env.cpuid && strstarts(env.cpuid, "AuthenticAMD")) > > - attr->exclude_guest =3D 0; > > - > > - free(env.cpuid); > > -} > > - > > /* Check whether the evsel's PMU supports the perf metrics */ > > bool evsel__sys_has_perf_metrics(const struct evsel *evsel) > > { > > diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c > > index 88f7b4241153..d80b54a6f450 100644 > > --- a/tools/perf/builtin-record.c > > +++ b/tools/perf/builtin-record.c > > @@ -4161,18 +4161,11 @@ int cmd_record(int argc, const char **argv) > > record.opts.tail_synthesize =3D true; > > > > if (rec->evlist->core.nr_entries =3D=3D 0) { > > - if (perf_pmu__has_hybrid()) { > > - err =3D evlist__add_default_hybrid(rec->evlist, > > - !record.opts.no_= samples); > > - } else { > > - err =3D __evlist__add_default(rec->evlist, > > - !record.opts.no_sampl= es); > > - } > > + bool can_profile_kernel =3D perf_event_paranoid_check(1); > > > > - if (err < 0) { > > - pr_err("Not enough memory for event selector list= \n"); > > + err =3D parse_event(rec->evlist, can_profile_kernel ? "cy= cles:P" : "cycles:Pu"); > > + if (err) > > goto out; > > - } > > } > > > > if (rec->opts.target.tid && !rec->opts.no_inherit_set) > > diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c > > index 48ee49e95c5e..27a7f068207d 100644 > > --- a/tools/perf/builtin-top.c > > +++ b/tools/perf/builtin-top.c > > @@ -1653,10 +1653,12 @@ int cmd_top(int argc, const char **argv) > > if (annotate_check_args(&top.annotation_opts) < 0) > > goto out_delete_evlist; > > > > - if (!top.evlist->core.nr_entries && > > - evlist__add_default(top.evlist) < 0) { > > - pr_err("Not enough memory for event selector list\n"); > > - goto out_delete_evlist; > > + if (!top.evlist->core.nr_entries) { > > + bool can_profile_kernel =3D perf_event_paranoid_check(1); > > + int err =3D parse_event(top.evlist, can_profile_kernel ? = "cycles:P" : "cycles:Pu"); > > + > > + if (err) > > + goto out_delete_evlist; > > } > > > > status =3D evswitch__init(&top.evswitch, top.evlist, stderr); > > diff --git a/tools/perf/util/evlist-hybrid.c b/tools/perf/util/evlist-h= ybrid.c > > index 0f59c80f27b2..64f78d06fe19 100644 > > --- a/tools/perf/util/evlist-hybrid.c > > +++ b/tools/perf/util/evlist-hybrid.c > > @@ -16,31 +16,6 @@ > > #include > > #include > > > > -int evlist__add_default_hybrid(struct evlist *evlist, bool precise) > > -{ > > - struct evsel *evsel; > > - struct perf_pmu *pmu; > > - __u64 config; > > - struct perf_cpu_map *cpus; > > - > > - perf_pmu__for_each_hybrid_pmu(pmu) { > > - config =3D PERF_COUNT_HW_CPU_CYCLES | > > - ((__u64)pmu->type << PERF_PMU_TYPE_SHIFT); > > - evsel =3D evsel__new_cycles(precise, PERF_TYPE_HARDWARE, > > - config); > > - if (!evsel) > > - return -ENOMEM; > > - > > - cpus =3D perf_cpu_map__get(pmu->cpus); > > - evsel->core.cpus =3D cpus; > > - evsel->core.own_cpus =3D perf_cpu_map__get(cpus); > > - evsel->pmu_name =3D strdup(pmu->name); > > - evlist__add(evlist, evsel); > > - } > > - > > - return 0; > > -} > > - > > bool evlist__has_hybrid(struct evlist *evlist) > > { > > struct evsel *evsel; > > diff --git a/tools/perf/util/evlist-hybrid.h b/tools/perf/util/evlist-h= ybrid.h > > index 4b000eda6626..0cded76eb344 100644 > > --- a/tools/perf/util/evlist-hybrid.h > > +++ b/tools/perf/util/evlist-hybrid.h > > @@ -7,7 +7,6 @@ > > #include "evlist.h" > > #include > > > > -int evlist__add_default_hybrid(struct evlist *evlist, bool precise); > > bool evlist__has_hybrid(struct evlist *evlist); > > > > #endif /* __PERF_EVLIST_HYBRID_H */ > > diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c > > index 9dfa977193b3..63f8821a5395 100644 > > --- a/tools/perf/util/evlist.c > > +++ b/tools/perf/util/evlist.c > > @@ -93,8 +93,15 @@ struct evlist *evlist__new(void) > > struct evlist *evlist__new_default(void) > > { > > struct evlist *evlist =3D evlist__new(); > > + bool can_profile_kernel; > > + int err; > > + > > + if (!evlist) > > + return NULL; > > > > - if (evlist && evlist__add_default(evlist)) { > > + can_profile_kernel =3D perf_event_paranoid_check(1); > > + err =3D parse_event(evlist, can_profile_kernel ? "cycles:P" : "cy= cles:Pu"); > > + if (err) { > > evlist__delete(evlist); > > evlist =3D NULL; > > } > > @@ -237,19 +244,6 @@ static void evlist__set_leader(struct evlist *evli= st) > > perf_evlist__set_leader(&evlist->core); > > } > > > > -int __evlist__add_default(struct evlist *evlist, bool precise) > > -{ > > - struct evsel *evsel; > > - > > - evsel =3D evsel__new_cycles(precise, PERF_TYPE_HARDWARE, > > - PERF_COUNT_HW_CPU_CYCLES); > > - if (evsel =3D=3D NULL) > > - return -ENOMEM; > > - > > - evlist__add(evlist, evsel); > > - return 0; > > -} > > - > > static struct evsel *evlist__dummy_event(struct evlist *evlist) > > { > > struct perf_event_attr attr =3D { > > diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h > > index 5e7ff44f3043..664c6bf7b3e0 100644 > > --- a/tools/perf/util/evlist.h > > +++ b/tools/perf/util/evlist.h > > @@ -100,13 +100,6 @@ void evlist__delete(struct evlist *evlist); > > void evlist__add(struct evlist *evlist, struct evsel *entry); > > void evlist__remove(struct evlist *evlist, struct evsel *evsel); > > > > -int __evlist__add_default(struct evlist *evlist, bool precise); > > - > > -static inline int evlist__add_default(struct evlist *evlist) > > -{ > > - return __evlist__add_default(evlist, true); > > -} > > - > > int evlist__add_attrs(struct evlist *evlist, struct perf_event_attr *a= ttrs, size_t nr_attrs); > > > > int __evlist__add_default_attrs(struct evlist *evlist, > > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c > > index 8c8f371ea2b5..1df8f967d2eb 100644 > > --- a/tools/perf/util/evsel.c > > +++ b/tools/perf/util/evsel.c > > @@ -316,48 +316,6 @@ struct evsel *evsel__new_idx(struct perf_event_att= r *attr, int idx) > > return evsel; > > } > > > > -static bool perf_event_can_profile_kernel(void) > > -{ > > - return perf_event_paranoid_check(1); > > -} > > - > > -struct evsel *evsel__new_cycles(bool precise __maybe_unused, __u32 typ= e, __u64 config) > > -{ > > - struct perf_event_attr attr =3D { > > - .type =3D type, > > - .config =3D config, > > - .exclude_kernel =3D !perf_event_can_profile_kernel(), > > - }; > > - struct evsel *evsel; > > - > > - event_attr_init(&attr); > > - > > - /* > > - * Now let the usual logic to set up the perf_event_attr defaults > > - * to kick in when we return and before perf_evsel__open() is cal= led. > > - */ > > - evsel =3D evsel__new(&attr); > > - if (evsel =3D=3D NULL) > > - goto out; > > - > > - arch_evsel__fixup_new_cycles(&evsel->core.attr); > > - > > - evsel->precise_max =3D true; > > - > > - /* use asprintf() because free(evsel) assumes name is allocated *= / > > - if (asprintf(&evsel->name, "cycles%s%s%.*s", > > - (attr.precise_ip || attr.exclude_kernel) ? ":" : "", > > - attr.exclude_kernel ? "u" : "", > > - attr.precise_ip ? attr.precise_ip + 1 : 0, "ppp") < = 0) > > - goto error_free; > > -out: > > - return evsel; > > -error_free: > > - evsel__delete(evsel); > > - evsel =3D NULL; > > - goto out; > > -} > > - > > int copy_config_terms(struct list_head *dst, struct list_head *src) > > { > > struct evsel_config_term *pos, *tmp; > > @@ -1131,10 +1089,6 @@ void __weak arch_evsel__set_sample_weight(struct= evsel *evsel) > > evsel__set_sample_bit(evsel, WEIGHT); > > } > > > > -void __weak arch_evsel__fixup_new_cycles(struct perf_event_attr *attr = __maybe_unused) > > -{ > > -} > > - > > void __weak arch__post_evsel_config(struct evsel *evsel __maybe_unused= , > > struct perf_event_attr *attr __maybe_= unused) > > { > > diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h > > index df8928745fc6..429b172cc94d 100644 > > --- a/tools/perf/util/evsel.h > > +++ b/tools/perf/util/evsel.h > > @@ -243,8 +243,6 @@ static inline struct evsel *evsel__newtp(const char= *sys, const char *name) > > } > > #endif > > > > -struct evsel *evsel__new_cycles(bool precise, __u32 type, __u64 config= ); > > - > > #ifdef HAVE_LIBTRACEEVENT > > struct tep_event *event_format__new(const char *sys, const char *name)= ; > > #endif > > @@ -312,7 +310,6 @@ void __evsel__reset_sample_bit(struct evsel *evsel,= enum perf_event_sample_forma > > void evsel__set_sample_id(struct evsel *evsel, bool use_sample_identif= ier); > > > > void arch_evsel__set_sample_weight(struct evsel *evsel); > > -void arch_evsel__fixup_new_cycles(struct perf_event_attr *attr); > > void arch__post_evsel_config(struct evsel *evsel, struct perf_event_at= tr *attr); > > > > int evsel__set_filter(struct evsel *evsel, const char *filter); > > -- > > 2.41.0.rc0.172.g3f132b7071-goog > > > > -- > > - Arnaldo 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 C8EFEC77B7E for ; Sat, 27 May 2023 05:58:56 +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:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6suXiFqh6hVhL2+UqB9dz9AhP2JHug0NeeHcMPqo5TE=; b=GznHLU/qe5ci4F W7RevT0bVQRuc+81t9UHPXmzfwK3NQnWO1Rc1L8lK+tfBAEXX1qL/h57ptERu6lJUo62QjembAqwC +WZrGn96nDaMaNlRQWhW67GpzLPwNgqUwXi92DhUllCBLTFuwxg+mZUgRpAs/Gz/cs2CuykznC+Yl sJPqFJio0J1rovJ81CrPyc0vkV9qEDDGs6GzthpwH4t5cLLjF/Vp89+FwGB5JsOb2ftanrIXfLiEw NNqjZ2WUIxaLEqbGmz3Pi33MYEVU3/0JAeOeojv/goKXd0i3kis55wAFrgANw1fTqohfg1fq1cneC Bs0A+Mudc6lHbAUnRM+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q2mwe-004z8S-2w; Sat, 27 May 2023 05:58:28 +0000 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2mwb-004z6f-02 for linux-arm-kernel@lists.infradead.org; Sat, 27 May 2023 05:58:27 +0000 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f606e111d3so13895e9.1 for ; Fri, 26 May 2023 22:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685167097; x=1687759097; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=FO/UGkGFNR0JZ32w4keSjzNDju+boE3Juixk0rVaTPg=; b=zjrV9XkDmzk0oBeBSYvZvYdtmOvnr4IIMXuIaajEIKK4GQGBr4Qh9HPOG0ymB862u8 6EXhk5oQgi74Jd+eq8GG7dkXJFAL+j8HZi353w1v+AljXl+z2qsLb1xOM33htRa16uqV d0O46EeSiJ54TZZop48CTq2pD3L2CQcsjJwjJ/OHkY6FYKPM6/sJncx9MG+sCtKUd1bM muSNdF4OHZn3JtcSbqKTPlCDJKDaJ0xNxwaq1tbGqS0bbmFuUHTA85Muue2gxRSw3ZTB 9SpiP3Z+A5Q0J7o3weoi3VgiqWVErCpcLrGCLHPsNkT3i1lY3JCClFTSM72rRjTLgqWG BlQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685167097; x=1687759097; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FO/UGkGFNR0JZ32w4keSjzNDju+boE3Juixk0rVaTPg=; b=C01wJUJ8NgNtj/Fy1E95ZhOeXh1hoaaRpe1/K18xgPJMm2Lh0ar3T3o7OPQepbFTMy jcmW2dx8QHrr7SJwLhuYPwmfTcfkL1OVrYy9RdE6oeR3LN+vDo8sbwvSFfSV9R3MaYYJ /vKzg4+kpgHAtAN6mIVwcBRB3tHV2gKTyTTkd2os/W2xQVxD/WLBYN2kmdSq7PTmCJkP +y4YNNcasCgk9Hr9dJCr/dxnZIaZ57c1P7CCcB0IWN7ccqAWjQvnrSb62nsJ1VYQJLy1 rzrLXDR70mMQuWmuf5L4Po78QcrxzW3YxavyqyEKBetId7iCcQYo6/efGlouqPgccfPI sjpg== X-Gm-Message-State: AC+VfDy7/9zv6dqXPZU8aXFF4vYrV4dYzDbna1ndrnneLkAmcdb7Ibpc vgXNhw6noyYMUV0oEc89aiuk2bvn5d4twfCRRd4G+w== X-Google-Smtp-Source: ACHHUZ7S/5eOdKqV9Jw1XPjO2xR6G/XRxDV5OIZVopVAd7fdwcNwDo9fXEHSAevW7pOPg64tDEsJ1Fqh00h6QGYm/s4= X-Received: by 2002:a05:600c:314c:b0:3f6:f4b:d4a6 with SMTP id h12-20020a05600c314c00b003f60f4bd4a6mr61151wmo.7.1685167097237; Fri, 26 May 2023 22:58:17 -0700 (PDT) MIME-Version: 1.0 References: <20230526215410.2435674-1-irogers@google.com> <20230526215410.2435674-15-irogers@google.com> In-Reply-To: From: Ian Rogers Date: Fri, 26 May 2023 22:58:04 -0700 Message-ID: Subject: Re: [PATCH v4 14/35] perf evlist: Remove __evlist__add_default To: Arnaldo Carvalho de Melo Cc: Suzuki K Poulose , Mike Leach , Leo Yan , John Garry , Will Deacon , James Clark , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kajol Jain , Jing Zhang , Kan Liang , Zhengjun Xing , Ravi Bangoria , Madhavan Srinivasan , Athira Rajeev , Ming Wang , Huacai Chen , Sandipan Das , Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson , Ali Saidi , Rob Herring , Thomas Richter , Kang Minchul , linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230526_225825_056302_71201524 X-CRM114-Status: GOOD ( 33.97 ) 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 T24gRnJpLCBNYXkgMjYsIDIwMjMgYXQgNjo0NeKAr1BNIEFybmFsZG8gQ2FydmFsaG8gZGUgTWVs bwo8YWNtZUBrZXJuZWwub3JnPiB3cm90ZToKPgo+IEVtIEZyaSwgTWF5IDI2LCAyMDIzIGF0IDAy OjUzOjQ5UE0gLTA3MDAsIElhbiBSb2dlcnMgZXNjcmV2ZXU6Cj4gPiBfX2V2bGlzdF9fYWRkX2Rl ZmF1bHQgYWRkcyBhIGN5Y2xlcyBldmVudCB0byBhIHR5cGljYWxseSBlbXB0eSBldmxpc3QKPiA+ IGFuZCB3YXMgZXh0ZW5kZWQgZm9yIGh5YnJpZCB3aXRoIGV2bGlzdF9fYWRkX2RlZmF1bHRfaHli cmlkLCBhcyBtb3JlCj4gPiB0aGFuIDEgUE1VIHdhcyBuZWNlc3NhcnkuIFJhdGhlciB0aGFuIGhh dmUgZGVkaWNhdGVkIGxvZ2ljIGZvciB0aGUKPiA+IGN5Y2xlcyBldmVudCwgdGhpcyBjaGFuZ2Ug c3dpdGNoZXMgdG8gcGFyc2luZyAnY3ljbGVzOlAnIHdoaWNoIHdpbGwKPiA+IGhhbmRsZSB3aWxk Y2FyZGluZyB0aGUgUE1VcyBhcHByb3ByaWF0ZWx5IGZvciBoeWJyaWQuCj4KPiBJIHRoaW5rIEkg cmVwb3J0ZWQgdGhpcyBlYXJsaWVyLCBidXQgYXQgdGhpcyBwb2ludCAncGVyZiB0ZXN0IHB5dGhv bicKPiBicmVha3MsIEkgZml4ZWQgaXQgaW4gdGhlIHRtcC5wZXJmLXRvb2xzLW5leHQ6Cj4KPiAg MTk6ICdpbXBvcnQgcGVyZicgaW4gcHl0aG9uICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA6IEZBSUxFRCEKPiDirKJbYWNtZUB0b29sYm94IHBlcmYtdG9vbHMtbmV4dF0k IGdpdCBsb2cgLS1vbmVsaW5lIC0xCj4gZmU0ZjYyMmM0ZmM3YTAyYSAoSEVBRCkgcGVyZiBldmxp c3Q6IFJlbW92ZSBfX2V2bGlzdF9fYWRkX2RlZmF1bHQKPiDirKJbYWNtZUB0b29sYm94IHBlcmYt dG9vbHMtbmV4dF0kCj4g4qyiW2FjbWVAdG9vbGJveCBwZXJmLXRvb2xzLW5leHRdJCBwZXJmIHRl c3QgLXYgcHl0aG9uCj4gQ291bGRuJ3QgYnVtcCBybGltaXQoTUVNTE9DSyksIGZhaWx1cmVzIG1h eSB0YWtlIHBsYWNlIHdoZW4gY3JlYXRpbmcgQlBGIG1hcHMsIGV0Ywo+ICAxOTogJ2ltcG9ydCBw ZXJmJyBpbiBweXRob24gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDoK PiAtLS0gc3RhcnQgLS0tCj4gdGVzdCBjaGlsZCBmb3JrZWQsIHBpZCAyOTc2NjIxCj4gcHl0aG9u IHVzYWdlIHRlc3Q6ICJlY2hvICJpbXBvcnQgc3lzIDsgc3lzLnBhdGguYXBwZW5kKCcvdG1wL2J1 aWxkL3BlcmYtdG9vbHMtbmV4dC9weXRob24nKTsgaW1wb3J0IHBlcmYiIHwgJy91c3IvYmluL3B5 dGhvbjMnICIKPiBUcmFjZWJhY2sgKG1vc3QgcmVjZW50IGNhbGwgbGFzdCk6Cj4gICBGaWxlICI8 c3RkaW4+IiwgbGluZSAxLCBpbiA8bW9kdWxlPgo+IEltcG9ydEVycm9yOiAvdG1wL2J1aWxkL3Bl cmYtdG9vbHMtbmV4dC9weXRob24vcGVyZi5jcHl0aG9uLTMxMC14ODZfNjQtbGludXgtZ251LnNv OiB1bmRlZmluZWQgc3ltYm9sOiBwYXJzZV9ldmVudAo+IHRlc3QgY2hpbGQgZmluaXNoZWQgd2l0 aCAtMQo+IC0tLS0gZW5kIC0tLS0KPiAnaW1wb3J0IHBlcmYnIGluIHB5dGhvbjogRkFJTEVEIQo+ IOKsolthY21lQHRvb2xib3ggcGVyZi10b29scy1uZXh0XSQKPgo+IFByb2JhYmx5IHRoZXJlIHdp bGwgYmUgYSBmZXcgbW9yZSBjYXNlcyBpbiB0aGUgbmV4dCBwYXRjaGVzLCBwbGVhc2UKPiBjaGVj ay4KCkknbGwgcmViYXNlIGFuZCByZXNlbmQuIEkgbmVlZGVkIHRvIGFkZDoKaHR0cHM6Ly9sb3Jl Lmtlcm5lbC5vcmcvbGttbC8yMDIzMDUyNzA1NTUxNy4yNzExNDg3LTEtaXJvZ2Vyc0Bnb29nbGUu Y29tLwp0byByZXBybyB0aGUgZmFpbHVyZS4gVGhlIHRlc3Qgd2FzIHBhc3Npbmcgd2l0aG91dCBp dC4KClRoYW5rcywKSWFuCgo+IC0gQXJuYWxkbwo+Cj4gPiBTaWduZWQtb2ZmLWJ5OiBJYW4gUm9n ZXJzIDxpcm9nZXJzQGdvb2dsZS5jb20+Cj4gPiBSZXZpZXdlZC1ieTogS2FuIExpYW5nIDxrYW4u bGlhbmdAbGludXguaW50ZWwuY29tPgo+ID4gLS0tCj4gPiAgdG9vbHMvcGVyZi9hcmNoL3g4Ni91 dGlsL2V2c2VsLmMgfCAyMCAtLS0tLS0tLS0tLS0tLQo+ID4gIHRvb2xzL3BlcmYvYnVpbHRpbi1y ZWNvcmQuYyAgICAgIHwgMTMgKysrLS0tLS0tCj4gPiAgdG9vbHMvcGVyZi9idWlsdGluLXRvcC5j ICAgICAgICAgfCAxMCArKysrLS0tCj4gPiAgdG9vbHMvcGVyZi91dGlsL2V2bGlzdC1oeWJyaWQu YyAgfCAyNSAtLS0tLS0tLS0tLS0tLS0tLQo+ID4gIHRvb2xzL3BlcmYvdXRpbC9ldmxpc3QtaHli cmlkLmggIHwgIDEgLQo+ID4gIHRvb2xzL3BlcmYvdXRpbC9ldmxpc3QuYyAgICAgICAgIHwgMjIg KysrKysrLS0tLS0tLS0tCj4gPiAgdG9vbHMvcGVyZi91dGlsL2V2bGlzdC5oICAgICAgICAgfCAg NyAtLS0tLQo+ID4gIHRvb2xzL3BlcmYvdXRpbC9ldnNlbC5jICAgICAgICAgIHwgNDYgLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiA+ICB0b29scy9wZXJmL3V0aWwvZXZzZWwuaCAg ICAgICAgICB8ICAzIC0tLQo+ID4gIDkgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwg MTMwIGRlbGV0aW9ucygtKQo+ID4KPiA+IGRpZmYgLS1naXQgYS90b29scy9wZXJmL2FyY2gveDg2 L3V0aWwvZXZzZWwuYyBiL3Rvb2xzL3BlcmYvYXJjaC94ODYvdXRpbC9ldnNlbC5jCj4gPiBpbmRl eCBlYTM5NzJkNzg1ZDEuLjE1M2NkY2E5NGNkNCAxMDA2NDQKPiA+IC0tLSBhL3Rvb2xzL3BlcmYv YXJjaC94ODYvdXRpbC9ldnNlbC5jCj4gPiArKysgYi90b29scy9wZXJmL2FyY2gveDg2L3V0aWwv ZXZzZWwuYwo+ID4gQEAgLTE2LDI2ICsxNiw2IEBAIHZvaWQgYXJjaF9ldnNlbF9fc2V0X3NhbXBs ZV93ZWlnaHQoc3RydWN0IGV2c2VsICpldnNlbCkKPiA+ICAgICAgIGV2c2VsX19zZXRfc2FtcGxl X2JpdChldnNlbCwgV0VJR0hUX1NUUlVDVCk7Cj4gPiAgfQo+ID4KPiA+IC12b2lkIGFyY2hfZXZz ZWxfX2ZpeHVwX25ld19jeWNsZXMoc3RydWN0IHBlcmZfZXZlbnRfYXR0ciAqYXR0cikKPiA+IC17 Cj4gPiAtICAgICBzdHJ1Y3QgcGVyZl9lbnYgZW52ID0geyAudG90YWxfbWVtID0gMCwgfSA7Cj4g PiAtCj4gPiAtICAgICBpZiAoIXBlcmZfZW52X19jcHVpZCgmZW52KSkKPiA+IC0gICAgICAgICAg ICAgcmV0dXJuOwo+ID4gLQo+ID4gLSAgICAgLyoKPiA+IC0gICAgICAqIE9uIEFNRCwgcHJlY2lz ZSBjeWNsZXMgZXZlbnQgc2FtcGxpbmcgaW50ZXJuYWxseSB1c2VzIElCUyBwbXUuCj4gPiAtICAg ICAgKiBCdXQgSUJTIGRvZXMgbm90IGhhdmUgZmlsdGVyaW5nIGNhcGFiaWxpdGllcyBhbmQgcGVy ZiBieSBkZWZhdWx0Cj4gPiAtICAgICAgKiBzZXRzIGV4Y2x1ZGVfZ3Vlc3QgPSAxLiBUaGlzIG1h a2VzIElCUyBwbXUgZXZlbnQgaW5pdCBmYWlsIGFuZAo+ID4gLSAgICAgICogdGh1cyBwZXJmIGVu ZHMgdXAgZG9pbmcgbm9uLXByZWNpc2Ugc2FtcGxpbmcuIEF2b2lkIGl0IGJ5IGNsZWFyaW5nCj4g PiAtICAgICAgKiBleGNsdWRlX2d1ZXN0Lgo+ID4gLSAgICAgICovCj4gPiAtICAgICBpZiAoZW52 LmNwdWlkICYmIHN0cnN0YXJ0cyhlbnYuY3B1aWQsICJBdXRoZW50aWNBTUQiKSkKPiA+IC0gICAg ICAgICAgICAgYXR0ci0+ZXhjbHVkZV9ndWVzdCA9IDA7Cj4gPiAtCj4gPiAtICAgICBmcmVlKGVu di5jcHVpZCk7Cj4gPiAtfQo+ID4gLQo+ID4gIC8qIENoZWNrIHdoZXRoZXIgdGhlIGV2c2VsJ3Mg UE1VIHN1cHBvcnRzIHRoZSBwZXJmIG1ldHJpY3MgKi8KPiA+ICBib29sIGV2c2VsX19zeXNfaGFz X3BlcmZfbWV0cmljcyhjb25zdCBzdHJ1Y3QgZXZzZWwgKmV2c2VsKQo+ID4gIHsKPiA+IGRpZmYg LS1naXQgYS90b29scy9wZXJmL2J1aWx0aW4tcmVjb3JkLmMgYi90b29scy9wZXJmL2J1aWx0aW4t cmVjb3JkLmMKPiA+IGluZGV4IDg4ZjdiNDI0MTE1My4uZDgwYjU0YTZmNDUwIDEwMDY0NAo+ID4g LS0tIGEvdG9vbHMvcGVyZi9idWlsdGluLXJlY29yZC5jCj4gPiArKysgYi90b29scy9wZXJmL2J1 aWx0aW4tcmVjb3JkLmMKPiA+IEBAIC00MTYxLDE4ICs0MTYxLDExIEBAIGludCBjbWRfcmVjb3Jk KGludCBhcmdjLCBjb25zdCBjaGFyICoqYXJndikKPiA+ICAgICAgICAgICAgICAgcmVjb3JkLm9w dHMudGFpbF9zeW50aGVzaXplID0gdHJ1ZTsKPiA+Cj4gPiAgICAgICBpZiAocmVjLT5ldmxpc3Qt PmNvcmUubnJfZW50cmllcyA9PSAwKSB7Cj4gPiAtICAgICAgICAgICAgIGlmIChwZXJmX3BtdV9f aGFzX2h5YnJpZCgpKSB7Cj4gPiAtICAgICAgICAgICAgICAgICAgICAgZXJyID0gZXZsaXN0X19h ZGRfZGVmYXVsdF9oeWJyaWQocmVjLT5ldmxpc3QsCj4gPiAtICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIXJlY29yZC5vcHRzLm5vX3NhbXBsZXMp Owo+ID4gLSAgICAgICAgICAgICB9IGVsc2Ugewo+ID4gLSAgICAgICAgICAgICAgICAgICAgIGVy ciA9IF9fZXZsaXN0X19hZGRfZGVmYXVsdChyZWMtPmV2bGlzdCwKPiA+IC0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIXJlY29yZC5vcHRzLm5vX3NhbXBs ZXMpOwo+ID4gLSAgICAgICAgICAgICB9Cj4gPiArICAgICAgICAgICAgIGJvb2wgY2FuX3Byb2Zp bGVfa2VybmVsID0gcGVyZl9ldmVudF9wYXJhbm9pZF9jaGVjaygxKTsKPiA+Cj4gPiAtICAgICAg ICAgICAgIGlmIChlcnIgPCAwKSB7Cj4gPiAtICAgICAgICAgICAgICAgICAgICAgcHJfZXJyKCJO b3QgZW5vdWdoIG1lbW9yeSBmb3IgZXZlbnQgc2VsZWN0b3IgbGlzdFxuIik7Cj4gPiArICAgICAg ICAgICAgIGVyciA9IHBhcnNlX2V2ZW50KHJlYy0+ZXZsaXN0LCBjYW5fcHJvZmlsZV9rZXJuZWwg PyAiY3ljbGVzOlAiIDogImN5Y2xlczpQdSIpOwo+ID4gKyAgICAgICAgICAgICBpZiAoZXJyKQo+ ID4gICAgICAgICAgICAgICAgICAgICAgIGdvdG8gb3V0Owo+ID4gLSAgICAgICAgICAgICB9Cj4g PiAgICAgICB9Cj4gPgo+ID4gICAgICAgaWYgKHJlYy0+b3B0cy50YXJnZXQudGlkICYmICFyZWMt Pm9wdHMubm9faW5oZXJpdF9zZXQpCj4gPiBkaWZmIC0tZ2l0IGEvdG9vbHMvcGVyZi9idWlsdGlu LXRvcC5jIGIvdG9vbHMvcGVyZi9idWlsdGluLXRvcC5jCj4gPiBpbmRleCA0OGVlNDllOTVjNWUu LjI3YTdmMDY4MjA3ZCAxMDA2NDQKPiA+IC0tLSBhL3Rvb2xzL3BlcmYvYnVpbHRpbi10b3AuYwo+ ID4gKysrIGIvdG9vbHMvcGVyZi9idWlsdGluLXRvcC5jCj4gPiBAQCAtMTY1MywxMCArMTY1Mywx MiBAQCBpbnQgY21kX3RvcChpbnQgYXJnYywgY29uc3QgY2hhciAqKmFyZ3YpCj4gPiAgICAgICBp ZiAoYW5ub3RhdGVfY2hlY2tfYXJncygmdG9wLmFubm90YXRpb25fb3B0cykgPCAwKQo+ID4gICAg ICAgICAgICAgICBnb3RvIG91dF9kZWxldGVfZXZsaXN0Owo+ID4KPiA+IC0gICAgIGlmICghdG9w LmV2bGlzdC0+Y29yZS5ucl9lbnRyaWVzICYmCj4gPiAtICAgICAgICAgZXZsaXN0X19hZGRfZGVm YXVsdCh0b3AuZXZsaXN0KSA8IDApIHsKPiA+IC0gICAgICAgICAgICAgcHJfZXJyKCJOb3QgZW5v dWdoIG1lbW9yeSBmb3IgZXZlbnQgc2VsZWN0b3IgbGlzdFxuIik7Cj4gPiAtICAgICAgICAgICAg IGdvdG8gb3V0X2RlbGV0ZV9ldmxpc3Q7Cj4gPiArICAgICBpZiAoIXRvcC5ldmxpc3QtPmNvcmUu bnJfZW50cmllcykgewo+ID4gKyAgICAgICAgICAgICBib29sIGNhbl9wcm9maWxlX2tlcm5lbCA9 IHBlcmZfZXZlbnRfcGFyYW5vaWRfY2hlY2soMSk7Cj4gPiArICAgICAgICAgICAgIGludCBlcnIg PSBwYXJzZV9ldmVudCh0b3AuZXZsaXN0LCBjYW5fcHJvZmlsZV9rZXJuZWwgPyAiY3ljbGVzOlAi IDogImN5Y2xlczpQdSIpOwo+ID4gKwo+ID4gKyAgICAgICAgICAgICBpZiAoZXJyKQo+ID4gKyAg ICAgICAgICAgICAgICAgICAgIGdvdG8gb3V0X2RlbGV0ZV9ldmxpc3Q7Cj4gPiAgICAgICB9Cj4g Pgo+ID4gICAgICAgc3RhdHVzID0gZXZzd2l0Y2hfX2luaXQoJnRvcC5ldnN3aXRjaCwgdG9wLmV2 bGlzdCwgc3RkZXJyKTsKPiA+IGRpZmYgLS1naXQgYS90b29scy9wZXJmL3V0aWwvZXZsaXN0LWh5 YnJpZC5jIGIvdG9vbHMvcGVyZi91dGlsL2V2bGlzdC1oeWJyaWQuYwo+ID4gaW5kZXggMGY1OWM4 MGYyN2IyLi42NGY3OGQwNmZlMTkgMTAwNjQ0Cj4gPiAtLS0gYS90b29scy9wZXJmL3V0aWwvZXZs aXN0LWh5YnJpZC5jCj4gPiArKysgYi90b29scy9wZXJmL3V0aWwvZXZsaXN0LWh5YnJpZC5jCj4g PiBAQCAtMTYsMzEgKzE2LDYgQEAKPiA+ICAjaW5jbHVkZSA8cGVyZi9ldnNlbC5oPgo+ID4gICNp bmNsdWRlIDxwZXJmL2NwdW1hcC5oPgo+ID4KPiA+IC1pbnQgZXZsaXN0X19hZGRfZGVmYXVsdF9o eWJyaWQoc3RydWN0IGV2bGlzdCAqZXZsaXN0LCBib29sIHByZWNpc2UpCj4gPiAtewo+ID4gLSAg ICAgc3RydWN0IGV2c2VsICpldnNlbDsKPiA+IC0gICAgIHN0cnVjdCBwZXJmX3BtdSAqcG11Owo+ ID4gLSAgICAgX191NjQgY29uZmlnOwo+ID4gLSAgICAgc3RydWN0IHBlcmZfY3B1X21hcCAqY3B1 czsKPiA+IC0KPiA+IC0gICAgIHBlcmZfcG11X19mb3JfZWFjaF9oeWJyaWRfcG11KHBtdSkgewo+ ID4gLSAgICAgICAgICAgICBjb25maWcgPSBQRVJGX0NPVU5UX0hXX0NQVV9DWUNMRVMgfAo+ID4g LSAgICAgICAgICAgICAgICAgICAgICAoKF9fdTY0KXBtdS0+dHlwZSA8PCBQRVJGX1BNVV9UWVBF X1NISUZUKTsKPiA+IC0gICAgICAgICAgICAgZXZzZWwgPSBldnNlbF9fbmV3X2N5Y2xlcyhwcmVj aXNlLCBQRVJGX1RZUEVfSEFSRFdBUkUsCj4gPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uZmlnKTsKPiA+IC0gICAgICAgICAgICAgaWYgKCFldnNlbCkKPiA+IC0g ICAgICAgICAgICAgICAgICAgICByZXR1cm4gLUVOT01FTTsKPiA+IC0KPiA+IC0gICAgICAgICAg ICAgY3B1cyA9IHBlcmZfY3B1X21hcF9fZ2V0KHBtdS0+Y3B1cyk7Cj4gPiAtICAgICAgICAgICAg IGV2c2VsLT5jb3JlLmNwdXMgPSBjcHVzOwo+ID4gLSAgICAgICAgICAgICBldnNlbC0+Y29yZS5v d25fY3B1cyA9IHBlcmZfY3B1X21hcF9fZ2V0KGNwdXMpOwo+ID4gLSAgICAgICAgICAgICBldnNl bC0+cG11X25hbWUgPSBzdHJkdXAocG11LT5uYW1lKTsKPiA+IC0gICAgICAgICAgICAgZXZsaXN0 X19hZGQoZXZsaXN0LCBldnNlbCk7Cj4gPiAtICAgICB9Cj4gPiAtCj4gPiAtICAgICByZXR1cm4g MDsKPiA+IC19Cj4gPiAtCj4gPiAgYm9vbCBldmxpc3RfX2hhc19oeWJyaWQoc3RydWN0IGV2bGlz dCAqZXZsaXN0KQo+ID4gIHsKPiA+ICAgICAgIHN0cnVjdCBldnNlbCAqZXZzZWw7Cj4gPiBkaWZm IC0tZ2l0IGEvdG9vbHMvcGVyZi91dGlsL2V2bGlzdC1oeWJyaWQuaCBiL3Rvb2xzL3BlcmYvdXRp bC9ldmxpc3QtaHlicmlkLmgKPiA+IGluZGV4IDRiMDAwZWRhNjYyNi4uMGNkZWQ3NmViMzQ0IDEw MDY0NAo+ID4gLS0tIGEvdG9vbHMvcGVyZi91dGlsL2V2bGlzdC1oeWJyaWQuaAo+ID4gKysrIGIv dG9vbHMvcGVyZi91dGlsL2V2bGlzdC1oeWJyaWQuaAo+ID4gQEAgLTcsNyArNyw2IEBACj4gPiAg I2luY2x1ZGUgImV2bGlzdC5oIgo+ID4gICNpbmNsdWRlIDx1bmlzdGQuaD4KPiA+Cj4gPiAtaW50 IGV2bGlzdF9fYWRkX2RlZmF1bHRfaHlicmlkKHN0cnVjdCBldmxpc3QgKmV2bGlzdCwgYm9vbCBw cmVjaXNlKTsKPiA+ICBib29sIGV2bGlzdF9faGFzX2h5YnJpZChzdHJ1Y3QgZXZsaXN0ICpldmxp c3QpOwo+ID4KPiA+ICAjZW5kaWYgLyogX19QRVJGX0VWTElTVF9IWUJSSURfSCAqLwo+ID4gZGlm ZiAtLWdpdCBhL3Rvb2xzL3BlcmYvdXRpbC9ldmxpc3QuYyBiL3Rvb2xzL3BlcmYvdXRpbC9ldmxp c3QuYwo+ID4gaW5kZXggOWRmYTk3NzE5M2IzLi42M2Y4ODIxYTUzOTUgMTAwNjQ0Cj4gPiAtLS0g YS90b29scy9wZXJmL3V0aWwvZXZsaXN0LmMKPiA+ICsrKyBiL3Rvb2xzL3BlcmYvdXRpbC9ldmxp c3QuYwo+ID4gQEAgLTkzLDggKzkzLDE1IEBAIHN0cnVjdCBldmxpc3QgKmV2bGlzdF9fbmV3KHZv aWQpCj4gPiAgc3RydWN0IGV2bGlzdCAqZXZsaXN0X19uZXdfZGVmYXVsdCh2b2lkKQo+ID4gIHsK PiA+ICAgICAgIHN0cnVjdCBldmxpc3QgKmV2bGlzdCA9IGV2bGlzdF9fbmV3KCk7Cj4gPiArICAg ICBib29sIGNhbl9wcm9maWxlX2tlcm5lbDsKPiA+ICsgICAgIGludCBlcnI7Cj4gPiArCj4gPiAr ICAgICBpZiAoIWV2bGlzdCkKPiA+ICsgICAgICAgICAgICAgcmV0dXJuIE5VTEw7Cj4gPgo+ID4g LSAgICAgaWYgKGV2bGlzdCAmJiBldmxpc3RfX2FkZF9kZWZhdWx0KGV2bGlzdCkpIHsKPiA+ICsg ICAgIGNhbl9wcm9maWxlX2tlcm5lbCA9IHBlcmZfZXZlbnRfcGFyYW5vaWRfY2hlY2soMSk7Cj4g PiArICAgICBlcnIgPSBwYXJzZV9ldmVudChldmxpc3QsIGNhbl9wcm9maWxlX2tlcm5lbCA/ICJj eWNsZXM6UCIgOiAiY3ljbGVzOlB1Iik7Cj4gPiArICAgICBpZiAoZXJyKSB7Cj4gPiAgICAgICAg ICAgICAgIGV2bGlzdF9fZGVsZXRlKGV2bGlzdCk7Cj4gPiAgICAgICAgICAgICAgIGV2bGlzdCA9 IE5VTEw7Cj4gPiAgICAgICB9Cj4gPiBAQCAtMjM3LDE5ICsyNDQsNiBAQCBzdGF0aWMgdm9pZCBl dmxpc3RfX3NldF9sZWFkZXIoc3RydWN0IGV2bGlzdCAqZXZsaXN0KQo+ID4gICAgICAgcGVyZl9l dmxpc3RfX3NldF9sZWFkZXIoJmV2bGlzdC0+Y29yZSk7Cj4gPiAgfQo+ID4KPiA+IC1pbnQgX19l dmxpc3RfX2FkZF9kZWZhdWx0KHN0cnVjdCBldmxpc3QgKmV2bGlzdCwgYm9vbCBwcmVjaXNlKQo+ ID4gLXsKPiA+IC0gICAgIHN0cnVjdCBldnNlbCAqZXZzZWw7Cj4gPiAtCj4gPiAtICAgICBldnNl bCA9IGV2c2VsX19uZXdfY3ljbGVzKHByZWNpc2UsIFBFUkZfVFlQRV9IQVJEV0FSRSwKPiA+IC0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUEVSRl9DT1VOVF9IV19DUFVfQ1lDTEVTKTsK PiA+IC0gICAgIGlmIChldnNlbCA9PSBOVUxMKQo+ID4gLSAgICAgICAgICAgICByZXR1cm4gLUVO T01FTTsKPiA+IC0KPiA+IC0gICAgIGV2bGlzdF9fYWRkKGV2bGlzdCwgZXZzZWwpOwo+ID4gLSAg ICAgcmV0dXJuIDA7Cj4gPiAtfQo+ID4gLQo+ID4gIHN0YXRpYyBzdHJ1Y3QgZXZzZWwgKmV2bGlz dF9fZHVtbXlfZXZlbnQoc3RydWN0IGV2bGlzdCAqZXZsaXN0KQo+ID4gIHsKPiA+ICAgICAgIHN0 cnVjdCBwZXJmX2V2ZW50X2F0dHIgYXR0ciA9IHsKPiA+IGRpZmYgLS1naXQgYS90b29scy9wZXJm L3V0aWwvZXZsaXN0LmggYi90b29scy9wZXJmL3V0aWwvZXZsaXN0LmgKPiA+IGluZGV4IDVlN2Zm NDRmMzA0My4uNjY0YzZiZjdiM2UwIDEwMDY0NAo+ID4gLS0tIGEvdG9vbHMvcGVyZi91dGlsL2V2 bGlzdC5oCj4gPiArKysgYi90b29scy9wZXJmL3V0aWwvZXZsaXN0LmgKPiA+IEBAIC0xMDAsMTMg KzEwMCw2IEBAIHZvaWQgZXZsaXN0X19kZWxldGUoc3RydWN0IGV2bGlzdCAqZXZsaXN0KTsKPiA+ ICB2b2lkIGV2bGlzdF9fYWRkKHN0cnVjdCBldmxpc3QgKmV2bGlzdCwgc3RydWN0IGV2c2VsICpl bnRyeSk7Cj4gPiAgdm9pZCBldmxpc3RfX3JlbW92ZShzdHJ1Y3QgZXZsaXN0ICpldmxpc3QsIHN0 cnVjdCBldnNlbCAqZXZzZWwpOwo+ID4KPiA+IC1pbnQgX19ldmxpc3RfX2FkZF9kZWZhdWx0KHN0 cnVjdCBldmxpc3QgKmV2bGlzdCwgYm9vbCBwcmVjaXNlKTsKPiA+IC0KPiA+IC1zdGF0aWMgaW5s aW5lIGludCBldmxpc3RfX2FkZF9kZWZhdWx0KHN0cnVjdCBldmxpc3QgKmV2bGlzdCkKPiA+IC17 Cj4gPiAtICAgICByZXR1cm4gX19ldmxpc3RfX2FkZF9kZWZhdWx0KGV2bGlzdCwgdHJ1ZSk7Cj4g PiAtfQo+ID4gLQo+ID4gIGludCBldmxpc3RfX2FkZF9hdHRycyhzdHJ1Y3QgZXZsaXN0ICpldmxp c3QsIHN0cnVjdCBwZXJmX2V2ZW50X2F0dHIgKmF0dHJzLCBzaXplX3QgbnJfYXR0cnMpOwo+ID4K PiA+ICBpbnQgX19ldmxpc3RfX2FkZF9kZWZhdWx0X2F0dHJzKHN0cnVjdCBldmxpc3QgKmV2bGlz dCwKPiA+IGRpZmYgLS1naXQgYS90b29scy9wZXJmL3V0aWwvZXZzZWwuYyBiL3Rvb2xzL3BlcmYv dXRpbC9ldnNlbC5jCj4gPiBpbmRleCA4YzhmMzcxZWEyYjUuLjFkZjhmOTY3ZDJlYiAxMDA2NDQK PiA+IC0tLSBhL3Rvb2xzL3BlcmYvdXRpbC9ldnNlbC5jCj4gPiArKysgYi90b29scy9wZXJmL3V0 aWwvZXZzZWwuYwo+ID4gQEAgLTMxNiw0OCArMzE2LDYgQEAgc3RydWN0IGV2c2VsICpldnNlbF9f bmV3X2lkeChzdHJ1Y3QgcGVyZl9ldmVudF9hdHRyICphdHRyLCBpbnQgaWR4KQo+ID4gICAgICAg cmV0dXJuIGV2c2VsOwo+ID4gIH0KPiA+Cj4gPiAtc3RhdGljIGJvb2wgcGVyZl9ldmVudF9jYW5f cHJvZmlsZV9rZXJuZWwodm9pZCkKPiA+IC17Cj4gPiAtICAgICByZXR1cm4gcGVyZl9ldmVudF9w YXJhbm9pZF9jaGVjaygxKTsKPiA+IC19Cj4gPiAtCj4gPiAtc3RydWN0IGV2c2VsICpldnNlbF9f bmV3X2N5Y2xlcyhib29sIHByZWNpc2UgX19tYXliZV91bnVzZWQsIF9fdTMyIHR5cGUsIF9fdTY0 IGNvbmZpZykKPiA+IC17Cj4gPiAtICAgICBzdHJ1Y3QgcGVyZl9ldmVudF9hdHRyIGF0dHIgPSB7 Cj4gPiAtICAgICAgICAgICAgIC50eXBlICAgPSB0eXBlLAo+ID4gLSAgICAgICAgICAgICAuY29u ZmlnID0gY29uZmlnLAo+ID4gLSAgICAgICAgICAgICAuZXhjbHVkZV9rZXJuZWwgPSAhcGVyZl9l dmVudF9jYW5fcHJvZmlsZV9rZXJuZWwoKSwKPiA+IC0gICAgIH07Cj4gPiAtICAgICBzdHJ1Y3Qg ZXZzZWwgKmV2c2VsOwo+ID4gLQo+ID4gLSAgICAgZXZlbnRfYXR0cl9pbml0KCZhdHRyKTsKPiA+ IC0KPiA+IC0gICAgIC8qCj4gPiAtICAgICAgKiBOb3cgbGV0IHRoZSB1c3VhbCBsb2dpYyB0byBz ZXQgdXAgdGhlIHBlcmZfZXZlbnRfYXR0ciBkZWZhdWx0cwo+ID4gLSAgICAgICogdG8ga2ljayBp biB3aGVuIHdlIHJldHVybiBhbmQgYmVmb3JlIHBlcmZfZXZzZWxfX29wZW4oKSBpcyBjYWxsZWQu Cj4gPiAtICAgICAgKi8KPiA+IC0gICAgIGV2c2VsID0gZXZzZWxfX25ldygmYXR0cik7Cj4gPiAt ICAgICBpZiAoZXZzZWwgPT0gTlVMTCkKPiA+IC0gICAgICAgICAgICAgZ290byBvdXQ7Cj4gPiAt Cj4gPiAtICAgICBhcmNoX2V2c2VsX19maXh1cF9uZXdfY3ljbGVzKCZldnNlbC0+Y29yZS5hdHRy KTsKPiA+IC0KPiA+IC0gICAgIGV2c2VsLT5wcmVjaXNlX21heCA9IHRydWU7Cj4gPiAtCj4gPiAt ICAgICAvKiB1c2UgYXNwcmludGYoKSBiZWNhdXNlIGZyZWUoZXZzZWwpIGFzc3VtZXMgbmFtZSBp cyBhbGxvY2F0ZWQgKi8KPiA+IC0gICAgIGlmIChhc3ByaW50ZigmZXZzZWwtPm5hbWUsICJjeWNs ZXMlcyVzJS4qcyIsCj4gPiAtICAgICAgICAgICAgICAgICAgKGF0dHIucHJlY2lzZV9pcCB8fCBh dHRyLmV4Y2x1ZGVfa2VybmVsKSA/ICI6IiA6ICIiLAo+ID4gLSAgICAgICAgICAgICAgICAgIGF0 dHIuZXhjbHVkZV9rZXJuZWwgPyAidSIgOiAiIiwKPiA+IC0gICAgICAgICAgICAgICAgICBhdHRy LnByZWNpc2VfaXAgPyBhdHRyLnByZWNpc2VfaXAgKyAxIDogMCwgInBwcCIpIDwgMCkKPiA+IC0g ICAgICAgICAgICAgZ290byBlcnJvcl9mcmVlOwo+ID4gLW91dDoKPiA+IC0gICAgIHJldHVybiBl dnNlbDsKPiA+IC1lcnJvcl9mcmVlOgo+ID4gLSAgICAgZXZzZWxfX2RlbGV0ZShldnNlbCk7Cj4g PiAtICAgICBldnNlbCA9IE5VTEw7Cj4gPiAtICAgICBnb3RvIG91dDsKPiA+IC19Cj4gPiAtCj4g PiAgaW50IGNvcHlfY29uZmlnX3Rlcm1zKHN0cnVjdCBsaXN0X2hlYWQgKmRzdCwgc3RydWN0IGxp c3RfaGVhZCAqc3JjKQo+ID4gIHsKPiA+ICAgICAgIHN0cnVjdCBldnNlbF9jb25maWdfdGVybSAq cG9zLCAqdG1wOwo+ID4gQEAgLTExMzEsMTAgKzEwODksNiBAQCB2b2lkIF9fd2VhayBhcmNoX2V2 c2VsX19zZXRfc2FtcGxlX3dlaWdodChzdHJ1Y3QgZXZzZWwgKmV2c2VsKQo+ID4gICAgICAgZXZz ZWxfX3NldF9zYW1wbGVfYml0KGV2c2VsLCBXRUlHSFQpOwo+ID4gIH0KPiA+Cj4gPiAtdm9pZCBf X3dlYWsgYXJjaF9ldnNlbF9fZml4dXBfbmV3X2N5Y2xlcyhzdHJ1Y3QgcGVyZl9ldmVudF9hdHRy ICphdHRyIF9fbWF5YmVfdW51c2VkKQo+ID4gLXsKPiA+IC19Cj4gPiAtCj4gPiAgdm9pZCBfX3dl YWsgYXJjaF9fcG9zdF9ldnNlbF9jb25maWcoc3RydWN0IGV2c2VsICpldnNlbCBfX21heWJlX3Vu dXNlZCwKPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgcGVyZl9l dmVudF9hdHRyICphdHRyIF9fbWF5YmVfdW51c2VkKQo+ID4gIHsKPiA+IGRpZmYgLS1naXQgYS90 b29scy9wZXJmL3V0aWwvZXZzZWwuaCBiL3Rvb2xzL3BlcmYvdXRpbC9ldnNlbC5oCj4gPiBpbmRl eCBkZjg5Mjg3NDVmYzYuLjQyOWIxNzJjYzk0ZCAxMDA2NDQKPiA+IC0tLSBhL3Rvb2xzL3BlcmYv dXRpbC9ldnNlbC5oCj4gPiArKysgYi90b29scy9wZXJmL3V0aWwvZXZzZWwuaAo+ID4gQEAgLTI0 Myw4ICsyNDMsNiBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBldnNlbCAqZXZzZWxfX25ld3RwKGNv bnN0IGNoYXIgKnN5cywgY29uc3QgY2hhciAqbmFtZSkKPiA+ICB9Cj4gPiAgI2VuZGlmCj4gPgo+ ID4gLXN0cnVjdCBldnNlbCAqZXZzZWxfX25ld19jeWNsZXMoYm9vbCBwcmVjaXNlLCBfX3UzMiB0 eXBlLCBfX3U2NCBjb25maWcpOwo+ID4gLQo+ID4gICNpZmRlZiBIQVZFX0xJQlRSQUNFRVZFTlQK PiA+ICBzdHJ1Y3QgdGVwX2V2ZW50ICpldmVudF9mb3JtYXRfX25ldyhjb25zdCBjaGFyICpzeXMs IGNvbnN0IGNoYXIgKm5hbWUpOwo+ID4gICNlbmRpZgo+ID4gQEAgLTMxMiw3ICszMTAsNiBAQCB2 b2lkIF9fZXZzZWxfX3Jlc2V0X3NhbXBsZV9iaXQoc3RydWN0IGV2c2VsICpldnNlbCwgZW51bSBw ZXJmX2V2ZW50X3NhbXBsZV9mb3JtYQo+ID4gIHZvaWQgZXZzZWxfX3NldF9zYW1wbGVfaWQoc3Ry dWN0IGV2c2VsICpldnNlbCwgYm9vbCB1c2Vfc2FtcGxlX2lkZW50aWZpZXIpOwo+ID4KPiA+ICB2 b2lkIGFyY2hfZXZzZWxfX3NldF9zYW1wbGVfd2VpZ2h0KHN0cnVjdCBldnNlbCAqZXZzZWwpOwo+ ID4gLXZvaWQgYXJjaF9ldnNlbF9fZml4dXBfbmV3X2N5Y2xlcyhzdHJ1Y3QgcGVyZl9ldmVudF9h dHRyICphdHRyKTsKPiA+ICB2b2lkIGFyY2hfX3Bvc3RfZXZzZWxfY29uZmlnKHN0cnVjdCBldnNl bCAqZXZzZWwsIHN0cnVjdCBwZXJmX2V2ZW50X2F0dHIgKmF0dHIpOwo+ID4KPiA+ICBpbnQgZXZz ZWxfX3NldF9maWx0ZXIoc3RydWN0IGV2c2VsICpldnNlbCwgY29uc3QgY2hhciAqZmlsdGVyKTsK PiA+IC0tCj4gPiAyLjQxLjAucmMwLjE3Mi5nM2YxMzJiNzA3MS1nb29nCj4gPgo+Cj4gLS0KPgo+ IC0gQXJuYWxkbwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5p bmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8v bGludXgtYXJtLWtlcm5lbAo=