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: 13814284 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2F22A189502; Fri, 27 Sep 2024 13:14:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727442852; cv=none; b=To2oiB6Xx1wuae+DkaDUU5kh56lhwPiEYALPup3Qd6kaK7bB3/s031tMpvDTCKFgipq6vVJzzk9V97uJmeO8B3n2YadmX+6/EfnNMFBb6aL1AOubW2I+NbzkUolkhsztaweaLs8sA+m+nN9mL0MzlJZfAdoc4Ax5xFz9QzfwatU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727442852; c=relaxed/simple; bh=8pMZwnUpWYbMv5a6Ys7FBJs8RZEhlrFBSSH8QX77gP4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=F7ir2z/ToqgIkAdEyMKHzLk3tyZh7kNvCrztN0lhJy8jg/M/ZkYgk0v9UaEWCQ8IlW6R7mM+adsoIjTCO17jl0kqlxjRD5Ks788F62GOYRe7lR+RNfwr1cePonDjAXhiZUlt8H0iWcTO/3csJ/qSkExz0UHcCNZvSXsDBgojrcg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NAuzruMa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NAuzruMa" 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 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13814285 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7FE8B18E04B; Fri, 27 Sep 2024 13:14:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727442854; cv=none; b=bp/wlE/oebjbofrL9g6ND+LzFyKDIr6mOWaP0aq3GGTlnPimkccR3lApfhGRM21lV4PFgbJot/RCmVloZxaK6xphtu59YPaE2VqdR/2tSK7RL4nj+B1ehpmcgyHYsirzxf2W1RxmJMxOzKlvTW2IAoa93p1PpeA/Oa+6JJ/V7rw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727442854; c=relaxed/simple; bh=lD7X3F4aQ/DImEMn86wtBbghQxJBS+VINHajn6ohurg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=P26y3I3vLI8lKnfiEtnnqvSC4ASDGl2BhIsDCST6BHDi9gafdwV6apsuWMaJQfyHQAis2hjeA2/HuMYZjfdex9+wOhgIz2OkC+HEhOyjFqe2Qqzu5JnZ4XsAsLcNjN//AX/OJoZ3pnlJTXPC9CESaZ/GUrpHlWHKPoHy7X0s/uk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HcAAV3e9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HcAAV3e9" 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> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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