From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 CB617392C20 for ; Fri, 6 Mar 2026 12:49:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772801350; cv=none; b=rx3N6hbEluqAieaDLwb9wnzj0qt8GR4bKnrsCVgPl5ARpNAk93rySxAXrt5wkndVZe65kYkHp1wRg5w40Une8ImhRo6GAqlq3P4ZtZ54VAcevRbXxD12pmi5v3Tzdb6mpJZHgmCxm0dOCtFuaWEJlZmGAcJy+ujJgt4dQguNKU8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772801350; c=relaxed/simple; bh=z3V40F0kGIL8yvCLdRRK98TbuZQ8stHEY3dTCT0ogJk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=etieGg6AVQjYBCs5Wgxfn1JZQJgcDgA9nPxKepT4ge1oBdYBrZmD1A54yLjb7JTUaTDc0bAQondcgmGyA10UkQ9D5crDRJ1dgMTcEbJNevInQXP1iTHMH5sRGmFuaE8ynEBKFwWL8To2I4T3t4TA2DaCajEOxJLA7LunwZn9JqA= 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=BXi02n9E; arc=none smtp.client-ip=209.85.214.171 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="BXi02n9E" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2ae505619baso33814105ad.2 for ; Fri, 06 Mar 2026 04:49:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772801348; x=1773406148; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/ZzuQXuKro+GXBxmmjg8yJdwWTDQZtX+cD1VaFXmUG0=; b=BXi02n9EhVBKK5fr3VS0l0SFncZsALwQFs0/GcHW34hzpeXB8dqNSp1toVXfL813yU CfgTaFqnD1MdfuFg/bM1j4uO4K1yflDIoPRNYe0K/Jd+vY2mDTITEiZ98LG9cQW9+iAf K2meBgAcvvCjYleRuuBf3L6hBEDNbZV5HZ+Wi2KkZSD60piYHWRh2dxAP348+LXx5MyZ gYhjOcWsJGy2Fl5Z5NfBuYSnQ5NCFdKuLUFAS9y3kfNpuAzECKAizqlzWvZIueNAJou8 zWRuV6wrgqqKQi6o6rT1YcGPIIunrBvhE4/KSrRCCcrs5LP4RejqYUgaYHGNf3Vwa6jd tXvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772801348; x=1773406148; h=content-transfer-encoding:mime-version: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=gN6dfqUdSFKKSqaHRb3Jn7rlioZIhyhyIaU6stUjH+mm2/prZUki2yphLlGfHVF/5X OM10N+EfwlTGm9fXI+nUQiYpuk1n1BtwAx7e9IRiaQ7gFQu54C7ecAc8Yf9VQQhsh/Yf 2TrJ57PATLm3j4DvU90fzBoMJbWXBki6QVhd4ut2/Npy1wTMB94grLTlTBurRzOcPycw Vof15faXpsIeKXVkJTmRg2Ch1HMBjsmF/2fHaOJF5JagnwU4fXBk6sEgb1sIfwRFVkQs CAmPBqsPrB+nG3xsuf7npYAvs7ll/BcofA93y2ktgOa3iFNjHOOcmHU74GsThY5OqUaJ F6SQ== X-Forwarded-Encrypted: i=1; AJvYcCWv1dOk0XVPCwTANjjWRstXrsICPsnhGg63yAQK3YwXuuUBd0yssR10SRhDk5A0cwnKN8ljuhJ+5Gdrnxk=@vger.kernel.org X-Gm-Message-State: AOJu0Yxk0T3iX5I1LX3gpGM26l7FaY5EvV8gDIljD1eAKyCEieHkDOJc TKEpCpzGimmJTwU5v+2s0KM9xOmuMOsqtfsxAzIhBq1rzIETpLyAl7lR X-Gm-Gg: ATEYQzyd5JPqp1SEgLvZoqzR4dfGoabQqDYZSZgVqdHv6IhzvRlAoIaa34aw7j+3cKc HqTIK2XHfynEc1uOmAaqjG+lYL42jlwlzbzbWwuHQxb02w2ttWHFO9u96KuLEgM+Pesyw5l5EAC qLZi8tVeyJAqm2H7inZRBhF2gNrJJz9efHj+s+TmK19jKDwVTlAS4rRkmAtA06xUhnYq4Ar+Z6X b3XJV+4oFmDe+c2AP/+ZNdMf12LHtAwdFE0QyE8xhMMxSE2rTJUktBggxTwMajQ9Jl44fvewOtT W5H+aEfYd3enOeBEwrn5Y8/L8qqLpPGb+jxeEm1g9d47UlGEvpphr0zaVfFENo5bO14jSAei5Dd lJMOwOvGrgPexmFvssyB0NO89K0mK3Hjv6iJR2xi+hNrhzWTYzzBdcMUfUVSnIgEKQtbzwBWfph YXR3oW3o1meG7Q07rhGrmOZpTIABv6z2jWhH0FDu+pPfr1naiqHQStJ8nlkDWs64yAbk+8GwYfg Mw= X-Received: by 2002:a17:903:2f8a:b0:2ae:57cc:63d7 with SMTP id d9443c01a7336-2ae823ff86amr24082965ad.7.1772801348105; Fri, 06 Mar 2026 04:49:08 -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-2ae83e78f77sm27712845ad.21.2026.03.06.04.49.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 04:49:07 -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 20:48:57 +0800 Message-ID: <20260306124901.2653465-1-suzhidao@xiaomi.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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; } - 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"); 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 = 1LLU << 6, - /* - * CPU cgroup support flags - */ - SCX_OPS_HAS_CGROUP_WEIGHT = 1LLU << 16, /* DEPRECATED, will be removed on 6.18 */ - SCX_OPS_ALL_FLAGS = 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, /* high 8 bits are internal, don't include in SCX_OPS_ALL_FLAGS */ __SCX_OPS_INTERNAL_MASK = 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 = (void *)fcg_cgroup_move, .init = (void *)fcg_init, .exit = (void *)fcg_exit, - .flags = SCX_OPS_HAS_CGROUP_WEIGHT | SCX_OPS_ENQ_EXITING, + .flags = SCX_OPS_ENQ_EXITING, .name = "flatcg"); -- 2.43.0