git subrepo pull (merge) linux-tkg

subrepo: subdir: "linux-tkg" merged: "80fe9da3" upstream: origin: "https://github.com/Frogging-Family/linux-tkg" branch: "master" commit: "61b14da7" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2022-04-04 21:54:07 -05:00 · 2022-04-04 21:54:07 -05:00 · da9b8d972f
commit da9b8d972f
parent f83940bd29
23 changed files with 18467 additions and 252 deletions
--- a/linux-tkg/.gitrepo
+++ b/linux-tkg/.gitrepo
@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/Frogging-Family/linux-tkg
 	branch = master
-	commit = f671c27f6bc882a2cb559115ddb73f55ccf4f922
+	commit = 61b14da7960e4cd1a31fb5ee235ec33933fa5645
 	parent = deeb3f62eca732218713da4a4e131d167bff20ee
 	method = merge
 	cmdver = 0.4.3
--- a/linux-tkg/PKGBUILD
+++ b/linux-tkg/PKGBUILD
@ -59,7 +59,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=249
+pkgrel=252
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@ -98,6 +98,7 @@ case $_basever in
        	0009-glitched-bmq.patch
        	0009-bmq_v5.4-r2.patch
        	0012-linux-hardened.patch
+        	0012-misc-additions.patch
 	)
 	sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
            'cd978b0ca835f0c9fec86f70cdfcc8e103653868e4b44996dc02ab49d6783df0'
@ -120,7 +121,8 @@ case $_basever in
            '2d9260b80b43bbd605cf420d6bd53aa7262103dfd77196ba590ece5600b6dc0d'
            '3832f828a9f402b153fc9a6829c5a4eaf6091804bcda3a0423c8e1b57e26420d'
            'c98befca824f761260466410a1dd94d2b9be6f7211b5daefcfc0f3a102bbdc81'
-            'aeb31404c26ee898d007b1f66cb9572c9884ad8eca14edc4587d68f6cba6de46')
+            'aeb31404c26ee898d007b1f66cb9572c9884ad8eca14edc4587d68f6cba6de46'
+            '87f8ba249620628ad493ed5d65da9811bf635411a70aaa49ed1d97438ebf77be')
 	;;
 	57)
 	source=("$kernel_site"
@ -655,7 +657,7 @@ case $_basever in
        #0008-5.14-bcachefs.patch
        0009-glitched-ondemand-bmq.patch
        0009-glitched-bmq.patch
-        0009-prjc_v5.16-r0.patch
+        0009-prjc_v5.16-r1.patch
        #0012-linux-hardened.patch
        0012-misc-additions.patch
        # MM Dirty Soft for WRITE_WATCH support in Wine
@ -679,7 +681,7 @@ case $_basever in
            'f91223f98f132602a4fa525917a1f27afe30bdb55a1ac863e739c536188417b3'
            '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
            'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
-            '7bd99d10ec9f834de95424d033f940f9531beb3a7b4d9711448f0ed66832c03d'
+            'ccf8d7dc78e92577f826f3e4d76453b1a873d41eb0df15528d117b25925b3f77'
            #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c'
            '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887'
            '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
@ -716,7 +718,7 @@ case $_basever in
    )
    sha256sums=('555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1'
            '24c982d6b7b704b31a6b4bc0a59cbf2135697a58d5d6030532ae07856da36944'
-            'bd1e57c15d4eb62024d2ee935b54d36e74e73b22c3800b45ecf9233521a9f74b'
+            'c05ff4ca7a69b94ace73d1019c398f3fd93dfa0ebcc9b2396b56aaa191fc72e0'
            '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
            '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
            'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
@ -731,12 +733,61 @@ case $_basever in
            'f91223f98f132602a4fa525917a1f27afe30bdb55a1ac863e739c536188417b3'
            '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
            'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
-            '5d8aa3d707982e324d3ce8fcc5f832035d8155dc703f0125bbaa21cd87ce26f3'
+            '95fd78b725360742ead8c55eea7e3ff7ac8ae11ae1a21a0d881e168a841bc9b4'
            #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c'
            '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887'
            '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
            'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6')
 	;;
+	518)
+    source=("$kernel_site"
+        #"$patch_site"
+        'config.x86_64' # stock Arch config
+        #'config_hardened.x86_64' # hardened Arch config
+        90-cleanup.hook
+        cleanup
+        # ARCH Patches
+        0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+        # TkG
+        0002-clear-patches.patch
+        0003-glitched-base.patch
+        0003-glitched-cfs.patch
+        0003-glitched-cfs-additions.patch
+        #0005-glitched-pds.patch
+        0006-add-acs-overrides_iommu.patch
+        0007-v5.18-fsync1_via_futex_waitv.patch
+        0007-v5.18-winesync.patch
+        #0008-5.14-bcachefs.patch
+        #0009-glitched-ondemand-bmq.patch
+        #0009-glitched-bmq.patch
+        #0009-prjc_v5.18-r0.patch
+        #0012-linux-hardened.patch
+        0012-misc-additions.patch
+        # MM Dirty Soft for WRITE_WATCH support in Wine
+        0001-mm-Support-soft-dirty-flag-reset-for-VA-range.patch
+        0002-mm-Support-soft-dirty-flag-read-with-reset.patch
+    )
+    sha256sums=('a7ae23d354937723b3ee65513c2707c02541a0553ae9a7d5c7136525335d4423'
+            #upcoming_kernel_patch_sha256
+            'c96860d65053cb5accdf1d4f94f4b7bbe46e90a3e869aa3b4cdebc48a68289c1'
+            '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
+            '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
+            'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
+            '35a7cde86fb94939c0f25a62b8c47f3de0dbd3c65f876f460b263181b3e92fc0'
+            '94eb8f15f4297057c8229bf75c9e08adbaa812f68999bb62dae0e226e37503eb'
+            '5efd40c392ece498d2d43d5443e6537c2d9ef7cf9820d5ce80b6577fc5d1a4b2'
+            'e5ea0bb25ee294c655ac3cc30e1eea497799826108fbfb4ef3258c676c1e8a12'
+            #'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
+            '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
+            '9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004'
+            'f91223f98f132602a4fa525917a1f27afe30bdb55a1ac863e739c536188417b3'
+            #'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
+            #'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
+            #'95fd78b725360742ead8c55eea7e3ff7ac8ae11ae1a21a0d881e168a841bc9b4'
+            '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887'
+            '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
+            'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6')
+	;;
 esac

 export KBUILD_BUILD_HOST=archlinux
--- a/linux-tkg/README.md
+++ b/linux-tkg/README.md
@ -5,6 +5,7 @@ This repository provides scripts to automatically download, patch and compile th
 ### Important information

 - **Non-pacman distros support can be considered experimental. You're invited to report issues you might encounter with it.**
+- **If your distro isn't using systemd, please set _configfile="running-kernel" in customization.cfg or you might end up with a non-bootable kernel**

 - In `intel_pstate` driver, frequency scaling aggressiveness has been changed with kernel 5.5 which results in stutters and poor performance in low/medium load scenarios (for higher power savings). As a workaround for our gaming needs, we are setting it to passive mode to make use of the `acpi_cpufreq` governor passthrough, keeping full support for turbo frequencies. It's combined with our aggressive ondemand governor by default for good performance on most CPUs while keeping frequency scaling for power savings. In a typical low/medium load scenario (Core i7 9700k, playing Mario Galaxy on Dolphin emulator) intel_pstate in performance mode gives a stuttery 45-50 fps experience, while passive mode + aggressive ondemand offers a locked 60 fps.
 - Nvidia's proprietary drivers might need to be patched if they don't support your chosen kernel OOTB: [Frogging-Family nvidia-all](https://github.com/Frogging-Family/nvidia-all) can do that automatically for you.
@ -35,7 +36,7 @@ The `customization.cfg` file offers many toggles for extra tweaks:
 - `Fsync`, `Futex2` and `Fastsync+winesync` support: can improve the performance in games, needs a patched wine like [wine-tkg](https://github.com/Frogging-Family/wine-tkg-git)
 - [Graysky's per-CPU-arch native optimizations](https://github.com/graysky2/kernel_compiler_patch): tunes the compiled code to to a specified CPU
 - Compile with GCC or Clang with optional `O2`/`O3` and `LTO` (Clang only) optimizations.
-  - **Warning regarding DKMS modules and Clang:** `DKMS` will default to using GCC, which will fail to build modules against a Clang-built kernel. This will - for example - break Nvidia drivers. Forcing `DKMS` to use Clang can be done but isn't recommended.
+  - **Warning regarding DKMS modules prior to v3.0.2 (2021-11-21) and Clang:** `DKMS` version v3.0.1 and earlier will default to using GCC, which will fail to build modules against a Clang-built kernel. This will - for example - break Nvidia drivers. Forcing older `DKMS` to use Clang can be done but isn't recommended.
 - Using [Modprobed-db](https://github.com/graysky2/modprobed-db)'s database can reduce the compilation time and produce a smaller kernel which will only contain the modules listed in it. **NOT recommended**
  - **Warning**: make sure to read [thoroughly about it first](https://wiki.archlinux.org/index.php/Modprobed-db) since it comes with caveats that can lead to an unbootable kernel.
 - "Zenify" patchset using core blk, mm and scheduler tweaks from Zen
--- a/linux-tkg/linux-tkg-config/5.17/config.x86_64
+++ b/linux-tkg/linux-tkg-config/5.17/config.x86_64
@ -2526,8 +2526,8 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
 #
 # NVME Support
 #
-CONFIG_NVME_CORE=y
-CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m
--- a/linux-tkg/linux-tkg-config/5.18/90-cleanup.hook
+++ b/linux-tkg/linux-tkg-config/5.18/90-cleanup.hook
@ -0,0 +1,14 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/modules/*/
+Target = !usr/lib/modules/*/?*
+
+[Action]
+Description = Cleaning up...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/cleanup
+NeedsTargets
+ 
--- a/linux-tkg/linux-tkg-config/5.18/cleanup
+++ b/linux-tkg/linux-tkg-config/5.18/cleanup
@ -0,0 +1,10 @@
+#!/bin/bash
+
+for _f in /usr/lib/modules/*tkg*; do
+  if [[ ! -e ${_f}/vmlinuz ]]; then
+    rm -rf "$_f"
+  fi
+done
+
+# vim:set ft=sh sw=2 et:
+ 
--- a/linux-tkg/linux-tkg-config/5.18/config.x86_64
+++ b/linux-tkg/linux-tkg-config/5.18/config.x86_64
--- a/linux-tkg/linux-tkg-config/prepare
+++ b/linux-tkg/linux-tkg-config/prepare
@ -1,7 +1,7 @@
 #!/bin/bash

 # List of kernels that are maintained upstream
-_current_kernels=("5.17" "5.16" "5.15" "5.10" "5.4")
+_current_kernels=("5.18" "5.17" "5.16" "5.15" "5.10" "5.4")

 # List of kernels that are no longer maintained upstream
 _eol_kernels=("5.14" "5.13" "5.12" "5.11" "5.9" "5.8" "5.7")
@ -20,6 +20,7 @@ _kver_subver_map=(
  ["5.15"]="32"
  ["5.16"]="18"
  ["5.17"]="1"
+  ["5.18"]="rc1"
 )

 # PREEMPT_RT's supported kernel subversion
@ -517,6 +518,8 @@ _tkg_srcprep() {
    rev=3
  elif [ "$_basever" = "515" ]; then
    rev=1
+  elif [ "$_basever" = "516" ]; then
+    rev=1
  else
    rev=0
  fi
@ -803,7 +806,7 @@ _tkg_srcprep() {
    _disable "SCHED_BMQ"
  elif [ "${_cpusched}" = "cacule" ]; then
    _enable "SCHED_AUTOGROUP" "CACULE_SCHED"
-    _disable "BSD_PROCESS_ACCT" "TASK_XACCT" "CGROUP_CPUACCT" "CGROUP_DEBUG"
+    _disable "BSD_PROCESS_ACCT" "TASK_XACCT" "CGROUP_CPUACCT" "CGROUP_DEBUG" "CACULE_RDB"
    if [ "$_cacule_rdb" = "true" ]; then
      _enable "CACULE_RDB"
      scripts/config --set-val "RDB_INTERVAL" "$_cacule_rdb_interval"
--- a/linux-tkg/linux-tkg-patches/5.16/0009-prjc_v5.16-r1.patch
+++ b/linux-tkg/linux-tkg-patches/5.16/0009-prjc_v5.16-r1.patch
@ -1,5 +1,5 @@
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 2fba82431efb..654a29d94696 100644
+index 391b3f9055fe..5d0e76e5a815 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5027,6 +5027,12 @@
@ -176,34 +176,23 @@ index 8874f681b056..59eb72bf7d5f 100644
 	[RLIMIT_RTTIME]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
 }
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 78c351e35fec..c6746f5ec3f5 100644
+index ee5ed8821963..61ee2514329a 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -748,8 +748,14 @@ struct task_struct {
+@@ -748,7 +748,12 @@ struct task_struct {
 	unsigned int			ptrace;
 
 #ifdef CONFIG_SMP
-	int				on_cpu;
- 	struct __call_single_node	wake_entry;
+	struct __call_single_node	wake_entry;
 +#endif
 +#if defined(CONFIG_SMP) || defined(CONFIG_SCHED_ALT)
-+	int				on_cpu;
+ 	int				on_cpu;
 +#endif
-+
-+#ifdef CONFIG_SMP
-+#ifndef CONFIG_SCHED_ALT
+#if defined(CONFIG_SMP) && !defined(CONFIG_SCHED_ALT)
+ 	struct __call_single_node	wake_entry;
 	unsigned int			wakee_flips;
 	unsigned long			wakee_flip_decay_ts;
- 	struct task_struct		*last_wakee;
-@@ -763,6 +769,7 @@ struct task_struct {
- 	 */
- 	int				recent_used_cpu;
- 	int				wake_cpu;
-+#endif /* !CONFIG_SCHED_ALT */
- #endif
- 	int				on_rq;
- 
-@@ -771,6 +778,20 @@ struct task_struct {
+@@ -771,6 +776,20 @@ struct task_struct {
 	int				normal_prio;
 	unsigned int			rt_priority;
 
@ -224,7 +213,7 @@ index 78c351e35fec..c6746f5ec3f5 100644
 	struct sched_entity		se;
 	struct sched_rt_entity		rt;
 	struct sched_dl_entity		dl;
-@@ -781,6 +802,7 @@ struct task_struct {
+@@ -781,6 +800,7 @@ struct task_struct {
 	unsigned long			core_cookie;
 	unsigned int			core_occupation;
 #endif
@ -232,7 +221,7 @@ index 78c351e35fec..c6746f5ec3f5 100644
 
 #ifdef CONFIG_CGROUP_SCHED
 	struct task_group		*sched_task_group;
-@@ -1501,6 +1523,15 @@ struct task_struct {
+@@ -1501,6 +1521,15 @@ struct task_struct {
 	 */
 };
 
@ -487,7 +476,7 @@ index ce77f0265660..3cccf8caa1be 100644
 	  This option permits Core Scheduling, a means of coordinated task
 	  selection across SMT siblings. When enabled -- see
 diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
-index d0e163a02099..b5276a7a5d82 100644
+index df62527f5e0b..556e69cdd44f 100644
 --- a/kernel/cgroup/cpuset.c
 +++ b/kernel/cgroup/cpuset.c
@@ -682,7 +682,7 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial)
@ -643,10 +632,10 @@ index c7421f2d05e1..9b32442ff2ca 100644
 obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o
 diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
 new file mode 100644
-index 000000000000..114bd1fd88eb
+index 000000000000..83407c4ee806
 --- /dev/null
 +++ b/kernel/sched/alt_core.c
-@@ -0,0 +1,7682 @@
+@@ -0,0 +1,7701 @@
 +/*
 + *  kernel/sched/alt_core.c
 + *
@ -677,7 +666,6 @@ index 000000000000..114bd1fd88eb
 +#include <linux/kprobes.h>
 +#include <linux/mmu_context.h>
 +#include <linux/nmi.h>
-+#include <linux/profile.h>
 +#include <linux/rcupdate_wait.h>
 +#include <linux/security.h>
 +#include <linux/syscalls.h>
@ -716,7 +704,7 @@ index 000000000000..114bd1fd88eb
 +#define sched_feat(x)	(0)
 +#endif /* CONFIG_SCHED_DEBUG */
 +
-+#define ALT_SCHED_VERSION "v5.15-r1"
+#define ALT_SCHED_VERSION "v5.16-r1"
 +
 +/* rt_prio(prio) defined in include/linux/sched/rt.h */
 +#define rt_task(p)		rt_prio((p)->prio)
@ -1355,6 +1343,25 @@ index 000000000000..114bd1fd88eb
 +	return task_on_rq_queued(p);
 +}
 +
+unsigned long get_wchan(struct task_struct *p)
+{
+	unsigned long ip = 0;
+	unsigned int state;
+
+	if (!p || p == current)
+		return 0;
+
+	/* Only get wchan if task is blocked and we can keep it that way. */
+	raw_spin_lock_irq(&p->pi_lock);
+	state = READ_ONCE(p->__state);
+	smp_rmb(); /* see try_to_wake_up() */
+	if (state != TASK_RUNNING && state != TASK_WAKING && !p->on_rq)
+		ip = __get_wchan(p);
+	raw_spin_unlock_irq(&p->pi_lock);
+
+	return ip;
+}
+
 +/*
 + * Add/Remove/Requeue task to/from the runqueue routines
 + * Context: rq->lock
@ -1396,25 +1403,6 @@ index 000000000000..114bd1fd88eb
 +	sched_update_tick_dependency(rq);
 +}
 +
-+unsigned long get_wchan(struct task_struct *p)
-+{
-+	unsigned long ip = 0;
-+	unsigned int state;
-+
-+	if (!p || p == current)
-+		return 0;
-+
-+	/* Only get wchan if task is blocked and we can keep it that way. */
-+	raw_spin_lock_irq(&p->pi_lock);
-+	state = READ_ONCE(p->__state);
-+	smp_rmb(); /* see try_to_wake_up() */
-+	if (state != TASK_RUNNING && state != TASK_WAKING && !p->on_rq)
-+		ip = __get_wchan(p);
-+	raw_spin_unlock_irq(&p->pi_lock);
-+
-+	return ip;
-+}
-+
 +static inline void enqueue_task(struct task_struct *p, struct rq *rq, int flags)
 +{
 +	lockdep_assert_held(&rq->lock);
@ -1982,6 +1970,7 @@ index 000000000000..114bd1fd88eb
 +	 * per-task data have been completed by this moment.
 +	 */
 +	smp_wmb();
+
 +	WRITE_ONCE(task_thread_info(p)->cpu, cpu);
 +#endif
 +}
@ -2899,9 +2888,10 @@ index 000000000000..114bd1fd88eb
 +	rq = this_rq();
 +
 +#ifdef CONFIG_SMP
-+	if (cpu == rq->cpu)
+	if (cpu == rq->cpu) {
 +		__schedstat_inc(rq->ttwu_local);
-+	else {
+		__schedstat_inc(p->stats.nr_wakeups_local);
+	} else {
 +		/** Alt schedule FW ToDo:
 +		 * How to do ttwu_wake_remote
 +		 */
@ -2909,6 +2899,7 @@ index 000000000000..114bd1fd88eb
 +#endif /* CONFIG_SMP */
 +
 +	__schedstat_inc(rq->ttwu_count);
+	__schedstat_inc(p->stats.nr_wakeups);
 +}
 +
 +/*
@ -3099,7 +3090,7 @@ index 000000000000..114bd1fd88eb
 +	raw_spin_lock_irqsave(&rq->lock, flags);
 +	if (is_idle_task(rq->curr))
 +		resched_curr(rq);
-+	/* Else CPU is not idle, do nothing here: */
+	/* Else CPU is not idle, do nothing here */
 +	raw_spin_unlock_irqrestore(&rq->lock, flags);
 +
 +out:
@ -3519,9 +3510,9 @@ index 000000000000..114bd1fd88eb
 +
 +	/*
 +	 * At this point the task is pinned; either:
-+	 *  - blocked and we're holding off wakeups	 (pi->lock)
-+	 *  - woken, and we're holding off enqueue	 (rq->lock)
-+	 *  - queued, and we're holding off schedule	 (rq->lock)
+	 *  - blocked and we're holding off wakeups      (pi->lock)
+	 *  - woken, and we're holding off enqueue       (rq->lock)
+	 *  - queued, and we're holding off schedule     (rq->lock)
 +	 *  - running, and we're holding off de-schedule (rq->lock)
 +	 *
 +	 * The called function (@func) can use: task_curr(), p->on_rq and
@ -3572,6 +3563,11 @@ index 000000000000..114bd1fd88eb
 +	p->stime			= 0;
 +	p->sched_time			= 0;
 +
+#ifdef CONFIG_SCHEDSTATS
+	/* Even if schedstat is disabled, there should not be garbage */
+	memset(&p->stats, 0, sizeof(p->stats));
+#endif
+
 +#ifdef CONFIG_PREEMPT_NOTIFIERS
 +	INIT_HLIST_HEAD(&p->preempt_notifiers);
 +#endif
@ -3637,11 +3633,8 @@ index 000000000000..114bd1fd88eb
 +	struct rq *rq;
 +
 +	/*
-+	 * The child is not yet in the pid-hash so no cgroup attach races,
-+	 * and the cgroup is pinned to this child due to cgroup_fork()
-+	 * is ran before sched_fork().
-+	 *
-+	 * Silence PROVE_RCU.
+	 * Because we're not yet on the pid-hash, p->pi_lock isn't strictly
+	 * required yet, but lockdep gets upset if rules are violated.
 +	 */
 +	raw_spin_lock_irqsave(&p->pi_lock, flags);
 +	/*
@ -3676,9 +3669,6 @@ index 000000000000..114bd1fd88eb
 +
 +void sched_post_fork(struct task_struct *p)
 +{
-+#ifdef CONFIG_UCLAMP_TASK
-+       uclamp_post_fork(p);
-+#endif
 +}
 +
 +#ifdef CONFIG_SCHEDSTATS
@ -6859,9 +6849,7 @@ index 000000000000..114bd1fd88eb
 +
 +	if (spin_needbreak(lock) || resched) {
 +		spin_unlock(lock);
-+		if (resched)
-+			preempt_schedule_common();
-+		else
+		if (!_cond_resched())
 +			cpu_relax();
 +		ret = 1;
 +		spin_lock(lock);
@ -6879,9 +6867,7 @@ index 000000000000..114bd1fd88eb
 +
 +	if (rwlock_needbreak(lock) || resched) {
 +		read_unlock(lock);
-+		if (resched)
-+			preempt_schedule_common();
-+		else
+		if (!_cond_resched())
 +			cpu_relax();
 +		ret = 1;
 +		read_lock(lock);
@ -6899,9 +6885,7 @@ index 000000000000..114bd1fd88eb
 +
 +	if (rwlock_needbreak(lock) || resched) {
 +		write_unlock(lock);
-+		if (resched)
-+			preempt_schedule_common();
-+		else
+		if (!_cond_resched())
 +			cpu_relax();
 +		ret = 1;
 +		write_lock(lock);
@ -7917,12 +7901,6 @@ index 000000000000..114bd1fd88eb
 +}
 +
 +#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
-+static inline int preempt_count_equals(int preempt_offset)
-+{
-+	int nested = preempt_count() + rcu_preempt_depth();
-+
-+	return (nested == preempt_offset);
-+}
 +
 +void __might_sleep(const char *file, int line)
 +{
@ -7942,7 +7920,28 @@ index 000000000000..114bd1fd88eb
 +}
 +EXPORT_SYMBOL(__might_sleep);
 +
-+void __might_resched(const char *file, int line, int preempt_offset)
+static void print_preempt_disable_ip(int preempt_offset, unsigned long ip)
+{
+	if (!IS_ENABLED(CONFIG_DEBUG_PREEMPT))
+		return;
+
+	if (preempt_count() == preempt_offset)
+		return;
+
+	pr_err("Preemption disabled at:");
+	print_ip_sym(KERN_ERR, ip);
+}
+
+static inline bool resched_offsets_ok(unsigned int offsets)
+{
+	unsigned int nested = preempt_count();
+
+	nested += rcu_preempt_depth() << MIGHT_RESCHED_RCU_SHIFT;
+
+	return nested == offsets;
+}
+
+void __might_resched(const char *file, int line, unsigned int offsets)
 +{
 +	/* Ratelimiting timestamp: */
 +	static unsigned long prev_jiffy;
@ -7952,7 +7951,7 @@ index 000000000000..114bd1fd88eb
 +	/* WARN_ON_ONCE() by default, no rate limit required: */
 +	rcu_sleep_check();
 +
-+	if ((preempt_count_equals(preempt_offset) && !irqs_disabled() &&
+	if ((resched_offsets_ok(offsets) && !irqs_disabled() &&
 +	     !is_idle_task(current) && !current->non_block_count) ||
 +	    system_state == SYSTEM_BOOTING || system_state > SYSTEM_RUNNING ||
 +	    oops_in_progress)
@ -7969,6 +7968,13 @@ index 000000000000..114bd1fd88eb
 +	pr_err("in_atomic(): %d, irqs_disabled(): %d, non_block: %d, pid: %d, name: %s\n",
 +	       in_atomic(), irqs_disabled(), current->non_block_count,
 +	       current->pid, current->comm);
+	pr_err("preempt_count: %x, expected: %x\n", preempt_count(),
+	       offsets & MIGHT_RESCHED_PREEMPT_MASK);
+
+	if (IS_ENABLED(CONFIG_PREEMPT_RCU)) {
+		pr_err("RCU nest depth: %d, expected: %u\n",
+		       rcu_preempt_depth(), offsets >> MIGHT_RESCHED_RCU_SHIFT);
+	}
 +
 +	if (task_stack_end_corrupted(current))
 +		pr_emerg("Thread overran stack, or stack corrupted\n");
@ -7976,12 +7982,10 @@ index 000000000000..114bd1fd88eb
 +	debug_show_held_locks(current);
 +	if (irqs_disabled())
 +		print_irqtrace_events(current);
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	if (!preempt_count_equals(preempt_offset)) {
-+		pr_err("Preemption disabled at:");
-+		print_ip_sym(KERN_ERR, preempt_disable_ip);
-+	}
-+#endif
+
+	print_preempt_disable_ip(offsets & MIGHT_RESCHED_PREEMPT_MASK,
+				 preempt_disable_ip);
+
 +	dump_stack();
 +	add_taint(TAINT_WARN, LOCKDEP_STILL_OK);
 +}
@ -8068,6 +8072,10 @@ index 000000000000..114bd1fd88eb
 +		if (p->flags & PF_KTHREAD)
 +			continue;
 +
+		schedstat_set(p->stats.wait_start,  0);
+		schedstat_set(p->stats.sleep_start, 0);
+		schedstat_set(p->stats.block_start, 0);
+
 +		if (!rt_task(p)) {
 +			/*
 +			 * Renice negative nice level userspace
@ -8139,9 +8147,9 @@ index 000000000000..114bd1fd88eb
 +	kmem_cache_free(task_group_cache, tg);
 +}
 +
-+static void sched_free_group_rcu(struct rcu_head *rcu)
+static void sched_free_group_rcu(struct rcu_head *rhp)
 +{
-+	sched_free_group(container_of(rcu, struct task_group, rcu));
+	sched_free_group(container_of(rhp, struct task_group, rcu));
 +}
 +
 +static void sched_unregister_group(struct task_group *tg)
@ -8172,13 +8180,13 @@ index 000000000000..114bd1fd88eb
 +/* rcu callback to free various structures associated with a task group */
 +static void sched_unregister_group_rcu(struct rcu_head *rhp)
 +{
-+	/* Now it should be safe to free those cfs_rqs */
+	/* Now it should be safe to free those cfs_rqs: */
 +	sched_unregister_group(container_of(rhp, struct task_group, rcu));
 +}
 +
 +void sched_destroy_group(struct task_group *tg)
 +{
-+	/* Wait for possible concurrent references to cfs_rqs complete */
+	/* Wait for possible concurrent references to cfs_rqs complete: */
 +	call_rcu(&tg->rcu, sched_unregister_group_rcu);
 +}
 +
@ -8368,10 +8376,10 @@ index 000000000000..1212a031700e
 +{}
 diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
 new file mode 100644
-index 000000000000..e78324687f6e
+index 000000000000..f2b9e686d6a6
 --- /dev/null
 +++ b/kernel/sched/alt_sched.h
-@@ -0,0 +1,661 @@
+@@ -0,0 +1,667 @@
 +#ifndef ALT_SCHED_H
 +#define ALT_SCHED_H
 +
@ -8405,6 +8413,7 @@ index 000000000000..e78324687f6e
 +#include <linux/livepatch.h>
 +#include <linux/membarrier.h>
 +#include <linux/proc_fs.h>
+#include <linux/profile.h>
 +#include <linux/psi.h>
 +#include <linux/slab.h>
 +#include <linux/stop_machine.h>
@ -8721,6 +8730,11 @@ index 000000000000..e78324687f6e
 +}
 +#endif
 +
+static inline u64 __rq_clock_broken(struct rq *rq)
+{
+	return READ_ONCE(rq->clock);
+}
+
 +static inline u64 rq_clock(struct rq *rq)
 +{
 +	/*
@ -9199,7 +9213,7 @@ index e7af18857371..3e38816b736e 100644
 static DECLARE_WORK(rebuild_sd_work, rebuild_sd_workfn);
 
 diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
-index 9392aea1804e..c1ead972e498 100644
+index b7ec42732b28..a855594a540f 100644
 --- a/kernel/sched/cputime.c
 +++ b/kernel/sched/cputime.c
@@ -123,7 +123,7 @@ void account_user_time(struct task_struct *p, u64 cputime)
@ -9495,7 +9509,7 @@ index a554e3bbab2b..3e56f5e6ff5c 100644
  * thermal:
  *
 diff --git a/kernel/sched/pelt.h b/kernel/sched/pelt.h
-index e06071bf3472..adf567df34d4 100644
+index c336f5f481bc..5865f14714a9 100644
 --- a/kernel/sched/pelt.h
 +++ b/kernel/sched/pelt.h
@@ -1,13 +1,15 @@
@ -9515,15 +9529,15 @@ index e06071bf3472..adf567df34d4 100644
 int update_thermal_load_avg(u64 now, struct rq *rq, u64 capacity);
 
 static inline u64 thermal_load_avg(struct rq *rq)
-@@ -42,6 +44,7 @@ static inline u32 get_pelt_divider(struct sched_avg *avg)
- 	return LOAD_AVG_MAX - 1024 + avg->period_contrib;
+@@ -44,6 +46,7 @@ static inline u32 get_pelt_divider(struct sched_avg *avg)
+ 	return PELT_MIN_DIVIDER + avg->period_contrib;
 }
 
 +#ifndef CONFIG_SCHED_ALT
 static inline void cfs_se_util_change(struct sched_avg *avg)
 {
 	unsigned int enqueued;
-@@ -153,9 +156,11 @@ static inline u64 cfs_rq_clock_pelt(struct cfs_rq *cfs_rq)
+@@ -155,9 +158,11 @@ static inline u64 cfs_rq_clock_pelt(struct cfs_rq *cfs_rq)
 	return rq_clock_pelt(rq_of(cfs_rq));
 }
 #endif
@ -9535,7 +9549,7 @@ index e06071bf3472..adf567df34d4 100644
 static inline int
 update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq)
 {
-@@ -173,6 +178,7 @@ update_dl_rq_load_avg(u64 now, struct rq *rq, int running)
+@@ -175,6 +180,7 @@ update_dl_rq_load_avg(u64 now, struct rq *rq, int running)
 {
 	return 0;
 }
@ -9571,22 +9585,6 @@ diff --git a/kernel/sched/stats.c b/kernel/sched/stats.c
 index 07dde2928c79..6a6edc730dce 100644
 --- a/kernel/sched/stats.c
 +++ b/kernel/sched/stats.c
-@@ -4,6 +4,7 @@
-  */
- #include "sched.h"
-
-+#ifndef CONFIG_SCHED_ALT
- void __update_stats_wait_start(struct rq *rq, struct task_struct *p,
- 			       struct sched_statistics *stats)
- {
-@@ -90,6 +90,7 @@
- 	}
- }
-
-+#endif
- /*
-  * Current schedstat API version.
-  *
@@ -126,8 +126,10 @@ static int show_schedstat(struct seq_file *seq, void *v)
 	} else {
 		struct rq *rq;
@ -9615,27 +9613,27 @@ index 07dde2928c79..6a6edc730dce 100644
 	}
 	return 0;
 diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h
-index cfb0893a83d4..4fb593535447 100644
+index 3a3c826dd83a..d80520eca556 100644
 --- a/kernel/sched/stats.h
 +++ b/kernel/sched/stats.h
-@@ -94,6 +94,7 @@ struct sched_entity_stats {
- } __no_randomize_layout;
- #endif
+@@ -87,6 +87,7 @@ static inline void rq_sched_info_depart  (struct rq *rq, unsigned long long delt
+ 
+ #endif /* CONFIG_SCHEDSTATS */
 
 +#ifndef CONFIG_SCHED_ALT
- static inline struct sched_statistics *
- __schedstats_from_se(struct sched_entity *se)
- {
+ #ifdef CONFIG_FAIR_GROUP_SCHED
+ struct sched_entity_stats {
+ 	struct sched_entity     se;
@@ -103,6 +104,7 @@ __schedstats_from_se(struct sched_entity *se)
 #endif
 	return &task_of(se)->stats;
 }
-+#endif
+#endif /* CONFIG_SCHED_ALT */
 
 #ifdef CONFIG_PSI
 /*
 diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
-index d201a7052a29..163cec668095 100644
+index d201a7052a29..e5a7a638f3fb 100644
 --- a/kernel/sched/topology.c
 +++ b/kernel/sched/topology.c
@@ -4,6 +4,7 @@
@ -9673,7 +9671,7 @@ index d201a7052a29..163cec668095 100644
 #ifdef CONFIG_NUMA
 
 static const struct cpumask *sd_numa_mask(int cpu)
-@@ -2531,3 +2536,15 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
+@@ -2531,3 +2536,17 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
 	partition_sched_domains_locked(ndoms_new, doms_new, dattr_new);
 	mutex_unlock(&sched_domains_mutex);
 }
@ -9683,6 +9681,8 @@ index d201a7052a29..163cec668095 100644
 +{}
 +
 +#ifdef CONFIG_NUMA
+int __read_mostly		node_reclaim_distance = RECLAIM_DISTANCE;
+
 +int sched_numa_find_closest(const struct cpumask *cpus, int cpu)
 +{
 +	return best_mask_cpu(cpu, cpus);
@ -9690,7 +9690,7 @@ index d201a7052a29..163cec668095 100644
 +#endif /* CONFIG_NUMA */
 +#endif
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 083be6af29d7..09fc6281d488 100644
+index 0586047f7323..e4bc1eacd184 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
@@ -122,6 +122,10 @@ static unsigned long long_max = LONG_MAX;
@ -9704,7 +9704,7 @@ index 083be6af29d7..09fc6281d488 100644
 #ifdef CONFIG_PRINTK
 static int ten_thousand = 10000;
 #endif
-@@ -1771,6 +1775,24 @@ int proc_do_static_key(struct ctl_table *table, int write,
+@@ -1778,6 +1782,24 @@ int proc_do_static_key(struct ctl_table *table, int write,
 }
 
 static struct ctl_table kern_table[] = {
@ -9729,7 +9729,7 @@ index 083be6af29d7..09fc6281d488 100644
 	{
 		.procname	= "sched_child_runs_first",
 		.data		= &sysctl_sched_child_runs_first,
-@@ -1901,6 +1923,7 @@ static struct ctl_table kern_table[] = {
+@@ -1908,6 +1930,7 @@ static struct ctl_table kern_table[] = {
 		.extra2		= SYSCTL_ONE,
 	},
 #endif
@ -9737,7 +9737,7 @@ index 083be6af29d7..09fc6281d488 100644
 #ifdef CONFIG_PROVE_LOCKING
 	{
 		.procname	= "prove_locking",
-@@ -2477,6 +2500,17 @@ static struct ctl_table kern_table[] = {
+@@ -2484,6 +2507,17 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= proc_dointvec,
 	},
 #endif
@ -9831,10 +9831,10 @@ index 96b4e7810426..83457e8bb5d2 100644
 	return false;
 }
 diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
-index afd937a46496..7fac2e43d668 100644
+index abcadbe933bb..d4c778b0ab0e 100644
 --- a/kernel/trace/trace_selftest.c
 +++ b/kernel/trace/trace_selftest.c
-@@ -1142,10 +1142,15 @@ static int trace_wakeup_test_thread(void *data)
+@@ -1140,10 +1140,15 @@ static int trace_wakeup_test_thread(void *data)
 {
 	/* Make this a -deadline thread */
 	static const struct sched_attr attr = {
--- a/linux-tkg/linux-tkg-patches/5.17/0009-prjc_v5.17-r0.patch
+++ b/linux-tkg/linux-tkg-patches/5.17/0009-prjc_v5.17-r0.patch
@ -1,5 +1,5 @@
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index f5a27f067db9..90c934ec13cc 100644
+index 7123524a86b8..c9878f85c176 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5085,6 +5085,12 @@
@ -176,34 +176,23 @@ index 8874f681b056..59eb72bf7d5f 100644
 	[RLIMIT_RTTIME]		= {  RLIM_INFINITY,  RLIM_INFINITY },	\
 }
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 75ba8aa60248..3de388cb6923 100644
+index 75ba8aa60248..6da339d69619 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -753,8 +753,14 @@ struct task_struct {
+@@ -753,7 +753,12 @@ struct task_struct {
 	unsigned int			ptrace;
 
 #ifdef CONFIG_SMP
-	int				on_cpu;
- 	struct __call_single_node	wake_entry;
+	struct __call_single_node	wake_entry;
 +#endif
 +#if defined(CONFIG_SMP) || defined(CONFIG_SCHED_ALT)
-+	int				on_cpu;
+ 	int				on_cpu;
 +#endif
-+
-+#ifdef CONFIG_SMP
-+#ifndef CONFIG_SCHED_ALT
+#if defined(CONFIG_SMP) && !defined(CONFIG_SCHED_ALT)
+ 	struct __call_single_node	wake_entry;
 	unsigned int			wakee_flips;
 	unsigned long			wakee_flip_decay_ts;
- 	struct task_struct		*last_wakee;
-@@ -768,6 +774,7 @@ struct task_struct {
- 	 */
- 	int				recent_used_cpu;
- 	int				wake_cpu;
-+#endif /* !CONFIG_SCHED_ALT */
- #endif
- 	int				on_rq;
- 
-@@ -776,6 +783,20 @@ struct task_struct {
+@@ -776,6 +781,20 @@ struct task_struct {
 	int				normal_prio;
 	unsigned int			rt_priority;
 
@ -224,7 +213,7 @@ index 75ba8aa60248..3de388cb6923 100644
 	struct sched_entity		se;
 	struct sched_rt_entity		rt;
 	struct sched_dl_entity		dl;
-@@ -786,6 +807,7 @@ struct task_struct {
+@@ -786,6 +805,7 @@ struct task_struct {
 	unsigned long			core_cookie;
 	unsigned int			core_occupation;
 #endif
@ -232,7 +221,7 @@ index 75ba8aa60248..3de388cb6923 100644
 
 #ifdef CONFIG_CGROUP_SCHED
 	struct task_group		*sched_task_group;
-@@ -1509,6 +1531,15 @@ struct task_struct {
+@@ -1509,6 +1529,15 @@ struct task_struct {
 	 */
 };
 
@ -352,20 +341,12 @@ index 8054641c0a7b..284687d47059 100644
 #else
 static inline void rebuild_sched_domains_energy(void)
 diff --git a/init/Kconfig b/init/Kconfig
-index e9119bf54b1f..2213c306065e 100644
+index e9119bf54b1f..6be3308a3665 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -817,6 +817,7 @@ menu "Scheduler features"
- config UCLAMP_TASK
- 	bool "Enable utilization clamping for RT/FAIR tasks"
- 	depends on CPU_FREQ_GOV_SCHEDUTIL
-+	depends on !SCHED_ALT
- 	help
- 	  This feature enables the scheduler to track the clamped utilization
- 	  of each CPU based on RUNNABLE tasks scheduled on that CPU.
-@@ -863,6 +864,35 @@ config UCLAMP_BUCKETS_COUNT
+@@ -814,9 +814,39 @@ config GENERIC_SCHED_CLOCK
 
- 	  If in doubt, use the default value.
+ menu "Scheduler features"
 
 +menuconfig SCHED_ALT
 +	bool "Alternative CPU Schedulers"
@ -396,9 +377,13 @@ index e9119bf54b1f..2213c306065e 100644
 +
 +endif
 +
- endmenu
- 
- #
+ config UCLAMP_TASK
+ 	bool "Enable utilization clamping for RT/FAIR tasks"
+ 	depends on CPU_FREQ_GOV_SCHEDUTIL
+	depends on !SCHED_ALT
+ 	help
+ 	  This feature enables the scheduler to track the clamped utilization
+ 	  of each CPU based on RUNNABLE tasks scheduled on that CPU.
@@ -907,6 +937,7 @@ config NUMA_BALANCING
 	depends on ARCH_SUPPORTS_NUMA_BALANCING
 	depends on !ARCH_WANT_NUMA_VARIABLE_LOCALITY
@ -647,10 +632,10 @@ index c83b37af155b..c88e9aab0cb3 100644
 obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o
 diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
 new file mode 100644
-index 000000000000..c52650a6e72e
+index 000000000000..6338a97b429e
 --- /dev/null
 +++ b/kernel/sched/alt_core.c
-@@ -0,0 +1,7680 @@
+@@ -0,0 +1,7704 @@
 +/*
 + *  kernel/sched/alt_core.c
 + *
@ -681,7 +666,6 @@ index 000000000000..c52650a6e72e
 +#include <linux/kprobes.h>
 +#include <linux/mmu_context.h>
 +#include <linux/nmi.h>
-+#include <linux/profile.h>
 +#include <linux/rcupdate_wait.h>
 +#include <linux/security.h>
 +#include <linux/syscalls.h>
@ -720,7 +704,7 @@ index 000000000000..c52650a6e72e
 +#define sched_feat(x)	(0)
 +#endif /* CONFIG_SCHED_DEBUG */
 +
-+#define ALT_SCHED_VERSION "v5.15-r1"
+#define ALT_SCHED_VERSION "v5.17-r0"
 +
 +/* rt_prio(prio) defined in include/linux/sched/rt.h */
 +#define rt_task(p)		rt_prio((p)->prio)
@ -1359,6 +1343,25 @@ index 000000000000..c52650a6e72e
 +	return task_on_rq_queued(p);
 +}
 +
+unsigned long get_wchan(struct task_struct *p)
+{
+	unsigned long ip = 0;
+	unsigned int state;
+
+	if (!p || p == current)
+		return 0;
+
+	/* Only get wchan if task is blocked and we can keep it that way. */
+	raw_spin_lock_irq(&p->pi_lock);
+	state = READ_ONCE(p->__state);
+	smp_rmb(); /* see try_to_wake_up() */
+	if (state != TASK_RUNNING && state != TASK_WAKING && !p->on_rq)
+		ip = __get_wchan(p);
+	raw_spin_unlock_irq(&p->pi_lock);
+
+	return ip;
+}
+
 +/*
 + * Add/Remove/Requeue task to/from the runqueue routines
 + * Context: rq->lock
@ -1400,25 +1403,6 @@ index 000000000000..c52650a6e72e
 +	sched_update_tick_dependency(rq);
 +}
 +
-+unsigned long get_wchan(struct task_struct *p)
-+{
-+	unsigned long ip = 0;
-+	unsigned int state;
-+
-+	if (!p || p == current)
-+		return 0;
-+
-+	/* Only get wchan if task is blocked and we can keep it that way. */
-+	raw_spin_lock_irq(&p->pi_lock);
-+	state = READ_ONCE(p->__state);
-+	smp_rmb(); /* see try_to_wake_up() */
-+	if (state != TASK_RUNNING && state != TASK_WAKING && !p->on_rq)
-+		ip = __get_wchan(p);
-+	raw_spin_unlock_irq(&p->pi_lock);
-+
-+	return ip;
-+}
-+
 +static inline void enqueue_task(struct task_struct *p, struct rq *rq, int flags)
 +{
 +	lockdep_assert_held(&rq->lock);
@ -1986,6 +1970,7 @@ index 000000000000..c52650a6e72e
 +	 * per-task data have been completed by this moment.
 +	 */
 +	smp_wmb();
+
 +	WRITE_ONCE(task_thread_info(p)->cpu, cpu);
 +#endif
 +}
@ -2094,6 +2079,9 @@ index 000000000000..c52650a6e72e
 +{
 +	struct task_struct *p = current;
 +
+	if (0 == p->migration_disabled)
+		return;
+
 +	if (p->migration_disabled > 1) {
 +		p->migration_disabled--;
 +		return;
@ -2903,9 +2891,10 @@ index 000000000000..c52650a6e72e
 +	rq = this_rq();
 +
 +#ifdef CONFIG_SMP
-+	if (cpu == rq->cpu)
+	if (cpu == rq->cpu) {
 +		__schedstat_inc(rq->ttwu_local);
-+	else {
+		__schedstat_inc(p->stats.nr_wakeups_local);
+	} else {
 +		/** Alt schedule FW ToDo:
 +		 * How to do ttwu_wake_remote
 +		 */
@ -2913,6 +2902,7 @@ index 000000000000..c52650a6e72e
 +#endif /* CONFIG_SMP */
 +
 +	__schedstat_inc(rq->ttwu_count);
+	__schedstat_inc(p->stats.nr_wakeups);
 +}
 +
 +/*
@ -3103,7 +3093,7 @@ index 000000000000..c52650a6e72e
 +	raw_spin_lock_irqsave(&rq->lock, flags);
 +	if (is_idle_task(rq->curr))
 +		resched_curr(rq);
-+	/* Else CPU is not idle, do nothing here: */
+	/* Else CPU is not idle, do nothing here */
 +	raw_spin_unlock_irqrestore(&rq->lock, flags);
 +
 +out:
@ -3523,9 +3513,9 @@ index 000000000000..c52650a6e72e
 +
 +	/*
 +	 * At this point the task is pinned; either:
-+	 *  - blocked and we're holding off wakeups	 (pi->lock)
-+	 *  - woken, and we're holding off enqueue	 (rq->lock)
-+	 *  - queued, and we're holding off schedule	 (rq->lock)
+	 *  - blocked and we're holding off wakeups      (pi->lock)
+	 *  - woken, and we're holding off enqueue       (rq->lock)
+	 *  - queued, and we're holding off schedule     (rq->lock)
 +	 *  - running, and we're holding off de-schedule (rq->lock)
 +	 *
 +	 * The called function (@func) can use: task_curr(), p->on_rq and
@ -3576,6 +3566,11 @@ index 000000000000..c52650a6e72e
 +	p->stime			= 0;
 +	p->sched_time			= 0;
 +
+#ifdef CONFIG_SCHEDSTATS
+	/* Even if schedstat is disabled, there should not be garbage */
+	memset(&p->stats, 0, sizeof(p->stats));
+#endif
+
 +#ifdef CONFIG_PREEMPT_NOTIFIERS
 +	INIT_HLIST_HEAD(&p->preempt_notifiers);
 +#endif
@ -3630,9 +3625,6 @@ index 000000000000..c52650a6e72e
 +	if (unlikely(sched_info_on()))
 +		memset(&p->sched_info, 0, sizeof(p->sched_info));
 +#endif
-+#if defined(CONFIG_SMP)
-+	p->on_cpu = 0;
-+#endif
 +	init_task_preempt_count(p);
 +
 +	return 0;
@ -3644,11 +3636,8 @@ index 000000000000..c52650a6e72e
 +	struct rq *rq;
 +
 +	/*
-+	 * The child is not yet in the pid-hash so no cgroup attach races,
-+	 * and the cgroup is pinned to this child due to cgroup_fork()
-+	 * is ran before sched_fork().
-+	 *
-+	 * Silence PROVE_RCU.
+	 * Because we're not yet on the pid-hash, p->pi_lock isn't strictly
+	 * required yet, but lockdep gets upset if rules are violated.
 +	 */
 +	raw_spin_lock_irqsave(&p->pi_lock, flags);
 +	/*
@ -3683,9 +3672,6 @@ index 000000000000..c52650a6e72e
 +
 +void sched_post_fork(struct task_struct *p)
 +{
-+#ifdef CONFIG_UCLAMP_TASK
-+	uclamp_post_fork(p);
-+#endif
 +}
 +
 +#ifdef CONFIG_SCHEDSTATS
@ -7266,7 +7252,6 @@ index 000000000000..c52650a6e72e
 +
 +	rq->idle = idle;
 +	rcu_assign_pointer(rq->curr, idle);
-+	idle->on_rq = TASK_ON_RQ_QUEUED;
 +	idle->on_cpu = 1;
 +
 +	raw_spin_unlock(&rq->lock);
@ -7919,12 +7904,6 @@ index 000000000000..c52650a6e72e
 +}
 +
 +#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
-+static inline int preempt_count_equals(int preempt_offset)
-+{
-+	int nested = preempt_count() + rcu_preempt_depth();
-+
-+	return (nested == preempt_offset);
-+}
 +
 +void __might_sleep(const char *file, int line)
 +{
@ -7944,7 +7923,28 @@ index 000000000000..c52650a6e72e
 +}
 +EXPORT_SYMBOL(__might_sleep);
 +
-+void __might_resched(const char *file, int line, int preempt_offset)
+static void print_preempt_disable_ip(int preempt_offset, unsigned long ip)
+{
+	if (!IS_ENABLED(CONFIG_DEBUG_PREEMPT))
+		return;
+
+	if (preempt_count() == preempt_offset)
+		return;
+
+	pr_err("Preemption disabled at:");
+	print_ip_sym(KERN_ERR, ip);
+}
+
+static inline bool resched_offsets_ok(unsigned int offsets)
+{
+	unsigned int nested = preempt_count();
+
+	nested += rcu_preempt_depth() << MIGHT_RESCHED_RCU_SHIFT;
+
+	return nested == offsets;
+}
+
+void __might_resched(const char *file, int line, unsigned int offsets)
 +{
 +	/* Ratelimiting timestamp: */
 +	static unsigned long prev_jiffy;
@ -7954,7 +7954,7 @@ index 000000000000..c52650a6e72e
 +	/* WARN_ON_ONCE() by default, no rate limit required: */
 +	rcu_sleep_check();
 +
-+	if ((preempt_count_equals(preempt_offset) && !irqs_disabled() &&
+	if ((resched_offsets_ok(offsets) && !irqs_disabled() &&
 +	     !is_idle_task(current) && !current->non_block_count) ||
 +	    system_state == SYSTEM_BOOTING || system_state > SYSTEM_RUNNING ||
 +	    oops_in_progress)
@ -7971,6 +7971,13 @@ index 000000000000..c52650a6e72e
 +	pr_err("in_atomic(): %d, irqs_disabled(): %d, non_block: %d, pid: %d, name: %s\n",
 +	       in_atomic(), irqs_disabled(), current->non_block_count,
 +	       current->pid, current->comm);
+	pr_err("preempt_count: %x, expected: %x\n", preempt_count(),
+	       offsets & MIGHT_RESCHED_PREEMPT_MASK);
+
+	if (IS_ENABLED(CONFIG_PREEMPT_RCU)) {
+		pr_err("RCU nest depth: %d, expected: %u\n",
+		       rcu_preempt_depth(), offsets >> MIGHT_RESCHED_RCU_SHIFT);
+	}
 +
 +	if (task_stack_end_corrupted(current))
 +		pr_emerg("Thread overran stack, or stack corrupted\n");
@ -7978,12 +7985,10 @@ index 000000000000..c52650a6e72e
 +	debug_show_held_locks(current);
 +	if (irqs_disabled())
 +		print_irqtrace_events(current);
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	if (!preempt_count_equals(preempt_offset)) {
-+		pr_err("Preemption disabled at:");
-+		print_ip_sym(KERN_ERR, preempt_disable_ip);
-+	}
-+#endif
+
+	print_preempt_disable_ip(offsets & MIGHT_RESCHED_PREEMPT_MASK,
+				 preempt_disable_ip);
+
 +	dump_stack();
 +	add_taint(TAINT_WARN, LOCKDEP_STILL_OK);
 +}
@ -8070,6 +8075,10 @@ index 000000000000..c52650a6e72e
 +		if (p->flags & PF_KTHREAD)
 +			continue;
 +
+		schedstat_set(p->stats.wait_start,  0);
+		schedstat_set(p->stats.sleep_start, 0);
+		schedstat_set(p->stats.block_start, 0);
+
 +		if (!rt_task(p)) {
 +			/*
 +			 * Renice negative nice level userspace
@ -8141,9 +8150,9 @@ index 000000000000..c52650a6e72e
 +	kmem_cache_free(task_group_cache, tg);
 +}
 +
-+static void sched_free_group_rcu(struct rcu_head *rcu)
+static void sched_free_group_rcu(struct rcu_head *rhp)
 +{
-+	sched_free_group(container_of(rcu, struct task_group, rcu));
+	sched_free_group(container_of(rhp, struct task_group, rcu));
 +}
 +
 +static void sched_unregister_group(struct task_group *tg)
@ -8174,13 +8183,13 @@ index 000000000000..c52650a6e72e
 +/* rcu callback to free various structures associated with a task group */
 +static void sched_unregister_group_rcu(struct rcu_head *rhp)
 +{
-+	/* Now it should be safe to free those cfs_rqs */
+	/* Now it should be safe to free those cfs_rqs: */
 +	sched_unregister_group(container_of(rhp, struct task_group, rcu));
 +}
 +
 +void sched_destroy_group(struct task_group *tg)
 +{
-+	/* Wait for possible concurrent references to cfs_rqs complete */
+	/* Wait for possible concurrent references to cfs_rqs complete: */
 +	call_rcu(&tg->rcu, sched_unregister_group_rcu);
 +}
 +
@ -8370,10 +8379,10 @@ index 000000000000..1212a031700e
 +{}
 diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
 new file mode 100644
-index 000000000000..6ff979a299ab
+index 000000000000..f2b9e686d6a6
 --- /dev/null
 +++ b/kernel/sched/alt_sched.h
-@@ -0,0 +1,662 @@
+@@ -0,0 +1,667 @@
 +#ifndef ALT_SCHED_H
 +#define ALT_SCHED_H
 +
@ -8724,6 +8733,11 @@ index 000000000000..6ff979a299ab
 +}
 +#endif
 +
+static inline u64 __rq_clock_broken(struct rq *rq)
+{
+	return READ_ONCE(rq->clock);
+}
+
 +static inline u64 rq_clock(struct rq *rq)
 +{
 +	/*
@ -9602,27 +9616,27 @@ index 07dde2928c79..6a6edc730dce 100644
 	}
 	return 0;
 diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h
-index 3a3c826dd83a..39df2b235944 100644
+index 3a3c826dd83a..d80520eca556 100644
 --- a/kernel/sched/stats.h
 +++ b/kernel/sched/stats.h
-@@ -94,6 +94,7 @@ struct sched_entity_stats {
- } __no_randomize_layout;
- #endif
+@@ -87,6 +87,7 @@ static inline void rq_sched_info_depart  (struct rq *rq, unsigned long long delt
+ 
+ #endif /* CONFIG_SCHEDSTATS */
 
 +#ifndef CONFIG_SCHED_ALT
- static inline struct sched_statistics *
- __schedstats_from_se(struct sched_entity *se)
- {
+ #ifdef CONFIG_FAIR_GROUP_SCHED
+ struct sched_entity_stats {
+ 	struct sched_entity     se;
@@ -103,6 +104,7 @@ __schedstats_from_se(struct sched_entity *se)
 #endif
 	return &task_of(se)->stats;
 }
-+#endif
+#endif /* CONFIG_SCHED_ALT */
 
 #ifdef CONFIG_PSI
 /*
 diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
-index d201a7052a29..163cec668095 100644
+index d201a7052a29..e5a7a638f3fb 100644
 --- a/kernel/sched/topology.c
 +++ b/kernel/sched/topology.c
@@ -4,6 +4,7 @@
@ -9660,7 +9674,7 @@ index d201a7052a29..163cec668095 100644
 #ifdef CONFIG_NUMA
 
 static const struct cpumask *sd_numa_mask(int cpu)
-@@ -2531,3 +2536,15 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
+@@ -2531,3 +2536,17 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
 	partition_sched_domains_locked(ndoms_new, doms_new, dattr_new);
 	mutex_unlock(&sched_domains_mutex);
 }
@ -9670,6 +9684,8 @@ index d201a7052a29..163cec668095 100644
 +{}
 +
 +#ifdef CONFIG_NUMA
+int __read_mostly		node_reclaim_distance = RECLAIM_DISTANCE;
+
 +int sched_numa_find_closest(const struct cpumask *cpus, int cpu)
 +{
 +	return best_mask_cpu(cpu, cpus);
@ -9677,21 +9693,21 @@ index d201a7052a29..163cec668095 100644
 +#endif /* CONFIG_NUMA */
 +#endif
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 5ae443b2882e..7bb4e033cae6 100644
+index 730ab56d9e92..f2fdf9088055 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -94,6 +94,10 @@
+@@ -96,6 +96,10 @@
 
- #if defined(CONFIG_SYSCTL)
+ /* Constants used for minimum and  maximum */
 
 +#ifdef CONFIG_SCHED_ALT
 +extern int sched_yield_type;
 +#endif
 +
- #ifdef CONFIG_USER_NS
- extern int unprivileged_userns_clone;
+ #ifdef CONFIG_PERF_EVENTS
+ static const int six_hundred_forty_kb = 640 * 1024;
 #endif
-@@ -1652,6 +1656,24 @@ int proc_do_static_key(struct ctl_table *table, int write,
+@@ -1659,6 +1663,24 @@ int proc_do_static_key(struct ctl_table *table, int write,
 }
 
 static struct ctl_table kern_table[] = {
@ -9716,7 +9732,7 @@ index 5ae443b2882e..7bb4e033cae6 100644
 	{
 		.procname	= "sched_child_runs_first",
 		.data		= &sysctl_sched_child_runs_first,
-@@ -1782,6 +1804,7 @@ static struct ctl_table kern_table[] = {
+@@ -1789,6 +1811,7 @@ static struct ctl_table kern_table[] = {
 		.extra2		= SYSCTL_ONE,
 	},
 #endif
@ -9724,7 +9740,7 @@ index 5ae443b2882e..7bb4e033cae6 100644
 #ifdef CONFIG_PROVE_LOCKING
 	{
 		.procname	= "prove_locking",
-@@ -2167,6 +2190,17 @@ static struct ctl_table kern_table[] = {
+@@ -2174,6 +2197,17 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= proc_dointvec,
 	},
 #endif
@ -9837,3 +9853,92 @@ index abcadbe933bb..d4c778b0ab0e 100644
 	};
 	struct wakeup_test_data *x = data;
 
+diff --git a/init/Kconfig b/init/Kconfig
+index 6be3308a3665af9e932db6639e4e22adec1dd9c9..2213c306065ea9e46061da4ad3c901183ee13f78 100644
+--- a/init/Kconfig
+++ b/init/Kconfig
+@@ -814,35 +814,6 @@ config GENERIC_SCHED_CLOCK
+
+ menu "Scheduler features"
+
+-menuconfig SCHED_ALT
+-	bool "Alternative CPU Schedulers"
+-	default y
+-	help
+-	  This feature enable alternative CPU scheduler"
+-
+-if SCHED_ALT
+-
+-choice