- Kernel - mailweb.openeuler.org

[PATCH openEuler-5.10 00/27] Backport LTS 5.10.63
by Zheng Zengkai 19 Oct '21

19 Oct '21

Backport LTS 5.10.63 patches from upstream. Al Viro (1): new helper: inode_wrong_type() Amir Goldstein (1): fuse: fix illegal access to inode with reused nodeid Andy Shevchenko (1): spi: Switch to signed types for *_native_cs SPI controller fields Christoph Hellwig (1): cryptoloop: add a deprecation warning Eric Biggers (4): fscrypt: add fscrypt_symlink_getattr() for computing st_size ext4: report correct st_size for encrypted symlinks f2fs: report correct st_size for encrypted symlinks ubifs: report correct st_size for encrypted symlinks Greg Kroah-Hartman (3): Revert "ucounts: Increase ucounts reference counter before the security hook" Revert "cred: add missing return error code when set_cred_ucounts() failed" Revert "Add a reference to ucounts for each cred" Harini Katakam (1): net: macb: Add a NULL check on desc_ptp Johnathon Clark (1): ALSA: hda/realtek: Quirk for HP Spectre x360 14 amp setup Kim Phillips (2): perf/x86/amd/ibs: Work around erratum #1197 perf/x86/amd/power: Assign pmu.module Krzysztof Hałasa (1): gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats Maciej Falkowski (1): ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power Matthieu Baerts (1): static_call: Fix unused variable warn w/o MODULE Pavel Skripkin (1): media: stkwebcam: fix memory leak in stk_camera_probe Randy Dunlap (1): xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG Sai Krishna Potthuri (1): reset: reset-zynqmp: Fixed the argument data type Shai Malin (2): qed: Fix the VF msix vectors flow qede: Fix memset corruption Takashi Iwai (1): ALSA: hda/realtek: Workaround for conflicting SSID on ASUS ROG Strix G17 Tuo Li (1): ceph: fix possible null-pointer dereference in ceph_mdsmap_decode() Xiaoyao Li (1): perf/x86/intel/pt: Fix mask of num_address_ranges Zubin Mithra (1): ALSA: pcm: fix divide error in snd_pcm_lib_ioctl arch/arm/mach-omap1/board-ams-delta.c | 14 ------- arch/x86/events/amd/ibs.c | 8 ++++ arch/x86/events/amd/power.c | 1 + arch/x86/events/intel/pt.c | 2 +- arch/xtensa/Kconfig | 2 +- drivers/block/Kconfig | 4 +- drivers/block/cryptoloop.c | 2 + drivers/gpu/ipu-v3/ipu-cpmem.c | 30 ++++++------- drivers/media/usb/stkwebcam/stk-webcam.c | 6 ++- drivers/net/ethernet/cadence/macb_ptp.c | 11 ++++- drivers/net/ethernet/qlogic/qed/qed_main.c | 7 +++- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/reset/reset-zynqmp.c | 3 +- fs/9p/vfs_inode.c | 4 +- fs/9p/vfs_inode_dotl.c | 4 +- fs/ceph/mdsmap.c | 8 ++-- fs/cifs/inode.c | 5 +-- fs/crypto/hooks.c | 44 ++++++++++++++++++++ fs/exec.c | 4 -- fs/ext4/symlink.c | 11 ++++- fs/f2fs/namei.c | 11 ++++- fs/fuse/dir.c | 6 +-- fs/fuse/fuse_i.h | 7 ++++ fs/fuse/inode.c | 4 +- fs/fuse/readdir.c | 7 +++- fs/nfs/inode.c | 6 +-- fs/nfsd/nfsproc.c | 2 +- fs/overlayfs/namei.c | 4 +- fs/ubifs/file.c | 12 +++++- include/linux/cred.h | 2 - include/linux/fs.h | 5 +++ include/linux/fscrypt.h | 7 ++++ include/linux/spi/spi.h | 4 +- include/linux/user_namespace.h | 4 -- kernel/cred.c | 41 ------------------ kernel/fork.c | 6 --- kernel/static_call.c | 4 +- kernel/sys.c | 12 ------ kernel/ucount.c | 40 ++---------------- kernel/user_namespace.c | 3 -- sound/core/pcm_lib.c | 2 +- sound/pci/hda/patch_realtek.c | 11 +++++ 42 files changed, 193 insertions(+), 179 deletions(-) -- 2.20.1

1 27

[PATCH openEuler-5.10 00/89] Backport LTS 5.10.62
by Zheng Zengkai 19 Oct '21

19 Oct '21

Backport LTS 5.10.62 patches from upstream. Aaron Ma (1): igc: fix page fault when thunderbolt is unplugged Adam Ford (1): clk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer dereference Alexey Gladkov (1): ucounts: Increase ucounts reference counter before the security hook Andrey Ignatov (1): rtnetlink: Return correct error on changing device netns Ben Skeggs (2): drm/nouveau/disp: power down unused DP links during init drm/nouveau/kms/nv50: workaround EFI GOP window channel format differences Benjamin Berg (2): usb: typec: ucsi: acpi: Always decode connector change information usb: typec: ucsi: Work around PPM losing change information Bjorn Andersson (1): usb: typec: ucsi: Clear pending after acking connector change Christophe JAILLET (1): xgene-v2: Fix a resource leak in the error handling path of 'xge_probe()' Colin Ian King (1): perf/x86/intel/uncore: Fix integer overflow on 23 bit left shift of a u32 DENG Qingfang (1): net: dsa: mt7530: fix VLAN traffic leaks again Daniel Borkmann (1): bpf: Fix ringbuf helper function compatibility Davide Caratti (1): net/sched: ets: fix crash when flipping from 'strict' to 'quantum' Denis Efremov (1): Revert "floppy: reintroduce O_NDELAY fix" Derek Fang (1): ASoC: rt5682: Adjust headset volume button threshold Dinghao Liu (1): RDMA/bnxt_re: Remove unpaired rtnl unlock in bnxt_re_dev_init() Eric Dumazet (2): ipv6: use siphash in rt6_exception_hash() ipv4: use siphash instead of Jenkins in fnhe_hashfun() Filipe Manana (1): btrfs: fix race between marking inode needs to be logged and log syncing Florian Westphal (1): netfilter: conntrack: collect all entries in one cycle Frieder Schrempf (1): mtd: spinand: Fix incorrect parameters for on-die ECC Gal Pressman (1): RDMA/efa: Free IRQ vectors on error flow Gerd Rausch (1): net/rds: dma_map_sg is entitled to merge entries Guenter Roeck (1): ARC: Fix CONFIG_STACKDEPOT Guo Ren (2): riscv: Fixup wrong ftrace remove cflag riscv: Fixup patch_text panic in ftrace Helge Deller (1): Revert "parisc: Add assembly implementations for memset, strlen, strcpy, strncpy and strcat" Jacob Keller (1): ice: do not abort devlink info if board identifier can't be found Jerome Brunet (1): usb: gadget: u_audio: fix race condition on endpoint stop Johan Hovold (1): Revert "USB: serial: ch341: fix character loss at high transfer rates" Johannes Berg (1): iwlwifi: pnvm: accept multiple HW-type TLVs Kees Cook (1): lkdtm: Enable DOUBLE_FAULT on all architectures Kenneth Feng (2): Revert "drm/amd/pm: fix workload mismatch on vega10" drm/amd/pm: change the workload type for some cards Li Jinlin (1): scsi: core: Fix hang of freezing queue between blocking and running device Linus Torvalds (2): pipe: avoid unnecessary EPOLLET wakeups under normal loads pipe: do FASYNC notifications for every pipe IO, not just state changes Mark Brown (2): ASoC: component: Remove misplaced prefix handling in pin control functions net: mscc: Fix non-GPL export of regmap APIs Mark Yacoub (1): drm: Copy drm_wait_vblank to user before returning Mathieu Desnoyers (1): tracepoint: Use rcu get state and cond sync for static call updates Matthew Brost (1): drm/i915: Fix syncmap memory leak Maxim Kiselev (1): net: marvell: fix MVNETA_TX_IN_PRGRS bit number Michael S. Tsirkin (1): tools/virtio: fix build Michał Mirosław (1): opp: remove WARN when no valid OPPs remain Michel Dänzer (1): drm/amdgpu: Cancel delayed work when GFXOFF is disabled Miklos Szeredi (1): ovl: fix uninitialized pointer read in ovl_lookup_real_one() Ming Lei (2): blk-iocost: fix lockdep warning on blkcg->lock blk-mq: don't grab rq's refcount in blk_mq_check_expired() Naresh Kumar PBS (1): RDMA/bnxt_re: Add missing spin lock initialization Neeraj Upadhyay (1): vringh: Use wiov->used to check for read/write desc order Parav Pandit (2): virtio: Improve vq->broken access to avoid any compiler optimization virtio_pci: Support surprise removal of virtio pci device Paul E. McKenney (5): srcu: Provide internal interface to start a Tree SRCU grace period srcu: Provide polling interfaces for Tree SRCU grace periods srcu: Provide internal interface to start a Tiny SRCU grace period srcu: Make Tiny SRCU use multi-bit grace-period counter srcu: Provide polling interfaces for Tiny SRCU grace periods Pauli Virtanen (1): Bluetooth: btusb: check conditions before enabling USB ALT 3 for WBS Peter Collingbourne (1): net: don't unconditionally copy_from_user a struct ifreq for socket ioctls Petko Manolov (1): net: usb: pegasus: fixes of set_register(s) return value evaluation; Petr Vorel (1): arm64: dts: qcom: msm8994-angler: Fix gpio-reserved-ranges 85-88 Qu Wenruo (1): Revert "btrfs: compression: don't try to compress if we don't have enough pages" Rahul Lakkireddy (1): cxgb4: dont touch blocked freelist bitmap after free Richard Guy Briggs (1): audit: move put_tree() to avoid trim_trees refcount underflow and UAF Rob Herring (1): dt-bindings: sifive-l2-cache: Fix 'select' matching Sasha Neftin (2): e1000e: Fix the max snoop/no-snoop latency for 10M e1000e: Do not take care about recovery NVM checksum Shai Malin (2): qed: qed ll2 race condition fixes qed: Fix null-pointer dereference in qed_rdma_create_qp() Shreyansh Chouhan (1): ip_gre: add validation for csum_start Stefan Mätje (1): can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters Takashi Iwai (1): usb: renesas-xhci: Prefer firmware loading on unknown ROM state Thara Gopinath (1): cpufreq: blocklist Qualcomm sm8150 in cpufreq-dt-platdev Thinh Nguyen (1): usb: dwc3: gadget: Fix dwc3_calc_trbs_left() Toshiki Nishioka (1): igc: Use num_tx_queues when iterating over tx_ring queue Tuo Li (1): IB/hfi1: Fix possible null-pointer dereference in _extend_sdma_tx_descs() Ulf Hansson (1): Revert "mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711" Vincent Chen (1): riscv: Ensure the value of FP registers in the core dump file is up to date Vincent Whitchurch (1): virtio_vdpa: reject invalid vq indices Wesley Cheng (1): usb: dwc3: gadget: Stop EP0 transfers during pullup disable Wong Vee Khee (1): net: stmmac: fix kernel panic due to NULL pointer dereference of plat->est Xiaoliang Yang (1): net: stmmac: add mutex lock to protect est parameters Xin Long (1): tipc: call tipc_wait_for_connect only when dlen is not 0 Xiubo Li (1): ceph: correctly handle releasing an embedded cap flush Yonghong Song (2): bpf: Fix NULL pointer dereference in bpf_get_local_storage() helper bpf: Fix potentially incorrect results with bpf_get_local_storage() Zhengjun Zhang (1): USB: serial: option: add new VID/PID to support Fibocom FG150 .../bindings/riscv/sifive-l2-cache.yaml | 6 +- arch/arc/kernel/vmlinux.lds.S | 2 + .../boot/dts/qcom/msm8994-angler-rev-101.dts | 4 + arch/parisc/include/asm/string.h | 15 -- arch/parisc/kernel/parisc_ksyms.c | 4 - arch/parisc/lib/Makefile | 4 +- arch/parisc/lib/memset.c | 72 ++++++++++ arch/parisc/lib/string.S | 136 ------------------ arch/riscv/kernel/Makefile | 5 +- arch/riscv/kernel/ptrace.c | 4 + arch/riscv/mm/Makefile | 3 +- arch/x86/events/intel/uncore_snbep.c | 2 +- block/blk-iocost.c | 8 +- block/blk-mq.c | 30 +--- drivers/block/floppy.c | 30 ++-- drivers/bluetooth/btusb.c | 22 +-- drivers/clk/renesas/rcar-usb2-clock-sel.c | 2 +- drivers/cpufreq/cpufreq-dt-platdev.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 36 +++-- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 15 +- drivers/gpu/drm/drm_ioc32.c | 4 +- drivers/gpu/drm/i915/gt/intel_timeline.c | 8 ++ drivers/gpu/drm/nouveau/dispnv50/disp.c | 27 ++++ drivers/gpu/drm/nouveau/dispnv50/head.c | 13 +- drivers/gpu/drm/nouveau/dispnv50/head.h | 1 + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | 1 + .../gpu/drm/nouveau/nvkm/engine/disp/outp.c | 9 ++ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 + drivers/infiniband/hw/bnxt_re/main.c | 1 - drivers/infiniband/hw/efa/efa_main.c | 1 + drivers/infiniband/hw/hfi1/sdma.c | 9 +- drivers/misc/lkdtm/core.c | 2 - drivers/mmc/host/sdhci-iproc.c | 3 +- drivers/mtd/nand/spi/core.c | 6 +- drivers/mtd/nand/spi/macronix.c | 6 +- drivers/mtd/nand/spi/toshiba.c | 6 +- drivers/net/can/usb/esd_usb2.c | 4 +- drivers/net/dsa/mt7530.c | 5 +- drivers/net/ethernet/apm/xgene-v2/main.c | 4 +- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 7 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 32 +++-- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 + drivers/net/ethernet/intel/ice/ice_devlink.c | 4 +- drivers/net/ethernet/intel/igc/igc_main.c | 36 +++-- drivers/net/ethernet/intel/igc/igc_ptp.c | 3 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/mscc/ocelot_io.c | 16 +-- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 20 +++ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 3 +- .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 22 ++- drivers/net/usb/pegasus.c | 4 +- drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 25 ++-- drivers/opp/of.c | 5 +- drivers/scsi/scsi_sysfs.c | 9 +- drivers/usb/dwc3/gadget.c | 23 ++- drivers/usb/gadget/function/u_audio.c | 5 +- drivers/usb/host/xhci-pci-renesas.c | 35 +++-- drivers/usb/serial/ch341.c | 1 - drivers/usb/serial/option.c | 2 + drivers/usb/typec/ucsi/ucsi.c | 125 +++++++++++++--- drivers/usb/typec/ucsi/ucsi.h | 2 + drivers/usb/typec/ucsi/ucsi_acpi.c | 5 +- drivers/vhost/vringh.c | 2 +- drivers/virtio/virtio_pci_common.c | 7 + drivers/virtio/virtio_ring.c | 6 +- drivers/virtio/virtio_vdpa.c | 3 + fs/btrfs/btrfs_inode.h | 15 ++ fs/btrfs/file.c | 11 +- fs/btrfs/inode.c | 6 +- fs/btrfs/transaction.h | 2 +- fs/ceph/caps.c | 21 +-- fs/ceph/mds_client.c | 7 +- fs/ceph/snap.c | 3 + fs/ceph/super.h | 3 +- fs/overlayfs/export.c | 2 +- fs/pipe.c | 33 +++-- include/linux/bpf-cgroup.h | 4 +- include/linux/bpf.h | 4 +- include/linux/netdevice.h | 4 + include/linux/pipe_fs_i.h | 2 + include/linux/rcupdate.h | 2 + include/linux/srcu.h | 3 + include/linux/srcutiny.h | 7 +- include/linux/stmmac.h | 1 + kernel/audit_tree.c | 2 +- kernel/bpf/helpers.c | 4 +- kernel/bpf/verifier.c | 8 +- kernel/cred.c | 12 +- kernel/rcu/srcutiny.c | 77 ++++++++-- kernel/rcu/srcutree.c | 127 ++++++++++++---- kernel/tracepoint.c | 81 +++++++++-- net/core/rtnetlink.c | 3 +- net/ipv4/ip_gre.c | 2 + net/ipv4/route.c | 12 +- net/ipv6/route.c | 20 ++- net/netfilter/nf_conntrack_core.c | 71 +++------ net/rds/ib_frmr.c | 4 +- net/sched/sch_ets.c | 7 + net/socket.c | 6 +- net/tipc/socket.c | 2 +- sound/soc/codecs/rt5682.c | 1 + sound/soc/soc-component.c | 63 ++++---- tools/virtio/Makefile | 3 +- tools/virtio/linux/spinlock.h | 56 ++++++++ tools/virtio/linux/virtio.h | 2 + 107 files changed, 1025 insertions(+), 600 deletions(-) create mode 100644 arch/parisc/lib/memset.c delete mode 100644 arch/parisc/lib/string.S create mode 100644 tools/virtio/linux/spinlock.h -- 2.20.1

1 89

[PATCH openEuler-5.10] ARM: spectre-v2: turn off the mitigation via boot cmdline param
by Zheng Zengkai 19 Oct '21

19 Oct '21

From: "GONG, Ruiqi" <gongruiqi1(a)huawei.com> hulk inclusion category: feature feature: switch of spectre mitigation bugzilla: 180851 https://gitee.com/openeuler/kernel/issues/I4EF1O ------------------------------------------------- We enable spectre mitigation by default for ARM32, which may cause performance regression. To offer an option to turn off this feature, implement a cmdline parameter 'nospectre_v2' compatible with mainline, which sets up a switch to skip invalidating BTB/icache for A9/A15 in context switching and user abort. Signed-off-by: GONG, Ruiqi <gongruiqi1(a)huawei.com> Cc: Hanjun Guo <guohanjun(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> --- arch/arm/include/asm/system_misc.h | 1 + arch/arm/mm/proc-v7-bugs.c | 18 ++++++++++++++++++ arch/arm/mm/proc-v7.S | 15 +++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/system_misc.h index 66f6a3ae68d2..a7ac0c9f38e5 100644 --- a/arch/arm/include/asm/system_misc.h +++ b/arch/arm/include/asm/system_misc.h @@ -37,6 +37,7 @@ static inline void harden_branch_predictor(void) #define UDBG_BUS (1 << 4) extern unsigned int user_debug; +extern int nospectre_v2; #endif /* !__ASSEMBLY__ */ diff --git a/arch/arm/mm/proc-v7-bugs.c b/arch/arm/mm/proc-v7-bugs.c index 114c05ab4dd9..d7750cddc334 100644 --- a/arch/arm/mm/proc-v7-bugs.c +++ b/arch/arm/mm/proc-v7-bugs.c @@ -8,6 +8,19 @@ #include <asm/proc-fns.h> #include <asm/system_misc.h> +/* + * 32-bit ARM spectre hardening, enabled by default, can be disabled via boot + * cmdline param 'nospectre_v2' to avoid performance regression. + */ +int nospectre_v2 __read_mostly; + +static int __init nospectre_v2_setup(char *str) +{ + nospectre_v2 = 1; + return 0; +} +early_param("nospectre_v2", nospectre_v2_setup); + #ifdef CONFIG_HARDEN_BRANCH_PREDICTOR DEFINE_PER_CPU(harden_branch_predictor_fn_t, harden_branch_predictor_fn); @@ -41,6 +54,11 @@ static void cpu_v7_spectre_init(void) const char *spectre_v2_method = NULL; int cpu = smp_processor_id(); + if (nospectre_v2) { + pr_info_once("Spectre v2: hardening is disabled\n"); + return; + } + if (per_cpu(harden_branch_predictor_fn, cpu)) return; diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 28c9d32fa99a..a59ddfd7a179 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -111,17 +111,32 @@ ENTRY(cpu_v7_hvc_switch_mm) b cpu_v7_switch_mm ENDPROC(cpu_v7_hvc_switch_mm) #endif + +.globl nospectre_v2 ENTRY(cpu_v7_iciallu_switch_mm) + adr r3, 3f + ldr r3, [r3] + cmp r3, #1 + beq 1f mov r3, #0 mcr p15, 0, r3, c7, c5, 0 @ ICIALLU +1: b cpu_v7_switch_mm ENDPROC(cpu_v7_iciallu_switch_mm) ENTRY(cpu_v7_bpiall_switch_mm) + adr r3, 3f + ldr r3, [r3] + cmp r3, #1 + beq 1f mov r3, #0 mcr p15, 0, r3, c7, c5, 6 @ flush BTAC/BTB +1: b cpu_v7_switch_mm ENDPROC(cpu_v7_bpiall_switch_mm) + .align +3: .long nospectre_v2 + string cpu_v7_name, "ARMv7 Processor" .align -- 2.20.1

1 0

[PATCH openEuler-5.10 00/38] bugfix and enhancement for mm/fs/livepatch
by Zheng Zengkai 19 Oct '21

19 Oct '21

Backport bugfix and enhancement patches for mm/fs/livepatch/sched. Al Viro (2): switch file_open_root() to struct path take LOOKUP_{ROOT,ROOT_GRABBED,JUMPED} out of LOOKUP_... space Chen Jun (1): mm: Fix the uninitialized use in overcommit_policy_handler Guoqing Jiang (1): md: revert io stats accounting Kefeng Wang (1): once: Fix panic when module unload Leah Rumancik (1): ext4: wipe ext4_dir_entry2 upon file deletion Li Hua (2): sched/idle: Optimize the loop time algorithm to reduce multicore disturb sched/idle: Reported an error when an illegal negative value is passed Vasily Averin (7): memcg: enable accounting for pids in nested pid namespaces memcg: enable accounting for mnt_cache entries memcg: enable accounting for fasync_cache memcg: enable accounting for new namesapces and struct nsproxy memcg: enable accounting for signals memcg: enable accounting for posix_timers_cache slab memcg: enable accounting for ldt_struct objects Vignesh Raghavendra (1): serial: 8250: 8250_omap: Fix possible array out of bounds access Yang Jihong (1): perf annotate: Add itrace options support Yang Yang (1): kyber: introduce kyber_depth_updated() Ye Bin (1): ext4: fix potential uninitialized access to retval in kmmpd Ye Weihua (9): livepatch: Add state describe for force livepatch: checks only if the replaced instruction is on the stack livepatch/arm64: only check stack top livepatch/arm: only check stack top livepatch/ppc32: only check stack top livepatch/ppc64: only check stack top livepatch/x86: only check stack top livepatch: move arch_klp_mem_recycle after the return value judgment livepatch: Fix compile warnning Yu Jiahua (1): sched: Aware multi-core system for optimize loadtracking Yu Kuai (2): blk-mq: clear active_queues before clearing BLK_MQ_F_TAG_QUEUE_SHARED blk-mq: fix divide by zero crash in tg_may_dispatch() Yutian Yang (1): memcg: charge fs_context and legacy_fs_context Zhang Yi (5): ext4: move inode eio simulation behind io completeion ext4: make the updating inode data procedure atomic ext4: factor out ext4_fill_raw_inode() ext4: move ext4_fill_raw_inode() related functions ext4: prevent getting empty inode buffer Zheng Zucheng (1): sysctl: Refactor IAS framework Documentation/filesystems/path-lookup.rst | 6 +- Documentation/filesystems/porting.rst | 9 + arch/arm/kernel/livepatch.c | 221 +++++++++++-- arch/arm64/kernel/livepatch.c | 209 +++++++++++-- arch/powerpc/kernel/livepatch_32.c | 209 +++++++++++-- arch/powerpc/kernel/livepatch_64.c | 227 ++++++++++---- arch/um/drivers/mconsole_kern.c | 2 +- arch/x86/kernel/ldt.c | 6 +- arch/x86/kernel/livepatch.c | 347 +++++++++++++++------ block/blk-mq.c | 6 +- block/blk-sysfs.c | 7 + block/blk-throttle.c | 37 ++- block/kyber-iosched.c | 29 +- drivers/md/md.c | 45 --- drivers/md/md.h | 1 - drivers/tty/serial/8250/8250_omap.c | 1 + fs/coredump.c | 4 +- fs/ext4/inode.c | 332 +++++++++++--------- fs/ext4/mmp.c | 2 +- fs/ext4/namei.c | 24 +- fs/fcntl.c | 3 +- fs/fhandle.c | 2 +- fs/fs_context.c | 4 +- fs/internal.h | 2 +- fs/kernel_read_file.c | 2 +- fs/namei.c | 60 ++-- fs/namespace.c | 7 +- fs/nfs/nfstrace.h | 4 - fs/open.c | 4 +- fs/proc/proc_sysctl.c | 2 +- include/linux/blkdev.h | 1 + include/linux/fs.h | 9 +- include/linux/kernel.h | 4 +- include/linux/livepatch.h | 4 + include/linux/namei.h | 3 - include/linux/once.h | 4 +- include/linux/sched/sysctl.h | 8 +- init/Kconfig | 36 ++- ipc/namespace.c | 2 +- kernel/cgroup/namespace.c | 2 +- kernel/livepatch/core.c | 2 +- kernel/nsproxy.c | 2 +- kernel/pid_namespace.c | 5 +- kernel/sched/fair.c | 86 ++--- kernel/sched/idle.c | 48 ++- kernel/signal.c | 2 +- kernel/sysctl.c | 84 ++--- kernel/time/namespace.c | 4 +- kernel/time/posix-timers.c | 4 +- kernel/user_namespace.c | 2 +- kernel/usermode_driver.c | 2 +- lib/once.c | 11 +- mm/util.c | 4 +- security/integrity/ima/ima_digest_list.c | 2 +- tools/perf/Documentation/perf-annotate.txt | 7 + tools/perf/builtin-annotate.c | 11 + 56 files changed, 1494 insertions(+), 669 deletions(-) -- 2.20.1

1 38

[PATCH openEuler-5.10 01/12] hfs: fix null-ptr-deref in hfs_find_init()
by Zheng Zengkai 19 Oct '21

19 Oct '21

From: Yang Yingliang <yangyingliang(a)huawei.com> hulk inclusion category: bugfix bugzilla: 179898 https://gitee.com/openeuler/kernel/issues/I4DDEL CVE: CVE-2018-12928 --------------------------- It will cause a null-ptr-deref in hfs_find_init() in fuzz test. [ 107.092729] hfs: continuing without an alternate MDB [ 107.097632] general protection fault, probably for non-canonical address 0xdffffc0000000008: 0000 [#1] SMP KASAN PTI [ 107.104679] KASAN: null-ptr-deref in range [0x0000000000000040-0x0000000000000047] [ 107.109100] CPU: 0 PID: 379 Comm: hfs_inject Not tainted 5.7.0-rc7-00001-g24627f5f2973 #897 [ 107.114142] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 [ 107.121095] RIP: 0010:hfs_find_init+0x72/0x170 [ 107.123609] Code: c1 ea 03 80 3c 02 00 0f 85 e6 00 00 00 4c 8d 65 40 48 c7 43 18 00 00 00 00 48 b8 00 00 00 00 00 fc ff df 4c 89 e2 48 c1 ea 03 <0f> b6 04 02 84 c0 74 08 3c 03 0f 8e a5 00 00 00 8b 45 40 be c0 0c [ 107.134660] RSP: 0018:ffff88810291f3f8 EFLAGS: 00010202 [ 107.137897] RAX: dffffc0000000000 RBX: ffff88810291f468 RCX: 1ffff110175cdf05 [ 107.141874] RDX: 0000000000000008 RSI: ffff88810291f468 RDI: ffff88810291f480 [ 107.145844] RBP: 0000000000000000 R08: 0000000000000000 R09: ffffed1020381013 [ 107.149431] R10: ffff88810291f500 R11: ffffed1020381012 R12: 0000000000000040 [ 107.152315] R13: 0000000000000000 R14: ffff888101c0814a R15: ffff88810291f468 [ 107.155464] FS: 00000000009ea880(0000) GS:ffff88810c600000(0000) knlGS:0000000000000000 [ 107.159795] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 107.162987] CR2: 00005605a19dd284 CR3: 0000000103a0c006 CR4: 0000000000020ef0 [ 107.166665] Call Trace: [ 107.167969] ? find_held_lock+0x33/0x1c0 [ 107.169972] hfs_ext_read_extent+0x16b/0xb00 [ 107.172092] ? create_page_buffers+0x14e/0x1b0 [ 107.174303] ? hfs_free_extents+0x280/0x280 [ 107.176437] ? lock_downgrade+0x730/0x730 [ 107.178272] hfs_get_block+0x496/0x8a0 [ 107.179972] block_read_full_page+0x241/0x8d0 [ 107.181971] ? hfs_extend_file+0xae0/0xae0 [ 107.183814] ? end_buffer_async_read_io+0x10/0x10 [ 107.185954] ? add_to_page_cache_lru+0x13f/0x1f0 [ 107.188006] ? add_to_page_cache_locked+0x10/0x10 [ 107.190175] do_read_cache_page+0xc6a/0x1180 [ 107.192096] ? generic_file_read_iter+0x4c0/0x4c0 [ 107.194234] ? hfs_btree_open+0x408/0x1000 [ 107.196068] ? lock_downgrade+0x730/0x730 [ 107.197926] ? wake_bit_function+0x180/0x180 [ 107.199845] ? lockdep_init_map_waits+0x267/0x7c0 [ 107.201895] hfs_btree_open+0x455/0x1000 [ 107.203479] hfs_mdb_get+0x122c/0x1ae8 [ 107.205065] ? hfs_mdb_put+0x350/0x350 [ 107.206590] ? queue_work_node+0x260/0x260 [ 107.208309] ? rcu_read_lock_sched_held+0xa1/0xd0 [ 107.210227] ? lockdep_init_map_waits+0x267/0x7c0 [ 107.212144] ? lockdep_init_map_waits+0x267/0x7c0 [ 107.213979] hfs_fill_super+0x9ba/0x1280 [ 107.215444] ? bdev_name.isra.9+0xf1/0x2b0 [ 107.217028] ? hfs_remount+0x190/0x190 [ 107.218428] ? pointer+0x5da/0x710 [ 107.219745] ? file_dentry_name+0xf0/0xf0 [ 107.221262] ? mount_bdev+0xd1/0x330 [ 107.222592] ? vsnprintf+0x7bd/0x1250 [ 107.224007] ? pointer+0x710/0x710 [ 107.225332] ? down_write+0xe5/0x160 [ 107.226698] ? hfs_remount+0x190/0x190 [ 107.228120] ? snprintf+0x91/0xc0 [ 107.229388] ? vsprintf+0x10/0x10 [ 107.230628] ? sget+0x3af/0x4a0 [ 107.231848] ? hfs_remount+0x190/0x190 [ 107.233300] mount_bdev+0x26e/0x330 [ 107.234611] ? hfs_statfs+0x540/0x540 [ 107.236015] legacy_get_tree+0x101/0x1f0 [ 107.237431] ? security_capable+0x58/0x90 [ 107.238832] vfs_get_tree+0x89/0x2d0 [ 107.240082] ? ns_capable_common+0x5c/0xd0 [ 107.241521] do_mount+0xd8a/0x1720 [ 107.242727] ? lock_downgrade+0x730/0x730 [ 107.244116] ? copy_mount_string+0x20/0x20 [ 107.245557] ? _copy_from_user+0xbe/0x100 [ 107.246967] ? memdup_user+0x47/0x70 [ 107.248212] __x64_sys_mount+0x162/0x1b0 [ 107.249537] do_syscall_64+0xa5/0x4f0 [ 107.250742] entry_SYSCALL_64_after_hwframe+0x49/0xb3 [ 107.252369] RIP: 0033:0x44e8ea [ 107.253360] Code: 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 49 89 ca b8 a5 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 [ 107.259240] RSP: 002b:00007ffd910e4c28 EFLAGS: 00000207 ORIG_RAX: 00000000000000a5 [ 107.261668] RAX: ffffffffffffffda RBX: 0000000000400400 RCX: 000000000044e8ea [ 107.263920] RDX: 000000000049321e RSI: 0000000000493222 RDI: 00007ffd910e4d00 [ 107.266177] RBP: 00007ffd910e5d10 R08: 0000000000000000 R09: 000000000000000a [ 107.268451] R10: 0000000000000001 R11: 0000000000000207 R12: 0000000000401c40 [ 107.270721] R13: 0000000000000000 R14: 00000000006ba018 R15: 0000000000000000 [ 107.273025] Modules linked in: [ 107.274029] Dumping ftrace buffer: [ 107.275121] (ftrace buffer empty) [ 107.276370] ---[ end trace c5e0b9d684f3570e ]--- We need check tree in hfs_find_init(). https://lore.kernel.org/linux-fsdevel/20180419024358.GA5215@bombadil.infrad… https://marc.info/?l=linux-fsdevel&m=152406881024567&w=2 References: CVE-2018-12928 Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> --- fs/hfs/bfind.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/hfs/bfind.c b/fs/hfs/bfind.c index ef9498a6e88a..ae44c8fa86ec 100644 --- a/fs/hfs/bfind.c +++ b/fs/hfs/bfind.c @@ -16,6 +16,8 @@ int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd) { void *ptr; + if (!tree) + return -EINVAL; fd->tree = tree; fd->bnode = NULL; ptr = kmalloc(tree->max_key_len * 2 + 4, GFP_KERNEL); -- 2.20.1

1 11

[PATCH openEuler-5.10 00/94] Backport LTS 5.10.61
by Zheng Zengkai 19 Oct '21

19 Oct '21

Backport LTS 5.10.61 patches from upstream. Adrian Larumbe (1): dmaengine: xilinx_dma: Fix read-after-free bug when terminating transfers Alan Stern (2): USB: core: Avoid WARNings for 0-length descriptor requests USB: core: Fix incorrect pipe calculation in do_proc_control() Andreas Persson (1): mtd: cfi_cmdset_0002: fix crash when erasing/writing AMD cards Andy Shevchenko (1): ptp_pch: Restore dependency on PCI Arkadiusz Kubalewski (1): i40e: Fix ATR queue selection Bing Guo (1): drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X Bjorn Andersson (1): clk: qcom: gdsc: Ensure regulator init state matches GDSC state Christophe Kerello (1): mmc: mmci: stm32: Check when the voltage switch procedure should be done Dan Carpenter (1): media: zr364xx: fix memory leaks in probe() Dave Gerlach (1): ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218 Dinghao Liu (1): net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32 Dong Aisheng (1): clk: imx6q: fix uart earlycon unwork Dongliang Mu (2): ipack: tpci200: fix many double free issues in tpci200_pci_probe ipack: tpci200: fix memory leak in the tpci200_register Eli Cohen (1): vdpa/mlx5: Avoid destroying MR on empty iotlb Evgeny Novikov (1): media: zr364xx: propagate errors from zr364xx_start_readpipe() Frank Wunderlich (1): iommu: Check if group is NULL before remove device Harshvardhan Jha (2): net: xfrm: Fix end of loop tests for list_for_each_entry scsi: megaraid_mm: Fix end of loop tests for list_for_each_entry() Hayes Wang (1): r8152: fix writing USB_BP2_EN Ido Schimmel (1): Revert "flow_offload: action should not be NULL when it is referenced" Igor Pylypiv (1): scsi: pm80xx: Fix TMF task completion race condition Ilya Leoshkevich (1): bpf: Clear zext_dst of dead insns Ivan T. Ivanov (1): net: usb: lan78xx: don't modify phy_device state concurrently Jakub Kicinski (4): bnxt: don't lock the tx queue from napi poll bnxt: disable napi before canceling DIM bnxt: make sure xmit_more + errors does not miss doorbells bnxt: count Tx drops Jaroslav Kysela (1): ALSA: hda - fix the 'Capture Switch' value change notifications Jason Wang (1): virtio-net: use NETIF_F_GRO_HW instead of NETIF_F_LRO Jeff Layton (1): fs: warn about impending deprecation of mandatory locks Jens Axboe (2): io_uring: fix xa_alloc_cycle() error return value check io_uring: only assign io_uring_enter() SQPOLL error in actual error case Johannes Weiner (1): mm: memcontrol: fix occasional OOMs due to proportional memory.low reclaim Jouni Malinen (5): ath: Use safer key clearing with key cache entries ath9k: Clear key cache explicitly on disabling hardware ath: Export ath_hw_keysetmac() ath: Modify ath_key_delete() to not need full key entry ath9k: Postpone key cache entry deletion for TXQ frames reference it Kai-Heng Feng (1): ALSA: hda/realtek: Limit mic boost on HP ProBook 445 G8 Kristin Paget (1): ALSA: hda/realtek: Enable 4-speaker output for Dell XPS 15 9510 laptop Lahav Schlesinger (1): vrf: Reset skb conntrack connection on VRF rcv Liu Yi L (1): iommu/vt-d: Fix incomplete cache flush in intel_pasid_tear_down_entry() Lu Baolu (1): iommu/vt-d: Consolidate duplicate cache invaliation code Marcin Bachry (1): PCI: Increase D3 delay for AMD Renoir/Cezanne XHCI Marek Behún (1): cpufreq: armada-37xx: forbid cpufreq for 1.2 GHz variant Michael Chan (2): bnxt_en: Disable aRFS if running on 212 firmware bnxt_en: Add missing DMA memory barriers NeilBrown (1): btrfs: prevent rename2 from exchanging a subvol with a directory from different parents Nicolas Saenz Julienne (2): mmc: sdhci-iproc: Cap min clock frequency on BCM2711 mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711 Niklas Schnelle (1): s390/pci: fix use after free of zpci_dev Ole Bjørn Midtbø (1): Bluetooth: hidp: use correct wait queue when removing ctrl_wait Parav Pandit (1): virtio: Protect vqs list access Pavel Skripkin (2): media: drivers/media/usb: fix memory leak in zr364xx_probe net: 6pack: fix slab-out-of-bounds in decode_data Peter Ujfalusi (1): dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller is not yet available Petko Manolov (1): net: usb: pegasus: Check the return value of get_geristers() and friends; Petr Vorel (1): arm64: dts: qcom: msm8992-bullhead: Remove PSCI Prabhakar Kushwaha (1): qede: fix crash in rmmod qede while automatic debug collection Qingqing Zhuo (1): drm/amd/display: workaround for hard hang on HPD on native DP Randy Dunlap (1): dccp: add do-while-0 stubs for dccp_pr_debug macros Saravana Kannan (2): net: mdio-mux: Don't ignore memory allocation errors net: mdio-mux: Handle -EPROBE_DEFER correctly Shaik Sajida Bhanu (1): mmc: sdhci-msm: Update the software timeout value for sdhc Sreekanth Reddy (1): scsi: core: Avoid printing an error if target_alloc() returns -ENXIO Srinivas Kandagatla (4): arm64: dts: qcom: c630: fix correct powerdown pin for WSA881x slimbus: messaging: start transaction ids from 1 instead of zero slimbus: messaging: check for valid transaction id slimbus: ngd: reset dma setup during runtime pm Steven Rostedt (VMware) (1): tracing / histogram: Fix NULL pointer dereference on strcmp() on NULL event name Sudeep Holla (1): ARM: dts: nomadik: Fix up interrupt controller node names Sylwester Dziedziuch (1): iavf: Fix ping is lost after untrusted VF had tried to change MAC Takashi Iwai (2): ALSA: hda/via: Apply runtime PM workaround for ASUS B23E ASoC: intel: atom: Fix breakage for PCM buffer address setup Toke Høiland-Jørgensen (1): sch_cake: fix srchost/dsthost hashing mode Tony Lindgren (1): bus: ti-sysc: Fix error handling for sysc_check_active_timer() Uwe Kleine-König (1): spi: spi-mux: Add module info needed for autoloading Vincent Whitchurch (1): mmc: dw_mmc: Fix hang on data CRC error Wang Hai (1): ixgbe, xsk: clean up the resources in ixgbe_xsk_pool_enable error path Wanpeng Li (1): KVM: X86: Fix warning caused by stale emulation context Wei Huang (1): KVM: x86: Factor out x86 instruction emulation with decoding Xie Yongji (2): vhost-vdpa: Fix integer overflow in vhost_vdpa_process_iotlb_update() vhost: Fix the calculation in vhost_overflow() Xuan Zhuo (1): virtio-net: support XDP when not more queues Ye Bin (1): scsi: scsi_dh_rdac: Avoid crash during rdac_bus_attach() Yifan Zhang (1): drm/amdgpu: fix the doorbell missing when in CGPG issue for renoir. Yongqiang Niu (2): soc / drm: mediatek: Move DDP component defines into mtk-mmsys.h drm/mediatek: Fix aal size config Yu Kuai (1): dmaengine: usb-dmac: Fix PM reference leak in usb_dmac_probe() jason-jh.lin (1): drm/mediatek: Add AAL output size configuration kaixi.fan (1): ovs: clear skb->tstamp in forwarding path lijinlin (1): scsi: core: Fix capacity set to zero after offlinining device arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 4 +- .../dts/qcom/msm8992-bullhead-rev-101.dts | 4 + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 4 +- arch/s390/pci/pci.c | 6 + arch/s390/pci/pci_bus.h | 5 + arch/x86/kvm/x86.c | 62 ++++++---- arch/x86/kvm/x86.h | 2 + drivers/bus/ti-sysc.c | 4 +- drivers/clk/imx/clk-imx6q.c | 2 +- drivers/clk/qcom/gdsc.c | 54 ++++++--- drivers/cpufreq/armada-37xx-cpufreq.c | 6 +- drivers/dma/of-dma.c | 9 +- drivers/dma/sh/usb-dmac.c | 2 +- drivers/dma/xilinx/xilinx_dma.c | 12 ++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 21 +++- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 4 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 4 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 34 +----- drivers/iommu/intel/pasid.c | 26 ++-- drivers/iommu/intel/pasid.h | 6 + drivers/iommu/intel/svm.c | 55 ++------- drivers/iommu/iommu.c | 3 + drivers/ipack/carriers/tpci200.c | 60 +++++----- drivers/media/usb/zr364xx/zr364xx.c | 77 ++++++++---- drivers/mmc/host/dw_mmc.c | 6 +- drivers/mmc/host/mmci_stm32_sdmmc.c | 7 +- drivers/mmc/host/sdhci-iproc.c | 21 +++- drivers/mmc/host/sdhci-msm.c | 18 +++ drivers/mtd/chips/cfi_cmdset_0002.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 113 ++++++++++++------ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 +- drivers/net/ethernet/intel/iavf/iavf.h | 1 + drivers/net/ethernet/intel/iavf/iavf_main.c | 1 + .../net/ethernet/intel/iavf/iavf_virtchnl.c | 47 +++++++- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 5 +- drivers/net/ethernet/qlogic/qede/qede.h | 1 + drivers/net/ethernet/qlogic/qede/qede_main.c | 8 ++ .../ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +- drivers/net/hamradio/6pack.c | 6 + drivers/net/mdio/mdio-mux.c | 36 ++++-- drivers/net/usb/lan78xx.c | 16 ++- drivers/net/usb/pegasus.c | 108 ++++++++++++----- drivers/net/usb/r8152.c | 2 +- drivers/net/virtio_net.c | 76 ++++++++---- drivers/net/vrf.c | 4 + drivers/net/wireless/ath/ath.h | 3 +- drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 95 ++++++++++++++- drivers/net/wireless/ath/key.c | 41 ++++--- drivers/pci/quirks.c | 1 + drivers/ptp/Kconfig | 3 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 4 +- drivers/scsi/megaraid/megaraid_mm.c | 21 +++- drivers/scsi/pm8001/pm8001_sas.c | 32 +++-- drivers/scsi/scsi_scan.c | 3 +- drivers/scsi/scsi_sysfs.c | 9 +- drivers/slimbus/messaging.c | 7 +- drivers/slimbus/qcom-ngd-ctrl.c | 5 +- drivers/soc/mediatek/mtk-mmsys.c | 4 +- drivers/spi/spi-mux.c | 8 ++ drivers/usb/core/devio.c | 2 +- drivers/usb/core/message.c | 6 + drivers/vdpa/mlx5/core/mr.c | 9 -- drivers/vhost/vdpa.c | 3 +- drivers/vhost/vhost.c | 10 +- drivers/virtio/virtio.c | 1 + drivers/virtio/virtio_ring.c | 8 ++ fs/btrfs/inode.c | 10 +- fs/io_uring.c | 16 +-- fs/namespace.c | 6 +- include/linux/memcontrol.h | 29 ++--- include/linux/soc/mediatek/mtk-mmsys.h | 33 +++++ include/linux/virtio.h | 1 + include/net/flow_offload.h | 12 +- kernel/bpf/verifier.c | 1 + kernel/trace/trace_events_hist.c | 2 + mm/vmscan.c | 27 +++-- net/bluetooth/hidp/core.c | 2 +- net/dccp/dccp.h | 6 +- net/openvswitch/vport.c | 1 + net/sched/sch_cake.c | 2 +- net/xfrm/xfrm_ipcomp.c | 2 +- sound/pci/hda/hda_generic.c | 10 +- sound/pci/hda/patch_realtek.c | 12 +- sound/pci/hda/patch_via.c | 1 + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- 91 files changed, 964 insertions(+), 447 deletions(-) -- 2.20.1

1 94

[PATCH openEuler-5.10 000/101] Backport LTS 5.10.60
by Zheng Zengkai 19 Oct '21

19 Oct '21

Backport LTS 5.10.60 patches from upstream. Alex Deucher (1): drm/amdgpu: don't enable baco on boco platforms in runpm Andy Shevchenko (1): pinctrl: tigerlake: Fix GPIO mapping for newer version of software Anirudh Venkataramanan (1): ice: Prevent probing virtual functions Anson Jacob (1): drm/amd/display: use GFP_ATOMIC in amdgpu_dm_irq_schedule_work Antti Keränen (1): iio: adis: set GPIO reset pin direction Ard Biesheuvel (3): efi/libstub: arm64: Force Image reallocation if BSS was not reserved efi/libstub: arm64: Relax 2M alignment again for relocatable kernels efi/libstub: arm64: Double check image alignment at entry Aya Levin (1): net/mlx5: Fix return value from tracer initialization Babu Moger (1): x86/resctrl: Fix default monitoring groups reporting Ben Dai (1): genirq/timings: Prevent potential array overflow in __irq_timings_store() Ben Hutchings (8): net: phy: micrel: Fix link detection on ksz87xx switch" net: dsa: microchip: Fix ksz_read64() net: dsa: microchip: ksz8795: Fix VLAN filtering net: dsa: microchip: Fix probing KSZ87xx switch with DT node for host port net: dsa: microchip: ksz8795: Fix PVID tag insertion net: dsa: microchip: ksz8795: Reject unsupported VLAN configuration net: dsa: microchip: ksz8795: Fix VLAN untagged flag change on deletion net: dsa: microchip: ksz8795: Use software untagging on CPU port Benjamin Herrenschmidt (1): arm64: efi: kaslr: Fix occasional random alloc (and boot) failure Bixuan Cui (1): genirq/msi: Ensure deactivation on teardown Brett Creeley (1): ice: don't remove netdev->dev_addr from uc sync list Chris Lesiak (1): iio: humidity: hdc100x: Add margin to the conversion time Christian Hewitt (1): drm/meson: fix colour distortion from HDR set during vendor u-boot Christophe Leroy (1): powerpc/smp: Fix OOPS in topology_init() Colin Ian King (1): iio: adc: Fix incorrect exit of for-loop DENG Qingfang (1): net: dsa: mt7530: add the missing RxUnicast MIB counter Dan Williams (2): ACPI: NFIT: Fix support for virtual SPA ranges libnvdimm/region: Fix label activation vs errors Dongliang Mu (2): ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi ieee802154: hwsim: fix GPF in hwsim_new_edge_nl Eric Bernstein (1): drm/amd/display: Remove invalid assert for ODM + MPC case Eric Dumazet (2): net: igmp: fix data-race in igmp_ifc_timer_expire() net: igmp: increase size of mr_ifc_count Ewan D. Milne (1): scsi: lpfc: Move initialization of phba->poll_list earlier to avoid crash Greg Kroah-Hartman (1): i2c: dev: zero out array used for i2c reads from userspace Grygorii Strashko (1): net: ethernet: ti: cpsw: fix min eth packet size for non-switch use-cases Guennadi Liakhovetski (1): ASoC: SOF: Intel: hda-ipc: fix reply size checking Guillaume Nault (1): bareudp: Fix invalid read beyond skb's linear data Hangbin Liu (1): net: sched: act_mirred: Reset ct info when mirror/redirect skb Hans de Goede (3): platform/x86: pcengines-apuv2: Add missing terminating entries to gpio-lookup tables vboxsf: Add vboxsf_[create|release]_sf_handle() helpers vboxsf: Add support for the atomic_open directory-inode op Hsin-Yi Wang (1): pinctrl: mediatek: Fix fallback behavior for bias_set_combo Hsuan-Chi Kuo (1): seccomp: Fix setting loaded filter count during TSYNC Jeff Layton (3): ceph: add some lockdep assertions around snaprealm handling ceph: clean up locking annotation for ceph_get_snap_realm and __lookup_snap_realm ceph: take snap_empty_lock atomically with snaprealm refcount change John Hubbard (1): net: mvvp2: fix short frame size on s390 Karsten Graul (1): net/smc: fix wait on already cleared link Longpeng(Mike) (1): vsock/virtio: avoid potential deadlock when vsock device remove Luis Henriques (1): ceph: reduce contention in ceph_check_delayed_caps() Mark Brown (1): ASoC: tlv320aic31xx: Fix jack detection after suspend Matt Roper (1): drm/i915: Only access SFC_DONE when media domain is not fused off Maxim Levitsky (2): KVM: nSVM: avoid picking up unsupported bits from L2 in int_ctl (CVE-2021-3653) KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656) Maximilian Heyne (1): xen/events: Fix race in set_evtchn_to_irq Md Fahad Iqbal Polash (1): iavf: Set RSS LUT and key in reset handle path Nathan Chancellor (1): vmlinux.lds.h: Handle clang's module.{c,d}tor sections Neal Cardwell (1): tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets Nikolay Aleksandrov (1): net: bridge: fix flags interpretation for extern learn fdb entries Pali Rohár (1): ppp: Fix generating ifname when empty IFLA_IFNAME is specified Randy Dunlap (1): x86/tools: Fix objdump version check again Richard Fitzgerald (5): ASoC: cs42l42: Correct definition of ADC Volume control ASoC: cs42l42: Don't allow SND_SOC_DAIFMT_LEFT_J ASoC: cs42l42: Fix inversion of ADC Notch Switch control ASoC: cs42l42: Remove duplicate control for WNF filter frequency ASoC: cs42l42: Fix LRCLK frame start edge Robin Gögge (1): libbpf: Fix probe for BPF_PROG_TYPE_CGROUP_SOCKOPT Roi Dayan (1): psample: Add a fwd declaration for skbuff Sean Christopherson (2): KVM: VMX: Use current VMCS to query WAITPKG support for MSR emulation KVM: nVMX: Use vmx_need_pf_intercept() when deciding if L0 wants a #PF Shay Drory (1): net/mlx5: Synchronize correct IRQ when destroying CQ Shyam Prasad N (1): cifs: create sd context must be a multiple of 8 Takashi Iwai (4): ASoC: amd: Fix reference to PCM buffer address ASoC: xilinx: Fix reference to PCM buffer address ASoC: uniphier: Fix reference to PCM buffer address ASoC: intel: atom: Fix reference to PCM buffer address Takeshi Misawa (1): net: Fix memory leak in ieee802154_raw_deliver Tatsuhiko Yasumatsu (1): bpf: Fix integer overflow involving bucket_size Thomas Gleixner (11): genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP x86/msi: Force affinity setup before startup x86/ioapic: Force affinity setup before startup PCI/MSI: Enable and mask MSI-X early PCI/MSI: Mask all unused MSI-X entries PCI/MSI: Enforce that MSI-X table entry is masked for update PCI/MSI: Enforce MSI[X] entry updates to be visible PCI/MSI: Do not set invalid bits in MSI mask PCI/MSI: Correct misleading comments PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() PCI/MSI: Protect msi_desc::masked for multi-MSI Uwe Kleine-König (1): iio: adc: ti-ads7950: Ensure CS is deasserted after reading channels Vineet Gupta (1): ARC: fp: set FPU_STATUS.FWE to enable FPU_STATUS update on context switch Vladimir Oltean (4): net: dsa: lan9303: fix broken backpressure in .port_fdb_dump net: dsa: lantiq: fix broken backpressure in .port_fdb_dump net: dsa: sja1105: fix broken backpressure in .port_fdb_dump net: bridge: validate the NUD_PERMANENT bit when adding an extern_learn FDB entry Willy Tarreau (1): net: linkwatch: fix failure to restore device state across suspend/resume Xie Yongji (1): nbd: Aovid double completion of a request Yajun Deng (1): netfilter: nf_conntrack_bridge: Fix memory leak when error Yang Yingliang (1): net: bridge: fix memleak in br_add_if() arch/arc/kernel/fpu.c | 9 +- arch/powerpc/kernel/sysfs.c | 2 +- arch/x86/include/asm/svm.h | 2 + arch/x86/kernel/apic/io_apic.c | 6 +- arch/x86/kernel/apic/msi.c | 13 +- arch/x86/kernel/cpu/resctrl/monitor.c | 27 ++-- arch/x86/kvm/svm/nested.c | 14 +- arch/x86/kvm/svm/svm.c | 8 +- arch/x86/kvm/vmx/nested.c | 3 +- arch/x86/kvm/vmx/vmx.h | 2 +- arch/x86/tools/chkobjdump.awk | 1 + drivers/acpi/nfit/core.c | 3 + drivers/base/core.c | 1 + drivers/block/nbd.c | 14 +- drivers/firmware/efi/libstub/arm64-stub.c | 69 ++++++++-- drivers/firmware/efi/libstub/randomalloc.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 +- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 1 - drivers/gpu/drm/i915/i915_gpu_error.c | 19 ++- drivers/gpu/drm/meson/meson_registers.h | 5 + drivers/gpu/drm/meson/meson_viu.c | 7 +- drivers/i2c/i2c-dev.c | 5 +- drivers/iio/adc/palmas_gpadc.c | 4 +- drivers/iio/adc/ti-ads7950.c | 1 - drivers/iio/humidity/hdc100x.c | 6 +- drivers/iio/imu/adis.c | 3 +- drivers/infiniband/hw/mlx5/cq.c | 4 +- drivers/infiniband/hw/mlx5/devx.c | 3 +- drivers/net/bareudp.c | 16 ++- drivers/net/dsa/lan9303-core.c | 34 ++--- drivers/net/dsa/lantiq_gswip.c | 14 +- drivers/net/dsa/microchip/ksz8795.c | 91 +++++++++++-- drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/dsa/microchip/ksz_common.h | 9 +- drivers/net/dsa/mt7530.c | 1 + drivers/net/dsa/sja1105/sja1105_main.c | 4 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 13 +- drivers/net/ethernet/intel/ice/ice_main.c | 28 ++-- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cq.c | 1 + .../mellanox/mlx5/core/diag/fw_tracer.c | 11 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 20 ++- .../ethernet/mellanox/mlx5/core/fpga/conn.c | 4 +- .../net/ethernet/mellanox/mlx5/core/lib/eq.h | 2 + .../mellanox/mlx5/core/steering/dr_send.c | 4 +- drivers/net/ethernet/ti/cpsw_new.c | 7 +- drivers/net/ethernet/ti/cpsw_priv.h | 4 +- drivers/net/ieee802154/mac802154_hwsim.c | 6 +- drivers/net/phy/micrel.c | 2 - drivers/net/ppp/ppp_generic.c | 2 +- drivers/nvdimm/namespace_devs.c | 17 ++- drivers/pci/msi.c | 125 +++++++++++------- drivers/pinctrl/intel/pinctrl-tigerlake.c | 26 ++-- .../pinctrl/mediatek/pinctrl-mtk-common-v2.c | 8 +- drivers/platform/x86/pcengines-apuv2.c | 2 + drivers/scsi/lpfc/lpfc_init.c | 3 +- drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 +- drivers/xen/events/events_base.c | 20 ++- fs/ceph/caps.c | 17 ++- fs/ceph/mds_client.c | 25 ++-- fs/ceph/snap.c | 54 +++++--- fs/ceph/super.h | 2 +- fs/cifs/smb2pdu.c | 2 +- fs/vboxsf/dir.c | 48 +++++++ fs/vboxsf/file.c | 71 ++++++---- fs/vboxsf/vfsmod.h | 7 + include/asm-generic/vmlinux.lds.h | 1 + include/linux/device.h | 1 + include/linux/inetdevice.h | 2 +- include/linux/irq.h | 2 + include/linux/mlx5/driver.h | 3 +- include/linux/msi.h | 2 +- include/net/psample.h | 2 + include/uapi/linux/neighbour.h | 7 +- kernel/bpf/hashtab.c | 4 +- kernel/irq/chip.c | 5 +- kernel/irq/msi.c | 13 +- kernel/irq/timings.c | 5 + kernel/seccomp.c | 2 +- net/bridge/br_fdb.c | 23 +++- net/bridge/br_if.c | 2 + net/bridge/netfilter/nf_conntrack_bridge.c | 6 + net/core/link_watch.c | 5 +- net/ieee802154/socket.c | 7 +- net/ipv4/igmp.c | 21 ++- net/ipv4/tcp_bbr.c | 2 +- net/sched/act_mirred.c | 3 + net/smc/smc_core.h | 2 + net/smc/smc_llc.c | 10 +- net/smc/smc_tx.c | 18 ++- net/smc/smc_wr.c | 10 ++ net/vmw_vsock/virtio_transport.c | 7 +- sound/soc/amd/acp-pcm-dma.c | 2 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 +- sound/soc/codecs/cs42l42.c | 39 +++--- sound/soc/codecs/tlv320aic31xx.c | 10 ++ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 3 +- sound/soc/sof/intel/hda-ipc.c | 4 +- sound/soc/uniphier/aio-dma.c | 2 +- sound/soc/xilinx/xlnx_formatter_pcm.c | 4 +- tools/lib/bpf/libbpf_probes.c | 4 +- 104 files changed, 829 insertions(+), 366 deletions(-) -- 2.20.1

1 101

[PATCH openEuler-5.10 00/18] Backport LTS 5.10.59
by Zheng Zengkai 19 Oct '21

19 Oct '21

Backport LTS 5.10.59 patches from upstream. Adam Ford (3): arm64: dts: renesas: rzg2: Add usb2_clksel to RZ/G2 M/N/H arm64: dts: renesas: beacon: Fix USB extal reference arm64: dts: renesas: beacon: Fix USB ref clock references Allen Pais (1): firmware: tee_bnxt: Release TEE shm, session, and context during kexec Daniel Borkmann (1): bpf: Add lockdown check for probe_write_user helper Hans de Goede (2): vboxsf: Honor excl flag to the dir-inode create op vboxsf: Make vboxsf_dir_create() return the handle for the created file Jeremy Szu (1): ALSA: hda/realtek: fix mute/micmute LEDs for HP ProBook 650 G8 Notebook PC Longfang Liu (1): USB:ehci:fix Kunpeng920 ehci hardware problem Luke D Jones (1): ALSA: hda: Add quirk for ASUS Flow x13 Mike Rapoport (1): mm: make zone_to_nid() and zone_set_nid() available for DISCONTIGMEM Miklos Szeredi (1): ovl: prevent private clone if bind mount is not allowed Pali Rohár (1): ppp: Fix generating ppp unit id when ifname is not specified Reinette Chatre (1): Revert "selftests/resctrl: Use resctrl/info for feature detection" Sean Christopherson (1): KVM: SVM: Fix off-by-one indexing when nullifying last used SEV VMCB Sumit Garg (1): tee: Correct inappropriate usage of TEE_SHM_DMA_BUF flag Takashi Iwai (1): ALSA: pcm: Fix mmap breakage without explicit buffer setup YueHaibing (1): net: xilinx_emaclite: Do not print real IOMEM pointer .../dts/renesas/beacon-renesom-baseboard.dtsi | 4 +- .../boot/dts/renesas/beacon-renesom-som.dtsi | 6 ++- arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 15 ++++++ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 15 ++++++ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 15 ++++++ arch/x86/kvm/svm/sev.c | 2 +- drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++-- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 5 +- drivers/net/ppp/ppp_generic.c | 19 +++++-- drivers/tee/optee/call.c | 2 +- drivers/tee/optee/core.c | 3 +- drivers/tee/optee/rpc.c | 5 +- drivers/tee/optee/shm_pool.c | 8 ++- drivers/tee/tee_shm.c | 4 +- drivers/usb/host/ehci-pci.c | 3 ++ fs/namespace.c | 42 ++++++++++----- fs/vboxsf/dir.c | 28 ++++++---- include/linux/mmzone.h | 4 +- include/linux/security.h | 1 + include/linux/tee_drv.h | 1 + kernel/trace/bpf_trace.c | 5 +- security/security.c | 1 + sound/core/pcm_native.c | 5 +- sound/pci/hda/patch_realtek.c | 2 + tools/testing/selftests/resctrl/resctrl.h | 6 +-- tools/testing/selftests/resctrl/resctrlfs.c | 52 ++++--------------- 26 files changed, 168 insertions(+), 99 deletions(-) -- 2.20.1

1 18

[PATCH openEuler-5.10 1/2] sched/rt: Fix double enqueue caused by rt_effective_prio
by Zheng Zengkai 19 Oct '21

19 Oct '21

From: Peter Zijlstra <peterz(a)infradead.org> stable inclusion from stable-5.10.58 commit a3e6bd0c71bb5e4821aff9ab8f221bfc08039d73 bugzilla: 176984 https://gitee.com/openeuler/kernel/issues/I4E2P4 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit f558c2b834ec27e75d37b1c860c139e7b7c3a8e4 upstream. Double enqueues in rt runqueues (list) have been reported while running a simple test that spawns a number of threads doing a short sleep/run pattern while being concurrently setscheduled between rt and fair class. WARNING: CPU: 3 PID: 2825 at kernel/sched/rt.c:1294 enqueue_task_rt+0x355/0x360 CPU: 3 PID: 2825 Comm: setsched__13 RIP: 0010:enqueue_task_rt+0x355/0x360 Call Trace: __sched_setscheduler+0x581/0x9d0 _sched_setscheduler+0x63/0xa0 do_sched_setscheduler+0xa0/0x150 __x64_sys_sched_setscheduler+0x1a/0x30 do_syscall_64+0x33/0x40 entry_SYSCALL_64_after_hwframe+0x44/0xae list_add double add: new=ffff9867cb629b40, prev=ffff9867cb629b40, next=ffff98679fc67ca0. kernel BUG at lib/list_debug.c:31! invalid opcode: 0000 [#1] PREEMPT_RT SMP PTI CPU: 3 PID: 2825 Comm: setsched__13 RIP: 0010:__list_add_valid+0x41/0x50 Call Trace: enqueue_task_rt+0x291/0x360 __sched_setscheduler+0x581/0x9d0 _sched_setscheduler+0x63/0xa0 do_sched_setscheduler+0xa0/0x150 __x64_sys_sched_setscheduler+0x1a/0x30 do_syscall_64+0x33/0x40 entry_SYSCALL_64_after_hwframe+0x44/0xae __sched_setscheduler() uses rt_effective_prio() to handle proper queuing of priority boosted tasks that are setscheduled while being boosted. rt_effective_prio() is however called twice per each __sched_setscheduler() call: first directly by __sched_setscheduler() before dequeuing the task and then by __setscheduler() to actually do the priority change. If the priority of the pi_top_task is concurrently being changed however, it might happen that the two calls return different results. If, for example, the first call returned the same rt priority the task was running at and the second one a fair priority, the task won't be removed by the rt list (on_list still set) and then enqueued in the fair runqueue. When eventually setscheduled back to rt it will be seen as enqueued already and the WARNING/BUG be issued. Fix this by calling rt_effective_prio() only once and then reusing the return value. While at it refactor code as well for clarity. Concurrent priority inheritance handling is still safe and will eventually converge to a new state by following the inheritance chain(s). Fixes: 0782e63bc6fe ("sched: Handle priority boosted tasks proper in setscheduler()") [squashed Peterz changes; added changelog] Reported-by: Mark Simmons <msimmons(a)redhat.com> Signed-off-by: Juri Lelli <juri.lelli(a)redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Link: https://lkml.kernel.org/r/20210803104501.38333-1-juri.lelli@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Acked-by: Weilong Chen <chenweilong(a)huawei.com> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Signed-off-by: Zheng Zucheng <zhengzucheng(a)huawei.com> --- kernel/sched/core.c | 95 ++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 58 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index cb5c2f9be849..d5434cc99934 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1590,12 +1590,18 @@ void deactivate_task(struct rq *rq, struct task_struct *p, int flags) dequeue_task(rq, p, flags); } -/* - * __normal_prio - return the priority that is based on the static prio - */ -static inline int __normal_prio(struct task_struct *p) +static inline int __normal_prio(int policy, int rt_prio, int nice) { - return p->static_prio; + int prio; + + if (dl_policy(policy)) + prio = MAX_DL_PRIO - 1; + else if (rt_policy(policy)) + prio = MAX_RT_PRIO - 1 - rt_prio; + else + prio = NICE_TO_PRIO(nice); + + return prio; } /* @@ -1607,15 +1613,7 @@ static inline int __normal_prio(struct task_struct *p) */ static inline int normal_prio(struct task_struct *p) { - int prio; - - if (task_has_dl_policy(p)) - prio = MAX_DL_PRIO-1; - else if (task_has_rt_policy(p)) - prio = MAX_RT_PRIO-1 - p->rt_priority; - else - prio = __normal_prio(p); - return prio; + return __normal_prio(p->policy, p->rt_priority, PRIO_TO_NICE(p->static_prio)); } /* @@ -3240,7 +3238,7 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) } else if (PRIO_TO_NICE(p->static_prio) < 0) p->static_prio = NICE_TO_PRIO(0); - p->prio = p->normal_prio = __normal_prio(p); + p->prio = p->normal_prio = p->static_prio; set_load_weight(p, false); /* @@ -4986,6 +4984,18 @@ int default_wake_function(wait_queue_entry_t *curr, unsigned mode, int wake_flag } EXPORT_SYMBOL(default_wake_function); +static void __setscheduler_prio(struct task_struct *p, int prio) +{ + if (dl_prio(prio)) + p->sched_class = &dl_sched_class; + else if (rt_prio(prio)) + p->sched_class = &rt_sched_class; + else + p->sched_class = &fair_sched_class; + + p->prio = prio; +} + #ifdef CONFIG_RT_MUTEXES static inline int __rt_effective_prio(struct task_struct *pi_task, int prio) @@ -5101,22 +5111,19 @@ void rt_mutex_setprio(struct task_struct *p, struct task_struct *pi_task) } else { p->dl.pi_se = &p->dl; } - p->sched_class = &dl_sched_class; } else if (rt_prio(prio)) { if (dl_prio(oldprio)) p->dl.pi_se = &p->dl; if (oldprio < prio) queue_flag |= ENQUEUE_HEAD; - p->sched_class = &rt_sched_class; } else { if (dl_prio(oldprio)) p->dl.pi_se = &p->dl; if (rt_prio(oldprio)) p->rt.timeout = 0; - p->sched_class = &fair_sched_class; } - p->prio = prio; + __setscheduler_prio(p, prio); if (queued) enqueue_task(rq, p, queue_flag); @@ -5349,35 +5356,6 @@ static void __setscheduler_params(struct task_struct *p, set_load_weight(p, true); } -/* Actually do priority change: must hold pi & rq lock. */ -static void __setscheduler(struct rq *rq, struct task_struct *p, - const struct sched_attr *attr, bool keep_boost) -{ - /* - * If params can't change scheduling class changes aren't allowed - * either. - */ - if (attr->sched_flags & SCHED_FLAG_KEEP_PARAMS) - return; - - __setscheduler_params(p, attr); - - /* - * Keep a potential priority boosting if called from - * sched_setscheduler(). - */ - p->prio = normal_prio(p); - if (keep_boost) - p->prio = rt_effective_prio(p, p->prio); - - if (dl_prio(p->prio)) - p->sched_class = &dl_sched_class; - else if (rt_prio(p->prio)) - p->sched_class = &rt_sched_class; - else - p->sched_class = &fair_sched_class; -} - /* * Check the target process has a UID that matches the current process's: */ @@ -5398,10 +5376,8 @@ static int __sched_setscheduler(struct task_struct *p, const struct sched_attr *attr, bool user, bool pi) { - int newprio = dl_policy(attr->sched_policy) ? MAX_DL_PRIO - 1 : - MAX_RT_PRIO - 1 - attr->sched_priority; - int retval, oldprio, oldpolicy = -1, queued, running; - int new_effective_prio, policy = attr->sched_policy; + int oldpolicy = -1, policy = attr->sched_policy; + int retval, oldprio, newprio, queued, running; const struct sched_class *prev_class; struct rq_flags rf; int reset_on_fork; @@ -5611,6 +5587,7 @@ static int __sched_setscheduler(struct task_struct *p, p->sched_reset_on_fork = reset_on_fork; oldprio = p->prio; + newprio = __normal_prio(policy, attr->sched_priority, attr->sched_nice); if (pi) { /* * Take priority boosted tasks into account. If the new @@ -5619,8 +5596,8 @@ static int __sched_setscheduler(struct task_struct *p, * the runqueue. This will be done when the task deboost * itself. */ - new_effective_prio = rt_effective_prio(p, newprio); - if (new_effective_prio == oldprio) + newprio = rt_effective_prio(p, newprio); + if (newprio == oldprio) queue_flags &= ~DEQUEUE_MOVE; } @@ -5633,7 +5610,10 @@ static int __sched_setscheduler(struct task_struct *p, prev_class = p->sched_class; - __setscheduler(rq, p, attr, pi); + if (!(attr->sched_flags & SCHED_FLAG_KEEP_PARAMS)) { + __setscheduler_params(p, attr); + __setscheduler_prio(p, newprio); + } __setscheduler_uclamp(p, attr); if (queued) { @@ -7640,7 +7620,6 @@ static inline int alloc_qos_sched_group(struct task_group *tg, static void sched_change_qos_group(struct task_struct *tsk, struct task_group *tg) { struct sched_attr attr; - struct rq *rq = task_rq(tsk); /* * No need to re-setcheduler when a task is exiting or the task @@ -7651,8 +7630,8 @@ static void sched_change_qos_group(struct task_struct *tsk, struct task_group *t (tg->qos_level == -1)) { attr.sched_priority = 0; attr.sched_policy = SCHED_IDLE; - attr.sched_nice = PRIO_TO_NICE(tsk->static_prio); - __setscheduler(rq, tsk, &attr, 0); + __setscheduler_params(tsk, &attr); + __setscheduler_prio(tsk, tsk->static_prio); } } -- 2.20.1

1 1

[PATCH openEuler-1.0-LTS 1/4] ovl: fix out of date comment and unreachable code
by Yang Yingliang 19 Oct '21

19 Oct '21

From: Amir Goldstein <amir73il(a)gmail.com> mainline inclusion from mainline-v5.7-rc1 commit 735c907d7b7df501e951ba07134b9f6f989a94e4 category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- ovl_inode_update() is no longer called from create object code path. Fixes: 01b39dcc9568 ("ovl: use inode_insert5() to hash a newly...") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Miklos Szeredi <mszeredi(a)redhat.com> Signed-off-by: Zheng Liang <zhengliang6(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/overlayfs/inode.c | 8 +++++--- fs/overlayfs/util.c | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index d1e9d926150b1..b016343a7209b 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -555,9 +555,11 @@ static void ovl_fill_inode(struct inode *inode, umode_t mode, dev_t rdev, * bits to encode layer), set the same value used for st_ino to i_ino, * so inode number exposed via /proc/locks and a like will be * consistent with d_ino and st_ino values. An i_ino value inconsistent - * with d_ino also causes nfsd readdirplus to fail. When called from - * ovl_new_inode(), ino arg is 0, so i_ino will be updated to real - * upper inode i_ino on ovl_inode_init() or ovl_inode_update(). + * with d_ino also causes nfsd readdirplus to fail. + * + * When called from ovl_create_object() => ovl_new_inode(), with + * ino = 0, i_ino will be updated to consistent value later on in + * ovl_get_inode() => ovl_fill_inode(). */ if (ovl_same_dev(inode->i_sb)) { inode->i_ino = ino; diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index eb9411461b695..b83955f31ded0 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -419,8 +419,6 @@ void ovl_inode_update(struct inode *inode, struct dentry *upperdentry) smp_wmb(); OVL_I(inode)->__upperdentry = upperdentry; if (inode_unhashed(inode)) { - if (!inode->i_ino) - inode->i_ino = upperinode->i_ino; inode->i_private = upperinode; __insert_inode_hash(inode, (unsigned long) upperinode); } -- 2.25.1

1 3