February 2024 - Kernel - mailweb.openeuler.org

[PATCH OLK-6.6] nvme: kabi: KABI reservation for nvme_ctrl
by Li Nan 06 Feb '24

06 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I91DNE ---------------------------------------------------------------------- Reserve KABI for struct nvme_ctrl. Signed-off-by: Li Nan <linan122(a)huawei.com> --- drivers/nvme/host/nvme.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 74f74b459f5f..431daba68d54 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -389,6 +389,11 @@ struct nvme_ctrl { enum nvme_ctrl_type cntrltype; enum nvme_dctype dctype; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; enum nvme_iopolicy { -- 2.39.2

2 1

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

06 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 v2 OLK-6.6 0/9] Support feature TLBI
by lishusen 06 Feb '24

06 Feb '24

Replace cpumask_t* by cpumask_var_t and rename related variables Yanan Wang (1): KVM: arm64: Only probe Hisi ncsnp feature on Hisi CPUs Zenghui Yu (2): KVM: arm64: Probe Hisi CPU TYPE from ACPI/DTB KVM: arm64: Add support for probing Hisi ncsnp capability lishusen (5): KVM: arm64: Support a new HiSi CPU type KVM: arm64: Probe and configure DVMBM capability on HiSi CPUs KVM: arm64: Add kvm_vcpu_arch::sched_cpus and pre_sched_cpus KVM: arm64: Add kvm_arch::sched_cpus and sched_lock KVM: arm64: Implement the capability of DVMBM .../admin-guide/kernel-parameters.txt | 4 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/kvm_host.h | 30 +- arch/arm64/include/asm/kvm_mmu.h | 2 +- arch/arm64/kernel/image-vars.h | 5 + arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/arm.c | 33 ++ arch/arm64/kvm/hisilicon/Kconfig | 7 + arch/arm64/kvm/hisilicon/Makefile | 2 + arch/arm64/kvm/hisilicon/hisi_virt.c | 378 ++++++++++++++++++ arch/arm64/kvm/hisilicon/hisi_virt.h | 87 ++++ arch/arm64/kvm/hyp/pgtable.c | 2 +- 13 files changed, 544 insertions(+), 9 deletions(-) create mode 100644 arch/arm64/kvm/hisilicon/Kconfig create mode 100644 arch/arm64/kvm/hisilicon/Makefile create mode 100644 arch/arm64/kvm/hisilicon/hisi_virt.c create mode 100644 arch/arm64/kvm/hisilicon/hisi_virt.h -- 2.33.0

1 8

[PATCH OLK-6.6 0/3] mainline cgroup bufix
by Chen Ridong 06 Feb '24

06 Feb '24

Kamalesh Babulal (2): cgroup: Check for ret during cgroup1_base_files cft addition cgroup: use legacy_name for cgroup v1 disable info Ming Lei (1): blk-cgroup: bypass blkcg_deactivate_policy after destroying block/blk-cgroup.c | 13 +++++++++++++ kernel/cgroup/cgroup.c | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) -- 2.34.1

2 4

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

06 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.34.1

2 2

[PATCH OLK-6.6 0/2] Add ZONE_EXTMEM to avoid kabi broken
by Liu Shixin 06 Feb '24

06 Feb '24

NUMA.remote may need a new zone to manage memory. Add ZONE_EXTMEM for future using to avoid kabi broken. Liu Shixin (2): mm: add ZONE_EXTMEM for future extension to avoid kabi broken openeuler_defconfig: enable CONFIG_ZONE_EXTMEM for arm64 arch/arm64/configs/openeuler_defconfig | 1 + include/linux/gfp.h | 13 +++++++++++++ include/linux/mmzone.h | 3 +++ include/trace/events/mmflags.h | 7 +++++++ mm/Kconfig | 13 +++++++++++++ mm/page_alloc.c | 6 ++++++ 6 files changed, 43 insertions(+) -- 2.25.1

2 3

[PATCH OLK-6.6] scsi: reserve space for structures in scsi
by Li Lingfeng 06 Feb '24

06 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8ZUL1 -------------------------------- Reserve space for structure libfc_cmd_priv/fcoe_percpu_s/iscsi_task/ iscsi_cmd/iscsi_conn/iscsi_session/iscsi_host/scsi_cmnd/scsi_device/ scsi_exec_args/scsi_device_handler/scsi_driver/scsi_eh_save/ scsi_host_template/Scsi_Host/scsi_target. Signed-off-by: Li Lingfeng <lilingfeng3(a)huawei.com> --- include/scsi/libfc.h | 4 ++++ include/scsi/libfcoe.h | 4 ++++ include/scsi/libiscsi.h | 30 ++++++++++++++++++++++++++++++ include/scsi/scsi_cmnd.h | 4 ++++ include/scsi/scsi_device.h | 16 ++++++++++++++++ include/scsi/scsi_dh.h | 4 ++++ include/scsi/scsi_driver.h | 4 ++++ include/scsi/scsi_eh.h | 4 ++++ include/scsi/scsi_host.h | 10 ++++++++++ 9 files changed, 80 insertions(+) diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index eca6fd42d7f7..c042d761d701 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h @@ -12,6 +12,7 @@ #include <linux/if.h> #include <linux/percpu.h> #include <linux/refcount.h> +#include <linux/kabi.h> #include <scsi/scsi_transport.h> #include <scsi/scsi_transport_fc.h> @@ -358,6 +359,9 @@ struct libfc_cmd_priv { struct fc_fcp_pkt *fsp; u32 resid_len; u8 status; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h index 8300ef1a982e..b2d11acaa68d 100644 --- a/include/scsi/libfcoe.h +++ b/include/scsi/libfcoe.h @@ -16,6 +16,7 @@ #include <linux/workqueue.h> #include <linux/local_lock.h> #include <linux/random.h> +#include <linux/kabi.h> #include <scsi/fc/fc_fcoe.h> #include <scsi/libfc.h> #include <scsi/fcoe_sysfs.h> @@ -329,6 +330,9 @@ struct fcoe_percpu_s { struct page *crc_eof_page; int crc_eof_offset; local_lock_t lock; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 7282555adfd5..179924347b95 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h @@ -17,6 +17,7 @@ #include <linux/workqueue.h> #include <linux/kfifo.h> #include <linux/refcount.h> +#include <linux/kabi.h> #include <scsi/iscsi_proto.h> #include <scsi/iscsi_if.h> #include <scsi/scsi_cmnd.h> @@ -133,6 +134,12 @@ struct iscsi_task { refcount_t refcount; struct list_head running; /* running cmd list */ void *dd_data; /* driver/transport data */ + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) }; static inline int iscsi_task_has_unsol_data(struct iscsi_task *task) @@ -156,6 +163,9 @@ static inline bool iscsi_task_is_completed(struct iscsi_task *task) struct iscsi_cmd { struct iscsi_task *task; int age; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; static inline struct iscsi_cmd *iscsi_cmd(struct scsi_cmnd *cmd) @@ -256,6 +266,13 @@ struct iscsi_conn { /* custom statistics */ uint32_t eh_abort_cnt; uint32_t fmr_unalign_cnt; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; struct iscsi_pool { @@ -363,6 +380,11 @@ struct iscsi_session { struct iscsi_task **cmds; /* Original Cmds arr */ struct iscsi_pool cmdpool; /* PDU's pool */ void *dd_data; /* LLD private data */ + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; enum { @@ -383,6 +405,14 @@ struct iscsi_host { int state; struct workqueue_struct *workq; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) }; /* diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 526def14e7fb..cc7a5fe2a314 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -9,6 +9,7 @@ #include <linux/types.h> #include <linux/timer.h> #include <linux/scatterlist.h> +#include <linux/kabi.h> #include <scsi/scsi_device.h> struct Scsi_Host; @@ -141,6 +142,9 @@ struct scsi_cmnd { * to be at an address < 16Mb). */ int result; /* Status code from lower level driver */ + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* Variant of blk_mq_rq_from_pdu() that verifies the type of its argument. */ diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 8fa1153f37cb..b91f07fd2b25 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -9,6 +9,7 @@ #include <scsi/scsi.h> #include <linux/atomic.h> #include <linux/sbitmap.h> +#include <linux/kabi.h> struct bsg_device; struct device; @@ -284,6 +285,15 @@ struct scsi_device { struct mutex state_mutex; enum scsi_device_state sdev_state; struct task_struct *quiesced_by; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) unsigned long sdev_data[]; } __attribute__((aligned(sizeof(unsigned long)))); @@ -370,6 +380,10 @@ struct scsi_target { char scsi_level; enum scsi_target_state state; void *hostdata; /* available to low-level driver */ + + KABI_RESERVE(1) + KABI_RESERVE(2) + unsigned long starget_data[]; /* for the transport */ /* starget_data must be the last element!!!! */ } __attribute__((aligned(sizeof(unsigned long)))); @@ -498,6 +512,8 @@ struct scsi_exec_args { blk_mq_req_flags_t req_flags; /* BLK_MQ_REQ flags */ int scmd_flags; /* SCMD flags */ int *resid; /* residual length */ + + KABI_RESERVE(1) }; int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd, diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h index 4df943c1b90b..1e6bc082efd8 100644 --- a/include/scsi/scsi_dh.h +++ b/include/scsi/scsi_dh.h @@ -11,6 +11,7 @@ */ #include <scsi/scsi_device.h> +#include <linux/kabi.h> enum { SCSI_DH_OK = 0, @@ -60,6 +61,9 @@ struct scsi_device_handler { blk_status_t (*prep_fn)(struct scsi_device *, struct request *); int (*set_params)(struct scsi_device *, const char *); void (*rescan)(struct scsi_device *); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #ifdef CONFIG_SCSI_DH diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h index 4ce1988b2ba0..7cd5cc59cfe1 100644 --- a/include/scsi/scsi_driver.h +++ b/include/scsi/scsi_driver.h @@ -4,6 +4,7 @@ #include <linux/blk_types.h> #include <linux/device.h> +#include <linux/kabi.h> #include <scsi/scsi_cmnd.h> struct module; @@ -18,6 +19,9 @@ struct scsi_driver { int (*done)(struct scsi_cmnd *); int (*eh_action)(struct scsi_cmnd *, int); void (*eh_reset)(struct scsi_cmnd *); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define to_scsi_driver(drv) \ container_of((drv), struct scsi_driver, gendrv) diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h index 1ae08e81339f..1f3b333f43b0 100644 --- a/include/scsi/scsi_eh.h +++ b/include/scsi/scsi_eh.h @@ -3,6 +3,7 @@ #define _SCSI_SCSI_EH_H #include <linux/scatterlist.h> +#include <linux/kabi.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_common.h> @@ -41,6 +42,9 @@ struct scsi_eh_save { unsigned char cmnd[32]; struct scsi_data_buffer sdb; struct scatterlist sense_sgl; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; extern void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 4c2dc8150c6d..f9ea73798ece 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -9,6 +9,7 @@ #include <linux/mutex.h> #include <linux/seq_file.h> #include <linux/blk-mq.h> +#include <linux/kabi.h> #include <scsi/scsi.h> struct block_device; @@ -497,6 +498,11 @@ struct scsi_host_template { /* Delay for runtime autosuspend */ int rpm_autosuspend_delay; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /* @@ -710,6 +716,10 @@ struct Scsi_Host { */ struct device *dma_dev; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) /* * We should ensure that this is aligned, both for better performance * and also because some compilers (m68k) don't automatically force -- 2.31.1

2 1

[PATCH v2 OLK-6.6 0/2] Support feature TWED
by lishusen 06 Feb '24

06 Feb '24

Add vcpu_set_twed() for case that feature TWED disabled Jingyi Wang (1): KVM: arm64: Make use of TWED feature Zengruan Ye (1): arm64: cpufeature: TWED support detection arch/arm64/Kconfig | 10 ++++++ arch/arm64/configs/openeuler_defconfig | 6 ++++ arch/arm64/include/asm/kvm_arm.h | 7 ++++ arch/arm64/include/asm/kvm_emulate.h | 44 ++++++++++++++++++++++++++ arch/arm64/include/asm/kvm_host.h | 5 +++ arch/arm64/kernel/cpufeature.c | 9 ++++++ arch/arm64/kvm/arm.c | 10 ++++++ arch/arm64/tools/cpucaps | 1 + 8 files changed, 92 insertions(+) -- 2.33.0

2 3

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

06 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I91COK ---------------------------------------------------------------------- structure size reserves reserved quota_format_ops 64 2 80 dquot_operations 88 2 104 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- include/linux/quota.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/quota.h b/include/linux/quota.h index 07071e64abf3..be91ebd3a73b 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -318,6 +318,9 @@ struct quota_format_ops { int (*commit_dqblk)(struct dquot *dquot); /* Write structure for one user */ int (*release_dqblk)(struct dquot *dquot); /* Called when last reference to dquot is being dropped */ int (*get_next_id)(struct super_block *sb, struct kqid *qid); /* Get next ID with existing structure in the quota file */ + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* Operations working with dquots */ @@ -337,6 +340,9 @@ struct dquot_operations { int (*get_inode_usage) (struct inode *, qsize_t *); /* Get next ID with active quota structure */ int (*get_next_id) (struct super_block *sb, struct kqid *qid); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct path; -- 2.31.1

2 1

[PATCH OLK-6.6 V2] fscache: reserve kabi for fscache structures
by Zizhi Wo 06 Feb '24

06 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I912AQ -------------------------------- Reserve space for struct fscache_cache/fscache_cache_ops/fscache_volume/ fscache_cookie. Signed-off-by: Zizhi Wo <wozizhi(a)huawei.com> --- include/linux/fscache-cache.h | 10 ++++++++++ include/linux/fscache.h | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h index a174cedf4d90..c16a22dbbb9b 100644 --- a/include/linux/fscache-cache.h +++ b/include/linux/fscache-cache.h @@ -43,6 +43,11 @@ struct fscache_cache { unsigned int debug_id; enum fscache_cache_state state; char *name; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /* @@ -77,6 +82,11 @@ struct fscache_cache_ops { /* Prepare to write to a live cache object */ void (*prepare_to_write)(struct fscache_cookie *cookie); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; extern struct workqueue_struct *fscache_wq; diff --git a/include/linux/fscache.h b/include/linux/fscache.h index 8e312c8323a8..3afe007834d1 100644 --- a/include/linux/fscache.h +++ b/include/linux/fscache.h @@ -89,6 +89,12 @@ struct fscache_volume { #define FSCACHE_VOLUME_ACQUIRE_PENDING 3 /* Volume is waiting to complete acquisition */ #define FSCACHE_VOLUME_CREATING 4 /* Volume is being created on disk */ u8 coherency_len; /* Length of the coherency data */ + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + u8 coherency[]; /* Coherency data */ }; @@ -145,6 +151,11 @@ struct fscache_cookie { void *aux; /* Auxiliary data */ u8 inline_aux[8]; /* - If the aux data is short enough */ }; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /* -- 2.39.2

2 1