From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 BC9D152E048 for ; Tue, 8 Sep 2026 23:56:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788911786; cv=none; b=q4xx05NXmNqeA+e+yyHIBEIPofDxroxZCj85pdIi6Zok+bNlLCJVy0p+gYBhaD1AzWyGlgxs8WcTkZqhQHGRpla5GOSK/b/IOUiCTGCnZkbnW4yIeZ0EiNjvLkVYaNINdZmczOA5wdGUXMcHh6voohl6nPEDd+k3GzjBQMZeru4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788911786; c=relaxed/simple; bh=txHUBulABd3m0OF7Y53+6fpuw2qvy7g4Ft1wH9BXuaY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h2p8EGWOCdP3lE7L8DX08458FNf4mdyC/CIn2vwFXPNYJuLf4HkxKDxgrv1O5TzO1SZYJ8gjFBElkV7VxhplLpfTi05o7lCbjCEuJOSVbOoQu7quL0Z/7uTsjX7G/0GcHla6KbvdMRNj/1IDw+kwO7Qrn6lhg/c9d+JAEwEJlHw= 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=reWDPeYz; arc=none smtp.client-ip=209.85.216.47 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="reWDPeYz" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-398b3c37877so4901004a91.0 for ; Tue, 08 Sep 2026 16:56:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788911782; x=1789516582; 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=uKqFigUfUBeSnFW0KPe67v5MSiJ+XREL1Pj3ehWoLGc=; b=reWDPeYz1olcvrwsK4GM1hVXP0yH9gXK+vsemTSiiarqx/1EzHAtIuxLi+9GdArHJ8 vDliPIpgXh4S9svqN2frJm8QeGMibPl/PTmLKo2GTm5y2z6WibEsUS8Wr3kFpf7v0Gio aHXDgIEJQXN3aSVxbQOvCgX66VOwaC0Q6sY7xk6sUzVWBOlBbH4Vc09oh3QHv1SeKa7V ca5DFgz3LpUgPqLtmamsrwb/PUR2/RbKWQCmtkNojp0gbBBlkmNrTcHyn1y1Sz/jPGL7 2Bs9OvBcXCqB9SbCv9kn1sSYChY+/m0zZtuclVuG0ay45iPpgfOwEa2haLxcHcKyOKN5 ft6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788911782; x=1789516582; 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=uKqFigUfUBeSnFW0KPe67v5MSiJ+XREL1Pj3ehWoLGc=; b=fIaiyw1v21lVeszod45caHmiHWt4wrgSqYAExG31osl2M1gaQ13PaohgUYY6rldj1Q YyesKhRF4mCxq6FGgMYc2lGDJ6XrZE+RIDtsnMoh4DkzHJEVYgijy2wA+KruGcSISj2B vqEdLFJtmNex4fBQMe4p0LchDUzLzZ35JJD44aKbAQHj4VBLoImoFMJXigExjBC8MKSE M3t5ekLOOpKpzbILvNikSz647LXh8uOtip0iKGdK/oBCxPrVGLnMVZUstDlUrCkaegfq JId72nv1Ev0cerTGNdoUnjuo5hc2jaDb7KGREmt1BQp7Vr1PdtRKYi0YgS9sNPKlfqrz D+fg== X-Forwarded-Encrypted: i=1; AKwUvBzsji+yVeSzIrFg3loq6aWk9U9z+qvLeTGXQQ9D88CjHLCoNVPvqs6efoelgp4mAijKJbgGIcyG@vger.kernel.org X-Gm-Message-State: AFuF++mgvER2QOYkPC0qLJcq7Q0PGwGIuZqUw3TTbV5myoDehVY3NsLs MG4ODoaWZ4twq+zJopfUo4Lwz0TXaTxuLDbVH1xR/R17FtQE2yuBoWkH X-Gm-Gg: AYBFou1Yjj5EVSiP6Me2rv9PO01hAYUSGkO3d+yk/j6EpogvMQ8odvlAa8mSpHIttfq MsHff5ssXOdArWlQCgP8QNZ8LiMwF+selbQDf1ClhTpzaD8X0vL17cgOZyiQYlisUpyrqbLAorz XyYH09f+mHQicSeRJDJH74PfzIHjKU8dJ49FpTpEXvnC0cHZGbyNyJC25CfzOVYogI0okxuN2dx EDUgQu+Yx/fvwYlo4YsKTc0RwKO3i2IOG2lMBmCzGhwtr35xKOHwfnxwmhV4M9pTzvk2pP7/AOK EJNeJMG63X/QKiUHy4eX9KFJjpcXGHfpvPEvIblMOD+tUEFnyreBtetV5g12DRM30Ri81H1uech zqfrZAWqFAP5p0WxjOJCTvyHrJ5WGgZ1Nv1gGVSsLudfww7syu9siuanrb4EyB/q+yPBl5WW6Nv N802gaxqeeEIUmGHApfuNoFXo7vhNEFEMvJ9qp99LsioifhbmCFuGurXg= X-Received: by 2002:a17:90b:3809:b0:396:4dfb:5890 with SMTP id 98e67ed59e1d1-39b260d333amr48826313a91.2.1788911781836; Tue, 08 Sep 2026 16:56:21 -0700 (PDT) Received: from localhost ([2a03:2880:9ff:6b::]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-143243767e1sm33162529c88.6.2026.09.08.16.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 16:56:21 -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 v4 4/4] selftests/sched_ext: build BPF schedulers via the shared lib.bpf.mk Date: Tue, 8 Sep 2026 16:55:52 -0700 Message-ID: <20260908235552.2610256-5-ziyang.meme@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260908235552.2610256-1-ziyang.meme@gmail.com> References: <20260908235552.2610256-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 sched_ext carries 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 generated skeletons and subskeletons keep the same public API, and the runner is 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/sched_ext/Makefile | 149 ++++----------------- 1 file changed, 26 insertions(+), 123 deletions(-) diff --git a/tools/testing/selftests/sched_ext/Makefile b/tools/testing/selftests/sched_ext/Makefile index 5d2dffca0e91..856fe7dea685 100644 --- a/tools/testing/selftests/sched_ext/Makefile +++ b/tools/testing/selftests/sched_ext/Makefile @@ -14,48 +14,29 @@ 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 +# Build scheduler skeletons and subskeletons with the shared BPF rules. +BPF_SRCS := $(wildcard *.bpf.c) +BPF_SKEL_EXT := .bpf.skel.h +BPF_GEN_SUBSKEL := 1 +# Preserve the existing build/ layout. +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 +45,26 @@ 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 - -$(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 $@ + $(BPF_EXTRA_CFLAGS) -$(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 -# 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))) +# Build every scheduler before each test. +all_test_bpfprogs := $(BPF_SKELS) auto-test-targets := \ create_dsq \ @@ -195,24 +100,22 @@ 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. -# -# Note that we must do double expansion here in order to support conditionally -# 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