From patchwork Fri Sep 27 13:13:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 13814291 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 60039CDD1B0 for ; Fri, 27 Sep 2024 13:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=9LMFXGnHB4DcLooWkWG914IEj7/C746sG+wr8zzCrZw=; b=m2MUUQMdedRmwP cBqeIW8/LylpVay+WyBN65sPZM6vFpPGI2gqBhB/SptzetTnS/ueQNDKhlFN6P86M6lXaPq/NGRgN Wp2fhW35tcSHD0hVAbZ9eCJjyDcGJJ8V59YA8LtEoQb2unn3f2lpZ9RHL5Lepcz4b0u5BqKqYo6d5 PecEbiUDwvl6Jqwrz0lHotUFRSH14JEfjkzdrw1f176p9NON3zqfAfabWYI3UHoJVdfLH0Fjor0eR 0Wpkzbtr9vPvAhZxZ3Ai8r+UeKMEcgkVhVmlpHR7LOJvikeCI9Jz8ARA2PR6tVnkeWboAd4bP5bwx ir2/8spJbFxaoNwuRQIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1suAtS-0000000BGHj-019J; Fri, 27 Sep 2024 13:20:22 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1suAnV-0000000BF2C-2P6u for linux-riscv@lists.infradead.org; Fri, 27 Sep 2024 13:14:14 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 099685C5BF4; Fri, 27 Sep 2024 13:14:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3F07C4CEC6; Fri, 27 Sep 2024 13:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727442851; bh=8pMZwnUpWYbMv5a6Ys7FBJs8RZEhlrFBSSH8QX77gP4=; h=From:To:Cc:Subject:Date:From; b=NAuzruMaylwxNLXYEombG2Q63XYZuh7ra2rE41KnwWlD+3OY2aUP8oDj1p8SNEj2d mgZpRubwXSN4IH/noP/GcjUA8swurAkiJJNsT7XQbhtGThlSZimsNRY2szPjj8Zrse fa/v/cs52p0ghTTQMxbXpa2Cg27wjCAg1bqMGHLq2KozgJWlSjOLcFEDa6ZPsIBlI4 pe5FLNHI+LEveVLIqDHWoG3/z4KYBTumN15mYCYSpNnBAq9rg4PCL1oxRsKqnw11Mo vug3zOxvrRbxtcDtTE5DPFGHXlueB0l1FJDFv1tM5YKl/Kw3ac46aS8fWFxRh8MSmb TPGT0AUvT651A== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , bpf@vger.kernel.org, netdev@vger.kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Charlie Jenkins Subject: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path Date: Fri, 27 Sep 2024 15:13:52 +0200 Message-ID: <20240927131355.350918-1-bjorn@kernel.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240927_061413_685579_F7E6ADBB X-CRM114-Status: UNSURE ( 7.48 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Björn Töpel libbpf does not include the per-arch tools include path, e.g. tools/arch/riscv/include. Some architectures depend those files to build properly. Include tools/arch/$(SUBARCH)/include in the libbpf build. Fixes: 6d74d178fe6e ("tools: Add riscv barrier implementation") Signed-off-by: Björn Töpel Tested-by: Alexandre Ghiti Reported-by: Andreas Schwab Tested-by: Kexy Biscuit --- tools/lib/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: db5ca265e3334b48c4e3fa07eef79e8bc578c430 diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 1b22f0f37288..857a5f7b413d 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -61,7 +61,8 @@ ifndef VERBOSE endif INCLUDES = -I$(or $(OUTPUT),.) \ - -I$(srctree)/tools/include -I$(srctree)/tools/include/uapi + -I$(srctree)/tools/include -I$(srctree)/tools/include/uapi \ + -I$(srctree)/tools/arch/$(SRCARCH)/include export prefix libdir src obj From patchwork Fri Sep 27 13:13:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 13814292 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 387C1CDD1AF for ; Fri, 27 Sep 2024 13:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XM3US4aGb4zxJwWrDSscO6Vp9WsfYozoONFekOvKAsE=; b=c6weJ8Q0NPsBtS AK/zzr/2LCo2iapJ5h2Vs4LrjsZpnUmB8vgRI5SOf2bj7V3vRk6j7HZbBbxYbRX7blgZxajaIzR9N mOWpBVfkTPb0YM59zreXo1M1rxYe5MoXcWKzS2EO47IIPOWl9W00z32RxkJnUbddznlFGziS43yWX u1DmfCZjaG0BRY5RwZwIW8UGsJyVaXq4E2NvnqEr0Gjapdno7Y0edgS8wQ0VL+TSB72WCI4v8Wj74 3jshPCWUpmqFpuNkIq33HbKp8SSP0DSLYVWswHXwoS3RkoPDOgbuos10aZCB3XgVMP2H+lhdbzJxw TnvuL1Vkoz64kq/fCQcw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1suAtS-0000000BGI7-2tQA; Fri, 27 Sep 2024 13:20:22 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1suAnW-0000000BF2k-468X for linux-riscv@lists.infradead.org; Fri, 27 Sep 2024 13:14:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6EBAE5C5C8E; Fri, 27 Sep 2024 13:14:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12D65C4CECF; Fri, 27 Sep 2024 13:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727442854; bh=lD7X3F4aQ/DImEMn86wtBbghQxJBS+VINHajn6ohurg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HcAAV3e94G5tfukXw6esqeXcQngIwF6ANCFn55VINpxDqY+aXJe+qTQAw/QXDna4P tEPEqoVP9orhnYRsUUsvO/kn/UAEnddgJIb1hXW8nNlJ7QBxbuEK1QZtmkORScMCJK 0X/uCPHyFVRPF0jLHfpHWSNHmJVkog+TxTb9SUW1ZosS7wSI2vL1auCike6htB/2SJ UaqomXoJj1vpV6DaiazieraciOTcpAJo8AKDW0CfS5ws7ICZ1D1Cfs9yiLV5ruU+id nBWtslwECXay1dByV2zMHZc85rs9kNG3qBKX7jLRXaE023R79ZSIY8kem/1fi1MTCT iZA/RFziNyQWg== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , bpf@vger.kernel.org, netdev@vger.kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Charlie Jenkins Subject: [PATCH bpf-next 2/2] selftests: bpf: Add missing per-arch include path Date: Fri, 27 Sep 2024 15:13:53 +0200 Message-ID: <20240927131355.350918-2-bjorn@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240927131355.350918-1-bjorn@kernel.org> References: <20240927131355.350918-1-bjorn@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240927_061415_087491_A4B42D87 X-CRM114-Status: UNSURE ( 7.76 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Björn Töpel The prog_tests programs do not include the per-arch tools include path, e.g. tools/arch/riscv/include. Some architectures depend those files to build properly. Include tools/arch/$(SUBARCH)/include in the selftests bpf build. Fixes: 6d74d178fe6e ("tools: Add riscv barrier implementation") Signed-off-by: Björn Töpel --- tools/testing/selftests/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 365740f24d2e..d6a53afa449f 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -10,6 +10,7 @@ TOOLSDIR := $(abspath ../../..) LIBDIR := $(TOOLSDIR)/lib BPFDIR := $(LIBDIR)/bpf TOOLSINCDIR := $(TOOLSDIR)/include +TOOLSARCHINCDIR := $(TOOLSDIR)/arch/$(SRCARCH)/include BPFTOOLDIR := $(TOOLSDIR)/bpf/bpftool APIDIR := $(TOOLSINCDIR)/uapi ifneq ($(O),) @@ -44,7 +45,7 @@ CFLAGS += -g $(OPT_FLAGS) -rdynamic \ -Wall -Werror -fno-omit-frame-pointer \ $(GENFLAGS) $(SAN_CFLAGS) $(LIBELF_CFLAGS) \ -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR) \ - -I$(TOOLSINCDIR) -I$(APIDIR) -I$(OUTPUT) + -I$(TOOLSINCDIR) -I$(TOOLSARCHINCDIR) -I$(APIDIR) -I$(OUTPUT) LDFLAGS += $(SAN_LDFLAGS) LDLIBS += $(LIBELF_LIBS) -lz -lrt -lpthread