From patchwork Mon Jun 5 20:27:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13268035 X-Patchwork-Delegate: bpf@iogearbox.net 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 78C761118D for ; Mon, 5 Jun 2023 20:28:17 +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 060CDEC for ; Mon, 5 Jun 2023 13:28:16 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-bad475920a8so14208361276.1 for ; Mon, 05 Jun 2023 13:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685996895; x=1688588895; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=hLjmrLz/hP83JFzqDViYQdWWK3BpFSisxk7JtaBYtgg=; b=JHcO2nxCY2NmHNHp9sTdROmKWR1yNZtWwu+HuzoIiIxKt+rIf3XD/ppPXvvTVddP9c YTAvGVjQaHXu/HPhqavbA4wROH/ilyQO0nSTVoNl0qvdKR6Ma6pEHhfHLJE6vl802xrb Sq0Nywm+xWoK0daLtzTU+LujMtdTSDnqtK/6mVceapvhF44yEPovNeDJl8ihmTqvkU12 yjnLYnywjjfov4E+eFG0xjnfzWx2VJqr255zwq71Iv61hl9DEKfenKkW6nZ9QGVtmu9+ uTEynVv4SjIOW1pILgMPp65Le858DcvSmINsnpJKvFP2tnk9RJOl5Cc30DiLWkBEomm8 f6tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685996895; x=1688588895; 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=hLjmrLz/hP83JFzqDViYQdWWK3BpFSisxk7JtaBYtgg=; b=BSiRze3sX+a4Z9OIiKg2wXCkszV/clGNZRdpLbtAklS8PgHgJT/rnfk5TVE8SCHm/L WeFxOYv9kWO9EnUnsBDsZg3h3aIz8JexJ6dtY6JtI3d1TwH9SMwS0ewG0djKoUbQYCZY HONrU7P1Bzvoxlvv3gxFG6hvWVzGdIwWeAboTLF13FO0nknPrJOj/VwJW3F6R+R2Dx4Q fGrVfUJpIS6lyxNlloX7dSfDpMpAlkdsFJxUS6FDuAB1EYmix0F66iUK6GXMayU783ep 4lpbjzwG1Z8YeGtHWdluraw3kly1ibidYglWatBGyYhWr0aRI05YnIihYhdKX7TEEzqq kdRg== X-Gm-Message-State: AC+VfDxQdHAyxjQqPaLCExH3WOb83gfKwdmGGtI3nZ5/EBaPhYQcEUve lfh7I4fWqayVvnXELvCy8tVs2JpS3qIW X-Google-Smtp-Source: ACHHUZ5PZa7BZYmMZzeOqH54Srg4/kt01xsgYTP9dOMIjyql6sSCb+sB1HON6zg2g6KNg0/5AxMS70NaMXQT X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bed9:39b9:3df1:2828]) (user=irogers job=sendgmr) by 2002:a25:b7ce:0:b0:bb1:569c:f381 with SMTP id u14-20020a25b7ce000000b00bb1569cf381mr88075ybj.1.1685996895273; Mon, 05 Jun 2023 13:28:15 -0700 (PDT) Date: Mon, 5 Jun 2023 13:27:09 -0700 In-Reply-To: <20230605202712.1690876-1-irogers@google.com> Message-Id: <20230605202712.1690876-2-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230605202712.1690876-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v2 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 Mon Jun 5 20:27:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13268036 X-Patchwork-Delegate: bpf@iogearbox.net 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 4C9121118D for ; Mon, 5 Jun 2023 20:28:20 +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 85D46109 for ; Mon, 5 Jun 2023 13:28:18 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-565ef5a707dso73856037b3.3 for ; Mon, 05 Jun 2023 13:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685996897; x=1688588897; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8yhF3LUAjC5vv5lFpyo9KAPX59o4Esq1dpIkjb48etw=; b=Cwb9qmQoXri1hiWhnNQpPPy/l2PGyCe56sNTUhcoGcqlVn9Cj4V/od2CHKPQrkR3or aB5S8nzckVosZKUNJHDV9Uef0JeCzJPvR9SiBaVOL/elx6AA913AwbHLMC9XXqDTFuZE kjPdr00K3LrnoSQ80mmAZe/3ehN66LKKDJ8UrzqoevmbY2VTYY8fFXX61n7BQRUUZqOo HSObiLwsQZq075I2N5yr2NRoS9yRUZrRUQaotTkeorQp2G/ro/nWouz09cgWbAhUhMyO qDNJzHdv1IzP9/+eNJ4qa8BTbHpHFpRCTakTbaCGLrAFuPD8wN8GFNTxq9LPusvpXomX tSIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685996897; x=1688588897; 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=8yhF3LUAjC5vv5lFpyo9KAPX59o4Esq1dpIkjb48etw=; b=h0Uj+2fix9SJnOLPDJ8xbHzN/5KgYx5GY2PoGYEC499Yymp/gKCScg/1sMdTikFj0k cfkScNn16nu6eMaE0Kgf6tmOBwRNPObfYL9jxgd9BpQlKSQwO6sQbDn4lsILztSyidzs QjQeAdmhDSOSUxlKn+XwVu/4AGJV0SojkS3voXYrHuF/RbocpXf20skDz65CL/TITECD eZp5WNHQOyoUvu3acynjp8ItuCBAGJPAwsAqTo0fjvvqUlvtoAS9XleLAIYowk1a5E0l +2B/1hVYJB8HQh3IyONzaOwVFDRRD54h8pEe0e1kA8UKlddmF4GIj7JVmmRwBEFdzLNP o0NQ== X-Gm-Message-State: AC+VfDwlFQ+iHFBxoHuf0M0Mriq5M9ezrQxzQ7j57Zv6KVysno5Yy61H 1XAz9tEZh6jT5jO7SFADI6htqj/Jikma X-Google-Smtp-Source: ACHHUZ4u6C4UhYkOI2bUkxhmrLOQ3XfOKZb5cb6MpfESQvWxRLl1tDTyvOQVOTjul74lpbI4NWKkjLcVyhyA X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bed9:39b9:3df1:2828]) (user=irogers job=sendgmr) by 2002:a81:b504:0:b0:565:cfdf:7a70 with SMTP id t4-20020a81b504000000b00565cfdf7a70mr4712056ywh.2.1685996897710; Mon, 05 Jun 2023 13:28:17 -0700 (PDT) Date: Mon, 5 Jun 2023 13:27:10 -0700 In-Reply-To: <20230605202712.1690876-1-irogers@google.com> Message-Id: <20230605202712.1690876-3-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230605202712.1690876-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v2 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=unavailable 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 Mon Jun 5 20:27:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13268037 X-Patchwork-Delegate: bpf@iogearbox.net 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 1F537261E0 for ; Mon, 5 Jun 2023 20:28:22 +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 E768E109 for ; Mon, 5 Jun 2023 13:28:20 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-561eb6c66f6so65409857b3.0 for ; Mon, 05 Jun 2023 13:28:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685996900; x=1688588900; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UB6gpBiBcnU1jnjPiiDD9uKRun1xokaVYhpMqOiKGIk=; b=YUoH34gluOcnMLglRERlvpfebD23yZUoPErPS/I1cj+IF71agxYfnW69JOXkdO3EsV o/pfQ8mxsGVjwmVDoU2v8PV3XSPhfWAAdeMI6H7xLKhZgRwz1yjYGmPt4NPn1VlUbP3K pFQsJsvCGnU1imCD1kANm012jDtFB81Q1sgGDlCggxYu0NrlLb/P6tquBY1BearYf/Lm eqHDSdTLYLZzBnQALPShfMgjweFGm2D7SpazBT/hIG98+9Lp6VSbv4i3577Ku+whecrm AzsgWRq44ntdwAHpIisf049UP73S8UyElEQ2DiCcoCqseACVXTcxxlxgpRxfwpziyPlL Gr8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685996900; x=1688588900; 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=UB6gpBiBcnU1jnjPiiDD9uKRun1xokaVYhpMqOiKGIk=; b=b++Doy76zjMuVj1kAG97nlm0dcRTSNMlsRU9y/i8k6bVC+VyU/JL7A0HJPNsxSG/vG 8AkPf0I7LfMbpyX5pDDtjgNj68y29uwNVegUWAscsebmebFQyKM/T1iJ9CPsdgVwHHGB GTnthcPtmku8Zewj+ACwY8mjG5XfkwMDpJl6TeCqa2D7S2ShMwuU/xXSFzVeG9+ZsC8D J01jpno/BvKLGOlh0qmg2W45KukCK7yFypQTBbT9+tCypDTtcnKLVd945bjJvWn1RydE pdMrxzqTt2iYH6juiNM2+Na2jwCogqrqhZkmSYhfG9PM0EtdjcDRFO9CCitV4Y2oFgK1 sH2w== X-Gm-Message-State: AC+VfDx117+5rI/62a8q/jjPkeN32Fp4LYZWO0otzbBUgy7okJobJVT+ hJk1QlqGVmW0wh5pUzi7knxjZS8ZtwIq X-Google-Smtp-Source: ACHHUZ4Z96ssNiqfTAzkaosiR+Pm5gOogVdYbFM7wBcCqqZ5osHLe80aD+5fi03vIM1WvuTtzxh+zYefiZeu X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bed9:39b9:3df1:2828]) (user=irogers job=sendgmr) by 2002:a81:4043:0:b0:568:c4ea:ce66 with SMTP id m3-20020a814043000000b00568c4eace66mr4723849ywn.5.1685996900158; Mon, 05 Jun 2023 13:28:20 -0700 (PDT) Date: Mon, 5 Jun 2023 13:27:11 -0700 In-Reply-To: <20230605202712.1690876-1-irogers@google.com> Message-Id: <20230605202712.1690876-4-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230605202712.1690876-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v2 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 Mon Jun 5 20:27:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13268038 X-Patchwork-Delegate: bpf@iogearbox.net 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 7AB0A261E0 for ; Mon, 5 Jun 2023 20:28:25 +0000 (UTC) Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84EF0122 for ; Mon, 5 Jun 2023 13:28:23 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-651afaa951fso1747504b3a.3 for ; Mon, 05 Jun 2023 13:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685996903; x=1688588903; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=+qYHV5dndHRBhvbPRu9xCOpU+u+ZVanAjGEzSYR7+fE=; b=cRXKNn7+YSXxjSE82ZAWPBlWtgcRZW0a6eCJLqKXO+z9nfKhe3fAvCtkNzc9R20ATJ JTA8H8IoLKqChxw3bQIxPIsF+Yjm3YXEPvRajAl8/RU9TmDS4CfjlKJwFpCkG0rDxwQq 4/2ZMmjUPim1BnCP0ZNfireRVukam04u9nXCM5u37eAtzr7gJBweyJsxhTQdxYWgQdks +cxVYRhaeVTQsXxPcznKJAHgraHO+FWFEVPI9QtV89IyO/76AWyNolwh2tDTs2C6SAgH KeEswJtIUw8Gd5rz2rvzs/xIAh/nXeYvOCElFv4R9sFqZJVG6IDtUH4L0wNU/LSSnJlF lpNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685996903; x=1688588903; 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=+qYHV5dndHRBhvbPRu9xCOpU+u+ZVanAjGEzSYR7+fE=; b=SKS/shf49k7/ipJDO6QXWiviWZOMczsoYnbr5IFpfzxIbPRSnEwb1f3xsBJKwo3+EQ 1F5bb9YLkm2rTdQWLEb8HLTcCmHyyBOrtsv2q6NHulcqrtZuff4sy9xOkzeBsrsrXoHL J+XF5ghKvIYl9uH87Mb3trn8uPi9s8nFFPS4hZ+xkLhAJtwnHifnvY+xuWNR4qFK+ryF oPEt6OFR4FAkeYIEZKNRi1p+9v0ksIRn02YIEmadUBngi670Lcf4wZTs2bhHpYzZ4Tf+ swI1PvGhqDKFMgtFolppk3uVhFhDLHXs08YtDZcFQ6cQqTPLOdnpzufKa0qyVgcQhzE3 ELiw== X-Gm-Message-State: AC+VfDx9WRNunHVnAH8IA1+I7pBvN8prT8UkW+YixW0TXWweZAkoHPrB Dx1u2DkysKI0TYF3ioxTzdmImOm0HrdC X-Google-Smtp-Source: ACHHUZ5kJFyJQnGfJxkrSLArQVibKLxmKB7BQc3RM1y2mYm7yqoiImIn/6Lx1E+t5ldnpaKwEkpEIhyFaBI5 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bed9:39b9:3df1:2828]) (user=irogers job=sendgmr) by 2002:a05:6a00:2292:b0:658:747:c85e with SMTP id f18-20020a056a00229200b006580747c85emr331558pfe.6.1685996902955; Mon, 05 Jun 2023 13:28:22 -0700 (PDT) Date: Mon, 5 Jun 2023 13:27:12 -0700 In-Reply-To: <20230605202712.1690876-1-irogers@google.com> Message-Id: <20230605202712.1690876-5-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230605202712.1690876-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v2 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=unavailable 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 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index f1840af195c0..c3bb27a912b0 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,28 @@ $(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) -t "$$file" | grep .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)) $(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) ifeq ($(VMLINUX_H),)