Merging debian version 6.8.9-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 36 insertions, 36 deletions

diff --git a/debian/patches-rt/PREEMPT_AUTO.patch b/debian/patches-rt/PREEMPT_AUTO.patch
index 323b18f798..338abae7c3 100644
--- a/debian/patches-rt/PREEMPT_AUTO.patch
+++ b/debian/patches-rt/PREEMPT_AUTO.patch
@@ -1,7 +1,7 @@
 From: Thomas Gleixner <tglx@linutronix.de>
 Date: Sat, 23 Sep 2023 03:11:05 +0200
 Subject: [PATCH] sched: define TIF_ALLOW_RESCHED
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.8/older/patches-6.8.2-rt11.tar.xz
 
 On Fri, Sep 22 2023 at 00:55, Thomas Gleixner wrote:
 > On Thu, Sep 21 2023 at 09:00, Linus Torvalds wrote:
@@ -122,7 +122,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -272,6 +272,7 @@ config X86
+@@ -277,6 +277,7 @@ config X86
  	select HAVE_STATIC_CALL
  	select HAVE_STATIC_CALL_INLINE		if HAVE_OBJTOOL
  	select HAVE_PREEMPT_DYNAMIC_CALL
@@ -165,7 +165,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  	}
 --- a/include/linux/entry-common.h
 +++ b/include/linux/entry-common.h
-@@ -60,7 +60,7 @@
+@@ -65,7 +65,7 @@
  #define EXIT_TO_USER_MODE_WORK						\
  	(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE |		\
  	 _TIF_NEED_RESCHED | _TIF_PATCH_PENDING | _TIF_NOTIFY_SIGNAL |	\
@@ -187,7 +187,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -2055,17 +2055,17 @@ static inline void update_tsk_thread_fla
+@@ -1934,17 +1934,17 @@ static inline void update_tsk_thread_fla
  	update_ti_thread_flag(task_thread_info(tsk), flag, value);
  }
  
@@ -208,7 +208,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	return test_ti_thread_flag(task_thread_info(tsk), flag);
  }
-@@ -2078,9 +2078,11 @@ static inline void set_tsk_need_resched(
+@@ -1957,9 +1957,11 @@ static inline void set_tsk_need_resched(
  static inline void clear_tsk_need_resched(struct task_struct *tsk)
  {
  	clear_tsk_thread_flag(tsk,TIF_NEED_RESCHED);
@@ -221,7 +221,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
  }
-@@ -2261,7 +2263,7 @@ static inline int rwlock_needbreak(rwloc
+@@ -2100,7 +2102,7 @@ static inline bool preempt_model_preempt
  
  static __always_inline bool need_resched(void)
  {
@@ -383,7 +383,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  	default y if HAVE_PREEMPT_DYNAMIC_CALL
 --- a/kernel/entry/common.c
 +++ b/kernel/entry/common.c
-@@ -155,7 +155,7 @@ static unsigned long exit_to_user_mode_l
+@@ -92,7 +92,7 @@ void __weak arch_do_signal_or_restart(st
  
  		local_irq_enable_exit_to_user(ti_work);
  
@@ -392,7 +392,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  			schedule();
  
  		if (ti_work & _TIF_UPROBE)
-@@ -385,7 +385,7 @@ void raw_irqentry_exit_cond_resched(void
+@@ -301,7 +301,7 @@ void raw_irqentry_exit_cond_resched(void
  		rcu_irq_exit_check_preempt();
  		if (IS_ENABLED(CONFIG_DEBUG_ENTRY))
  			WARN_ON_ONCE(!on_thread_stack());
@@ -414,7 +414,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  		if (ti_work & _TIF_NOTIFY_RESUME)
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -898,14 +898,15 @@ static inline void hrtick_rq_init(struct
+@@ -899,14 +899,15 @@ static inline void hrtick_rq_init(struct
  
  #if defined(CONFIG_SMP) && defined(TIF_POLLING_NRFLAG)
  /*
@@ -433,7 +433,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  /*
-@@ -922,7 +923,7 @@ static bool set_nr_if_polling(struct tas
+@@ -923,7 +924,7 @@ static bool set_nr_if_polling(struct tas
  	do {
  		if (!(val & _TIF_POLLING_NRFLAG))
  			return false;
@@ -442,7 +442,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  			return true;
  	} while (!try_cmpxchg(&ti->flags, &val, val | _TIF_NEED_RESCHED));
  
-@@ -930,9 +931,9 @@ static bool set_nr_if_polling(struct tas
+@@ -931,9 +932,9 @@ static bool set_nr_if_polling(struct tas
  }
  
  #else
@@ -454,7 +454,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  	return true;
  }
  
-@@ -1037,28 +1038,47 @@ void wake_up_q(struct wake_q_head *head)
+@@ -1038,28 +1039,47 @@ void wake_up_q(struct wake_q_head *head)
   * might also involve a cross-CPU call to trigger the scheduler on
   * the target CPU.
   */
@@ -510,10 +510,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  void resched_cpu(int cpu)
-@@ -1131,7 +1151,7 @@ static void wake_up_idle_cpu(int cpu)
- 	if (cpu == smp_processor_id())
- 		return;
- 
+@@ -1154,7 +1174,7 @@ static void wake_up_idle_cpu(int cpu)
+ 	 * and testing of the above solutions didn't appear to report
+ 	 * much benefits.
+ 	 */
 -	if (set_nr_and_not_polling(rq->idle))
 +	if (set_nr_and_not_polling(rq->idle, TIF_NEED_RESCHED))
  		smp_send_reschedule(cpu);
@@ -556,7 +556,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  late_initcall(sched_init_debug);
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
-@@ -1001,8 +1001,10 @@ static void clear_buddies(struct cfs_rq
+@@ -975,8 +975,10 @@ static void clear_buddies(struct cfs_rq
   * XXX: strictly: vd_i += N*r_i/w_i such that: vd_i > ve_i
   * this is probably good enough.
   */
@@ -568,7 +568,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  	if ((s64)(se->vruntime - se->deadline) < 0)
  		return;
  
-@@ -1021,10 +1023,19 @@ static void update_deadline(struct cfs_r
+@@ -995,10 +997,19 @@ static void update_deadline(struct cfs_r
  	/*
  	 * The task has consumed its request, reschedule.
  	 */
@@ -591,7 +591,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  #include "pelt.h"
-@@ -1132,7 +1143,7 @@ static void update_tg_load_avg(struct cf
+@@ -1153,7 +1164,7 @@ s64 update_curr_common(struct rq *rq)
  /*
   * Update the current task's runtime statistics.
   */
@@ -599,17 +599,17 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 +static void __update_curr(struct cfs_rq *cfs_rq, bool tick)
  {
  	struct sched_entity *curr = cfs_rq->curr;
- 	u64 now = rq_clock_task(rq_of(cfs_rq));
-@@ -1159,7 +1170,7 @@ static void update_curr(struct cfs_rq *c
- 	schedstat_add(cfs_rq->exec_clock, delta_exec);
+ 	s64 delta_exec;
+@@ -1166,7 +1177,7 @@ static void update_curr(struct cfs_rq *c
+ 		return;
  
  	curr->vruntime += calc_delta_fair(delta_exec, curr);
 -	update_deadline(cfs_rq, curr);
 +	update_deadline(cfs_rq, curr, tick);
  	update_min_vruntime(cfs_rq);
  
- 	if (entity_is_task(curr)) {
-@@ -1173,6 +1184,11 @@ static void update_curr(struct cfs_rq *c
+ 	if (entity_is_task(curr))
+@@ -1175,6 +1186,11 @@ static void update_curr(struct cfs_rq *c
  	account_cfs_rq_runtime(cfs_rq, delta_exec);
  }
  
@@ -621,7 +621,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  static void update_curr_fair(struct rq *rq)
  {
  	update_curr(cfs_rq_of(&rq->curr->se));
-@@ -5449,7 +5465,7 @@ entity_tick(struct cfs_rq *cfs_rq, struc
+@@ -5493,7 +5509,7 @@ entity_tick(struct cfs_rq *cfs_rq, struc
  	/*
  	 * Update run-time statistics of the 'current'.
  	 */
@@ -630,7 +630,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  
  	/*
  	 * Ensure that runnable average is periodically updated.
-@@ -5463,7 +5479,7 @@ entity_tick(struct cfs_rq *cfs_rq, struc
+@@ -5507,7 +5523,7 @@ entity_tick(struct cfs_rq *cfs_rq, struc
  	 * validating it and just reschedule.
  	 */
  	if (queued) {
@@ -639,7 +639,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  		return;
  	}
  	/*
-@@ -5609,7 +5625,7 @@ static void __account_cfs_rq_runtime(str
+@@ -5653,7 +5669,7 @@ static void __account_cfs_rq_runtime(str
  	 * hierarchy can be throttled
  	 */
  	if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr))
@@ -648,7 +648,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  static __always_inline
-@@ -5869,7 +5885,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cf
+@@ -5913,7 +5929,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cf
  
  	/* Determine whether we need to wake up potentially idle CPU: */
  	if (rq->curr == rq->idle && rq->cfs.nr_running)
@@ -657,7 +657,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  #ifdef CONFIG_SMP
-@@ -6584,7 +6600,7 @@ static void hrtick_start_fair(struct rq
+@@ -6628,7 +6644,7 @@ static void hrtick_start_fair(struct rq
  
  		if (delta < 0) {
  			if (task_current(rq, p))
@@ -666,7 +666,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  			return;
  		}
  		hrtick_start(rq, delta);
-@@ -8240,7 +8256,7 @@ static void check_preempt_wakeup_fair(st
+@@ -8304,7 +8320,7 @@ static void check_preempt_wakeup_fair(st
  	 * prevents us from potentially nominating it as a false LAST_BUDDY
  	 * below.
  	 */
@@ -675,7 +675,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  		return;
  
  	/* Idle tasks are by definition preempted by non-idle tasks. */
-@@ -8282,7 +8298,7 @@ static void check_preempt_wakeup_fair(st
+@@ -8346,7 +8362,7 @@ static void check_preempt_wakeup_fair(st
  	return;
  
  preempt:
@@ -684,7 +684,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  #ifdef CONFIG_SMP
-@@ -12449,7 +12465,7 @@ static inline void task_tick_core(struct
+@@ -12516,7 +12532,7 @@ static inline void task_tick_core(struct
  	 */
  	if (rq->core->core_forceidle_count && rq->cfs.nr_running == 1 &&
  	    __entity_slice_used(&curr->se, MIN_NR_TASKS_DURING_FORCEIDLE))
@@ -693,7 +693,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  /*
-@@ -12614,7 +12630,7 @@ prio_changed_fair(struct rq *rq, struct
+@@ -12681,7 +12697,7 @@ prio_changed_fair(struct rq *rq, struct
  	 */
  	if (task_current(rq, p)) {
  		if (p->prio > oldprio)
@@ -704,7 +704,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
 --- a/kernel/sched/features.h
 +++ b/kernel/sched/features.h
-@@ -88,3 +88,5 @@ SCHED_FEAT(UTIL_EST_FASTUP, true)
+@@ -87,3 +87,5 @@ SCHED_FEAT(UTIL_EST, true)
  SCHED_FEAT(LATENCY_WARN, false)
  
  SCHED_FEAT(HZ_BW, true)
@@ -724,7 +724,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  
 --- a/kernel/sched/sched.h
 +++ b/kernel/sched/sched.h
-@@ -2419,6 +2419,7 @@ extern void init_sched_fair_class(void);
+@@ -2463,6 +2463,7 @@ extern void init_sched_fair_class(void);
  extern void reweight_task(struct task_struct *p, int prio);
  
  extern void resched_curr(struct rq *rq);
@@ -734,7 +734,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  extern struct rt_bandwidth def_rt_bandwidth;
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -2723,6 +2723,8 @@ unsigned int tracing_gen_ctx_irq_test(un
+@@ -2717,6 +2717,8 @@ unsigned int tracing_gen_ctx_irq_test(un
  
  	if (tif_need_resched())
  		trace_flags |= TRACE_FLAG_NEED_RESCHED;