- Kernel - mailweb.openeuler.org

[PATCH openEuler-5.10 01/26] readahead: introduce FMODE_CTL_WILLNEED to read first 2MB of file
by Zheng Zengkai 23 May '22

23 May '22

From: Yufen Yu <yuyufen(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I53R0H CVE: NA backport: openEuler-22.03-LTS ------------------------------------------------- In some scenario, likely spark-sql, almost all meta file's size is less then 2MB and applications read these smaller files in random mode. That means, it may issue multiple times random io to rotate disk, which can cause performance degradation. To improve the small files random read, we try to read the first 2MB into pagecache on the first time of read. Then it can avoid multiple random io. In fact, applications can call fadvise system with POSIX_FADV_WILLNEED to achieve this goal. But, some apps may cannot easily do that. So, we provide a new file flag FMODE_CTL_WILLNEED. Signed-off-by: Yufen Yu <yuyufen(a)huawei.com> Reviewed-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Conflicts: include/linux/fs.h Value '0x40000000' has been used for flag FMODE_BUF_RASYNC. Signed-off-by: Zhihao Cheng <chengzhihao1(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- include/linux/fs.h | 7 +++++++ mm/readahead.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index db632747781a..dd023a3023b5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -183,6 +183,12 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, /* File supports async buffered reads */ #define FMODE_BUF_RASYNC ((__force fmode_t)0x40000000) +/* File mode control flag, expect random access pattern */ +#define FMODE_CTL_RANDOM ((__force fmode_t)0x1) + +/* File mode control flag, will try to read head of the file into pagecache */ +#define FMODE_CTL_WILLNEED ((__force fmode_t)0x2) + /* * Attribute flags. These should be or-ed together to figure out what * has been changed! @@ -947,6 +953,7 @@ struct file { atomic_long_t f_count; unsigned int f_flags; fmode_t f_mode; + fmode_t f_ctl_mode; struct mutex f_pos_lock; loff_t f_pos; struct fown_struct f_owner; diff --git a/mm/readahead.c b/mm/readahead.c index c5b0457415be..ed23d5dec123 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -26,6 +26,7 @@ #include "internal.h" +#define READAHEAD_FIRST_SIZE (2 * 1024 * 1024) /* * Initialise a struct file's readahead state. Assumes that the caller has * memset *ra to zero. @@ -549,10 +550,41 @@ static void ondemand_readahead(struct readahead_control *ractl, do_page_cache_ra(ractl, ra->size, ra->async_size); } +/* + * Try to read first @ra_size from head of the file. + */ +static bool page_cache_readahead_from_head(struct address_space *mapping, + struct file *filp, pgoff_t offset, + unsigned long req_size, + unsigned long ra_size) +{ + struct backing_dev_info *bdi = inode_to_bdi(mapping->host); + struct file_ra_state *ra = &filp->f_ra; + unsigned long size = min_t(unsigned long, ra_size, + file_inode(filp)->i_size); + unsigned long nrpages = (size + PAGE_SIZE - 1) / PAGE_SIZE; + unsigned long max_pages; + unsigned int offs = 0; + + /* Cannot read date over target size, back to normal way */ + if (offset + req_size > nrpages) + return false; + + max_pages = max_t(unsigned long, bdi->io_pages, ra->ra_pages); + max_pages = min(max_pages, nrpages); + while (offs < nrpages) { + force_page_cache_readahead(mapping, filp, offs, max_pages); + offs += max_pages; + } + return true; +} + void page_cache_sync_ra(struct readahead_control *ractl, struct file_ra_state *ra, unsigned long req_count) { - bool do_forced_ra = ractl->file && (ractl->file->f_mode & FMODE_RANDOM); + bool do_forced_ra = ractl->file && + ((ractl->file->f_mode & FMODE_RANDOM) || + (ractl->file->f_ctl_mode & FMODE_CTL_RANDOM)); /* * Even if read-ahead is disabled, issue this request as read-ahead @@ -567,6 +599,12 @@ void page_cache_sync_ra(struct readahead_control *ractl, do_forced_ra = true; } + /* 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, + ractl->_index, req_count, READAHEAD_FIRST_SIZE)) + return; + /* be dumb */ if (do_forced_ra) { force_page_cache_ra(ractl, ra, req_count); -- 2.20.1

1 25

[PATCH openEuler-5.10 000/113] Backport 5.10.102 LTS
by Zheng Zengkai 23 May '22

23 May '22

lockdep: Correct lock_classes index mapping i2c: brcmstb: fix support for DSL and CM variants copy_process(): Move fd_install() out of sighand->siglock critical section i2c: qcom-cci: don't put a device tree node before i2c_add_adapter() i2c: qcom-cci: don't delete an unregistered adapter dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size dmaengine: stm32-dmamux: Fix PM disable depth imbalance in stm32_dmamux_probe dmaengine: sh: rcar-dmac: Check for error num after setting mask net: sched: limit TC_ACT_REPEAT loops EDAC: Fix calculation of returned address and next offset in edac_align_ptr() scsi: lpfc: Fix pt2pt NVMe PRLI reject LOGO loop kconfig: fix failing to generate auto.conf net: macb: Align the dma and coherent dma masks net: usb: qmi_wwan: Add support for Dell DW5829e tracing: Fix tp_printk option related with tp_printk_stop_on_boot drm/rockchip: dw_hdmi: Do not leave clock enabled in error case xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create soc: aspeed: lpc-ctrl: Block error printing on probe defer cases ata: libata-core: Disable TRIM on M88V29 kconfig: let 'shell' return enough output for deep path names selftests: fixup build warnings in pidfd / clone3 tests pidfd: fix test failure due to stack overflow on some arches arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 arm64: dts: meson-g12: add ATF BL32 reserved-memory region arm64: dts: meson-gx: add ATF BL32 reserved-memory region netfilter: conntrack: don't refresh sctp entries in closed state irqchip/sifive-plic: Add missing thead,c900-plic match string phy: usb: Leave some clocks running during suspend ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of ARM: OMAP2+: hwmod: Add of_node_put() before break NFS: Don't set NFS_INO_INVALID_XATTR if there is no xattr cache KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW KVM: x86/pmu: Don't truncate the PerfEvtSeln MSR when creating a perf event KVM: x86/pmu: Refactoring find_arch_event() to pmc_perf_hw_id() Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status mtd: rawnand: qcom: Fix clock sequencing in qcom_nandc_probe() tty: n_tty: do not look ahead for EOL character past the end of the buffer NFS: Do not report writeback errors in nfs_getattr() block/wbt: fix negative inflight counter when remove scsi device ASoC: tas2770: Insert post reset delay KVM: SVM: Never reject emulation due to SMAP errata for !SEV guests mtd: rawnand: gpmi: don't leak PM reference in error path powerpc/lib/sstep: fix 'ptesync' build error ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range() ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw() ALSA: hda: Fix missing codec probe on Shenker Dock 15 ALSA: hda: Fix regression on forced probe mask option ALSA: hda/realtek: Fix deadlock by COEF mutex ALSA: hda/realtek: Add quirk for Legion Y9000X 2019 selftests/exec: Add non-regular to TEST_GEN_PROGS perf bpf: Defer freeing string after possible strlen() on it dpaa2-eth: Initialize mutex used in one step timestamping path libsubcmd: Fix use-after-free for realloc(..., 0) bonding: fix data-races around agg_select_timer net_sched: add __rcu annotation to netdev->qdisc drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit ping: fix the dif and sdif check in ping_lookup net: ieee802154: ca8210: Fix lifs/sifs periods net: dsa: lantiq_gswip: fix use after free in gswip_remove() net: dsa: lan9303: fix reset on probe ipv6: per-netns exclusive flowlabel checks netfilter: nft_synproxy: unregister hooks on init error path selftests: netfilter: fix exit value for nft_concat_range iwlwifi: pcie: gen2: fix locking when "HW not ready" iwlwifi: pcie: fix locking when "HW not ready" drm/i915/gvt: Make DRM_I915_GVT depend on X86 vsock: remove vsock from connected table when connect is interrupted by a signal drm/i915/opregion: check port number bounds for SWSCI display power state drm/radeon: Fix backlight control on iMac 12,1 iwlwifi: fix use-after-free kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled kbuild: lto: merge module sections random: wake up /dev/random writers after zap gcc-plugins/stackleak: Use noinstr in favor of notrace Revert "module, async: async_synchronize_full() on module init iff async is used" x86/Xen: streamline (and fix) PV CPU enumeration drm/amdgpu: fix logic inversion in check nvme-rdma: fix possible use-after-free in transport error_recovery work nvme-tcp: fix possible use-after-free in transport error_recovery work nvme: fix a possible use-after-free in controller reset during load scsi: pm8001: Fix use-after-free for aborted SSP/STP sas_task scsi: pm8001: Fix use-after-free for aborted TMF sas_task quota: make dquot_quota_sync return errors from ->sync_fs vfs: make freeze_super abort when sync_filesystem returns error selftests: skip mincore.check_file_mmap when fs lacks needed support selftests: openat2: Skip testcases that fail with EOPNOTSUPP selftests: openat2: Add missing dependency in Makefile selftests: openat2: Print also errno in failure messages selftests/zram: Adapt the situation that /dev/zram0 is being used selftests/zram01.sh: Fix compression ratio calculation selftests/zram: Skip max_comp_streams interface on newer kernel net: ieee802154: at86rf230: Stop leaking skb's kselftest: signal all child processes selftests: rtc: Increase test timeout so that all tests run platform/x86: ISST: Fix possible circular locking dependency detected platform/x86: touchscreen_dmi: Add info for the RWC NANOTE P8 AY07J 2-in-1 btrfs: send: in case of IO error log it parisc: Add ioread64_lo_hi() and iowrite64_lo_hi() PCI: hv: Fix NUMA node assignment when kernel boots with custom NUMA topology mm: don't try to NUMA-migrate COW pages that have other uses mmc: block: fix read single on recovery logic parisc: Fix sglist access in ccio-dma.c parisc: Fix data TLB miss in sba_unmap_sg parisc: Drop __init from map_pages declaration serial: parisc: GSC: fix build when IOSAPIC is not set Revert "svm: Add warning message for AVIC IPI invalid target" HID:Add support for UGTABLET WP5540 scsi: lpfc: Fix mailbox command failure during driver initialization can: isotp: add SF_BROADCAST support for functional addressing can: isotp: prevent race between isotp_bind() and isotp_setsockopt() fs/proc: task_mmu.c: don't read mapcount for migration entry mm: memcg: synchronize objcg lists with a dedicated spinlock drm/nouveau/pmu/gm200-: use alternate falcon reset sequence already merged rcu: Do not report strict GPs for outgoing CPUs ax25: improve the incomplete fix to avoid UAF and NPD bugs bonding: force carrier update when releasing slave NFS: LOOKUP_DIRECTORY is also ok with symlinks lib/iov_iter: initialize "flags" in new pipe_buffer fget: clarify and improve __fget_files() implementation deferred (kabi changes) ipv6: per-netns exclusive flowlabel checks Total patches: 120 - 6 - 1 = 113 Al Cooper (1): phy: usb: Leave some clocks running during suspend Alexey Khoroshilov (1): net: dsa: lantiq_gswip: fix use after free in gswip_remove() Anders Roxell (1): powerpc/lib/sstep: fix 'ptesync' build error Andy Shevchenko (1): parisc: Add ioread64_lo_hi() and iowrite64_lo_hi() Arnaldo Carvalho de Melo (1): perf bpf: Defer freeing string after possible strlen() on it Axel Rasmussen (2): pidfd: fix test failure due to stack overflow on some arches selftests: fixup build warnings in pidfd / clone3 tests Ben Skeggs (1): drm/nouveau/pmu/gm200-: use alternate falcon reset sequence Brenda Streiff (1): kconfig: let 'shell' return enough output for deep path names Bryan O'Donoghue (1): mtd: rawnand: qcom: Fix clock sequencing in qcom_nandc_probe() Cheng Jui Wang (1): lockdep: Correct lock_classes index mapping Christian Eggers (1): mtd: rawnand: gpmi: don't leak PM reference in error path Christian Hewitt (3): arm64: dts: meson-gx: add ATF BL32 reserved-memory region arm64: dts: meson-g12: add ATF BL32 reserved-memory region arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 Christian König (1): drm/amdgpu: fix logic inversion in check Christian Löhle (1): mmc: block: fix read single on recovery logic Cristian Marussi (4): selftests: openat2: Print also errno in failure messages selftests: openat2: Add missing dependency in Makefile selftests: openat2: Skip testcases that fail with EOPNOTSUPP selftests: skip mincore.check_file_mmap when fs lacks needed support Dan Aloni (1): xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create Darrick J. Wong (2): vfs: make freeze_super abort when sync_filesystem returns error quota: make dquot_quota_sync return errors from ->sync_fs Dāvis Mosāns (1): btrfs: send: in case of IO error log it Eliav Farber (1): EDAC: Fix calculation of returned address and next offset in edac_align_ptr() Eric Dumazet (4): drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit net_sched: add __rcu annotation to netdev->qdisc bonding: fix data-races around agg_select_timer net: sched: limit TC_ACT_REPEAT loops Florian Westphal (1): netfilter: conntrack: don't refresh sctp entries in closed state Guo Ren (1): irqchip/sifive-plic: Add missing thead,c900-plic match string Hangbin Liu (1): selftests: netfilter: fix exit value for nft_concat_range Igor Pylypiv (1): Revert "module, async: async_synchronize_full() on module init iff async is used" Jae Hyun Yoo (1): soc: aspeed: lpc-ctrl: Block error printing on probe defer cases JaeSang Yoo (1): tracing: Fix tp_printk option related with tp_printk_stop_on_boot James Smart (2): scsi: lpfc: Fix mailbox command failure during driver initialization scsi: lpfc: Fix pt2pt NVMe PRLI reject LOGO loop Jan Beulich (1): x86/Xen: streamline (and fix) PV CPU enumeration Jani Nikula (1): drm/i915/opregion: check port number bounds for SWSCI display power state Jason A. Donenfeld (1): random: wake up /dev/random writers after zap Jiasheng Jiang (2): dmaengine: sh: rcar-dmac: Check for error num after setting mask dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size Jim Mattson (2): KVM: x86/pmu: Don't truncate the PerfEvtSeln MSR when creating a perf event KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW Jing Leng (1): kconfig: fix failing to generate auto.conf Johannes Berg (3): iwlwifi: fix use-after-free iwlwifi: pcie: fix locking when "HW not ready" iwlwifi: pcie: gen2: fix locking when "HW not ready" John David Anglin (3): parisc: Drop __init from map_pages declaration parisc: Fix data TLB miss in sba_unmap_sg parisc: Fix sglist access in ccio-dma.c John Garry (2): scsi: pm8001: Fix use-after-free for aborted TMF sas_task scsi: pm8001: Fix use-after-free for aborted SSP/STP sas_task Kees Cook (2): gcc-plugins/stackleak: Use noinstr in favor of notrace libsubcmd: Fix use-after-free for realloc(..., 0) Laibin Qiu (1): block/wbt: fix negative inflight counter when remove scsi device Li Zhijian (1): kselftest: signal all child processes Like Xu (1): KVM: x86/pmu: Refactoring find_arch_event() to pmc_perf_hw_id() Linus Torvalds (2): mm: don't try to NUMA-migrate COW pages that have other uses tty: n_tty: do not look ahead for EOL character past the end of the buffer Long Li (1): PCI: hv: Fix NUMA node assignment when kernel boots with custom NUMA topology Mans Rullgard (1): net: dsa: lan9303: fix reset on probe Marc St-Amand (1): net: macb: Align the dma and coherent dma masks Mark Brown (2): ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw() ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range() Martin Povišer (1): ASoC: tas2770: Insert post reset delay Miaoqian Lin (2): Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj dmaengine: stm32-dmamux: Fix PM disable depth imbalance in stm32_dmamux_probe Miquel Raynal (2): net: ieee802154: at86rf230: Stop leaking skb's net: ieee802154: ca8210: Fix lifs/sifs periods Muhammad Usama Anjum (1): selftests/exec: Add non-regular to TEST_GEN_PROGS Nicholas Bishop (1): drm/radeon: Fix backlight control on iMac 12,1 Norbert Slusarek (1): can: isotp: prevent race between isotp_bind() and isotp_setsockopt() Nícolas F. R. A. Prado (1): selftests: rtc: Increase test timeout so that all tests run Oliver Hartkopp (1): can: isotp: add SF_BROADCAST support for functional addressing Pablo Neira Ayuso (1): netfilter: nft_synproxy: unregister hooks on init error path Radu Bulie (1): dpaa2-eth: Initialize mutex used in one step timestamping path Rafał Miłecki (1): i2c: brcmstb: fix support for DSL and CM variants Randy Dunlap (1): serial: parisc: GSC: fix build when IOSAPIC is not set Roman Gushchin (1): mm: memcg: synchronize objcg lists with a dedicated spinlock Sagi Grimberg (3): nvme: fix a possible use-after-free in controller reset during load nvme-tcp: fix possible use-after-free in transport error_recovery work nvme-rdma: fix possible use-after-free in transport error_recovery work Sami Tolvanen (1): kbuild: lto: merge module sections Sascha Hauer (1): drm/rockchip: dw_hdmi: Do not leave clock enabled in error case Sean Christopherson (3): Revert "svm: Add warning message for AVIC IPI invalid target" kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled KVM: SVM: Never reject emulation due to SMAP errata for !SEV guests Sergio Costas (1): HID:Add support for UGTABLET WP5540 Seth Forshee (1): vsock: remove vsock from connected table when connect is interrupted by a signal Siva Mullati (1): drm/i915/gvt: Make DRM_I915_GVT depend on X86 Slark Xiao (1): net: usb: qmi_wwan: Add support for Dell DW5829e Srinivas Pandruvada (1): platform/x86: ISST: Fix possible circular locking dependency detected Takashi Iwai (3): ALSA: hda/realtek: Fix deadlock by COEF mutex ALSA: hda: Fix regression on forced probe mask option ALSA: hda: Fix missing codec probe on Shenker Dock 15 Trond Myklebust (2): NFS: Do not report writeback errors in nfs_getattr() NFS: Don't set NFS_INO_INVALID_XATTR if there is no xattr cache Vladimir Zapolskiy (2): i2c: qcom-cci: don't delete an unregistered adapter i2c: qcom-cci: don't put a device tree node before i2c_add_adapter() Waiman Long (1): copy_process(): Move fd_install() out of sighand->siglock critical section Wan Jiabing (1): ARM: OMAP2+: hwmod: Add of_node_put() before break Xin Long (1): ping: fix the dif and sdif check in ping_lookup Yang Shi (1): fs/proc: task_mmu.c: don't read mapcount for migration entry Yang Xu (3): selftests/zram: Skip max_comp_streams interface on newer kernel selftests/zram01.sh: Fix compression ratio calculation selftests/zram: Adapt the situation that /dev/zram0 is being used Ye Guojin (1): ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of Yu Huang (1): ALSA: hda/realtek: Add quirk for Legion Y9000X 2019 Yuka Kawajiri (1): platform/x86: touchscreen_dmi: Add info for the RWC NANOTE P8 AY07J 2-in-1 Zoltán Böszörményi (1): ata: libata-core: Disable TRIM on M88V29 david regan (1): mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status arch/arm/mach-omap2/display.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 4 +- .../boot/dts/amlogic/meson-g12-common.dtsi | 6 + .../boot/dts/amlogic/meson-g12a-sei510.dts | 8 -- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 + .../boot/dts/amlogic/meson-sm1-sei610.dts | 8 -- arch/parisc/lib/iomap.c | 18 +++ arch/parisc/mm/init.c | 9 +- arch/powerpc/lib/sstep.c | 2 + arch/x86/kvm/pmu.c | 15 +- arch/x86/kvm/pmu.h | 3 +- arch/x86/kvm/svm/avic.c | 2 - arch/x86/kvm/svm/pmu.c | 8 +- arch/x86/kvm/svm/svm.c | 7 +- arch/x86/kvm/vmx/pmu_intel.c | 9 +- arch/x86/xen/enlighten_pv.c | 4 - arch/x86/xen/smp_pv.c | 26 +--- block/bfq-iosched.c | 2 + drivers/ata/libata-core.c | 1 + drivers/char/random.c | 5 +- drivers/dma/sh/rcar-dmac.c | 9 +- drivers/dma/stm32-dmamux.c | 4 +- drivers/edac/edac_mc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/i915/Kconfig | 1 + drivers/gpu/drm/i915/display/intel_opregion.c | 15 ++ drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 8 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c | 31 +++- .../gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 2 + drivers/gpu/drm/radeon/atombios_encoders.c | 3 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hv/vmbus_drv.c | 5 +- drivers/i2c/busses/i2c-brcmstb.c | 2 +- drivers/i2c/busses/i2c-qcom-cci.c | 16 ++- drivers/irqchip/irq-sifive-plic.c | 1 + drivers/mmc/core/block.c | 28 ++-- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 +- drivers/mtd/nand/raw/qcom_nandc.c | 14 +- drivers/net/bonding/bond_3ad.c | 30 +++- drivers/net/dsa/lan9303-core.c | 2 +- drivers/net/dsa/lantiq_gswip.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 2 +- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- drivers/net/ieee802154/at86rf230.c | 13 +- drivers/net/ieee802154/ca8210.c | 4 +- drivers/net/usb/qmi_wwan.c | 2 + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 + .../wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 +- .../net/wireless/intel/iwlwifi/pcie/trans.c | 3 +- drivers/nvme/host/core.c | 9 +- drivers/nvme/host/rdma.c | 1 + drivers/nvme/host/tcp.c | 1 + drivers/parisc/ccio-dma.c | 3 +- drivers/parisc/sba_iommu.c | 3 +- drivers/pci/controller/pci-hyperv.c | 13 +- drivers/phy/broadcom/phy-brcm-usb.c | 38 +++++ .../intel_speed_select_if/isst_if_common.c | 97 ++++++++----- drivers/platform/x86/touchscreen_dmi.c | 24 ++++ drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_attr.c | 3 + drivers/scsi/lpfc/lpfc_els.c | 20 ++- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +- drivers/scsi/lpfc/lpfc_sli.c | 15 +- drivers/scsi/pm8001/pm8001_sas.c | 5 + drivers/scsi/pm8001/pm80xx_hwi.c | 4 +- drivers/soc/aspeed/aspeed-lpc-ctrl.c | 7 +- drivers/tty/n_tty.c | 6 +- drivers/tty/serial/8250/8250_gsc.c | 2 +- fs/btrfs/send.c | 4 + fs/nfs/inode.c | 23 ++- fs/proc/task_mmu.c | 43 ++++-- fs/quota/dquot.c | 11 +- fs/super.c | 19 ++- include/linux/memcontrol.h | 5 +- include/linux/netdevice.h | 2 +- include/linux/sched.h | 1 - include/net/bond_3ad.h | 2 +- include/uapi/linux/can/isotp.h | 2 +- kernel/async.c | 3 - kernel/fork.c | 7 +- kernel/locking/lockdep.c | 4 +- kernel/module.c | 25 +--- kernel/stackleak.c | 5 +- kernel/trace/trace.c | 4 + mm/memcontrol.c | 10 +- mm/mprotect.c | 2 +- net/can/isotp.c | 71 +++++++--- net/core/drop_monitor.c | 11 +- net/core/rtnetlink.c | 6 +- net/ipv4/ping.c | 11 +- net/netfilter/nf_conntrack_proto_sctp.c | 9 ++ net/netfilter/nft_synproxy.c | 4 +- net/sched/act_api.c | 13 +- net/sched/cls_api.c | 6 +- net/sched/sch_api.c | 22 +-- net/sched/sch_generic.c | 29 ++-- net/sunrpc/xprtrdma/verbs.c | 3 + net/vmw_vsock/af_vsock.c | 1 + scripts/kconfig/confdata.c | 13 +- scripts/kconfig/preprocess.c | 2 +- scripts/module.lds.S | 26 ++++ sound/pci/hda/hda_intel.c | 5 +- sound/pci/hda/patch_realtek.c | 40 ++++-- sound/soc/codecs/tas2770.c | 7 +- sound/soc/soc-ops.c | 29 ++-- tools/lib/subcmd/subcmd-util.h | 11 +- tools/perf/util/bpf-loader.c | 3 +- tools/testing/selftests/clone3/clone3.c | 2 - tools/testing/selftests/exec/Makefile | 4 +- tools/testing/selftests/kselftest_harness.h | 4 +- .../selftests/mincore/mincore_selftest.c | 20 ++- .../selftests/netfilter/nft_concat_range.sh | 2 +- tools/testing/selftests/openat2/Makefile | 2 +- tools/testing/selftests/openat2/helpers.h | 12 +- .../testing/selftests/openat2/openat2_test.c | 12 +- tools/testing/selftests/pidfd/pidfd.h | 13 +- .../selftests/pidfd/pidfd_fdinfo_test.c | 22 ++- tools/testing/selftests/pidfd/pidfd_test.c | 6 +- tools/testing/selftests/pidfd/pidfd_wait.c | 5 +- tools/testing/selftests/rtc/settings | 2 +- tools/testing/selftests/zram/zram.sh | 15 +- tools/testing/selftests/zram/zram01.sh | 33 ++--- tools/testing/selftests/zram/zram02.sh | 1 - tools/testing/selftests/zram/zram_lib.sh | 134 ++++++++++++------ 130 files changed, 941 insertions(+), 479 deletions(-) -- 2.20.1

1 113

[PATCH openEuler-5.10 01/39] skmsg: Lock ingress_skb when purging
by Zheng Zengkai 21 May '22

21 May '22

From: Wang Yufen <wangyufen(a)huawei.com> mainline inclusion from mainline-v5.13-rc1 commit 37f0e514db660f03f8982b8f4fbbd4b2740abe7d category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I545NW Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Currently we purge the ingress_skb queue only when psock refcnt goes down to 0, so locking the queue is not necessary, but in order to be called during ->close, we have to lock it here. Signed-off-by: Cong Wang <cong.wang(a)bytedance.com> Signed-off-by: Alexei Starovoitov <ast(a)kernel.org> Acked-by: Jakub Sitnicki <jakub(a)cloudflare.com> Acked-by: John Fastabend <john.fastabend(a)gmail.com> Link: https://lore.kernel.org/bpf/20210331023237.41094-2-xiyou.wangcong@gmail.com Signed-off-by: Wang Yufen <wangyufen(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Reviewed-by: Liu Jian <liujian56(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- net/core/skmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 4ee4fe436847..f80428cc7264 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -638,7 +638,7 @@ void __sk_psock_purge_ingress_msg(struct sk_psock *psock) static void sk_psock_zap_ingress(struct sk_psock *psock) { - __skb_queue_purge(&psock->ingress_skb); + skb_queue_purge(&psock->ingress_skb); __sk_psock_purge_ingress_msg(psock); } -- 2.20.1

1 38

[PATCH OLK-5.10 00/90] sw64: Backport sw64 enhancement and bugfix
by Zheng Zengkai 20 May '22

20 May '22

Backport sw64 enhancement and bugfix patches. 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.20.1

1 90

[PATCH v1 OLK-5.10 00/90] sw64: merge patches
by Zheng Zengkai 20 May '22

20 May '22

From: Gu Zitao <guzitao(a)wxiat.com> 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 90

[PATCH openEuler-5.10 1/4] perf: hisi: Make irq shared
by Zheng Zengkai 19 May '22

19 May '22

From: Chen Jun <chenjun102(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I584X2 CVE: NA -------------------------------- On some platforms, there are some error: genirq: Flags mismatch irq 23. 00010804 (xxx) vs. 00010804 (xxx) The reason is that there are more than one pmu nodes witch uses the same irq number. Add IROF_SHARED when devm_request_irq Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Reviewed-by: Weilong Chen <chenweilong(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/perf/hisilicon/hisi_uncore_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c index 07f0c7015181..d31a497020c2 100644 --- a/drivers/perf/hisilicon/hisi_uncore_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c @@ -168,7 +168,7 @@ int hisi_uncore_pmu_init_irq(struct hisi_pmu *hisi_pmu, return irq; ret = devm_request_irq(&pdev->dev, irq, hisi_uncore_pmu_isr, - IRQF_NOBALANCING | IRQF_NO_THREAD, + IRQF_NOBALANCING | IRQF_NO_THREAD | IRQF_SHARED, dev_name(&pdev->dev), hisi_pmu); if (ret < 0) { dev_err(&pdev->dev, -- 2.20.1

1 3

[PATCH OLK-5.10] eulerfs: fix bitmap minimum size calculation error
by Gou Hao 19 May '22

19 May '22

uniontech inclusion category: bugfix bugzilla: NA CVE: NA ---------- If it can't be divided, minimum_size need to add another byte. Signed-off-by: Gou Hao <gouhao(a)uniontech.com> --- fs/eulerfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/eulerfs/super.c b/fs/eulerfs/super.c index 43fc717002d7..20c7fe845b6c 100644 --- a/fs/eulerfs/super.c +++ b/fs/eulerfs/super.c @@ -216,7 +216,7 @@ static bool eufs_check_size(struct super_block *sb, unsigned long size) /* For Super Block */ minimum_size = 2 << sb->s_blocksize_bits; /* For Bitmaps */ - minimum_size += size / EUFS_BLOCK_SIZE / 8; + minimum_size += DIV_ROUND_UP(size / EUFS_BLOCK_SIZE, 8); if (size < minimum_size) return false; -- 2.20.1

1 0

[PATCH] eulerfs: fix bitmap minimum size calculation error
by Gou Hao 19 May '22

19 May '22

uniontech inclusion category: bugfix bugzilla: NA CVE: NA ---------- If it can't be divided, minimum_size need to add another byte. Signed-off-by: Gou Hao <gouhao(a)uniontech.com> --- fs/eulerfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/eulerfs/super.c b/fs/eulerfs/super.c index 43fc717002d7..20c7fe845b6c 100644 --- a/fs/eulerfs/super.c +++ b/fs/eulerfs/super.c @@ -216,7 +216,7 @@ static bool eufs_check_size(struct super_block *sb, unsigned long size) /* For Super Block */ minimum_size = 2 << sb->s_blocksize_bits; /* For Bitmaps */ - minimum_size += size / EUFS_BLOCK_SIZE / 8; + minimum_size += DIV_ROUND_UP(size / EUFS_BLOCK_SIZE, 8); if (size < minimum_size) return false; -- 2.20.1

1 0

[PATCH OLK-5.10] config: add SENSORS_ZHAOXIN_CPUTEMP for Zhaoxin CPUs
by LeoLiuoc 18 May '22

18 May '22

Set CONFIG_SENSORS_ZHAOXIN_CPUTEMP to 'm' by default in openeuler_configs Signed-off-by: LeoLiuoc <LeoLiu-oc(a)zhaoxin.com> --- arch/x86/configs/openeuler_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 61c4be815462..4e3692e24b65 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -4052,6 +4052,7 @@ CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m # CONFIG_SENSORS_TMP513 is not set CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_ZHAOXIN_CPUTEMP=m CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m -- 2.20.1

1 0

[PATCH openEuler-5.10 1/2] net/x25: Fix null-ptr-deref caused by x25_disconnect
by Zheng Zengkai 18 May '22

18 May '22

From: Duoming Zhou <duoming(a)zju.edu.cn> stable inclusion from stable-v5.10.110 commit 5c94b6205e87411dbe9dc1ca088eb36b8837fb47 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5661B CVE: CVE-2022-1516 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 7781607938c8371d4c2b243527430241c62e39c2 ] When the link layer is terminating, x25->neighbour will be set to NULL in x25_disconnect(). As a result, it could cause null-ptr-deref bugs in x25_sendmsg(),x25_recvmsg() and x25_connect(). One of the bugs is shown below. (Thread 1) | (Thread 2) x25_link_terminated() | x25_recvmsg() x25_kill_by_neigh() | ... x25_disconnect() | lock_sock(sk) ... | ... x25->neighbour = NULL //(1) | ... | x25->neighbour->extended //(2) The code sets NULL to x25->neighbour in position (1) and dereferences x25->neighbour in position (2), which could cause null-ptr-deref bug. This patch adds lock_sock() in x25_kill_by_neigh() in order to synchronize with x25_sendmsg(), x25_recvmsg() and x25_connect(). What`s more, the sock held by lock_sock() is not NULL, because it is extracted from x25_list and uses x25_list_lock to synchronize. Fixes: 4becb7ee5b3d ("net/x25: Fix x25_neigh refcnt leak when x25 disconnect") Signed-off-by: Duoming Zhou <duoming(a)zju.edu.cn> Reviewed-by: Lin Ma <linma(a)zju.edu.cn> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Baisong Zhong <zhongbaisong(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- net/x25/af_x25.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 03ed170b8125..d231d4620c38 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1775,10 +1775,15 @@ void x25_kill_by_neigh(struct x25_neigh *nb) write_lock_bh(&x25_list_lock); - sk_for_each(s, &x25_list) - if (x25_sk(s)->neighbour == nb) + sk_for_each(s, &x25_list) { + if (x25_sk(s)->neighbour == nb) { + write_unlock_bh(&x25_list_lock); + lock_sock(s); x25_disconnect(s, ENETUNREACH, 0, 0); - + release_sock(s); + write_lock_bh(&x25_list_lock); + } + } write_unlock_bh(&x25_list_lock); /* Remove any related forwards */ -- 2.20.1

1 1

2024

2023

2022

2021

2020

2019

Kernel