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 3006D431E44 for ; Fri, 14 Aug 2026 07:51:21 +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=1786693890; cv=none; b=fToJt/hFFnKjALhx33KIxlYKrnHl1MtxOktUqPQJLUq0RZqZiypcDIleEiFndRbLedU2K2fx8sTZ+HpQU+hTPlAC85+J+nd1WgYtUnZYo47oSehv671giT2JRzD9eWhn44gbXRywpr84Dj78sq+xRjkGIPlDbETK0xdFnegTL+s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786693890; c=relaxed/simple; bh=kVn96FqvMwMBuSVn/zBD+oSFhXhkjnJo2LaWSB69ZqA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cGpmn2iG4i+e7bdVwSe88Vyr6vKE18KXlUWc6svtSkRkqU8HDaoicMq9eagcHegNjJIiOlc6CEH0OjfAo1mCWw6fulu35djn+7sNVgZYmIClTwUz57wHE8UvPe3gbw4+9O1z31/Tj/KKsjQC6kRoIm76WXIVWIjRKDh9c0EkT4U= 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=UEbBnrXm; 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="UEbBnrXm" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2d01663d816so6893565ad.1 for ; Fri, 14 Aug 2026 00:51:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786693878; x=1787298678; darn=lists.linux.dev; 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=7Tw7QssqNwPoq9ncdKoV/ppucaSKUcHYQcUv1PyBsN0=; b=UEbBnrXmpStYsk04ZFBJ+fvQJTwO96FMuuAlf2p0a1p57LYW/2wQQ7LbaY/zhXyxkC D2mmlkoZ4mnB7ZrViEOeWoCI6Siinh0LVhov7vjveqxVwfe9qQn/6T/LFb+YuBqhJ6yY E4J4UPfJQay1ukmn6sg4qvQfr2Cmz9QUHBNrbKd7u9dx3lwjqMG1vUmo+QuURtEERYXT EVLcNpSR34WMDp+7AD/mfCYD4fz2gv6Hq+QnxUkcJMe+c2nCMCZgtnNAS7mKI6Nn04vz DKzGYiv2KiQdrXPWj9G+lfVclij9IXuEyUTaL/DIHSRHp0ipqL3tavdxQEXQBhhfzYiS 4Aow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786693878; x=1787298678; 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=7Tw7QssqNwPoq9ncdKoV/ppucaSKUcHYQcUv1PyBsN0=; b=LKjbT8lekIRb/hngMw2+BcrLaf1kjEhTfypqCOoNhVgKTujZ/taHxf+dCt0SVPPIbw fdflMT3gM/4N4kUoQYJuIJ/zXqHwzxLwUS3X4nbUm1lk/mqk8DmdPE3RbT1j3z8OrZfw zkABnFFkz1Kk3OOInrRseVJNm703d3AdfX/xfVG9QsZsu1iGBdbtXZmuIwmw3Mqfgeoa Y6AlMgqigbY4SDlASUfPbM19s7nz0bXg9qMk9ogaPO5oBZxfyL4uyRrfS9YNXRFM66Yo ycrdQwYDsehIPfdpQ8j6SPHilOomfOs+ZBuRISkGioTTKmuxkIR2HOnXqg54rEH/xnG/ +0nw== X-Forwarded-Encrypted: i=1; AHgh+RofY4nEYF06tCDF/SDpl+3yB+Aiw8jhvWvj6Gim3MPsaEBUh+9C3o8lg4Jyrct2PO0MzYqM@lists.linux.dev X-Gm-Message-State: AOJu0Yxr6lGN8jCikBWhpJvI4Ut7pLN2MQRhzh8SN0HpQhW6JzGkOyKr rs4l8nqwAZAj4HAcaw6FysBS0/SdwaPT0mQQk92kfZN/nHIyMUYM8Evx X-Gm-Gg: AR+sD11RCuLo5k75/RYgah4UnoSIkF76nFnZ3bZ97BAIo/bnqNUsSXQ2niBXN/7X3EA XtnuATIc6NnrzKanzL1Ez+WLDXxIDQSWIHxGRT81z2ys3n7OadSVqSJmt4Pxh/biuG8nVqlthWx ahAmzkIu15kvi4KD4/7pxOFOEjkrd8EwbQUbjufc2qV0O7y8CSYjBWwp7KZCtKOfMReeGQU2TD9 WOnugeJ4NWjUkzWOZ9Ygim7pbNDMk6lLr2CJ6i9iTc4TTSvuiDE2PrXomTXrb143BTg6zWNZ6yv 9ReCY7hklIOO0FMenyXtJrtC96T9KqsUXzp+yPmyJUYbypAvvwwTptXcLCahNHaZqaHWyhBGZO2 Bo0fxEry0Pi4uIncE4aZbxPvZGT1fcsf/g6VjUbQVZTGbncqr+EVTwpY00fVdhT2Us6LztMT+zf WFtLIvhjvZ7i7zOEqhfj+1PnHptmMtj1yuYFUybAGpZPP+Hj3yq84fDYE= X-Received: by 2002:a05:6a20:cd90:b0:3bf:c28f:8afc with SMTP id adf61e73a8af0-3cc71707793mr4594413637.0.1786693877991; Fri, 14 Aug 2026 00:51:17 -0700 (PDT) Received: from localhost ([2a03:2880:9ff:74::]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-320ea302649sm1331437eec.24.2026.08.14.00.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 00:51:17 -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 4/4] selftests/sched_ext: build BPF schedulers via the shared lib.bpf.mk Date: Fri, 14 Aug 2026 00:50:54 -0700 Message-ID: <20260814075054.507089-5-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: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit sched_ext carried its own ~130 lines of libbpf + bpftool + vmlinux.h + BPF-object + skeleton build machinery. Replace it with an include of the shared tools/testing/selftests/lib.bpf.mk, making sched_ext the third in-tree consumer of that fragment, after selftests/cgroup and selftests/hid. All 28 skeletons and 28 subskeletons keep a same public API before and after, the runner builds and links 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/sched_ext/Makefile | 146 +++++---------------- 1 file changed, 30 insertions(+), 116 deletions(-) diff --git a/tools/testing/selftests/sched_ext/Makefile b/tools/testing/selftests/sched_ext/Makefile index 5d2dffca0e91..620e8cb31e6f 100644 --- a/tools/testing/selftests/sched_ext/Makefile +++ b/tools/testing/selftests/sched_ext/Makefile @@ -14,48 +14,32 @@ CURDIR := $(abspath .) REPOROOT := $(abspath ../../../..) TOOLSDIR := $(REPOROOT)/tools LIBDIR := $(TOOLSDIR)/lib -BPFDIR := $(LIBDIR)/bpf TOOLSINCDIR := $(TOOLSDIR)/include -BPFTOOLDIR := $(TOOLSDIR)/bpf/bpftool APIDIR := $(TOOLSINCDIR)/uapi GENDIR := $(REPOROOT)/include/generated GENHDR := $(GENDIR)/autoconf.h -SCXTOOLSDIR := $(TOOLSDIR)/sched_ext SCXTOOLSINCDIR := $(TOOLSDIR)/sched_ext/include -OUTPUT_DIR := $(OUTPUT)/build -OBJ_DIR := $(OUTPUT_DIR)/obj -INCLUDE_DIR := $(OUTPUT_DIR)/include -BPFOBJ_DIR := $(OBJ_DIR)/libbpf -SCXOBJ_DIR := $(OBJ_DIR)/sched_ext -BPFOBJ := $(BPFOBJ_DIR)/libbpf.a -LIBBPF_OUTPUT := $(OBJ_DIR)/libbpf/libbpf.a - -DEFAULT_BPFTOOL := $(OUTPUT_DIR)/host/sbin/bpftool -HOST_OBJ_DIR := $(OBJ_DIR)/host/bpftool -HOST_LIBBPF_OUTPUT := $(OBJ_DIR)/host/libbpf/ -HOST_LIBBPF_DESTDIR := $(OUTPUT_DIR)/host/ -HOST_DESTDIR := $(OUTPUT_DIR)/host/ - -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 +# The schedulers are built by ../lib.bpf.mk: modern *.bpf.c layout, a +# .bpf.skel.h suffix, and subskeletons. +BPF_SRCS := $(wildcard *.bpf.c) +BPF_SKEL_EXT := .bpf.skel.h +BPF_GEN_SUBSKEL := 1 +# Keep the generated files under build/ as before. SCXOBJ_DIR (userspace +# objects) reuses the BPF object dir. +BPF_OBJ_DIR := $(OUTPUT)/build/obj/sched_ext +BPF_SKEL_DIR := $(OUTPUT)/build/include +SCXOBJ_DIR := $(BPF_OBJ_DIR) -BPFTOOL ?= $(DEFAULT_BPFTOOL) +include ../lib.bpf.mk ifneq ($(wildcard $(GENHDR)),) GENFLAGS := -DHAVE_GENHDR endif CFLAGS += -g -O2 -rdynamic -pthread -Wall -Werror $(GENFLAGS) \ - -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR) \ - -I$(TOOLSINCDIR) -I$(APIDIR) -I$(CURDIR)/include -I$(SCXTOOLSINCDIR) + -I$(GENDIR) -I$(LIBDIR) -I$(TOOLSINCDIR) -I$(APIDIR) \ + -I$(CURDIR)/include -I$(SCXTOOLSINCDIR) # Silence some warnings when compiled with clang ifneq ($(LLVM),) @@ -64,102 +48,30 @@ endif LDFLAGS = -lelf -lz -lpthread -lzstd -IS_LITTLE_ENDIAN = $(shell $(CC) -dM -E - &1 \ - | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \ -$(shell $(1) $(2) -dM -E - $@ -else - $(call msg,CP,,$@) - $(Q)cp "$(VMLINUX_H)" $@ -endif + $(BPF_EXTRA_CFLAGS) -$(SCXOBJ_DIR)/%.bpf.o: %.bpf.c $(INCLUDE_DIR)/vmlinux.h | $(BPFOBJ) $(SCXOBJ_DIR) - $(call msg,CLNG-BPF,,$(notdir $@)) - $(Q)$(CLANG) $(BPF_CFLAGS) -target bpf -c $< -o $@ - -$(INCLUDE_DIR)/%.bpf.skel.h: $(SCXOBJ_DIR)/%.bpf.o $(INCLUDE_DIR)/vmlinux.h $(BPFTOOL) | $(INCLUDE_DIR) - $(eval sched=$(notdir $@)) - $(call msg,GEN-SKEL,,$(sched)) - $(Q)$(BPFTOOL) gen object $(<:.o=.linked1.o) $< - $(Q)$(BPFTOOL) gen object $(<:.o=.linked2.o) $(<:.o=.linked1.o) - $(Q)$(BPFTOOL) gen object $(<:.o=.linked3.o) $(<:.o=.linked2.o) - $(Q)diff $(<:.o=.linked2.o) $(<:.o=.linked3.o) - $(Q)$(BPFTOOL) gen skeleton $(<:.o=.linked3.o) name $(subst .bpf.skel.h,,$(sched)) > $@ - $(Q)$(BPFTOOL) gen subskeleton $(<:.o=.linked3.o) name $(subst .bpf.skel.h,,$(sched)) > $(@:.skel.h=.subskel.h) +EXTRA_CLEAN += $(OUTPUT)/build ################ # C schedulers # ################ -override define CLEAN - rm -rf $(OUTPUT_DIR) - rm -f $(TEST_GEN_PROGS) -endef - -# Every testcase takes all of the BPF progs are dependencies by default. This +# Every testcase takes all of the BPF progs as dependencies by default. This # allows testcases to load any BPF scheduler, which is useful for testcases # that don't need their own prog to run their test. -all_test_bpfprogs := $(foreach prog,$(wildcard *.bpf.c),$(INCLUDE_DIR)/$(patsubst %.c,%.skel.h,$(prog))) +all_test_bpfprogs := $(BPF_SKELS) auto-test-targets := \ create_dsq \ @@ -195,7 +107,8 @@ auto-test-targets := \ testcase-targets := $(addsuffix .o,$(addprefix $(SCXOBJ_DIR)/,$(auto-test-targets))) $(SCXOBJ_DIR)/runner.o: runner.c | $(SCXOBJ_DIR) $(BPFOBJ) - $(CC) $(CFLAGS) -c $< -o $@ + $(call msg,CC,,$@) + $(Q)$(CC) $(CFLAGS) -c $< -o $@ # Create all of the test targets object files, whose testcase objects will be # registered into the runner in ELF constructors. @@ -204,15 +117,16 @@ $(SCXOBJ_DIR)/runner.o: runner.c | $(SCXOBJ_DIR) $(BPFOBJ) # compiling BPF object files only if one is present, as the wildcard Make # function doesn't support using implicit rules otherwise. $(testcase-targets): $(SCXOBJ_DIR)/%.o: %.c $(SCXOBJ_DIR)/runner.o $(all_test_bpfprogs) | $(SCXOBJ_DIR) - $(eval test=$(patsubst %.o,%.c,$(notdir $@))) - $(CC) $(CFLAGS) -c $< -o $@ + $(call msg,CC,,$@) + $(Q)$(CC) $(CFLAGS) -c $< -o $@ $(SCXOBJ_DIR)/util.o: util.c | $(SCXOBJ_DIR) - $(CC) $(CFLAGS) -c $< -o $@ + $(call msg,CC,,$@) + $(Q)$(CC) $(CFLAGS) -c $< -o $@ $(OUTPUT)/runner: $(SCXOBJ_DIR)/runner.o $(SCXOBJ_DIR)/util.o $(BPFOBJ) $(testcase-targets) - @echo "$(testcase-targets)" - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + $(call msg,BINARY,,$@) + $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) .DEFAULT_GOAL := all -- 2.53.0-Meta