- Kernel - mailweb.openeuler.org

[PATCH openEuler-23.09 00/14] LoongArch: fix some pci problems
by Hongchen Zhang 28 Sep '23

28 Sep '23

Hongchen Zhang (14): LoongArch: fix ls2k500 bmc not work when installing iso LS7A2000 : Add quirk for OHCI device rev 0x02 PCI: Check if entry->offset already exist for mem resource PCI: Check if the pci controller can use both CFG0 and CFG1 mode to access configuration space PCI: PM: Fix pcie mrrs restoring pci: fix kabi error caused by pm_suspend_target_state LoongArch: Fixed some pcie card not scanning properly pci/quirks: ls7a2000: fix pm transition of devices under pcie port LS7A2000: PCIE: Fixup GPU card error pci: fix X server auto probe fail when both ast and etnaviv drm present LoongArch: pci root bridige set acpi companion only when not acpi_disabled. LoongArch: Fix secondary bridge routing errors pci: irq: Add early_param pci_irq_limit to limit pci irq numbers irqchip/loongson-pch-pic: 7a1000 int_clear reg must use 64bit write. arch/loongarch/pci/acpi.c | 23 ++-- drivers/gpu/drm/loongson/loongson_module.c | 15 +++ drivers/irqchip/irq-loongson-pch-pic.c | 22 +-- drivers/pci/controller/pci-loongson.c | 147 ++++++++++++++++++++- drivers/pci/msi/msi.c | 25 ++++ drivers/pci/pci.c | 20 ++- 6 files changed, 228 insertions(+), 24 deletions(-) -- 2.33.0

1 5

[PATCH openEuler-23.09 00/11] LoongArch: some optimization and
by Hongchen Zhang 28 Sep '23

28 Sep '23

Hongchen Zhang (11): LoongArch: Adapted SECTION_SIZE_BITS with page size LoongArch: Remove redudant csr save/restore LoongArch: use 40 bits address space for user LoongArch: refresh usage of sync LoongArch: fix SECCOMP test error LoongArch: Change definition of cpu_relax() for Loongson-3 usb: xhci: add XHCI_NO_SOFT_RETRY quirk for EJ188 net: stmmac: fix potential double free of dma descriptor resources LoongArch: Remove generic irq migration irqchip/loongson-pch-pic: 7a1000 int_clear reg must use 64bit write. LoongArch: defconfig: Enable a large number of configurations arch/loongarch/Kconfig | 8 +- arch/loongarch/configs/loongson3_defconfig | 1586 +++++++++++++++-- arch/loongarch/include/asm/atomic.h | 8 + arch/loongarch/include/asm/cmpxchg.h | 2 + arch/loongarch/include/asm/futex.h | 2 + arch/loongarch/include/asm/irq.h | 1 + arch/loongarch/include/asm/pgtable.h | 7 +- arch/loongarch/include/asm/sparsemem.h | 2 +- arch/loongarch/include/asm/stackframe.h | 9 - arch/loongarch/include/asm/thread_info.h | 1 + arch/loongarch/include/asm/vdso/processor.h | 11 +- arch/loongarch/kernel/entry.S | 8 - arch/loongarch/kernel/irq.c | 36 + arch/loongarch/kernel/smp.c | 3 +- arch/loongarch/kernel/switch.S | 6 - arch/loongarch/mm/pgtable.c | 2 - drivers/irqchip/irq-loongson-pch-pic.c | 16 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 11 + drivers/usb/host/xhci-pci.c | 6 + kernel/irq/Kconfig | 4 +- 20 files changed, 1546 insertions(+), 183 deletions(-) -- 2.33.0

2 12

[PATCH openEuler-23.09 00/14] LoongArch: fix some pci problems
by Hongchen Zhang 28 Sep '23

28 Sep '23

Hongchen Zhang (14): LoongArch: fix ls2k500 bmc not work when installing iso LS7A2000 : Add quirk for OHCI device rev 0x02 PCI: Check if entry->offset already exist for mem resource PCI: Check if the pci controller can use both CFG0 and CFG1 mode to access configuration space PCI: PM: Fix pcie mrrs restoring pci: fix kabi error caused by pm_suspend_target_state LoongArch: Fixed some pcie card not scanning properly pci/quirks: ls7a2000: fix pm transition of devices under pcie port LS7A2000: PCIE: Fixup GPU card error pci: fix X server auto probe fail when both ast and etnaviv drm present LoongArch: pci root bridige set acpi companion only when not acpi_disabled. LoongArch: Fix secondary bridge routing errors pci: irq: Add early_param pci_irq_limit to limit pci irq numbers irqchip/loongson-pch-pic: 7a1000 int_clear reg must use 64bit write. arch/loongarch/pci/acpi.c | 23 ++-- drivers/gpu/drm/loongson/loongson_module.c | 15 +++ drivers/irqchip/irq-loongson-pch-pic.c | 22 +-- drivers/pci/controller/pci-loongson.c | 147 ++++++++++++++++++++- drivers/pci/msi/msi.c | 25 ++++ drivers/pci/pci.c | 20 ++- 6 files changed, 228 insertions(+), 24 deletions(-) -- 2.33.0

2 15

[PATCH openEuler-23.09 00/24] LoongArch: some fix and optimization for LoongArch machine
by Hongchen Zhang 28 Sep '23

28 Sep '23

Hongchen Zhang (24): LoongArch: fix ls2k500 bmc not work when installing iso LoongArch: Adapted SECTION_SIZE_BITS with page size LoongArch: Remove redudant csr save/restore LoongArch: use 40 bits address space for user LoongArch: refresh usage of sync LoongArch: fix SECCOMP test error LoongArch: Change definition of cpu_relax() for Loongson-3 LS7A2000 : Add quirk for OHCI device rev 0x02 PCI: Check if entry->offset already exist for mem resource PCI: Check if the pci controller can use both CFG0 and CFG1 mode to access configuration space PCI: PM: Fix pcie mrrs restoring pci: fix kabi error caused by pm_suspend_target_state LoongArch: Fixed some pcie card not scanning properly pci/quirks: ls7a2000: fix pm transition of devices under pcie port LS7A2000: PCIE: Fixup GPU card error pci: fix X server auto probe fail when both ast and etnaviv drm present LoongArch: pci root bridige set acpi companion only when not acpi_disabled. usb: xhci: add XHCI_NO_SOFT_RETRY quirk for EJ188 net: stmmac: fix potential double free of dma descriptor resources LoongArch: Fix secondary bridge routing errors LoongArch: Remove generic irq migration pci: irq: Add early_param pci_irq_limit to limit pci irq numbers irqchip/loongson-pch-pic: 7a1000 int_clear reg must use 64bit write. LoongArch: defconfig: Enable a large number of configurations arch/loongarch/Kconfig | 8 +- arch/loongarch/configs/loongson3_defconfig | 1586 +++++++++++++++-- arch/loongarch/include/asm/atomic.h | 8 + arch/loongarch/include/asm/cmpxchg.h | 2 + arch/loongarch/include/asm/futex.h | 2 + arch/loongarch/include/asm/irq.h | 1 + arch/loongarch/include/asm/pgtable.h | 7 +- arch/loongarch/include/asm/sparsemem.h | 2 +- arch/loongarch/include/asm/stackframe.h | 9 - arch/loongarch/include/asm/thread_info.h | 1 + arch/loongarch/include/asm/vdso/processor.h | 11 +- arch/loongarch/kernel/entry.S | 8 - arch/loongarch/kernel/irq.c | 36 + arch/loongarch/kernel/smp.c | 3 +- arch/loongarch/kernel/switch.S | 6 - arch/loongarch/mm/pgtable.c | 2 - arch/loongarch/pci/acpi.c | 23 +- drivers/gpu/drm/loongson/loongson_module.c | 15 + drivers/irqchip/irq-loongson-pch-pic.c | 22 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 11 + drivers/pci/controller/pci-loongson.c | 147 +- drivers/pci/msi/msi.c | 25 + drivers/pci/pci.c | 20 +- drivers/usb/host/xhci-pci.c | 6 + kernel/irq/Kconfig | 4 +- 25 files changed, 1763 insertions(+), 202 deletions(-) -- 2.33.0

1 15

[src-openeuler/rdma-core v3 0/5] Support reporting wc as software mode
by Chengchang Tang 26 Sep '23

26 Sep '23

From: Juan Zhou <zhoujuan51(a)h-partners.com> Chengchang Tang (5): libhns: Support reporting wc as software mode libhns: return error when post send in reset state libhns: separate the initialization steps of lock libhns: assign doorbell to zero when allocate it libhns: Fix missing reset notification. providers/hns/hns_roce_u.c | 4 + providers/hns/hns_roce_u.h | 14 ++ providers/hns/hns_roce_u_db.c | 2 + providers/hns/hns_roce_u_hw_v2.c | 272 +++++++++++++++++++++++++++---- providers/hns/hns_roce_u_hw_v2.h | 2 + providers/hns/hns_roce_u_verbs.c | 147 ++++++++++++++--- 6 files changed, 387 insertions(+), 54 deletions(-) -- 2.30.0

1 5

[OLK-5.10 1/2] RDMA/hns: Fix potential UAF after reset
by Chengchang Tang 26 Sep '23

26 Sep '23

driver inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/rdma-core/issues/I83L7U ---------------------------------------------------------- Currently, the mapping relationship of reset page between kernel mode and user mode is maintained by driver. If the driver is hot-plugged (e.g. reset), the memory of the reset page is released by kernel driver, but the reset page in user mode still points to this released address which would lead to a UAF. This patch use the helper rdma_user_mmap_io() to maintain the vma mapping, rather than driver itself, which remmaps the userspace reset page to an safe zero page if driver was hot-plugged. Fixes: e8b1fec497a0 ("RDMA/hns: Kernel notify usr space to stop ring db") Signed-off-by: Chengchang Tang <tangchengchang(a)huawei.com> --- drivers/infiniband/hw/hns/hns_roce_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c index 4a16200ab950..2f0a5b2bbc50 100644 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c @@ -675,10 +675,9 @@ static int hns_roce_mmap(struct ib_ucontext *uctx, struct vm_area_struct *vma) goto out; } - ret = remap_pfn_range(vma, vma->vm_start, - page_to_pfn(hr_dev->reset_page), - PAGE_SIZE, vma->vm_page_prot); - goto out; + prot = vma->vm_page_prot; + pfn = page_to_pfn(hr_dev->reset_page); + break; default: ret = -EINVAL; goto out; -- 2.30.0

1 1

[PATCH OLK-5.10] drm/inspur: fix compile warning
by Hongchen Zhang 26 Sep '23

26 Sep '23

LoongArch inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I84IWW ------------------------------------------ Fix the following warning of inspur BMC drm driver: drivers/gpu/drm/inspur/inspur_drm_drv.c: In function ‘inspur_pci_probe’: drivers/gpu/drm/inspur/inspur_drm_drv.c:379:29: warning: unused variable ‘priv’ [-Wunused-variable] 379 | struct inspur_drm_private *priv; | ^~~~ Fixes: b9d65551a3ad ("drm: add inspur drm driver support") Signed-off-by: Hongchen Zhang <zhanghongchen(a)loongson.cn> --- drivers/gpu/drm/inspur/inspur_drm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/inspur/inspur_drm_drv.c b/drivers/gpu/drm/inspur/inspur_drm_drv.c index d7026e1df167..f615d6d89109 100644 --- a/drivers/gpu/drm/inspur/inspur_drm_drv.c +++ b/drivers/gpu/drm/inspur/inspur_drm_drv.c @@ -376,7 +376,7 @@ static int inspur_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { int ret = 0; - struct inspur_drm_private *priv; + struct inspur_drm_private __maybe_unused *priv; struct drm_device *dev; inspur_remove_framebuffers(pdev); -- 2.33.0

2 1

[PATCH openEuler-1.0-LTS] sched/rt: Fix RT utilization tracking during policy change
by Xia Fukun 26 Sep '23

26 Sep '23

From: Vincent Donnefort <vincent.donnefort(a)arm.com> stable inclusion from stable-5.10.50 commit c576472a051a9975e2433de6c80ed27acea2d6f9 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I84IKS CVE: NA -------------------------------- [ Upstream commit fecfcbc288e9f4923f40fd23ca78a6acdc7fdf6c ] RT keeps track of the utilization on a per-rq basis with the structure avg_rt. This utilization is updated during task_tick_rt(), put_prev_task_rt() and set_next_task_rt(). However, when the current running task changes its policy, set_next_task_rt() which would usually take care of updating the utilization when the rq starts running RT tasks, will not see a such change, leaving the avg_rt structure outdated. When that very same task will be dequeued later, put_prev_task_rt() will then update the utilization, based on a wrong last_update_time, leading to a huge spike in the RT utilization signal. The signal would eventually recover from this issue after few ms. Even if no RT tasks are run, avg_rt is also updated in __update_blocked_others(). But as the CPU capacity depends partly on the avg_rt, this issue has nonetheless a significant impact on the scheduler. Fix this issue by ensuring a load update when a running task changes its policy to RT. Fixes: 371bf427 ("sched/rt: Add rt_rq utilization tracking") Signed-off-by: Vincent Donnefort <vincent.donnefort(a)arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Reviewed-by: Vincent Guittot <vincent.guittot(a)linaro.org> Link: https://lore.kernel.org/r/1624271872-211872-2-git-send-email-vincent.donnef… Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Xia Fukun <xiafukun(a)huawei.com> --- kernel/sched/rt.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 5dff9a6fe2cf..28fc1e341e17 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -2242,13 +2242,20 @@ void __init init_sched_rt_class(void) static void switched_to_rt(struct rq *rq, struct task_struct *p) { /* - * If we are already running, then there's nothing - * that needs to be done. But if we are not running - * we may need to preempt the current running task. - * If that current running task is also an RT task + * If we are running, update the avg_rt tracking, as the running time + * will now on be accounted into the latter. + */ + if (task_current(rq, p)) { + update_rt_rq_load_avg(rq_clock_pelt(rq), rq, 0); + return; + } + + /* + * If we are not running we may need to preempt the current + * running task. If that current running task is also an RT task * then see if we can move to another run queue. */ - if (task_on_rq_queued(p) && rq->curr != p) { + if (task_on_rq_queued(p)) { #ifdef CONFIG_SMP if (p->nr_cpus_allowed > 1 && rq->rt.overloaded) rt_queue_push_tasks(rq); -- 2.34.1

2 1

[PATCH openEuler-1.0-LTS] cifs: Release folio lock on fscache read hit.
by ZhaoLong Wang 26 Sep '23

26 Sep '23

From: Russell Harmon via samba-technical <samba-technical(a)lists.samba.org> stable inclusion from stable-v4.19.293 commit 5a87735675147f848445f05fd1f06168188f91af category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I84IKB CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 69513dd669e243928f7450893190915a88f84a2b upstream. Under the current code, when cifs_readpage_worker is called, the call contract is that the callee should unlock the page. This is documented in the read_folio section of Documentation/filesystems/vfs.rst as: > The filesystem should unlock the folio once the read has completed, > whether it was successful or not. Without this change, when fscache is in use and cache hit occurs during a read, the page lock is leaked, producing the following stack on subsequent reads (via mmap) to the page: $ cat /proc/3890/task/12864/stack [<0>] folio_wait_bit_common+0x124/0x350 [<0>] filemap_read_folio+0xad/0xf0 [<0>] filemap_fault+0x8b1/0xab0 [<0>] __do_fault+0x39/0x150 [<0>] do_fault+0x25c/0x3e0 [<0>] __handle_mm_fault+0x6ca/0xc70 [<0>] handle_mm_fault+0xe9/0x350 [<0>] do_user_addr_fault+0x225/0x6c0 [<0>] exc_page_fault+0x84/0x1b0 [<0>] asm_exc_page_fault+0x27/0x30 This requires a reboot to resolve; it is a deadlock. Note however that the call to cifs_readpage_from_fscache does mark the page clean, but does not free the folio lock. This happens in __cifs_readpage_from_fscache on success. Releasing the lock at that point however is not appropriate as cifs_readahead also calls cifs_readpage_from_fscache and *does* unconditionally release the lock after its return. This change therefore effectively makes cifs_readpage_worker work like cifs_readahead. Signed-off-by: Russell Harmon <russ(a)har.mn> Acked-by: Paulo Alcantara (SUSE) <pc(a)manguebit.com> Reviewed-by: David Howells <dhowells(a)redhat.com> Cc: stable(a)vger.kernel.org Signed-off-by: Steve French <stfrench(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: ZhaoLong Wang <wangzhaolong1(a)huawei.com> --- fs/cifs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index bc3d0d76c2c4..875cb44ba573 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -4005,9 +4005,9 @@ static int cifs_readpage_worker(struct file *file, struct page *page, io_error: kunmap(page); - unlock_page(page); read_complete: + unlock_page(page); return rc; } -- 2.34.3

2 1

[PATCH OLK-5.10] xfrm6: fix inet6_dev refcount underflow problem
by Zhengchao Shao 26 Sep '23

26 Sep '23

From: Lu Wei <luwei32(a)huawei.com> maillist inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I84HSL Reference: https://lore.kernel.org/netdev/CADvbK_euiOKytyFd6KYgNoM5SbDcyz92Li=K7P48H35… -------------------------------- There are race conditions that may lead to inet6_dev refcount underflow in xfrm6_dst_destroy() and rt6_uncached_list_flush_dev(). One of the refcount underflow bugs is shown below: (cpu 1) | (cpu 2) xfrm6_dst_destroy() | ... | in6_dev_put() | | rt6_uncached_list_flush_dev() ... | ... | in6_dev_put() rt6_uncached_list_del() | ... ... | xfrm6_dst_destroy() calls rt6_uncached_list_del() after in6_dev_put(), so rt6_uncached_list_flush_dev() has a chance to call in6_dev_put() again for the same inet6_dev. Fix it by moving in6_dev_put() after rt6_uncached_list_del() in xfrm6_dst_destroy(). Fixes: 510c321b5571 ("xfrm: reuse uncached_list to track xdsts") Signed-off-by: Zhang Changzhong <zhangchangzhong(a)huawei.com> Reviewed-by: Xin Long <lucien.xin(a)gmail.com> Signed-off-by: Lu Wei <luwei32(a)huawei.com> Signed-off-by: Zhengchao Shao <shaozhengchao(a)huawei.com> --- net/ipv6/xfrm6_policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 247296e3294b..4c3aa97f23fa 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -120,11 +120,11 @@ static void xfrm6_dst_destroy(struct dst_entry *dst) { struct xfrm_dst *xdst = (struct xfrm_dst *)dst; - if (likely(xdst->u.rt6.rt6i_idev)) - in6_dev_put(xdst->u.rt6.rt6i_idev); dst_destroy_metrics_generic(dst); if (xdst->u.rt6.rt6i_uncached_list) rt6_uncached_list_del(&xdst->u.rt6); + if (likely(xdst->u.rt6.rt6i_idev)) + in6_dev_put(xdst->u.rt6.rt6i_idev); xfrm_dst_destroy(xdst); } -- 2.34.1

2 1