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 A486DC46CA1 for ; Sat, 16 Sep 2023 12:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239330AbjIPM2G (ORCPT ); Sat, 16 Sep 2023 08:28:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239334AbjIPM15 (ORCPT ); Sat, 16 Sep 2023 08:27:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61CFDCEF for ; Sat, 16 Sep 2023 05:27:52 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A89CEC433C7; Sat, 16 Sep 2023 12:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694867272; bh=/EiuX4jasXzgT2XYCfwpVsJvltGY6AsMXV2nli9F2Xg=; h=Subject:To:Cc:From:Date:From; b=OTYgJURZ3Kl+rxboDW2+0tJ70ovz/5GocjNwPBEcgfFaS9cmLOEmILM836Ch/zeVO ArU9zNMen7JQx3WkhefAi5rco6bpcx/vxGuFmLTMcLTMovXVJCEbkOJTgKEKu1zNhp CgznoCTGd0EWRPqexB40fJddJlxnoynjVCagZkW8= Subject: FAILED: patch "[PATCH] perf build: Include generated header files properly" failed to apply to 5.10-stable tree To: namhyung@kernel.org, acme@redhat.com, adrian.hunter@intel.com, ak@linux.intel.com, anupnewsmail@gmail.com, irogers@google.com, jolsa@kernel.org, mingo@kernel.org, peterz@infradead.org Cc: From: Date: Sat, 16 Sep 2023 14:27:45 +0200 Message-ID: <2023091645-chubby-mountable-3c2d@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x c7e97f215a4ad634b746804679f5937d25f77e29 # git commit -s git send-email --to '' --in-reply-to '2023091645-chubby-mountable-3c2d@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: c7e97f215a4a ("perf build: Include generated header files properly") 3d88aec0d42e ("perf pmu: Make parser reentrant") e293a5e816c0 ("perf pmu: Use relative path for sysfs scan") eec1131091c8 ("perf pmu: Add perf_pmu__destroy() function") 990a71e904f6 ("perf bpf filter: Introduce basic BPF filter expression") 16cad1d3597d ("perf lock contention: Use lock_stat_find{,new}") 492fef218a66 ("perf lock contention: Factor out lock_contention_get_name()") d50a79cd0f39 ("perf pmu: Use perf_pmu__open_file() and perf_pmu__scan_file()") f8ad6018ce3c ("perf pmu: Remove duplication around EVENT_SOURCE_DEVICE_PATH") acef233b7ca7 ("perf pmu: Add #slots literal support for arm64") 688d2e8de231 ("perf lock contention: Add -l/--lock-addr option") eca949b2b4ad ("perf lock contention: Implement -t/--threads option for BPF") fd507d3e359c ("perf lock contention: Add lock_data.h for common data") 378ef0f5d9d7 ("perf build: Use libtraceevent from the system") 616aa32d6f22 ("perf build: Fixes for LIBTRACEEVENT_DYNAMIC") cc2367eebb0c ("machine: Adopt is_lock_function() from builtin-lock.c") 336b92da1aa4 ("perf tool: Move pmus list variable to a new file") a3720e969c6d ("perf build: Fix LIBTRACEEVENT_DYNAMIC") 746bd29e348f ("perf build: Use tools/lib headers from install path") bd560973c5d3 ("perf expr: Tidy hashmap dependency") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c7e97f215a4ad634b746804679f5937d25f77e29 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Thu, 27 Jul 2023 19:24:47 -0700 Subject: [PATCH] perf build: Include generated header files properly The flex and bison generate header files from the source. When user specified a build directory with O= option, it'd generate files under the directory. The build command has -I option to specify the header include directory. But the -I option only affects the files included like <...>. Let's change the flex and bison headers to use it instead of "...". Fixes: 80eeb67fe577aa76 ("perf jevents: Program to convert JSON file") Signed-off-by: Namhyung Kim Cc: Adrian Hunter Cc: Andi Kleen Cc: Anup Sharma Cc: Ian Rogers Cc: Ingo Molnar Cc: Jiri Olsa Cc: Peter Zijlstra Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20230728022447.1323563-2-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index 08ec9aa583e7..8cd561aa606a 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -1000,7 +1000,7 @@ such as "arm/cortex-a34".''', _args = ap.parse_args() _args.output_file.write(""" -#include "pmu-events/pmu-events.h" +#include #include "util/header.h" #include "util/pmu.h" #include diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c index 0b30688d78a7..47f01df658d9 100644 --- a/tools/perf/util/bpf-filter.c +++ b/tools/perf/util/bpf-filter.c @@ -9,8 +9,8 @@ #include "util/evsel.h" #include "util/bpf-filter.h" -#include "util/bpf-filter-flex.h" -#include "util/bpf-filter-bison.h" +#include +#include #include "bpf_skel/sample-filter.h" #include "bpf_skel/sample_filter.skel.h" diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 4814262e3805..7410a165f68b 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -10,8 +10,8 @@ #include "debug.h" #include "evlist.h" #include "expr.h" -#include "expr-bison.h" -#include "expr-flex.h" +#include +#include #include "util/hashmap.h" #include "smt.h" #include "tsc.h" diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index ac315e1be2bc..acddb2542b1a 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -18,8 +18,8 @@ #include "debug.h" #include #include -#include "parse-events-bison.h" -#include "parse-events-flex.h" +#include +#include #include "pmu.h" #include "pmus.h" #include "asm/bug.h" diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 7f984a7f16ca..b6654b9f55d2 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -19,8 +19,8 @@ #include "evsel.h" #include "pmu.h" #include "pmus.h" -#include "pmu-bison.h" -#include "pmu-flex.h" +#include +#include #include "parse-events.h" #include "print-events.h" #include "header.h"