- Kernel - mailweb.openeuler.org

[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

[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] fs: kabi: KABI reservation for vfs
by Baokun Li 05 Feb '24

05 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I918TX ---------------------------------------------------------------------- structure size reserves reserved buffer_head 104 3 128 renamedata 64 2 80 file_operations 264 7 320 inode_operations 256 8 320 super_operations 208 6 256 file_system_type 72 4 104 fs_context 152 2 168 fs_context_operations 48 2 64 fs_parameter_spec 32 2 48 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- include/linux/buffer_head.h | 3 +++ include/linux/fs.h | 32 ++++++++++++++++++++++++++++++++ include/linux/fs_context.h | 6 ++++++ include/linux/fs_parser.h | 3 +++ 4 files changed, 44 insertions(+) diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 44e9de51eedf..38beaec5ef64 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -78,6 +78,9 @@ struct buffer_head { spinlock_t b_uptodate_lock; /* Used by the first bh in a page, to * serialise IO completion of other * buffers in the page */ + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; /* diff --git a/include/linux/fs.h b/include/linux/fs.h index 4bbed16bf8d5..ecd1ddae41f1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1774,6 +1774,9 @@ struct renamedata { struct dentry *new_dentry; struct inode **delegated_inode; unsigned int flags; + + KABI_RESERVE(1) + KABI_RESERVE(2) } __randomize_layout; int vfs_rename(struct renamedata *); @@ -1928,6 +1931,14 @@ struct file_operations { int (*uring_cmd)(struct io_uring_cmd *ioucmd, unsigned int issue_flags); int (*uring_cmd_iopoll)(struct io_uring_cmd *, struct io_comp_batch *, unsigned int poll_flags); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) } __randomize_layout; /* Wrap a directory iterator that needs exclusive inode access */ @@ -1978,6 +1989,15 @@ struct inode_operations { struct dentry *dentry, struct fileattr *fa); int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa); struct offset_ctx *(*get_offset_ctx)(struct inode *inode); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) } ____cacheline_aligned; static inline ssize_t call_read_iter(struct file *file, struct kiocb *kio, @@ -2061,6 +2081,13 @@ struct super_operations { long (*free_cached_objects)(struct super_block *, struct shrink_control *); void (*shutdown)(struct super_block *sb); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; /* @@ -2360,6 +2387,11 @@ struct file_system_type { struct lock_class_key i_mutex_key; struct lock_class_key invalidate_lock_key; struct lock_class_key i_mutex_dir_key; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; #define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME) diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h index c13e99cbbf81..a6365f9e0a27 100644 --- a/include/linux/fs_context.h +++ b/include/linux/fs_context.h @@ -110,6 +110,9 @@ struct fs_context { bool global:1; /* Goes into &init_user_ns */ bool oldapi:1; /* Coming from mount(2) */ bool exclusive:1; /* create new superblock, reject existing one */ + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct fs_context_operations { @@ -119,6 +122,9 @@ struct fs_context_operations { int (*parse_monolithic)(struct fs_context *fc, void *data); int (*get_tree)(struct fs_context *fc); int (*reconfigure)(struct fs_context *fc); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* diff --git a/include/linux/fs_parser.h b/include/linux/fs_parser.h index 01542c4b87a2..10fb88069392 100644 --- a/include/linux/fs_parser.h +++ b/include/linux/fs_parser.h @@ -45,6 +45,9 @@ struct fs_parameter_spec { #define fs_param_can_be_empty 0x0004 /* "xxx=" is allowed */ #define fs_param_deprecated 0x0008 /* The param is deprecated */ const void *data; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* -- 2.31.1

2 1