From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 B4932423A80 for ; Fri, 14 Aug 2026 07:51:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786693885; cv=none; b=eSarrTbrhF5zwnBbrOomkL/ZoOkrCcpI+EDNzBcM0UqrtLoUPNSvxi8jAF8qwgMIBswTulfISJTLlpaoqgMuS+ZqTMN+jjf2IK3Olu+sCUM6U3CPvyWiP6nHFcegQnNMdUC7+1+du2wAQlXAJh7hxTOsJX8w9OZTWC4nTPbsX14= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786693885; c=relaxed/simple; bh=4i2fY5nv4LWBRynnBWy66tM+604aHi4WdBxv+wgPslw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IvHKFH74d0O7fSt1cSTG3z66hyCawi488EZDntdrtuEYRwG45CrFWJRIiVjl98E03G0B5V4MLOyjW3MyyBn57MYIVpl1JOL5yQWkrUIl+g7QKEYG3Z68YsI1yzd5fYeslzXI5C+RICsbHkSOZ59hzA1ALDKndvbV31uHqbtig/o= 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=od4rn2HG; arc=none smtp.client-ip=209.85.214.170 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="od4rn2HG" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2ce98cb8165so6588535ad.1 for ; Fri, 14 Aug 2026 00:51:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786693876; x=1787298676; 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=ic+zxcFnUgGphC+WM5P08jxKZUHNK9ABeGTpRSb9nWQ=; b=od4rn2HGup6IaZGoSQ3zaIVgwt8utWiAhkjBEgcpknYVjxarqlhRWSBbmkNQn0Ch6M ojg2hIDa/WMCzvPPnl/TdP6ji7YNhjLhwNmWl4/A4tLOFkhdVzTaBFou5+w9NER5hHiB xdGwqPnB4GgOLOUIXgv3tFfE1dsjTTk37ZdfwInI7rlGznuHpHfdhnPgBdRllHOZ+idX xVv9wwquVJS7uOgJ/mu2Bd5cnG4Awb06CABsYjI6D43LqlsGpoh74BPkvKwD5o9zmzzH Lv0AzcnVQ0ul5kU4CI/tP9HQtJ7SEhYhQ1kbDbeB8WWpqG4j7uKwr/YSeZBsi+6de9X1 O4dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786693876; x=1787298676; 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=ic+zxcFnUgGphC+WM5P08jxKZUHNK9ABeGTpRSb9nWQ=; b=tNCwjrhc87KfsLPzFkBLsiwLpUesriw+94aGZZEBMiaEe26YHDv7quty4ymYHC/uOO BYwAFsu1h4polBbliSnLL1xfUKIoqf8kS/0TVDJEPq6dBavuyEOdNIBTJKa8jJ21fOUq Iw6aP58xWreJtl/8GVwx8ebKoDlBg3gWMyY7zaiEUND/ULLMnM1LvNt1croswn3sPg3C SY0Bjj9Lw7Xn9KZiO6aHEh+LZwR/X8GHZo3OFonOUn2M73C32R0W82VVu9xjbJgUc0Mx kEHW3GgjplTa5doD0L4rGRKI/a/8cWXNlDfw6/cJrWamY+Z9Zl3dWtYP1c2ausfi9T+V K0Vw== X-Forwarded-Encrypted: i=1; AHgh+RrbsLIOvCCJXE3HCyFfR3xklGEKcbQY6OMQg1MNiG/A7XTLTlVRIVghWHgE4iNbpbGBtoo/RB3o@vger.kernel.org X-Gm-Message-State: AOJu0Yxvy/Os/WmvZ9QECp5lIYey1wm8jIJ84/RzzKaAZnF7s9DI4EoG H0GmKLuqR2YdjR5FSH/hNDY5XKPZoGdz0B/TTb9lKJWWGsWO/ZrLkPJO X-Gm-Gg: AR+sD13dFHKtOpYSFcTx8nXMp+RFY2OE2XzHSrrRZVofYfby0K693pzaAlEISIBLeEy qQ8xZI4dUn9RmBdYpzVXGjVeXKYGkrYa32qh6UWnzIStaPgIYqFky+y8A8AVU7iQKJUCj5q1gs/ Ra8fiP3hzlM4XMzxNTXhcPQqOU86dMdy89TujyoynliNygUWcqYeB2uAJ08rxhoMfmRl13x38Pd bmEh6sesPlDguA0YzZ1aZGYrT3BScbuMUZ+Q0ZR2lAfLLHTwGAhGsH/uQDpgD+YqkqFwXCPi0lf eWiZwn1b9LG9MnCJ0wblMMQ1uQGRdRQzJ4avURrZPjWSNNtjEUMt6gw2RD49yGEl3qiYvhGQr1q y+tJ9RlJkvjvqoIkSuhCDUKYLjo3zQrSSs1spZHtkDykQ4naQR30Gqhx0OQO/qtEXRqGd4z1GEj OIlRLEuI0gN6azBtHjoKGsoxTdB2STtfmtr1tRtIyQ7vPlQs04zfuwWLc= X-Received: by 2002:a17:903:1a0d:b0:2d2:72b6:556b with SMTP id d9443c01a7336-2d37f7b7ca7mr136997765ad.13.1786693876317; Fri, 14 Aug 2026 00:51:16 -0700 (PDT) Received: from localhost ([2a03:2880:9ff:40::]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-320e9df2504sm1278521eec.17.2026.08.14.00.51.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 00:51:15 -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: Viktor Malik , Andrea Righi , Changwoo Min , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , JP Kobryn , Mykola Lysenko , Nathan Chancellor , Ziyang Men , kernel-team@meta.com, linux-kselftest@vger.kernel.org, cgroups@vger.kernel.org, linux-input@vger.kernel.org, sched-ext@lists.linux.dev, linux-mm@kvack.org, bpf@vger.kernel.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/4] selftests/hid: build the BPF program via the shared lib.bpf.mk Date: Fri, 14 Aug 2026 00:50:53 -0700 Message-ID: <20260814075054.507089-4-ziyang.meme@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260814075054.507089-1-ziyang.meme@gmail.com> References: <20260814075054.507089-1-ziyang.meme@gmail.com> Precedence: bulk X-Mailing-List: cgroups@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. The generated hid.skel.h public API is same before and after, hid_bpf and hidraw are built and linked the same way. Suggested-by: Eduard Zingerman Suggested-by: Mykola Lysenko Assisted-by: Claude:claude-opus-5 Signed-off-by: Ziyang Men --- tools/testing/selftests/hid/.gitignore | 1 + tools/testing/selftests/hid/Makefile | 180 +++---------------------- 2 files changed, 20 insertions(+), 161 deletions(-) diff --git a/tools/testing/selftests/hid/.gitignore b/tools/testing/selftests/hid/.gitignore index 933f483815b2..69943301dc1d 100644 --- a/tools/testing/selftests/hid/.gitignore +++ b/tools/testing/selftests/hid/.gitignore @@ -1,5 +1,6 @@ bpftool *.skel.h +*.bpf.d /host-tools /tools hid_bpf diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile index 2f423de83147..1d7c64ec992c 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 +# progs/hid.c is built into a skeleton by ../lib.bpf.mk. hid keeps the legacy +# progs/.c layout, hence BPF_PROG_EXT. BPF_EXTRA_HDRS is deferred: it +# uses $(BPFDIR), which lib.bpf.mk defines. +BPF_SRCS := $(wildcard progs/*.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 and has a few unused locals. +BPF_EXTRA_CFLAGS := -Wno-unused-variable + include ../lib.mk +include ../lib.bpf.mk -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 +# Ship what this directory shipped before the conversion. +TEST_GEN_FILES += $(BPF_OBJS) +TEST_GEN_PROGS_EXTENDED += $(DEFAULT_BPFTOOL) -# 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