Revert "FROMEXT: sched: linux6.18.18-bore-6.6.2"

This reverts commit 39c5dcb.

Author: opsiff

include/linux/sched.h

@@ -817,37 +817,6 @@ struct kmap_ctrl {
 #endif
 };
 
-#ifdef CONFIG_SCHED_BORE
-#define BORE_BC_TIMESTAMP_SHIFT 16
-
-struct bore_bc {
-	union {
-		struct {
-			u64		timestamp:	48;
-			u64		penalty:	16;
-		};
-		u64			value;
-	};
-};
-
-struct bore_ctx {
-	u64				burst_time;
-	u16				prev_penalty;
-	u16				curr_penalty;
-	union {
-		u16			penalty;
-		struct {
-			u8		_;
-			u8		score;
-		};
-	};
-	bool			stop_update;
-	bool			futex_waiting;
-	struct bore_bc	subtree;
-	struct bore_bc	group;
-};
-#endif /* CONFIG_SCHED_BORE */
-
 struct task_struct {
 #ifdef CONFIG_THREAD_INFO_IN_TASK
 	/*
@@ -906,9 +875,6 @@ struct task_struct {
 #ifdef CONFIG_SCHED_CLASS_EXT
 	struct sched_ext_entity		scx;
 #endif
-#ifdef CONFIG_SCHED_BORE
-	struct bore_ctx			bore;
-#endif /* CONFIG_SCHED_BORE */
 	const struct sched_class	*sched_class;
 
 #ifdef CONFIG_SCHED_CORE

include/linux/sched/bore.h

@@ -1423,23 +1423,6 @@ config CHECKPOINT_RESTORE
 
 	  If unsure, say N here.
 
-config SCHED_BORE
-	bool "Burst-Oriented Response Enhancer"
-	default y
-	help
-	  In Desktop and Mobile computing, one might prefer interactive
-	  tasks to keep responsive no matter what they run in the background.
-
-	  Enabling this kernel feature modifies the scheduler to discriminate
-	  tasks by their burst time (runtime since it last went sleeping or
-	  yielding state) and prioritize those that run less bursty.
-	  Such tasks usually include window compositor, widgets backend,
-	  terminal emulator, video playback, games and so on.
-	  With a little impact to scheduling fairness, it may improve
-	  responsiveness especially under heavy background workload.
-
-	  If unsure, say Y here.
-
 config SCHED_AUTOGROUP
 	bool "Automatic process group scheduling"
 	select CGROUPS

init/Kconfig

@@ -57,20 +57,3 @@ config HZ
 
 config SCHED_HRTICK
 	def_bool HIGH_RES_TIMERS
-
-config MIN_BASE_SLICE_NS
-	int "Default value for min_base_slice_ns"
-	default 2000000
-	help
-	 The BORE Scheduler automatically calculates the optimal base
-	 slice for the configured HZ using the following equation:
-	 
-	 base_slice_ns =
-	 	1000000000/HZ * DIV_ROUNDUP(min_base_slice_ns, 1000000000/HZ)
-	 
-	 This option sets the default lower bound limit of the base slice
-	 to prevent the loss of task throughput due to overscheduling.
-	 
-	 Setting this value too high can cause the system to boot with
-	 an unnecessarily large base slice, resulting in high scheduling
-	 latency and poor system responsiveness.

kernel/Kconfig.hz

@@ -147,11 +147,7 @@ static void __unhash_process(struct release_task_post *post, struct task_struct
 		detach_pid(post->pids, p, PIDTYPE_SID);
 
 		list_del_rcu(&p->tasks);
-#ifdef CONFIG_SCHED_BORE
-		list_del_rcu(&p->sibling);
-#else /* !CONFIG_SCHED_BORE */
 		list_del_init(&p->sibling);
-#endif /* CONFIG_SCHED_BORE */
 		__this_cpu_dec(process_counts);
 	}
 	list_del_rcu(&p->thread_node);

kernel/exit.c

@@ -116,10 +116,6 @@
 /* For dup_mmap(). */
 #include "../mm/internal.h"
 
-#ifdef CONFIG_SCHED_BORE
-#include <linux/sched/bore.h>
-#endif /* CONFIG_SCHED_BORE */
-
 #include <trace/events/sched.h>
 
 #define CREATE_TRACE_POINTS
@@ -2324,11 +2320,6 @@ __latent_entropy struct task_struct *copy_process(
 	p->start_time = ktime_get_ns();
 	p->start_boottime = ktime_get_boottime_ns();
 
-#ifdef CONFIG_SCHED_BORE
-	if (likely(p->pid))
-		task_fork_bore(p, current, clone_flags, p->start_time);
-#endif /* CONFIG_SCHED_BORE */
-
 	/*
 	 * Make it visible to the rest of the system, but dont wake it up yet.
 	 * Need tasklist lock for parent etc handling!
@@ -2402,11 +2393,7 @@ __latent_entropy struct task_struct *copy_process(
 			 */
 			p->signal->has_child_subreaper = p->real_parent->signal->has_child_subreaper ||
 							 p->real_parent->signal->is_child_subreaper;
-#ifdef CONFIG_SCHED_BORE
-			list_add_tail_rcu(&p->sibling, &p->real_parent->children);
-#else /* !CONFIG_SCHED_BORE */
 			list_add_tail(&p->sibling, &p->real_parent->children);
-#endif /* CONFIG_SCHED_BORE */
 			list_add_tail_rcu(&p->tasks, &init_task.tasks);
 			attach_pid(p, PIDTYPE_TGID);
 			attach_pid(p, PIDTYPE_PGID);

kernel/fork.c

@@ -4,9 +4,6 @@
 #include <linux/sched/task.h>
 #include <linux/sched/signal.h>
 #include <linux/freezer.h>
-#ifdef CONFIG_SCHED_BORE
-#include <linux/sched/bore.h>
-#endif /* CONFIG_SCHED_BORE */
 
 #include "futex.h"
 
@@ -358,15 +355,7 @@ void futex_do_wait(struct futex_q *q, struct hrtimer_sleeper *timeout)
 		 * is no timeout, or if it has yet to expire.
 		 */
 		if (!timeout || timeout->task)
-#ifdef CONFIG_SCHED_BORE
-		{
-			current->bore.futex_waiting = true;
-#endif /* CONFIG_SCHED_BORE */
 			schedule();
-#ifdef CONFIG_SCHED_BORE
-			current->bore.futex_waiting = false;
-		}
-#endif /* CONFIG_SCHED_BORE */
 	}
 	__set_current_state(TASK_RUNNING);
 }

kernel/futex/waitwake.c

@@ -37,4 +37,3 @@ obj-y += core.o
 obj-y += fair.o
 obj-y += build_policy.o
 obj-y += build_utility.o
-obj-$(CONFIG_SCHED_BORE) += bore.o