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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BD69C433DB for ; Mon, 4 Jan 2021 22:17:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24F5722519 for ; Mon, 4 Jan 2021 22:17:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726098AbhADWRJ (ORCPT ); Mon, 4 Jan 2021 17:17:09 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:33995 "EHLO mail-wr1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726026AbhADWRI (ORCPT ); Mon, 4 Jan 2021 17:17:08 -0500 Received: by mail-wr1-f49.google.com with SMTP id q18so33697335wrn.1 for ; Mon, 04 Jan 2021 14:16:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6CoLUcuX4lM6ijizrchc9AUWAmUj156qoDq8bwkK1CM=; b=KKHg6OdVOXCpyP29ViZk9GoAPmBgJ/z3ZcG03AK0NSbIDgu7fto0XgwUcDJ1SsAi+h kMh6IT7XS8YfG9MmMyGP+jIUJxGzTm41oEKEt4oI5k/1l86vXWPwhpyGBwOLqZbTsLfH /gUf9X7lkl7g5o9s6x9emXAEbCGjfUsKQonJkHgu4jJiUeWsy1RC5PH+FJGz1ORBvp5o SScL/UZhx2NQWv+tY8p3MObBnK4k6GELcaRG4FMi4oTpKBjSsMFJxndRypaWwVm2oLIN UgyvCJmbpb+uxg0SvB1E/3oT0AVrQA//H8053S665txIj6Q/fUgeUJLfMIVFvxugNYVU mbEw== X-Gm-Message-State: AOAM533i3PfoSzdvNM6oFN19/XF6vxgs6aSOsHVK4c0Hq5Kg4JQDS9tQ 7569TES8nD961bzDDRwFTti6wI7lLzzrTIrf X-Google-Smtp-Source: ABdhPJw7LvZ7vp3/6F2zqVcmyq8EhKHSS3Oipmgyj9ZE02Bdvdm20RBdvKGbeoe38hmbbg5lMrYisg== X-Received: by 2002:adf:ba8b:: with SMTP id p11mr78797145wrg.328.1609798585467; Mon, 04 Jan 2021 14:16:25 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:e2db:6a88:4676:d01b]) by smtp.gmail.com with ESMTPSA id f77sm1091563wmf.42.2021.01.04.14.16.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jan 2021 14:16:24 -0800 (PST) From: Luca Boccassi To: dwarves@vger.kernel.org Subject: [PATCH dwarves v3] libbpf: allow to use packaged version Date: Mon, 4 Jan 2021 22:16:22 +0000 Message-Id: <20210104221622.256663-1-bluca@debian.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210103213201.829827-1-bluca@debian.org> References: <20210103213201.829827-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: dwarves@vger.kernel.org Add a new CMake option, LIBBPF_EMBEDDED, to switch between the embedded version and the system version (searched via pkg-config) of libbpf. Set the embedded version as the default. Signed-off-by: Luca Boccassi --- v2: switched default to use embedded version v3: add lib/include/bpf -> lib/bpf/src symlink to allow using 'system' style #include everywhere, rather than #ifdefs. Thanks Andrii for the suggestion! CMakeLists.txt | 43 ++++++++++++++++++++++++++++++------------- btf_encoder.c | 4 ++-- btf_loader.c | 2 +- lib/include/bpf | 1 + libbtf.c | 7 +++---- libbtf.h | 2 +- pahole.c | 2 +- pahole_strings.h | 2 +- strings.c | 2 +- 9 files changed, 41 insertions(+), 24 deletions(-) create mode 120000 lib/include/bpf diff --git a/CMakeLists.txt b/CMakeLists.txt index 857487a..eefdebe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,24 @@ project(pahole C) cmake_minimum_required(VERSION 2.8.8) cmake_policy(SET CMP0005 NEW) +option(LIBBPF_EMBEDDED "Use the embedded version of libbpf instead of searching it via pkg-config" ON) +if (NOT LIBBPF_EMBEDDED) + find_package(PkgConfig) + if(PKGCONFIG_FOUND) + pkg_check_modules(LIBBPF libbpf>=0.3.0) + endif() +endif() + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include/uapi) + ${CMAKE_CURRENT_SOURCE_DIR}) +if(NOT LIBBPF_FOUND) + # Allows to use 'system' style #include with both embedded and system libbpf + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib/include) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include/uapi) +else() + INCLUDE_DIRECTORIES(${LIBBPF_INCLUDE_DIRS}) + LINK_DIRECTORIES(${LIBBPF_LIBRARY_DIRS}) +endif() # Try to parse this later, Helio just showed me a KDE4 example to support # x86-64 builds. @@ -56,7 +71,7 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") endif() endif() endif() -if(NOT EXISTS "${PROJECT_SOURCE_DIR}/lib/bpf/src/btf.h") +if(NOT LIBBPF_FOUND AND NOT EXISTS "${PROJECT_SOURCE_DIR}/lib/bpf/src/btf.h") message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") endif() @@ -81,22 +96,24 @@ endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64") -file(GLOB libbpf_sources "lib/bpf/src/*.c") -add_library(bpf OBJECT ${libbpf_sources}) -set_property(TARGET bpf PROPERTY POSITION_INDEPENDENT_CODE 1) -target_include_directories(bpf PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include - ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include/uapi) +if (NOT LIBBPF_FOUND) + file(GLOB libbpf_sources "lib/bpf/src/*.c") + add_library(bpf OBJECT ${libbpf_sources}) + set_property(TARGET bpf PROPERTY POSITION_INDEPENDENT_CODE 1) + target_include_directories(bpf PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include) +endif() set(dwarves_LIB_SRCS dwarves.c dwarves_fprintf.c gobuffer strings ctf_encoder.c ctf_loader.c libctf.c btf_encoder.c btf_loader.c libbtf.c dwarf_loader.c dutil.c elf_symtab.c rbtree.c) -add_library(dwarves SHARED ${dwarves_LIB_SRCS} $) +if (NOT LIBBPF_FOUND) + list(APPEND dwarves_LIB_SRCS $) +endif() +add_library(dwarves SHARED ${dwarves_LIB_SRCS}) set_target_properties(dwarves PROPERTIES VERSION 1.0.0 SOVERSION 1) set_target_properties(dwarves PROPERTIES INTERFACE_LINK_LIBRARIES "") -target_include_directories(dwarves PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include/uapi) -target_link_libraries(dwarves ${DWARF_LIBRARIES} ${ZLIB_LIBRARIES}) +target_link_libraries(dwarves ${DWARF_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBBPF_LIBRARIES}) set(dwarves_emit_LIB_SRCS dwarves_emit.c) add_library(dwarves_emit SHARED ${dwarves_emit_LIB_SRCS}) diff --git a/btf_encoder.c b/btf_encoder.c index 3339730..76e7d43 100644 --- a/btf_encoder.c +++ b/btf_encoder.c @@ -11,12 +11,12 @@ #include "dwarves.h" #include "libbtf.h" -#include "lib/bpf/include/uapi/linux/btf.h" -#include "lib/bpf/src/libbpf.h" #include "hash.h" #include "elf_symtab.h" #include "btf_encoder.h" +#include +#include #include /* for isalpha() and isalnum() */ #include /* for qsort() and bsearch() */ #include diff --git a/btf_loader.c b/btf_loader.c index ec286f4..fa85d06 100644 --- a/btf_loader.c +++ b/btf_loader.c @@ -20,12 +20,12 @@ #include #include #include +#include #include #include #include "libbtf.h" -#include "lib/bpf/include/uapi/linux/btf.h" #include "dutil.h" #include "dwarves.h" diff --git a/lib/include/bpf b/lib/include/bpf new file mode 120000 index 0000000..4c41b71 --- /dev/null +++ b/lib/include/bpf @@ -0,0 +1 @@ +../bpf/src \ No newline at end of file diff --git a/libbtf.c b/libbtf.c index 16e1d45..3cc2ac5 100644 --- a/libbtf.c +++ b/libbtf.c @@ -16,12 +16,11 @@ #include #include #include +#include +#include +#include #include "libbtf.h" -#include "lib/bpf/include/uapi/linux/btf.h" -#include "lib/bpf/include/linux/err.h" -#include "lib/bpf/src/btf.h" -#include "lib/bpf/src/libbpf.h" #include "dutil.h" #include "gobuffer.h" #include "dwarves.h" diff --git a/libbtf.h b/libbtf.h index 191f586..0b99767 100644 --- a/libbtf.h +++ b/libbtf.h @@ -11,7 +11,7 @@ #include #include -#include "lib/bpf/src/btf.h" +#include struct btf_elf { void *priv; diff --git a/pahole.c b/pahole.c index 4a34ba5..68dd166 100644 --- a/pahole.c +++ b/pahole.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "dwarves_reorganize.h" #include "dwarves.h" @@ -23,7 +24,6 @@ #include "ctf_encoder.h" #include "btf_encoder.h" #include "libbtf.h" -#include "lib/bpf/src/libbpf.h" static bool btf_encode; static bool ctf_encode; diff --git a/pahole_strings.h b/pahole_strings.h index 522fbf2..657701b 100644 --- a/pahole_strings.h +++ b/pahole_strings.h @@ -6,7 +6,7 @@ Copyright (C) 2008 Arnaldo Carvalho de Melo */ -#include "lib/bpf/src/btf.h" +#include typedef unsigned int strings_t; diff --git a/strings.c b/strings.c index d37f49d..8244c49 100644 --- a/strings.c +++ b/strings.c @@ -13,9 +13,9 @@ #include #include #include +#include #include "dutil.h" -#include "lib/bpf/src/libbpf.h" struct strings *strings__new(void) { -- 2.29.2