April 2024 - Kernel - mailweb.openeuler.org

[PATCH OLK-6.6 0/3] Revert "KVM: arm64: Disable MPAM visibility by default, and handle traps"
by Zeng Heng 07 Apr '24

07 Apr '24

Zeng Heng (3): resctrl: fix undefined reference to lockdep_is_cpus_held() fs/resctrl: Move rdtgroup_setup_default() out of init.text section Revert "KVM: arm64: Disable MPAM visibility by default, and handle traps" arch/arm64/kvm/sys_regs.c | 74 ++++++++------------------------------- fs/resctrl/rdtgroup.c | 2 +- include/linux/resctrl.h | 2 +- 3 files changed, 16 insertions(+), 62 deletions(-) -- 2.25.1

2 4

[PATCH OLK-6.6 1/3] resctrl: fix undefined reference to lockdep_is_cpus_held()
by Zeng Heng 07 Apr '24

07 Apr '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8T2RT -------------------------------- lockdep_is_cpus_held() will only be compiled by the kernel when CONFIG_LOCKDEP is defined. Otherwise, kernel test robot would report the following compile error: ld: vmlinux.o: in function `resctrl_get_domain_from_cpu': include/linux/resctrl.h:291: undefined reference to `lockdep_is_cpus_held' Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202401252038.VOiTn1TA-lkp@intel.com/ Signed-off-by: Zeng Heng <zengheng4(a)huawei.com> --- include/linux/resctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index dd34523469a5..f4aeccd78afb 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -300,7 +300,7 @@ resctrl_get_domain_from_cpu(int cpu, struct rdt_resource *r) * about locks this thread holds will lead to false positives. Check * someone is holding the CPUs lock. */ - if (IS_ENABLED(CONFIG_LOCKDEP)) + if (IS_ENABLED(CONFIG_HOTPLUG_CPU) && IS_ENABLED(CONFIG_LOCKDEP)) lockdep_is_cpus_held(); list_for_each_entry_rcu(d, &r->domains, list) { -- 2.25.1

2 3

[PATCH OLK-6.6] mm, fs: Add BPF_READAHEAD_OPTIMIZATION option for bpf readhead
by ZhaoLong Wang 07 Apr '24

07 Apr '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I7Y9JD CVE: NA --------------------------- This patch introduces a new configuration option called BPF_READAHEAD_OPTIMIZATION, which is designed to optimize the read performance in Spark SQL scenarios using eBPF to implement a programmable kernel. The changes include: - Add CONFIG_BPF_READAHEAD_OPTIMIZATION to mm/Kconfig, which depends on CONFIG_TRACEPOINTS. - Add conditional compilation directives to fs/ext4/file.c, fs/read_write.c, fs/xfs/xfs_file.c, and include/linux/fs.h to include tracepoint-related headers and functions only when BPF_READAHEAD_OPTIMIZATION is enabled. - Miodify page_cache_sync_ra() in mm/readahead.c to disable forced readahead when BPF_READAHEAD_OPTIMIZATION is not enabled. Signed-off-by: ZhaoLong Wang <wangzhaolong1(a)huawei.com> --- fs/ext4/file.c | 6 ++++++ fs/read_write.c | 2 +- fs/xfs/xfs_file.c | 7 ++++++- include/linux/fs.h | 8 ++++++++ mm/Kconfig | 9 +++++++++ mm/readahead.c | 10 ++++++++++ 6 files changed, 40 insertions(+), 2 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 324b45b51d1f..14f1441c3391 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -30,7 +30,9 @@ #include <linux/uio.h> #include <linux/mman.h> #include <linux/backing-dev.h> +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION #include <trace/events/fs.h> +#endif #include "ext4.h" #include "ext4_jbd2.h" #include "xattr.h" @@ -145,7 +147,9 @@ static ssize_t ext4_file_read_iter(struct kiocb *iocb, struct iov_iter *to) if (iocb->ki_flags & IOCB_DIRECT) return ext4_dio_read_iter(iocb, to); +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION fs_file_read_do_trace(iocb); +#endif return generic_file_read_iter(iocb, to); } @@ -167,7 +171,9 @@ static ssize_t ext4_file_splice_read(struct file *in, loff_t *ppos, */ static int ext4_release_file(struct inode *inode, struct file *filp) { +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION trace_fs_file_release(inode, filp); +#endif if (ext4_test_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE)) { ext4_alloc_da_blocks(inode); diff --git a/fs/read_write.c b/fs/read_write.c index 3d69fb284d10..2ee9a07f7208 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1721,7 +1721,7 @@ int generic_file_rw_checks(struct file *file_in, struct file *file_out) return 0; } -#ifdef CONFIG_TRACEPOINTS +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION static void fs_file_read_ctx_init(struct fs_file_read_ctx *ctx, struct file *filp, loff_t pos) { diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index ecf10d3aec17..7a4bd39bc694 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -31,7 +31,9 @@ #include <linux/mman.h> #include <linux/fadvise.h> #include <linux/mount.h> +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION #include <trace/events/fs.h> +#endif static const struct vm_operations_struct xfs_file_vm_ops; @@ -308,8 +310,9 @@ xfs_file_buffered_read( ssize_t ret; trace_xfs_file_buffered_read(iocb, to); +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION fs_file_read_do_trace(iocb); - +#endif ret = xfs_ilock_iocb(iocb, XFS_IOLOCK_SHARED); if (ret) return ret; @@ -1266,7 +1269,9 @@ xfs_file_release( struct inode *inode, struct file *filp) { +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION trace_fs_file_release(inode, filp); +#endif return xfs_release(XFS_I(inode)); } diff --git a/include/linux/fs.h b/include/linux/fs.h index d74314a8fa94..eb50bcbfcc24 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -43,7 +43,9 @@ #include <linux/cred.h> #include <linux/mnt_idmapping.h> #include <linux/slab.h> +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION #include <linux/tracepoint-defs.h> +#endif #include <linux/kabi.h> #include <asm/byteorder.h> @@ -190,11 +192,13 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, /* File supports async nowait buffered writes */ #define FMODE_BUF_WASYNC ((__force fmode_t)0x80000000) +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION /* File mode control flag, expect random access pattern */ #define FMODE_CTL_RANDOM ((__force fmode_t)0x1000) /* File mode control flag, will try to read head of the file into pagecache */ #define FMODE_CTL_WILLNEED ((__force fmode_t)0x400000) +#endif /* * Attribute flags. These should be or-ed together to figure out what @@ -1058,7 +1062,9 @@ struct file { struct address_space *f_mapping; errseq_t f_wb_err; errseq_t f_sb_err; /* for syncfs */ +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION fmode_t f_ctl_mode; +#endif KABI_RESERVE(1) KABI_RESERVE(2) } __randomize_layout @@ -3524,6 +3530,7 @@ struct fs_file_read_ctx { long long index; }; +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION #ifdef CONFIG_TRACEPOINTS DECLARE_TRACEPOINT(fs_file_read); extern void fs_file_read_update_args_by_trace(struct kiocb *iocb); @@ -3536,4 +3543,5 @@ static inline void fs_file_read_do_trace(struct kiocb *iocb) if (tracepoint_enabled(fs_file_read)) fs_file_read_update_args_by_trace(iocb); } +#endif #endif /* _LINUX_FS_H */ diff --git a/mm/Kconfig b/mm/Kconfig index cdbb1ceaa554..27c4bd8238c9 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1424,6 +1424,15 @@ config ETMEM high-performance storage media to release memory space and reduce memory costs. +config BPF_READAHEAD_OPTIMIZATION + bool "Enable bpf readahead optimization" + depends on TRACEPOINTS + default n + help + EBPF is used to implement a programmable kernel. The readahead behavior + of the kernel is adjusted based on the application read mode to optimize + the read performance in the Spark SQL scenario, + source "mm/damon/Kconfig" endmenu diff --git a/mm/readahead.c b/mm/readahead.c index 4d0dbfd62d20..4f8e339e2d6e 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -131,7 +131,9 @@ #include "internal.h" +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION #define READAHEAD_FIRST_SIZE (2 * 1024 * 1024) +#endif /* * Initialise a struct file's readahead state. Assumes that the caller has * memset *ra to zero. @@ -669,6 +671,7 @@ static void ondemand_readahead(struct readahead_control *ractl, page_cache_ra_order(ractl, ra, order); } +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION /* * Try to read first @ra_size from head of the file. */ @@ -697,13 +700,18 @@ static bool page_cache_readahead_from_head(struct address_space *mapping, } return true; } +#endif void page_cache_sync_ra(struct readahead_control *ractl, unsigned long req_count) { +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION bool do_forced_ra = ractl->file && ((ractl->file->f_mode & FMODE_RANDOM) || (ractl->file->f_ctl_mode & FMODE_CTL_RANDOM)); +#else + bool do_forced_ra = ractl->file && (ractl->file->f_mode & FMODE_RANDOM); +#endif /* * Even if readahead is disabled, issue this request as readahead @@ -718,11 +726,13 @@ void page_cache_sync_ra(struct readahead_control *ractl, do_forced_ra = true; } +#ifdef CONFIG_BPF_READAHEAD_OPTIMIZATION /* try to read first READAHEAD_FIRST_SIZE into pagecache */ if (ractl->file && (ractl->file->f_ctl_mode & FMODE_CTL_WILLNEED) && page_cache_readahead_from_head(ractl->mapping, ractl->file, readahead_index(ractl), req_count, READAHEAD_FIRST_SIZE)) return; +#endif /* be dumb */ if (do_forced_ra) { -- 2.39.2

2 1

[PATCH openEuler-1.0-LTS] net: fec: fix the potential memory leak in fec_enet_init()
by Zhang Zekun 07 Apr '24

07 Apr '24

From: Fugang Duan <fugang.duan(a)nxp.com> stable inclusion from stable-5.10.42 commit 8ee7ef4a57a9e1228b6f345aaa70aa8951c7e9cd bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9BGVY CVE: CVE-2021-47150 ---------------------------------------------- If the memory allocated for cbd_base is failed, it should free the memory allocated for the queues, otherwise it causes memory leak. And if the memory allocated for the queues is failed, it can return error directly. Fixes: 59d0f7465644 ("net: fec: init multi queue date structure") Signed-off-by: Fugang Duan <fugang.duan(a)nxp.com> Signed-off-by: Joakim Zhang <qiangqing.zhang(a)nxp.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> --- drivers/net/ethernet/freescale/fec_main.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 296ae1e4c322..3e402c9b3598 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3147,7 +3147,9 @@ static int fec_enet_init(struct net_device *ndev) return ret; } - fec_enet_alloc_queue(ndev); + ret = fec_enet_alloc_queue(ndev); + if (ret) + return ret; bd_size = (fep->total_tx_ring_size + fep->total_rx_ring_size) * dsize; @@ -3155,7 +3157,8 @@ static int fec_enet_init(struct net_device *ndev) cbd_base = dmam_alloc_coherent(&fep->pdev->dev, bd_size, &bd_dma, GFP_KERNEL); if (!cbd_base) { - return -ENOMEM; + ret = -ENOMEM; + goto free_queue_mem; } memset(cbd_base, 0, bd_size); @@ -3235,6 +3238,10 @@ static int fec_enet_init(struct net_device *ndev) fec_enet_update_ethtool_stats(ndev); return 0; + +free_queue_mem: + fec_enet_free_queue(ndev); + return ret; } #ifdef CONFIG_OF -- 2.17.1

2 1

[PATCH V2 OLK-5.10] [Huawei] iommu/arm-smmu-v3: fix using uninitialized or unchecked symbol
by Zhang Zekun 07 Apr '24

07 Apr '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9EEIG -------------------------------------- This commit fix the following errors in the code: 1. The arm_smmu_aux_attach_dev function returns an uncertain return value ret when all conditions are not met. In this case, the cd table is not initialized. Therefore, a new default exception value is added. 2. In arm_smmu_ecmdq_probe(), the parameter pre_addr is used in the loop but it is not initialed yet. Also, the parameter "ecmdq" is used before check if it is NULL. Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> --- v2: - fix a patch format check warning drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index fe647241ca88..423a54b7611d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3630,6 +3630,9 @@ static int arm_smmu_aux_attach_dev(struct iommu_domain *domain, struct device *d dev_err(dev, "cannot attach aux domain with different parent\n"); ret = -EINVAL; goto out_unlock; + } else { + ret = -EINVAL; + goto out_unlock; } /* FIXME: serialize against arm_smmu_share_asid() */ @@ -4813,7 +4816,7 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) int ret, cpu; u32 i, nump, numq, gap; u32 reg, shift_increment; - u64 addr, smmu_dma_base; + u64 addr, smmu_dma_base, val, pre_addr; void __iomem *cp_regs, *cp_base; /* IDR6 */ @@ -4831,8 +4834,6 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) return -ENOMEM; for (i = 0; i < nump; i++) { - u64 val, pre_addr; - val = readq_relaxed(cp_regs + 32 * i); if (!(val & ECMDQ_CP_PRESET)) { iounmap(cp_regs); @@ -4872,7 +4873,6 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) struct arm_smmu_queue *q; ecmdq = *per_cpu_ptr(smmu->ecmdqs, cpu); - q = &ecmdq->cmdq.q; /* * The boot option "maxcpus=" can limit the number of online @@ -4885,6 +4885,8 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) */ if (!ecmdq || (ecmdq != per_cpu_ptr(smmu->ecmdq, cpu))) continue; + + q = &ecmdq->cmdq.q; ecmdq->base = cp_base + addr; q->llq.max_n_shift = ECMDQ_MAX_SZ_SHIFT + shift_increment; -- 2.17.1

1 0

[PATCH OLK-5.10] [Huawei] iommu/arm-smmu-v3: fix using uninitialized or unchecked symbol
by Zhang Zekun 07 Apr '24

07 Apr '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9EEIG -------------------------------------- This commit fix the following errors in the code: 1. The arm_smmu_aux_attach_dev function returns an uncertain return value ret when all conditions are not met. In this case, the cd table is not initialized. Therefore, a new default exception value is added. 2. In arm_smmu_ecmdq_probe(), the parameter pre_addr is used in the loop but it is not initialed yet. Also, the parameter "ecmdq" is used before check if it is NULL. Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index fe647241ca88..423a54b7611d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3630,6 +3630,9 @@ static int arm_smmu_aux_attach_dev(struct iommu_domain *domain, struct device *d dev_err(dev, "cannot attach aux domain with different parent\n"); ret = -EINVAL; goto out_unlock; + } else { + ret = -EINVAL; + goto out_unlock; } /* FIXME: serialize against arm_smmu_share_asid() */ @@ -4813,7 +4816,7 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) int ret, cpu; u32 i, nump, numq, gap; u32 reg, shift_increment; - u64 addr, smmu_dma_base; + u64 addr, smmu_dma_base, val, pre_addr; void __iomem *cp_regs, *cp_base; /* IDR6 */ @@ -4831,8 +4834,6 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) return -ENOMEM; for (i = 0; i < nump; i++) { - u64 val, pre_addr; - val = readq_relaxed(cp_regs + 32 * i); if (!(val & ECMDQ_CP_PRESET)) { iounmap(cp_regs); @@ -4872,7 +4873,6 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) struct arm_smmu_queue *q; ecmdq = *per_cpu_ptr(smmu->ecmdqs, cpu); - q = &ecmdq->cmdq.q; /* * The boot option "maxcpus=" can limit the number of online @@ -4885,6 +4885,8 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) */ if (!ecmdq || (ecmdq != per_cpu_ptr(smmu->ecmdq, cpu))) continue; + + q = &ecmdq->cmdq.q; ecmdq->base = cp_base + addr; q->llq.max_n_shift = ECMDQ_MAX_SZ_SHIFT + shift_increment; -- 2.17.1

2 1

[PATCH] [Huawei] iommu/arm-smmu-v3: fix using uninitialized or unchecked symbol
by Zhang Zekun 07 Apr '24

07 Apr '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9EEIG -------------------------------------- This commit fix the following errors in the code: 1. The arm_smmu_aux_attach_dev function returns an uncertain return value ret when all conditions are not met. In this case, the cd table is not initialized. Therefore, a new default exception value is added. 2. In arm_smmu_ecmdq_probe(), the parameter pre_addr is used in the loop but it is not initialed yet. Also, the parameter "ecmdq" is used before check if it is NULL. Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index fe647241ca88..423a54b7611d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3630,6 +3630,9 @@ static int arm_smmu_aux_attach_dev(struct iommu_domain *domain, struct device *d dev_err(dev, "cannot attach aux domain with different parent\n"); ret = -EINVAL; goto out_unlock; + } else { + ret = -EINVAL; + goto out_unlock; } /* FIXME: serialize against arm_smmu_share_asid() */ @@ -4813,7 +4816,7 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) int ret, cpu; u32 i, nump, numq, gap; u32 reg, shift_increment; - u64 addr, smmu_dma_base; + u64 addr, smmu_dma_base, val, pre_addr; void __iomem *cp_regs, *cp_base; /* IDR6 */ @@ -4831,8 +4834,6 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) return -ENOMEM; for (i = 0; i < nump; i++) { - u64 val, pre_addr; - val = readq_relaxed(cp_regs + 32 * i); if (!(val & ECMDQ_CP_PRESET)) { iounmap(cp_regs); @@ -4872,7 +4873,6 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) struct arm_smmu_queue *q; ecmdq = *per_cpu_ptr(smmu->ecmdqs, cpu); - q = &ecmdq->cmdq.q; /* * The boot option "maxcpus=" can limit the number of online @@ -4885,6 +4885,8 @@ static int arm_smmu_ecmdq_probe(struct arm_smmu_device *smmu) */ if (!ecmdq || (ecmdq != per_cpu_ptr(smmu->ecmdq, cpu))) continue; + + q = &ecmdq->cmdq.q; ecmdq->base = cp_base + addr; q->llq.max_n_shift = ECMDQ_MAX_SZ_SHIFT + shift_increment; -- 2.17.1

1 0

[PATCH OLK-6.6 00/16] Support NMI in the virtual machine
by chenxiang 07 Apr '24

07 Apr '24

From: caijian <caijian11(a)h-partners.com> Patch#1 Revert "KVM: arm64: Disable MPAM visibility by default, and handle traps" to make sure it could load vm with high version qemu in the board that supports MPAM feature. Patch#2-16 support nmi in the virtual machine. https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?… Marc Zyngier (15): KVM: arm64: vgic-v3: Upgrade AP1Rn to 64bit. KVM: arm64: vgic-v3: Allow the NMI state to make it into the LRs KVM: arm64: vgic-v3: Make NMI priority RES0 KVM: arm64: vgic-v4: Propagate the NMI state into the GICv4.1 VSGI configuration KVM: arm64: vgic-v3: Use the NMI attribute as part of the AP-list sorting KVM: arm64: vgic-v3: Add support for GIC{D,R}_INMIR registers KVM: arm64: vgic-v3: Add userspace selection for GICv3.3 NMI KVM: arm64: vgic-debug: Add the NMI field to the debug output KVM: arm64: Allow userspace to control ID_AA64PFR1_EL1.NMI KVM: arm64: Don't trap ALLINT accesses if the vcpu has FEAT_NMI KVM: arm64: vgic-v3: Don't inject an NMI if the vcpu doesn't have FEAT_NMI KVM: arm64: Allow GICv3.3 NMI if the host supports it KVM: arm64: Handle traps of ALLINT arm64: Decouple KVM from CONFIG_ARM64_NMI KVM: arm64: vgic-v3: Handle traps of ICV_NMIAR1_EL1 caijian (1): Revert "KVM: arm64: Disable MPAM visibility by default, and handle traps" arch/arm64/include/asm/cpufeature.h | 3 +- arch/arm64/include/asm/kvm_host.h | 2 + arch/arm64/include/asm/sysreg.h | 3 + arch/arm64/kernel/cpufeature.c | 13 ++- arch/arm64/kvm/arm.c | 3 + arch/arm64/kvm/hyp/include/hyp/switch.h | 6 +- arch/arm64/kvm/hyp/vgic-v3-sr.c | 14 +++- arch/arm64/kvm/sys_regs.c | 107 ++++++++++-------------- arch/arm64/kvm/vgic/vgic-debug.c | 9 +- arch/arm64/kvm/vgic/vgic-init.c | 10 ++- arch/arm64/kvm/vgic/vgic-mmio-v2.c | 1 + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 70 +++++++++++++++- arch/arm64/kvm/vgic/vgic-mmio.c | 25 ++++-- arch/arm64/kvm/vgic/vgic-v3.c | 12 ++- arch/arm64/kvm/vgic/vgic-v4.c | 1 + arch/arm64/kvm/vgic/vgic.c | 8 +- arch/arm64/kvm/vgic/vgic.h | 1 + drivers/irqchip/irq-gic-v3-its.c | 9 ++ drivers/irqchip/irq-gic-v3.c | 12 +++ drivers/irqchip/irq-gic-v4.c | 3 +- include/kvm/arm_vgic.h | 10 ++- include/linux/irqchip/arm-gic-v4.h | 4 +- include/linux/irqchip/arm-vgic-info.h | 2 + 23 files changed, 238 insertions(+), 90 deletions(-) -- 2.30.0

2 17

[openeuler:openEuler-1.0-LTS 20821/22045] fs/io_uring.c:3882:14: sparse: sparse: incorrect type in assignment (different address spaces)
by kernel test robot 05 Apr '24

05 Apr '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: e89315eb08769716cbf7e08f49672222cf0eca47 commit: b2b243d6115480833f9d888b06d70e372ae6fdb2 [20821/22045] io_uring: get rid of intermediate IORING_OP_CLOSE stage config: arm64-randconfig-r112-20240401 (https://download.01.org/0day-ci/archive/20240405/202404050320.ikGdTX4Z-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce: (https://download.01.org/0day-ci/archive/20240405/202404050320.ikGdTX4Z-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/202404050320.ikGdTX4Z-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) fs/io_uring.c:2822:24: sparse: sparse: incorrect type in return expression (different address spaces) @@ expected void [noderef] <asn:1> * @@ got struct io_buffer *[assigned] kbuf @@ fs/io_uring.c:2822:24: sparse: expected void [noderef] <asn:1> * fs/io_uring.c:2822:24: sparse: got struct io_buffer *[assigned] kbuf fs/io_uring.c:2988:40: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected void [noderef] <asn:1> *[assigned] iov_base @@ got void * @@ fs/io_uring.c:2988:40: sparse: expected void [noderef] <asn:1> *[assigned] iov_base fs/io_uring.c:2988:40: sparse: got void * fs/io_uring.c:3364:37: sparse: sparse: incorrect type in argument 2 (different address spaces) @@ expected long long [noderef] [usertype] <asn:1> *off_in @@ got long long [usertype] *[assigned] poff_in @@ fs/io_uring.c:3364:37: sparse: expected long long [noderef] [usertype] <asn:1> *off_in fs/io_uring.c:3364:37: sparse: got long long [usertype] *[assigned] poff_in fs/io_uring.c:3364:51: sparse: sparse: incorrect type in argument 4 (different address spaces) @@ expected long long [noderef] [usertype] <asn:1> *off_out @@ got long long [usertype] *[assigned] poff_out @@ fs/io_uring.c:3364:51: sparse: expected long long [noderef] [usertype] <asn:1> *off_out fs/io_uring.c:3364:51: sparse: got long long [usertype] *[assigned] poff_out >> fs/io_uring.c:3882:14: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct file *[assigned] file @@ got struct file [noderef] <asn:4> * @@ fs/io_uring.c:3882:14: sparse: expected struct file *[assigned] file fs/io_uring.c:3882:14: sparse: got struct file [noderef] <asn:4> * fs/io_uring.c:4529:72: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected int mask @@ got restricted __poll_t [usertype] mask @@ fs/io_uring.c:4529:72: sparse: expected int mask fs/io_uring.c:4529:72: sparse: got restricted __poll_t [usertype] mask fs/io_uring.c:4533:21: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] result @@ got restricted __poll_t [usertype] mask @@ fs/io_uring.c:4533:21: sparse: expected unsigned int [usertype] result fs/io_uring.c:4533:21: sparse: got restricted __poll_t [usertype] mask fs/io_uring.c:4571:29: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] result @@ got restricted __poll_t @@ fs/io_uring.c:4571:29: sparse: expected unsigned int [usertype] result fs/io_uring.c:4571:29: sparse: got restricted __poll_t fs/io_uring.c:4636:34: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected restricted __poll_t [usertype] mask @@ got unsigned int [usertype] result @@ fs/io_uring.c:4636:34: sparse: expected restricted __poll_t [usertype] mask fs/io_uring.c:4636:34: sparse: got unsigned int [usertype] result fs/io_uring.c:4788:41: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected int mask @@ got restricted __poll_t [usertype] @@ fs/io_uring.c:4788:41: sparse: expected int mask fs/io_uring.c:4788:41: sparse: got restricted __poll_t [usertype] fs/io_uring.c:4877:22: sparse: sparse: invalid assignment: |= fs/io_uring.c:4877:22: sparse: left side has type restricted __poll_t fs/io_uring.c:4877:22: sparse: right side has type int fs/io_uring.c:4879:22: sparse: sparse: invalid assignment: |= fs/io_uring.c:4879:22: sparse: left side has type restricted __poll_t fs/io_uring.c:4879:22: sparse: right side has type int fs/io_uring.c:4880:14: sparse: sparse: invalid assignment: |= fs/io_uring.c:4880:14: sparse: left side has type restricted __poll_t fs/io_uring.c:4880:14: sparse: right side has type int fs/io_uring.c:4894:67: sparse: sparse: incorrect type in argument 4 (different base types) @@ expected int mask @@ got restricted __poll_t [assigned] [usertype] mask @@ fs/io_uring.c:4894:67: sparse: expected int mask fs/io_uring.c:4894:67: sparse: got restricted __poll_t [assigned] [usertype] mask fs/io_uring.c:4895:52: sparse: sparse: incorrect type in argument 5 (different base types) @@ expected int events @@ got restricted __poll_t [usertype] events @@ fs/io_uring.c:4895:52: sparse: expected int events fs/io_uring.c:4895:52: sparse: got restricted __poll_t [usertype] events fs/io_uring.c:5051:34: sparse: sparse: restricted __poll_t degrades to integer fs/io_uring.c:5050:57: sparse: sparse: restricted __poll_t degrades to integer fs/io_uring.c:5050:22: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __poll_t [usertype] events @@ got unsigned int @@ fs/io_uring.c:5050:22: sparse: expected restricted __poll_t [usertype] events fs/io_uring.c:5050:22: sparse: got unsigned int In file included from include/linux/hugetlb.h:45, from fs/io_uring.c:73: include/linux/mempolicy.h:329:13: warning: '__do_mbind' defined but not used [-Wunused-function] 329 | static long __do_mbind(unsigned long start, unsigned long len, | ^~~~~~~~~~ fs/io_uring.c: In function 'io_probe.isra': fs/io_uring.c:8725:23: warning: array subscript i is outside array bounds of 'struct io_uring_probe_op[0]' [-Warray-bounds=] 8725 | p->ops[i].op = i; | ~~~~~~^~~ In file included from fs/io_uring.c:86: include/uapi/linux/io_uring.h:291:34: note: while referencing 'ops' 291 | struct io_uring_probe_op ops[0]; | ^~~ fs/io_uring.c:8727:31: warning: array subscript i is outside array bounds of 'struct io_uring_probe_op[0]' [-Warray-bounds=] 8727 | p->ops[i].flags = IO_URING_OP_SUPPORTED; | ~~~~~~^~~ include/uapi/linux/io_uring.h:291:34: note: while referencing 'ops' 291 | struct io_uring_probe_op ops[0]; | ^~~ In file included from include/linux/if_ether.h:23, from include/uapi/linux/ethtool.h:19, from include/linux/ethtool.h:19, from include/linux/netdevice.h:42, from include/net/sock.h:52, from fs/io_uring.c:65: In function '__skb_queue_before', inlined from '__skb_queue_tail' at include/linux/skbuff.h:1908:2, inlined from 'io_ring_file_put.isra' at fs/io_uring.c:6991:3: include/linux/skbuff.h:1874:9: warning: array subscript 'struct sk_buff[0]' is partly outside array bounds of 'struct sk_buff_head[1]' [-Warray-bounds=] 1874 | __skb_insert(newsk, next->prev, next, list); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fs/io_uring.c: In function 'io_ring_file_put.isra': fs/io_uring.c:6949:29: note: object 'list' of size 80 6949 | struct sk_buff_head list, *head = &sock->sk_receive_queue; | ^~~~ In function '__skb_queue_before', inlined from '__skb_queue_tail' at include/linux/skbuff.h:1908:2, inlined from 'io_ring_file_put.isra' at fs/io_uring.c:6981:5: include/linux/skbuff.h:1874:9: warning: array subscript 'struct sk_buff[0]' is partly outside array bounds of 'struct sk_buff_head[1]' [-Warray-bounds=] 1874 | __skb_insert(newsk, next->prev, next, list); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fs/io_uring.c: In function 'io_ring_file_put.isra': fs/io_uring.c:6949:29: note: object 'list' of size 80 6949 | struct sk_buff_head list, *head = &sock->sk_receive_queue; | ^~~~ In file included from include/linux/poll.h:12, from include/linux/ring_buffer.h:7, from include/linux/trace_events.h:6, from include/trace/syscall.h:7, from include/linux/syscalls.h:86, from fs/io_uring.c:45: In function '_copy_from_user', inlined from 'copy_from_user' at include/linux/uaccess.h:144:7, inlined from 'io_uring_setup' at fs/io_uring.c:8679:6: include/linux/uaccess.h:112:17: warning: 'p' may be used uninitialized [-Wmaybe-uninitialized] 112 | kasan_check_write(to, n); | ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from include/linux/compiler.h:265, from include/linux/kernel.h:10, from fs/io_uring.c:42: include/linux/kasan-checks.h: In function 'io_uring_setup': include/linux/kasan-checks.h:7:6: note: by argument 1 of type 'const volatile void *' to 'kasan_check_write' declared here 7 | void kasan_check_write(const volatile void *p, unsigned int size); vim +3882 fs/io_uring.c 3864 3865 static int io_close(struct io_kiocb *req, bool force_nonblock, 3866 struct io_comp_state *cs) 3867 { 3868 struct files_struct *files = current->files; 3869 struct io_close *close = &req->close; 3870 struct fdtable *fdt; 3871 struct file *file; 3872 int ret; 3873 3874 file = NULL; 3875 ret = -EBADF; 3876 spin_lock(&files->file_lock); 3877 fdt = files_fdtable(files); 3878 if (close->fd >= fdt->max_fds) { 3879 spin_unlock(&files->file_lock); 3880 goto err; 3881 } > 3882 file = fdt->fd[close->fd]; 3883 if (!file) { 3884 spin_unlock(&files->file_lock); 3885 goto err; 3886 } 3887 3888 if (file->f_op == &io_uring_fops) { 3889 spin_unlock(&files->file_lock); 3890 file = NULL; 3891 goto err; 3892 } 3893 3894 /* if the file has a flush method, be safe and punt to async */ 3895 if ((file->f_op->flush && force_nonblock) || 3896 req->close.fd == req->ctx->ring_fd) { 3897 spin_unlock(&files->file_lock); 3898 return -EAGAIN; 3899 } 3900 3901 ret = __close_fd_get_file(close->fd, &file); 3902 spin_unlock(&files->file_lock); 3903 if (ret < 0) { 3904 if (ret == -ENOENT) 3905 ret = -EBADF; 3906 goto err; 3907 } 3908 3909 /* No ->flush() or already async, safely close from here */ 3910 ret = filp_close(file, current->files); 3911 err: 3912 if (ret < 0) 3913 req_set_fail_links(req); 3914 if (file) 3915 fput(file); 3916 __io_req_complete(req, ret, 0, cs); 3917 return 0; 3918 } 3919 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:openEuler-1.0-LTS 20444/22045] arch/arm64/kernel/cpufeature.c:1287:9: error: 'a32_elf_hwcap2' undeclared; did you mean 'elf_hwcap'?
by kernel test robot 05 Apr '24

05 Apr '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: e89315eb08769716cbf7e08f49672222cf0eca47 commit: 6dfc76f160cb5e8bf25cb85d4763cdc3144bfda8 [20444/22045] arm64: errata: Remove AES hwcap for COMPAT tasks config: arm64-randconfig-r112-20240401 (https://download.01.org/0day-ci/archive/20240405/202404050118.HPvTb5SP-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce: (https://download.01.org/0day-ci/archive/20240405/202404050118.HPvTb5SP-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/202404050118.HPvTb5SP-lkp@intel.com/ Note: the openeuler/openEuler-1.0-LTS HEAD e89315eb08769716cbf7e08f49672222cf0eca47 builds fine. It only hurts bisectability. All errors (new ones prefixed by >>): arch/arm64/kernel/cpufeature.c:1287:9: sparse: sparse: undefined identifier 'a32_elf_hwcap2' arch/arm64/kernel/cpufeature.c: In function 'elf_hwcap_fixup': >> arch/arm64/kernel/cpufeature.c:1287:9: error: 'a32_elf_hwcap2' undeclared (first use in this function); did you mean 'elf_hwcap'? 1287 | a32_elf_hwcap2 &= ~COMPAT_HWCAP2_AES; | ^~~~~~~~~~~~~~ | elf_hwcap arch/arm64/kernel/cpufeature.c:1287:9: note: each undeclared identifier is reported only once for each function it appears in vim +1287 arch/arm64/kernel/cpufeature.c 1282 1283 static void elf_hwcap_fixup(void) 1284 { 1285 #ifdef CONFIG_ARM64_ERRATUM_1742098 1286 if (cpus_have_const_cap(ARM64_WORKAROUND_1742098)) > 1287 a32_elf_hwcap2 &= ~COMPAT_HWCAP2_AES; 1288 #endif /* ARM64_ERRATUM_1742098 */ 1289 } 1290 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0