From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Jan 2025 02:49:43 +0000 (-0800)
Subject: Merge tag 'sched_ext-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v6.14-rc1~121
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/bc8198dc7ebc492ec3e9fa1617dcdfbe98e73b17

Merge tag 'sched_ext-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext

Pull sched_ext updates from Tejun Heo:

 - scx_bpf_now() added so that BPF scheduler can access the cached
   timestamp in struct rq to avoid reading TSC multiple times within a
   locked scheduling operation.

 - Minor updates to the built-in idle CPU selection logic.

 - tool/sched_ext updates and other misc changes.

* tag 'sched_ext-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext:
  sched_ext: fix kernel-doc warnings
  sched_ext: Use time helpers in BPF schedulers
  sched_ext: Replace bpf_ktime_get_ns() to scx_bpf_now()
  sched_ext: Add time helpers for BPF schedulers
  sched_ext: Add scx_bpf_now() for BPF scheduler
  sched_ext: Implement scx_bpf_now()
  sched_ext: Relocate scx_enabled() related code
  sched_ext: Add option -l in selftest runner to list all available tests
  sched_ext: Include remaining task time slice in error state dump
  sched_ext: update scx_bpf_dsq_insert() doc for SCX_DSQ_LOCAL_ON
  sched_ext: idle: small CPU iteration refactoring
  sched_ext: idle: introduce check_builtin_idle_enabled() helper
  sched_ext: idle: clarify comments
  sched_ext: idle: use assign_cpu() to update the idle cpumask
  sched_ext: Use str_enabled_disabled() helper in update_selcpu_topology()
  sched_ext: Use sizeof_field for key_len in dsq_hash_params
  tools/sched_ext: Receive updates from SCX repo
  sched_ext: Use the NUMA scheduling domain for NUMA optimizations
---

bc8198dc7ebc492ec3e9fa1617dcdfbe98e73b17
diff --cc kernel/sched/ext.c
index 7fee43426ee7,64967d28da7f..8857c0709bdd
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -3590,12 -3651,17 +3655,9 @@@ static void reset_idle_masks(void
  	cpumask_copy(idle_masks.smt, cpu_online_mask);
  }
  
 -void __scx_update_idle(struct rq *rq, bool idle)
 +static void update_builtin_idle(int cpu, bool idle)
  {
- 	if (idle)
- 		cpumask_set_cpu(cpu, idle_masks.cpu);
- 	else
- 		cpumask_clear_cpu(cpu, idle_masks.cpu);
 -	int cpu = cpu_of(rq);
 -
 -	if (SCX_HAS_OP(update_idle) && !scx_rq_bypassing(rq)) {
 -		SCX_CALL_OP(SCX_KF_REST, update_idle, cpu_of(rq), idle);
 -		if (!static_branch_unlikely(&scx_builtin_idle_enabled))
 -			return;
 -	}
 -
+ 	assign_cpu(cpu, idle_masks.cpu, idle);
  
  #ifdef CONFIG_SCHED_SMT
  	if (sched_smt_active()) {