From nobody Mon Sep 15 04:11:26 2025 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 64F39C3DA78 for ; Mon, 16 Jan 2023 01:01:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231631AbjAPBBv (ORCPT ); Sun, 15 Jan 2023 20:01:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231706AbjAPBBh (ORCPT ); Sun, 15 Jan 2023 20:01:37 -0500 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 ECA1D93C3 for ; Sun, 15 Jan 2023 17:01:35 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id k20-20020aa792d4000000b0058347d2f5e3so11675464pfa.15 for ; Sun, 15 Jan 2023 17:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tHhCz4k6MsqFldWGTt35hGeLdTBertltyGAk8DkitQI=; b=oVMWfsW34/mGzPMwBFwgP503Mmst6dTXQwRmf7yhjQV3T611RrXu8SUNd69diz8msL k2m6ORMzKffSio7JKlJDYGbJNzNcYNM/zi4Lh+Neq+n+22h8KgrCElrqrFrNrnrW9Fwt 4Q0aMoJtNkCMGnvh5OijMMjPPrdIaHndXZd6eLelQTfo1IFemkORMu4h77rN+LVcOu6N pgHQSYw04OOZlUZjQ0ilOFIuOJMHbrpCoEgdIhWSmdlrkjyOIUDGbWBQLdvu3u2qmQbX mHHPhWZK+IL4rEZKsQXiNAi2erx1zf9lypve5krMuoHLn300TU+ofqNc6LiwuoX1klx+ 5Kkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=tHhCz4k6MsqFldWGTt35hGeLdTBertltyGAk8DkitQI=; b=du387f7VEWdWlQ8KA40D+84g5U6s1VzcQQEovf4rn5tCXmm7bBQ1ZG2P4b9ih/x+0b X+J5oUMZcxldHHafPVkUJsuGK8aNCeaVEQR3jYrsfm+ui4J8qz4oojHFFF261Bk3Rzy2 jst+DB/Eo+llGD/f4G6VZCscSKXggfgzKbRRGqhVB5RH/ItT1oT3LrnVnFadK7XJxr6/ hQKPFZxyEbx2EWI7W5aytbQVXjBlaAKSKPInHh7eHJH1qCy39w+B6cWbaX2z2EOj2BIp m+Y8CUhxcg2R0DKDrsK0I1MDjKq+zEyJf7iwhpODnbhgngN8X/Nfv5G755RVOrBNNJRw JhoQ== X-Gm-Message-State: AFqh2kqmnsgXxbpQ7WQ14EuEU9nILuWAjtCNXpUbx3gCbfXJ4ofXTNH/ tcfu/7wWCbxSAvTV4+S+oUZIi+owvL/q X-Google-Smtp-Source: AMrXdXvaEANIV4ydnJVEVN/4TOnTdYZRjSst6vBFoO6VrG5s9o9TicPq79sqg2G3TQ4ogM26FcqU7DZSUxLt X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:79e:5e8e:382c:e7ce]) (user=irogers job=sendgmr) by 2002:a17:90b:264d:b0:226:1564:643c with SMTP id pa13-20020a17090b264d00b002261564643cmr5421842pjb.206.1673830895350; Sun, 15 Jan 2023 17:01:35 -0800 (PST) Date: Sun, 15 Jan 2023 17:01:13 -0800 In-Reply-To: <20230116010115.490713-1-irogers@google.com> Message-Id: <20230116010115.490713-2-irogers@google.com> Mime-Version: 1.0 References: <20230116010115.490713-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 1/3] tools build: Pass libbpf feature only if libbpf 1.0+ From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andres Freund , Quentin Monnet , Roberto Sassu , Christy Lee , Andrii Nakryiko , Adrian Hunter , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Cc: Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" libbpf 1.0 represented a cleanup and stabilization of APIs. Simplify development by only passing the feature test if libbpf 1.0 is installed. Signed-off-by: Ian Rogers --- tools/build/feature/test-libbpf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/feature/test-libbpf.c b/tools/build/feature/test-l= ibbpf.c index a508756cf4cc..cd9989f52119 100644 --- a/tools/build/feature/test-libbpf.c +++ b/tools/build/feature/test-libbpf.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 #include =20 +#if !defined(LIBBPF_MAJOR_VERSION) || (LIBBPF_MAJOR_VERSION < 1) +#error At least libbpf 1.0 is required for Linux tools. +#endif + int main(void) { return bpf_object__open("test") ? 0 : -1; --=20 2.39.0.314.g84b9a713c41-goog From nobody Mon Sep 15 04:11:26 2025 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 E2DE8C46467 for ; Mon, 16 Jan 2023 01:02:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231815AbjAPBCK (ORCPT ); Sun, 15 Jan 2023 20:02:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231770AbjAPBBu (ORCPT ); Sun, 15 Jan 2023 20:01:50 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AF1615541 for ; Sun, 15 Jan 2023 17:01:44 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id s2-20020a170902ea0200b0019247629ee5so19080429plg.17 for ; Sun, 15 Jan 2023 17:01:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=VRrV8udrTURO9JO/oxNuWIRvgc98bYawahAGihNy554=; b=e6dQl1+Q10HiIwzFDsr7u+GFX7EwgiHn6PlxEXX8Q0KNKHqjsU1kXpn3Jfz8gAzQW7 zylf+mfRGHzyxJrAao+mnE5KADUOm6tGbPeywRzSKIc+4KErGCGBcsl/UwpthqBweKFl Z92pG+MG9HF9kU9m6SVVwlznibtelFGBeuPr+CrLNqaUThrg49TS59Yq6NxLGWfLOHv7 TI57D5lVMr4df+UoUq3S2Y/g8DukoigGaA/pPvGaqAgOEeQ6W4dHBfi8U3VQhnRhHkP8 FzruzBS2mdleqFinHa0WvQrghWp1b45HKqdhy/10NGtNrVg1p2ErLru9lTxDtH/HiEzt yPBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=VRrV8udrTURO9JO/oxNuWIRvgc98bYawahAGihNy554=; b=aA26DUuEKcUk4FMBODZQkJy7YQBVbLtn3Ld2v7zr3vh17BayP0mVwiR7IU/y7XYs1U frRGFD6/xeff+X2VT0791HTyasS8BRQYYc6KP6FlqqqH1jIrDcNPnLPIyFZUH1qAHu/a jv4VfG06ylaq4mRe9hOIlhbv8aTK6PJXFA3nCoLZSRXkVXX9SW0sbiIl+aaIWZCJ27Oi PxXi6wco3k+9AAkJFObcXbK0xqHN+JDZy0KylZqZ/RXJVzdRXrzBUWfGL5G0dnP08Egb /65ZTf9Ds+0skS9odgE2RNjWyCr2IvrthpuVb50PSAgcFEmfWQPlB5pEQN1mM8ZkEd8T NL6A== X-Gm-Message-State: AFqh2kojh1o7dhijwq3WcP/1dE4tx7BbdQta9bVYhgfKKCfPH2+yPJ8B AjXJguFw9uuKkPtxy045yg5091lab5Mi X-Google-Smtp-Source: AMrXdXsvoWBAVbo0DvESAFaSxyRdlBsQvG7Q/trMPQjHjqZeSWq6WI59P9MDuTOrPv9Dj9i/TDzYmJkV4uo4 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:79e:5e8e:382c:e7ce]) (user=irogers job=sendgmr) by 2002:a17:90a:ad84:b0:229:45e8:f3a2 with SMTP id s4-20020a17090aad8400b0022945e8f3a2mr520970pjq.46.1673830903833; Sun, 15 Jan 2023 17:01:43 -0800 (PST) Date: Sun, 15 Jan 2023 17:01:14 -0800 In-Reply-To: <20230116010115.490713-1-irogers@google.com> Message-Id: <20230116010115.490713-3-irogers@google.com> Mime-Version: 1.0 References: <20230116010115.490713-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 2/3] perf build: Remove libbpf pre-1.0 feature tests From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andres Freund , Quentin Monnet , Roberto Sassu , Christy Lee , Andrii Nakryiko , Adrian Hunter , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Cc: Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The feature tests were necessary for libbpf pre-1.0, but as the libbpf implies at least 1.0 we can remove these now. Signed-off-by: Ian Rogers --- tools/build/feature/Makefile | 7 --- .../feature/test-libbpf-bpf_map_create.c | 8 ---- .../test-libbpf-bpf_object__next_map.c | 8 ---- .../test-libbpf-bpf_object__next_program.c | 8 ---- .../build/feature/test-libbpf-bpf_prog_load.c | 9 ---- .../test-libbpf-bpf_program__set_insns.c | 8 ---- .../test-libbpf-btf__load_from_kernel_by_id.c | 8 ---- .../build/feature/test-libbpf-btf__raw_data.c | 8 ---- tools/perf/Makefile.config | 48 ++++--------------- 9 files changed, 10 insertions(+), 102 deletions(-) delete mode 100644 tools/build/feature/test-libbpf-bpf_map_create.c delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_map.c delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_progra= m.c delete mode 100644 tools/build/feature/test-libbpf-bpf_prog_load.c delete mode 100644 tools/build/feature/test-libbpf-bpf_program__set_insns.c delete mode 100644 tools/build/feature/test-libbpf-btf__load_from_kernel_b= y_id.c delete mode 100644 tools/build/feature/test-libbpf-btf__raw_data.c diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 690fe97be190..dc9323e01e42 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -58,13 +58,6 @@ FILES=3D \ test-lzma.bin \ test-bpf.bin \ test-libbpf.bin \ - test-libbpf-btf__load_from_kernel_by_id.bin \ - test-libbpf-bpf_prog_load.bin \ - test-libbpf-bpf_map_create.bin \ - test-libbpf-bpf_object__next_program.bin \ - test-libbpf-bpf_object__next_map.bin \ - test-libbpf-bpf_program__set_insns.bin \ - test-libbpf-btf__raw_data.bin \ test-get_cpuid.bin \ test-sdt.bin \ test-cxx.bin \ diff --git a/tools/build/feature/test-libbpf-bpf_map_create.c b/tools/build= /feature/test-libbpf-bpf_map_create.c deleted file mode 100644 index b9f550e332c8..000000000000 --- a/tools/build/feature/test-libbpf-bpf_map_create.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include - -int main(void) -{ - return bpf_map_create(0 /* map_type */, NULL /* map_name */, 0, /* key_si= ze */, - 0 /* value_size */, 0 /* max_entries */, NULL /* opts */); -} diff --git a/tools/build/feature/test-libbpf-bpf_object__next_map.c b/tools= /build/feature/test-libbpf-bpf_object__next_map.c deleted file mode 100644 index 64adb519e97e..000000000000 --- a/tools/build/feature/test-libbpf-bpf_object__next_map.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include - -int main(void) -{ - bpf_object__next_map(NULL /* obj */, NULL /* prev */); - return 0; -} diff --git a/tools/build/feature/test-libbpf-bpf_object__next_program.c b/t= ools/build/feature/test-libbpf-bpf_object__next_program.c deleted file mode 100644 index 8bf4fd26b545..000000000000 --- a/tools/build/feature/test-libbpf-bpf_object__next_program.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include - -int main(void) -{ - bpf_object__next_program(NULL /* obj */, NULL /* prev */); - return 0; -} diff --git a/tools/build/feature/test-libbpf-bpf_prog_load.c b/tools/build/= feature/test-libbpf-bpf_prog_load.c deleted file mode 100644 index 47f516d63ebc..000000000000 --- a/tools/build/feature/test-libbpf-bpf_prog_load.c +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include - -int main(void) -{ - return bpf_prog_load(0 /* prog_type */, NULL /* prog_name */, - NULL /* license */, NULL /* insns */, - 0 /* insn_cnt */, NULL /* opts */); -} diff --git a/tools/build/feature/test-libbpf-bpf_program__set_insns.c b/too= ls/build/feature/test-libbpf-bpf_program__set_insns.c deleted file mode 100644 index f3b7f18c8f49..000000000000 --- a/tools/build/feature/test-libbpf-bpf_program__set_insns.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include - -int main(void) -{ - bpf_program__set_insns(NULL /* prog */, NULL /* new_insns */, 0 /* new_in= sn_cnt */); - return 0; -} diff --git a/tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c = b/tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c deleted file mode 100644 index a17647f7d5a4..000000000000 --- a/tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include - -int main(void) -{ - btf__load_from_kernel_by_id(20151128); - return 0; -} diff --git a/tools/build/feature/test-libbpf-btf__raw_data.c b/tools/build/= feature/test-libbpf-btf__raw_data.c deleted file mode 100644 index 57da31dd7581..000000000000 --- a/tools/build/feature/test-libbpf-btf__raw_data.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include - -int main(void) -{ - btf__raw_data(NULL /* btf_ro */, NULL /* size */); - return 0; -} diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 5b8784675903..5ab7cac48c4a 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -565,54 +565,26 @@ ifndef NO_LIBELF =20 # detecting libbpf without LIBBPF_DYNAMIC, so make VF=3D1 shows libb= pf detection status $(call feature_check,libbpf) + + # Feature test requires libbpf 1.0 so we can assume the following: + CFLAGS +=3D -DHAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID + CFLAGS +=3D -DHAVE_LIBBPF_BPF_PROG_LOAD + CFLAGS +=3D -DHAVE_LIBBPF_BPF_OBJECT__NEXT_PROGRAM + CFLAGS +=3D -DHAVE_LIBBPF_BPF_OBJECT__NEXT_MAP + CFLAGS +=3D -DHAVE_LIBBPF_BPF_PROGRAM__SET_INSNS + CFLAGS +=3D -DHAVE_LIBBPF_BTF__RAW_DATA + CFLAGS +=3D -DHAVE_LIBBPF_BPF_MAP_CREATE + ifdef LIBBPF_DYNAMIC ifeq ($(feature-libbpf), 1) EXTLIBS +=3D -lbpf $(call detected,CONFIG_LIBBPF_DYNAMIC) - - $(call feature_check,libbpf-btf__load_from_kernel_by_id) - ifeq ($(feature-libbpf-btf__load_from_kernel_by_id), 1) - CFLAGS +=3D -DHAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID - endif - $(call feature_check,libbpf-bpf_prog_load) - ifeq ($(feature-libbpf-bpf_prog_load), 1) - CFLAGS +=3D -DHAVE_LIBBPF_BPF_PROG_LOAD - endif - $(call feature_check,libbpf-bpf_object__next_program) - ifeq ($(feature-libbpf-bpf_object__next_program), 1) - CFLAGS +=3D -DHAVE_LIBBPF_BPF_OBJECT__NEXT_PROGRAM - endif - $(call feature_check,libbpf-bpf_object__next_map) - ifeq ($(feature-libbpf-bpf_object__next_map), 1) - CFLAGS +=3D -DHAVE_LIBBPF_BPF_OBJECT__NEXT_MAP - endif - $(call feature_check,libbpf-bpf_program__set_insns) - ifeq ($(feature-libbpf-bpf_program__set_insns), 1) - CFLAGS +=3D -DHAVE_LIBBPF_BPF_PROGRAM__SET_INSNS - else - dummy :=3D $(error Error: libbpf devel library needs to be >= =3D 0.8.0 to build with LIBBPF_DYNAMIC, update or build statically with the= version that comes with the kernel sources); - endif - $(call feature_check,libbpf-btf__raw_data) - ifeq ($(feature-libbpf-btf__raw_data), 1) - CFLAGS +=3D -DHAVE_LIBBPF_BTF__RAW_DATA - endif - $(call feature_check,libbpf-bpf_map_create) - ifeq ($(feature-libbpf-bpf_map_create), 1) - CFLAGS +=3D -DHAVE_LIBBPF_BPF_MAP_CREATE - endif else dummy :=3D $(error Error: No libbpf devel library found, please = install libbpf-devel); endif else # Libbpf will be built as a static library from tools/lib/bpf. LIBBPF_STATIC :=3D 1 - CFLAGS +=3D -DHAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID - CFLAGS +=3D -DHAVE_LIBBPF_BPF_PROG_LOAD - CFLAGS +=3D -DHAVE_LIBBPF_BPF_OBJECT__NEXT_PROGRAM - CFLAGS +=3D -DHAVE_LIBBPF_BPF_OBJECT__NEXT_MAP - CFLAGS +=3D -DHAVE_LIBBPF_BPF_PROGRAM__SET_INSNS - CFLAGS +=3D -DHAVE_LIBBPF_BTF__RAW_DATA - CFLAGS +=3D -DHAVE_LIBBPF_BPF_MAP_CREATE endif endif =20 --=20 2.39.0.314.g84b9a713c41-goog From nobody Mon Sep 15 04:11:26 2025 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 99BE7C3DA78 for ; Mon, 16 Jan 2023 01:02:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231825AbjAPBCc (ORCPT ); Sun, 15 Jan 2023 20:02:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231814AbjAPBCK (ORCPT ); Sun, 15 Jan 2023 20:02:10 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46D361554E for ; Sun, 15 Jan 2023 17:01:52 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id f8-20020a170902ce8800b00190c6518e21so18912376plg.1 for ; Sun, 15 Jan 2023 17:01:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=fq9l7at1ooTaJSpkUGZKe7P3obJP6I4kIWy9k7MQBXM=; b=OHrc/Y7AlG8ipL/VF8EJAhW/ttvEH2GKjIzii39L+HIHdQ702xNLigbdi5Et+ALdzm irtFcjWnSXcnIUMx1Hsx7zxmjTkTPjzQEl4DrQ2C7vz+NyTYK8UlcSpb10bkrkHLmg6y X8DjtdzNgQ2rmmS/faKieX528UmyMmu1ko80krLwPJ6x4rKbaTV6v5xMio8yHrFZl9ry r+2BHfX1XSbNwQCXkLHBObCfp8ytS3j+PkJXn1pZcb1I/fkwHuuDxS5Uv7/6l6Gfb3Ee Zjnu4wlQoxhBZFym1XwKwSa9cKKMK/E69YtBkges5K0PU4zA29gjIAEdOvyvwHE1gQwN emeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=fq9l7at1ooTaJSpkUGZKe7P3obJP6I4kIWy9k7MQBXM=; b=8SHxBgeFoN79Loqcd8al9kRg3eq038WRDGa9MLWkhANxgZ4+3h/xJiu/0gG4+KWRSl WmpjyUgIGLSSNZdrJhcvAFJpWOrpELHWLo5E078Zckubpx5Ciw/7Q6HRjJga4G524NoK oAnsALcTU3F4vkBNpSRX13ryUTOl0ZRSuWRFvYp90cqMNtClcyzrZUVkE8Ohb5U9id55 Njq1RqV71bS8JKg/koLkVBwGzmZgNDvnVra0vetbxGUwd8eqc1eiixOd6ZiEiOzzpK3e m3wX+OdqIUwbpVrJdiaKLxkV+5897vjmejqJyCY8yeqqHDezWvmmfRyiChYUIJEL4xrW KiMw== X-Gm-Message-State: AFqh2ko2Vk4p3TR55TlIffpT7okhXOdb/eiiVMz9CsZt1gxfS14gt+Ju adS3Gb5Q3/uKiUbYdeP15FdiO3Q7kFLF X-Google-Smtp-Source: AMrXdXvTTWiyW6nD9G8MZKP8e0oyn0VbGW50n5E0CQJjlRQFJCA1q4ja0+qw47ymzPhYIU9++iJTPdDiKoF8 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:79e:5e8e:382c:e7ce]) (user=irogers job=sendgmr) by 2002:a63:1666:0:b0:478:e22:c90a with SMTP id 38-20020a631666000000b004780e22c90amr4920876pgw.185.1673830912233; Sun, 15 Jan 2023 17:01:52 -0800 (PST) Date: Sun, 15 Jan 2023 17:01:15 -0800 In-Reply-To: <20230116010115.490713-1-irogers@google.com> Message-Id: <20230116010115.490713-4-irogers@google.com> Mime-Version: 1.0 References: <20230116010115.490713-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 3/3] perf bpf: Remove pre libbpf 1.0 conditional logic From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andres Freund , Quentin Monnet , Roberto Sassu , Christy Lee , Andrii Nakryiko , Adrian Hunter , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Cc: Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Tests are no longer applicable as libbpf 1.0 can be assumed. Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 9 ----- tools/perf/util/bpf-event.c | 66 ----------------------------------- tools/perf/util/bpf-loader.c | 18 ---------- tools/perf/util/bpf_counter.c | 18 ---------- 4 files changed, 111 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 5ab7cac48c4a..86ab83d48013 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -566,15 +566,6 @@ ifndef NO_LIBELF # detecting libbpf without LIBBPF_DYNAMIC, so make VF=3D1 shows libb= pf detection status $(call feature_check,libbpf) =20 - # Feature test requires libbpf 1.0 so we can assume the following: - CFLAGS +=3D -DHAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID - CFLAGS +=3D -DHAVE_LIBBPF_BPF_PROG_LOAD - CFLAGS +=3D -DHAVE_LIBBPF_BPF_OBJECT__NEXT_PROGRAM - CFLAGS +=3D -DHAVE_LIBBPF_BPF_OBJECT__NEXT_MAP - CFLAGS +=3D -DHAVE_LIBBPF_BPF_PROGRAM__SET_INSNS - CFLAGS +=3D -DHAVE_LIBBPF_BTF__RAW_DATA - CFLAGS +=3D -DHAVE_LIBBPF_BPF_MAP_CREATE - ifdef LIBBPF_DYNAMIC ifeq ($(feature-libbpf), 1) EXTLIBS +=3D -lbpf diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c index cc7c1f90cf62..025f331b3867 100644 --- a/tools/perf/util/bpf-event.c +++ b/tools/perf/util/bpf-event.c @@ -22,72 +22,6 @@ #include "record.h" #include "util/synthetic-events.h" =20 -#ifndef HAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID -struct btf *btf__load_from_kernel_by_id(__u32 id) -{ - struct btf *btf; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - int err =3D btf__get_from_id(id, &btf); -#pragma GCC diagnostic pop - - return err ? ERR_PTR(err) : btf; -} -#endif - -#ifndef HAVE_LIBBPF_BPF_PROG_LOAD -LIBBPF_API int bpf_load_program(enum bpf_prog_type type, - const struct bpf_insn *insns, size_t insns_cnt, - const char *license, __u32 kern_version, - char *log_buf, size_t log_buf_sz); - -int bpf_prog_load(enum bpf_prog_type prog_type, - const char *prog_name __maybe_unused, - const char *license, - const struct bpf_insn *insns, size_t insn_cnt, - const struct bpf_prog_load_opts *opts) -{ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return bpf_load_program(prog_type, insns, insn_cnt, license, - opts->kern_version, opts->log_buf, opts->log_size); -#pragma GCC diagnostic pop -} -#endif - -#ifndef HAVE_LIBBPF_BPF_OBJECT__NEXT_PROGRAM -struct bpf_program * -bpf_object__next_program(const struct bpf_object *obj, struct bpf_program = *prev) -{ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return bpf_program__next(prev, obj); -#pragma GCC diagnostic pop -} -#endif - -#ifndef HAVE_LIBBPF_BPF_OBJECT__NEXT_MAP -struct bpf_map * -bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *p= rev) -{ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return bpf_map__next(prev, obj); -#pragma GCC diagnostic pop -} -#endif - -#ifndef HAVE_LIBBPF_BTF__RAW_DATA -const void * -btf__raw_data(const struct btf *btf_ro, __u32 *size) -{ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return btf__get_raw_data(btf_ro, size); -#pragma GCC diagnostic pop -} -#endif - static int snprintf_hex(char *buf, size_t size, unsigned char *data, size_= t len) { int ret =3D 0; diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index 6e9b06cf06ee..44cde27d6389 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -32,24 +32,6 @@ =20 #include =20 -#ifndef HAVE_LIBBPF_BPF_PROGRAM__SET_INSNS -int bpf_program__set_insns(struct bpf_program *prog __maybe_unused, - struct bpf_insn *new_insns __maybe_unused, size_t new_insn_cnt __may= be_unused) -{ - pr_err("%s: not support, update libbpf\n", __func__); - return -ENOTSUP; -} - -int libbpf_register_prog_handler(const char *sec __maybe_unused, - enum bpf_prog_type prog_type __maybe_unus= ed, - enum bpf_attach_type exp_attach_type __ma= ybe_unused, - const struct libbpf_prog_handler_opts *op= ts __maybe_unused) -{ - pr_err("%s: not support, update libbpf\n", __func__); - return -ENOTSUP; -} -#endif - /* temporarily disable libbpf deprecation warnings */ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" =20 diff --git a/tools/perf/util/bpf_counter.c b/tools/perf/util/bpf_counter.c index eeee899fcf34..aa78a15a6f0a 100644 --- a/tools/perf/util/bpf_counter.c +++ b/tools/perf/util/bpf_counter.c @@ -312,24 +312,6 @@ static bool bperf_attr_map_compatible(int attr_map_fd) (map_info.value_size =3D=3D sizeof(struct perf_event_attr_map_entry)); } =20 -#ifndef HAVE_LIBBPF_BPF_MAP_CREATE -LIBBPF_API int bpf_create_map(enum bpf_map_type map_type, int key_size, - int value_size, int max_entries, __u32 map_f= lags); -int -bpf_map_create(enum bpf_map_type map_type, - const char *map_name __maybe_unused, - __u32 key_size, - __u32 value_size, - __u32 max_entries, - const struct bpf_map_create_opts *opts __maybe_unused) -{ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return bpf_create_map(map_type, key_size, value_size, max_entries, 0); -#pragma GCC diagnostic pop -} -#endif - static int bperf_lock_attr_map(struct target *target) { char path[PATH_MAX]; --=20 2.39.0.314.g84b9a713c41-goog