From patchwork Fri Jun 9 04:32:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13273223 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 92DED15AC for ; Fri, 9 Jun 2023 04:32:50 +0000 (UTC) Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E770730F1 for ; Thu, 8 Jun 2023 21:32:48 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba8cf175f5bso5496780276.0 for ; Thu, 08 Jun 2023 21:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686285168; x=1688877168; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=K6oRCwXAzzSsLjoJyJ6r/zwtsDdAY1vGn92p8AsarWw=; b=d3Ee3fZGjYLP9WKSxWYiUnxOI87dxEFHLN/O93FklZhWhUuqFJopThs5OZFaLkIT3S 1bqM0b3JeAPs9mkYlvvsfcfS0lSoEFKdnMraKt1V1MlcyKjCpTknWMSOJ/JVVKQYx7w1 j+AusEe4RTPVjaW9M3g8WiuGVqNFOnDOMefH0Masn3q36p1LqU4GJ137K7JLU0lfvlpL hkdaYSwiYoot+doO26no9dfhijb6eAAVq5/QQ7RTQACaCrVIWhiF05SXiz7RJlA3VRQ9 ArULx0sp6irqsg1xvqc4ySH1XJNxvpjY3nfPdcTXLf5wdGVW0kiYwquQiGfAQQniL04Z MPqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686285168; x=1688877168; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=K6oRCwXAzzSsLjoJyJ6r/zwtsDdAY1vGn92p8AsarWw=; b=bTF97Lak2uF2ZR9tqtlJ3NhBRKmxRxp9973ljQ75zX5qYs+FJCjimZ1Hmm7EOB+SKg QyFGtklAHavBwCGybReSwajQt5P+W84DOA9G/EwXILYf/QaXBFi1zYx+d1bs934bK9so vKlIw+ACI6g1WDMEK0AOTQ2jP7C7qC5rnuGyt/4wAJcIM68llTEIaUdYJHeBqTsC0nGc A1kx6yauvFThCI4gL9A5e72chgBVqFc6864BcmIvA76SjkGP6H6EHUAPrv6giX+DnUPI OMNDUc8kXe0KThtvp44TdFbLmXvYgGxna2jCqUN6SmxXeUhTkHLBgk+mQUJJiSSHWrNr yjXg== X-Gm-Message-State: AC+VfDzBy2ySxEdmKCVb5kZUJGRKeQWYMHMivyVUj57dQnl+dK8FBUkV 3XeqaWWTbQH8gLR9zA5yqr24PVKLzt76 X-Google-Smtp-Source: ACHHUZ7NpFHAyW1Yt9it4EMsBQDl+J1uSYI5e37+q8nQ0EnzyyQgQaKSAChKKHuTCQ4Ny3F0KwVBh4s9CI0/ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c3e5:ebc6:61e5:c73f]) (user=irogers job=sendgmr) by 2002:a25:8c07:0:b0:bad:2b06:da3 with SMTP id k7-20020a258c07000000b00bad2b060da3mr860012ybl.3.1686285168206; Thu, 08 Jun 2023 21:32:48 -0700 (PDT) Date: Thu, 8 Jun 2023 21:32:37 -0700 In-Reply-To: <20230609043240.43890-1-irogers@google.com> Message-Id: <20230609043240.43890-2-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230609043240.43890-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Subject: [PATCH v3 1/4] perf build: Add ability to build with a generated vmlinux.h From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , James Clark , Tiezhu Yang , Yang Jihong , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: Andrii Nakryiko X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Commit a887466562b4 ("perf bpf skels: Stop using vmlinux.h generated from BTF, use subset of used structs + CO-RE") made it so that vmlinux.h was uncondtionally included from tools/perf/util/vmlinux.h. This change reverts part of that change (so that vmlinux.h is once again generated) and makes it so that the vmlinux.h used at build time is selected from the VMLINUX_H variable. By default the VMLINUX_H variable is set to the vmlinux.h added in change a887466562b4, but if GEN_VMLINUX_H=1 is passed on the build command line then the previous generation behavior kicks in. The build with GEN_VMLINUX_H=1 currently fails with: ``` util/bpf_skel/lock_contention.bpf.c:419:8: error: redefinition of 'rq' struct rq {}; ^ /tmp/perf/util/bpf_skel/.tmp/../vmlinux.h:45630:8: note: previous definition is here struct rq { ^ 1 error generated. ``` Signed-off-by: Ian Rogers Acked-by: Andrii Nakryiko --- tools/perf/Makefile.config | 4 ++++ tools/perf/Makefile.perf | 16 +++++++++++++++- tools/perf/util/bpf_skel/.gitignore | 1 + tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h | 0 4 files changed, 20 insertions(+), 1 deletion(-) rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (100%) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index a794d9eca93d..08d4e7eaa721 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -680,6 +680,10 @@ ifdef BUILD_BPF_SKEL CFLAGS += -DHAVE_BPF_SKEL endif +ifndef GEN_VMLINUX_H + VMLINUX_H=$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h +endif + dwarf-post-unwind := 1 dwarf-post-unwind-text := BUG diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index f48794816d82..f1840af195c0 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -1080,7 +1080,21 @@ $(BPFTOOL): | $(SKEL_TMP_OUT) $(Q)CFLAGS= $(MAKE) -C ../bpf/bpftool \ OUTPUT=$(SKEL_TMP_OUT)/ bootstrap -$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) | $(SKEL_TMP_OUT) +VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \ + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ + ../../vmlinux \ + /sys/kernel/btf/vmlinux \ + /boot/vmlinux-$(shell uname -r) +VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) + +$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) +ifeq ($(VMLINUX_H),) + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ +else + $(Q)cp "$(VMLINUX_H)" $@ +endif + +$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) $(SKEL_OUT)/vmlinux.h | $(SKEL_TMP_OUT) $(QUIET_CLANG)$(CLANG) -g -O2 -target bpf -Wall -Werror $(BPF_INCLUDE) $(TOOLS_UAPI_INCLUDE) \ -c $(filter util/bpf_skel/%.bpf.c,$^) -o $@ diff --git a/tools/perf/util/bpf_skel/.gitignore b/tools/perf/util/bpf_skel/.gitignore index 7a1c832825de..cd01455e1b53 100644 --- a/tools/perf/util/bpf_skel/.gitignore +++ b/tools/perf/util/bpf_skel/.gitignore @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only .tmp *.skel.h +vmlinux.h diff --git a/tools/perf/util/bpf_skel/vmlinux.h b/tools/perf/util/bpf_skel/vmlinux/vmlinux.h similarity index 100% rename from tools/perf/util/bpf_skel/vmlinux.h rename to tools/perf/util/bpf_skel/vmlinux/vmlinux.h From patchwork Fri Jun 9 04:32:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13273224 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 4A2FB15AC for ; Fri, 9 Jun 2023 04:32:53 +0000 (UTC) Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A51230E5 for ; Thu, 8 Jun 2023 21:32:51 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-bb397723627so1725478276.1 for ; Thu, 08 Jun 2023 21:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686285170; x=1688877170; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=CDlEfBbym2UKOdEUfGTXbXJzggygNVLpeRONZtrZ238=; b=Pg+v1RbQTeV1POXuMbh477bKylMdkWdHTGsodk4EDgoVrGTXB+9d1pkhl9ukNceJmA FksFheCI47sJraF7JPBk9V8uBY7xCCbVkNAl7rhr5C8D0/lnathSsti96EREsm9cppsb pj6eUxHTL0jvRSwzbzCwkCxeP7RB+lUn1J6iowaRI2p2Llu1JbVSjeuw2N0Uvglz/KOv Nq+5hDen91mprjzq+aDBmSVSgotOvMugb5b3r1itTJiZHp96ujZGFGSluiZXF488Swfk i4p/SITRNaZ3HHhn7cgGGI10j2A6YH7SdU6kd8kTbGqh9FZw4rYcIW+nF7DcYebAMp2E 69jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686285170; x=1688877170; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CDlEfBbym2UKOdEUfGTXbXJzggygNVLpeRONZtrZ238=; b=MZuNytgzFDPIhVYcX9WNiWjawgNjVQ8c30F2T1wCQmSqlefH33KGoAPa4g9lws4E2Q rai8lMGKNVc/RDyQwqMvzzdR5NFhXx4hdTLyrid9fwbHZxR0OhI3N/iOtHXb/xFtKA+g xe33c5sZkaMwOTuzFcWTu/BV9gapa+6CVvHBH+2SYBL1/wiiCbHMGHEw50NCDWzSUKnQ PBcnUct1ypDoFlKaHD4LA8BixZH79w/yow0tKR1ykuJwJSi8hwhHp8g4qeYkFS9V5mSG bgMNfamxqvVxy6zj8lYeyoWDh06LWJVbtT46T0GinykKrLmd7QBPICLhVgXXGeLYP873 NL8w== X-Gm-Message-State: AC+VfDwMifPUflZHbWOEIEH1ZaNV90AZXw1Czc/WfargBx9urdQR4gdD 5xA5gBS3LE6VAjLmyEQf3QeLz1bJ0ltQ X-Google-Smtp-Source: ACHHUZ4uF6M9FeGQA6l0x9G2cxJ5uV2EoAKqpKuH9AtgS+wd2HjYaLsgrqwd5uVhIWH+AKWyfwyfocyOJGkH X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c3e5:ebc6:61e5:c73f]) (user=irogers job=sendgmr) by 2002:a25:fc24:0:b0:ba8:6148:4300 with SMTP id v36-20020a25fc24000000b00ba861484300mr65057ybd.6.1686285170622; Thu, 08 Jun 2023 21:32:50 -0700 (PDT) Date: Thu, 8 Jun 2023 21:32:38 -0700 In-Reply-To: <20230609043240.43890-1-irogers@google.com> Message-Id: <20230609043240.43890-3-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230609043240.43890-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Subject: [PATCH v3 2/4] perf bpf: Move the declaration of struct rq From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , James Clark , Tiezhu Yang , Yang Jihong , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: Andrii Nakryiko X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net struct rq is defined in vmlinux.h when the vmlinux.h is generated, this causes a redefinition failure if it is declared in lock_contention.bpf.c. Move the definition to vmlinux.h for consistency with the generated version. Fixes: 760ebc45746b ("perf lock contention: Add empty 'struct rq' to satisfy libbpf 'runqueue' type verification") Signed-off-by: Ian Rogers Acked-by: Andrii Nakryiko --- tools/perf/util/bpf_skel/lock_contention.bpf.c | 2 -- tools/perf/util/bpf_skel/vmlinux/vmlinux.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/util/bpf_skel/lock_contention.bpf.c index 1d48226ae75d..8d3cfbb3cc65 100644 --- a/tools/perf/util/bpf_skel/lock_contention.bpf.c +++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c @@ -416,8 +416,6 @@ int contention_end(u64 *ctx) return 0; } -struct rq {}; - extern struct rq runqueues __ksym; struct rq___old { diff --git a/tools/perf/util/bpf_skel/vmlinux/vmlinux.h b/tools/perf/util/bpf_skel/vmlinux/vmlinux.h index c7ed51b0c1ef..ab84a6e1da5e 100644 --- a/tools/perf/util/bpf_skel/vmlinux/vmlinux.h +++ b/tools/perf/util/bpf_skel/vmlinux/vmlinux.h @@ -171,4 +171,14 @@ struct bpf_perf_event_data_kern { struct perf_sample_data *data; struct perf_event *event; } __attribute__((preserve_access_index)); + +/* + * If 'struct rq' isn't defined for lock_contention.bpf.c, for the sake of + * rq___old and rq___new, then the type for the 'runqueue' variable ends up + * being a forward declaration (BTF_KIND_FWD) while the kernel has it defined + * (BTF_KIND_STRUCT). The definition appears in vmlinux.h rather than + * lock_contention.bpf.c for consistency with a generated vmlinux.h. + */ +struct rq {}; + #endif // __VMLINUX_H From patchwork Fri Jun 9 04:32:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13273225 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 7C1DC15AC for ; Fri, 9 Jun 2023 04:32:55 +0000 (UTC) Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFEAF30E5 for ; Thu, 8 Jun 2023 21:32:53 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5692be06cb2so17728967b3.1 for ; Thu, 08 Jun 2023 21:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686285173; x=1688877173; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eip+GKzgi+H+UisiUsEsMTegbA5w4/cyYD2LTNMLb1c=; b=DJBFhRCz579eISTrwAKv+a4Sa4rt7TRv99gGYmUFbbDFN56KBekmWQj07fqgH7OGmb i5Ht2/fOJZ5U/vdJedjrHdwBv06oebCd+wVsn5/qYpyhBDJWOy4NqmSbeUcaJFWmxocT XwHrpUMLZ+BnN2JshnuB93vp2qOGo4yFS1TQkJhCdlVAqOlHk/Y+CD+ROWxaDfBCtWwS 1Kc6GAmU0q/Lfy6qaQzikMpAdYlzOo6b+/fjSd0UbYhFoo3uvb9WcqrAo+oqd+EtfmOl 1Vmf+yNRmR9CzDBhsuKNqNLjwQ3ycx+BcGXLAphN9wMOCcs+USVzwLzXc+i2rro6niJ5 zgVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686285173; x=1688877173; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eip+GKzgi+H+UisiUsEsMTegbA5w4/cyYD2LTNMLb1c=; b=ECLzMlVcmweUN7a86ibB1HcQuIW/NxzWwXG43s/2xr++CBuueftShKsU5N0h61ydDP GyWmYniJvgGZyLY8S0qMqhpxMUM7eUUpJT7GFfl63v2AD8TufGyEywo0M5yPWaKE9GDb D+6jgfnTpatdYlz0Ahhx0CuBSCyFLwNEvLT26ZoH9xNne18+sIwz+nvUYdosLOgDZfFi vTjT7waARRsQp+TQl52FwGTM/f9wvO/wOEY+cLRuAVkdKXTO+M2gN/xxDqZG7UJiw9PX aQX7YizKYk/wLMgx8aI4VJxHyfB6bQkmFmr+Ab/dYVaTuzF+yCCrsFIgvXH352VpRwDb O6Gw== X-Gm-Message-State: AC+VfDxnNSUgbqItAuZI8f1NBakOtu0GW3XH1MI8n80QvgF00WOEhLwI rDSFaJ1dfUGn1geWeNB8Ebvq6d0Eu6dG X-Google-Smtp-Source: ACHHUZ7tu13JlWNPkPP1onH/w35dv0gMnF/OAMoeeHS8gt2OBtOOuDzW1wv9x6GnuTMhwVkeKtqW3KZ0Vk7T X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c3e5:ebc6:61e5:c73f]) (user=irogers job=sendgmr) by 2002:a05:6902:4e5:b0:bac:f387:735b with SMTP id w5-20020a05690204e500b00bacf387735bmr60622ybs.13.1686285173182; Thu, 08 Jun 2023 21:32:53 -0700 (PDT) Date: Thu, 8 Jun 2023 21:32:39 -0700 In-Reply-To: <20230609043240.43890-1-irogers@google.com> Message-Id: <20230609043240.43890-4-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230609043240.43890-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Subject: [PATCH v3 3/4] perf test: Add build tests for BUILD_BPF_SKEL From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , James Clark , Tiezhu Yang , Yang Jihong , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: Andrii Nakryiko X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Add tests with and without generating vmlinux.h. Signed-off-by: Ian Rogers Acked-by: Andrii Nakryiko --- tools/perf/tests/make | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 8dd3f8090352..775f374d9345 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -69,6 +69,8 @@ make_clean_all := clean all make_python_perf_so := $(python_perf_so) make_debug := DEBUG=1 make_nondistro := BUILD_NONDISTRO=1 +make_bpf_skel := BUILD_BPF_SKEL=1 +make_gen_vmlinux_h := BUILD_BPF_SKEL=1 GEN_VMLINUX_H=1 make_no_libperl := NO_LIBPERL=1 make_no_libpython := NO_LIBPYTHON=1 make_no_scripts := NO_LIBPYTHON=1 NO_LIBPERL=1 @@ -136,6 +138,8 @@ endif run += make_python_perf_so run += make_debug run += make_nondistro +run += make_build_bpf_skel +run += make_gen_vmlinux_h run += make_no_libperl run += make_no_libpython run += make_no_scripts From patchwork Fri Jun 9 04:32:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13273226 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 F2F81A2D for ; Fri, 9 Jun 2023 04:32:58 +0000 (UTC) Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC8DF30F6 for ; Thu, 8 Jun 2023 21:32:56 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5655d99da53so30888537b3.0 for ; Thu, 08 Jun 2023 21:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686285175; x=1688877175; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=ASHCbqrtMwwghLa6ldqtFIr9DVtYxGlsru2IeiO0chg=; b=zI3WfmrJTWofT6Q5ncQ6jKrXFR1E3mo9Hit36AdOzyBeM6PnVVNbAQ0WNi65k/+zcA pR2aXpJwJaskgwdpY+kRv/hyUfkVL91tivrmkolRVBjmQdoGjBGJK8oZSBVLsoqMge2S m/lWXRXuPDMh/9dfkqwUN7EO5npxmr1P+sWYJUgYfC7vyvYirx7VbhA7HDJw1f+GYZ1K URTRPQTOWSQMbs0l9jWvaD1fHKYrDJLDjBvCQUkYBykXnnQniZAFVt+rref9n3kl/MF0 jAgELj+szWLc9gT7BHTUJeXYu9loowgmmr1rSX6Hfxtz8VUyMus1WO5K8VcaKT/GzcZQ nf8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686285175; x=1688877175; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ASHCbqrtMwwghLa6ldqtFIr9DVtYxGlsru2IeiO0chg=; b=Xb3Abm3UQ8pqx+Dhl6T6nlNDjlq/U4FO1h4IcXdrV5mFJgpTYeko0hKBlB2luOa/+y QZ/3MEOXjMY3BKSvPn1MvyZW3oa+TvgNveAye5B3uudjE0IRrhb+UPijbktI0S1NUJ00 DczTflJJoVNZO+YYzNjCiLmQts6Yf+QViAdJQGtZ8hCNbKe08UQMsOsnbCp7ZJVbCT5T x1qoQKrGw4otJ20j7zW130XtaNRCICPBjQNW+e+cWpxQFf85641sciFAy4MrvbU2kTFg fC3UiSz/rNMwPPS6SMAFfyVJ0Y47IqERlZYb5Gmo9Pobibg78JQiH87UxSFCkdepXBKn 4IDg== X-Gm-Message-State: AC+VfDytdsqzA+0OOotYbAMOaCv7fHm3XJ12bhiZwrsrUnzpZ1ixuKT1 tS2HtDx8lg49pukF3HpeOO7dRSgOc8Yt X-Google-Smtp-Source: ACHHUZ4iB6nP+HsqtQdFaFGqIVReKInr9ZAzZ0P6gBKiMmd7L9cSwiggbWzNxk1AoADQfIFADF2Se2xAo5yp X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c3e5:ebc6:61e5:c73f]) (user=irogers job=sendgmr) by 2002:a81:ae59:0:b0:557:616:7d63 with SMTP id g25-20020a81ae59000000b0055706167d63mr538367ywk.1.1686285175731; Thu, 08 Jun 2023 21:32:55 -0700 (PDT) Date: Thu, 8 Jun 2023 21:32:40 -0700 In-Reply-To: <20230609043240.43890-1-irogers@google.com> Message-Id: <20230609043240.43890-5-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230609043240.43890-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Subject: [PATCH v3 4/4] perf build: Filter out BTF sources without a .BTF section From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , James Clark , Tiezhu Yang , Yang Jihong , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net If generating vmlinux.h, make the code to generate it more tolerant by filtering out paths to kernels that lack a .BTF section. Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index f1840af195c0..e440793fc6ca 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -193,6 +193,7 @@ FLEX ?= flex BISON ?= bison STRIP = strip AWK = awk +READELF ?= readelf # include Makefile.config by default and rule out # non-config cases @@ -1080,12 +1081,34 @@ $(BPFTOOL): | $(SKEL_TMP_OUT) $(Q)CFLAGS= $(MAKE) -C ../bpf/bpftool \ OUTPUT=$(SKEL_TMP_OUT)/ bootstrap -VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \ +# Paths to search for a kernel to generate vmlinux.h from. +VMLINUX_BTF_ELF_PATHS ?= $(if $(O),$(O)/vmlinux) \ $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ ../../vmlinux \ - /sys/kernel/btf/vmlinux \ /boot/vmlinux-$(shell uname -r) -VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) + +# Paths to BTF information. +VMLINUX_BTF_BTF_PATHS ?= /sys/kernel/btf/vmlinux + +# Filter out kernels that don't exist or without a BTF section. +VMLINUX_BTF_ELF_ABSPATHS ?= $(abspath $(wildcard $(VMLINUX_BTF_ELF_PATHS))) +VMLINUX_BTF_PATHS ?= $(shell for file in $(VMLINUX_BTF_ELF_ABSPATHS); \ + do \ + if [ -f $$file ] && ($(READELF) -S "$$file" | grep -q .BTF); \ + then \ + echo "$$file"; \ + fi; \ + done) \ + $(wildcard $(VMLINUX_BTF_BTF_PATHS)) + +# Select the first as the source of vmlinux.h. +VMLINUX_BTF ?= $(firstword $(VMLINUX_BTF_PATHS)) + +ifeq ($(VMLINUX_H),) + ifeq ($(VMLINUX_BTF),) + $(error Missing bpftool input for generating vmlinux.h) + endif +endif $(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) ifeq ($(VMLINUX_H),)