September 2020 - Kernel - mailweb.openeuler.org

perf spe-c2c record失败的问题
by haoxin 15 Dec '21

15 Dec '21

您好，我采用最细的openEuler-1.0测试perf spe-c2c的功能，但是发现/sys/devices下没有arm_spe_0这个目录执行perf spe-c2c record时显示： event syntax error: 'arm_spe_0/ts_enable=1,pct_enable=1,pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/' \___ Cannot find PMU `arm_spe_0'. Missing kernel support? 想问下您这是为什么？需要哪里开启spe功能吗？

3 2

[PATCH] mm/swapfile: fix and annotate various data races
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Qian Cai <cai(a)lca.pw> mainline inclusion from mainline-v5.9-rc1 commit a449bf58e45abf919b27ba62a9dcbae3ad36e725 category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- swap_info_struct si.highest_bit, si.swap_map[offset] and si.flags could be accessed concurrently separately as noticed by KCSAN, === si.highest_bit === write to 0xffff8d5abccdc4d4 of 4 bytes by task 5353 on cpu 24: swap_range_alloc+0x81/0x130 swap_range_alloc at mm/swapfile.c:681 scan_swap_map_slots+0x371/0xb90 get_swap_pages+0x39d/0x5c0 get_swap_page+0xf2/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 read to 0xffff8d5abccdc4d4 of 4 bytes by task 6672 on cpu 70: scan_swap_map_slots+0x4a6/0xb90 scan_swap_map_slots at mm/swapfile.c:892 get_swap_pages+0x39d/0x5c0 get_swap_page+0xf2/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 Reported by Kernel Concurrency Sanitizer on: CPU: 70 PID: 6672 Comm: oom01 Tainted: G W L 5.5.0-next-20200205+ #3 Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 === si.swap_map[offset] === write to 0xffffbc370c29a64c of 1 bytes by task 6856 on cpu 86: __swap_entry_free_locked+0x8c/0x100 __swap_entry_free_locked at mm/swapfile.c:1209 (discriminator 4) __swap_entry_free.constprop.20+0x69/0xb0 free_swap_and_cache+0x53/0xa0 unmap_page_range+0x7f8/0x1d70 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0x10e/0x270 do_exit+0x59b/0xf40 do_group_exit+0x8b/0x180 read to 0xffffbc370c29a64c of 1 bytes by task 6855 on cpu 20: _swap_info_get+0x81/0xa0 _swap_info_get at mm/swapfile.c:1140 free_swap_and_cache+0x40/0xa0 unmap_page_range+0x7f8/0x1d70 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0x10e/0x270 do_exit+0x59b/0xf40 do_group_exit+0x8b/0x180 === si.flags === write to 0xffff956c8fc6c400 of 8 bytes by task 6087 on cpu 23: scan_swap_map_slots+0x6fe/0xb50 scan_swap_map_slots at mm/swapfile.c:887 get_swap_pages+0x39d/0x5c0 get_swap_page+0x377/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 read to 0xffff956c8fc6c400 of 8 bytes by task 6207 on cpu 63: _swap_info_get+0x41/0xa0 __swap_info_get at mm/swapfile.c:1114 put_swap_page+0x84/0x490 __remove_mapping+0x384/0x5f0 shrink_page_list+0xff1/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 The writes are under si->lock but the reads are not. For si.highest_bit and si.swap_map[offset], data race could trigger logic bugs, so fix them by having WRITE_ONCE() for the writes and READ_ONCE() for the reads except those isolated reads where they compare against zero which a data race would cause no harm. Thus, annotate them as intentional data races using the data_race() macro. For si.flags, the readers are only interested in a single bit where a data race there would cause no issue there. [cai(a)lca.pw: add a missing annotation for si->flags in memory.c] Link: http://lkml.kernel.org/r/1581612647-5958-1-git-send-email-cai@lca.pw Signed-off-by: Qian Cai <cai(a)lca.pw> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Cc: Marco Elver <elver(a)google.com> Cc: Hugh Dickins <hughd(a)google.com> Link: http://lkml.kernel.org/r/1581095163-12198-1-git-send-email-cai@lca.pw Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> [yyl: remove data_race(), this macro is used when KCSAN is enabled] Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/swapfile.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 60ccb3072318..41400ae4e7c1 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -639,7 +639,7 @@ static void swap_range_alloc(struct swap_info_struct *si, unsigned long offset, if (offset == si->lowest_bit) si->lowest_bit += nr_entries; if (end == si->highest_bit) - si->highest_bit -= nr_entries; + WRITE_ONCE(si->highest_bit, si->highest_bit - nr_entries); si->inuse_pages += nr_entries; if (si->inuse_pages == si->pages) { si->lowest_bit = si->max; @@ -671,7 +671,7 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset, if (end > si->highest_bit) { bool was_full = !si->highest_bit; - si->highest_bit = end; + WRITE_ONCE(si->highest_bit, end); if (was_full && (si->flags & SWP_WRITEOK)) add_to_avail_list(si); } @@ -804,7 +804,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si, else goto done; } - si->swap_map[offset] = usage; + WRITE_ONCE(si->swap_map[offset], usage); inc_cluster_info_page(si, si->cluster_info, offset); unlock_cluster(ci); @@ -850,12 +850,13 @@ static int scan_swap_map_slots(struct swap_info_struct *si, scan: spin_unlock(&si->lock); - while (++offset <= si->highest_bit) { + while (++offset <= READ_ONCE(si->highest_bit)) { if (!si->swap_map[offset]) { spin_lock(&si->lock); goto checks; } - if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) { + if (vm_swap_full() && + READ_ONCE(si->swap_map[offset]) == SWAP_HAS_CACHE) { spin_lock(&si->lock); goto checks; } @@ -870,7 +871,8 @@ static int scan_swap_map_slots(struct swap_info_struct *si, spin_lock(&si->lock); goto checks; } - if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) { + if (vm_swap_full() && + READ_ONCE(si->swap_map[offset]) == SWAP_HAS_CACHE) { spin_lock(&si->lock); goto checks; } @@ -1166,7 +1168,10 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p, } usage = count | has_cache; - p->swap_map[offset] = usage ? : SWAP_HAS_CACHE; + if (usage) + WRITE_ONCE(p->swap_map[offset], usage); + else + WRITE_ONCE(p->swap_map[offset], SWAP_HAS_CACHE); return usage; } @@ -3522,7 +3527,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) } else err = -ENOENT; /* unused swap entry */ - p->swap_map[offset] = count | has_cache; + WRITE_ONCE(p->swap_map[offset], count | has_cache); unlock_out: unlock_cluster_or_swap_info(p, ci); -- 2.25.1

1 0

[PATCH] iommu: fix a mistake for iommu_unregister_device_fault_handler
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Bixuan Cui <cuibixuan(a)huawei.com> ascend inclusion category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- Fix a mistake check for commit bd6c06e0917d ("iommu: introduce device fault report API") Fixes: bd6c06e0917d ("iommu: introduce device fault report API") Signed-off-by: Bixuan Cui <cuibixuan(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 831c5065f7f8..bee6b8fcfe0e 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -982,7 +982,7 @@ int iommu_unregister_device_fault_handler(struct device *dev) mutex_lock(&param->lock); /* we cannot unregister handler if there are pending faults */ - if (list_empty(&param->fault_param->faults)) { + if (!list_empty(&param->fault_param->faults)) { ret = -EBUSY; goto unlock; } -- 2.25.1

1 0

[PATCH] arm64: Kconfig: change fix compile error if gcc don't support armv8.4-a
by Yang Yingliang 30 Sep '20

30 Sep '20

hulk inclusion category: feature CVE: NA ----------------------- After 4d0831e8a029 ("kconfig: unify cc-option and as-option") in mainline, we can use cc-option. But in linux-4.19, this patch is not merged, so we will get the follow error: CC scripts/mod/empty.o CC scripts/mod/devicetable-offsets.s Assembler messages: Error: unknown architecture `armv8.4-a' Error: unrecognized option -march=armv8.4-a Fix this by changing cc-option to as-option. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1ef7862d1b75..e379fca3c8ad 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1307,7 +1307,7 @@ endmenu menu "ARMv8.4 architectural features" config AS_HAS_ARMV8_4 - def_bool $(cc-option,-Wa$(comma)-march=armv8.4-a) + def_bool $(as-option,-Wa$(comma)-march=armv8.4-a) config ARM64_TLB_RANGE bool "Enable support for tlbi range feature" -- 2.25.1

1 0

[PATCH 1/2] block: loop: set discard granularity and alignment for block device backed loop
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Ming Lei <ming.lei(a)redhat.com> mainline inclusion from mainline-v5.9-rc3 commit bcb21c8cc9947286211327d663ace69f07d37a76 category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- In case of block device backend, if the backend supports write zeros, the loop device will set queue flag of QUEUE_FLAG_DISCARD. However, limits.discard_granularity isn't setup, and this way is wrong, see the following description in Documentation/ABI/testing/sysfs-block: A discard_granularity of 0 means that the device does not support discard functionality. Especially 9b15d109a6b2 ("block: improve discard bio alignment in __blkdev_issue_discard()") starts to take q->limits.discard_granularity for computing max discard sectors. And zero discard granularity may cause kernel oops, or fail discard request even though the loop queue claims discard support via QUEUE_FLAG_DISCARD. Fix the issue by setup discard granularity and alignment. Fixes: c52abf563049 ("loop: Better discard support for block devices") Signed-off-by: Ming Lei <ming.lei(a)redhat.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Acked-by: Coly Li <colyli(a)suse.de> Cc: Hannes Reinecke <hare(a)suse.com> Cc: Xiao Ni <xni(a)redhat.com> Cc: Martin K. Petersen <martin.petersen(a)oracle.com> Cc: Evan Green <evgreen(a)chromium.org> Cc: Gwendal Grignou <gwendal(a)chromium.org> Cc: Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> Cc: Andrzej Pietrasiewicz <andrzej.p(a)collabora.com> Cc: Christoph Hellwig <hch(a)lst.de> Cc: <stable(a)vger.kernel.org> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Yufen Yu <yuyufen(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/block/loop.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index da68c42aed68..19042b42a8ba 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -864,6 +864,7 @@ static void loop_config_discard(struct loop_device *lo) struct file *file = lo->lo_backing_file; struct inode *inode = file->f_mapping->host; struct request_queue *q = lo->lo_queue; + u32 granularity, max_discard_sectors; /* * If the backing device is a block device, mirror its zeroing @@ -876,11 +877,10 @@ static void loop_config_discard(struct loop_device *lo) struct request_queue *backingq; backingq = bdev_get_queue(inode->i_bdev); - blk_queue_max_discard_sectors(q, - backingq->limits.max_write_zeroes_sectors); - blk_queue_max_write_zeroes_sectors(q, - backingq->limits.max_write_zeroes_sectors); + max_discard_sectors = backingq->limits.max_write_zeroes_sectors; + granularity = backingq->limits.discard_granularity ?: + queue_physical_block_size(backingq); /* * We use punch hole to reclaim the free space used by the @@ -889,23 +889,26 @@ static void loop_config_discard(struct loop_device *lo) * useful information. */ } else if (!file->f_op->fallocate || lo->lo_encrypt_key_size) { - q->limits.discard_granularity = 0; - q->limits.discard_alignment = 0; - blk_queue_max_discard_sectors(q, 0); - blk_queue_max_write_zeroes_sectors(q, 0); + max_discard_sectors = 0; + granularity = 0; } else { - q->limits.discard_granularity = inode->i_sb->s_blocksize; - q->limits.discard_alignment = 0; - - blk_queue_max_discard_sectors(q, UINT_MAX >> 9); - blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); + max_discard_sectors = UINT_MAX >> 9; + granularity = inode->i_sb->s_blocksize; } - if (q->limits.max_write_zeroes_sectors) + if (max_discard_sectors) { + q->limits.discard_granularity = granularity; + blk_queue_max_discard_sectors(q, max_discard_sectors); + blk_queue_max_write_zeroes_sectors(q, max_discard_sectors); blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); - else + } else { + q->limits.discard_granularity = 0; + blk_queue_max_discard_sectors(q, 0); + blk_queue_max_write_zeroes_sectors(q, 0); blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); + } + q->limits.discard_alignment = 0; } static void loop_unprepare_queue(struct loop_device *lo) -- 2.25.1

1 1

[PATCH 1/2] Revert "KVM: arm64: Add kvm_extable for vaxorcism code"
by Yang Yingliang 30 Sep '20

30 Sep '20

This reverts commit 8cc25436c41592b2236b4d2911a3031131a62872. --- arch/arm64/include/asm/kvm_asm.h | 15 ---------- arch/arm64/kernel/vmlinux.lds.S | 8 ----- arch/arm64/kvm/hyp/entry.S | 16 ++++------ arch/arm64/kvm/hyp/hyp-entry.S | 51 +++++++++++++------------------- arch/arm64/kvm/hyp/switch.c | 31 ------------------- 5 files changed, 26 insertions(+), 95 deletions(-) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 5df55a4dab42..400cb2af5ba6 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -146,21 +146,6 @@ extern u32 __kvm_get_mdcr_el2(void); kern_hyp_va \vcpu .endm -/* - * KVM extable for unexpected exceptions. - * In the same format _asm_extable, but output to a different section so that - * it can be mapped to EL2. The KVM version is not sorted. The caller must - * ensure: - * x18 has the hypervisor value to allow any Shadow-Call-Stack instrumented - * code to write to it, and that SPSR_EL2 and ELR_EL2 are restored by the fixup. - */ -.macro _kvm_extable, from, to - .pushsection __kvm_ex_table, "a" - .align 3 - .long (\from - .), (\to - .) - .popsection -.endm - #endif #endif /* __ARM_KVM_ASM_H__ */ diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 69e7c8d4a00f..d6050c6e65bc 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -24,13 +24,6 @@ ENTRY(_text) jiffies = jiffies_64; - -#define HYPERVISOR_EXTABLE \ - . = ALIGN(SZ_8); \ - __start___kvm_ex_table = .; \ - *(__kvm_ex_table) \ - __stop___kvm_ex_table = .; - #define HYPERVISOR_TEXT \ /* \ * Align to 4 KB so that \ @@ -46,7 +39,6 @@ jiffies = jiffies_64; __hyp_idmap_text_end = .; \ __hyp_text_start = .; \ *(.hyp.text) \ - HYPERVISOR_EXTABLE \ __hyp_text_end = .; #define IDMAP_TEXT \ diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 90e012fa3ca5..a0552b5177c5 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -164,22 +164,18 @@ alternative_endif // This is our single instruction exception window. A pending // SError is guaranteed to occur at the earliest when we unmask // it, and at the latest just after the ISB. + .global abort_guest_exit_start abort_guest_exit_start: isb + .global abort_guest_exit_end abort_guest_exit_end: - msr daifset, #4 // Mask aborts - ret - - _kvm_extable abort_guest_exit_start, 9997f - _kvm_extable abort_guest_exit_end, 9997f -9997: - msr daifset, #4 // Mask aborts - mov x0, #(1 << ARM_EXIT_WITH_SERROR_BIT) - // restore the EL1 exception context so that we can report some - // information. Merge the exception code with the SError pending bit. + // If the exception took place, restore the EL1 exception + // context so that we can report some information. + // Merge the exception code with the SError pending bit. + tbz x0, #ARM_EXIT_WITH_SERROR_BIT, 1f msr elr_el2, x2 msr esr_el2, x3 msr spsr_el2, x4 diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index c3e4ae84f3a4..71591a6ee63e 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -26,30 +26,6 @@ #include <asm/kvm_mmu.h> #include <asm/mmu.h> -.macro save_caller_saved_regs_vect - /* x0 and x1 were saved in the vector entry */ - stp x2, x3, [sp, #-16]! - stp x4, x5, [sp, #-16]! - stp x6, x7, [sp, #-16]! - stp x8, x9, [sp, #-16]! - stp x10, x11, [sp, #-16]! - stp x12, x13, [sp, #-16]! - stp x14, x15, [sp, #-16]! - stp x16, x17, [sp, #-16]! -.endm - -.macro restore_caller_saved_regs_vect - ldp x16, x17, [sp], #16 - ldp x14, x15, [sp], #16 - ldp x12, x13, [sp], #16 - ldp x10, x11, [sp], #16 - ldp x8, x9, [sp], #16 - ldp x6, x7, [sp], #16 - ldp x4, x5, [sp], #16 - ldp x2, x3, [sp], #16 - ldp x0, x1, [sp], #16 -.endm - .text .pushsection .hyp.text, "ax" @@ -209,14 +185,27 @@ el2_sync: el2_error: - save_caller_saved_regs_vect - stp x29, x30, [sp, #-16]! - - bl kvm_unexpected_el2_exception - - ldp x29, x30, [sp], #16 - restore_caller_saved_regs_vect + ldp x0, x1, [sp], #16 + /* + * Only two possibilities: + * 1) Either we come from the exit path, having just unmasked + * PSTATE.A: change the return code to an EL2 fault, and + * carry on, as we're already in a sane state to handle it. + * 2) Or we come from anywhere else, and that's a bug: we panic. + * + * For (1), x0 contains the original return code and x1 doesn't + * contain anything meaningful at that stage. We can reuse them + * as temp registers. + * For (2), who cares? + */ + mrs x0, elr_el2 + adr x1, abort_guest_exit_start + cmp x0, x1 + adr x1, abort_guest_exit_end + ccmp x0, x1, #4, ne + b.ne __hyp_panic + mov x0, #(1 << ARM_EXIT_WITH_SERROR_BIT) eret sb diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index e9ea7cf3e98f..acd2d84b190c 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -25,7 +25,6 @@ #include <asm/barrier.h> #include <asm/cpufeature.h> -#include <asm/extable.h> #include <asm/kprobes.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> @@ -37,9 +36,6 @@ #include <asm/processor.h> #include <asm/thread_info.h> -extern struct exception_table_entry __start___kvm_ex_table; -extern struct exception_table_entry __stop___kvm_ex_table; - /* Check whether the FP regs were dirtied while in the host-side run loop: */ static bool __hyp_text update_fp_enabled(struct kvm_vcpu *vcpu) { @@ -730,30 +726,3 @@ void __hyp_text __noreturn hyp_panic(struct kvm_cpu_context *host_ctxt) unreachable(); } - -asmlinkage void __hyp_text kvm_unexpected_el2_exception(void) -{ - unsigned long addr, fixup; - struct kvm_cpu_context *host_ctxt; - struct exception_table_entry *entry, *end; - unsigned long elr_el2 = read_sysreg(elr_el2); - - entry = hyp_symbol_addr(__start___kvm_ex_table); - end = hyp_symbol_addr(__stop___kvm_ex_table); - host_ctxt = __hyp_this_cpu_ptr(kvm_host_cpu_state); - - while (entry < end) { - addr = (unsigned long)&entry->insn + entry->insn; - fixup = (unsigned long)&entry->fixup + entry->fixup; - - if (addr != elr_el2) { - entry++; - continue; - } - - write_sysreg(fixup, elr_el2); - return; - } - - hyp_panic(host_ctxt); -} -- 2.25.1

2 3

[PATCH 1/3] net: hns3: modify the sensitive words
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Shengzui You <youshengzui(a)huawei.com> driver inclusion category: bugfix bugzilla: NA CVE: NA ----------------------------------- Reviewed-by: Weiwei Deng <dengweiwei(a)huawei.com> Reviewed-by: Zhaohui Zhong <zhongzhaohui(a)huawei.com> Reviewed-by: Junxin Chen <chenjunxin1(a)huawei.com> Signed-off-by: Shengzui You <youshengzui(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- .../hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h index cd1636e6dd65..343e036412d4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h @@ -36,14 +36,14 @@ typedef void (*nic_event_fn_t) (struct net_device *netdev, enum hnae3_event_type_custom); /** - * nic_register_event - register for nic event listening + * nic_register_event - register for nic event handling * @event_call: nic event handler * return 0 - success , negative - fail */ int nic_register_event(nic_event_fn_t event_call); /** - * nic_unregister_event - quit nic event listening + * nic_unregister_event - quit nic event handling * return 0 - success , negative - fail */ int nic_unregister_event(void); -- 2.25.1

1 2

[PATCH kernel-5.5] riscv/kvm: Add Linux-syscall-note at kvm.h
by Yipeng Yin 29 Sep '20

29 Sep '20

euleros inclusion category: bugfix bugzilla: NA CVE: NA It will raise 'missing "WITH Linux-syscall-note" for SPDX-License-Identifier' when make headers_install. this patch fix it. Link: https://gitee.com/openeuler/kernel/issues/I1WZL5 Signed-off-by: Yipeng Yin <yinyipeng1(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- arch/riscv/include/uapi/asm/kvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index f4274c2e5..65cd00654 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (C) 2019 Western Digital Corporation or its affiliates. * -- 2.19.1

2 1

[PATCH] block: allow for_each_bvec to support zero len bvec
by Yang Yingliang 29 Sep '20

29 Sep '20

From: Ming Lei <ming.lei(a)redhat.com> stable inclusion from linux-4.19.144 commit b48bcb664b657ae94b19c0728978c88e012f7a37 CVE: CVE-2020-25641 -------------------------------- commit 7e24969022cbd61ddc586f14824fc205661bb124 upstream. Block layer usually doesn't support or allow zero-length bvec. Since commit 1bdc76aea115 ("iov_iter: use bvec iterator to implement iterate_bvec()"), iterate_bvec() switches to bvec iterator. However, Al mentioned that 'Zero-length segments are not disallowed' in iov_iter. Fixes for_each_bvec() so that it can move on after seeing one zero length bvec. Fixes: 1bdc76aea115 ("iov_iter: use bvec iterator to implement iterate_bvec()") Reported-by: syzbot <syzbot+61acc40a49a3e46e25ea(a)syzkaller.appspotmail.com> Signed-off-by: Ming Lei <ming.lei(a)redhat.com> Tested-by: Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> Cc: Al Viro <viro(a)zeniv.linux.org.uk> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: <stable(a)vger.kernel.org> Link: https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2262077.html Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> 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> --- include/linux/bvec.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/bvec.h b/include/linux/bvec.h index fe7a22dd133b..bc1f16e9f3f4 100644 --- a/include/linux/bvec.h +++ b/include/linux/bvec.h @@ -119,11 +119,18 @@ static inline bool bvec_iter_rewind(const struct bio_vec *bv, return true; } +static inline void bvec_iter_skip_zero_bvec(struct bvec_iter *iter) +{ + iter->bi_bvec_done = 0; + iter->bi_idx++; +} + #define for_each_bvec(bvl, bio_vec, iter, start) \ for (iter = (start); \ (iter).bi_size && \ ((bvl = bvec_iter_bvec((bio_vec), (iter))), 1); \ - bvec_iter_advance((bio_vec), &(iter), (bvl).bv_len)) + (bvl).bv_len ? (void)bvec_iter_advance((bio_vec), &(iter), \ + (bvl).bv_len) : bvec_iter_skip_zero_bvec(&(iter))) /* for iterating one bio from start to end */ #define BVEC_ITER_ALL_INIT (struct bvec_iter) \ -- 2.25.1

1 0

[PATCH 1/6] loop: Report EOPNOTSUPP properly
by Yang Yingliang 28 Sep '20

28 Sep '20

From: Evan Green <evgreen(a)chromium.org> mainline inclusion from mainline-v5.7-rc1 commit 8cd55087dc45b2e1a73ed2a197cbf405f32deb08 category: bugfix bugzilla: 38877 CVE: NA Properly plumb out EOPNOTSUPP from loop driver operations, which may get returned when for instance a discard operation is attempted but not supported by the underlying block device. Before this change, everything was reported in the log as an I/O error, which is scary and not helpful in debugging. Signed-off-by: Evan Green <evgreen(a)chromium.org> Reviewed-by: Gwendal Grignou <gwendal(a)chromium.org> Reviewed-by: Bart Van Assche <bvanassche(a)acm.org> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p(a)collabora.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Luo Meng <luomeng12(a)huawei.com> Reviewed-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/block/loop.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index da68c42aed68..19b64ca8c4e3 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -461,7 +461,7 @@ static void lo_complete_rq(struct request *rq) if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || req_op(rq) != REQ_OP_READ) { if (cmd->ret < 0) - ret = BLK_STS_IOERR; + ret = errno_to_blk_status(cmd->ret); goto end_io; } @@ -1924,7 +1924,10 @@ static void loop_handle_cmd(struct loop_cmd *cmd) failed: /* complete non-aio request */ if (!cmd->use_aio || ret) { - cmd->ret = ret ? -EIO : 0; + if (ret == -EOPNOTSUPP) + cmd->ret = ret; + else + cmd->ret = ret ? -EIO : 0; blk_mq_complete_request(rq); } } -- 2.25.1

1 5

[PATCH 00/38] backport stable-4.19.148
by Yang Yingliang 28 Sep '20

28 Sep '20

Dan Carpenter (1): hdlc_ppp: add range checks in ppp_cp_parse_cr() David Ahern (1): ipv4: Update exception handling for multipath routes via same device Dmitry Golovin (1): x86/boot: kbuild: allow readelf executable to be specified Edwin Peer (1): bnxt_en: return proper error codes in bnxt_show_temp Eric Dumazet (3): ipv6: avoid lockdep issue in fib6_del() net: qrtr: check skb_put_padto() return value net: add __must_check to skb_put_padto() Fangrui Song (1): Documentation/llvm: fix the name of llvm-size Florian Fainelli (1): net: phy: Avoid NPD upon phy_detach() when driver is unbound Ganji Aravind (1): cxgb4: Fix offset when clearing filter byte counters Greg Kroah-Hartman (1): Linux 4.19.148 Jakub Kicinski (1): nfp: use correct define to return NONE fec Linus Walleij (1): net: dsa: rtl8366: Properly clear member config Lukas Wunner (1): serial: 8250: Avoid error message on reprobe Mark Gray (1): geneve: add transport ports in route lookup for geneve Mark Salyzyn (1): af_key: pfkey_dump needs parameter validation Masahiro Yamada (5): net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware kbuild: remove AS variable kbuild: replace AS=clang with LLVM_IAS=1 kbuild: support LLVM=1 to switch the default tools to Clang/LLVM Michael Chan (1): bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex. Muchun Song (1): kprobes: fix kill kprobe which has been marked as gone Necip Fazil Yildiran (1): net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC Nick Desaulniers (2): MAINTAINERS: add CLANG/LLVM BUILD SUPPORT info Documentation/llvm: add documentation on building w/ Clang/LLVM Peilin Ye (1): tipc: Fix memory leak in tipc_group_create_member() Petr Machata (1): net: DCB: Validate DCB_ATTR_DCB_BUFFER argument Priyaranjan Jha (2): tcp_bbr: refactor bbr_target_cwnd() for general inflight provisioning tcp_bbr: adapt cwnd based on ack aggregation estimation Ralph Campbell (1): mm/thp: fix __split_huge_pmd_locked() for migration PMD Rustam Kovhaev (1): KVM: fix memory leak in kvm_io_bus_unregister_dev() Tetsuo Handa (1): tipc: fix shutdown() of connection oriented socket Vasily Gorbik (1): kbuild: add OBJSIZE variable for the size tool Wei Wang (1): ip: fix tos reflection in ack and reset packets Xin Long (1): tipc: use skb_unshare() instead in tipc_buf_append() Xunlei Pang (1): mm: memcg: fix memcg reclaim soft lockup Yunsheng Lin (1): net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc Documentation/kbuild/llvm.rst | 87 +++++++++ MAINTAINERS | 9 + Makefile | 38 +++- arch/x86/boot/compressed/Makefile | 2 +- drivers/net/dsa/rtl8366.c | 20 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 31 +-- .../net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 9 +- .../ethernet/netronome/nfp/nfp_net_ethtool.c | 4 +- drivers/net/geneve.c | 37 +++- drivers/net/phy/phy_device.c | 3 +- drivers/net/wan/Kconfig | 2 +- drivers/net/wan/Makefile | 12 +- drivers/net/wan/hdlc_ppp.c | 16 +- drivers/tty/serial/8250/8250_core.c | 11 +- include/linux/skbuff.h | 7 +- include/net/inet_connection_sock.h | 4 +- kernel/kprobes.c | 9 +- mm/huge_memory.c | 40 ++-- mm/vmscan.c | 8 + net/dcb/dcbnl.c | 8 + net/ipv4/ip_output.c | 3 +- net/ipv4/route.c | 13 +- net/ipv4/tcp_bbr.c | 180 ++++++++++++++++-- net/ipv6/Kconfig | 1 + net/ipv6/ip6_fib.c | 13 +- net/key/af_key.c | 7 + net/qrtr/qrtr.c | 20 +- net/sched/sch_generic.c | 49 +++-- net/tipc/group.c | 14 +- net/tipc/msg.c | 3 +- net/tipc/socket.c | 5 +- tools/objtool/Makefile | 6 + virt/kvm/kvm_main.c | 21 +- 34 files changed, 550 insertions(+), 161 deletions(-) create mode 100644 Documentation/kbuild/llvm.rst -- 2.25.1

1 38

【议题收集】【Meeting Notice】openEuler kernel sig meeting Time: 2020-10-16 10:00-12:00
by Xie XiuQi 28 Sep '20

28 Sep '20

openEuler kernel sig meeting 定于 2020-10-16 10:00-12:00 召开，欢迎回复邮件申报议题。 (受十一假期影响，中间跳过一次例会，如有问题需要交流，可以先发邮件列表） --- 会议信息 --- 会议链接：https://zoom.us/j/94156903933 会议 ID : 94156903933 --- 会议纪要归档 --- Meeting Record 20200918： https://gitee.com/openeuler/kernel/issues/I1WGN0

1 0

[PATCH kernel-5.5] riscv/kvm: Add Linux-syscall-note at kvm.h
by Yipeng Yin 28 Sep '20

28 Sep '20

euleros inclusion category: bugfix bugzilla: NA CVE: NA It will raise 'missing "WITH Linux-syscall-note" for SPDX-License-Identifier' when make headers_install. this patch fix it. Link: https://gitee.com/openeuler/kernel/issues/I1WZL5 Signed-off-by: Yipeng Yin <yinyipeng1(a)huawei.com> --- arch/riscv/include/uapi/asm/kvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index f4274c2e5..65cd00654 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (C) 2019 Western Digital Corporation or its affiliates. * -- 2.19.1

2 1

[PATCH openEuler-1.0-LTS 00/13] steal tasks to improve CPU utilization
by Wei Li 27 Sep '20

27 Sep '20

Steal tasks to improve CPU utilization, backported from branch 'kernel-4.19'. Cheng Jian (3): disable stealing by default sched/fair: introduce SCHED_STEAL config: enable CONFIG_SCHED_STEAL by default Steve Sistare (10): sched: Provide sparsemask, a reduced contention bitmap sched/topology: Provide hooks to allocate data shared per LLC sched/topology: Provide cfs_overload_cpus bitmap sched/fair: Dynamically update cfs_overload_cpus sched/fair: Hoist idle_stamp up from idle_balance sched/fair: Generalize the detach_task interface sched/fair: Provide can_migrate_task_llc sched/fair: Steal work from an overloaded CPU when CPU goes idle sched/fair: disable stealing if too many NUMA nodes sched/fair: Provide idle search schedstats arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/configs/storage_ci_defconfig | 1 + arch/arm64/configs/syzkaller_defconfig | 1 + arch/x86/configs/hulk_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + arch/x86/configs/storage_ci_defconfig | 1 + include/linux/sched/topology.h | 3 + init/Kconfig | 15 + kernel/sched/core.c | 35 ++- kernel/sched/fair.c | 367 ++++++++++++++++++++++-- kernel/sched/features.h | 8 + kernel/sched/sched.h | 20 ++ kernel/sched/sparsemask.h | 210 ++++++++++++++ kernel/sched/stats.c | 15 + kernel/sched/stats.h | 20 ++ kernel/sched/topology.c | 141 ++++++++- 18 files changed, 810 insertions(+), 32 deletions(-) create mode 100644 kernel/sched/sparsemask.h -- 2.17.1

1 13

[PATCH 00/50] backport stable-4.19.147
by Yang Yingliang 24 Sep '20

24 Sep '20

Adam Borowski (1): x86/defconfig: Enable CONFIG_USB_XHCI_HCD=y Alexey Kardashevskiy (1): powerpc/dma: Fix dma_map_ops::get_required_mask Arvind Sankar (1): x86/boot/compressed: Disable relocation relaxation Bob Peterson (1): gfs2: initialize transaction tr_ailX_lists earlier Christophe JAILLET (1): clk: davinci: Use the correct size when allocating memory Chuck Lever (1): NFS: Zero-stateid SETATTR should first return delegation Daniel Mack (1): dsa: Allow forwarding of redirected IGMP traffic David Milburn (2): nvme-fc: cancel async events before freeing event struct nvme-rdma: cancel async events before freeing event struct Dinghao Liu (1): scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort Evan Nimmo (1): i2c: algo: pca: Reapply i2c bus settings after reset Gabriel Krisman Bertazi (1): f2fs: Return EOF on unaligned end of file DIO read Greg Kroah-Hartman (2): Revert "ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO" Linux 4.19.147 Gustav Wiklander (1): spi: Fix memory leak on splited transfers Haiyang Zhang (1): hv_netvsc: Remove "unlikely" from netvsc_select_queue Hans de Goede (1): Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists Huacai Chen (1): KVM: MIPS: Change the definition of kvm type J. Bruce Fields (1): SUNRPC: stop printk reading past end of string James Smart (1): scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery Javed Hasan (1): scsi: libfc: Fix for double free() Jiri Olsa (1): perf test: Fix the "signal" test inline assembly Laurent Pinchart (1): rapidio: Replace 'select' DMAENGINES 'with depends on' Miaohe Lin (1): net: handle the return value of pskb_carve_frag_list() correctly Michael Kelley (1): Drivers: hv: vmbus: Add timeout to vmbus_wait_for_unload Namhyung Kim (1): perf test: Free formats for perf pmu parse test Naresh Kumar PBS (1): RDMA/bnxt_re: Restrict the max_gids to 256 Nathan Chancellor (1): clk: rockchip: Fix initialization of mux_pll_src_4plls_p Olga Kornievskaia (1): NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall Oliver Neukum (2): USB: UAS: fix disconnect by unplugging a hub usblp: fix race between disconnect() and read() Penghao (1): USB: quirks: Add USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk for BYD zhaoxin notebook Quentin Perret (1): ehci-hcd: Move include to keep CRC stable Quinn Tran (3): scsi: qla2xxx: Update rscn_rcvd field to more meaningful scan_needed scsi: qla2xxx: Move rport registration out of internal work_list scsi: qla2xxx: Reduce holding sess_lock to prevent CPU lock-up Sahitya Tummala (1): f2fs: fix indefinite loop scanning for free nid Stafford Horne (1): openrisc: Fix cache API compile issue when not inlining Stephan Gerhold (1): ASoC: qcom: Set card->owner to avoid warnings Sunghyun Jin (1): percpu: fix first chunk size calculation for populated bitmap Tetsuo Handa (1): fbcon: Fix user font detection test at fbcon_resize(). Thomas Bogendoerfer (2): MIPS: SNI: Fix MIPS_L1_CACHE_SHIFT MIPS: SNI: Fix spurious interrupts Tobias Diedrich (1): serial: 8250_pci: Add Realtek 816a and 816b Vincent Huang (1): Input: trackpoint - add new trackpoint variant IDs Vincent Whitchurch (2): regulator: pwm: Fix machine constraints application spi: spi-loopback-test: Fix out-of-bounds read Volker Rümelin (1): i2c: i801: Fix resume bug Yu Kuai (2): drm/mediatek: Add exception handing in mtk_drm_probe() if component init fail drm/mediatek: Add missing put_device() call in mtk_hdmi_dt_parse_pdata() Makefile | 2 +- arch/mips/Kconfig | 1 + arch/mips/kvm/mips.c | 2 + arch/mips/sni/a20r.c | 9 +- arch/openrisc/mm/cache.c | 2 +- arch/powerpc/kernel/dma-iommu.c | 3 +- arch/x86/boot/compressed/Makefile | 2 + arch/x86/configs/i386_defconfig | 1 + arch/x86/configs/x86_64_defconfig | 1 + drivers/clk/davinci/pll.c | 2 +- drivers/clk/rockchip/clk-rk3228.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++++-- drivers/hv/channel_mgmt.c | 7 +- drivers/i2c/algos/i2c-algo-pca.c | 35 +++++--- drivers/i2c/busses/i2c-i801.c | 21 +++-- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 1 + drivers/input/mouse/trackpoint.c | 10 ++- drivers/input/mouse/trackpoint.h | 10 ++- drivers/input/serio/i8042-x86ia64io.h | 16 ++++ drivers/net/hyperv/netvsc_drv.c | 2 +- drivers/nvme/host/fc.c | 1 + drivers/nvme/host/rdma.c | 1 + drivers/rapidio/Kconfig | 2 +- drivers/regulator/pwm-regulator.c | 2 +- drivers/scsi/libfc/fc_disc.c | 2 - drivers/scsi/lpfc/lpfc_els.c | 4 +- drivers/scsi/pm8001/pm8001_sas.c | 2 +- drivers/scsi/qla2xxx/qla_def.h | 10 ++- drivers/scsi/qla2xxx/qla_gbl.h | 5 +- drivers/scsi/qla2xxx/qla_gs.c | 30 ++++--- drivers/scsi/qla2xxx/qla_init.c | 101 +++++++++++++++++------ drivers/scsi/qla2xxx/qla_os.c | 29 ++++--- drivers/scsi/qla2xxx/qla_target.c | 85 +++++++++++++++---- drivers/spi/spi-loopback-test.c | 2 +- drivers/spi/spi.c | 9 +- drivers/tty/serial/8250/8250_pci.c | 11 +++ drivers/usb/class/usblp.c | 5 ++ drivers/usb/core/quirks.c | 4 + drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ehci-hub.c | 1 - drivers/usb/storage/uas.c | 14 +++- drivers/video/fbdev/core/fbcon.c | 2 +- fs/f2fs/data.c | 3 + fs/f2fs/node.c | 3 + fs/gfs2/glops.c | 2 + fs/gfs2/log.c | 2 - fs/gfs2/trans.c | 2 + fs/nfs/nfs4proc.c | 11 ++- include/linux/i2c-algo-pca.h | 15 ++++ include/uapi/linux/kvm.h | 5 +- mm/percpu.c | 2 +- net/core/skbuff.c | 10 ++- net/dsa/tag_edsa.c | 37 ++++++++- net/sunrpc/rpcb_clnt.c | 4 +- sound/pci/hda/patch_realtek.c | 1 - sound/soc/qcom/apq8016_sbc.c | 1 + sound/soc/qcom/apq8096.c | 1 + sound/soc/qcom/sdm845.c | 1 + sound/soc/qcom/storm.c | 1 + tools/perf/tests/bp_signal.c | 5 +- tools/perf/tests/pmu.c | 1 + tools/perf/util/pmu.c | 11 +++ tools/perf/util/pmu.h | 1 + 65 files changed, 457 insertions(+), 149 deletions(-) -- 2.25.1

1 50

[PATCH 1/5] loop: Report EOPNOTSUPP properly
by Yang Yingliang 24 Sep '20

24 Sep '20

From: Evan Green <evgreen(a)chromium.org> mainline inclusion from mainline-v5.7-rc1 commit 8cd55087dc45b2e1a73ed2a197cbf405f32deb08 category: bugfix bugzilla: 38877 CVE: NA Properly plumb out EOPNOTSUPP from loop driver operations, which may get returned when for instance a discard operation is attempted but not supported by the underlying block device. Before this change, everything was reported in the log as an I/O error, which is scary and not helpful in debugging. Signed-off-by: Evan Green <evgreen(a)chromium.org> Reviewed-by: Gwendal Grignou <gwendal(a)chromium.org> Reviewed-by: Bart Van Assche <bvanassche(a)acm.org> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p(a)collabora.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Luo Meng <luomeng12(a)huawei.com> Reviewed-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/block/loop.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 19042b42a8ba..d0687e90e5d4 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -461,7 +461,7 @@ static void lo_complete_rq(struct request *rq) if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || req_op(rq) != REQ_OP_READ) { if (cmd->ret < 0) - ret = BLK_STS_IOERR; + ret = errno_to_blk_status(cmd->ret); goto end_io; } @@ -1927,7 +1927,10 @@ static void loop_handle_cmd(struct loop_cmd *cmd) failed: /* complete non-aio request */ if (!cmd->use_aio || ret) { - cmd->ret = ret ? -EIO : 0; + if (ret == -EOPNOTSUPP) + cmd->ret = ret; + else + cmd->ret = ret ? -EIO : 0; blk_mq_complete_request(rq); } } -- 2.25.1

1 4

[PATCH 00/75] backport stable-4.19.146
by Yang Yingliang 23 Sep '20

23 Sep '20

Adam Ford (2): ARM: dts: logicpd-torpedo-baseboard: Fix broken audio ARM: dts: logicpd-som-lv-baseboard: Fix broken audio Aleksander Morgado (1): USB: serial: option: add support for SIM7070/SIM7080/SIM7090 modules Angelo Compagnucci (2): iio: adc: mcp3422: fix locking scope iio: adc: mcp3422: fix locking on error path Bjørn Mork (1): USB: serial: option: support dynamic Quectel USB compositions Chris Healy (1): ARM: dts: vfxxx: Add syscon compatible with OCOTP Darrick J. Wong (1): xfs: initialize the shortform attr header padding entry Dinghao Liu (4): RDMA/rxe: Fix memleak in rxe_mem_init_user NFC: st95hf: Fix memleak in st95hf_in_send_cmd firestream: Fix memleak in fs_open HID: elan: Fix memleak in elan_input_configured Dinh Nguyen (1): ARM: dts: socfpga: fix register entry for timer3 on Arria10 Douglas Anderson (1): mmc: sdhci-msm: Add retries when all tuning phases are found valid Evgeniy Didin (1): ARC: [plat-hsdk]: Switch ethernet phy-mode to rgmii-id Filipe Manana (1): btrfs: fix wrong address when faulting in pages in the search ioctl Florian Fainelli (4): ARM: dts: bcm: HR2: Fixed QSPI compatible string ARM: dts: NSP: Fixed QSPI compatible string ARM: dts: BCM5301X: Fixed QSPI compatible string arm64: dts: ns2: Fixed QSPI compatible string Florian Westphal (1): netfilter: conntrack: allow sctp hearbeat after connection re-use Francisco Jerez (1): cpufreq: intel_pstate: Fix intel_pstate_get_hwp_max() for turbo disabled Greg Kroah-Hartman (1): Linux 4.19.146 Hanjun Guo (1): dmaengine: acpi: Put the CSRT table after using it Heikki Krogerus (1): usb: typec: ucsi: acpi: Check the _DEP dependencies Hou Pu (1): scsi: target: iscsi: Fix hang in iscsit_access_np() when getting tpg->np_login_sem Joerg Roedel (1): iommu/amd: Do not use IOMMUv2 functionality when SME is active Jonathan Cameron (12): iio:light:ltr501 Fix timestamp alignment issue. iio:accel:bmc150-accel: Fix timestamp alignment and prevent data leak. iio:adc:ti-adc084s021 Fix alignment and data leak issues. iio:adc:ina2xx Fix timestamp alignment issue. iio:adc:max1118 Fix alignment of timestamp and data leak issues iio:adc:ti-adc081c Fix alignment and data leak issues iio:magnetometer:ak8975 Fix alignment and data leak issues. iio:light:max44000 Fix timestamp alignment and prevent data leak. iio:chemical:ccs811: Fix timestamp alignment and prevent data leak. iio: accel: kxsd9: Fix alignment of local buffer. iio:accel:mma7455: Fix timestamp alignment and prevent data leak. iio:accel:mma8452: Fix timestamp alignment and prevent data leak. Jordan Crouse (1): drm/msm: Disable preemption on all 5xx targets Josef Bacik (1): btrfs: fix lockdep splat in add_missing_dev Kamal Heib (2): RDMA/rxe: Drop pointless checks in rxe_init_ports RDMA/core: Fix reported speed and width Leon Romanovsky (1): gcov: Disable gcov build with GCC 10 Linus Torvalds (1): vgacon: remove software scrollback support Linus Walleij (1): drm/tve200: Stabilize enable/disable Mathias Nyman (1): usb: Fix out of sync data toggle if a configured device is reconfigured Matthias Schiffer (1): ARM: dts: ls1021a: fix QuadSPI-memory reg range Maxim Kochetkov (1): iio: adc: ti-ads1015: fix conversion when CONFIG_PM is not set Michał Mirosław (1): regulator: push allocation in set_consumer_device_supply() out of lock Mohan Kumar (1): ALSA: hda: Fix 2 channel swapping for Tegra Nirenjan Krishnan (1): HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for all Saitek X52 devices Ondrej Jirman (1): drm/sun4i: Fix dsi dcs long write function Patrick Riphagen (1): USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter Peter Oberparleiter (1): gcov: add support for GCC 10.1 Qu Wenruo (1): btrfs: require only sector size alignment for parent eb bytenr Rafael J. Wysocki (1): cpufreq: intel_pstate: Refuse to turn off with HWP enabled Rander Wang (1): ALSA: hda: fix a runtime pm issue in SOF when integrated GPU is disabled Rustam Kovhaev (1): staging: wlan-ng: fix out of bounds read in prism2sta_probe_usb() Sagi Grimberg (2): nvme-fabrics: don't check state NVME_CTRL_NEW for request acceptance nvme-rdma: serialize controller teardown sequences Sandeep Raghuraman (1): drm/amdgpu: Fix bug in reporting voltage for CIK Selvin Xavier (1): RDMA/bnxt_re: Do not report transparent vlan from QP1 Sivaprakash Murugesan (1): phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init Tetsuo Handa (1): video: fbdev: fix OOB read in vga_8planes_imageblit() Vaibhav Agarwal (1): staging: greybus: audio: fix uninitialized value issue Varun Prakash (1): scsi: target: iscsi: Fix data digest calculation Vineet Gupta (2): ARC: HSDK: wireup perf irq irqchip/eznps: Fix build error for !ARC700 builds Wanpeng Li (1): KVM: VMX: Don't freeze guest when event delivery causes an APIC-access exit Xie He (3): drivers/net/wan/lapbether: Added needed_tailroom drivers/net/wan/lapbether: Set network_header before transmitting drivers/net/wan/hdlc_cisco: Add hard_header_len Yi Zhang (1): RDMA/rxe: Fix the parent sysfs read when the interface has 15 chars Zeng Tao (1): usb: core: fix slab-out-of-bounds Read in read_descriptors Makefile | 2 +- arch/arc/boot/dts/hsdk.dts | 6 +- arch/arc/plat-eznps/include/plat/ctop.h | 1 - arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- .../boot/dts/logicpd-som-lv-baseboard.dtsi | 2 + .../boot/dts/logicpd-torpedo-baseboard.dtsi | 2 + arch/arm/boot/dts/ls1021a.dtsi | 2 +- arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +- arch/arm/boot/dts/vfxxx.dtsi | 2 +- .../boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- arch/powerpc/configs/pasemi_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/x86/configs/i386_defconfig | 1 - arch/x86/configs/x86_64_defconfig | 1 - arch/x86/kvm/vmx.c | 1 + drivers/atm/firestream.c | 1 + drivers/cpufreq/intel_pstate.c | 14 +- drivers/dma/acpi-dma.c | 4 +- .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 +- drivers/gpu/drm/tve200/tve200_display.c | 22 +- drivers/hid/hid-elan.c | 2 + drivers/hid/hid-ids.h | 2 + drivers/hid/hid-quirks.c | 2 + drivers/iio/accel/bmc150-accel-core.c | 15 +- drivers/iio/accel/kxsd9.c | 16 +- drivers/iio/accel/mma7455_core.c | 16 +- drivers/iio/accel/mma8452.c | 11 +- drivers/iio/adc/ina2xx-adc.c | 11 +- drivers/iio/adc/max1118.c | 10 +- drivers/iio/adc/mcp3422.c | 16 +- drivers/iio/adc/ti-adc081c.c | 11 +- drivers/iio/adc/ti-adc084s021.c | 10 +- drivers/iio/adc/ti-ads1015.c | 10 + drivers/iio/chemical/ccs811.c | 13 +- drivers/iio/light/ltr501.c | 15 +- drivers/iio/light/max44000.c | 12 +- drivers/iio/magnetometer/ak8975.c | 16 +- drivers/infiniband/core/verbs.c | 2 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 21 +- drivers/infiniband/sw/rxe/rxe.c | 3 - drivers/infiniband/sw/rxe/rxe_mr.c | 1 + drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- drivers/iommu/amd_iommu_v2.c | 7 + drivers/mmc/host/sdhci-msm.c | 18 +- drivers/net/wan/hdlc_cisco.c | 1 + drivers/net/wan/lapbether.c | 3 + drivers/nfc/st95hf/core.c | 2 +- drivers/nvme/host/fabrics.c | 1 - drivers/nvme/host/rdma.c | 6 + drivers/phy/qualcomm/phy-qcom-qmp.c | 16 +- drivers/phy/qualcomm/phy-qcom-qmp.h | 2 + drivers/regulator/core.c | 46 ++-- drivers/staging/greybus/audio_topology.c | 29 +-- drivers/staging/wlan-ng/hfa384x_usb.c | 5 - drivers/staging/wlan-ng/prism2usb.c | 19 +- drivers/target/iscsi/iscsi_target.c | 17 +- drivers/target/iscsi/iscsi_target_login.c | 6 +- drivers/target/iscsi/iscsi_target_login.h | 3 +- drivers/target/iscsi/iscsi_target_nego.c | 3 +- drivers/usb/core/message.c | 91 ++++---- drivers/usb/core/sysfs.c | 5 + drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 1 + drivers/usb/serial/option.c | 22 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 4 + drivers/video/console/Kconfig | 46 ---- drivers/video/console/vgacon.c | 221 +----------------- drivers/video/fbdev/vga16fb.c | 2 +- fs/btrfs/extent-tree.c | 19 +- fs/btrfs/ioctl.c | 3 +- fs/btrfs/print-tree.c | 12 +- fs/btrfs/volumes.c | 10 + fs/xfs/libxfs/xfs_attr_leaf.c | 4 +- include/linux/netfilter/nf_conntrack_sctp.h | 2 + include/soc/nps/common.h | 6 + kernel/gcov/gcc_4_7.c | 4 +- net/netfilter/nf_conntrack_proto_sctp.c | 39 +++- sound/hda/hdac_device.c | 2 + sound/pci/hda/patch_hdmi.c | 5 + 83 files changed, 479 insertions(+), 504 deletions(-) -- 2.25.1

1 75

[PATCH] config: add digest list options for arm64
by Yang Yingliang 22 Sep '20

22 Sep '20

From: Roberto Sassu <roberto.sassu(a)huawei.com> hulk inclusion category: feature feature: digest-lists --------------------------- Enable digest lists and PGP keys preload. Signed-off-by: Roberto Sassu <roberto.sassu(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 73 +++++++++++++++++++------- 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 809350e03968..b2abedf899b5 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -3048,20 +3048,23 @@ CONFIG_HW_RANDOM_CAVIUM=y # CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=8192 -CONFIG_TCG_TPM=m +CONFIG_TCG_TPM=y CONFIG_HW_RANDOM_TPM=y -CONFIG_TCG_TIS_CORE=m -CONFIG_TCG_TIS=m -CONFIG_TCG_TIS_SPI=m -# CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_INFINEON is not set -# CONFIG_TCG_TIS_I2C_NUVOTON is not set -CONFIG_TCG_ATMEL=m -# CONFIG_TCG_INFINEON is not set -CONFIG_TCG_CRB=m +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_TCG_TIS_SPI=y +CONFIG_TCG_TIS_I2C_ATMEL=y +CONFIG_TCG_TIS_I2C_INFINEON=y +CONFIG_TCG_TIS_I2C_NUVOTON=y +CONFIG_TCG_NSC=y +CONFIG_TCG_ATMEL=y +CONFIG_TCG_INFINEON=y +# CONFIG_TCG_XEN is not set +CONFIG_TCG_CRB=y # CONFIG_TCG_VTPM_PROXY is not set -# CONFIG_TCG_TIS_ST33ZP24_I2C is not set -# CONFIG_TCG_TIS_ST33ZP24_SPI is not set +CONFIG_TCG_TIS_ST33ZP24=y +CONFIG_TCG_TIS_ST33ZP24_I2C=y +CONFIG_TCG_TIS_ST33ZP24_SPI=y # CONFIG_DEVPORT is not set # CONFIG_XILLYBUS is not set CONFIG_HISI_SVM=y @@ -5425,8 +5428,8 @@ CONFIG_KEYS=y CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y -CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m +CONFIG_TRUSTED_KEYS=y +CONFIG_ENCRYPTED_KEYS=y # CONFIG_KEY_DH_OPERATIONS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y @@ -5459,7 +5462,39 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_SECURITY_APPARMOR_DEBUG is not set # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_YAMA=y -# CONFIG_INTEGRITY is not set +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_AUDIT=y +CONFIG_IMA=y +CONFIG_IMA_MEASURE_PCR_IDX=10 +CONFIG_IMA_LSM_RULES=y +# CONFIG_IMA_TEMPLATE is not set +CONFIG_IMA_NG_TEMPLATE=y +# CONFIG_IMA_SIG_TEMPLATE is not set +CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y +CONFIG_IMA_DEFAULT_HASH="sha256" +# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_READ_POLICY=y +CONFIG_IMA_APPRAISE=y +# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set +CONFIG_IMA_APPRAISE_BOOTPARAM=y +CONFIG_IMA_TRUSTED_KEYRING=y +# CONFIG_IMA_BLACKLIST_KEYRING is not set +CONFIG_IMA_LOAD_X509=y +CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" +# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set +CONFIG_IMA_DIGEST_LIST=y +CONFIG_IMA_DIGEST_LISTS_DIR="/etc/ima/digest_lists" +CONFIG_IMA_PARSER_BINARY_PATH="/usr/bin/upload_digest_lists" +CONFIG_EVM=y +CONFIG_EVM_ATTR_FSUUID=y +# CONFIG_EVM_ADD_XATTRS is not set +CONFIG_EVM_LOAD_X509=y +CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SECURITY_APPARMOR is not set # CONFIG_DEFAULT_SECURITY_DAC is not set @@ -5646,9 +5681,9 @@ CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_PKCS7_TEST_KEY is not set CONFIG_SIGNED_PE_FILE_VERIFICATION=y -# CONFIG_PGP_LIBRARY is not set -# CONFIG_PGP_KEY_PARSER is not set -# CONFIG_PGP_PRELOAD is not set +CONFIG_PGP_LIBRARY=y +CONFIG_PGP_KEY_PARSER=y +CONFIG_PGP_PRELOAD=y # # Certificates for signature checking @@ -5659,7 +5694,7 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set -# CONFIG_PGP_PRELOAD_PUBLIC_KEYS is not set +CONFIG_PGP_PRELOAD_PUBLIC_KEYS=y CONFIG_BINARY_PRINTF=y # -- 2.25.1

1 0

[PATCH] acpi/arm64: check the returned logical CPU number of 'acpi_map_cpuid()'
by Yang Yingliang 22 Sep '20

22 Sep '20

From: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> hulk inclusion category: bugfix bugzilla: NA CVE: NA --------------------------- When we set 'nr_cpus=1' in kernel parameter, we get the following error. It's because 'acpi_map_cpuid()' return -ENODEV in 'acpi_map_cpu()' when there are not enough logical CPU numbers. So we need to check the returned logical CPU number and return error if it is negative. 'acpi_map_cpu' when there are not enough logical CPU [ 0.025955] Unable to handle kernel paging request at virtual address ffff00002915b828 [ 0.025958] Mem abort info: [ 0.025959] ESR = 0x96000006 [ 0.025961] Exception class = DABT (current EL), IL = 32 bits [ 0.025963] SET = 0, FnV = 0 [ 0.025965] EA = 0, S1PTW = 0 [ 0.025966] Data abort info: [ 0.025968] ISV = 0, ISS = 0x00000006 [ 0.025970] CM = 0, WnR = 0 [ 0.025972] swapper pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) [ 0.025974] [ffff00002915b828] pgd=000000013fffe003, pud=000000013fffd003, pmd=0000000000000000 [ 0.025979] Internal error: Oops: 96000006 [#1] SMP [ 0.025981] Modules linked in: [ 0.025983] Process swapper/0 (pid: 1, stack limit = 0x(____ptrval____)) [ 0.025986] CPU: 0 PID: 1 Comm: swapper/0 Tainted: G W 4.19.141+ #37 [ 0.025988] Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 [ 0.025991] pstate: a0c00005 (NzCv daif +PAN +UAO) [ 0.025993] pc : acpi_map_cpu+0xe0/0x170 [ 0.025996] lr : acpi_map_cpu+0xb8/0x170 [ 0.025997] sp : ffff8000fef1fa50 [ 0.025999] x29: ffff8000fef1fa50 x28: ffff000008e22058 [ 0.026001] x27: ffff0000092a6000 x26: ffff000008d60778 [ 0.026004] x25: ffff0000094c3000 x24: 0000000000000001 [ 0.026006] x23: ffff8000fe802c18 x22: 00000000ffffffff [ 0.026008] x21: ffff000008a16000 x20: ffff000008a16a20 [ 0.026011] x19: 00000000ffffffed x18: ffffffffffffffff [ 0.026013] x17: 0000000087411dcf x16: 00000000b93a5600 [ 0.026015] x15: ffff000009159708 x14: 0720072007200720 [ 0.026018] x13: 0720072007200720 x12: 0720072007200720 [ 0.026020] x11: 072007200720073d x10: 073d073d073d073d [ 0.026022] x9 : 073d073d073d0764 x8 : 0765076607660766 [ 0.026024] x7 : 0766076607660778 x6 : 0000000000000130 [ 0.026027] x5 : ffff0000085955c8 x4 : 0000000000000000 [ 0.026029] x3 : 0000000000000000 x2 : ffff00000915b830 [ 0.026031] x1 : ffff00002915b828 x0 : 0000200000000000 [ 0.026033] Call trace: [ 0.026035] acpi_map_cpu+0xe0/0x170 [ 0.026038] acpi_processor_add+0x44c/0x640 [ 0.026040] acpi_bus_attach+0x174/0x218 [ 0.026043] acpi_bus_attach+0xa8/0x218 [ 0.026045] acpi_bus_attach+0xa8/0x218 [ 0.026047] acpi_bus_attach+0xa8/0x218 [ 0.026049] acpi_bus_scan+0x58/0xb8 [ 0.026052] acpi_scan_init+0xf4/0x234 [ 0.026054] acpi_init+0x318/0x384 [ 0.026056] do_one_initcall+0x54/0x250 [ 0.026059] kernel_init_freeable+0x2d4/0x3c0 [ 0.026061] kernel_init+0x18/0x118 [ 0.026063] ret_from_fork+0x10/0x18 [ 0.026066] Code: d2800020 9120c042 8b010c41 9ad32000 (f820303f) Signed-off-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Reviewed-by: Keqian Zhu <zhukeqian1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/kernel/acpi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 73eb04f997a7..729733536cb4 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -270,6 +270,10 @@ int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id, int cpu, nid; cpu = acpi_map_cpuid(physid, acpi_id); + if (cpu < 0) { + pr_info("Unable to map GICC to logical cpu number\n"); + return cpu; + } nid = acpi_get_node(handle); if (nid != NUMA_NO_NODE) { set_cpu_numa_node(cpu, nid); -- 2.25.1

1 0

[PATCH 0/9] backport stable-4.19.145
by Yang Yingliang 22 Sep '20

22 Sep '20

Greg Kroah-Hartman (1): Linux 4.19.145 Jakub Kicinski (1): net: disable netpoll on fresh napis Jens Axboe (1): block: ensure bdi->io_pages is always initialized Kamil Lorenc (1): net: usb: dm9601: Add USB ID of Keenetic Plus DSL Paul Moore (1): netlabel: fix problems with mapping removal Roi Dayan (1): net/mlx5e: Don't support phys switch id if not in switchdev mode Takashi Sakamoto (1): ALSA; firewire-tascam: exclude Tascam FE-8 from detection Tetsuo Handa (1): tipc: fix shutdown() of connectionless socket Xin Long (1): sctp: not disable bh in the whole sctp_get_port_local() Makefile | 2 +- block/blk-core.c | 2 + .../net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- drivers/net/usb/dm9601.c | 4 ++ net/core/dev.c | 3 +- net/core/netpoll.c | 2 +- net/netlabel/netlabel_domainhash.c | 59 ++++++++++--------- net/sctp/socket.c | 16 ++--- net/tipc/socket.c | 9 ++- sound/firewire/tascam/tascam.c | 30 +++++++++- 10 files changed, 82 insertions(+), 47 deletions(-) -- 2.25.1

1 9

[PATCH 00/79] backport stable-4.19.144
by Yang Yingliang 22 Sep '20

22 Sep '20

Al Grant (1): perf tools: Correct SNOOPX field offset Al Viro (1): fix regression in "epoll: Keep a reference on files added to the check list" Amit Engel (1): nvmet: Disable keep-alive timer when kato is cleared to 0h Bodo Stroesser (2): scsi: target: tcmu: Fix size in calls to tcmu_flush_dcache_range scsi: target: tcmu: Optimize use of flush_dcache_page Christophe JAILLET (1): nvmet-fc: Fix a missed _irqsave version of spin_lock in 'nvmet_fc_fod_op_done()' Dan Carpenter (1): net: gemini: Fix another missing clk_disable_unprepare() in probe Dan Crawford (1): ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO Daniel Borkmann (1): uaccess: Add non-pagefault user-space write function Daniele Palmas (1): net: usb: qmi_wwan: add Telit 0x1050 composition Darrick J. Wong (1): xfs: fix xfs_bmap_validate_extent_raw when checking attr fork of rt files Dinghao Liu (3): net: hns: Fix memleak in hns_nic_dev_probe net: systemport: Fix memleak in bcm_sysport_probe net: arc_emac: Fix memleak in arc_mdio_probe Dmitry Baryshkov (1): drm/msm/a6xx: fix gmu start on newer firmware Edwin Peer (1): bnxt_en: fix HWRM error when querying VF temperature Florian Fainelli (2): MIPS: mm: BMIPS5000 has inclusive physical caches MIPS: BMIPS: Also call bmips_cpu_setup() for secondary cores Florian Westphal (1): netfilter: nf_tables: fix destination register zeroing Greg Kroah-Hartman (1): Linux 4.19.144 Himadri Pandya (1): net: usb: Fix uninit-was-stored issue in asix_read_phy_addr() Huang Ying (1): x86, fakenuma: Fix invalid starting node ID Jakub Kicinski (1): bnxt: don't enable NAPI until rings are ready James Morse (4): KVM: arm64: Add kvm_extable for vaxorcism code KVM: arm64: Defer guest entry when an asynchronous exception is pending KVM: arm64: Survive synchronous exceptions caused by AT instructions KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception Jason Gunthorpe (1): include/linux/log2.h: add missing () around n in roundup_pow_of_two() Jeff Layton (1): ceph: don't allow setlease on cephfs Jesper Dangaard Brouer (1): selftests/bpf: Fix massive output from test_maps Johannes Berg (1): cfg80211: regulatory: reject invalid hints John Stultz (1): tty: serial: qcom_geni_serial: Drop __init from qcom_geni_console_setup Josef Bacik (3): btrfs: drop path before adding new uuid tree entry btrfs: set the lockdep class for log tree extent buffers btrfs: fix potential deadlock in the search ioctl Jussi Kivilinna (1): batman-adv: bla: use netif_rx_ni when not in interrupt context Kai Vehmanen (1): ALSA: hda/hdmi: always check pin power status in i915 pin fixup Kim Phillips (1): perf record/stat: Explicitly call out event modifiers in the documentation Krishna Manikandan (1): drm/msm: add shutdown support for display platform_driver Linus Lüssing (1): batman-adv: Fix own OGM check in aggregated OGMs Lu Baolu (1): iommu/vt-d: Serialize IOMMU GCMD register modifications Marc Zyngier (2): HID: core: Correctly handle ReportSize being zero HID: core: Sanitize event code and type when mapping input Marek Szyprowski (1): dmaengine: pl330: Fix burst length if burst size is smaller than bus width Masami Hiramatsu (1): uaccess: Add non-pagefault user-space read functions Max Staudt (1): affs: fix basic permission bits to actually work Michael Chan (1): tg3: Fix soft lockup when tg3_reset_task() fails. Mikulas Patocka (3): ext2: don't update mtime on COW faults xfs: don't update mtime on COW faults dm writecache: handle DAX to partitions on persistent memory correctly Ming Lei (1): block: allow for_each_bvec to support zero len bvec Mrinal Pandey (1): checkpatch: fix the usage of capture group ( ... ) Namhyung Kim (1): perf jevents: Fix suspicious code in fixregex() Nicolas Dichtel (1): gtp: add GTPA_LINK info to msg sent to userspace Nikolay Borisov (2): btrfs: Remove redundant extent_buffer_get in get_old_root btrfs: Remove extraneous extent_buffer_get from tree_mod_log_rewind Pablo Neira Ayuso (3): netfilter: nf_tables: add NFTA_SET_USERDATA if not null netfilter: nf_tables: incorrect enum nft_list_attributes definition netfilter: nfnetlink: nfnetlink_unicast() reports EAGAIN instead of ENOBUFS Pavan Chebbi (1): bnxt_en: Don't query FW when netif_running() is false. Peter Ujfalusi (1): dmaengine: of-dma: Fix of_dma_router_xlate's of_dma_xlate handling Peter Zijlstra (1): cpuidle: Fixup IRQ state Rogan Dawes (1): usb: qmi_wwan: add D-Link DWM-222 A2 device ID Sean Young (2): media: rc: do not access device via sysfs after rc_unregister_device() media: rc: uevent sysfs file races with rc_unregister_device() Shung-Hsi Yu (1): net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init() Simon Leiner (1): xen/xenbus: Fix granting of vmalloc'd memory Sven Eckelmann (1): batman-adv: Avoid uninitialized chaddr when handling DHCP Sven Schnelle (1): s390: don't trace preemption in percpu macros Takashi Iwai (1): ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check Takashi Sakamoto (1): ALSA: firewire-digi00x: exclude Avid Adrenaline from detection Tejun Heo (1): libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks Tom Rix (1): hwmon: (applesmc) check status earlier. Tong Zhang (1): ALSA: ca0106: fix error code handling Tony Lindgren (1): thermal: ti-soc-thermal: Fix bogus thermal shutdowns for omap4430 Vasundhara Volam (2): bnxt_en: Check for zero dir entries in NVRAM. bnxt_en: Fix PCI AER error recovery flow Yu Kuai (1): dmaengine: at_hdmac: check return value of of_find_device_by_node() in at_dma_xlate() Yuusuke Ashizuka (1): ravb: Fixed to be able to unload modules Documentation/filesystems/affs.txt | 16 +- Makefile | 2 +- arch/arm64/include/asm/kvm_arm.h | 3 +- arch/arm64/include/asm/kvm_asm.h | 43 +++++ arch/arm64/kernel/vmlinux.lds.S | 8 + arch/arm64/kvm/hyp/entry.S | 31 +++- arch/arm64/kvm/hyp/hyp-entry.S | 66 ++++--- arch/arm64/kvm/hyp/switch.c | 39 +++- arch/mips/kernel/smp-bmips.c | 2 + arch/mips/mm/c-r4k.c | 4 + arch/s390/include/asm/percpu.h | 28 +-- arch/x86/mm/numa_emulation.c | 2 +- drivers/ata/libata-core.c | 5 +- drivers/ata/libata-scsi.c | 8 +- drivers/cpuidle/cpuidle.c | 3 +- drivers/dma/at_hdmac.c | 2 + drivers/dma/of-dma.c | 8 +- drivers/dma/pl330.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 12 +- drivers/gpu/drm/msm/msm_drv.c | 8 + drivers/hid/hid-core.c | 15 +- drivers/hid/hid-input.c | 4 + drivers/hid/hid-multitouch.c | 2 + drivers/hwmon/applesmc.c | 31 ++-- drivers/iommu/intel_irq_remapping.c | 10 +- drivers/md/dm-writecache.c | 12 +- drivers/media/rc/rc-main.c | 44 +++-- drivers/net/ethernet/arc/emac_mdio.c | 1 + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 26 +-- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 5 +- drivers/net/ethernet/broadcom/tg3.c | 17 +- drivers/net/ethernet/cortina/gemini.c | 34 ++-- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 9 +- drivers/net/ethernet/mellanox/mlx4/mr.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 110 ++++++------ drivers/net/gtp.c | 1 + drivers/net/usb/asix_common.c | 2 +- drivers/net/usb/qmi_wwan.c | 2 + drivers/nvme/target/core.c | 6 + drivers/nvme/target/fc.c | 4 +- drivers/target/target_core_user.c | 15 +- .../ti-soc-thermal/omap4-thermal-data.c | 23 +-- .../thermal/ti-soc-thermal/omap4xxx-bandgap.h | 10 +- drivers/tty/serial/qcom_geni_serial.c | 2 +- drivers/xen/xenbus/xenbus_client.c | 10 +- fs/affs/amigaffs.c | 27 +++ fs/affs/file.c | 26 ++- fs/btrfs/ctree.c | 8 +- fs/btrfs/extent_io.c | 8 +- fs/btrfs/extent_io.h | 6 +- fs/btrfs/ioctl.c | 27 ++- fs/btrfs/volumes.c | 3 +- fs/ceph/file.c | 1 + fs/eventpoll.c | 6 +- fs/ext2/file.c | 6 +- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/xfs_file.c | 12 +- include/linux/bvec.h | 9 +- include/linux/hid.h | 42 +++-- include/linux/libata.h | 1 + include/linux/log2.h | 2 +- include/linux/netfilter/nfnetlink.h | 3 +- include/linux/uaccess.h | 26 +++ include/net/netfilter/nf_tables.h | 2 + include/uapi/linux/netfilter/nf_tables.h | 2 +- mm/maccess.c | 167 ++++++++++++++++-- net/batman-adv/bat_v_ogm.c | 11 +- net/batman-adv/bridge_loop_avoidance.c | 5 +- net/batman-adv/gateway_client.c | 6 +- net/netfilter/nf_tables_api.c | 64 ++++--- net/netfilter/nfnetlink.c | 11 +- net/netfilter/nfnetlink_log.c | 3 +- net/netfilter/nfnetlink_queue.c | 2 +- net/netfilter/nft_payload.c | 4 +- net/wireless/reg.c | 3 + scripts/checkpatch.pl | 4 +- sound/core/oss/mulaw.c | 4 +- sound/firewire/digi00x/digi00x.c | 5 + sound/pci/ca0106/ca0106_main.c | 3 +- sound/pci/hda/patch_hdmi.c | 1 + sound/pci/hda/patch_realtek.c | 1 + tools/include/uapi/linux/perf_event.h | 2 +- tools/perf/Documentation/perf-record.txt | 4 + tools/perf/Documentation/perf-stat.txt | 4 + tools/perf/pmu-events/jevents.c | 2 +- tools/testing/selftests/bpf/test_maps.c | 2 + 87 files changed, 885 insertions(+), 337 deletions(-) -- 2.25.1

1 79

[PATCH 000/120] backport stable-4.19.143
by Yang Yingliang 22 Sep '20

22 Sep '20

Aditya Pakki (5): drm/radeon: fix multiple reference count leak omapfb: fix multiple reference count leaks due to pm_runtime_get_sync drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open drm/nouveau: fix reference count leak in nv50_disp_atomic_commit drm/nouveau: Fix reference count leak in nouveau_connector_detect Adrian Hunter (1): scsi: ufs: Improve interrupt handling for shared interrupts Alan Stern (3): USB: yurex: Fix bad gfp argument USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D usb: storage: Add unusual_uas entry for Sony PSZ drives Alex Deucher (1): drm/amdgpu: Fix buffer overflow in INFO ioctl Alexey Kardashevskiy (1): powerpc/xive: Ignore kmemleak false positives Alvin Šipraga (1): macvlan: validate setting of multiple remote source MAC addresses Amelie Delaunay (1): spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate Andrey Konovalov (1): efi: provide empty efi_enter_virtual_mode implementation Andy Shevchenko (2): mfd: intel-lpss: Add Intel Emmitsburg PCH PCI IDs USB: gadget: u_f: Unbreak offset calculation in VLAs Arnd Bergmann (1): powerpc/spufs: add CONFIG_COREDUMP dependency Athira Rajeev (1): powerpc/perf: Fix soft lockups due to missed interrupt accounting Bodo Stroesser (1): scsi: target: tcmu: Fix crash on ARM during cmd completion Brooke Basile (2): USB: gadget: u_f: add overflow checks to VLA macros USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb() Changming Liu (1): USB: sisusbvga: Fix a potential UB casued by left shifting a negative value Chao Yu (1): f2fs: fix error path in do_recover_data() Chris Wilson (1): locking/lockdep: Fix overflow in presentation of average lock-time Christophe JAILLET (1): usb: gadget: f_tcm: Fix some resource leaks in some error paths Cong Wang (1): tipc: fix uninit skb->data in tipc_nl_compat_dumpit() Cyril Roelandt (1): USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge Dave Chinner (1): xfs: Don't allow logging of XFS_ISTALE inodes David Brazdil (1): KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe Desnes A. Nunes do Rosario (1): selftests/powerpc: Purge extra count_pmc() calls of ebb selftests Dick Kennedy (1): scsi: lpfc: Fix shost refcount mismatch when deleting vport Ding Hui (1): xhci: Always restore EP_SOFT_CLEAR_TOGGLE even if ep reset failed Evan Quan (2): drm/amd/pm: correct Vega10 swctf limit setting drm/amd/pm: correct Vega12 swctf limit setting Evgeny Novikov (1): USB: lvtest: return proper error code in probe Filipe Manana (1): btrfs: fix space cache memory leak after transaction abort George Kennedy (2): fbcon: prevent user font height or width change from causing potential out-of-bounds access vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize() Greg Kroah-Hartman (1): Linux 4.19.143 Hans Verkuil (1): cec-api: prevent leaking memory through hole in structure Hans de Goede (1): HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands Hector Martin (1): ALSA: usb-audio: Update documentation comment for MS2109 quirk Heikki Krogerus (1): device property: Fix the secondary firmware node handling in set_primary_fwnode() Hou Pu (1): null_blk: fix passing of REQ_FUA flag in null_handle_rq Ikjoon Jang (1): HID: quirks: add NOGET quirk for Logitech GROUP Jan Kara (4): ext4: don't BUG on inconsistent journal feature writeback: Protect inode->i_io_list with inode->i_lock writeback: Avoid skipping inode writeback writeback: Fix sync livelock due to b_dirty_time processing Jarkko Sakkinen (1): tpm: Unify the mismatching TPM space buffer sizes Jason Baron (1): EDAC/ie31200: Fallback if host bridge device is already initialized Javed Hasan (1): scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del() Jia-Ju Bai (1): media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq() Jing Xiangfeng (1): scsi: iscsi: Do not put host in iscsi_set_flashnode_param() Josef Bacik (1): btrfs: check the right error variable in btrfs_del_dir_entries_in_log Kai-Heng Feng (2): xhci: Do warm-reset when both CAS and XDEV_RESUME are set USB: quirks: Add no-lpm quirk for another Raydium touchscreen Li Guifu (1): f2fs: fix use-after-free issue Li Jun (1): usb: host: xhci: fix ep context print mismatch in debugfs Lukas Czerner (3): jbd2: make sure jh have b_transaction set in refile/unfile_buffer ext4: handle read only external journal device ext4: handle option set by mount flags correctly Lukas Wunner (2): serial: pl011: Fix oops on -EPROBE_DEFER serial: pl011: Don't leak amba_ports entry on driver register error Mahesh Bandewar (1): ipvlan: fix device features Marcos Paulo de Souza (1): btrfs: reset compression level for lzo on remount Mark Tomlinson (1): gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY Miaohe Lin (1): net: Fix potential wrong skb->protocol in skb_vlan_untag() Michael Ellerman (1): powerpc/64s: Don't init FSCR_DSCR in __init_FSCR() Mike Christie (1): scsi: fcoe: Fix I/O path allocation Ming Lei (1): blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART Navid Emamdoost (4): drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms drm/amd/display: fix ref count leak in amdgpu_drm_ioctl drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails Necip Fazil Yildiran (1): net: qrtr: fix usage of idr in port assignment to socket Peilin Ye (2): net/smc: Prevent kernel-infoleak in __smc_diag_dump() HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage() Peng Fan (1): mips/vdso: Fix resource leaks in genvdso.c Qiushi Wu (5): ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt ASoC: img-parallel-out: Fix a reference count leak ASoC: tegra: Fix reference count leaks. drm/amdkfd: Fix reference count leaks. PCI: Fix pci_create_slot() reference count leak Qu Wenruo (1): btrfs: file: reserve qgroup space after the hole punch range is locked Quinn Tran (1): scsi: qla2xxx: Fix null pointer access during disconnect from subsystem Rafael J. Wysocki (1): PM: sleep: core: Fix the handling of pending runtime resume requests Randy Dunlap (1): ALSA: pci: delete repeated words in comments Reto Schneider (1): rtlwifi: rtl8192cu: Prevent leaking urb Rob Clark (1): drm/msm/adreno: fix updating ring fence Robin Murphy (1): iommu/iova: Don't BUG on invalid PFNs Saurav Kashyap (2): scsi: qla2xxx: Check if FW supports MQ before enabling Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command" Sean Young (1): media: gpio-ir-tx: improve precision of transmitted signal due to scheduling Sergey Senozhatsky (1): serial: 8250: change lock order in serial8250_do_startup() Shay Agroskin (1): net: ena: Make missed_tx stat incremental Stanley Chu (2): scsi: ufs: Fix possible infinite loop in ufshcd_hold scsi: ufs: Clean up completed request without interrupt notification Stephan Gerhold (1): arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep Sumera Priyadarsini (1): net: gianfar: Add of_node_put() before goto statement Sylwester Nawrocki (1): ASoC: wm8994: Avoid attempts to read unreadable registers Tamseel Shams (1): serial: samsung: Removes the IRQ not found warning Tang Bin (1): usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe() Tetsuo Handa (1): vt: defer kfree() of vc_screenbuf in vc_do_resize() Thinh Nguyen (4): usb: uas: Add quirk for PNY Pro Elite usb: dwc3: gadget: Don't setup more than requested usb: dwc3: gadget: Fix handling ZLP usb: dwc3: gadget: Handle ZLP for sg requests Thomas Gleixner (2): XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information. genirq/matrix: Deal with the sillyness of for_each_cpu() on UP Tianjia Zhang (1): nvme-fc: Fix wrong return value in __nvme_fc_init_request() Tom Rix (1): USB: cdc-acm: rework notification_buffer resizing Valmer Huhn (1): serial: 8250_exar: Fix number of ports for Commtech PCIe cards Vineeth Vijayan (1): s390/cio: add cond_resched() in the slow_eval_known_fn() loop Wolfram Sang (1): i2c: rcar: in slave mode, clear NACK earlier Xianting Tian (1): fs: prevent BUG_ON in submit_bh_wbc() Xiubo Li (1): ceph: fix potential mdsc use-after-free crash Yangbo Lu (1): ARM: dts: ls1021a: output PPS signal on FIPER2 Zhi Chen (1): Revert "ath10k: fix DMA related firmware crashes on multiple devices" qiuguorui1 (1): irqchip/stm32-exti: Avoid losing interrupts due to clearing pending bits by mistake Makefile | 2 +- arch/arm/boot/dts/ls1021a.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 +- arch/arm64/kvm/hyp/switch.c | 2 +- arch/mips/vdso/genvdso.c | 10 ++ arch/powerpc/kernel/cpu_setup_power.S | 2 +- arch/powerpc/perf/core-book3s.c | 4 + arch/powerpc/platforms/cell/Kconfig | 1 + arch/powerpc/sysdev/xive/native.c | 2 + block/blk-mq-sched.c | 9 ++ block/blk-mq.c | 9 ++ drivers/base/core.c | 12 +- drivers/base/power/main.c | 16 +- drivers/block/null_blk_main.c | 2 +- drivers/char/tpm/tpm-chip.c | 9 +- drivers/char/tpm/tpm.h | 6 +- drivers/char/tpm/tpm2-space.c | 26 ++-- drivers/char/tpm/tpmrm-dev.c | 2 +- drivers/edac/ie31200_edac.c | 50 +++++- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 20 ++- .../drm/amd/powerplay/hwmgr/vega10_thermal.c | 7 +- .../drm/amd/powerplay/hwmgr/vega12_thermal.c | 6 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- drivers/gpu/drm/radeon/radeon_connectors.c | 20 ++- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 22 +-- drivers/hid/usbhid/hiddev.c | 4 + drivers/i2c/busses/i2c-rcar.c | 1 + drivers/iommu/iova.c | 4 +- drivers/irqchip/irq-stm32-exti.c | 14 +- drivers/media/cec/cec-api.c | 8 +- drivers/media/pci/ttpci/av7110.c | 5 +- drivers/media/rc/gpio-ir-tx.c | 7 +- drivers/mfd/intel-lpss-pci.c | 3 + drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 +- drivers/net/ethernet/freescale/gianfar.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ipvlan/ipvlan_main.c | 27 +++- drivers/net/macvlan.c | 21 ++- drivers/net/wireless/ath/ath10k/hw.h | 2 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +- drivers/nvme/host/fc.c | 4 +- drivers/pci/slot.c | 6 +- drivers/s390/cio/css.c | 5 + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 26 +--- drivers/scsi/qla2xxx/qla_mbx.c | 8 - drivers/scsi/qla2xxx/qla_nvme.c | 5 + drivers/scsi/qla2xxx/qla_os.c | 5 + drivers/scsi/scsi_transport_iscsi.c | 2 +- drivers/scsi/ufs/ufshcd.c | 14 +- drivers/spi/spi-stm32.c | 3 +- drivers/target/target_core_user.c | 9 +- drivers/tty/serial/8250/8250_exar.c | 24 ++- drivers/tty/serial/8250/8250_port.c | 9 +- drivers/tty/serial/amba-pl011.c | 16 +- drivers/tty/serial/samsung.c | 8 +- drivers/tty/vt/vt.c | 5 +- drivers/tty/vt/vt_ioctl.c | 12 +- drivers/usb/class/cdc-acm.c | 22 ++- drivers/usb/core/quirks.c | 7 + drivers/usb/dwc3/gadget.c | 104 ++++++++++--- drivers/usb/gadget/function/f_ncm.c | 81 ++++++++-- drivers/usb/gadget/function/f_tcm.c | 7 +- drivers/usb/gadget/u_f.h | 38 +++-- drivers/usb/host/ohci-exynos.c | 5 +- drivers/usb/host/xhci-debugfs.c | 8 +- drivers/usb/host/xhci-hub.c | 19 +-- drivers/usb/host/xhci.c | 3 +- drivers/usb/misc/lvstest.c | 2 +- drivers/usb/misc/sisusbvga/sisusb.c | 2 +- drivers/usb/misc/yurex.c | 2 +- drivers/usb/storage/unusual_devs.h | 2 +- drivers/usb/storage/unusual_uas.h | 14 ++ drivers/video/fbdev/core/fbcon.c | 25 ++- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 +- drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 +- drivers/xen/events/events_base.c | 16 +- fs/btrfs/disk-io.c | 1 + fs/btrfs/file.c | 8 +- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/super.c | 1 + fs/btrfs/tree-log.c | 10 +- fs/buffer.c | 9 ++ fs/ceph/mds_client.c | 14 +- fs/ext4/super.c | 147 ++++++++++++------ fs/f2fs/f2fs.h | 4 +- fs/f2fs/inline.c | 19 ++- fs/f2fs/node.c | 6 +- fs/f2fs/recovery.c | 10 +- fs/f2fs/super.c | 5 +- fs/fs-writeback.c | 83 +++++----- fs/jbd2/transaction.c | 10 ++ fs/xfs/xfs_icache.c | 3 +- fs/xfs/xfs_inode.c | 25 ++- fs/xfs/xfs_trans_inode.c | 2 + include/linux/efi.h | 4 + include/linux/fs.h | 8 +- include/trace/events/writeback.h | 13 +- kernel/irq/matrix.c | 7 + kernel/locking/lockdep_proc.c | 2 +- net/core/skbuff.c | 4 +- net/ipv6/ip6_tunnel.c | 10 +- net/qrtr/qrtr.c | 20 +-- net/smc/smc_diag.c | 16 +- net/tipc/netlink_compat.c | 12 +- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/patch_sigmatel.c | 2 +- sound/pci/ice1712/prodigy192.c | 2 +- sound/pci/oxygen/xonar_dg.c | 2 +- sound/soc/codecs/wm8958-dsp2.c | 4 + sound/soc/img/img-i2s-in.c | 4 +- sound/soc/img/img-parallel-out.c | 4 +- sound/soc/tegra/tegra30_ahub.c | 4 +- sound/soc/tegra/tegra30_i2s.c | 4 +- sound/usb/quirks-table.h | 4 +- .../powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 - .../selftests/powerpc/pmu/ebb/cycles_test.c | 2 - .../powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 - .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 - tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 - .../pmu/ebb/ebb_on_willing_child_test.c | 2 - .../powerpc/pmu/ebb/lost_exception_test.c | 1 - .../powerpc/pmu/ebb/multi_counter_test.c | 7 - .../powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 - .../powerpc/pmu/ebb/pmae_handling_test.c | 2 - .../powerpc/pmu/ebb/pmc56_overflow_test.c | 2 - 142 files changed, 1037 insertions(+), 442 deletions(-) -- 2.25.1

1 120

[PATCH 01/37] arm64/ascend: enable ascend features for Ascend910 platform
by Yang Yingliang 22 Sep '20

22 Sep '20

From: Ding Tianhong <dingtianhong(a)huawei.com> ascend inclusion category: feature bugzilla: NA CVE: NA ------------------------------------------------- The Ascend910 platform only use the acpi mode to boot system, the oem message is recorded in the oem_table_id of IORT table, so use the oem message to enable the ascend features. Signed-off-by: Ding Tianhong <dingtianhong(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/mm/init.c | 7 ++++++- drivers/acpi/arm64/iort.c | 24 ++++++++++++++++++++++++ include/linux/init.h | 7 +++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 883350f9cc42..f23da539a476 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -769,7 +769,7 @@ __setup("keepinitrd", keepinitrd_setup); #endif #ifdef CONFIG_ASCEND_FEATURES -static int __init ascend_enable_setup(char *__unused) +void ascend_enable_all_features(void) { if (IS_ENABLED(CONFIG_ASCEND_DVPP_MMAP)) enable_mmap_dvpp = 1; @@ -782,6 +782,11 @@ static int __init ascend_enable_setup(char *__unused) if (IS_ENABLED(CONFIG_SUSPEND)) mem_sleep_current = PM_SUSPEND_ON; +} + +static int __init ascend_enable_setup(char *__unused) +{ + ascend_enable_all_features(); return 1; } diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 5a724bdb4a4d..7408ffab7303 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -25,6 +25,7 @@ #include <linux/pci.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/init.h> #define IORT_TYPE_MASK(type) (1 << (type)) #define IORT_MSI_TYPE (1 << ACPI_IORT_NODE_ITS_GROUP) @@ -1639,6 +1640,26 @@ static void __init iort_init_platform_devices(void) } } +/* + * This function detects the ascend platform by oem table id. + */ +static bool ascend_platform_detected(struct acpi_table_header *h) +{ + if (!memcmp(h->oem_table_id, "HI19801P", ACPI_OEM_TABLE_ID_SIZE)) + return true; + + if (!memcmp(h->oem_table_id, "HI19802P", ACPI_OEM_TABLE_ID_SIZE)) + return true; + + if (!memcmp(h->oem_table_id, "HI19804P", ACPI_OEM_TABLE_ID_SIZE)) + return true; + + if (!memcmp(h->oem_table_id, "HI1980\0\0", ACPI_OEM_TABLE_ID_SIZE)) + return true; + + return false; +} + void __init acpi_iort_init(void) { acpi_status status; @@ -1654,5 +1675,8 @@ void __init acpi_iort_init(void) return; } + if (ascend_platform_detected(iort_table)) + ascend_enable_all_features(); + iort_init_platform_devices(); } diff --git a/include/linux/init.h b/include/linux/init.h index 2538d176dd1f..e6f970ac7bf4 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -306,4 +306,11 @@ void __init parse_early_options(char *cmdline); #define __exit_p(x) NULL #endif +#ifndef __ASSEMBLY__ +#ifdef CONFIG_ASCEND_FEATURES +extern void ascend_enable_all_features(void); +#else +static inline void ascend_enable_all_features(void) { } +#endif +#endif #endif /* _LINUX_INIT_H */ -- 2.25.1

1 36

[PATCH] export walk_page_range and tlb flush function
by Miaohe Lin 18 Sep '20

18 Sep '20

From: yanxiaodan <yanxiaodan(a)huawei.com> Export walk_page_range,__kvm_tlb_flush_vmid and flush_tlb_mm_range, so that memory-scan module can use these functions to scan the memory pages and flush TLB. memory-scan link: https://gitee.com/openeuler/memory-scan Signed-off-by: yanxiaodan <yanxiaodan(a)huawei.com> --- arch/arm64/kvm/hyp/tlb.c | 1 + arch/x86/mm/tlb.c | 2 +- mm/pagewalk.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/tlb.c b/arch/arm64/kvm/hyp/tlb.c index d063a57..7158622 100644 --- a/arch/arm64/kvm/hyp/tlb.c +++ b/arch/arm64/kvm/hyp/tlb.c @@ -205,6 +205,7 @@ void __hyp_text __kvm_tlb_flush_vmid(struct kvm *kvm) __tlb_switch_to_host(kvm, &cxt); } +EXPORT_SYMBOL(__kvm_tlb_flush_vmid); void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu) { diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 1a3569b..be19bf5 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -945,7 +945,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, put_flush_tlb_info(); put_cpu(); } - +EXPORT_SYMBOL(flush_tlb_mm_range); static void do_flush_tlb_all(void *info) { diff --git a/mm/pagewalk.c b/mm/pagewalk.c index e81640d..44a9ab1 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -430,6 +430,7 @@ int walk_page_range(struct mm_struct *mm, unsigned long start, } while (start = next, start < end); return err; } +EXPORT_SYMBOL(walk_page_range); /* * Similar to walk_page_range() but can walk any page tables even if they are -- 1.8.3.1

1 0

【Meeting Notice】openEuler kernel sig meeting Time: 2020-09-18 10:00-12:00
by Meeting Book 17 Sep '20

17 Sep '20

5 7

[PATCH v2] delete python2 dependency
by Zhipeng Xie 15 Sep '20

15 Sep '20

hulk inclusion category: tools bugzilla: NA CVE: NA Link: https://gitee.com/src-openeuler/kernel/issues/I1SMDG ------------------------------------------------- Python2 is no longer supported by the upstream community. The dependency on python2 should be removed from the kernel code. Signed-off-by: Zhipeng Xie <xiezhipeng1(a)huawei.com> --- tools/perf/scripts/python/call-graph-from-sql.py | 2 +- tools/perf/scripts/python/export-to-postgresql.py | 2 +- tools/power/pm-graph/bootgraph.py | 2 +- tools/power/pm-graph/sleepgraph.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/scripts/python/call-graph-from-sql.py b/tools/perf/scripts/python/call-graph-from-sql.py index b494a67a1c67..099b472df4a2 100644 --- a/tools/perf/scripts/python/call-graph-from-sql.py +++ b/tools/perf/scripts/python/call-graph-from-sql.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # call-graph-from-sql.py: create call-graph from sql database # Copyright (c) 2014-2017, Intel Corporation. # diff --git a/tools/perf/scripts/python/export-to-postgresql.py b/tools/perf/scripts/python/export-to-postgresql.py index e46f51b17513..e97a03697aa2 100644 --- a/tools/perf/scripts/python/export-to-postgresql.py +++ b/tools/perf/scripts/python/export-to-postgresql.py @@ -171,7 +171,7 @@ import datetime # SELECT * FROM samples_view WHERE event = 'transactions' AND branch_type_name = 'transaction abort'; # # To print a call stack requires walking the call_paths table. For example this python script: -# #!/usr/bin/python2 +# #!/usr/bin/python # # import sys # from PySide.QtSql import * diff --git a/tools/power/pm-graph/bootgraph.py b/tools/power/pm-graph/bootgraph.py index 8ee626c0f6a5..abb4c38f029b 100755 --- a/tools/power/pm-graph/bootgraph.py +++ b/tools/power/pm-graph/bootgraph.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # # Tool for analyzing boot timing # Copyright (c) 2013, Intel Corporation. diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py index 0c760478f7d7..420102e2cd08 100755 --- a/tools/power/pm-graph/sleepgraph.py +++ b/tools/power/pm-graph/sleepgraph.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # # Tool for analyzing suspend/resume timing # Copyright (c) 2013, Intel Corporation. -- 2.18.1

3 2

[PATCH] arm64: configs: enable CONFIG_NUMA_AWARE_SPINLOCKS
by Yang Yingliang 15 Sep '20

15 Sep '20

hulk inclusion category: feature CVE: NA ----------------------- enable CONFIG_NUMA_AWARE_SPINLOCKS. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/configs/euleros_defconfig | 3 ++- arch/arm64/configs/hulk_defconfig | 2 +- arch/arm64/configs/openeuler_defconfig | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/euleros_defconfig b/arch/arm64/configs/euleros_defconfig index 09c604738074..2762ee8afe05 100644 --- a/arch/arm64/configs/euleros_defconfig +++ b/arch/arm64/configs/euleros_defconfig @@ -418,6 +418,7 @@ CONFIG_ARM64_ERR_RECOV=y CONFIG_MPAM=y CONFIG_NUMA=y CONFIG_NODES_SHIFT=3 +CONFIG_NUMA_AWARE_SPINLOCKS=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y @@ -440,7 +441,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_SECCOMP=y CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 9952d0b89744..4979492bb484 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -440,7 +440,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_SECCOMP=y CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index beb292fa9b47..809350e03968 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -421,7 +421,7 @@ CONFIG_ARM64_ERR_RECOV=y CONFIG_MPAM=y CONFIG_NUMA=y CONFIG_NODES_SHIFT=4 -# CONFIG_NUMA_AWARE_SPINLOCKS is not set +CONFIG_NUMA_AWARE_SPINLOCKS=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -- 2.25.1

1 0

[PATCH 1/2] random: only read from /dev/random after its pool has received 128 bits
by Yang Yingliang 15 Sep '20

15 Sep '20

From: Theodore Ts'o <tytso(a)mit.edu> mainline inclusion from mainline-v5.2-rc1 commit eb9d1bf079bb438d1a066d72337092935fc770f6 category: bugfix bugzilla: NA CVE: NA https://gitee.com/openeuler/kernel/issues/I1CVQ4?from=project-issue ------------------------------------------------- Immediately after boot, we allow reads from /dev/random before its entropy pool has been fully initialized. Fix this so that we don't allow this until the blocking pool has received 128 bits. We do this by repurposing the initialized flag in the entropy pool struct, and use the initialized flag in the blocking pool to indicate whether it is safe to pull from the blocking pool. To do this, we needed to rework when we decide to push entropy from the input pool to the blocking pool, since the initialized flag for the input pool was used for this purpose. To simplify things, we no longer use the initialized flag for that purpose, nor do we use the entropy_total field any more. Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/char/random.c | 44 +++++++++++++++++------------------ include/trace/events/random.h | 13 ++++------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 6a5d4dfafc47..750d2ab2ac54 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -471,7 +471,6 @@ struct entropy_store { unsigned short add_ptr; unsigned short input_rotate; int entropy_count; - int entropy_total; unsigned int initialized:1; unsigned int last_data_init:1; __u8 last_data[EXTRACT_SIZE]; @@ -644,7 +643,7 @@ static void process_random_ready_list(void) */ static void credit_entropy_bits(struct entropy_store *r, int nbits) { - int entropy_count, orig; + int entropy_count, orig, has_initialized = 0; const int pool_size = r->poolinfo->poolfracbits; int nfrac = nbits << ENTROPY_SHIFT; @@ -699,23 +698,25 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) entropy_count = 0; } else if (entropy_count > pool_size) entropy_count = pool_size; + if ((r == &blocking_pool) && !r->initialized && + (entropy_count >> ENTROPY_SHIFT) > 128) + has_initialized = 1; if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig) goto retry; - r->entropy_total += nbits; - if (!r->initialized && r->entropy_total > 128) { + if (has_initialized) r->initialized = 1; - r->entropy_total = 0; - } trace_credit_entropy_bits(r->name, nbits, - entropy_count >> ENTROPY_SHIFT, - r->entropy_total, _RET_IP_); + entropy_count >> ENTROPY_SHIFT, _RET_IP_); if (r == &input_pool) { int entropy_bits = entropy_count >> ENTROPY_SHIFT; + struct entropy_store *other = &blocking_pool; - if (crng_init < 2 && entropy_bits >= 128) { + if (crng_init < 2) { + if (entropy_bits < 128) + return; crng_reseed(&primary_crng, r); entropy_bits = r->entropy_count >> ENTROPY_SHIFT; } @@ -726,20 +727,14 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) wake_up_interruptible(&random_read_wait); kill_fasync(&fasync, SIGIO, POLL_IN); } - /* If the input pool is getting full, send some - * entropy to the blocking pool until it is 75% full. + /* If the input pool is getting full, and the blocking + * pool has room, send some entropy to the blocking + * pool. */ - if (entropy_bits > random_write_wakeup_bits && - r->initialized && - r->entropy_total >= 2*random_read_wakeup_bits) { - struct entropy_store *other = &blocking_pool; - - if (other->entropy_count <= - 3 * other->poolinfo->poolfracbits / 4) { - schedule_work(&other->push_work); - r->entropy_total = 0; - } - } + if (!work_pending(&other->push_work) && + (ENTROPY_BITS(r) > 6 * r->poolinfo->poolbytes) && + (ENTROPY_BITS(other) <= 6 * other->poolinfo->poolbytes)) + schedule_work(&other->push_work); } } @@ -1558,6 +1553,11 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf, int large_request = (nbytes > 256); trace_extract_entropy_user(r->name, nbytes, ENTROPY_BITS(r), _RET_IP_); + if (!r->initialized && r->pull) { + xfer_secondary_pool(r, ENTROPY_BITS(r->pull)/8); + if (!r->initialized) + return 0; + } xfer_secondary_pool(r, nbytes); nbytes = account(r, nbytes, 0, 0); diff --git a/include/trace/events/random.h b/include/trace/events/random.h index 0560dfc33f1c..32c10a515e2d 100644 --- a/include/trace/events/random.h +++ b/include/trace/events/random.h @@ -62,15 +62,14 @@ DEFINE_EVENT(random__mix_pool_bytes, mix_pool_bytes_nolock, TRACE_EVENT(credit_entropy_bits, TP_PROTO(const char *pool_name, int bits, int entropy_count, - int entropy_total, unsigned long IP), + unsigned long IP), - TP_ARGS(pool_name, bits, entropy_count, entropy_total, IP), + TP_ARGS(pool_name, bits, entropy_count, IP), TP_STRUCT__entry( __field( const char *, pool_name ) __field( int, bits ) __field( int, entropy_count ) - __field( int, entropy_total ) __field(unsigned long, IP ) ), @@ -78,14 +77,12 @@ TRACE_EVENT(credit_entropy_bits, __entry->pool_name = pool_name; __entry->bits = bits; __entry->entropy_count = entropy_count; - __entry->entropy_total = entropy_total; __entry->IP = IP; ), - TP_printk("%s pool: bits %d entropy_count %d entropy_total %d " - "caller %pS", __entry->pool_name, __entry->bits, - __entry->entropy_count, __entry->entropy_total, - (void *)__entry->IP) + TP_printk("%s pool: bits %d entropy_count %d caller %pS", + __entry->pool_name, __entry->bits, + __entry->entropy_count, (void *)__entry->IP) ); TRACE_EVENT(push_to_pool, -- 2.25.1

1 1

[PATCH 0/6] Support E0PD
by Yang Yingliang 14 Sep '20

14 Sep '20

Chen Jun (1): config: set default value of CONFIG_ARM64_E0PD Mark Brown (4): arm64: Add initial support for E0PD arm64: Factor out checks for KASLR in KPTI code into separate function arm64: Don't use KPTI where we have E0PD arm64: Use a variable to store non-global mappings decision Will Deacon (1): arm64: kpti: Fix "kpti=off" when KASLR is enabled arch/arm64/Kconfig | 16 +++++++ arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 2 + arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/mmu.h | 4 +- arch/arm64/include/asm/pgtable-hwdef.h | 2 + arch/arm64/include/asm/pgtable-prot.h | 6 ++- arch/arm64/include/asm/sysreg.h | 1 + arch/arm64/kernel/cpufeature.c | 61 ++++++++++++++++++++++++-- arch/arm64/kernel/setup.c | 7 +++ 11 files changed, 95 insertions(+), 9 deletions(-) -- 2.25.1

1 6

[PATCH 0/7] Add auto-tuning for huagepage
by Yang Yingliang 14 Sep '20

14 Sep '20

Weilong Chen (7): arm64/ascend: Add new CONFIG for auto-tuning hugepage arm64/ascend: Add mmap hook when alloc hugepage arm64/ascend: Add set hugepage number helper function arm64/ascend: Add hugepage flags change interface arm64/ascend: Notifier will return a freed val to indecate print logs arm64/ascend: Enable CONFIG_ASCEND_AUTO_TUNING_HUGEPAGE for hulk_defconfig arm64/ascend: Add auto tuning hugepage module arch/arm64/Kconfig | 6 + arch/arm64/configs/hulk_defconfig | 1 + mm/Makefile | 1 + mm/hugepage_tuning.c | 693 ++++++++++++++++++++++++++++++ mm/hugepage_tuning.h | 70 +++ mm/hugetlb.c | 22 + mm/mmap.c | 30 ++ mm/oom_kill.c | 8 +- 8 files changed, 829 insertions(+), 2 deletions(-) create mode 100644 mm/hugepage_tuning.c create mode 100644 mm/hugepage_tuning.h -- 2.25.1

1 7

[PATCH 00/10] Support v8.5-RNG
by Yang Yingliang 11 Sep '20

11 Sep '20

Guenter Roeck (1): arm64: kaslr: Use standard early random function Linus Torvalds (1): random: random.h should include archrandom.h, not the other way around Mark Brown (3): arm64: kaslr: Announce KASLR status on boot arm64: kaslr: Check command line before looking for a seed arm64: Use v8.5-RNG entropy for KASLR seed Mark Rutland (2): arm64: add credited/trusted RNG support random: add arch_get_random_*long_early() Richard Henderson (1): arm64: Implement archrandom.h for ARMv8.5-RNG Robin Murphy (1): arm64: Fix CONFIG_ARCH_RANDOM=n build Yang Yingliang (1): config: set default value of CONFIG_ARCH_RANDOM Documentation/arm64/cpu-feature-registers.txt | 2 + Documentation/arm64/elf_hwcaps.txt | 5 ++ arch/arm64/Kconfig | 12 +++ arch/arm64/configs/euleros_defconfig | 5 ++ arch/arm64/configs/hulk_defconfig | 5 ++ arch/arm64/configs/openeuler_defconfig | 5 ++ arch/arm64/include/asm/archrandom.h | 88 +++++++++++++++++++ arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/asm/sysreg.h | 4 + arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/kernel/cpufeature.c | 14 +++ arch/arm64/kernel/cpuinfo.c | 1 + arch/arm64/kernel/kaslr.c | 54 +++++++++++- include/linux/random.h | 22 +++++ 15 files changed, 217 insertions(+), 5 deletions(-) create mode 100644 arch/arm64/include/asm/archrandom.h -- 2.25.1

1 10

[PATCH 0/2] Add support for SDEI_WATCHDOG/PMU_WATCHDOG selection
by Yang Yingliang 11 Sep '20

11 Sep '20

Jingyi Wang (2): arm64: watchdog: add switch to select sdei_watchdog/pmu_watchdog arm64: update hulk_defconfig and openeuler_defconfig arch/arm64/configs/hulk_defconfig | 2 +- arch/arm64/configs/openeuler_defconfig | 3 ++- arch/arm64/kernel/watchdog_sdei.c | 23 ++++++++++++++------ include/linux/nmi.h | 11 ++++++++++ kernel/watchdog.c | 29 +++++++++++++++++++------- lib/Kconfig.debug | 7 ++----- 6 files changed, 55 insertions(+), 20 deletions(-) -- 2.25.1

1 2

[PATCH 0/3] Fix use-after-free in dm_bm_set_read_only
by Yang Yingliang 11 Sep '20

11 Sep '20

Ye Bin (3): dm cache metadata: Avoid returning cmd->bm wild pointer on error dm thin metadata: Avoid returning cmd->bm wild pointer on error dm thin metadata: Fix use-after-free in dm_bm_set_read_only drivers/md/dm-cache-metadata.c | 8 ++++++-- drivers/md/dm-thin-metadata.c | 10 +++++++--- drivers/md/persistent-data/dm-block-manager.c | 14 ++++++++------ 3 files changed, 21 insertions(+), 11 deletions(-) -- 2.25.1

1 3

[PATCH] mm: slub: fix conversion of freelist_corrupted()
by Yang Yingliang 11 Sep '20

11 Sep '20

From: Eugeniu Rosca <erosca(a)de.adit-jv.com> mainline inclusion from mainline-v5.9-rc4 commit dc07a728d49cf025f5da2c31add438d839d076c0 category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- Commit 52f23478081ae0 ("mm/slub.c: fix corrupted freechain in deactivate_slab()") suffered an update when picked up from LKML [1]. Specifically, relocating 'freelist = NULL' into 'freelist_corrupted()' created a no-op statement. Fix it by sticking to the behavior intended in the original patch [1]. In addition, make freelist_corrupted() immune to passing NULL instead of &freelist. The issue has been spotted via static analysis and code review. [1] https://lore.kernel.org/linux-mm/20200331031450.12182-1-dongli.zhang@oracle… Fixes: 52f23478081ae0 ("mm/slub.c: fix corrupted freechain in deactivate_slab()") Signed-off-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Cc: Dongli Zhang <dongli.zhang(a)oracle.com> Cc: Joe Jin <joe.jin(a)oracle.com> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: David Rientjes <rientjes(a)google.com> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: <stable(a)vger.kernel.org> Link: https://lkml.kernel.org/r/20200824130643.10291-1-erosca@de.adit-jv.com Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/slub.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 0415902a2749..887e3d67a4d7 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -646,12 +646,12 @@ static void slab_fix(struct kmem_cache *s, char *fmt, ...) } static bool freelist_corrupted(struct kmem_cache *s, struct page *page, - void *freelist, void *nextfree) + void **freelist, void *nextfree) { if ((s->flags & SLAB_CONSISTENCY_CHECKS) && - !check_valid_pointer(s, page, nextfree)) { - object_err(s, page, freelist, "Freechain corrupt"); - freelist = NULL; + !check_valid_pointer(s, page, nextfree) && freelist) { + object_err(s, page, *freelist, "Freechain corrupt"); + *freelist = NULL; slab_fix(s, "Isolate corrupted freechain"); return true; } @@ -1342,7 +1342,7 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) {} static bool freelist_corrupted(struct kmem_cache *s, struct page *page, - void *freelist, void *nextfree) + void **freelist, void *nextfree) { return false; } @@ -2036,7 +2036,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page, * 'freelist' is already corrupted. So isolate all objects * starting at 'freelist'. */ - if (freelist_corrupted(s, page, freelist, nextfree)) + if (freelist_corrupted(s, page, &freelist, nextfree)) break; do { -- 2.25.1

1 0

[PATCH 0/7] Support some features of ARMv8.x
by Yang Yingliang 10 Sep '20

10 Sep '20

Support - SVE2 - ARMv8.5-CondM, Condition flag manipulation - ARMv8.5-FRINT, Armv8.5 Floating-point to integer - ARMv8.6 Matrix multiply extension Dave Martin (2): arm64: Expose SVE2 features for userspace arm64: cpufeature: Fix missing ZFR0 in __read_sysreg_by_encoding() Julien Grall (2): arm64: cpufeature: Treat ID_AA64ZFR0_EL1 as RAZ when SVE is not enabled arm64: cpufeature: Effectively expose FRINT capability to userspace Mark Brown (2): arm64: Expose ARMv8.5 CondM capability to userspace arm64: Expose FRINT capabilities to userspace Steven Price (1): arm64: cpufeature: Export matrix and other features to userspace Documentation/arm64/cpu-feature-registers.txt | 30 ++++++++++ Documentation/arm64/elf_hwcaps.txt | 59 +++++++++++++++++++ Documentation/arm64/sve.txt | 17 ++++++ arch/arm64/Kconfig | 3 + arch/arm64/include/asm/hwcap.h | 15 +++++ arch/arm64/include/asm/sysreg.h | 27 +++++++++ arch/arm64/include/uapi/asm/hwcap.h | 15 +++++ arch/arm64/kernel/cpufeature.c | 45 +++++++++++++- arch/arm64/kernel/cpuinfo.c | 15 +++++ 9 files changed, 225 insertions(+), 1 deletion(-) -- 2.25.1

1 7

[PATCH 0/6] Support TLB maintenance and TLB range instructions
by Yang Yingliang 10 Sep '20

10 Sep '20

Anshuman Khandual (1): arm64/cpufeature: Add remaining feature bits in ID_AA64ISAR0 register Sami Tolvanen (1): arm64: use a common .arch preamble for inline assembly Yuan Can (1): config: arm64: update defconfig Zhenyu Ye (3): arm64: tlb: Detect the ARMv8.4 TLBI RANGE feature arm64: enable tlbi range instructions arm64: tlb: Use the TLBI RANGE feature in arm64 arch/arm64/Kconfig | 18 +++ arch/arm64/Makefile | 15 ++- arch/arm64/configs/euleros_defconfig | 5 + arch/arm64/configs/hulk_defconfig | 5 + arch/arm64/configs/openeuler_defconfig | 5 + arch/arm64/include/asm/compiler.h | 6 + arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/cpufeature.h | 6 + arch/arm64/include/asm/sysreg.h | 4 + arch/arm64/include/asm/tlbflush.h | 160 ++++++++++++++++++++----- arch/arm64/kernel/cpufeature.c | 11 ++ 11 files changed, 205 insertions(+), 33 deletions(-) -- 2.25.1

1 6

[PATCH 0/2] Add interface to configure timeout
by Yang Yingliang 10 Sep '20

10 Sep '20

Wang Wensheng (2): watchdog: Add interface to config timeout and pretimeout in sysfs watchdog: Enable CONFIG_ASCEND_WATCHDOG_SYSFS_CONFIGURE in hulk_defconfig arch/arm64/Kconfig | 10 +++++ arch/arm64/configs/hulk_defconfig | 1 + drivers/watchdog/watchdog_dev.c | 63 +++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) -- 2.25.1

1 2

[PATCH 0/6] arm64: Initial support for CVADP
by Yang Yingliang 09 Sep '20

09 Sep '20

ARMv8.5 introduces a DC CVADP instruction which cleans the data cache to the point of deep persistence. This series makes the instruction available to userspace and advertises the presence of this CPU feature. At present when CONFIG_ARM64_PMEM is enabled and the CVAP feature is present (ARMv8.2) the CVAP instruction is used (from memcpy_flushcache and arch_wb_cache_pmem). No changes have been made to use CVADP in these functions or similar. As we have moved beyond 32 capabilities we now begin using AT_HWCAP2 for userspace. Tested as follows: $ dmesg | grep "Deep" [ 0.166496] CPU features: detected: Data cache clean to Point of Deep Persistence $ LD_SHOW_AUXV=1 sleep 2>&1 | grep AT_HWCAP AT_HWCAP: ef91ff87 AT_HWCAP2: 0x1 Andrew Murray (6): arm64: HWCAP: add support for AT_HWCAP2 arm64: HWCAP: encapsulate elf_hwcap arm64: Handle trapped DC CVADP arm64: Expose DC CVADP to userspace arm64: add CVADP support to the cache maintenance helper arm64: Advertise ARM64_HAS_DCPODP cpu feature Documentation/arm64/elf_hwcaps.txt | 17 +++- arch/arm64/crypto/aes-ce-ccm-glue.c | 2 +- arch/arm64/crypto/aes-neonbs-glue.c | 2 +- arch/arm64/crypto/chacha20-neon-glue.c | 2 +- arch/arm64/crypto/ghash-ce-glue.c | 6 +- arch/arm64/crypto/sha256-glue.c | 4 +- arch/arm64/include/asm/assembler.h | 4 + arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/cpufeature.h | 21 ++--- arch/arm64/include/asm/esr.h | 3 +- arch/arm64/include/asm/hwcap.h | 54 +++++++++++- arch/arm64/include/uapi/asm/hwcap.h | 7 +- arch/arm64/kernel/cpufeature.c | 110 +++++++++++++++++-------- arch/arm64/kernel/cpuinfo.c | 3 +- arch/arm64/kernel/fpsimd.c | 4 +- arch/arm64/kernel/traps.c | 3 + drivers/clocksource/arm_arch_timer.c | 8 ++ 17 files changed, 186 insertions(+), 67 deletions(-) -- 2.25.1

1 6

[PATCH 1/3] mm/swap_state: fix a data race in swapin_nr_pages
by Yang Yingliang 09 Sep '20

09 Sep '20

From: Qian Cai <cai(a)lca.pw> mainline inclusion from mainline-v5.8-rc1 commit d6c1f098f2a7ba62627c9bc17cda28f534ef9e4a category: bugfix bugzilla: 35806 CVE: NA ------------------------------------------------- "prev_offset" is a static variable in swapin_nr_pages() that can be accessed concurrently with only mmap_sem held in read mode as noticed by KCSAN, BUG: KCSAN: data-race in swap_cluster_readahead / swap_cluster_readahead write to 0xffffffff92763830 of 8 bytes by task 14795 on cpu 17: swap_cluster_readahead+0x2a6/0x5e0 swapin_readahead+0x92/0x8dc do_swap_page+0x49b/0xf20 __handle_mm_fault+0xcfb/0xd70 handle_mm_fault+0xfc/0x2f0 do_page_fault+0x263/0x715 page_fault+0x34/0x40 1 lock held by (dnf)/14795: #0: ffff897bd2e98858 (&mm->mmap_sem#2){++++}-{3:3}, at: do_page_fault+0x143/0x715 do_user_addr_fault at arch/x86/mm/fault.c:1405 (inlined by) do_page_fault at arch/x86/mm/fault.c:1535 irq event stamp: 83493 count_memcg_event_mm+0x1a6/0x270 count_memcg_event_mm+0x119/0x270 __do_softirq+0x365/0x589 irq_exit+0xa2/0xc0 read to 0xffffffff92763830 of 8 bytes by task 1 on cpu 22: swap_cluster_readahead+0xfd/0x5e0 swapin_readahead+0x92/0x8dc do_swap_page+0x49b/0xf20 __handle_mm_fault+0xcfb/0xd70 handle_mm_fault+0xfc/0x2f0 do_page_fault+0x263/0x715 page_fault+0x34/0x40 1 lock held by systemd/1: #0: ffff897c38f14858 (&mm->mmap_sem#2){++++}-{3:3}, at: do_page_fault+0x143/0x715 irq event stamp: 43530289 count_memcg_event_mm+0x1a6/0x270 count_memcg_event_mm+0x119/0x270 __do_softirq+0x365/0x589 irq_exit+0xa2/0xc0 Signed-off-by: Qian Cai <cai(a)lca.pw> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Cc: Marco Elver <elver(a)google.com> Cc: Hugh Dickins <hughd(a)google.com> Link: http://lkml.kernel.org/r/20200402213748.2237-1-cai@lca.pw Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Liu Shixin <liushixin2(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/swap_state.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index b776b472974c..2137e2d57196 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -548,10 +548,11 @@ static unsigned long swapin_nr_pages(unsigned long offset) return 1; hits = atomic_xchg(&swapin_readahead_hits, 0); - pages = __swapin_nr_pages(prev_offset, offset, hits, max_pages, + pages = __swapin_nr_pages(READ_ONCE(prev_offset), offset, hits, + max_pages, atomic_read(&last_readahead_pages)); if (!hits) - prev_offset = offset; + WRITE_ONCE(prev_offset, offset); atomic_set(&last_readahead_pages, pages); return pages; -- 2.25.1

1 2

[PATCH 0/4] arm64: perf: Add support for ARMv8.5-PMU
by Yang Yingliang 09 Sep '20

09 Sep '20

Backport perf support patches for ARMv8.5-PMU. Andrew Murray (3): arm64: cpufeature: Extract capped perfmon fields KVM: arm64: limit PMU version to PMUv3 for ARMv8.1 arm64: perf: Add support for ARMv8.5-PMU 64-bit counters Robin Murphy (1): arm64: perf: Clean up enable/disable calls arch/arm64/include/asm/cpufeature.h | 23 ++++ arch/arm64/include/asm/perf_event.h | 3 +- arch/arm64/include/asm/sysreg.h | 10 ++ arch/arm64/kernel/perf_event.c | 170 +++++++++++++++++----------- arch/arm64/kvm/sys_regs.c | 10 ++ include/linux/perf/arm_pmu.h | 1 + 6 files changed, 150 insertions(+), 67 deletions(-) -- 2.25.1

1 4

[PATCH 0/8] ARMv8.4 TTL feature
by Yang Yingliang 09 Sep '20

09 Sep '20

ARMv8.4 TTL feature. Catalin Marinas (1): arm64: Shift the __tlbi_level() indentation left Marc Zyngier (2): arm64: Detect the ARMv8.4 TTL feature arm64: Add level-hinted TLB invalidation helper Peter Zijlstra (Intel) (1): tlb: mmu_gather: add tlb_flush_*_range APIs Zhenyu Ye (4): arm64: Add tlbi_user_level TLB invalidation helper arm64: tlb: Set the TTL field in flush_tlb_range arm64: tlb: Set the TTL field in flush_*_tlb_range arm64: tlb: don't set the ttl value in flush_tlb_page_nosync arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/pgtable.h | 10 ++++ arch/arm64/include/asm/stage2_pgtable.h | 9 ++++ arch/arm64/include/asm/sysreg.h | 1 + arch/arm64/include/asm/tlb.h | 29 +++++++++++- arch/arm64/include/asm/tlbflush.h | 63 ++++++++++++++++++++++--- arch/arm64/kernel/cpufeature.c | 11 +++++ include/asm-generic/tlb.h | 55 +++++++++++++++------ 8 files changed, 158 insertions(+), 23 deletions(-) -- 2.25.1

1 8

BPF 新特性合入openEuler内核策略讨论
by 陆志浩 09 Sep '20

09 Sep '20

Hi： BPF 特性在上游内核社区非常活跃，该特性在网络、内核维护、容器、安全等方面都有使用价值，当前openEuler 4.19内核的BPF特性相较最新版本比较陈旧，不利于下游场景的一些价值场景的业务开发。我希望在openEuler 4.19内核版本逐步合入BPF最新特性，并且长期更新BPF最新特性及bugfix。 PS: 会上提供BPF新特性列表以及相关的文件列表范围，初步给出对周边模块的影响性。 by luzhihao

1 0

[PATCH] net: hns3: fix ping failed after S3 since removing HNAE3_RESTORE_CLIENT
by Yonglong Liu 09 Sep '20

09 Sep '20

commit: 412c29318f9b ("net: hns3: refactor the MAC address configure") removed the operation of HNAE3_RESTORE_CLIENT, so after S3 or S4, the MAC address is missing, then cause ping failed. According to the commit, need to assign a reset type to restore the MAC address. Signed-off-by: Yonglong Liu <liuyonglong(a)huawei.com> --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 823f161..ac1789e 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -3850,6 +3850,11 @@ static int hclge_resume(struct hnae3_ae_dev *ae_dev) rtnl_lock(); + memset(hdev->vlan_table, 0, sizeof(hdev->vlan_table)); + memset(hdev->vf_vlan_full, 0, sizeof(hdev->vf_vlan_full)); + bitmap_set(hdev->vport_config_block, 0, hdev->num_alloc_vport); + hclge_reset_umv_space(hdev); + ret = hclge_reset_ae_dev(hdev->ae_dev); if (ret) goto err_reset_lock; -- 2.8.1

1 0

[PATCH] net: hns3: fix ping failed after S3 since removing HNAE3_RESTORE_CLIENT
by Yonglong Liu 08 Sep '20

08 Sep '20

commit: 412c29318f9b ("net: hns3: refactor the MAC address configure") removed the operation of HNAE3_RESTORE_CLIENT, so after S3 or S4, the MAC address is missing, then cause ping failed. According to the commit, need to assign a reset type to restore the MAC address. Signed-off-by: Yonglong Liu <liuyonglong(a)huawei.com> --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 823f161..25aee93 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -3850,6 +3850,8 @@ static int hclge_resume(struct hnae3_ae_dev *ae_dev) rtnl_lock(); + hdev->reset_type = HNAE3_GLOBAL_RESET; + ret = hclge_reset_ae_dev(hdev->ae_dev); if (ret) goto err_reset_lock; -- 2.8.1

1 1

[PATCH 00/72] backport stable-4.19.142
by Yang Yingliang 08 Sep '20

08 Sep '20

Al Viro (1): do_epoll_ctl(): clean the failure exits up a bit Alex Williamson (1): vfio/type1: Add proper error unwind for vfio_iommu_replay() Bodo Stroesser (1): scsi: target: tcmu: Fix crash in tcmu_flush_dcache_range on ARM Charan Teja Reddy (1): mm, page_alloc: fix core hung in free_pcppages_bulk() Chris Wilson (1): drm/vgem: Replace opencoded version of drm_gem_dumb_map_offset() Chuck Lever (1): svcrdma: Fix another Receive buffer leak Chuhong Yuan (1): media: budget-core: Improve exception handling in budget_register() Cong Wang (1): bonding: fix a potential double-unregister Darrick J. Wong (1): xfs: fix inode quota reservation checks David Howells (1): afs: Fix NULL deref in afs_dynroot_depopulate() Dinghao Liu (1): ASoC: intel: Fix memleak in sst_media_open Doug Berger (1): mm: include CMA pages in lowmem_reserve at boot Eiichi Tsukata (1): xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init Eric Sandeen (1): ext4: fix potential negative array index in do_split() Evgeny Novikov (1): media: vpss: clean up resources in init Fugang Duan (1): net: fec: correct the error path for regulator disable in probe Gaurav Singh (1): tools/testing/selftests/cgroup/cgroup_util.c: cg_read_strcmp: fix null pointer dereference Greg Kroah-Hartman (1): Linux 4.19.142 Greg Ungerer (1): m68knommu: fix overwriting of bits in ColdFire V3 cache control Grzegorz Szczurek (1): i40e: Fix crash during removing i40e driver Haiyang Zhang (1): hv_netvsc: Fix the queue_mapping in netvsc_vf_xmit() Heiko Carstens (2): s390/runtime_instrumentation: fix storage key handling s390/ptrace: fix storage key handling Helge Deller (1): fs/signalfd.c: fix inconsistent return codes for signalfd4 Huacai Chen (1): rtc: goldfish: Enable interrupt in set_alarm() when necessary Hugh Dickins (2): khugepaged: khugepaged_test_exit() check mmget_still_valid() khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter() Jan Kara (1): ext4: fix checking of directory entry validity for inline directories Jann Horn (1): romfs: fix uninitialized memory leak in romfs_dev_read() Jarod Wilson (1): bonding: show saner speed for broadcast mode Javed Hasan (1): scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases Jim Mattson (2): kvm: x86: Toggling CR4.SMAP does not load PDPTEs in PAE mode kvm: x86: Toggling CR4.PKE does not load PDPTEs in PAE mode Jiri Wiesner (1): bonding: fix active-backup failover for current ARP slave Josef Bacik (2): btrfs: don't show full path of bind mounts in subvol= btrfs: sysfs: use NOFS for device creation Juergen Gross (2): efi: avoid error message when booting under Xen xen: don't reschedule in preemption off sections Krunoslav Kovac (1): drm/amd/display: fix pow() crashing when given base 0 Li Heng (1): efi: add missed destroy_workqueue when efisubsys_init fails Liang Chen (1): kthread: Do not preempt current task if it is going to call schedule() Luc Van Oostenryck (1): alpha: fix annotation of io{read,write}{16,32}be() Lukas Wunner (1): spi: Prevent adding devices below an unregistering controller Mao Wenan (1): virtio_ring: Avoid loop when vq is broken in virtqueue_poll Marc Zyngier (1): epoll: Keep a reference on files added to the check list Marcos Paulo de Souza (1): btrfs: export helpers for subvolume name/id resolution Masahiro Yamada (2): kconfig: qconf: do not limit the pop-up menu to the first row kconfig: qconf: fix signal connection to invalid slots Masami Hiramatsu (1): perf probe: Fix memory leakage when the probe point is not found Nikolay Borisov (1): btrfs: Move free_pages_out label in inline extent handling branch in compress_file_range Peter Xu (1): mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible Przemyslaw Patynowski (1): i40e: Set RX_ONLY mode for unicast promiscuous on VLAN Qu Wenruo (1): btrfs: inode: fix NULL pointer dereference if inode doesn't need compression Randy Dunlap (1): Fix build error when CONFIG_ACPI is not set/enabled: Selvin Xavier (1): RDMA/bnxt_re: Do not add user qps to flushlist Shay Agroskin (1): net: ena: Prevent reset after device destruction Srinivas Kandagatla (2): ASoC: q6routing: add dummy register read/write function ASoC: msm8916-wcd-analog: fix register Interrupt offset Srinivas Pandruvada (1): cpufreq: intel_pstate: Fix cpuinfo_max_freq when MSR_TURBO_RATIO_LIMIT is 0 Stanley Chu (1): scsi: ufs: Add DELAY_BEFORE_LPM quirk for Micron devices Steffen Maier (1): scsi: zfcp: Fix use-after-free in request timeout handlers Stephen Boyd (1): clk: Evict unregistered clks from parent caches Tom Rix (1): net: dsa: b53: check for timeout Vasant Hegde (1): powerpc/pseries: Do not initiate shutdown when system is running on UPS Wang Hai (1): net: gemini: Fix missing free_netdev() in error path of gemini_ethernet_port_probe() Wei Yongjun (1): kernel/relay.c: fix memleak on destroy relay channel Will Deacon (2): KVM: Pass MMU notifier range flags to kvm_unmap_hva_range() KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set Xiongfeng Wang (1): Input: psmouse - add a newline when printing 'proto' by sysfs Xiubo Li (1): ceph: fix use-after-free for fsc->mdsc Zhe Li (1): jffs2: fix UAF problem zhangyi (F) (1): jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock() Makefile | 2 +- arch/alpha/include/asm/io.h | 8 +-- arch/arm/include/asm/kvm_host.h | 2 +- arch/arm64/include/asm/kvm_host.h | 2 +- arch/m68k/include/asm/m53xxacr.h | 6 +- arch/mips/include/asm/kvm_host.h | 2 +- arch/mips/kvm/mmu.c | 3 +- arch/powerpc/include/asm/kvm_host.h | 3 +- arch/powerpc/kvm/book3s.c | 3 +- arch/powerpc/kvm/e500_mmu_host.c | 3 +- arch/powerpc/platforms/pseries/ras.c | 1 - arch/s390/kernel/ptrace.c | 7 +- arch/s390/kernel/runtime_instr.c | 2 +- arch/x86/include/asm/kvm_host.h | 3 +- arch/x86/kvm/mmu.c | 3 +- arch/x86/kvm/x86.c | 2 +- arch/x86/pci/xen.c | 1 + drivers/clk/clk.c | 52 +++++++++++--- drivers/cpufreq/intel_pstate.c | 1 + drivers/firmware/efi/efi.c | 2 + .../gpu/drm/amd/display/include/fixed31_32.h | 3 + drivers/gpu/drm/vgem/vgem_drv.c | 27 ------- drivers/infiniband/hw/bnxt_re/main.c | 3 +- drivers/input/mouse/psmouse-base.c | 2 +- drivers/media/pci/ttpci/budget-core.c | 11 ++- drivers/media/platform/davinci/vpss.c | 20 ++++-- drivers/net/bonding/bond_main.c | 42 +++++++++-- drivers/net/dsa/b53/b53_common.c | 2 + drivers/net/ethernet/amazon/ena/ena_netdev.c | 19 ++--- drivers/net/ethernet/cortina/gemini.c | 4 +- drivers/net/ethernet/freescale/fec_main.c | 4 +- .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 35 ++++++--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 + drivers/net/hyperv/netvsc_drv.c | 2 +- drivers/rtc/rtc-goldfish.c | 1 + drivers/s390/scsi/zfcp_fsf.c | 4 +- drivers/scsi/libfc/fc_disc.c | 12 +++- drivers/scsi/ufs/ufs_quirks.h | 1 + drivers/scsi/ufs/ufshcd.c | 2 + drivers/spi/Kconfig | 3 + drivers/spi/spi.c | 21 +++++- drivers/target/target_core_user.c | 2 +- drivers/vfio/vfio_iommu_type1.c | 71 +++++++++++++++++-- drivers/video/fbdev/efifb.c | 2 +- drivers/virtio/virtio_ring.c | 3 + drivers/xen/preempt.c | 2 +- fs/afs/dynroot.c | 20 +++--- fs/btrfs/ctree.h | 2 + fs/btrfs/export.c | 8 +-- fs/btrfs/export.h | 5 ++ fs/btrfs/inode.c | 23 +++--- fs/btrfs/super.c | 18 +++-- fs/btrfs/sysfs.c | 4 ++ fs/ceph/mds_client.c | 3 +- fs/eventpoll.c | 19 ++--- fs/ext4/namei.c | 22 ++++-- fs/jbd2/journal.c | 4 +- fs/jffs2/dir.c | 6 +- fs/romfs/storage.c | 4 +- fs/signalfd.c | 10 +-- fs/xfs/xfs_sysfs.h | 6 +- fs/xfs/xfs_trans_dquot.c | 2 +- kernel/kthread.c | 17 ++++- kernel/relay.c | 1 + mm/hugetlb.c | 24 +++---- mm/khugepaged.c | 7 +- mm/page_alloc.c | 7 +- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 + scripts/kconfig/qconf.cc | 70 +++++++++--------- sound/soc/codecs/msm8916-wcd-analog.c | 4 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +- sound/soc/qcom/qdsp6/q6routing.c | 16 +++++ tools/perf/util/probe-finder.c | 2 +- tools/testing/selftests/cgroup/cgroup_util.c | 2 +- virt/kvm/arm/mmu.c | 18 +++-- virt/kvm/kvm_main.c | 2 +- 77 files changed, 508 insertions(+), 236 deletions(-) -- 2.25.1

1 72

[PATCH 1/6] can: j1939: fix kernel-infoleak in j1939_sk_sock2sockaddr_can()
by Yang Yingliang 08 Sep '20

08 Sep '20

From: Eric Dumazet <edumazet(a)google.com> mainline inclusion from mainline-v5.9-rc2 commit 38ba8b9241f5848a49b80fddac9ab5f4692e434e category: bugfix bugzilla: 38684 CVE: NA --------------------------- syzbot found that at least 2 bytes of kernel information were leaked during getsockname() on AF_CAN CAN_J1939 socket. Since struct sockaddr_can has in fact two holes, simply clear the whole area before filling it with useful data. BUG: KMSAN: kernel-infoleak in kmsan_copy_to_user+0x81/0x90 mm/kmsan/kmsan_hooks.c:253 CPU: 0 PID: 8466 Comm: syz-executor511 Not tainted 5.8.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x21c/0x280 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:121 kmsan_internal_check_memory+0x238/0x3d0 mm/kmsan/kmsan.c:423 kmsan_copy_to_user+0x81/0x90 mm/kmsan/kmsan_hooks.c:253 instrument_copy_to_user include/linux/instrumented.h:91 [inline] _copy_to_user+0x18e/0x260 lib/usercopy.c:39 copy_to_user include/linux/uaccess.h:186 [inline] move_addr_to_user+0x3de/0x670 net/socket.c:237 __sys_getsockname+0x407/0x5e0 net/socket.c:1909 __do_sys_getsockname net/socket.c:1920 [inline] __se_sys_getsockname+0x91/0xb0 net/socket.c:1917 __x64_sys_getsockname+0x4a/0x70 net/socket.c:1917 do_syscall_64+0xad/0x160 arch/x86/entry/common.c:386 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x440219 Code: Bad RIP value. RSP: 002b:00007ffe5ee150c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000033 RAX: ffffffffffffffda RBX: 00000000004002c8 RCX: 0000000000440219 RDX: 0000000020000240 RSI: 0000000020000100 RDI: 0000000000000003 RBP: 00000000006ca018 R08: 0000000000000000 R09: 00000000004002c8 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000401a20 R13: 0000000000401ab0 R14: 0000000000000000 R15: 0000000000000000 Local variable ----address@__sys_getsockname created at: __sys_getsockname+0x91/0x5e0 net/socket.c:1894 __sys_getsockname+0x91/0x5e0 net/socket.c:1894 Bytes 2-3 of 24 are uninitialized Memory access of size 24 starts at ffff8880ba2c7de8 Data copied to user address 0000000020000100 Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Signed-off-by: Eric Dumazet <edumazet(a)google.com> Reported-by: syzbot <syzkaller(a)googlegroups.com> Cc: Robin van der Gracht <robin(a)protonic.nl> Cc: Oleksij Rempel <o.rempel(a)pengutronix.de> Cc: Pengutronix Kernel Team <kernel(a)pengutronix.de> Cc: linux-can(a)vger.kernel.org Acked-by: Oleksij Rempel <o.rempel(a)pengutronix.de> Link: https://lore.kernel.org/r/20200813161834.4021638-1-edumazet@google.com Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> Signed-off-by: Zhang Changzhong <zhangchangzhong(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- net/can/j1939/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index f7587428febdd..2f4e2142ef268 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -553,6 +553,11 @@ static int j1939_sk_connect(struct socket *sock, struct sockaddr *uaddr, static void j1939_sk_sock2sockaddr_can(struct sockaddr_can *addr, const struct j1939_sock *jsk, int peer) { + /* There are two holes (2 bytes and 3 bytes) to clear to avoid + * leaking kernel information to user space. + */ + memset(addr, 0, J1939_MIN_NAMELEN); + addr->can_family = AF_CAN; addr->can_ifindex = jsk->ifindex; addr->can_addr.j1939.pgn = jsk->addr.pgn; -- 2.25.1

1 5

[PATCH 0/4] Support Common Not Private
by Yang Yingliang 08 Sep '20

08 Sep '20

Cheng Jian (1): config: arm64: set defalut value of config CNP Vladimir Murzin (3): arm64: mm: Support Common Not Private translations arm64: KVM: Enable Common Not Private translations arm64: Introduce command line parameter to disable CNP .../admin-guide/kernel-parameters.txt | 4 ++ arch/arm/include/asm/kvm_arm.h | 1 + arch/arm/include/asm/kvm_mmu.h | 5 +++ arch/arm64/Kconfig | 14 ++++++ arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/configs/storage_ci_defconfig | 1 + arch/arm64/configs/syzkaller_defconfig | 1 + arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/cpufeature.h | 6 +++ arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/include/asm/kvm_mmu.h | 5 +++ arch/arm64/include/asm/mmu_context.h | 17 +++++++- arch/arm64/include/asm/pgtable-hwdef.h | 2 + arch/arm64/kernel/cpufeature.c | 43 +++++++++++++++++++ arch/arm64/kernel/suspend.c | 4 ++ arch/arm64/kvm/hyp-init.S | 3 ++ arch/arm64/mm/context.c | 3 ++ arch/arm64/mm/proc.S | 11 +++-- virt/kvm/arm/arm.c | 4 +- 21 files changed, 123 insertions(+), 8 deletions(-) -- 2.25.1

1 4

[PATCH 1/8] posix-cpu-timers: Stop disabling timers on mt-exec
by Yang Yingliang 08 Sep '20

08 Sep '20

From: "Eric W. Biederman" <ebiederm(a)xmission.com> mainline inclusion from mainline-v5.6 commit b95e31c07c5eb4f5c0769f12b38b0343d7961040 category: bugfix bugzilla: 32426 CVE: NA ------------------------ The reasons why the extra posix_cpu_timers_exit_group() invocation has been added are not entirely clear from the commit message. Today all that posix_cpu_timers_exit_group() does is stop timers that are tracking the task from firing. Every other operation on those timers is still allowed. The practical implication of this is posix_cpu_timer_del() which could not get the siglock after the thread group leader has exited (because sighand == NULL) would be able to run successfully because the timer was already dequeued. With that locking issue fixed there is no point in disabling all of the timers. So remove this ``tempoary'' hack. Fixes: e0a70217107e ("posix-cpu-timers: workaround to suppress the problems with mt exec") Signed-off-by: "Eric W. Biederman" <ebiederm(a)xmission.com> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Link: https://lkml.kernel.org/r/87o8tityzs.fsf@x220.int.ebiederm.org Reviewed-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/exit.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index 35adc3b1e9be9..891d65e3ffd51 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -102,17 +102,8 @@ static void __exit_signal(struct task_struct *tsk) #ifdef CONFIG_POSIX_TIMERS posix_cpu_timers_exit(tsk); - if (group_dead) { + if (group_dead) posix_cpu_timers_exit_group(tsk); - } else { - /* - * This can only happen if the caller is de_thread(). - * FIXME: this is the temporary hack, we should teach - * posix-cpu-timers to handle this case correctly. - */ - if (unlikely(has_group_leader_pid(tsk))) - posix_cpu_timers_exit_group(tsk); - } #endif if (group_dead) { -- 2.25.1

1 7

[PATCH] defconfig: update the defconfigs to support NVDIMM
by Yang Yingliang 08 Sep '20

08 Sep '20

From: Hanjun Guo <guohanjun(a)huawei.com> hulk inclusion category: feature bugzilla: NA CVE: NA --------------------------- openEuler wants NVDIMM support, update the defconfig. Signed-off-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/configs/hulk_defconfig | 2 +- arch/arm64/configs/openeuler_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 809f808363616..a696b55daaae0 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -644,7 +644,7 @@ CONFIG_ACPI_HED=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_BGRT is not set CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y -# CONFIG_ACPI_NFIT is not set +CONFIG_ACPI_NFIT=m CONFIG_HAVE_ACPI_APEI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index d3144ca393452..91bef6fcdbf88 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -640,7 +640,7 @@ CONFIG_ACPI_HED=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_BGRT is not set CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y -# CONFIG_ACPI_NFIT is not set +CONFIG_ACPI_NFIT=m CONFIG_HAVE_ACPI_APEI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y -- 2.25.1

1 0

[PATCH 1/5] net: hns3: check cmdq message parameters sent from VF
by Yang Yingliang 08 Sep '20

08 Sep '20

From: Yufeng Mo <moyufeng(a)huawei.com> driver inclusion category: bugfix bugzilla: NA CVE: NA ----------------------------------- The parameters sent from VF may be unreliable. If these parameters are used directly, memory overwriting may occur. Therefore, we need to check parameters before using. Signed-off-by: Yufeng Mo <moyufeng(a)huawei.com> Reviewed-by: Peng Li <lipeng321(a)huawei.com> Reviewed-by: Weiwei Deng <dengweiwei(a)huawei.com> Reviewed-by: Zhaohui Zhong <zhongzhaohui(a)huawei.com> Reviewed-by: Junxin Chen <chenjunxin1(a)huawei.com> Signed-off-by: Shengzui You <youshengzui(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- .../hisilicon/hns3/hns3pf/hclge_main.c | 7 +++++ .../hisilicon/hns3/hns3pf/hclge_mbx.c | 26 ++++++++++--------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 24b86d704e038..9c3ee09a67d7c 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -9542,12 +9542,19 @@ int hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id) void hclge_reset_vf_queue(struct hclge_vport *vport, u16 queue_id) { + struct hnae3_handle *handle = &vport->nic; struct hclge_dev *hdev = vport->back; int reset_try_times = 0; int reset_status; u16 queue_gid; int ret; + if (queue_id >= handle->kinfo.num_tqps) { + dev_warn(&hdev->pdev->dev, "Invalid vf queue id(%u)\n", + queue_id); + return; + } + queue_gid = hclge_covert_handle_qid_global(&vport->nic, queue_id); ret = hclge_send_reset_tqp_cmd(hdev, queue_gid, true); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c index 72fd997576016..33ca01408cfcb 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c @@ -167,21 +167,31 @@ static int hclge_get_ring_chain_from_mbx( struct hclge_vport *vport) { struct hnae3_ring_chain_node *cur_chain, *new_chain; + struct hclge_dev *hdev = vport->back; int ring_num; - int i = 0; + int i; ring_num = req->msg.ring_num; if (ring_num > HCLGE_MBX_MAX_RING_CHAIN_PARAM_NUM) return -ENOMEM; + for (i = 0; i < ring_num; i++) { + if (req->msg.param[i].tqp_index >= vport->nic.kinfo.rss_size) { + dev_err(&hdev->pdev->dev, "tqp index(%u) is out of range(0-%u)\n", + req->msg.param[i].tqp_index, + vport->nic.kinfo.rss_size - 1); + return -EINVAL; + } + } + hnae3_set_bit(ring_chain->flag, HNAE3_RING_TYPE_B, - req->msg.param[i].ring_type); + req->msg.param[0].ring_type); ring_chain->tqp_index = hclge_get_queue_id(vport->nic.kinfo.tqp - [req->msg.param[i].tqp_index]); + [req->msg.param[0].tqp_index]); hnae3_set_field(ring_chain->int_gl_idx, HNAE3_RING_GL_IDX_M, - HNAE3_RING_GL_IDX_S, req->msg.param[i].int_gl_index); + HNAE3_RING_GL_IDX_S, req->msg.param[0].int_gl_index); cur_chain = ring_chain; @@ -270,7 +280,6 @@ static int hclge_get_vf_ring_vector_map(struct hclge_vport *vport, #define HCLGE_VECTOR_ID_OFFSET 3 #define HCLGE_RING_VECTOR_MAP_INFO_LEN 4 struct hnae3_ring_chain_node ring_chain; - struct hclge_dev *hdev = vport->back; struct hclge_desc desc; struct hclge_ctrl_vector_chain_cmd *data = (struct hclge_ctrl_vector_chain_cmd *)desc.data; @@ -278,13 +287,6 @@ static int hclge_get_vf_ring_vector_map(struct hclge_vport *vport, u8 int_gl_index; int ret; - if (req->msg.param[0].tqp_index >= vport->nic.kinfo.rss_size) { - dev_err(&hdev->pdev->dev, "tqp index(%u) is out of range(0-%u)\n", - req->msg.param[0].tqp_index, - vport->nic.kinfo.rss_size - 1); - return -EINVAL; - } - req->msg.ring_num = HCLGE_LIMIT_RING_NUM; memset(&ring_chain, 0, sizeof(ring_chain)); -- 2.25.1

1 4