- Kernel - mailweb.openeuler.org

[PATCH v1 OLK-5.10 40/90] sw64: add required include headers to ptrace.h
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/include/asm/ptrace.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/sw_64/include/asm/ptrace.h b/arch/sw_64/include/asm/ptrace.h index 1dde5e6cba8a..33f5cc97c976 100644 --- a/arch/sw_64/include/asm/ptrace.h +++ b/arch/sw_64/include/asm/ptrace.h @@ -3,7 +3,11 @@ #define _ASM_SW64_PTRACE_H #include <uapi/asm/ptrace.h> - +#include <linux/sched/task_stack.h> +#include <asm/hmcall.h> +#include <asm/thread_info.h> +#include <asm/processor.h> +#include <asm/page.h> #define arch_has_single_step() (1) #define user_mode(regs) (((regs)->ps & 8) != 0) -- 2.17.1

1 9

[PATCH v1 OLK-5.10 30/90] sw64: rename kvm_mem variables
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Rename variables for kvm_mem cmdline to improve readability. Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/setup.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/sw_64/kernel/setup.c b/arch/sw_64/kernel/setup.c index e5abef2dc593..26a611448ad6 100644 --- a/arch/sw_64/kernel/setup.c +++ b/arch/sw_64/kernel/setup.c @@ -81,8 +81,8 @@ DEFINE_PER_CPU(unsigned long, hard_node_id) = { 0 }; struct cma *sw64_kvm_cma; EXPORT_SYMBOL(sw64_kvm_cma); -static phys_addr_t size_cmdline; -static phys_addr_t base_cmdline; +static phys_addr_t kvm_mem_size; +static phys_addr_t kvm_mem_base; struct gen_pool *sw64_kvm_pool; EXPORT_SYMBOL(sw64_kvm_pool); @@ -748,17 +748,17 @@ static int __init early_kvm_reserved_mem(char *p) return -EINVAL; } - size_cmdline = memparse(p, &p); + kvm_mem_size = memparse(p, &p); if (*p != '@') return -EINVAL; - base_cmdline = memparse(p + 1, &p); + kvm_mem_base = memparse(p + 1, &p); return 0; } early_param("kvm_mem", early_kvm_reserved_mem); void __init sw64_kvm_reserve(void) { - kvm_cma_declare_contiguous(base_cmdline, size_cmdline, 0, + kvm_cma_declare_contiguous(kvm_mem_base, kvm_mem_size, 0, PAGE_SIZE, 0, "sw64_kvm_cma", &sw64_kvm_cma); } #endif @@ -1030,14 +1030,14 @@ static int __init sw64_kvm_pool_init(void) if (!sw64_kvm_cma) goto out; - kvm_pool_virt = (unsigned long)base_cmdline; + kvm_pool_virt = (unsigned long)kvm_mem_base; sw64_kvm_pool = gen_pool_create(PAGE_SHIFT, -1); if (!sw64_kvm_pool) goto out; - status = gen_pool_add_virt(sw64_kvm_pool, kvm_pool_virt, base_cmdline, - size_cmdline, -1); + status = gen_pool_add_virt(sw64_kvm_pool, kvm_pool_virt, kvm_mem_base, + kvm_mem_size, -1); if (status < 0) { pr_err("failed to add memory chunks to sw64 kvm pool\n"); gen_pool_destroy(sw64_kvm_pool); @@ -1046,8 +1046,8 @@ static int __init sw64_kvm_pool_init(void) } gen_pool_set_algo(sw64_kvm_pool, gen_pool_best_fit, NULL); - base_page = pfn_to_page(base_cmdline >> PAGE_SHIFT); - end_page = pfn_to_page((base_cmdline + size_cmdline) >> PAGE_SHIFT); + base_page = pfn_to_page(kvm_mem_base >> PAGE_SHIFT); + end_page = pfn_to_page((kvm_mem_base + kvm_mem_size) >> PAGE_SHIFT); p = base_page; while (page_ref_count(p) == 0 && -- 2.17.1

1 9

[PATCH v1 OLK-5.10 20/90] sw64: fix the value of QEMU_PRINTF_BUFF_BASE
by Gu Zitao 12 May '22

12 May '22

From: Min Fanlei <minfanlei(a)wxiat.com> Sunway inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I56WV8 -------------------------------- Signed-off-by: Min Fanlei <minfanlei(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/dup_print.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/sw_64/kernel/dup_print.c b/arch/sw_64/kernel/dup_print.c index ac0a95d4d30b..fae543625f62 100644 --- a/arch/sw_64/kernel/dup_print.c +++ b/arch/sw_64/kernel/dup_print.c @@ -6,6 +6,7 @@ #include <linux/delay.h> #include <linux/spinlock.h> #include <linux/uaccess.h> +#include <asm/chip3_io.h> #ifdef CONFIG_SW64_RRK @@ -20,7 +21,7 @@ unsigned long sw64_printk_offset; * For output the kernel message on the console * with full-system emulator. */ -#define QEMU_PRINTF_BUFF_BASE (0x805000040000ULL | PAGE_OFFSET) +#define QEMU_PRINTF_BUFF_BASE (IO_BASE | MCU_BASE | 0x40000UL | PAGE_OFFSET) int sw64_printk(const char *fmt, va_list args) { -- 2.17.1

1 9

[PATCH v1 OLK-5.10 12/90] sw64: switch to generic pcibios_set_master and pci_common_swizzle
by Gu Zitao 12 May '22

12 May '22

From: Zhou Xuemei <zhouxuemei(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56U83 -------------------------------- The generic implementation is better than arch-specific version. So we remove the arch-specific one and switch to the generic version. Signed-off-by: Zhou Xuemei <zhouxuemei(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/pci.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/arch/sw_64/kernel/pci.c b/arch/sw_64/kernel/pci.c index b8505ad8972c..2c53e0717c9a 100644 --- a/arch/sw_64/kernel/pci.c +++ b/arch/sw_64/kernel/pci.c @@ -175,21 +175,6 @@ struct pci_dev *sw64_gendev_to_pci(struct device *dev) return NULL; } -/* - * If we set up a device for bus mastering, we need to check the latency - * timer as certain firmware forgets to set it properly. - */ -void pcibios_set_master(struct pci_dev *dev) -{ - u8 lat; - - pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); - if (lat >= 16) - return; - pr_info("PCI: Setting latency timer of device %s to 64\n", pci_name(dev)); - pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64); -} - void __init pcibios_claim_one_bus(struct pci_bus *b) { struct pci_dev *dev; @@ -265,7 +250,7 @@ void __init common_init_pci(void) bridge->sysdata = hose; bridge->busnr = hose->busn_space->start; bridge->ops = &sw64_pci_ops; - bridge->swizzle_irq = sw64_swizzle; + bridge->swizzle_irq = pci_common_swizzle; bridge->map_irq = sw64_map_irq; ret = pci_scan_root_bus_bridge(bridge); @@ -593,11 +578,6 @@ int sw64_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return sw64_chip_init->pci_init.map_irq(dev, slot, pin); } -unsigned char sw64_swizzle(struct pci_dev *dev, u8 *pinp) -{ - return PCI_SLOT(dev->devfn); -} - static void __init sw64_init_host(unsigned long node, unsigned long index) { -- 2.17.1

1 0

[PATCH v1 OLK-5.10 14/90] sw64: modify tc_sched_clock debugfs file
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Use debugfs_create_file() to create debugfs file for tc_sched_clock so it is protected against file removals. Change its name to "tc_sched_clock" to stay consistent with what we use in cmdline. Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sw_64/kernel/time.c b/arch/sw_64/kernel/time.c index 0815d06b03d4..185db832dfb8 100644 --- a/arch/sw_64/kernel/time.c +++ b/arch/sw_64/kernel/time.c @@ -237,8 +237,8 @@ static int __init sched_clock_debug_init(void) if (!sw64_debugfs_dir) return -ENODEV; - sched_clock_status = debugfs_create_file_unsafe("use_tc_as_sched_clock", - 0666, sw64_debugfs_dir, NULL, + sched_clock_status = debugfs_create_file("tc_sched_clock", + 0644, sw64_debugfs_dir, NULL, &sched_clock_status_fops); if (!sched_clock_status) -- 2.17.1

1 5

[PATCH v1 OLK-5.10 13/90] sw64: remove redundant Kconfig source
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Remove redundant Kconfig source to avoid compiler warning. Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/sw_64/Kconfig b/arch/sw_64/Kconfig index a81d388ed304..318a423d87dd 100644 --- a/arch/sw_64/Kconfig +++ b/arch/sw_64/Kconfig @@ -419,9 +419,6 @@ config ARCH_DISCONTIGMEM_ENABLE or have huge holes in the physical address space for other reasons. See <file:Documentation/vm/numa> for more. -source "kernel/Kconfig.preempt" - - config NUMA bool "NUMA Support" depends on SMP && !FLATMEM -- 2.17.1

1 0

[PATCH v1 OLK-5.10 00/90] sw64: merge patches
by Gu Zitao 12 May '22

12 May '22

Cui Mingrui (2): sw64: optimize ip checksum calculation sw64: fix ip checksum calculation Du Yilong (3): sw64: kvm: fix bug when open file with the O_DIRECT flag sw64: add set time support for hypervisor based rtc sw64: kvm: remap pages of guest by vm_insert_page() Gu Zitao (7): config: add initial openeuler_defconfig for sw64 sw64: fix coding style problems sw64: fix the VDSO symbol generation for nm sw64: fix SPDX license identifier in uapi headers sw64: add SO_RCVTIMEO/ SO_SNDTIMEO socket options sw64: remove unnecessary include headers sw64: fix some compile errors He Chuyue (2): sw64: add regs and stack access APIs to support kprobe events sw64: remove unnecessary parameter in REG_OFFSET_NAME He Sheng (20): sw64: clean up useless #if 0 and #if 1 sw64: switch GUP to the generic get_user_pages_fast() implementation sw64: remove unused a.out.h sw64: fix ex_table entries from misalignment handlers sw64: define NR_SYSCALLS as generated __NR_syscalls sw64: clean up a.out and ECOFF binary related headers sw64: ptrace: clean up debug codes sw64: add kbuild defconfig rule sw64: clean up out-of-date selected options sw64: Kconfig: remove dependence on !PREEMPT sw64: Kconfig: remove dependence on ARCH_SUPPORTS_ACPI sw64: add missing global __constant_c_memset sw64: do some cleanups for rt_sigframe sw64: fix setup_rt_frame for non SA_SIGINFO sw64: fix compile error for DISCONTIGMEM=y sw64: force signal and fault for traps and debugging sw64: push and pop kernel stack with ldi instruction sw64: signal: save/restore fpregs with copy user sw64: fix the number of aux entries in ARCH_DLINFO sw64: fix sendfile system call Lu Feifei (6): sw64: fix printk method for guest os sw64: unify access to LONGTIME for guest and emulator sw64: kvm: handle ldl_u and stl_u when exit mmio sw64: kvm: simplify the code sw64: pci: align the address of mmio resource to PAGE_SIZE sw64: unify 32-bit MEMIO address of host and guest Mao Minkai (29): sw64: vdso: add automatic syscall fallback sw64: vdso: change vdso version sw64: vdso: fix time calculation sw64: mm: reorder memblock_init process sw64: mm: warn overlapped memmap and DMA region sw64: mm: use memblock to find the end of memory sw64: print correct initrd address sw64: remove redundant Kconfig source sw64: modify tc_sched_clock debugfs file sw64: simplify cpumask_of_node sw64: remove CONFIG_USE_PERCPU_NUMA_NODE_ID=n code sw64: fix all compile warnings sw64: numa: switch to arch node_distance sw64: mm: mark pci and memmap region as nomap sw64: use jump label for running modes sw64: remove MAX_ASN sw64: kvm: remove MAX_VPN sw64: fix coding style problems sw64: rename kvm_mem variables sw64: reformat syscall.tbl sw64: add missing pkey syscall numbers sw64: add clone3 syscall support sw64: add required include headers to ptrace.h sw64: switch to old-style semctl/shmctl syscalls sw64: increase position index in c_next for cpuinfo sw64: add old sigprocmask back for compatibility sw64: vdso: fix backtrace of vrt_sigreturn sw64: vdso: fix CFI directives for fpregs in vrt_sigreturn sw64: optimize simd version of memcpy and memset Min Fanlei (4): sw64: fix the value of QEMU_PRINTF_BUFF_BASE sw64: add support for emulator running mode sw64: enable more than 32 CPUs for guest sw64: kvm: fix bad page state setting outside of kvm memory pool Tang Jinyang (2): sw64: add dynamic frequency scaling support sw64: add dynamic turning on/off cores support Wang Yingying (3): hwmon: add voltage sensor support for sw64 sw64: add pvt device to chip3.dts hwmon: add support for sw64 temperature sensor Xu Chenjiao (2): sw64: radeon: add a force flush to delay work when radeon uvd suspend sw64: pcie: enable PME and AER support Zhao Yihan (1): sw64: remap PA with |= in early_ioremap Zheng Chongzhen (3): sw64: re-implement sw64_dma_direct_ops according upstream sw64: iommu: fix 32-bit devices dma ops sw64: fix compile error for CONFIG_PCI=n Zhou Xuemei (5): sw64: pci: remove some useless code sw64: switch to generic pcibios_set_master and pci_common_swizzle sw64: clean up some useless codes sw64: dts: rename spi flash partition to fix warning sw64: add ARCH_HAS_PTE_SPECIAL support Zhu Donghong (1): ipmi: add ipmi driver support arch/sw_64/Kconfig | 325 +- arch/sw_64/Makefile | 1 + arch/sw_64/boot/dts/chip3.dts | 41 +- arch/sw_64/chip/chip3/chip.c | 130 +- arch/sw_64/chip/chip3/cpufreq_debugfs.c | 7 +- arch/sw_64/chip/chip3/i2c-lib.c | 4 - arch/sw_64/chip/chip3/irq_chip.c | 13 +- arch/sw_64/chip/chip3/msi.c | 7 +- arch/sw_64/chip/chip3/pci-quirks.c | 7 +- arch/sw_64/chip/chip3/vt_msi.c | 6 - arch/sw_64/configs/openeuler_defconfig | 4312 +++++++++++++++++++++ arch/sw_64/defconfig | 73 - arch/sw_64/include/asm/Kbuild | 1 + arch/sw_64/include/asm/a.out-core.h | 80 - arch/sw_64/include/asm/a.out.h | 16 - arch/sw_64/include/asm/checksum.h | 58 +- arch/sw_64/include/asm/chip3_io.h | 4 +- arch/sw_64/include/asm/clock.h | 56 + arch/sw_64/include/asm/cputime.h | 4 +- arch/sw_64/include/asm/early_ioremap.h | 2 +- arch/sw_64/include/asm/hw_init.h | 29 +- arch/sw_64/include/asm/kvm_host.h | 3 +- arch/sw_64/include/asm/mmu_context.h | 3 +- arch/sw_64/include/asm/numa.h | 1 + arch/sw_64/include/asm/pci.h | 24 +- arch/sw_64/include/asm/pgtable.h | 26 +- arch/sw_64/include/asm/ptrace.h | 8 +- arch/sw_64/include/asm/topology.h | 29 +- arch/sw_64/include/asm/unistd.h | 3 +- arch/sw_64/include/asm/user.h | 53 - arch/sw_64/include/asm/vdso.h | 4 +- arch/sw_64/include/asm/vga.h | 18 +- arch/sw_64/include/uapi/asm/a.out.h | 88 - arch/sw_64/include/uapi/asm/auxvec.h | 25 +- arch/sw_64/include/uapi/asm/bitsperlong.h | 2 +- arch/sw_64/include/uapi/asm/byteorder.h | 2 +- arch/sw_64/include/uapi/asm/compiler.h | 2 +- arch/sw_64/include/uapi/asm/console.h | 2 +- arch/sw_64/include/uapi/asm/errno.h | 2 +- arch/sw_64/include/uapi/asm/fcntl.h | 2 +- arch/sw_64/include/uapi/asm/fpu.h | 2 +- arch/sw_64/include/uapi/asm/gentrap.h | 2 +- arch/sw_64/include/uapi/asm/hmcall.h | 2 +- arch/sw_64/include/uapi/asm/ioctl.h | 2 +- arch/sw_64/include/uapi/asm/ioctls.h | 48 +- arch/sw_64/include/uapi/asm/ipcbuf.h | 2 +- arch/sw_64/include/uapi/asm/kvm.h | 14 +- arch/sw_64/include/uapi/asm/kvm_para.h | 2 +- arch/sw_64/include/uapi/asm/mman.h | 2 +- arch/sw_64/include/uapi/asm/msgbuf.h | 2 +- arch/sw_64/include/uapi/asm/param.h | 2 +- arch/sw_64/include/uapi/asm/poll.h | 2 +- arch/sw_64/include/uapi/asm/posix_types.h | 2 +- arch/sw_64/include/uapi/asm/ptrace.h | 2 +- arch/sw_64/include/uapi/asm/reg.h | 2 +- arch/sw_64/include/uapi/asm/regdef.h | 2 +- arch/sw_64/include/uapi/asm/resource.h | 2 +- arch/sw_64/include/uapi/asm/sembuf.h | 2 +- arch/sw_64/include/uapi/asm/setup.h | 2 +- arch/sw_64/include/uapi/asm/shmbuf.h | 2 +- arch/sw_64/include/uapi/asm/sigcontext.h | 2 +- arch/sw_64/include/uapi/asm/siginfo.h | 2 +- arch/sw_64/include/uapi/asm/signal.h | 2 +- arch/sw_64/include/uapi/asm/socket.h | 34 +- arch/sw_64/include/uapi/asm/sockios.h | 2 +- arch/sw_64/include/uapi/asm/stat.h | 2 +- arch/sw_64/include/uapi/asm/statfs.h | 2 +- arch/sw_64/include/uapi/asm/swab.h | 2 +- arch/sw_64/include/uapi/asm/sysinfo.h | 2 +- arch/sw_64/include/uapi/asm/termbits.h | 2 +- arch/sw_64/include/uapi/asm/termios.h | 2 +- arch/sw_64/include/uapi/asm/types.h | 2 +- arch/sw_64/include/uapi/asm/unistd.h | 7 +- arch/sw_64/kernel/Makefile | 5 +- arch/sw_64/kernel/acpi.c | 19 +- arch/sw_64/kernel/asm-offsets.c | 7 +- arch/sw_64/kernel/audit.c | 2 +- arch/sw_64/kernel/cacheinfo.c | 3 +- arch/sw_64/kernel/clock.c | 184 + arch/sw_64/kernel/core.c | 41 +- arch/sw_64/kernel/cpuautoplug.c | 496 +++ arch/sw_64/kernel/crash_dump.c | 2 - arch/sw_64/kernel/dup_print.c | 10 +- arch/sw_64/kernel/early_printk.c | 4 +- arch/sw_64/kernel/entry.S | 5 +- arch/sw_64/kernel/ftrace.c | 5 - arch/sw_64/kernel/insn.c | 13 - arch/sw_64/kernel/irq.c | 15 - arch/sw_64/kernel/irq_sw64.c | 9 +- arch/sw_64/kernel/jump_label.c | 3 +- arch/sw_64/kernel/kgdb.c | 9 +- arch/sw_64/kernel/kprobes/decode-insn.c | 6 +- arch/sw_64/kernel/kprobes/kprobes.c | 4 - arch/sw_64/kernel/kvm_cma.c | 4 - arch/sw_64/kernel/machine_kexec.c | 7 +- arch/sw_64/kernel/module.c | 9 - arch/sw_64/kernel/msi.c | 25 - arch/sw_64/kernel/pci-noop.c | 8 - arch/sw_64/kernel/pci-sysfs.c | 3 - arch/sw_64/kernel/pci.c | 102 +- arch/sw_64/kernel/pci_common.c | 285 +- arch/sw_64/kernel/pci_impl.h | 49 - arch/sw_64/kernel/perf_event.c | 12 - arch/sw_64/kernel/perf_regs.c | 4 - arch/sw_64/kernel/platform.c | 20 + arch/sw_64/kernel/process.c | 26 - arch/sw_64/kernel/ptrace.c | 132 +- arch/sw_64/kernel/relocate.c | 13 +- arch/sw_64/kernel/segvdbg.c | 4 +- arch/sw_64/kernel/setup.c | 124 +- arch/sw_64/kernel/signal.c | 74 +- arch/sw_64/kernel/smp.c | 25 +- arch/sw_64/kernel/stacktrace.c | 1 - arch/sw_64/kernel/suspend.c | 22 +- arch/sw_64/kernel/syscalls/syscall.tbl | 28 +- arch/sw_64/kernel/tc.c | 3 - arch/sw_64/kernel/time.c | 31 +- arch/sw_64/kernel/timer.c | 21 +- arch/sw_64/kernel/topology.c | 19 - arch/sw_64/kernel/traps.c | 95 +- arch/sw_64/kernel/unaligned.c | 3 - arch/sw_64/kernel/uprobes.c | 5 - arch/sw_64/kernel/vdso.c | 9 - arch/sw_64/kernel/vdso/so2s.sh | 3 +- arch/sw_64/kernel/vdso/vdso.S | 2 - arch/sw_64/kernel/vdso/vdso.lds.S | 2 +- arch/sw_64/kernel/vdso/vgettimeofday.c | 33 +- arch/sw_64/kernel/vdso/vrt_sigreturn.S | 40 + arch/sw_64/kvm/emulate.c | 2 + arch/sw_64/kvm/kvm-sw64.c | 39 +- arch/sw_64/kvm/vmem.c | 37 +- arch/sw_64/lib/checksum.c | 136 +- arch/sw_64/lib/csum_partial_copy.c | 310 +- arch/sw_64/lib/deep-memcpy.S | 449 ++- arch/sw_64/lib/deep-memset.S | 27 +- arch/sw_64/lib/fls.c | 1 - arch/sw_64/lib/iomap.c | 4 +- arch/sw_64/lib/udelay.c | 5 - arch/sw_64/math-emu/math.c | 10 +- arch/sw_64/mm/fault.c | 21 +- arch/sw_64/mm/hugetlbpage.c | 7 +- arch/sw_64/mm/init.c | 48 +- arch/sw_64/mm/numa.c | 30 +- arch/sw_64/mm/physaddr.c | 1 - arch/sw_64/mm/thp.c | 9 - drivers/cpufreq/Makefile | 1 + drivers/cpufreq/sw64_cpufreq.c | 186 + drivers/gpu/drm/radeon/radeon_uvd.c | 5 + drivers/hwmon/Kconfig | 9 + drivers/hwmon/Makefile | 1 + drivers/hwmon/sw64_pvt.c | 222 ++ drivers/iommu/sw64/sunway_iommu.c | 58 +- drivers/iommu/sw64/sunway_iommu.h | 2 +- drivers/rtc/rtc-sw64-virt.c | 24 +- 154 files changed, 7026 insertions(+), 2337 deletions(-) create mode 100644 arch/sw_64/configs/openeuler_defconfig delete mode 100644 arch/sw_64/defconfig delete mode 100644 arch/sw_64/include/asm/a.out-core.h delete mode 100644 arch/sw_64/include/asm/a.out.h create mode 100644 arch/sw_64/include/asm/clock.h delete mode 100644 arch/sw_64/include/asm/user.h delete mode 100644 arch/sw_64/include/uapi/asm/a.out.h create mode 100644 arch/sw_64/kernel/clock.c create mode 100644 arch/sw_64/kernel/cpuautoplug.c create mode 100644 arch/sw_64/kernel/platform.c create mode 100644 drivers/cpufreq/sw64_cpufreq.c create mode 100644 drivers/hwmon/sw64_pvt.c -- 2.17.1

1 11

[PATCH openEuler-5.10 01/43] rcu: Prevent expedited GP from enabling tick on offline CPU
by Zheng Zengkai 10 May '22

10 May '22

From: "Paul E. McKenney" <paulmck(a)kernel.org> mainline inclusion from mainline-v5.17-rc1 commit 147f04b14adde831eb4a0a1e378667429732f9e8 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I53ILL CVE: NA ------------------------------------------------------------------------- If an RCU expedited grace period starts just when a CPU is in the process of going offline, so that the outgoing CPU has completed its pass through stop-machine but has not yet completed its final dive into the idle loop, RCU will attempt to enable that CPU's scheduling-clock tick via a call to tick_dep_set_cpu(). For this to happen, that CPU has to have been online when the expedited grace period completed its CPU-selection phase. This is pointless: The outgoing CPU has interrupts disabled, so it cannot take a scheduling-clock tick anyway. In addition, the tick_dep_set_cpu() function's eventual call to irq_work_queue_on() will splat as follows: smpboot: CPU 1 is now offline WARNING: CPU: 6 PID: 124 at kernel/irq_work.c:95 +irq_work_queue_on+0x57/0x60 Modules linked in: CPU: 6 PID: 124 Comm: kworker/6:2 Not tainted 5.15.0-rc1+ #3 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS +rel-1.14.0-0-g155821a-rebuilt.opensuse.org 04/01/2014 Workqueue: rcu_gp wait_rcu_exp_gp RIP: 0010:irq_work_queue_on+0x57/0x60 Code: 8b 05 1d c7 ea 62 a9 00 00 f0 00 75 21 4c 89 ce 44 89 c7 e8 +9b 37 fa ff ba 01 00 00 00 89 d0 c3 4c 89 cf e8 3b ff ff ff eb ee <0f> 0b eb b7 +0f 0b eb db 90 48 c7 c0 98 2a 02 00 65 48 03 05 91 6f RSP: 0000:ffffb12cc038fe48 EFLAGS: 00010282 RAX: 0000000000000001 RBX: 0000000000005208 RCX: 0000000000000020 RDX: 0000000000000001 RSI: 0000000000000001 RDI: ffff9ad01f45a680 RBP: 000000000004c990 R08: 0000000000000001 R09: ffff9ad01f45a680 R10: ffffb12cc0317db0 R11: 0000000000000001 R12: 00000000fffecee8 R13: 0000000000000001 R14: 0000000000026980 R15: ffffffff9e53ae00 FS: 0000000000000000(0000) GS:ffff9ad01f580000(0000) +knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 000000000de0c000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: tick_nohz_dep_set_cpu+0x59/0x70 rcu_exp_wait_wake+0x54e/0x870 ? sync_rcu_exp_select_cpus+0x1fc/0x390 process_one_work+0x1ef/0x3c0 ? process_one_work+0x3c0/0x3c0 worker_thread+0x28/0x3c0 ? process_one_work+0x3c0/0x3c0 kthread+0x115/0x140 ? set_kthread_struct+0x40/0x40 ret_from_fork+0x22/0x30 ---[ end trace c5bf75eb6aa80bc6 ]--- This commit therefore avoids invoking tick_dep_set_cpu() on offlined CPUs to limit both futility and false-positive splats. Signed-off-by: Paul E. McKenney <paulmck(a)kernel.org> Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Cheng Jian <cj.chengjian(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- kernel/rcu/tree_exp.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h index 0dc16345e668..2bc4538e8a61 100644 --- a/kernel/rcu/tree_exp.h +++ b/kernel/rcu/tree_exp.h @@ -507,7 +507,10 @@ static void synchronize_rcu_expedited_wait(void) if (rdp->rcu_forced_tick_exp) continue; rdp->rcu_forced_tick_exp = true; - tick_dep_set_cpu(cpu, TICK_DEP_BIT_RCU_EXP); + preempt_disable(); + if (cpu_online(cpu)) + tick_dep_set_cpu(cpu, TICK_DEP_BIT_RCU_EXP); + preempt_enable(); } } j = READ_ONCE(jiffies_till_first_fqs); -- 2.20.1

1 42

[PATCH openEuler-5.10 00/21] Backport 5.10.97 LTS
by Zheng Zengkai 10 May '22

10 May '22

Backport 5.10.97 LTS patches from upstream. Conflicts already merged cgroup-v1: Require capabilities to set release_agent net: sched: fix use-after-free in tc_new_tfilter() context conflict psi: Fix uaf issue when psi trigger is destroyed while being polled Alex Elder (3): net: ipa: fix atomic update in ipa_endpoint_replenish() net: ipa: use a bitmap for endpoint replenish_enabled net: ipa: prevent concurrent replenish Dan Carpenter (1): fanotify: Fix stale file descriptor in copy_event_to_user() Eric Dumazet (3): rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink() af_packet: fix data-race in packet_setsockopt / packet_setsockopt tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data() Georgi Valkov (1): ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback Kevin Hilman (1): Revert "drivers: bus: simple-pm-bus: Add support for probing simple bus only devices" Lukas Wunner (1): PCI: pciehp: Fix infinite loop in IRQ handler upon power fault Maher Sanalla (1): net/mlx5: Use del_timer_sync in fw reset flow of halting poll Maor Dickman (2): net/mlx5e: Fix handling of wrong devices during bond netevent net/mlx5: E-Switch, Fix uninitialized variable modact Maxime Ripard (1): drm/vc4: hdmi: Make sure the device is powered with CEC Raju Rangoju (1): net: amd-xgbe: ensure to reset the tx_timer_active flag Sean Christopherson (1): KVM: x86: Forcibly leave nested virt when SMM state is toggled Shyam Sundar S K (1): net: amd-xgbe: Fix skb data length underflow Suren Baghdasaryan (1): psi: Fix uaf issue when psi trigger is destroyed while being polled Tianchen Ding (1): cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask() Tony Luck (2): x86/mce: Add Xeon Sapphire Rapids to list of CPUs that support PPIN x86/cpu: Add Xeon Icelake-D to list of CPUs that support PPIN Documentation/accounting/psi.rst | 3 +- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kernel/cpu/mce/intel.c | 2 + arch/x86/kvm/svm/nested.c | 10 ++- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/kvm/vmx/nested.c | 1 + arch/x86/kvm/x86.c | 2 + drivers/bus/simple-pm-bus.c | 39 +---------- drivers/gpu/drm/vc4/vc4_hdmi.c | 25 +++---- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 +++- .../ethernet/mellanox/mlx5/core/en/rep/bond.c | 32 ++++----- .../ethernet/mellanox/mlx5/core/fw_reset.c | 2 +- .../mellanox/mlx5/core/lib/fs_chains.c | 2 +- drivers/net/ipa/ipa_endpoint.c | 25 ++++--- drivers/net/ipa/ipa_endpoint.h | 15 ++++- drivers/net/usb/ipheth.c | 6 +- drivers/pci/hotplug/pciehp_hpc.c | 7 +- fs/notify/fanotify/fanotify_user.c | 6 +- include/linux/psi.h | 2 +- include/linux/psi_types.h | 3 - kernel/cgroup/cgroup.c | 11 +++- kernel/cgroup/cpuset.c | 3 +- kernel/sched/psi.c | 66 ++++++++----------- net/core/rtnetlink.c | 6 +- net/ipv4/tcp_input.c | 2 + net/packet/af_packet.c | 8 ++- 27 files changed, 153 insertions(+), 144 deletions(-) -- 2.20.1

1 21

[PATCH openEuler-5.10 00/92] Backport 5.10.96 LTS
by Zheng Zengkai 10 May '22

10 May '22

Backport 5.10.96 LTS patches from upstream. complicts: Already merged(6): udf: Restore i_lenAlloc when inode expansion fails NFSv4: Handle case where the lookup of a directory fails yam: fix a memory leak in yam_siocdevprivate() net: hns3: handle empty unknown interrupt for VF NFSv4: nfs_atomic_open() can race when looking up a non-regular file udf: Fix NULL ptr deref when converting from inline format Context conflict: arm64: errata: Fix exec handling in erratum 1418040 workaround defered (2) (cause symbol kabi changes): net: fix information leakage in /proc/net/ptype perf: Fix perf_event_read_local() time Alan Stern (2): usb-storage: Add unusual-devs entry for VL817 USB-SATA bridge USB: core: Fix hang in usb_kill_urb by adding memory barriers Amir Goldstein (2): fsnotify: fix fsnotify hooks in pseudo filesystems fsnotify: invalidate dcache before IN_DELETE event Ard Biesheuvel (1): efi: runtime: avoid EFIv2 runtime services on Apple x86 machines Athira Rajeev (1): powerpc/perf: Fix power_pmu_disable to call clear_pmi_irq_pending only if PMI is pending Badhri Jagan Sridharan (1): usb: typec: tcpm: Do not disconnect while receiving VBUS off Brian Gix (1): Bluetooth: refactor malicious adv data check Cameron Williams (1): tty: Add support for Brainboxes UC cards. Christophe Leroy (3): powerpc/32s: Allocate one 256k IBAT instead of two consecutives 128k IBATs powerpc/32s: Fix kasan_init_region() for KASAN powerpc/32: Fix boot failure with GCC latent entropy plugin D Scott Phillips (1): arm64: errata: Fix exec handling in erratum 1418040 workaround David Howells (1): rxrpc: Adjust retransmission backoff Dmitry V. Levin (1): usr/include/Makefile: add linux/nfc.h to the compile-test coverage Eric Dumazet (5): ipv4: avoid using shared IP generator for connected sockets ipv6: annotate accesses to fn->fn_sernum ipv4: raw: lock the socket in raw_bind() ipv4: tcp: send zero IPID in SYNACK messages ipv4: remove sparse error in ip_neigh_gw4() Florian Westphal (1): netfilter: conntrack: don't increment invalid counter on NF_REPEAT Frank Li (1): usb: xhci-plat: fix crash when suspend if remote wake enable Geert Uytterhoeven (1): mtd: rawnand: mpc5121: Remove unused variable in ads5121_select_chip() Greg Kroah-Hartman (1): PM: wakeup: simplify the output logic of pm_show_wakelocks() Guenter Roeck (4): hwmon: (lm90) Mark alert as broken for MAX6646/6647/6649 hwmon: (lm90) Mark alert as broken for MAX6680 hwmon: (lm90) Reduce maximum conversion rate for G781 hwmon: (lm90) Mark alert as broken for MAX6654 Guillaume Nault (1): Revert "ipv6: Honor all IPv6 PIO Valid Lifetime values" Ido Schimmel (1): ipv6_tunnel: Rate limit warning messages Ilya Leoshkevich (1): s390/module: fix loading modules with a lot of relocations Jakub Kicinski (1): ipv4: fix ip option filtering for locally generated fragments Jedrzej Jagielski (2): i40e: Increase delay to 1 s after global EMP reset i40e: Fix issue when maximum queues is exceeded Jeff Layton (2): ceph: properly put ceph_string reference after async create attempt ceph: set pool_ns in new inode layout for async creates Jianguo Wu (1): net-procfs: show net devices bound packet types Joe Damato (1): i40e: fix unsigned stat widths John Meneghini (1): scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put() Jon Hunter (1): usb: common: ulpi: Fix crash in ulpi_match() Joseph Qi (2): jbd2: export jbd2_journal_[grab|put]_journal_head ocfs2: fix a deadlock when commit trans José Expósito (2): drm/msm/dsi: invalid parameter check in msm_dsi_phy_enable drm/msm/dpu: invalid parameter check in dpu_setup_dspp_pcc Karen Sornek (1): i40e: Fix for failed to init adminq while VF reset Like Xu (1): KVM: x86: Update vCPU's runtime CPUID on write to MSR_IA32_XSS Linyu Yuan (1): usb: roles: fix include/linux/usb/role.h compile issue Lucas Stach (1): drm/etnaviv: relax submit size limits Marc Kleine-Budde (1): dt-bindings: can: tcan4x5x: fix mram-cfg RX FIFO config Marek Behún (2): net: sfp: ignore disabled SFP node phylib: fix potential use-after-free Mathieu Desnoyers (1): sched/membarrier: Fix membarrier-rseq fence command missing from query bitmask Matthias Kaehlcke (1): rpmsg: char: Fix race between the release of rpmsg_eptdev and cdev Miaoqian Lin (2): drm/msm/dsi: Fix missing put_device() call in dsi_get_phy drm/msm/hdmi: Fix missing put_device() call in msm_hdmi_get_phy Michael Kelley (1): video: hyperv_fb: Fix validation of screen resolution Mihai Carabas (1): efi/libstub: arm64: Fix image check alignment at entry Mohammad Athari Bin Ismail (1): net: stmmac: skip only stmmac_ptp_register when resume from suspend Naveen N. Rao (2): bpf: Guard against accessing NULL pt_regs in bpf_get_task_stack() powerpc64/bpf: Limit 'ldbrx' to processors compliant with ISA v2.06 Nikolay Aleksandrov (1): net: bridge: vlan: fix single net device option dumping OGAWA Hirofumi (1): block: Fix wrong offset in bio_truncate() Pablo Neira Ayuso (1): netfilter: nft_payload: do not update layer 4 checksum when mangling fragments Pavankumar Kondeti (1): usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS Randy Dunlap (1): kernel: delete repeated words in comments Robert Hancock (2): serial: 8250: of: Fix mapped region size when using reg-offset property net: phy: broadcom: hook up soft_reset for BCM54616S Sean Christopherson (1): Revert "KVM: SVM: avoid infinite loop on NPF from bad address" Sing-Han Chen (1): ucsi_ccg: Check DEV_INT bit only when starting CCG4 Stanimir Varbanov (1): media: venus: core: Drop second v4l2 device unregister Steffen Maier (1): scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices Subbaraya Sundeep (1): octeontx2-pf: Forward error codes to VF Sujit Kautkar (1): rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev Sukadev Bhattiprolu (2): ibmvnic: init ->running_cap_crqs early ibmvnic: don't spin in tasklet Sylwester Dziedziuch (1): i40e: Fix queues reservation for XDP Tim Yi (1): net: bridge: vlan: fix memory leak in __allowed_ingress Toke Høiland-Jørgensen (1): net: cpsw: Properly initialise struct page_pool_params Tom Zanussi (1): tracing: Don't inc err_log entry count if entry allocation fails Trond Myklebust (2): NFS: Ensure the server has an up to date ctime before hardlinking NFS: Ensure the server has an up to date ctime before renaming Valentin Caron (1): serial: stm32: fix software flow control transfer Vasily Gorbik (1): s390/hypfs: include z/VM guests with access control group set Vincent Guittot (1): sched/pelt: Relax the sync of util_sum with util_avg Xianting Tian (1): drm/msm: Fix wrong size calculation Xiaoke Wang (1): tracing/histogram: Fix a potential memory leak for kstrdup() Xin Long (1): ping: fix the sk_bound_dev_if match in ping_lookup Yajun Deng (2): net: ipv4: Move ip_options_fragment() out of loop net: ipv4: Fix the warning for dereference Yazen Ghannam (1): x86/MCE/AMD: Allow thresholding interface updates after init Zhengjun Xing (1): perf/x86/intel/uncore: Fix CAS_COUNT_WRITE issue for ICX daniel.starke(a)siemens.com (1): tty: n_gsm: fix SW flow control encoding/handling .../devicetree/bindings/net/can/tcan4x5x.txt | 2 +- arch/arm64/kernel/process.c | 39 +++--- arch/powerpc/include/asm/book3s/32/mmu-hash.h | 2 + arch/powerpc/include/asm/ppc-opcode.h | 1 + arch/powerpc/kernel/Makefile | 1 + arch/powerpc/lib/Makefile | 3 + arch/powerpc/mm/book3s32/mmu.c | 15 ++- arch/powerpc/mm/kasan/book3s_32.c | 59 ++++----- arch/powerpc/net/bpf_jit_comp64.c | 22 ++-- arch/powerpc/perf/core-book3s.c | 17 ++- arch/s390/hypfs/hypfs_vm.c | 6 +- arch/s390/kernel/module.c | 37 +++--- arch/x86/events/intel/uncore_snbep.c | 2 +- arch/x86/kernel/cpu/mce/amd.c | 2 +- arch/x86/kvm/svm/svm.c | 7 -- arch/x86/kvm/x86.c | 1 + block/bio.c | 3 +- drivers/firmware/efi/efi.c | 7 ++ drivers/firmware/efi/libstub/arm64-stub.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 11 +- drivers/gpu/drm/msm/dsi/dsi.c | 7 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 +- drivers/gpu/drm/msm/hdmi/hdmi.c | 7 +- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/hwmon/lm90.c | 7 +- drivers/media/platform/qcom/venus/core.c | 2 - drivers/mtd/nand/raw/mpc5121_nfc.c | 1 - drivers/net/ethernet/ibm/ibmvnic.c | 112 +++++++++++------- drivers/net/ethernet/intel/i40e/i40e.h | 9 +- .../net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 44 ++++--- .../net/ethernet/intel/i40e/i40e_register.h | 3 + .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 103 +++++++++++++++- .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 7 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 20 ++-- drivers/net/ethernet/ti/cpsw_priv.c | 2 +- drivers/net/phy/broadcom.c | 1 + drivers/net/phy/phy_device.c | 6 +- drivers/net/phy/sfp-bus.c | 5 + drivers/rpmsg/rpmsg_char.c | 22 +--- drivers/s390/scsi/zfcp_fc.c | 13 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 20 +--- drivers/tty/n_gsm.c | 4 +- drivers/tty/serial/8250/8250_of.c | 11 +- drivers/tty/serial/8250/8250_pci.c | 100 +++++++++++++++- drivers/tty/serial/stm32-usart.c | 2 +- drivers/usb/common/ulpi.c | 7 +- drivers/usb/core/hcd.c | 14 +++ drivers/usb/core/urb.c | 12 ++ drivers/usb/gadget/function/f_sourcesink.c | 1 + drivers/usb/host/xhci-plat.c | 3 + drivers/usb/storage/unusual_devs.h | 10 ++ drivers/usb/typec/tcpm/tcpm.c | 3 +- drivers/usb/typec/ucsi/ucsi_ccg.c | 2 +- drivers/video/fbdev/hyperv_fb.c | 16 +-- fs/btrfs/ioctl.c | 6 +- fs/ceph/file.c | 9 ++ fs/configfs/dir.c | 6 +- fs/devpts/inode.c | 2 +- fs/jbd2/journal.c | 2 + fs/namei.c | 10 +- fs/nfs/dir.c | 4 + fs/nfsd/nfsctl.c | 5 +- fs/ocfs2/suballoc.c | 25 ++-- include/linux/fsnotify.h | 48 +++++++- include/linux/usb/role.h | 6 + include/net/addrconf.h | 2 + include/net/ip.h | 21 ++-- include/net/ip6_fib.h | 2 +- include/net/route.h | 2 +- kernel/bpf/stackmap.c | 5 +- kernel/events/core.c | 8 +- kernel/events/uprobes.c | 2 +- kernel/locking/rtmutex.c | 4 +- kernel/locking/rwsem.c | 2 +- kernel/locking/semaphore.c | 2 +- kernel/power/wakelock.c | 11 +- kernel/sched/fair.c | 18 ++- kernel/sched/membarrier.c | 11 +- kernel/sched/pelt.h | 4 +- kernel/trace/trace.c | 3 +- kernel/trace/trace_events_hist.c | 1 + net/bluetooth/hci_event.c | 10 +- net/bridge/br_vlan.c | 9 +- net/core/net-procfs.c | 35 +++++- net/ipv4/ip_output.c | 41 ++++--- net/ipv4/ping.c | 3 +- net/ipv4/raw.c | 5 +- net/ipv6/addrconf.c | 27 +++-- net/ipv6/ip6_fib.c | 23 ++-- net/ipv6/ip6_tunnel.c | 8 +- net/ipv6/route.c | 2 +- net/netfilter/nf_conntrack_core.c | 8 +- net/netfilter/nft_payload.c | 3 + net/rxrpc/call_event.c | 8 +- net/rxrpc/output.c | 2 +- net/sunrpc/rpc_pipe.c | 4 +- usr/include/Makefile | 1 - virt/kvm/kvm_main.c | 1 - 101 files changed, 836 insertions(+), 407 deletions(-) -- 2.20.1

1 92