- Kernel - mailweb.openeuler.org

[openeuler:OLK-6.6 2536/2999] kernel/sched/fair.c:314:36: error: 'hundred_thousand' undeclared here (not in a function)
by kernel test robot 05 Feb '24

05 Feb '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 90577e059749e400dd367f89398a3f60a35ab887 commit: f7c232d3e20a69b46e53da221ba3cbac0fa68a0d [2536/2999] smart_grid: introduce smart_grid_strategy_ctrl sysctl config: loongarch-randconfig-001-20240205 (https://download.01.org/0day-ci/archive/20240205/202402052121.E2UkGTnd-lkp@…) compiler: loongarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240205/202402052121.E2UkGTnd-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202402052121.E2UkGTnd-lkp@intel.com/ All errors (new ones prefixed by >>): >> kernel/sched/fair.c:314:36: error: 'hundred_thousand' undeclared here (not in a function) 314 | .extra2 = &hundred_thousand, | ^~~~~~~~~~~~~~~~ kernel/sched/fair.c:7104:6: warning: no previous prototype for 'free_affinity_domains' [-Wmissing-prototypes] 7104 | void free_affinity_domains(struct affinity_domain *ad) | ^~~~~~~~~~~~~~~~~~~~~ vim +/hundred_thousand +314 kernel/sched/fair.c 216 217 #ifdef CONFIG_SYSCTL 218 static struct ctl_table sched_fair_sysctls[] = { 219 { 220 .procname = "sched_child_runs_first", 221 .data = &sysctl_sched_child_runs_first, 222 .maxlen = sizeof(unsigned int), 223 .mode = 0644, 224 .proc_handler = proc_dointvec, 225 }, 226 #ifdef CONFIG_CFS_BANDWIDTH 227 { 228 .procname = "sched_cfs_bandwidth_slice_us", 229 .data = &sysctl_sched_cfs_bandwidth_slice, 230 .maxlen = sizeof(unsigned int), 231 .mode = 0644, 232 .proc_handler = proc_dointvec_minmax, 233 .extra1 = SYSCTL_ONE, 234 }, 235 #endif 236 #ifdef CONFIG_NUMA_BALANCING 237 { 238 .procname = "numa_balancing_promote_rate_limit_MBps", 239 .data = &sysctl_numa_balancing_promote_rate_limit, 240 .maxlen = sizeof(unsigned int), 241 .mode = 0644, 242 .proc_handler = proc_dointvec_minmax, 243 .extra1 = SYSCTL_ZERO, 244 }, 245 #endif /* CONFIG_NUMA_BALANCING */ 246 #ifdef CONFIG_QOS_SCHED 247 { 248 .procname = "qos_overload_detect_period_ms", 249 .data = &sysctl_overload_detect_period, 250 .maxlen = sizeof(unsigned int), 251 .mode = 0644, 252 .proc_handler = proc_dointvec_minmax, 253 .extra1 = SYSCTL_ONE_HUNDRED, 254 .extra2 = &hundred_thousand, 255 }, 256 { 257 .procname = "qos_offline_wait_interval_ms", 258 .data = &sysctl_offline_wait_interval, 259 .maxlen = sizeof(unsigned int), 260 .mode = 0644, 261 .proc_handler = proc_dointvec_minmax, 262 .extra1 = SYSCTL_ONE_HUNDRED, 263 .extra2 = &one_thousand, 264 }, 265 #endif 266 #ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY 267 { 268 .procname = "sched_util_low_pct", 269 .data = &sysctl_sched_util_low_pct, 270 .maxlen = sizeof(sysctl_sched_util_low_pct), 271 .mode = 0644, 272 .proc_handler = proc_dointvec_minmax, 273 .extra1 = SYSCTL_ZERO, 274 .extra2 = SYSCTL_ONE_HUNDRED, 275 }, 276 #endif 277 #ifdef CONFIG_QOS_SCHED_PRIO_LB 278 { 279 .procname = "sched_prio_load_balance_enabled", 280 .data = &sysctl_sched_prio_load_balance_enabled, 281 .maxlen = sizeof(unsigned int), 282 .mode = 0644, 283 .proc_handler = proc_dointvec_minmax, 284 .extra1 = SYSCTL_ZERO, 285 .extra2 = SYSCTL_ONE, 286 }, 287 #endif 288 #ifdef CONFIG_QOS_SCHED_MULTILEVEL 289 { 290 .procname = "qos_level_weights", 291 .data = &sysctl_qos_level_weights, 292 .maxlen = 5*sizeof(int), 293 .mode = 0644, 294 .proc_handler = proc_dointvec, 295 }, 296 #endif 297 #ifdef CONFIG_QOS_SCHED_SMART_GRID 298 { 299 .procname = "smart_grid_strategy_ctrl", 300 .data = &sysctl_smart_grid_strategy_ctrl, 301 .maxlen = sizeof(unsigned int), 302 .mode = 0644, 303 .proc_handler = proc_dointvec_minmax, 304 .extra1 = SYSCTL_ZERO, 305 .extra2 = SYSCTL_ONE, 306 }, 307 { 308 .procname = "affinity_adjust_delay_ms", 309 .data = &sysctl_affinity_adjust_delay_ms, 310 .maxlen = sizeof(unsigned int), 311 .mode = 0644, 312 .proc_handler = proc_dointvec_minmax, 313 .extra1 = SYSCTL_ZERO, > 314 .extra2 = &hundred_thousand, 315 }, 316 #endif 317 {} 318 }; 319 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:openEuler-1.0-LTS 16446/21616] drivers/iommu/arm-smmu-v3.c:211:55: error: 'CONFIG_CMA_ALIGNMENT' undeclared; did you mean 'CONFIG_CMDLINE'?
by kernel test robot 05 Feb '24

05 Feb '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 3a28772f4b29bdda924e9a5d2e3ff1ff1b23fd14 commit: 3e8f9682bfad48236b3a76f113cbd5270102e745 [16446/21616] iommu/arm-smmu-v3: Increase maximum size of queues config: arm64-randconfig-r131-20240130 (https://download.01.org/0day-ci/archive/20240205/202402052127.OnYWBMsR-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce: (https://download.01.org/0day-ci/archive/20240205/202402052127.OnYWBMsR-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202402052127.OnYWBMsR-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/iommu/arm-smmu-v3.c:879:26: sparse: sparse: cast to restricted __le64 drivers/iommu/arm-smmu-v3.c:879:24: sparse: sparse: incorrect type in assignment (different base types) drivers/iommu/arm-smmu-v3.c:879:24: sparse: expected restricted __le64 [usertype] drivers/iommu/arm-smmu-v3.c:879:24: sparse: got unsigned long long [usertype] drivers/iommu/arm-smmu-v3.c:887:20: sparse: sparse: incorrect type in argument 1 (different base types) drivers/iommu/arm-smmu-v3.c:887:20: sparse: expected restricted __le64 [usertype] *[assigned] dst drivers/iommu/arm-smmu-v3.c:887:20: sparse: got unsigned long long [usertype] *ent drivers/iommu/arm-smmu-v3.c:887:25: sparse: sparse: incorrect type in argument 2 (different base types) drivers/iommu/arm-smmu-v3.c:887:25: sparse: expected unsigned long long [usertype] *[assigned] src drivers/iommu/arm-smmu-v3.c:887:25: sparse: got restricted __le64 [usertype] * drivers/iommu/arm-smmu-v3.c:983:27: sparse: sparse: restricted __le32 degrades to integer drivers/iommu/arm-smmu-v3.c:983:27: sparse: sparse: cast from restricted __le32 drivers/iommu/arm-smmu-v3.c:1029:20: sparse: sparse: incorrect type in argument 1 (different base types) drivers/iommu/arm-smmu-v3.c:1029:20: sparse: expected restricted __le64 [usertype] *[assigned] dst drivers/iommu/arm-smmu-v3.c:1029:20: sparse: got unsigned long long * drivers/iommu/arm-smmu-v3.c:1029:25: sparse: sparse: incorrect type in argument 2 (different base types) drivers/iommu/arm-smmu-v3.c:1029:25: sparse: expected unsigned long long [usertype] *[assigned] src drivers/iommu/arm-smmu-v3.c:1029:25: sparse: got restricted __le64 [usertype] * drivers/iommu/arm-smmu-v3.c:1328:53: sparse: sparse: incorrect type in argument 3 (different base types) drivers/iommu/arm-smmu-v3.c:1328:53: sparse: expected restricted __le64 [usertype] *dst drivers/iommu/arm-smmu-v3.c:1328:53: sparse: got unsigned long long [usertype] *strtab drivers/iommu/arm-smmu-v3.c:1356:39: sparse: sparse: incorrect type in argument 1 (different base types) drivers/iommu/arm-smmu-v3.c:1356:39: sparse: expected unsigned long long [usertype] *[assigned] strtab drivers/iommu/arm-smmu-v3.c:1356:39: sparse: got restricted __le64 [usertype] *l2ptr drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3558:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3566:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: cast from unknown type drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: undefined identifier 'CONFIG_CMA_ALIGNMENT' drivers/iommu/arm-smmu-v3.c:3568:36: sparse: sparse: cast from unknown type In file included from include/linux/list.h:9, from include/linux/resource_ext.h:17, from include/linux/acpi.h:26, from drivers/iommu/arm-smmu-v3.c:23: drivers/iommu/arm-smmu-v3.c: In function 'arm_smmu_device_hw_probe': >> drivers/iommu/arm-smmu-v3.c:211:55: error: 'CONFIG_CMA_ALIGNMENT' undeclared (first use in this function); did you mean 'CONFIG_CMDLINE'? 211 | #define Q_MAX_SZ_SHIFT (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT) | ^~~~~~~~~~~~~~~~~~~~ include/linux/kernel.h:847:36: note: in definition of macro '__typecheck' 847 | (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) | ^ include/linux/kernel.h:871:31: note: in expansion of macro '__safe_cmp' 871 | __builtin_choose_expr(__safe_cmp(x, y), \ | ^~~~~~~~~~ include/linux/kernel.h:939:33: note: in expansion of macro '__careful_cmp' 939 | #define min_t(type, x, y) __careful_cmp((type)(x), (type)(y), <) | ^~~~~~~~~~~~~ drivers/iommu/arm-smmu-v3.c:3558:36: note: in expansion of macro 'min_t' 3558 | smmu->cmdq.q.max_n_shift = min_t(u32, CMDQ_MAX_SZ_SHIFT, | ^~~~~ drivers/iommu/arm-smmu-v3.c:278:42: note: in expansion of macro 'Q_MAX_SZ_SHIFT' 278 | #define CMDQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - CMDQ_ENT_SZ_SHIFT) | ^~~~~~~~~~~~~~ drivers/iommu/arm-smmu-v3.c:3558:47: note: in expansion of macro 'CMDQ_MAX_SZ_SHIFT' 3558 | smmu->cmdq.q.max_n_shift = min_t(u32, CMDQ_MAX_SZ_SHIFT, | ^~~~~~~~~~~~~~~~~ drivers/iommu/arm-smmu-v3.c:211:55: note: each undeclared identifier is reported only once for each function it appears in 211 | #define Q_MAX_SZ_SHIFT (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT) | ^~~~~~~~~~~~~~~~~~~~ include/linux/kernel.h:847:36: note: in definition of macro '__typecheck' 847 | (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) | ^ include/linux/kernel.h:871:31: note: in expansion of macro '__safe_cmp' 871 | __builtin_choose_expr(__safe_cmp(x, y), \ | ^~~~~~~~~~ include/linux/kernel.h:939:33: note: in expansion of macro '__careful_cmp' 939 | #define min_t(type, x, y) __careful_cmp((type)(x), (type)(y), <) | ^~~~~~~~~~~~~ drivers/iommu/arm-smmu-v3.c:3558:36: note: in expansion of macro 'min_t' 3558 | smmu->cmdq.q.max_n_shift = min_t(u32, CMDQ_MAX_SZ_SHIFT, | ^~~~~ drivers/iommu/arm-smmu-v3.c:278:42: note: in expansion of macro 'Q_MAX_SZ_SHIFT' 278 | #define CMDQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - CMDQ_ENT_SZ_SHIFT) | ^~~~~~~~~~~~~~ drivers/iommu/arm-smmu-v3.c:3558:47: note: in expansion of macro 'CMDQ_MAX_SZ_SHIFT' 3558 | smmu->cmdq.q.max_n_shift = min_t(u32, CMDQ_MAX_SZ_SHIFT, | ^~~~~~~~~~~~~~~~~ >> include/linux/kernel.h:871:9: error: first argument to '__builtin_choose_expr' not a constant 871 | __builtin_choose_expr(__safe_cmp(x, y), \ | ^~~~~~~~~~~~~~~~~~~~~ include/linux/kernel.h:939:33: note: in expansion of macro '__careful_cmp' 939 | #define min_t(type, x, y) __careful_cmp((type)(x), (type)(y), <) | ^~~~~~~~~~~~~ drivers/iommu/arm-smmu-v3.c:3558:36: note: in expansion of macro 'min_t' 3558 | smmu->cmdq.q.max_n_shift = min_t(u32, CMDQ_MAX_SZ_SHIFT, | ^~~~~ >> include/linux/kernel.h:871:9: error: first argument to '__builtin_choose_expr' not a constant 871 | __builtin_choose_expr(__safe_cmp(x, y), \ | ^~~~~~~~~~~~~~~~~~~~~ include/linux/kernel.h:939:33: note: in expansion of macro '__careful_cmp' 939 | #define min_t(type, x, y) __careful_cmp((type)(x), (type)(y), <) | ^~~~~~~~~~~~~ drivers/iommu/arm-smmu-v3.c:3566:36: note: in expansion of macro 'min_t' 3566 | smmu->evtq.q.max_n_shift = min_t(u32, EVTQ_MAX_SZ_SHIFT, | ^~~~~ >> include/linux/kernel.h:871:9: error: first argument to '__builtin_choose_expr' not a constant 871 | __builtin_choose_expr(__safe_cmp(x, y), \ | ^~~~~~~~~~~~~~~~~~~~~ include/linux/kernel.h:939:33: note: in expansion of macro '__careful_cmp' 939 | #define min_t(type, x, y) __careful_cmp((type)(x), (type)(y), <) | ^~~~~~~~~~~~~ drivers/iommu/arm-smmu-v3.c:3568:36: note: in expansion of macro 'min_t' 3568 | smmu->priq.q.max_n_shift = min_t(u32, PRIQ_MAX_SZ_SHIFT, | ^~~~~ vim +211 drivers/iommu/arm-smmu-v3.c 200 201 #define Q_IDX(q, p) ((p) & ((1 << (q)->max_n_shift) - 1)) 202 #define Q_WRP(q, p) ((p) & (1 << (q)->max_n_shift)) 203 #define Q_OVERFLOW_FLAG (1 << 31) 204 #define Q_OVF(q, p) ((p) & Q_OVERFLOW_FLAG) 205 #define Q_ENT(q, p) ((q)->base + \ 206 Q_IDX(q, p) * (q)->ent_dwords) 207 208 #define Q_BASE_RWA (1UL << 62) 209 #define Q_BASE_ADDR_MASK GENMASK_ULL(51, 5) 210 #define Q_BASE_LOG2SIZE GENMASK(4, 0) > 211 #define Q_MAX_SZ_SHIFT (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT) 212 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH openEuler-1.0-LTS 0/2] fix kprobe reenter bug
by Liu Chuang 05 Feb '24

05 Feb '24

Liu Chuang (1): arm64/openeuler_defconfig: add not set config to fix compiling error Masami Hiramatsu (1): tracing/kprobes: Do the notrace functions check without kprobes on ftrace arch/arm64/configs/openeuler_defconfig | 1 + kernel/trace/Kconfig | 2 +- kernel/trace/trace_kprobe.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- 2.34.1

2 3

[PATCH OLK-6.6 00/10] Support PV feature
by lishusen 05 Feb '24

05 Feb '24

Support PV sched and PV qspinlock Zengruan Ye (9): KVM: arm64: Document PV-sched interface KVM: arm64: Implement PV_SCHED_FEATURES call KVM: arm64: Support pvsched preempted via shared structure KVM: arm64: Add interface to support vCPU preempted check KVM: arm64: Support the vCPU preemption check KVM: arm64: Add SMCCC PV-sched to kick cpu KVM: arm64: Implement PV_SCHED_KICK_CPU call KVM: arm64: Enable PV qspinlock KVM: arm64: Add tracepoints for PV qspinlock lishusen (1): KVM: arm64: Add configuration for feature pv-sched Documentation/virt/kvm/arm/pvsched.rst | 74 ++++++++ arch/arm64/Kconfig | 20 +++ arch/arm64/include/asm/Kbuild | 1 - arch/arm64/include/asm/kvm_host.h | 24 +++ arch/arm64/include/asm/paravirt.h | 51 ++++++ arch/arm64/include/asm/pvsched-abi.h | 16 ++ arch/arm64/include/asm/qspinlock.h | 48 +++++ arch/arm64/include/asm/qspinlock_paravirt.h | 12 ++ arch/arm64/include/asm/spinlock.h | 13 ++ arch/arm64/kernel/Makefile | 3 +- arch/arm64/kernel/paravirt-spinlocks.c | 21 +++ arch/arm64/kernel/paravirt.c | 189 ++++++++++++++++++++ arch/arm64/kernel/trace-paravirt.h | 66 +++++++ arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/arm.c | 26 +++ arch/arm64/kvm/handle_exit.c | 3 + arch/arm64/kvm/hypercalls.c | 24 +++ arch/arm64/kvm/pvsched.c | 81 +++++++++ arch/arm64/kvm/trace_arm.h | 18 ++ include/linux/arm-smccc.h | 25 +++ include/linux/cpuhotplug.h | 1 + 21 files changed, 715 insertions(+), 3 deletions(-) create mode 100644 Documentation/virt/kvm/arm/pvsched.rst create mode 100644 arch/arm64/include/asm/pvsched-abi.h create mode 100644 arch/arm64/include/asm/qspinlock.h create mode 100644 arch/arm64/include/asm/qspinlock_paravirt.h create mode 100644 arch/arm64/kernel/paravirt-spinlocks.c create mode 100644 arch/arm64/kernel/trace-paravirt.h create mode 100644 arch/arm64/kvm/pvsched.c -- 2.33.0

2 11

[PATCH OLK-6.6] iov_iter: kabi: KABI reservation for iov_iter
by Baokun Li 05 Feb '24

05 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I918ZJ ---------------------------------------------------------------------- structure size reserves reserved iov_iter 40 3 64 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- include/linux/uio.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/uio.h b/include/linux/uio.h index 42bce38a8e87..56249514c82d 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -81,6 +81,10 @@ struct iov_iter { unsigned long nr_segs; loff_t xarray_start; }; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; static inline const struct iovec *iter_iov(const struct iov_iter *iter) -- 2.31.1

2 1

[PATCH openEuler-1.0-LTS 0/2] fix kprobe reenter bug
by Liu Chuang 05 Feb '24

05 Feb '24

Liu Chuang (1): arm64/openeuler_defconfig: add not set config to fix compiling error Masami Hiramatsu (1): tracing/kprobes: Do the notrace functions check without kprobes on ftrace arch/arm64/configs/openeuler_defconfig | 1 + kernel/trace/Kconfig | 2 +- kernel/trace/trace_kprobe.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- 2.34.1

2 3

[PATCH OLK-6.6] sched/deadline.c: pick and check task if double_lock_balance() unlock the rq
by Zhao Wenhui 05 Feb '24

05 Feb '24

From: Li Bin <huawei.libin(a)huawei.com> hulk inclusion category: bugfix bugzilla: 47435 CVE: NA --------------------------- push_dl_task() pick the first pushable task and find an eligible lowest_rq, then double_lock_balance(rq, lowest_rq). So if double_lock_balance() unlock the rq (when double_lock_balance() return 1), we have to check if this task is still on the rq. The problem is that the check conditions are not sufficient: if (unlikely(task_rq(task) != rq || !cpumask_test_cpu(later_rq->cpu, &task->cpus_allowed) || task_running(rq, task) || !dl_task(task) || !task_on_rq_queued(task))) { cpu2 cpu1 cpu0 push_dl_task(rq1) pick task_A on rq1 find rq0 double_lock_balance(rq1, rq0) unlock(rq1) rq1 __schedule pick task_A run task_A sleep (dequeued) lock(rq0) lock(rq1) do_above_check(task_A) task_rq(task_A) == rq1 cpus_allowed unchanged task_running == false dl_task(task_A) == true try_to_wake_up(task_A) select_cpu = cpu3 enqueue(rq3, task_A) task_A->on_rq = 1 task_on_rq_queued(task_A) above_check passed, return rq0 ... migrate task_A from rq1 to rq0 So we can't rely on these checks of task_A to make sure the task_A is still on the rq1, even though we hold the rq1->lock. This patch will repick the first pushable task to be sure the task is still on the rq. Signed-off-by: Li Bin <huawei.libin(a)huawei.com> Acked-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Reviewed-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> [XQ: - backport to 4.4, adjusted context, - use tsk_cpus_allowed() instead of task->cpus_allowed] Link: https://lkml.org/lkml/2017/9/11/26 Link: https://lkml.org/lkml/2018/4/12/246 Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: zhangyi (F) <yi.zhang(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> (cherry picked from commit bf781024558706a7097840a18ca246f29506c89a) Signed-off-by: Li Ming <limingming.li(a)huawei.com> Conflicts: kernel/sched/deadline.c Acked-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Zhao Wenhui <zhaowenhui8(a)huawei.com> --- kernel/sched/deadline.c | 55 ++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index d78f2e8769fb..4e0aec982884 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -2206,6 +2206,26 @@ static int find_later_rq(struct task_struct *task) return -1; } +static struct task_struct *pick_next_pushable_dl_task(struct rq *rq) +{ + struct task_struct *p; + + if (!has_pushable_dl_tasks(rq)) + return NULL; + + p = rb_entry(rq->dl.pushable_dl_tasks_root.rb_leftmost, + struct task_struct, pushable_dl_tasks); + + BUG_ON(rq->cpu != task_cpu(p)); + BUG_ON(task_current(rq, p)); + BUG_ON(p->nr_cpus_allowed <= 1); + + BUG_ON(!task_on_rq_queued(p)); + BUG_ON(!dl_task(p)); + + return p; +} + /* Locks the rq it finds */ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq) { @@ -2233,12 +2253,16 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq) /* Retry if something changed. */ if (double_lock_balance(rq, later_rq)) { - if (unlikely(task_rq(task) != rq || - !cpumask_test_cpu(later_rq->cpu, &task->cpus_mask) || - task_on_cpu(rq, task) || - !dl_task(task) || - is_migration_disabled(task) || - !task_on_rq_queued(task))) { + struct task_struct *next_task; + /* + * We had to unlock the run queue. In + * the mean time, task could have + * migrated already or had its affinity changed. + * Also make sure that it wasn't scheduled on its rq. + */ + next_task = pick_next_pushable_dl_task(rq); + if (unlikely(next_task != task || + !cpumask_test_cpu(later_rq->cpu, task->cpus_ptr))) { double_unlock_balance(rq, later_rq); later_rq = NULL; break; @@ -2261,25 +2285,6 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq) return later_rq; } -static struct task_struct *pick_next_pushable_dl_task(struct rq *rq) -{ - struct task_struct *p; - - if (!has_pushable_dl_tasks(rq)) - return NULL; - - p = __node_2_pdl(rb_first_cached(&rq->dl.pushable_dl_tasks_root)); - - WARN_ON_ONCE(rq->cpu != task_cpu(p)); - WARN_ON_ONCE(task_current(rq, p)); - WARN_ON_ONCE(p->nr_cpus_allowed <= 1); - - WARN_ON_ONCE(!task_on_rq_queued(p)); - WARN_ON_ONCE(!dl_task(p)); - - return p; -} - /* * See if the non running -deadline tasks on this rq * can be sent to some other CPU where they can preempt -- 2.34.1

2 1

[PATCH OLK-6.6] dax: kabi: KABI reservation for dax_holder_operations
by Baokun Li 05 Feb '24

05 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I918WQ ---------------------------------------------------------------------- structure size reserves reserved dax_holder_operations 8 2 24 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- include/linux/dax.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/dax.h b/include/linux/dax.h index 22cd9902345d..f899c8317017 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -53,6 +53,9 @@ struct dax_holder_operations { */ int (*notify_failure)(struct dax_device *dax_dev, u64 offset, u64 len, int mf_flags); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #if IS_ENABLED(CONFIG_DAX) -- 2.31.1

2 1

[PATCH OLK-6.6 0/1] sched: migtate user interface from smart grid to sched bpf
by Liao Chen 05 Feb '24

05 Feb '24

Migtating user interface from smart grid to sched bpf, which allows users to set SCHED_GRID_QOS_TASK_LEVEL through: /proc/${pid}/task/${pid}/tag interface. Although arbitrary integer value could be assigned to <tag>, currnetly we clamp the value of SCHED_GRID_QOS_TASK_LEVEL to 0-7, which maintains consistency. Liao Chen (1): sched: migtate user interface from smart grid to sched bpf fs/proc/base.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.34.1

2 2

[PATCH OLK-6.6] jbd2: kabi: KABI reservation for jbd2
by Baokun Li 05 Feb '24

05 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I918VT ---------------------------------------------------------------------- structure size reserves reserved transaction_chp_stats_s 24 2 40 transaction_s 208 4 256 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- include/linux/jbd2.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 52772c826c86..e4239c8595d5 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -512,6 +512,9 @@ struct transaction_chp_stats_s { __u32 cs_forced_to_close; __u32 cs_written; __u32 cs_dropped; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* The transaction_t type is the guts of the journaling mechanism. It @@ -706,6 +709,11 @@ struct transaction_s * structures associated with the transaction */ struct list_head t_private_list; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; struct transaction_run_stats_s { -- 2.31.1

2 1

2024

2023

2022

2021

2020

2019

Kernel