From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f4.google.com (mail-pj2-f4.google.com [74.125.227.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EAB2415F22 for ; Tue, 21 Jul 2026 17:48:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.132 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656130; cv=none; b=oXGxop9q1T+Uhrc/8xFcJkTXvrYSylV0R/BjAx/BWz3luS0ycDocxBwBSpnBY316vJqqdyCLD8jJ+Xg16TKXBrWxmajY1Dt4Bl+/mmx90QDq/uEpKnf8TiTvlcIZQNqK+wbqoGmwg5gr90O4IZ5f4F/nRlcVedymoNWLgDQJ6e4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656130; c=relaxed/simple; bh=sRoAOqve++B63kDPpInmDmu+xh4/uy82qPpeQLmoTZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ja23GprUIeaI0HNVieWhfP4XO+PRSb86XIb0tizNLcyihqARzdjrPS3IQL2PNj3gTBIz7o5v4XMFQ0/cZkWRDG05UIPkdtlePOlsSCSWz9Q52OJ59KNpfza/001YMSEjMw+G/tLud73PG2IJPnRXXxcmvX3wnLHAAUR87Eupb/k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UtUM5tXN; arc=none smtp.client-ip=74.125.227.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UtUM5tXN" Received: by mail-pj2-f4.google.com with SMTP id 98e67ed59e1d1-38111ea8a88so7789767a91.1 for ; Tue, 21 Jul 2026 10:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784656123; x=1785260923; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jApOwXpBhXqEU1tu6BspXbjxNN8qabGRryStwscMjoo=; b=UtUM5tXNxah0MeaB2u4x9Z/b6ueSU8GdalGAbwyRqFFnrNMo43HQAGLjmb2DRAs9UV FdYMo75b95znPf4jVK2MxidJyVilzE0xALTBe1xQmCfqHEAxJZb//O0FBK5O/vBlmxd8 qziNSexSv8AJ4EMEg3D151EarB/I6EWyxvy6RYaZpE3WG9OV8gO2fY767ofBf28YfF3z bSnlgbLJYkHCOOR6+15ue9Ds3py+N6IpPOZnY9dUTLpBxyT9+pd4wJrl+tq4wsQkrmHU lTXl9iSrZi1qAreQtr+Xf6hPUmes9oA593ITV2ziqt+9e/VegmlXr6ummtq3P5P7C1aW L22w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784656123; x=1785260923; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=jApOwXpBhXqEU1tu6BspXbjxNN8qabGRryStwscMjoo=; b=jOfYmM08cAfatIy5T4J7Q/5kxya5xebeJgTV2cGKalmbH8MhoA5Hmfgr7r45n6uQ9o XMB40/Bvv4jQrSsBAibCFn7V3NwEDsCEAC3Lzj6OIZvcuemzkX2rEs+sS5rVFBdk1rYf ozo+tg+0+orG5ZKKN8eakPZt55NbS9LkA+UYV8apDrs1qqyqhNyVHqA7PdqKEZtURCO4 m9cGp7JOA0J5TWW0h1ZRggamtwd6j7J1Nigsk1i9nqDhi8VSqWOX4wQNJSQIlNxSc56k E7E5KiiYfxtivIb/dWY0szUOe923OUhCrLuk9irhGS5FGOuFSq/3sj0U6+VkQ7hPseNu L2ag== X-Forwarded-Encrypted: i=1; AHgh+RoWLp0sWudcTYOz2Y19JyDgNUctsxT+b4QcRTic6uCuc0T0M6i50knfrLQxsn20cupGumyQ4036jhA2dA==@vger.kernel.org X-Gm-Message-State: AOJu0Yz+Oh2zLmkY3JoVkzTcF/H8f0vtkGH+4isesF+i/gDvXjtrB8cJ GtQ+lz3VbBWS64UcMroArNU1iUW8odrSACjaU5/u5dBb4cYBu/GUr1Ig X-Gm-Gg: AR+sD13a6eWcbY580//1DLFv5NvtdRALrJz2eSJNCdGwozJtLhWC1DRMbmjk1RiIjzb 8URlwxg5iVPaXzQewbIu9g8+D7eaUUIPIcrcHqletH4TtynrLhTQJnxb/rUt4CHQSS6V7U188++ LkjuGcVviZgIdgO/fJTrZO2QtBEvOAvl4qScNONWkK3dPSMWaGxQagGf10H0Az/UubnoG+NofAA qUiZVSgR3NcTi3EcgtFTiUCNGmPLYmmhZCoXhXNXYOBDwULn2vAPwmkNIIf62Zqhi8/OlhkPCAK glAmphrV8u8DbHZYudIL+dD4W7JdoEzfNRo4cs8wLyR/j4Ta0NXdKIjiIgwYAKhUrpSxiqjAwnV 5d3b4PIt3fhYYZ1BcL6pN928MZ1Waw84b8GaKDw2BT8xYLRAAP1PyWaujiNjTJ8b/hst2vw3o X-Received: by 2002:a05:6a21:a393:b0:3c3:9251:fe49 with SMTP id adf61e73a8af0-3c3ad972d5bmr20981964637.50.1784656123174; Tue, 21 Jul 2026 10:48:43 -0700 (PDT) Received: from localhost ([2a03:2880:9ff:66::]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc193f8sm2331163eec.1.2026.07.21.10.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 10:48:42 -0700 (PDT) From: Ziyang Men To: Shuah Khan , Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Jiri Kosina , Benjamin Tissoires , David Vernet , Eduard Zingerman Cc: Andrea Righi , Changwoo Min , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , JP Kobryn , Mykola Lysenko , Nathan Chancellor , linux-kselftest@vger.kernel.org, cgroups@vger.kernel.org, linux-input@vger.kernel.org, sched-ext@lists.linux.dev, linux-mm@kvack.org, kernel-team@meta.com, bpf@vger.kernel.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org, Ziyang Men Subject: [PATCH v2 3/4] selftests/hid: build the BPF program via the shared lib.bpf.mk Date: Tue, 21 Jul 2026 10:48:32 -0700 Message-ID: <20260721174833.1232771-4-ziyang.meme@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721174833.1232771-1-ziyang.meme@gmail.com> References: <20260721174833.1232771-1-ziyang.meme@gmail.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit hid carries its own ~150 lines of libbpf + bpftool + vmlinux.h + BPF-object + skeleton build machinery, copied from selftests/bpf. Replace it with an include of the shared tools/testing/selftests/lib.bpf.mk, so that the previous ~150 lines of BPF build configuration can now be achieved in only ~10 lines. hid keeps the legacy progs/.c layout, so it sets BPF_PROG_EXT := .c and passes its shared BPF headers through BPF_EXTRA_HDRS. It also gains the fragment's -Wall on the BPF compile, which its old Makefile did not set; hid.c has a few pre-existing unused locals, so BPF_EXTRA_CFLAGS := -Wno-unused-variable keeps the previous behaviour without touching the program source. The conversion drops two pieces of dead machinery hid had copied from selftests/bpf: a resolve_btfids build that was never a prerequisite of any target, and a CLANG_CFLAGS variable that was never passed to any compile. No functional change: the generated hid.skel.h public API is byte-identical before and after, hid_bpf and hidraw are built and linked the same way, and the folder builds cleanly under both plain make and LLVM=1. Suggested-by: Shakeel Butt Suggested-by: Eduard Zingerman Suggested-by: Mykola Lysenko Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Ziyang Men --- tools/testing/selftests/hid/Makefile | 182 +++------------------------ 1 file changed, 20 insertions(+), 162 deletions(-) diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile index 2f423de83147..48def484703c 100644 --- a/tools/testing/selftests/hid/Makefile +++ b/tools/testing/selftests/hid/Makefile @@ -58,172 +58,31 @@ override define CLEAN $(Q)$(RM) -r $(EXTRA_CLEAN) endef -include ../lib.mk +# The BPF program (progs/hid.c) is compiled into a skeleton by the shared +# tools/testing/selftests/lib.bpf.mk fragment. hid keeps the legacy +# progs/.c layout, so point BPF_PROG_EXT at .c and hand the fragment +# hid's shared BPF headers as extra prerequisites. BPF_EXTRA_HDRS is deferred +# because it references $(BPFDIR), which lib.bpf.mk defines. +BPF_SRCS := progs/hid.c +BPF_PROG_EXT := .c +BPF_EXTRA_HDRS = $(wildcard progs/*.h) $(wildcard $(BPFDIR)/hid_bpf_*.h) \ + $(wildcard $(BPFDIR)/*.bpf.h) +# hid.c predates the shared -Wall (hid's old Makefile didn't set it) and has a +# few unused locals; tolerate that pre-existing warning without touching the +# program source. +BPF_EXTRA_CFLAGS := -Wno-unused-variable -TOOLSDIR := $(top_srcdir)/tools -LIBDIR := $(TOOLSDIR)/lib -BPFDIR := $(LIBDIR)/bpf -TOOLSINCDIR := $(TOOLSDIR)/include -BPFTOOLDIR := $(TOOLSDIR)/bpf/bpftool -SCRATCH_DIR := $(OUTPUT)/tools -BUILD_DIR := $(SCRATCH_DIR)/build -INCLUDE_DIR := $(SCRATCH_DIR)/include -BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a -ifneq ($(CROSS_COMPILE),) -HOST_BUILD_DIR := $(BUILD_DIR)/host -HOST_SCRATCH_DIR := $(OUTPUT)/host-tools -HOST_INCLUDE_DIR := $(HOST_SCRATCH_DIR)/include -else -HOST_BUILD_DIR := $(BUILD_DIR) -HOST_SCRATCH_DIR := $(SCRATCH_DIR) -HOST_INCLUDE_DIR := $(INCLUDE_DIR) -endif -HOST_BPFOBJ := $(HOST_BUILD_DIR)/libbpf/libbpf.a -RESOLVE_BTFIDS := $(HOST_BUILD_DIR)/resolve_btfids/resolve_btfids - -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)))) -ifeq ($(VMLINUX_BTF),) -$(error Cannot find a vmlinux for VMLINUX_BTF at any of "$(VMLINUX_BTF_PATHS)") -endif +include ../lib.mk +include ../lib.bpf.mk -# Define simple and short `make test_progs`, `make test_sysctl`, etc targets -# to build individual tests. +# Define simple and short `make hid_bpf`, `make hidraw` targets. # NOTE: Semicolon at the end is critical to override lib.mk's default static # rule for binaries. $(notdir $(TEST_GEN_PROGS)): %: $(OUTPUT)/% ; -# sort removes libbpf duplicates when not cross-building -MAKE_DIRS := $(sort $(BUILD_DIR)/libbpf $(HOST_BUILD_DIR)/libbpf \ - $(HOST_BUILD_DIR)/bpftool $(HOST_BUILD_DIR)/resolve_btfids \ - $(INCLUDE_DIR)) -$(MAKE_DIRS): - $(call msg,MKDIR,,$@) - $(Q)mkdir -p $@ - -DEFAULT_BPFTOOL := $(HOST_SCRATCH_DIR)/sbin/bpftool - -TEST_GEN_PROGS_EXTENDED += $(DEFAULT_BPFTOOL) - -$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(BPFOBJ) - -BPFTOOL ?= $(DEFAULT_BPFTOOL) -$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ - $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/bpftool - $(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \ - ARCH= CROSS_COMPILE= CC=$(HOSTCC) LD=$(HOSTLD) \ - EXTRA_CFLAGS='-g -O0' \ - OUTPUT=$(HOST_BUILD_DIR)/bpftool/ \ - LIBBPF_OUTPUT=$(HOST_BUILD_DIR)/libbpf/ \ - LIBBPF_DESTDIR=$(HOST_SCRATCH_DIR)/ \ - prefix= DESTDIR=$(HOST_SCRATCH_DIR)/ install-bin - -$(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ - | $(BUILD_DIR)/libbpf - $(Q)$(MAKE) $(submake_extras) -C $(BPFDIR) OUTPUT=$(BUILD_DIR)/libbpf/ \ - EXTRA_CFLAGS='-g -O0' \ - DESTDIR=$(SCRATCH_DIR) prefix= all install_headers - -ifneq ($(BPFOBJ),$(HOST_BPFOBJ)) -$(HOST_BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ - | $(HOST_BUILD_DIR)/libbpf - $(Q)$(MAKE) $(submake_extras) -C $(BPFDIR) \ - EXTRA_CFLAGS='-g -O0' ARCH= CROSS_COMPILE= \ - OUTPUT=$(HOST_BUILD_DIR)/libbpf/ CC=$(HOSTCC) LD=$(HOSTLD) \ - DESTDIR=$(HOST_SCRATCH_DIR)/ prefix= all install_headers -endif - -$(INCLUDE_DIR)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) | $(INCLUDE_DIR) -ifeq ($(VMLINUX_H),) - $(call msg,GEN,,$@) - $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF) format c > $@ -else - $(call msg,CP,,$@) - $(Q)cp "$(VMLINUX_H)" $@ -endif - -$(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids \ - $(TOOLSDIR)/bpf/resolve_btfids/main.c \ - $(TOOLSDIR)/lib/rbtree.c \ - $(TOOLSDIR)/lib/zalloc.c \ - $(TOOLSDIR)/lib/string.c \ - $(TOOLSDIR)/lib/ctype.c \ - $(TOOLSDIR)/lib/str_error_r.c - $(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/resolve_btfids \ - CC=$(HOSTCC) LD=$(HOSTLD) AR=$(HOSTAR) \ - LIBBPF_INCLUDE=$(HOST_INCLUDE_DIR) \ - OUTPUT=$(HOST_BUILD_DIR)/resolve_btfids/ BPFOBJ=$(HOST_BPFOBJ) - -# Get Clang's default includes on this system, as opposed to those seen by -# '--target=bpf'. This fixes "missing" files on some architectures/distros, -# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc. -# -# Use '-idirafter': Don't interfere with include mechanics except where the -# build would have failed anyways. -define get_sys_includes -$(shell $(1) -v -E - &1 \ - | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \ -$(shell $(1) -dM -E - $@ +# Each test binary links against the in-tree static libbpf that lib.bpf.mk +# built (lib.mk has already prefixed TEST_GEN_PROGS with $(OUTPUT)/). +$(TEST_GEN_PROGS): $(BPFOBJ) $(OUTPUT)/%.o: %.c $(BPF_SKELS) hid_common.h $(call msg,CC,,$@) @@ -233,5 +92,4 @@ $(OUTPUT)/%: $(OUTPUT)/%.o $(call msg,BINARY,,$@) $(Q)$(LINK.c) $^ $(LDLIBS) -o $@ -EXTRA_CLEAN := $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) feature bpftool \ - $(addprefix $(OUTPUT)/,*.o *.skel.h no_alu32) +EXTRA_CLEAN += feature bpftool $(addprefix $(OUTPUT)/,*.o no_alu32) -- 2.53.0-Meta