From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 44CEF3AC0E4 for ; Thu, 10 Sep 2026 23:33:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789083220; cv=none; b=Yu4D66uTIffzXkYmrR+tvMcCscRgE3LT6jjrlojpDa2VtBpX0+iRu6eOiAK5/Wz/krb/0rFKNfUsXIINMA+IffS+cAMjaYeVgW5l4yQd2wtL6CNS6ftyticI8qBs1/BvdpWbqOh1OO5IEB4fgm3yLJhhP4NTSLZ3kr8VEs5xEBs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789083220; c=relaxed/simple; bh=CFZl7E/T7hsA/mKXCg0BES3xc8sd+pvX6iOVoxrDtns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HnpNC15anBGTVcqEueI2nEdHW70fZZMcy+w97SsFBEyHW24R4PJctKc7kvC6O7a3cq3tb4TOOf77J+CqBP1oSyBFOIUUwp63Xe4Nh+bjAmbhEh39hzTnSXzaKnuaYSsIJF72z1gEnPuhISo+YFYEur+i7u1wTPgXNbxZXWUl+Bg= 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=pQoTuPlf; arc=none smtp.client-ip=209.85.214.169 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="pQoTuPlf" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2caced6038eso3902775ad.0 for ; Thu, 10 Sep 2026 16:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789083216; x=1789688016; 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=zd2gkMuIc1TcNe9YCvTi4dDIYFUJcR5yO2iE7XwTG+I=; b=pQoTuPlfmsMZksLKVCtVFnoIrTdEGs//giWzJI+JHKKYQLg0YlRCEfcCr+txVy1Oa6 E7ePhAeqZMJg3LpMvJ46VMxnCSVcc+fZyh7VwCpHyFgAmULCN6T8ZnugCNogFev2inyV +qK75xqM5G+mkWj1DQbNkVIU0LwoKLPXb8L8wgR7F7Bo97IXocUL7PIWr9MipKJb5N5o cfaPy4rYyYG8uEjxtlrDNvpv6euX2SJR8akd56RIpIiy3JI/DkkCgLduLaFJlGssBKDP OipnHFS/IP1PCTX7gUVmRqIhjJ+cRrAc8RezcW1c4jsi77unWUvC+oebPpQQbFrIEZzM WGKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789083216; x=1789688016; 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=zd2gkMuIc1TcNe9YCvTi4dDIYFUJcR5yO2iE7XwTG+I=; b=S6qTrbwqS9969/Hj+R6c6QSQ1iVON02BLcsdGrImjzqhnmCLrmhGriI+DUuO7MTTpg wsNjW4HPjUNrD6iBSFQdclhWZ+/RtSl00brpZuTE7+s9JPCkxvuvIlBdmaM9RWTE/lRc Ig3duqxauW5NL2+539wmEs9AtMSG0Zu6b14zbZ5hi5nQOFjw75Bdk8ck5RvInGfo0qyN P2lJjeo+OI/tBKPr+m23+SU9gNIL8Xs7WDNhzgvON48ejnLIwFrENm50TKUrb/gE+1hA ZqFHOyDopv0jAjNm/PQqpxP3pjzQO++YCpUMKQhLhe4eEAu1xp4bzKddKfW0qvgubLyj oSug== X-Forwarded-Encrypted: i=1; AKwUvByUQYgvHVwDuKd0l+xfWllJP4bGCvU2i91yk6u1FYoORYn50py0OKZDsTABNoUpUxDq6SjFD+NL@vger.kernel.org X-Gm-Message-State: AFuF++k1JUsPYZpUt4SQTtZHbjYRK4uChW7pDokI6iYMyDvKk7HTuDD0 K2xyXQVXInb8UEVLvZBtER2rogUxbcrwl0TUabyJA2yCqqnt9gPgHxry X-Gm-Gg: AYBFou0Qsm3Tn8/wg9tTvcMwBTdyMe9VvkHWbl4jVbGy8xWLHHdby2ASFPsHlihaq8g qd/NAJDJ0/k9C7S4zVPFEcNCb2UvuC2pld17Pi1gO+74yFg2ckU63jAgCJYVnklpkjpOY5Hr0DB WGnpSbTBpg8CEq8gQTQtSJ5/t7MHl85WyHLrmaESCVYRyG1Ld774PmiAbKulSOWVCQD7qXAuNEI 1Z4XA5c4OXRmGBWtETsZgwfYSxJkE59QhladNEpDBytuxk8i+dj21AhRGje9pDHX1X3fAe/DdJS ggMZBMssia9Qf+NMtljf8Cr3tI6DiVhux7rgSQ31lsbgvzMW/r3opmO3C66s2wUnphBEb1NNDOv s5Oa10Xv288MG8mqC2xnxdWlw6tSD6uqmEgOmOMFt27H8vJb5BjCJM6BDisEsiVHajyrrslAcOq PzAMNj8pfjRAZpNjaAAXWjYUoZ5W1meMjhqVIO666d+O0xl75dq8VeIsvoe5gnEZOnEQ== X-Received: by 2002:a17:903:37c6:b0:2d0:401c:2edc with SMTP id d9443c01a7336-2dd0e8a181dmr75304235ad.1.1789083215583; Thu, 10 Sep 2026 16:33:35 -0700 (PDT) Received: from localhost ([2a03:2880:9ff:6b::]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33ba4e9a3casm1319129eec.12.2026.09.10.16.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 16:33:35 -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 v5 3/4] selftests/hid: build the BPF program via the shared lib.bpf.mk Date: Thu, 10 Sep 2026 16:33:02 -0700 Message-ID: <20260910233303.1063501-4-ziyang.meme@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260910233303.1063501-1-ziyang.meme@gmail.com> References: <20260910233303.1063501-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 remains byte-identical, and hid_bpf and hidraw are linked the same way. The shared fragment also supplies the common warning, language, system-include and adaptive BPF CPU flags. Remove four unused locals so hid.c builds with that warning set without a directory-wide suppression. 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 | 179 ++---------------------- tools/testing/selftests/hid/progs/hid.c | 7 +- 3 files changed, 19 insertions(+), 168 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..1190a747036d 100644 --- a/tools/testing/selftests/hid/Makefile +++ b/tools/testing/selftests/hid/Makefile @@ -47,7 +47,6 @@ msg = else msg = @printf ' %-8s%s %s%s\n' "$(1)" "$(if $(2), [$(2)])" "$(notdir $(3))" "$(if $(4), $(4))"; MAKEFLAGS += --no-print-directory -submake_extras := feature_display=0 endif # override lib.mk's default rules @@ -58,172 +57,25 @@ override define CLEAN $(Q)$(RM) -r $(EXTRA_CLEAN) endef -include ../lib.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 - -# Define simple and short `make test_progs`, `make test_sysctl`, etc targets -# to build individual tests. -# 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 $@ +# Build the legacy progs/*.c layout with the shared BPF rules. +BPF_SRCS := $(wildcard progs/*.c) +BPF_PROG_EXT := .c +# BPFDIR is defined when this recursive variable is expanded. +BPF_EXTRA_HDRS = $(wildcard progs/*.h) $(wildcard $(BPFDIR)/hid_bpf_*.h) \ + $(wildcard $(BPFDIR)/*.bpf.h) -DEFAULT_BPFTOOL := $(HOST_SCRATCH_DIR)/sbin/bpftool +include ../lib.mk +include ../lib.bpf.mk +# Preserve the existing install list. +TEST_GEN_FILES += $(BPF_OBJS) 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 - $@ +# Relink tests when the in-tree libbpf changes. +$(TEST_GEN_PROGS): $(BPFOBJ) $(OUTPUT)/%.o: %.c $(BPF_SKELS) hid_common.h $(call msg,CC,,$@) @@ -233,5 +85,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 += $(OUTPUT)/*.o diff --git a/tools/testing/selftests/hid/progs/hid.c b/tools/testing/selftests/hid/progs/hid.c index b21fbb13c926..ec734e18d23a 100644 --- a/tools/testing/selftests/hid/progs/hid.c +++ b/tools/testing/selftests/hid/progs/hid.c @@ -111,7 +111,7 @@ int hid_user_raw_request(struct hid_hw_request_syscall_args *args) { struct hid_bpf_ctx *ctx; const size_t size = args->size; - int i, ret = 0; + int ret = 0; if (size > sizeof(args->data)) return -7; /* -E2BIG */ @@ -137,7 +137,7 @@ int hid_user_output_report(struct hid_hw_request_syscall_args *args) { struct hid_bpf_ctx *ctx; const size_t size = args->size; - int i, ret = 0; + int ret = 0; if (size > sizeof(args->data)) return -7; /* -E2BIG */ @@ -161,7 +161,7 @@ int hid_user_input_report(struct hid_hw_request_syscall_args *args) { struct hid_bpf_ctx *ctx; const size_t size = args->size; - int i, ret = 0; + int ret = 0; if (size > sizeof(args->data)) return -7; /* -E2BIG */ @@ -417,7 +417,6 @@ SEC("?struct_ops.s/hid_hw_output_report") int BPF_PROG(hid_test_hidraw_output_report, struct hid_bpf_ctx *hctx, __u64 source) { __u8 *data = hid_bpf_get_data(hctx, 0 /* offset */, 3 /* size */); - int ret; if (!data) return 0; /* EPERM check */ -- 2.53.0-Meta