From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 ABF201A3A8A for ; Mon, 30 Dec 2024 09:56:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735552595; cv=none; b=RYYhZzaGgJEPcpd3u+aYLnMAYDZe+AGKge2HlaRNvpgvPkoeJAtvIWt2KSAEOhUJ9OjygncFgLqGjApt2JBRVU4Fia7FPrl2TPdozOEeJqsmfQy/ATQUzTVN1Ks8skv5rHvVnXmzs5JTcW1cEZsudbRyXzia1AFykH5fWaQb25k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735552595; c=relaxed/simple; bh=TlSqGNDpjyEQ/sAS+WG9j8ZbPrrXCvTJG01tJ8bLoZ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qUwCnl8Nj/kcvhWxd1N4eXERsiNruOA7Cx+2Ohq9htZeoZDT8MpzLe1zU4ojJNp/hG4nSdQC4/HJlgtol4jevWmtGXztgbi+INxqxf+5P/8ZqVO5g/Vhuqj3YTRndxFyV5zW7Ylm4t9O6EREMmrAVaekFjFmmRmxUYN6+d4PF18= 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=A7LG+trg; arc=none smtp.client-ip=209.85.214.177 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="A7LG+trg" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21675fd60feso154446365ad.2 for ; Mon, 30 Dec 2024 01:56:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735552593; x=1736157393; 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=ot9Lx1zg/XLL07layOuusQRDG2mU5e3t2AM5FahhmOs=; b=A7LG+trgk/tlA58cW7+Ei5PTVVGPE6qu27iD0mCAwxFNDXA2pW1kjJcGF8wjuEhpm8 AyEiLoM1dfMJ9ENxcCglpu4oOKkUoux7uLHzijxhO6kVt2z6KY3/qn7uas2NtkNzLGAm ZTIi67rakqWHJtA1qaz3bRwd1nFaZyvU2pONJP5QYT5E8dIx/EL3r/ZKFQ42bTY/2IZd O8Eo8OmWWhbGrFVYLj/9oqBic0chsfJuhfIp8ubXaEOKK0zX5g4VIiJb6jrngDF+Zsih CQFlj/iBUwB6omlJ0F5iROaOPrHvquO/K86fb+BNFvsG5jEQkN4hHq5XXA/rvbe3b7h3 Xi6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735552593; x=1736157393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ot9Lx1zg/XLL07layOuusQRDG2mU5e3t2AM5FahhmOs=; b=VF3b+TcQFXFKfWkPm1qalYyEwwAanUgANgROsdGGY5EJs7rq23rgBr4pzs4xuEtxhr F4CU/wKBblwWB5NlvTkC/GTglzQdtflAXBfpTUYQ9jFBAbNtAJ4Lmvm3ugXM8IE6yGzT n9vWFfSIvm5xS4gvQ+qj1K+Zgy/yaW7ZOmIYUXe+kYJmDEMcO2d+7abFLVAKjBoQn3/1 nXVbijSkok3Tljgl/e/m9ZEvxvgtRUoTP9ixLfWG1SvYqUl6yCvoobLEIzpRcHub8oYX SpDIyIgSLBvQsjoq9hyL9St+siCUag4/S/LV9lJOKSnyTzmmB2yyO6/iqlepRnymN5ht rw8A== X-Forwarded-Encrypted: i=1; AJvYcCWzXB9HnRu4OwJvUryds4Ncibu/CC0cMB5qqDLqZleTHqXN3FvKxbzVqluUpvRSvogK1UBlzF6SUhM+sAQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxjtgrC6Cp1gy3Lftbwmv2mM2bVc/3pVNqv+Pr2GypAo+waYEAY RdWob/4bJdPCy9024xCaB1gB0TM8rUfVyPCbZwl7Jj/0or5fBDWl0xB60Q== X-Gm-Gg: ASbGncv9D5o1EPdQxN4V+rFd48MoPO+corjw8lis9okAhkX2L0QSbvi8ndqzVcfkpo8 mA5cCTYzh4v5c+HFM/4wDBqnwIwHfmqkJj4txZ5z0icSC4KfsbH+VW45A3e7hLHgUsl+evBsm0X 8dX2EnzK4MhBSJBHC0hxxQXyweAm49NN54gyyCAQX/4cnTAANVllnig30civL4AgmdMSJyxy7Yp +SF76PyMOEjbigNJZmDWFXIyVhI5PYtPbxFoURt5jPCL0ezz0datopwCVdd X-Google-Smtp-Source: AGHT+IFMK4aKJiEcLVhlOIDS2/X1HwBLTO9M/Jq/nvvVRqpxchmaBVGp1bPGkCmPlBzU+BMB9V245w== X-Received: by 2002:a17:903:2449:b0:215:3a42:dc17 with SMTP id d9443c01a7336-219e6e8bbabmr436279965ad.7.1735552593016; Mon, 30 Dec 2024 01:56:33 -0800 (PST) Received: from localhost ([58.29.143.236]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f68e4sm175002415ad.211.2024.12.30.01.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 01:56:32 -0800 (PST) From: Changwoo Min X-Google-Original-From: Changwoo Min To: tj@kernel.org, void@manifault.com, arighi@nvidia.com, mingo@redhat.com, peterz@infradead.org Cc: changwoo@igalia.com, kernel-dev@igalia.com, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/6] sched_ext: Relocate scx_enabled() related code Date: Mon, 30 Dec 2024 18:56:20 +0900 Message-ID: <20241230095625.114363-2-changwoo@igalia.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241230095625.114363-1-changwoo@igalia.com> References: <20241230095625.114363-1-changwoo@igalia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit scx_enabled() will be used in scx_rq_clock_update/invalidate() in the following patch, so relocate the scx_enabled() related code to the proper location. Signed-off-by: Changwoo Min --- kernel/sched/sched.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 76f5f53a645f..440ecedf871b 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1717,6 +1717,19 @@ struct rq_flags { extern struct balance_callback balance_push_callback; +#ifdef CONFIG_SCHED_CLASS_EXT +extern const struct sched_class ext_sched_class; + +DECLARE_STATIC_KEY_FALSE(__scx_ops_enabled); /* SCX BPF scheduler loaded */ +DECLARE_STATIC_KEY_FALSE(__scx_switched_all); /* all fair class tasks on SCX */ + +#define scx_enabled() static_branch_unlikely(&__scx_ops_enabled) +#define scx_switched_all() static_branch_unlikely(&__scx_switched_all) +#else /* !CONFIG_SCHED_CLASS_EXT */ +#define scx_enabled() false +#define scx_switched_all() false +#endif /* !CONFIG_SCHED_CLASS_EXT */ + /* * Lockdep annotation that avoids accidental unlocks; it's like a * sticky/continuous lockdep_assert_held(). @@ -2505,19 +2518,6 @@ extern const struct sched_class rt_sched_class; extern const struct sched_class fair_sched_class; extern const struct sched_class idle_sched_class; -#ifdef CONFIG_SCHED_CLASS_EXT -extern const struct sched_class ext_sched_class; - -DECLARE_STATIC_KEY_FALSE(__scx_ops_enabled); /* SCX BPF scheduler loaded */ -DECLARE_STATIC_KEY_FALSE(__scx_switched_all); /* all fair class tasks on SCX */ - -#define scx_enabled() static_branch_unlikely(&__scx_ops_enabled) -#define scx_switched_all() static_branch_unlikely(&__scx_switched_all) -#else /* !CONFIG_SCHED_CLASS_EXT */ -#define scx_enabled() false -#define scx_switched_all() false -#endif /* !CONFIG_SCHED_CLASS_EXT */ - /* * Iterate only active classes. SCX can take over all fair tasks or be * completely disabled. If the former, skip fair. If the latter, skip SCX. -- 2.47.1