From nobody Thu Apr 9 18:55:58 2026 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 14C653A9DB1 for ; Fri, 6 Mar 2026 14:03:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772805818; cv=none; b=qRZmp0Y4C+5Mh406sOE7PAkXsFn9yxsUS9q4ku63+WDZ8NJelOJovi8hGUTncLmLgPRP/d7QFRnJr1FSEjt6RBhh2AWQmZzhddp2DFksrIfhpY4dzKirfvNp+utj+zKyxL8F1IfEY+Mgeghx9r4qAOekJ7BtH3p12oHu/KYbHh0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772805818; c=relaxed/simple; bh=z3V40F0kGIL8yvCLdRRK98TbuZQ8stHEY3dTCT0ogJk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lntCmWrP7BWC10+ORIQ65aM4I1bFzEbU/uQjzhDDxh8Wx/Umbsy7n4c1XKalJ4fZBpomXnc98lvVOBxLd+94JSQ6HAUr35DKF97XP//KNm5RCZb+cF6po5y34SZer/wem0YJO5fb1TmeV5IcXdyvoe+CznKY4c4/C1w/UbtWYDs= 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=bcly7hUo; arc=none smtp.client-ip=209.85.215.176 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="bcly7hUo" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c70bfef17a4so5520829a12.2 for ; Fri, 06 Mar 2026 06:03:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772805816; x=1773410616; 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; bh=/ZzuQXuKro+GXBxmmjg8yJdwWTDQZtX+cD1VaFXmUG0=; b=bcly7hUoYrirOiTEqLwYt88e8ehbRB0ys+3G9lqslxQO5+H5I5PJmWnSJVdkqSlL9N OIqAlqJPGAAeyFOoU3Rq5D9UkaRtQYRRFWO4q2DygReJcwkZ+jisueNcQ3UDD1XxR7TZ OBR/DGxMvt0H7Pmn601W6YcmZMmGF7Gy8zeXiTFIf0qFKovo6a4vIeZ/U06CBU6ZUrKO DH5Hil97XxHzAyouPvBgmcfGoqjrBB3w8rEhOhwufM/cMBztmhHwoOdpOXEhef9heufx v/7aGBUtmgQNt7VT4OcV+15GYIdMDRoZAevSIQGRRB5NmUXV8DFteeXU0LYZwg6yNXYP 1+pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772805816; x=1773410616; 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; bh=/ZzuQXuKro+GXBxmmjg8yJdwWTDQZtX+cD1VaFXmUG0=; b=ccJy+OShopxPOdDy/SvTcuUovqJ4ZlnSDNFnAwgux2/5qDWy9iBkcqeiFU6E19Vu8N 12nF5KmfAC+i9490tUv/WA6OwoOz1H4sQR+DdfPFDTY8hUa4sqeApngFONqbeGbtI54m nBHxnnGNKEe5J8hh68S9Cw0IsttDWMsEzY8q98eGU7uZjHZQP07/ns7KpXEh9/K5Llow D71GK4T9GyHj2C9brveQbj+7UfjAV+3I92R3cwl535oQqTq0ctUGQf86cFnjwOaXFueo CL2wprMBm7Jb2e+KWCXlXz344X5Ic8agn67rEFH19rBn/LPjIoYi6Qo7JV9TDK+NWUnm MbzA== X-Forwarded-Encrypted: i=1; AJvYcCWfeJKtKeGO+LfJdlxGuGRFmYz8rSp9Nj0qFphPEFoZ2lqdtoKFW0IErQicZwsY9xOqMrvvQdhhseKa7YA=@vger.kernel.org X-Gm-Message-State: AOJu0YweoWV3Bmq+lyqhQnPs1+HBl9+40DDdpswnY7G7+O4/8Y+d5Cfg sTL7Now5E+aZhftAlynGoA5kfV7euFSYwOovf8zlPtARidL2IZTKdcrc X-Gm-Gg: ATEYQzywkyWAb7TUu+GXPXfCPMzhp5kgzXWhlUvwK3I0IdJ9GlfDCy8Jj3T0zNN42bv 6aGkkMsUOlObStpreUn7crUcfl9pHUneMlUAddtpBeLwGh6D6j0X3loj7upsmPZtXl8C5e1ZSZD 6mG1vSZdBWqIbVVWaj59duUykuoDzU4/WFOeWgt3F1HjTR6aAJRZjDIQFI1p1xREi0ganeUQ1Wt tKAYtAyxlliA+kMsiTm9OpgX1GBATzR0E1hQijufjjTaR+q7jENFzBkz6GeYBwEodnzmhGEJ0nt amgcu6ykWY8HQu7L/muUO8etlCKY2r5Y45gvghwvIM0mvgF00HTuibmZ6KEvSyLaI7C9+0x6et7 4YADFx3zIGmE6P4RVZJsxI6Np8i2zpf9zxkbJ0H7te1iBAWv5PgKCZV7cHJBpHvuJvPUw0kDYKz GnJlW06zLzY8r9iUsQjk28nPG5jIqLofqraSDz98uHVuxJ2KnxTardEoVfzviIn3JssbNvElAdX DA= X-Received: by 2002:a17:902:ef0a:b0:2ae:4fc7:8053 with SMTP id d9443c01a7336-2ae82481982mr29214585ad.46.1772805814651; Fri, 06 Mar 2026 06:03:34 -0800 (PST) Received: from mi-HP-ProDesk-680-G6-PCI-Microtower-PC.mioffice.cn ([43.224.245.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae840ccb6csm29134715ad.92.2026.03.06.06.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 06:03:34 -0800 (PST) From: zhidao su X-Google-Original-From: zhidao su To: tj@kernel.org, sched-ext@lists.linux.dev, linux-kernel@vger.kernel.org Cc: void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, linux-kselftest@vger.kernel.org, Su Zhidao Subject: [PATCH 1/5] sched_ext: Remove deprecated SCX_OPS_HAS_CGROUP_WEIGHT flag Date: Fri, 6 Mar 2026 22:03:21 +0800 Message-ID: <20260306140325.2710927-2-suzhidao@xiaomi.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260306140325.2710927-1-suzhidao@xiaomi.com> References: <20260306140325.2710927-1-suzhidao@xiaomi.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Su Zhidao SCX_OPS_HAS_CGROUP_WEIGHT was deprecated in 6.15 with a comment 'will be removed on 6.18'. Now that we are at 6.18, remove it. The flag was a no-op and only triggered a pr_warn() on use. Remove the flag definition, the warning, and update scx_flatcg which was the last in-tree user. Signed-off-by: Su Zhidao --- kernel/sched/ext.c | 3 --- kernel/sched/ext_internal.h | 8 +------- tools/sched_ext/include/scx/enum_defs.autogen.h | 1 - tools/sched_ext/scx_flatcg.bpf.c | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index c4ccd685259f..56ff5874af94 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -5061,9 +5061,6 @@ static int validate_ops(struct scx_sched *sch, const = struct sched_ext_ops *ops) return -EINVAL; } =20 - if (ops->flags & SCX_OPS_HAS_CGROUP_WEIGHT) - pr_warn("SCX_OPS_HAS_CGROUP_WEIGHT is deprecated and a noop\n"); - if (ops->cpu_acquire || ops->cpu_release) pr_warn("ops->cpu_acquire/release() are deprecated, use sched_switch TP = instead\n"); =20 diff --git a/kernel/sched/ext_internal.h b/kernel/sched/ext_internal.h index bd26811fea99..3c86c53e1975 100644 --- a/kernel/sched/ext_internal.h +++ b/kernel/sched/ext_internal.h @@ -174,19 +174,13 @@ enum scx_ops_flags { */ SCX_OPS_BUILTIN_IDLE_PER_NODE =3D 1LLU << 6, =20 - /* - * CPU cgroup support flags - */ - SCX_OPS_HAS_CGROUP_WEIGHT =3D 1LLU << 16, /* DEPRECATED, will be removed = on 6.18 */ - SCX_OPS_ALL_FLAGS =3D SCX_OPS_KEEP_BUILTIN_IDLE | SCX_OPS_ENQ_LAST | SCX_OPS_ENQ_EXITING | SCX_OPS_ENQ_MIGRATION_DISABLED | SCX_OPS_ALLOW_QUEUED_WAKEUP | SCX_OPS_SWITCH_PARTIAL | - SCX_OPS_BUILTIN_IDLE_PER_NODE | - SCX_OPS_HAS_CGROUP_WEIGHT, + SCX_OPS_BUILTIN_IDLE_PER_NODE, =20 /* high 8 bits are internal, don't include in SCX_OPS_ALL_FLAGS */ __SCX_OPS_INTERNAL_MASK =3D 0xffLLU << 56, diff --git a/tools/sched_ext/include/scx/enum_defs.autogen.h b/tools/sched_= ext/include/scx/enum_defs.autogen.h index dcc945304760..80c885f781ba 100644 --- a/tools/sched_ext/include/scx/enum_defs.autogen.h +++ b/tools/sched_ext/include/scx/enum_defs.autogen.h @@ -91,7 +91,6 @@ #define HAVE_SCX_OPS_SWITCH_PARTIAL #define HAVE_SCX_OPS_ENQ_MIGRATION_DISABLED #define HAVE_SCX_OPS_ALLOW_QUEUED_WAKEUP -#define HAVE_SCX_OPS_HAS_CGROUP_WEIGHT #define HAVE_SCX_OPS_ALL_FLAGS #define HAVE_SCX_OPSS_NONE #define HAVE_SCX_OPSS_QUEUEING diff --git a/tools/sched_ext/scx_flatcg.bpf.c b/tools/sched_ext/scx_flatcg.= bpf.c index 0e785cff0f24..a8a9234bb41e 100644 --- a/tools/sched_ext/scx_flatcg.bpf.c +++ b/tools/sched_ext/scx_flatcg.bpf.c @@ -960,5 +960,5 @@ SCX_OPS_DEFINE(flatcg_ops, .cgroup_move =3D (void *)fcg_cgroup_move, .init =3D (void *)fcg_init, .exit =3D (void *)fcg_exit, - .flags =3D SCX_OPS_HAS_CGROUP_WEIGHT | SCX_OPS_ENQ_EXITING, + .flags =3D SCX_OPS_ENQ_EXITING, .name =3D "flatcg"); --=20 2.43.0