- Kernel - mailweb.openeuler.org

[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

[PATCH 1/2] config: add certs dir to CONFIG_MODULE_SIG_KEY
by Yang Yingliang 08 Sep '20

08 Sep '20

hulk inclusion category: bugfix bugzilla: NA CVE: NA --------------------------- make[1]: *** No rule to make target 'signing_key.pem', needed by 'certs/signing_key.x509'. Stop. Fix the compile error by add certs dir to CONFIG_MODULE_SIG_KEY. Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/configs/euleros_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/euleros_defconfig b/arch/arm64/configs/euleros_defconfig index c0ec409e48ac7..6b8a71fd4f846 100644 --- a/arch/arm64/configs/euleros_defconfig +++ b/arch/arm64/configs/euleros_defconfig @@ -5317,7 +5317,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y # # Certificates for signature checking # -CONFIG_MODULE_SIG_KEY="./signing_key.pem" +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -- 2.25.1

1 1

[PATCH] Revert "net: hns3: fix for ping failed when resume from s3 or s4"
by Yonglong Liu 08 Sep '20

08 Sep '20

This reverts commit 4c6d4e21ed9b2309f15ef9074e80c7fc1c09ccfc. Because commit: 412c29318f9b ("net: hns3: refactor the MAC address configure") removed the operation of HNAE3_RESTORE_CLIENT. --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 6ee6b4e..823f161 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -3858,10 +3858,6 @@ static int hclge_resume(struct hnae3_ae_dev *ae_dev) if (ret) goto err_reset_lock; - ret = hclge_notify_client(hdev, HNAE3_RESTORE_CLIENT); - if (ret) - goto err_reset_lock; - rtnl_unlock(); ret = hclge_notify_roce_client(hdev, HNAE3_INIT_CLIENT); -- 2.8.1

1 0

[PATCH 1/3] config: set config BLK_CGROUP_IOCOST default value
by Yang Yingliang 02 Sep '20

02 Sep '20

hulk inclusion category: feature bugzilla: 38688 CVE: NA --------------------------- set config BLK_CGROUP_IOCOST default value. Reviewed-by: zhangyi (F) <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/euleros_defconfig b/arch/arm64/configs/euleros_defconfig index 673dcb491a5ac..c0ec409e48ac7 100644 --- a/arch/arm64/configs/euleros_defconfig +++ b/arch/arm64/configs/euleros_defconfig @@ -795,6 +795,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 02090f911f17a..809f808363616 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -809,6 +809,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 49fd2e5c20185..1f18ab6957849 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -803,6 +803,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 747c6bd5967f2..912933ebd9817 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -883,6 +883,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_SED_OPAL is not set -- 2.25.1

1 2

[PATCH 00/28] ARMv8.3 pointer authentication
by Yang Yingliang 02 Sep '20

02 Sep '20

Firstly, this series improves function return address protection for the arm64 kernel, by compiling the kernel with ARMv8.3 Pointer Authentication instructions (referred ptrauth hereafter). This should help protect the kernel against attacks using return-oriented programming. Secondly, Suzuki's patches optimize checking and enabling cpu capabilities. Thirdly, three patches on kernel config enable ptrauth compiling and fix compile warnings. Finally, two patches of Mark Rutland and one patch of Marc Zyngier are necessary simplifications and cleanups. Amit Daniel Kachhap (9): arm64: cpufeature: Fix meta-capability cpufeature check arm64: ptrauth: Add bootup/runtime flags for __cpu_setup arm64: cpufeature: Move cpu capability helpers inside C file arm64: initialize ptrauth keys for kernel booting task arm64: mask PAC bits of __builtin_return_address arm64: __show_regs: strip PAC from lr in printk arm64: suspend: restore the kernel ptrauth keys lkdtm: arm64: test kernel pointer authentication arm64: Kconfig: ptrauth: Add binutils version check to fix mismatch Catalin Marinas (1): kbuild: Add support for 'as-instr' to be used in Kconfig files Kristina Martsenko (7): arm64: cpufeature: add pointer auth meta-capabilities arm64: rename ptrauth key structures to be user-specific arm64: install user ptrauth keys at kernel exit time arm64: cpufeature: handle conflicts based on capability arm64: enable ptrauth earlier arm64: initialize and switch ptrauth kernel keys arm64: compile the kernel with ptrauth return address signing Marc Zyngier (1): arm64: Drop unnecessary include from asm/smp.h Mark Rutland (3): arm64: unwind: strip PAC from kernel addresses arm64: remove ptrauth_keys_install_kernel sync arg arm64: simplify ptrauth initialization Nick Desaulniers (1): arm64: Kconfig: verify binutils support for ARM64_PTR_AUTH Suzuki K Poulose (4): arm64: capabilities: Speed up capability lookup arm64: capabilities: Optimize this_cpu_has_cap arm64: capabilities: Use linear array for detection and verification arm64: capabilities: Batch cpu_enable callbacks Vincenzo Frascino (1): kconfig: Add support for 'as-option' Zheng Zengkai (1): config: enable ARM64 pointer authentication configs by default arch/arm64/Kconfig | 38 +++- arch/arm64/Makefile | 11 + arch/arm64/configs/hulk_defconfig | 7 + arch/arm64/configs/openeuler_defconfig | 7 + arch/arm64/include/asm/asm_pointer_auth.h | 98 ++++++++ arch/arm64/include/asm/compiler.h | 19 ++ arch/arm64/include/asm/cpucaps.h | 4 +- arch/arm64/include/asm/cpufeature.h | 42 ++-- arch/arm64/include/asm/pointer_auth.h | 50 ++--- arch/arm64/include/asm/processor.h | 3 +- arch/arm64/include/asm/stackprotector.h | 5 + arch/arm64/kernel/asm-offsets.c | 13 ++ arch/arm64/kernel/cpufeature.c | 258 ++++++++++++++-------- arch/arm64/kernel/entry.S | 6 + arch/arm64/kernel/head.S | 10 + arch/arm64/kernel/pointer_auth.c | 7 +- arch/arm64/kernel/process.c | 5 +- arch/arm64/kernel/ptrace.c | 16 +- arch/arm64/kernel/sleep.S | 1 + arch/arm64/kernel/stacktrace.c | 5 +- arch/arm64/mm/proc.S | 27 ++- drivers/misc/lkdtm/bugs.c | 36 +++ drivers/misc/lkdtm/core.c | 1 + drivers/misc/lkdtm/lkdtm.h | 1 + include/linux/stackprotector.h | 2 +- scripts/Kconfig.include | 10 + 26 files changed, 513 insertions(+), 169 deletions(-) create mode 100644 arch/arm64/include/asm/asm_pointer_auth.h -- 2.25.1

1 28

[PATCH 00/90] backport stable-4.19.141
by Yang Yingliang 02 Sep '20

02 Sep '20

Adrian Hunter (1): perf intel-pt: Fix FUP packet state Ahmad Fatoum (3): watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options watchdog: f71808e_wdt: remove use of wrong watchdog_info option watchdog: f71808e_wdt: clear watchdog timeout occurred flag Alexandru Ardelean (1): iio: dac: ad5592r: fix unbalanced mutex unlocks in ad5592r_read_raw() Anand Jain (1): btrfs: don't traverse into the seed devices in show_devname Andy Shevchenko (1): mfd: dln2: Run event handler loop under spinlock Aneesh Kumar K.V (3): selftests/powerpc: ptrace-pkey: Rename variables to make it easier to follow code selftests/powerpc: ptrace-pkey: Update the test to mark an invalid pkey correctly selftests/powerpc: ptrace-pkey: Don't update expected UAMOR value Ansuel Smith (2): PCI: qcom: Define some PARF params needed for ipq8064 SoC PCI: qcom: Add support for tx term offset for rev 2.1.0 Anton Blanchard (1): pseries: Fix 64 bit logical memory block panic ChangSyun Peng (1): md/raid5: Fix Force reconstruct-write io stuck in degraded raid5 Charles Keepax (1): mfd: arizona: Ensure 32k clock is put on driver unbind and error Chengming Zhou (1): ftrace: Setup correct FTRACE_FL_REGS flags for module Christian Eggers (1): dt-bindings: iio: io-channel-mux: Fix compatible string in example code Colin Ian King (3): iommu/omap: Check for failure of a call to omap_iommu_dump_ctx Input: sentelic - fix error return when fsp_reg_write fails fs/ufs: avoid potential u32 multiplication overflow Coly Li (2): bcache: allocate meta data pages as compound pages bcache: fix overflow in offset_to_stripe() Dan Carpenter (2): drm/vmwgfx: Use correct vmw_legacy_display_unit pointer drm/vmwgfx: Fix two list_for_each loop exit tests Daniel Díaz (1): tools build feature: Quote CC and CXX for their arguments David Sterba (1): btrfs: fix messages after changing compression level by remount Dinghao Liu (1): ALSA: echoaudio: Fix potential Oops in snd_echo_resume() Eric Biggers (3): fs/minix: set s_maxbytes correctly fs/minix: fix block limit check for V1 filesystems fs/minix: remove expected error message in block_to_path() Eugeniu Rosca (1): media: vsp1: dl: Fix NULL pointer dereference on unbind Ewan D. Milne (1): scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport Filipe Manana (1): btrfs: fix memory leaks after failure to lookup checksums during inode logging Geert Uytterhoeven (1): sh: landisk: Add missing initialization of sh_io_port_base Greg Kroah-Hartman (1): Linux 4.19.141 Huacai Chen (1): MIPS: CPU#0 is not hotpluggable Hugh Dickins (1): khugepaged: retract_page_tables() remember to test exit Jason Gunthorpe (1): RDMA/ipoib: Fix ABBA deadlock with ipoib_reap_ah() Jeffrey Mitchell (1): nfs: Fix getxattr kernel panic and memory overflow Johan Hovold (2): USB: serial: ftdi_sio: make process-packet buffer unsigned USB: serial: ftdi_sio: clean up receive processing Johannes Berg (1): mac80211: fix misplaced while instead of if Jonathan McDowell (2): net: ethernet: stmmac: Disable hardware multicast filter net: stmmac: dwmac1000: provide multicast filter fallback Josef Bacik (2): btrfs: open device without device_list_mutex btrfs: only search for left_info if there is no right_info in try_merge_free_space Junxiao Bi (1): ocfs2: change slot number type s16 to u16 Kai-Heng Feng (1): PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken Kamal Heib (1): RDMA/ipoib: Return void from ipoib_ib_dev_stop() Kees Cook (2): net/compat: Add missing sock updates for SCM_RIGHTS module: Correctly truncate sysfs sections output Kevin Hao (1): tracing/hwlat: Honor the tracing_cpumask Krzysztof Sobota (1): watchdog: initialize device before misc_register Liu Yi L (1): iommu/vt-d: Enforce PASID devTLB field mask Liu Ying (1): drm/imx: imx-ldb: Disable both channels for split mode in enc->disable() Lukas Wunner (1): driver core: Avoid binding drivers to dead devices Marius Iacob (1): drm: Added orientation quirk for ASUS tablet model T103HAF Max Filippov (1): xtensa: fix xtensa_pmu_setup prototype Michael Ellerman (2): powerpc: Allow 4224 bytes of stack expansion for the signal frame powerpc: Fix circular dependency between percpu.h and mmu.h Michal Koutný (1): mm/page_counter.c: fix protection usage propagation Mikulas Patocka (1): ext2: fix missing percpu_counter_inc Ming Lei (1): dm rq: don't call blk_mq_queue_stopped() in dm_stop_queue() Muchun Song (1): kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler Paul Aurich (1): cifs: Fix leak when handling lease break for cached root fid Paul Kocialkowski (2): media: rockchip: rga: Introduce color fmt macros and refactor CSC mode logic media: rockchip: rga: Only set output CSC mode for RGB input Pavel Machek (1): btrfs: fix return value mixup in btrfs_get_extent Qu Wenruo (2): btrfs: free anon block device right after subvolume deletion btrfs: don't allocate anonymous block device for user invisible roots Rafael J. Wysocki (1): PCI: hotplug: ACPI: Fix context refcounting in acpiphp_grab_context() Rajat Jain (1): PCI: Add device even if driver attach failed Rayagonda Kokatanur (1): pwm: bcm-iproc: handle clk_get_rate() return Sandeep Raghuraman (1): drm/amdgpu: Fix bug where DPM is not enabled after hibernate and resume Sibi Sankar (1): remoteproc: qcom: q6v5: Update running state before requesting stop Stafford Horne (1): openrisc: Fix oops caused when dumping stack Steve French (1): smb3: warn on confusing error scenario with sec=krb5 Steve Longerbeam (1): gpu: ipu-v3: image-convert: Combine rotate/no-rotate irq handlers Steven Rostedt (VMware) (1): tracing: Use trace_sched_process_free() instead of exit() for pid tracing Thomas Gleixner (1): genirq/affinity: Make affinity setting if activated opt-in Thomas Hebb (1): tools build feature: Use CC and CXX from parent Tiezhu Yang (1): test_kmod: avoid potential double free in trigger_config_run_type() Tom Rix (1): btrfs: ref-verify: fix memory leak in add_block_entry Tomasz Maciej Nowak (1): arm64: dts: marvell: espressobin: add ethernet alias Vincent Whitchurch (1): perf bench mem: Always memset source before memcpy Wang Hai (1): net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init Wolfram Sang (2): i2c: rcar: slave: only send STOP event when we have been addressed i2c: rcar: avoid race when unregistering slave Xu Wang (1): clk: clk-atlas6: fix return value check in atlas6_clk_init() Yoshihiro Shimoda (1): mmc: renesas_sdhi_internal_dmac: clean up the code for dma complete .../iio/multiplexer/io-channel-mux.txt | 2 +- Makefile | 2 +- .../dts/marvell/armada-3720-espressobin.dts | 6 ++ arch/mips/kernel/topology.c | 2 +- arch/openrisc/kernel/stacktrace.c | 18 ++++- arch/powerpc/include/asm/percpu.h | 4 +- arch/powerpc/mm/fault.c | 7 +- .../platforms/pseries/hotplug-memory.c | 2 +- arch/sh/boards/mach-landisk/setup.c | 3 + arch/x86/kernel/apic/vector.c | 4 + arch/xtensa/kernel/perf_event.c | 2 +- drivers/base/dd.c | 4 +- drivers/clk/sirf/clk-atlas6.c | 2 +- .../gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 +- .../gpu/drm/drm_panel_orientation_quirks.c | 6 ++ drivers/gpu/drm/imx/imx-ldb.c | 7 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- drivers/gpu/ipu-v3/ipu-image-convert.c | 58 +++++---------- drivers/i2c/busses/i2c-rcar.c | 15 ++-- drivers/iio/dac/ad5592r-base.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 67 ++++++++--------- drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 + drivers/input/mouse/sentelic.c | 2 +- drivers/iommu/omap-iommu-debug.c | 3 + drivers/irqchip/irq-gic-v3-its.c | 5 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/bset.c | 2 +- drivers/md/bcache/btree.c | 2 +- drivers/md/bcache/journal.c | 4 +- drivers/md/bcache/super.c | 2 +- drivers/md/bcache/writeback.c | 14 ++-- drivers/md/bcache/writeback.h | 19 ++++- drivers/md/dm-rq.c | 3 - drivers/md/raid5.c | 3 +- drivers/media/platform/rockchip/rga/rga-hw.c | 29 ++++---- drivers/media/platform/rockchip/rga/rga-hw.h | 5 ++ drivers/media/platform/vsp1/vsp1_dl.c | 2 + drivers/mfd/arizona-core.c | 18 +++++ drivers/mfd/dln2.c | 4 + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 18 +++-- drivers/net/ethernet/qualcomm/emac/emac.c | 17 ++++- .../ethernet/stmicro/stmmac/dwmac-ipq806x.c | 1 + .../ethernet/stmicro/stmmac/dwmac1000_core.c | 3 + drivers/pci/bus.c | 6 +- drivers/pci/controller/dwc/pcie-qcom.c | 41 ++++++++++- drivers/pci/hotplug/acpiphp_glue.c | 14 +++- drivers/pci/quirks.c | 5 +- drivers/pwm/pwm-bcm-iproc.c | 9 ++- drivers/remoteproc/qcom_q6v5.c | 2 + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- drivers/usb/serial/ftdi_sio.c | 37 +++++----- drivers/watchdog/f71808e_wdt.c | 13 +++- drivers/watchdog/watchdog_dev.c | 18 ++--- fs/btrfs/disk-io.c | 13 +++- fs/btrfs/free-space-cache.c | 4 +- fs/btrfs/inode.c | 4 +- fs/btrfs/ref-verify.c | 2 + fs/btrfs/super.c | 35 ++++----- fs/btrfs/tree-log.c | 8 +- fs/btrfs/volumes.c | 21 +++++- fs/cifs/smb2misc.c | 73 +++++++++++++------ fs/cifs/smb2pdu.c | 2 + fs/ext2/ialloc.c | 3 +- fs/minix/inode.c | 12 +-- fs/minix/itree_v1.c | 12 +-- fs/minix/itree_v2.c | 13 ++-- fs/minix/minix.h | 1 - fs/nfs/nfs4proc.c | 2 - fs/nfs/nfs4xdr.c | 6 +- fs/ocfs2/ocfs2.h | 4 +- fs/ocfs2/suballoc.c | 4 +- fs/ocfs2/super.c | 4 +- fs/ufs/super.c | 2 +- include/linux/intel-iommu.h | 4 +- include/linux/irq.h | 13 ++++ include/net/sock.h | 4 + kernel/irq/manage.c | 6 +- kernel/kprobes.c | 7 ++ kernel/module.c | 22 +++++- kernel/trace/ftrace.c | 15 ++-- kernel/trace/trace_events.c | 4 +- kernel/trace/trace_hwlat.c | 5 +- lib/test_kmod.c | 2 +- mm/khugepaged.c | 22 +++--- mm/page_counter.c | 6 +- net/compat.c | 1 + net/core/sock.c | 21 ++++++ net/mac80211/sta_info.c | 2 +- sound/pci/echoaudio/echoaudio.c | 2 - tools/build/Makefile.feature | 2 +- tools/build/feature/Makefile | 2 - tools/perf/bench/mem-functions.c | 21 +++--- .../util/intel-pt-decoder/intel-pt-decoder.c | 21 ++---- .../selftests/powerpc/ptrace/ptrace-pkey.c | 55 +++++++------- 96 files changed, 639 insertions(+), 365 deletions(-) -- 2.25.1

1 90

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

01 Sep '20

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

2 1

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

01 Sep '20

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

1 0

[PATCH kernel-4.19, openEuler-1.0-LTS, openEuler-20.09] arm64/config: enable TIPC module for openEuler
by Xie XiuQi 31 Aug '20

31 Aug '20

hulk inclusion category: feature feature: TIPC bugzilla: NA CVE: NA Link: https://gitee.com/openeuler/kernel/issues/I1TDS3 The Transparent Inter Process Communication (TIPC) protocol is specially designed for intra cluster communication. This protocol originates from Ericsson where it has been used in carrier grade cluster applications for many years. Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 44a7d1661576..0ca7fd9cfeee 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1459,7 +1459,10 @@ CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_INET_SCTP_DIAG=m # CONFIG_RDS is not set -# CONFIG_TIPC is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TIPC_DIAG=m CONFIG_ATM=m CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set -- 2.20.1

1 0

[PATCH] kvm: fix compile error when including linux/kvm.h
by Yang Yingliang 29 Aug '20

29 Aug '20

From: Peng Liang <liangpeng10(a)huawei.com> hulk inclusion category: bugfix bugzilla: NA CVE: NA linux/kvm.h should be self-contained so uint64_t should be replaced with __u64. Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> Reviewed-by: zhanghailiang <zhang.zhanghailiang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- include/uapi/linux/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 4bd8e8bcc78e1..6b6eb5b00a385 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1201,13 +1201,13 @@ struct kvm_vfio_spapr_tce { #define ID_REG_MAX_NUMS 64 struct id_reg_info { - uint64_t sys_id; - uint64_t sys_val; + __u64 sys_id; + __u64 sys_val; }; struct id_registers { struct id_reg_info regs[ID_REG_MAX_NUMS]; - uint64_t num; + __u64 num; }; /* -- 2.25.1

1 0

[PATCH 1/8] Revert "block: rename 'q->debugfs_dir' and 'q->blk_trace->dir' in blk_unregister_queue()"
by Yang Yingliang 29 Aug '20

29 Aug '20

From: Yu Kuai <yukuai3(a)huawei.com> hulk inclusion category: bugfix bugzilla: 30213 CVE: CVE-2019-19770 --------------------------- The UAF in blktrace was fixed by a different approch from mainline, thus revert our solution and backport related patches. Signed-off-by: Yu Kuai <yukuai3(a)huawei.com> Reviewed-by: Yufen Yu <yuyufen(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- block/blk-sysfs.c | 49 ----------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index ce84526ed51dd..2d905a8b14730 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -11,7 +11,6 @@ #include <linux/blktrace_api.h> #include <linux/blk-mq.h> #include <linux/blk-cgroup.h> -#include <linux/debugfs.h> #include <linux/atomic.h> #include "blk.h" @@ -960,53 +959,6 @@ int blk_register_queue(struct gendisk *disk) } EXPORT_SYMBOL_GPL(blk_register_queue); -#ifdef CONFIG_DEBUG_FS -void blk_rename_debugfs_dir(struct dentry **old) -{ - static atomic_t i = ATOMIC_INIT(0); - struct dentry *new; - char name[DNAME_INLINE_LEN]; - u32 index = atomic_fetch_inc(&i); - - snprintf(name, sizeof(name), "ready_to_remove_%u", index); - new = debugfs_lookup(name, blk_debugfs_root); - if (WARN_ON(new)) { - dput(new); - return; - } - new = debugfs_rename(blk_debugfs_root, *old, blk_debugfs_root, name); - if (WARN_ON(!new)) - return; - *old = new; -} - -/* - * blk_prepare_release_queue - rename q->debugfs_dir and q->blk_trace->dir - * @q: request_queue of which the dir to be renamed belong to. - * - * Because the final release of request_queue is in a workqueue, the - * cleanup might not been finished yet while the same device start to - * create. It's not correct if q->debugfs_dir still exist while trying - * to create a new one. - */ -static void blk_prepare_release_queue(struct request_queue *q) -{ -#ifdef CONFIG_BLK_DEBUG_FS - if (!IS_ERR_OR_NULL(q->debugfs_dir)) - blk_rename_debugfs_dir(&q->debugfs_dir); - -#endif -#ifdef CONFIG_BLK_DEV_IO_TRACE - mutex_lock(&q->blk_trace_mutex); - if (q->blk_trace && !IS_ERR_OR_NULL(q->blk_trace->dir)) - blk_rename_debugfs_dir(&q->blk_trace->dir); - mutex_unlock(&q->blk_trace_mutex); -#endif -} -#else -#define blk_prepare_release_queue(q) do { } while (0) -#endif - /** * blk_unregister_queue - counterpart of blk_register_queue() * @disk: Disk of which the request queue should be unregistered from sysfs. @@ -1031,7 +983,6 @@ void blk_unregister_queue(struct gendisk *disk) * concurrent elv_iosched_store() calls. */ mutex_lock(&q->sysfs_lock); - blk_prepare_release_queue(q); blk_queue_flag_clear(QUEUE_FLAG_REGISTERED, q); -- 2.25.1

1 7

[PATCH 00/16] ARMv8.3 pointer authentication userspace
by Yang Yingliang 29 Aug '20

29 Aug '20

This series adds support for the ARMv8.3 pointer authentication extension, enabling userspace return address protection with GCC 7 and above. Arnaldo Carvalho de Melo (2): tools beauty: Make the prctl option table generator catch all PR_ options tools headers uapi: Sync prctl.h with the kernel sources Kristina Martsenko (3): arm64: add comments about EC exception levels arm64: add prctl control for resetting ptrauth keys arm64: add ptrace regsets for ptrauth key management Mark Rutland (8): arm64: add pointer authentication register bits arm64/kvm: hide ptrauth from guests arm64/cpufeature: detect pointer authentication arm64: add basic pointer authentication support arm64: expose user PAC bit positions via ptrace arm64: perf: strip PAC when unwinding userspace arm64: enable pointer authentication arm64: docs: document pointer authentication Will Deacon (3): arm64: ptr auth: Move per-thread keys from thread_info to thread_struct arm64: cpufeature: Reduce number of pointer auth CPU caps from 6 to 4 arm64: cpufeature: Rework ptr auth hwcaps using multi_entry_cap_matches Documentation/arm64/booting.txt | 8 + Documentation/arm64/cpu-feature-registers.txt | 8 + Documentation/arm64/elf_hwcaps.txt | 12 ++ .../arm64/pointer-authentication.txt | 93 +++++++++ arch/arm64/Kconfig | 23 +++ arch/arm64/include/asm/cpucaps.h | 6 +- arch/arm64/include/asm/cpufeature.h | 73 +++++-- arch/arm64/include/asm/esr.h | 17 +- arch/arm64/include/asm/pointer_auth.h | 97 +++++++++ arch/arm64/include/asm/processor.h | 7 + arch/arm64/include/asm/sysreg.h | 30 +++ arch/arm64/include/uapi/asm/hwcap.h | 2 + arch/arm64/include/uapi/asm/ptrace.h | 20 ++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/cpu_errata.c | 32 --- arch/arm64/kernel/cpufeature.c | 138 +++++++++++-- arch/arm64/kernel/cpuinfo.c | 2 + arch/arm64/kernel/perf_callchain.c | 6 +- arch/arm64/kernel/pointer_auth.c | 47 +++++ arch/arm64/kernel/process.c | 4 + arch/arm64/kernel/ptrace.c | 185 ++++++++++++++++++ arch/arm64/kvm/handle_exit.c | 18 ++ arch/arm64/kvm/sys_regs.c | 8 + include/uapi/linux/elf.h | 3 + include/uapi/linux/prctl.h | 8 + kernel/sys.c | 8 + tools/include/uapi/linux/prctl.h | 8 + tools/perf/trace/beauty/prctl_option.sh | 2 +- 28 files changed, 789 insertions(+), 77 deletions(-) create mode 100644 Documentation/arm64/pointer-authentication.txt create mode 100644 arch/arm64/include/asm/pointer_auth.h create mode 100644 arch/arm64/kernel/pointer_auth.c -- 2.25.1

1 16

[PATCH kernel-5.5 0/4] Add RISC-V log dirty support
by Yifei Jiang 27 Aug '20

27 Aug '20

euleros inclusion category: feature bugzilla: NA CVE: NA This series supports log dirty for migration in RISC-V KVM. We have implemented the vm migration in Qemu, So these patches have been tested and are valid. Link: https://gitee.com/openeuler/kernel/issues/I1SWY2 Yifei Jiang (4): riscv/kvm: Fix use VSIP_VALID_MASK mask HIP register riscv/kvm: add kvm_arch_mmu_enable_log_dirty_pt_masked riscv/kvm: implement kvm_vm_ioctl_get_dirty_log riscv/kvm: Add kvm_vm_ioctl_clear_dirty_log arch/riscv/configs/defconfig | 1 + arch/riscv/kvm/Kconfig | 1 + arch/riscv/kvm/mmu.c | 37 +++++++++++++++++++++++++++ arch/riscv/kvm/vcpu.c | 2 +- arch/riscv/kvm/vm.c | 49 ++++++++++++++++++++++++++++++++++-- 5 files changed, 87 insertions(+), 3 deletions(-) -- 2.19.1

3 7

[PATCH] ACPI: GED: fix replace timer with delayed work
by huangjun 27 Aug '20

27 Aug '20

From: Jun Huang <huangjun63(a)huawei.com> The acpi_execute_simple_method function uses a mutex, so it cannot be called in the timer. We replace timer with delayed work. Signed-off-by: Jun Huang <huangjun63(a)huawei.com> --- drivers/acpi/evged.c | 60 ++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c index 7354d8d..5bf65b1 100644 --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -34,7 +34,7 @@ * Method (_EVT, 1) { * if (Lequal(123, Arg0)) * { - * } + * }# * } * } * @@ -46,20 +46,23 @@ #include <linux/list.h> #include <linux/platform_device.h> #include <linux/acpi.h> -#include <linux/timer.h> #include <linux/jiffies.h> +#include <linux/workqueue.h> #define MODULE_NAME "acpi-ged" +static void gpp_enable_pwd(struct work_struct *private_); + +static DECLARE_DELAYED_WORK(gpp_work, gpp_enable_pwd); + struct acpi_ged_handle { - struct timer_list timer; /* For 4s anti-shake of power button */ acpi_handle gpp_handle; /* ACPI Handle: enable shutdown */ acpi_handle gpo_handle; /* ACPI Handle: set sleep flag */ }; struct acpi_ged_device { struct device *dev; - struct acpi_ged_handle *wakeup_handle; + struct acpi_ged_handle *ged_handle; struct list_head event_list; }; @@ -71,6 +74,8 @@ struct acpi_ged_event { acpi_handle handle; }; +static struct acpi_ged_handle *wakeup_handle; + static irqreturn_t acpi_ged_irq_handler(int irq, void *data) { struct acpi_ged_event *event = data; @@ -142,7 +147,6 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, #ifdef CONFIG_PM_SLEEP static void init_ged_handle(struct acpi_ged_device *geddev) { - struct acpi_ged_handle *wakeup_handle; acpi_handle gpo_handle = NULL; acpi_handle gpp_handle = NULL; acpi_status acpi_ret; @@ -151,10 +155,7 @@ static void init_ged_handle(struct acpi_ged_device *geddev) { if (!wakeup_handle) return; - geddev->wakeup_handle = wakeup_handle; - - /* Initialize wakeup_handle, prepare for ged suspend and resume */ - timer_setup(&wakeup_handle->timer, NULL, 0); + geddev->ged_handle = wakeup_handle; acpi_ret = acpi_get_handle(ACPI_HANDLE(geddev->dev), "_GPO", &gpo_handle); if (ACPI_FAILURE(acpi_ret)) @@ -204,8 +205,6 @@ static void ged_shutdown(struct platform_device *pdev) dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n", event->gsi, event->irq); } - if (geddev->wakeup_handle) - del_timer(&geddev->wakeup_handle->timer); } static int ged_remove(struct platform_device *pdev) @@ -220,23 +219,10 @@ static const struct acpi_device_id ged_acpi_ids[] = { }; #ifdef CONFIG_PM_SLEEP -static void ged_timer_callback(struct timer_list *t) -{ - struct acpi_ged_handle *wakeup_handle = from_timer(wakeup_handle, t, timer); - acpi_status acpi_ret; - - /* _GPP method enable power button */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); - if (ACPI_FAILURE(acpi_ret)) - pr_warn("_GPP method execution failed\n"); - } -} - static int ged_suspend(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; + //struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; acpi_status acpi_ret; @@ -255,18 +241,26 @@ static int ged_suspend(struct device *dev) return 0; } +static void gpp_enable_pwd(struct work_struct *private_) +{ + acpi_status acpi_ret; + + /* _GPP method enable power button */ + if (wakeup_handle && wakeup_handle->gpp_handle) { + acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); + if (ACPI_FAILURE(acpi_ret)) + pr_warn("_GPP method execution failed\n"); + } + +} + static int ged_resume(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; - - /* use timer to complete 4s anti-shake */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - wakeup_handle->timer.expires = jiffies + (4 * HZ); - wakeup_handle->timer.function = ged_timer_callback; - add_timer(&wakeup_handle->timer); - } + + /* use delayed_work to complete 4s anti-shake */ + schedule_delayed_work(&gpp_work, 4 * HZ); list_for_each_entry_safe(event, next, &geddev->event_list, node) disable_irq_wake(event->irq); -- 2.23.0.windows.1

1 0

[PATCH 0/2] Add risc-v vhost-net support
by Yifei Jiang 26 Aug '20

26 Aug '20

euleros inclusion category: feature bugzilla: NA CVE: NA These two patches enable the support for vhost-net on RISC-V architecture. The following two steps are performed to run a vm with vhost-net: 1. create virbr0 on riscv64 emulation $ brctl addbr virbr0 $ brctl stp virbr0 on $ ifconfig virbr0 up $ ifconfig virbr0 virbr0_ip netmask 255.255.255.0 2. boot a riscv64 guest OS on riscv64 emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guest \ -smp 2 \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk,drive=hd0 \ -netdev type=tap,vhost=on,script=./ifup.sh,downscript=./ifdown.sh,id=net0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" $ cat ifup.sh #!/bin/sh brctl addif virbr0 $1 ifconfig $1 up $ cat ifdown.sh #!/bin/sh ifconfig $1 down brctl delif virbr0 $1 This brenchmark netperf is used to test the performance of vhost-net and virtio-net. The results are as follow: $ ./netperf -H virbr0_ip -l 100 -t TCP_STREAM vhost-net: Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec 131072 16384 16384 100.06 521.62 virtio-net: Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec 131072 16384 16384 292.86 292.86 Link: https://gitee.com/openeuler/kernel/issues/I1SQJ2 Yifei Jiang (2): RISC-V: KVM: enable ioeventfd capability RISC-V: KVM: kernel mmio read/write support arch/riscv/kvm/Kconfig | 2 ++ arch/riscv/kvm/Makefile | 2 +- arch/riscv/kvm/vcpu_exit.c | 28 ++++++++++++++++++++++++++-- arch/riscv/kvm/vm.c | 1 + 4 files changed, 30 insertions(+), 3 deletions(-) -- 2.19.1

3 4

[PATCH 1/4] can: j1939: fix support for multipacket broadcast message
by Yang Yingliang 25 Aug '20

25 Aug '20

From: Zhang Changzhong <zhangchangzhong(a)huawei.com> mainline inclusion from mainline-v5.9-rc2 commit f4fd77fd87e9b214c26bb2ebd4f90055eaea5ade category: bugfix bugzilla: 39990 CVE: NA --------------------------- Currently j1939_tp_im_involved_anydir() in j1939_tp_recv() check the previously set flags J1939_ECU_LOCAL_DST and J1939_ECU_LOCAL_SRC of incoming skb, thus multipacket broadcast message was aborted by receive side because it may come from remote ECUs and have no exact dst address. Similarly, j1939_tp_cmd_recv() and j1939_xtp_rx_dat() didn't process broadcast message. So fix it by checking and process broadcast message in j1939_tp_recv(), j1939_tp_cmd_recv() and j1939_xtp_rx_dat(). Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Signed-off-by: Zhang Changzhong <zhangchangzhong(a)huawei.com> Link: https://lore.kernel.org/r/1596599425-5534-2-git-send-email-zhangchangzhong@… Acked-by: Oleksij Rempel <o.rempel(a)pengutronix.de> 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/transport.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 9f99af5b0b11e..e5188acbb1db7 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1651,8 +1651,12 @@ static void j1939_xtp_rx_rts(struct j1939_priv *priv, struct sk_buff *skb, return; } session = j1939_xtp_rx_rts_session_new(priv, skb); - if (!session) + if (!session) { + if (cmd == J1939_TP_CMD_BAM && j1939_sk_recv_match(priv, skcb)) + netdev_info(priv->ndev, "%s: failed to create TP BAM session\n", + __func__); return; + } } else { if (j1939_xtp_rx_rts_session_active(session, skb)) { j1939_session_put(session); @@ -1829,6 +1833,13 @@ static void j1939_xtp_rx_dat(struct j1939_priv *priv, struct sk_buff *skb) else j1939_xtp_rx_dat_one(session, skb); } + + if (j1939_cb_is_broadcast(skcb)) { + session = j1939_session_get_by_addr(priv, &skcb->addr, false, + false); + if (session) + j1939_xtp_rx_dat_one(session, skb); + } } /* j1939 main intf */ @@ -1920,7 +1931,7 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb) if (j1939_tp_im_transmitter(skcb)) j1939_xtp_rx_rts(priv, skb, true); - if (j1939_tp_im_receiver(skcb)) + if (j1939_tp_im_receiver(skcb) || j1939_cb_is_broadcast(skcb)) j1939_xtp_rx_rts(priv, skb, false); break; @@ -1984,7 +1995,7 @@ int j1939_tp_recv(struct j1939_priv *priv, struct sk_buff *skb) { struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb); - if (!j1939_tp_im_involved_anydir(skcb)) + if (!j1939_tp_im_involved_anydir(skcb) && !j1939_cb_is_broadcast(skcb)) return 0; switch (skcb->addr.pgn) { -- 2.25.1

1 3

[RESEND,PATCH 0/7] Improvements and fixes
by Roberto Sassu 25 Aug '20

25 Aug '20

Resending due to conflicts with existing code. This patch set provides some improvements and fixes. The first three patches solve a permission problem caused by EVM. EVM denies xattr operations also for files that are not appraised by IMA. If only executables are appraised, xattr operations on the other files should be allowed, even if metadata verification fails (for example due to missing security.evm). At the moment, in openEuler we use EVM_ALLOW_METADATA_WRITES to avoid this problem (EVM does not check metadata integrity), but it would be useful to do the verification for example to prevent accidental changes on immutable metadata. The fourth patch enables the choice of the algorithm for the HMAC and ensures that the parameters passed to the functions which handle the HMAC are consistent with the algorithm chosen. The last three patches are simple bug fixes. Roberto Sassu (7): evm: Move hooks outside LSM infrastructure evm: Extend API of post hooks to pass the result of pre hooks evm: Return -EAGAIN to ignore verification failures evm: Propagate choice of HMAC algorithm in evm_crypto.c ima: Fix datalen check in ima_write_data() evm: Fix validation of fake xattr passed by IMA evm: Initialize saved_evm_status fs/attr.c | 7 ++- fs/xattr.c | 65 +++++++++++++++++--------- include/linux/evm.h | 18 +++++--- security/integrity/evm/Kconfig | 32 +++++++++++++ security/integrity/evm/evm.h | 1 + security/integrity/evm/evm_crypto.c | 15 ++++-- security/integrity/evm/evm_main.c | 71 +++++++++++++++++++++-------- security/integrity/ima/ima_fs.c | 2 +- security/integrity/integrity.h | 2 +- security/security.c | 18 ++------ 10 files changed, 159 insertions(+), 72 deletions(-) -- 2.27.GIT

2 8

[PATCH 00/35] patches for iocost
by Yang Yingliang 25 Aug '20

25 Aug '20

patches 1-31 are from mainline patch 32 add cgroup-V1 support patch 33 and 34 are from ali-cloud-kernel(https://github.com/alibaba/cloud-kernel.git), they fix bug when introduce iocost in lower kernel. patch 35 fix a bug when using iocost in sq Dan Carpenter (1): iocost: don't nest spin_lock_irq in ioc_weight_write() Jiufei Xue (3): iocost: check active_list of all the ancestors in iocg_activate() iocost: fix NULL pointer dereference in ioc_rqos_throttle iocost: fix a deadlock in ioc_rqos_throttle() Stephen Rothwell (1): blkcg: blk-iocost: predeclare used structs Tejun Heo (27): blk-mq: add optional request->alloc_time_ns block/rq_qos: add rq_qos_merge() block/rq_qos: implement rq_qos_ops->queue_depth_changed() blkcg: separate blkcg_conf_get_disk() out of blkg_conf_prep() cgroup: add cgroup_parse_float() cgroup: Move cgroup_parse_float() implementation out of CONFIG_SYSFS blkcg: pass @q and @blkcg into blkcg_pol_alloc_pd_fn() blkcg: make ->cpd_init_fn() optional blkcg: implement blk-iocost blkcg: add tools/cgroup/iocost_monitor.py blkcg: add tools/cgroup/iocost_coef_gen.py blkcg: fix missing free on error path of blk_iocost_init() blkcg: add missing NULL check in ioc_cpd_alloc() blk-iocost: Fix incorrect operation order during iocg free blk-iocost: Account force-charged overage in absolute vtime blk-iocost: Don't let merges push vtime into the future iocost_monitor: Always use strings for json values iocost_monitor: Report more info with higher accuracy iocost_monitor: Report debt iocost: better trace vrate changes iocost: improve nr_lagging handling iocost: bump up default latency targets for hard disks iocost: over-budget forced IOs should schedule async delay iocost: Fix iocost_monitor.py due to helper type mismatch blk-iocost: fix incorrect vtime comparison in iocg_is_idle() blkcg: blkcg_activate_policy() should initialize ancestors first blkcg: Fix multiple bugs in blkcg_activate_policy() Waiman Long (1): blk-iocost: Fix error on iocost_ioc_vrate_adj Yu Kuai (2): iocost: add cgroup V1 suport blk-iocost: fix spin_lock won't release in sq Documentation/admin-guide/cgroup-v2.rst | 103 + block/Kconfig | 13 + block/Makefile | 1 + block/bfq-cgroup.c | 5 +- block/blk-cgroup.c | 136 +- block/blk-core.c | 4 + block/blk-iocost.c | 2547 +++++++++++++++++++++++ block/blk-iolatency.c | 5 +- block/blk-mq.c | 13 +- block/blk-rq-qos.c | 21 + block/blk-rq-qos.h | 5 + block/blk-settings.c | 2 +- block/blk-throttle.c | 6 +- block/blk-wbt.c | 18 +- block/blk-wbt.h | 4 - block/cfq-iosched.c | 5 +- include/linux/blk-cgroup.h | 4 +- include/linux/blk_types.h | 3 + include/linux/blkdev.h | 14 +- include/linux/cgroup.h | 2 + include/trace/events/iocost.h | 178 ++ kernel/cgroup/cgroup.c | 43 + tools/cgroup/iocost_coef_gen.py | 178 ++ tools/cgroup/iocost_monitor.py | 277 +++ 24 files changed, 3522 insertions(+), 65 deletions(-) create mode 100644 block/blk-iocost.c create mode 100644 include/trace/events/iocost.h create mode 100644 tools/cgroup/iocost_coef_gen.py create mode 100644 tools/cgroup/iocost_monitor.py -- 2.25.1

1 35

[PATCH 0/5] Support idle-haltpoll in ARM
by Yang Yingliang 25 Aug '20

25 Aug '20

Idle-haltpoll has been supported in X86. Now, we will provide it in ARM. Xiangyou Xie (5): arm64: Optimize ttwu IPI cpuidle-haltpoll: Use arch_cpu_idle() to replace default_idle() arm64: Add some definitions of kvm_para* ARM: cpuidle: Add support for cpuidle-haltpoll driver for ARM config: set default value of haltpoll arch/arm64/Kconfig | 3 +++ arch/arm64/configs/euleros_defconfig | 2 ++ arch/arm64/configs/hulk_defconfig | 2 ++ arch/arm64/configs/openeuler_defconfig | 4 +++- arch/arm64/include/asm/kvm_para.h | 27 ++++++++++++++++++++++++++ arch/arm64/include/asm/thread_info.h | 3 +++ arch/arm64/kernel/process.c | 4 ++++ arch/x86/kernel/process.c | 1 + drivers/cpuidle/Kconfig | 4 ++-- drivers/cpuidle/cpuidle-haltpoll.c | 6 +++--- drivers/cpuidle/governors/haltpoll.c | 6 +++++- drivers/cpuidle/poll_state.c | 3 +++ 12 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 arch/arm64/include/asm/kvm_para.h -- 2.25.1

1 5

[PATCH 0/4] kvm: arm64: emulate ID registers
by Yang Yingliang 25 Aug '20

25 Aug '20

In AArch64, guest will read the same values of the ID regsiters with host. Both of them read the values from arm64_ftr_regs. This patch series add support to emulate and configure ID registers so that we can control the value of ID registers that guest read. Peng Liang (4): arm64: add a helper function to traverse arm64_ftr_regs kvm: arm64: emulate the ID registers kvm: arm64: make ID registers configurable kvm: arm64: add KVM_CAP_ARM_CPU_FEATURE extension arch/arm64/include/asm/cpufeature.h | 2 + arch/arm64/include/asm/kvm_host.h | 2 + arch/arm64/kernel/cpufeature.c | 13 ++++++ arch/arm64/kvm/sys_regs.c | 71 ++++++++++++++++++++++------- include/uapi/linux/kvm.h | 13 ++++++ virt/kvm/arm/arm.c | 23 ++++++++++ 6 files changed, 107 insertions(+), 17 deletions(-) -- 2.25.1

1 4

[PATCH 01/22] arm64: mm: define NET_IP_ALIGN to 0
by Yang Yingliang 25 Aug '20

25 Aug '20

From: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> mainline inclusion from mainline-v4.20-rc2 commit 26a4676faa1ad5d99317e0cd701e5d6f3e716b77 category: feature bugzilla: NA CVE: NA --------------------------- On arm64, there is no need to add 2 bytes of padding to the start of each network buffer just to make the IP header appear 32-bit aligned. Since this might actually adversely affect DMA performance some platforms, let's override NET_IP_ALIGN to 0 to get rid of this padding. Acked-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Tested-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Acked-by: Mark Rutland <mark.rutland(a)arm.com> Acked-by: Will Deacon <will.deacon(a)arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas(a)arm.com> Signed-off-by: Hanjun Guo <guohanjun(a)huawei.com> 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/include/asm/processor.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 98529c8b5d313..7695a5117ff20 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -24,6 +24,14 @@ #define KERNEL_DS UL(-1) #define USER_DS (TASK_SIZE_64 - 1) +/* + * On arm64 systems, unaligned accesses by the CPU are cheap, and so there is + * no point in shifting all network buffers by 2 bytes just to make some IP + * header fields appear aligned in memory, potentially sacrificing some DMA + * performance on some platforms. + */ +#define NET_IP_ALIGN 0 + #ifndef __ASSEMBLY__ /* -- 2.25.1

1 21

[PATCH 00/25] ILP32 for ARM64
by Yang Yingliang 25 Aug '20

25 Aug '20

Andrew Pinski (3): arm64: rename COMPAT to AARCH32_EL0 arm64: uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 arm64:ilp32: add ARM64_ILP32 to Kconfig Dave Martin (1): arm64: signal: Make parse_user_sigframe() independent of rt_sigframe layout James Morse (1): ptrace: Add compat PTRACE_{G, S}ETSIGMASK handlers Philipp Tomsich (1): arm64:ilp32: add vdso-ilp32 and use for signal return Xiongfeng Wang (2): arm64: ilp32: fix compile warning cause by 'VA_BITS' config: add CONFIG_ARM64_ILP32 in defconfigs Yury Norov (17): compat ABI: use non-compat openat and open_by_handle_at variants 32-bit userspace ABI: introduce ARCH_32BIT_OFF_T config option asm-generic: Drop getrlimit and setrlimit syscalls from default list thread: move thread bits accessors to separated file arm64: ilp32: add documentation on the ILP32 ABI for ARM64 arm64: rename functions that reference compat term arm64: introduce is_a32_compat_{task, thread} for AArch32 compat arm64: ilp32: add is_ilp32_compat_{task, thread} and TIF_32BIT_AARCH64 arm64: introduce binfmt_elf32.c arm64: change compat_elf_hwcap and compat_elf_hwcap2 prefix to a32 arm64: ilp32: introduce binfmt_ilp32.c arm64: ilp32: share aarch32 syscall handlers arm64: ilp32: introduce syscall table for ILP32 arm64: signal: share lp64 signal structures and routines to ilp32 arm64: signal32: move ilp32 and aarch32 common code to separated file arm64: ilp32: introduce ilp32-specific sigframe and ucontext arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Documentation/arm64/ilp32.txt | 52 +++ arch/Kconfig | 15 + arch/arc/Kconfig | 1 + arch/arc/include/uapi/asm/unistd.h | 1 + arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 17 +- arch/arm64/Makefile | 3 + arch/arm64/configs/euleros_defconfig | 2 + arch/arm64/configs/hulk_defconfig | 2 + arch/arm64/configs/openeuler_defconfig | 2 + arch/arm64/configs/storage_ci_defconfig | 2 + arch/arm64/configs/syzkaller_defconfig | 2 + arch/arm64/include/asm/compat.h | 19 +- arch/arm64/include/asm/elf.h | 36 +- arch/arm64/include/asm/fpsimd.h | 2 +- arch/arm64/include/asm/ftrace.h | 2 +- arch/arm64/include/asm/hwcap.h | 8 +- arch/arm64/include/asm/is_compat.h | 78 ++++ arch/arm64/include/asm/memory.h | 4 + arch/arm64/include/asm/processor.h | 13 +- arch/arm64/include/asm/ptrace.h | 12 +- arch/arm64/include/asm/seccomp.h | 2 +- arch/arm64/include/asm/signal32.h | 19 +- arch/arm64/include/asm/signal32_common.h | 13 + arch/arm64/include/asm/signal_common.h | 303 +++++++++++++++ arch/arm64/include/asm/signal_ilp32.h | 23 ++ arch/arm64/include/asm/syscall.h | 10 +- arch/arm64/include/asm/thread_info.h | 4 +- arch/arm64/include/asm/unistd.h | 6 +- arch/arm64/include/asm/vdso.h | 6 + arch/arm64/include/uapi/asm/bitsperlong.h | 9 +- arch/arm64/include/uapi/asm/unistd.h | 13 + arch/arm64/kernel/Makefile | 8 +- arch/arm64/kernel/armv8_deprecated.c | 6 +- arch/arm64/kernel/asm-offsets.c | 9 +- arch/arm64/kernel/binfmt_elf32.c | 35 ++ arch/arm64/kernel/binfmt_ilp32.c | 87 +++++ arch/arm64/kernel/cpufeature.c | 28 +- arch/arm64/kernel/cpuinfo.c | 18 +- arch/arm64/kernel/debug-monitors.c | 4 +- arch/arm64/kernel/entry.S | 6 +- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/hw_breakpoint.c | 8 +- arch/arm64/kernel/perf_callchain.c | 28 +- arch/arm64/kernel/perf_regs.c | 4 +- arch/arm64/kernel/process.c | 13 +- arch/arm64/kernel/ptrace.c | 38 +- arch/arm64/kernel/signal.c | 348 ++++-------------- arch/arm64/kernel/signal32.c | 111 +++--- arch/arm64/kernel/signal32_common.c | 37 ++ arch/arm64/kernel/signal_ilp32.c | 67 ++++ arch/arm64/kernel/sys32.c | 104 +----- arch/arm64/kernel/sys32_common.c | 106 ++++++ arch/arm64/kernel/sys_compat.c | 12 +- arch/arm64/kernel/sys_ilp32.c | 75 ++++ arch/arm64/kernel/syscall.c | 37 +- arch/arm64/kernel/traps.c | 3 +- arch/arm64/kernel/vdso-ilp32/.gitignore | 2 + arch/arm64/kernel/vdso-ilp32/Makefile | 89 +++++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S | 22 ++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S | 84 +++++ arch/arm64/kernel/vdso.c | 62 +++- arch/arm64/kernel/vdso/gettimeofday.c | 6 + arch/arm64/kernel/vdso/vdso.S | 6 +- arch/arm64/mm/mmap.c | 2 +- arch/c6x/include/uapi/asm/unistd.h | 1 + arch/h8300/Kconfig | 1 + arch/h8300/include/uapi/asm/unistd.h | 1 + arch/hexagon/Kconfig | 1 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/nds32/Kconfig | 1 + arch/nds32/include/uapi/asm/unistd.h | 1 + arch/nios2/Kconfig | 1 + arch/nios2/include/uapi/asm/unistd.h | 1 + arch/openrisc/Kconfig | 1 + arch/openrisc/include/uapi/asm/unistd.h | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/riscv/Kconfig | 1 + arch/riscv/include/asm/unistd.h | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/unicore32/Kconfig | 1 + arch/unicore32/include/uapi/asm/unistd.h | 1 + arch/x86/Kconfig | 1 + arch/x86/um/Kconfig | 1 + arch/xtensa/Kconfig | 1 + drivers/clocksource/arm_arch_timer.c | 4 +- include/linux/fcntl.h | 2 +- include/linux/sched.h | 1 + include/linux/thread_bits.h | 87 +++++ include/linux/thread_info.h | 75 +--- include/uapi/asm-generic/unistd.h | 10 +- kernel/ptrace.c | 47 ++- scripts/checksyscalls.sh | 5 + 98 files changed, 1679 insertions(+), 726 deletions(-) create mode 100644 Documentation/arm64/ilp32.txt create mode 100644 arch/arm64/include/asm/is_compat.h create mode 100644 arch/arm64/include/asm/signal32_common.h create mode 100644 arch/arm64/include/asm/signal_common.h create mode 100644 arch/arm64/include/asm/signal_ilp32.h create mode 100644 arch/arm64/kernel/binfmt_elf32.c create mode 100644 arch/arm64/kernel/binfmt_ilp32.c create mode 100644 arch/arm64/kernel/signal32_common.c create mode 100644 arch/arm64/kernel/signal_ilp32.c create mode 100644 arch/arm64/kernel/sys32_common.c create mode 100644 arch/arm64/kernel/sys_ilp32.c create mode 100644 arch/arm64/kernel/vdso-ilp32/.gitignore create mode 100644 arch/arm64/kernel/vdso-ilp32/Makefile create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S create mode 100644 include/linux/thread_bits.h -- 2.25.1

1 25

[PATCH 000/169] backport stable-4.19.140
by Yang Yingliang 25 Aug '20

25 Aug '20

Aditya Pakki (2): drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync drm/nouveau: fix multiple instances of reference count leaks Alim Akhtar (1): arm64: dts: exynos: Fix silent hang after boot on Espresso Andrii Nakryiko (1): tools, build: Propagate build failures from tools/build/Makefile.build Aneesh Kumar K.V (1): powerpc/book3s64/pkeys: Use PVR check instead of cpu feature Arnd Bergmann (1): leds: lm355x: avoid enum conversion warning Bartosz Golaszewski (1): irqchip/irq-mtk-sysirq: Replace spinlock with raw_spinlock Bjorn Helgaas (1): PCI: Fix pci_cfg_wait queue locking problem Bolarinwa Olayemi Saheed (1): iwlegacy: Check the return value of pcie_capability_read_*() Brant Merryman (2): USB: serial: cp210x: re-enable auto-RTS on open USB: serial: cp210x: enable usb generic throttle/unthrottle Chris Packham (1): net: dsa: mv88e6xxx: MV88E6097 does not support jumbo configuration Christian Eggers (1): spi: spidev: Align buffers for DMA Christian König (1): drm/radeon: disable AGP by default Christophe JAILLET (5): video: pxafb: Fix the function used to balance a 'dma_alloc_coherent()' call scsi: cumana_2: Fix different dev_id between request_irq() and free_irq() scsi: powertec: Fix different dev_id between request_irq() and free_irq() scsi: eesox: Fix different dev_id between request_irq() and free_irq() net: spider_net: Fix the size used in a 'dma_free_coherent()' call Chuck Lever (1): svcrdma: Fix page leak in svc_rdma_recv_read_chunk() Chuhong Yuan (2): media: omap3isp: Add missed v4l2_ctrl_handler_free() for preview_init_entities() media: exynos4-is: Add missed check for pinctrl_lookup_state() Chunfeng Yun (1): usb: mtu3: clear dual mode of u3port when disable device Colin Ian King (3): drm/arm: fix unintentional integer overflow on left shift drm/radeon: fix array out-of-bounds read and write issues staging: rtl8192u: fix a dubious looking mask before a shift Coly Li (1): bcache: fix super block seq numbers comparision in register_cache_set() Cristian Marussi (1): firmware: arm_scmi: Fix SCMI genpd domain probing Dan Carpenter (5): media: firewire: Using uninitialized values in node_probe() mwifiex: Prevent memory corruption handling keys thermal: ti-soc-thermal: Fix reversed condition in ti_thermal_expose_sensor() Smack: fix another vsscanf out of bounds Smack: prevent underflow in smk_set_cipso() Danesh Petigara (1): usb: bdc: Halt controller on suspend Darrick J. Wong (2): xfs: don't eat an EIO/ENOSPC writeback error when scrubbing data fork xfs: fix reflink quota reservation accounting error Dave Airlie (1): drm/ttm/nouveau: don't call tt destroy callback on alloc failure. Dejin Zheng (2): video: fbdev: sm712fb: fix an issue about iounmap for a wrong address console: newport_con: fix an issue about leak related system resources Dilip Kota (1): spi: lantiq: fix: Rx overflow error in full duplex mode Dmitry Osipenko (1): gpu: host1x: debug: Fix multiple channels emitting messages simultaneously Drew Fustini (1): pinctrl-single: fix pcs_parse_pinconf() return value Emil Velikov (1): drm/mipi: use dcs write for mipi_dsi_dcs_set_tear_scanline Eric Biggers (3): fs/minix: check return value of sb_getblk() fs/minix: don't allow getting deleted inodes fs/minix: reject too-large maximum file size Eric Dumazet (1): x86/fsgsbase/64: Fix NULL deref in 86_fsgsbase_read_task Erik Kaneda (1): ACPICA: Do not increment operation_region reference counts for field units Evan Green (1): ath10k: Acquire tx_lock in tx error paths Evgeny Novikov (2): video: fbdev: neofb: fix memory leak in neo_scan_monitor() usb: gadget: net2280: fix memory leak on probe error handling paths Finn Thain (3): m68k: mac: Don't send IOP message until channel is idle m68k: mac: Fix IOP status/control register writes scsi: mesh: Fix panic after host or bus reset Florinel Iordache (5): fsl/fman: use 32-bit unsigned integer fsl/fman: fix dereference null return value fsl/fman: fix unreachable code fsl/fman: check dereferencing null pointer fsl/fman: fix eth hash table allocation Gilad Ben-Yossef (1): crypto: ccree - fix resource leak on error path Grant Likely (1): HID: input: Fix devices that return multiple bytes in battery report Greg Kroah-Hartman (1): Linux 4.19.140 Hanjun Guo (1): PCI: Release IVRS table in AMD ACS quirk Harish (1): selftests/powerpc: Fix CPU affinity for child process Hector Martin (3): ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109 ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109 ALSA: usb-audio: add quirk for Pioneer DDJ-RB Heiko Stuebner (3): arm64: dts: rockchip: fix rk3368-lion gmac reset gpio arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio arm64: dts: rockchip: fix rk3399-puma gmac reset gpio Hui Wang (1): ALSA: hda - fix the micmute led status for Lenovo ThinkCentre AIO Ira Weiny (1): net/tls: Fix kmap usage Ivan Kokshaysky (1): cpufreq: dt: fix oops on armada37xx Jack Xiao (1): drm/amdgpu: avoid dereferencing a NULL pointer Jakub Kicinski (1): bitfield.h: don't compile-time validate _val in FIELD_FIT Jerome Brunet (1): ASoC: meson: axg-tdm-interface: fix link fmt setup Jian Cai (1): crypto: aesni - add compatibility with IAS Jim Cromie (1): dyndbg: fix a BUG_ON in ddebug_describe_flags Johan Hovold (1): USB: serial: iuu_phoenix: fix led-activity helpers John Allen (1): crypto: ccp - Fix use of merged scatterlists John David Anglin (1): parisc: Implement __smp_store_release and __smp_load_acquire barriers John Garry (1): scsi: scsi_debug: Add check for sdebug_max_queue during module init John Ogness (1): af_packet: TPACKET_V3: fix fill status rwlock imbalance Jon Derrick (1): irqdomain/treewide: Free firmware node after domain removal Julian Anastasov (1): ipvs: allow connection reuse for unconfirmed conntrack Julian Wiedmann (1): s390/qeth: don't process empty bridge port events Kai-Heng Feng (1): leds: core: Flush scheduled work for system suspend Kars Mulder (1): usb: core: fix quirks_param_set() writing to a const pointer Kishon Vijay Abraham I (1): PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID register Laurent Pinchart (1): drm: panel: simple: Fix bpc for LG LB070WV8 panel Li Heng (1): RDMA/core: Fix return error value in _ib_modify_qp() to negative Lihong Kou (1): Bluetooth: add a mutex lock to avoid UAF in do_enale_set Linus Walleij (2): net: dsa: rtl8366: Fix VLAN semantics net: dsa: rtl8366: Fix VLAN set-up Lu Wei (2): platform/x86: intel-hid: Fix return value check in check_acpi_dev() platform/x86: intel-vbtn: Fix return value check in check_acpi_dev() Lubomir Rintel (1): drm/etnaviv: Fix error path on failure to enable bus clk Luis Chamberlain (1): loop: be paranoid on exit and prevent new additions / removals Marco Felsch (1): drm/imx: tve: fix regulator_disable error path Marek Szyprowski (2): phy: exynos5-usbdrd: Calibrating makes sense only for USB2.0 PHY usb: dwc2: Fix error path in gadget registration Matteo Croce (1): pstore: Fix linking when crypto API disabled Maulik Shah (1): soc: qcom: rpmh-rsc: Set suppress_bind_attrs flag Miaohe Lin (1): net: Set fput_needed iff FDPUT_FPUT is set Michael Ellerman (1): powerpc/boot: Fix CONFIG_PPC_MPC52XX references Michael Tretter (1): drm/debugfs: fix plain echo to connector "force" attribute Mikhail Malygin (1): RDMA/rxe: Prevent access to wr->next ptr afrer wr is posted to send queue Mikulas Patocka (2): crypto: hisilicon - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified crypto: cpt - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified Milton Miller (1): powerpc/vdso: Fix vdso cpu truncation Mirko Dietrich (1): ALSA: usb-audio: Creative USB X-Fi Pro SB1095 volume knob support Nathan Huckleberry (1): ARM: 8992/1: Fix unwind_frame for clang-built kernels Navid Emamdoost (1): drm/etnaviv: fix ref count leak via pm_runtime_get_sync Nick Desaulniers (1): tracepoint: Mark __tracepoint_string's __used Nicolas Boichat (2): Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Bluetooth: hci_serdev: Only unregister device if it was registered Niklas Söderlund (2): ARM: dts: gose: Fix ports node name for adv7180 ARM: dts: gose: Fix ports node name for adv7612 Oleksandr Andrushchenko (1): xen/gntdev: Fix dmabuf import with non-zero sgt offset Paul E. McKenney (2): fs/btrfs: Add cond_resched() for try_release_extent_mapping() stalls mm/mmap.c: Add cond_resched() for exit_mmap() CPU stalls Pavel Machek (1): ocfs2: fix unbalanced locking Peng Liu (1): sched: correct SD_flags returned by tl->sd_flags() Pierre-Louis Bossart (1): ASoC: Intel: bxt_rt298: add missing .owner field Prasanna Kerekoppa (1): brcmfmac: To fix Bss Info flag definition Bug Qingyu Li (1): net/nfc/rawsock.c: add CAP_NET_RAW check. Qiushi Wu (2): EDAC: Fix reference count leaks agp/intel: Fix a memory leak on module initialisation failure Ricardo Cañuelo (1): arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding Rob Clark (1): drm/msm: ratelimit crtc event overflow error Roger Pau Monne (2): xen/balloon: fix accounting in alloc_xenballooned_pages error path xen/balloon: make the balloon wait interruptible Romain Naour (1): include/asm-generic/vmlinux.lds.h: align ro_after_init Sai Prakash Ranjan (1): coresight: tmc: Fix TMC mode read in tmc_read_unprepare_etb() Sandipan Das (1): selftests/powerpc: Fix online CPU selection Sasi Kumar (1): bdc: Fix bug causing crash after multiple disconnects Sedat Dilek (1): crypto: aesni - Fix build with LLVM_IAS=1 Sivaprakash Murugesan (1): mtd: rawnand: qcom: avoid write to unavailable register Stephan Gerhold (1): arm64: dts: qcom: msm8916: Replace invalid bias-pull-none property Sudeep Holla (1): clk: scmi: Fix min and max rate when registering clocks with discrete rates Sven Schnelle (1): parisc: mask out enable and reserved bits from sba imask Tianjia Zhang (2): net: ethernet: aquantia: Fix wrong return value liquidio: Fix wrong return value in cn23xx_get_pf_num() Tim Froidcoeur (2): net: refactor bind_bucket fastreuse into helper net: initialize fastreuse on inet_inherit_port Tom Rix (3): drm/bridge: sil_sii8620: initialize return of sii8620_readb power: supply: check if calc_soc succeeded in pm860x_init_battery crypto: qat - fix double free in qat_uclo_create_batch_init_list Tomasz Duszynski (1): iio: improve IIO_CONCENTRATION channel type description Tomi Valkeinen (1): drm/tilcdc: fix leak & null ref in panel_connector_get_modes Trond Myklebust (2): NFS: Don't move layouts to plh_return_segs list while in use NFS: Don't return layout segments that are in use Vincent Guittot (1): sched/fair: Fix NOHZ next idle balance Wang Hai (3): cxl: Fix kobject memleak wl1251: fix always return 0 error dlm: Fix kobject memleak Wright Feng (2): brcmfmac: keep SDIO watchdog running when console_interval is non-zero brcmfmac: set state of hanger slot to FREE when flushing PSQ Xie He (1): drivers/net/wan/lapbether: Added needed_headroom and a skb->len check Xiongfeng Wang (1): PCI/ASPM: Add missing newline in sysfs 'policy' Yang Yingliang (1): Revert "pci: lock the pci_cfg_wait queue for the consistency of data" Yu Kuai (2): ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh() MIPS: OCTEON: add missing put_device() call in dwc3_octeon_device_init() Yuval Basson (1): RDMA/qedr: SRQ's bug fixes Zhao Heming (1): md-cluster: fix wild pointer of unlock_all_bitmaps() Zheng Bin (1): 9p: Fix memory leak in v9fs_mount Zhenzhong Duan (1): x86/mce/inject: Fix a wrong assignment of i_mce.status Zhu Yanjun (1): RDMA/rxe: Skip dgid check in loopback mode yu kuai (1): ARM: at91: pm: add missing put_device() call in at91_pm_sram_init() Documentation/ABI/testing/sysfs-bus-iio | 3 +- Makefile | 2 +- arch/arm/boot/dts/r8a7793-gose.dts | 4 +- arch/arm/kernel/stacktrace.c | 24 +++++ arch/arm/mach-at91/pm.c | 11 ++- arch/arm/mach-socfpga/pm.c | 8 +- .../boot/dts/exynos/exynos7-espresso.dts | 1 + .../boot/dts/hisilicon/hi3660-hikey960.dts | 11 +++ .../arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 10 +- arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 +- arch/m68k/mac/iop.c | 21 ++-- arch/mips/cavium-octeon/octeon-usb.c | 5 +- arch/parisc/include/asm/barrier.h | 61 ++++++++++++ arch/powerpc/boot/Makefile | 2 +- arch/powerpc/boot/serial.c | 2 +- arch/powerpc/kernel/vdso.c | 2 +- arch/powerpc/mm/pkeys.c | 16 +-- arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 14 +-- arch/x86/crypto/aesni-intel_asm.S | 6 +- arch/x86/kernel/apic/io_apic.c | 5 + arch/x86/kernel/cpu/mce/inject.c | 2 +- arch/x86/kernel/ptrace.c | 2 +- drivers/acpi/acpica/exprep.c | 4 - drivers/acpi/acpica/utdelete.c | 6 +- drivers/block/loop.c | 4 + drivers/bluetooth/hci_h5.c | 2 +- drivers/bluetooth/hci_serdev.c | 3 +- drivers/char/agp/intel-gtt.c | 4 +- drivers/clk/clk-scmi.c | 22 ++++- drivers/cpufreq/armada-37xx-cpufreq.c | 1 + drivers/crypto/cavium/cpt/cptvf_algs.c | 1 + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 12 +-- drivers/crypto/cavium/cpt/request_manager.h | 2 + drivers/crypto/ccp/ccp-dev.h | 1 + drivers/crypto/ccp/ccp-ops.c | 37 ++++--- drivers/crypto/ccree/cc_cipher.c | 30 +++--- drivers/crypto/hisilicon/sec/sec_algs.c | 34 ++++--- drivers/crypto/qat/qat_common/qat_uclo.c | 9 +- drivers/edac/edac_device_sysfs.c | 1 + drivers/edac/edac_pci_sysfs.c | 2 +- drivers/firmware/arm_scmi/scmi_pm_domain.c | 12 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 19 ++-- drivers/gpu/drm/arm/malidp_planes.c | 2 +- drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 8 +- drivers/gpu/drm/drm_mipi_dsi.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 19 +++- drivers/gpu/drm/imx/imx-tve.c | 20 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 8 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 9 +- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/radeon/ci_dpm.c | 2 +- drivers/gpu/drm/radeon/radeon_display.c | 4 +- drivers/gpu/drm/radeon/radeon_drv.c | 9 +- drivers/gpu/drm/radeon/radeon_kms.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 +- drivers/gpu/drm/ttm/ttm_tt.c | 3 - drivers/gpu/host1x/debug.c | 4 + drivers/hid/hid-input.c | 6 +- .../hwtracing/coresight/coresight-tmc-etf.c | 13 ++- drivers/infiniband/core/verbs.c | 2 +- drivers/infiniband/hw/qedr/qedr.h | 4 +- drivers/infiniband/hw/qedr/verbs.c | 22 ++--- drivers/infiniband/sw/rxe/rxe_recv.c | 6 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 5 +- drivers/iommu/intel_irq_remapping.c | 8 ++ drivers/irqchip/irq-mtk-sysirq.c | 8 +- drivers/leds/led-class.c | 1 + drivers/leds/leds-lm355x.c | 7 +- drivers/md/bcache/super.c | 9 +- drivers/md/md-cluster.c | 1 + drivers/media/firewire/firedtv-fw.c | 2 + drivers/media/platform/exynos4-is/media-dev.c | 3 + drivers/media/platform/omap3isp/isppreview.c | 4 +- drivers/misc/cxl/sysfs.c | 2 +- drivers/mtd/nand/raw/qcom_nandc.c | 7 +- drivers/net/dsa/mv88e6xxx/chip.c | 1 - drivers/net/dsa/rtl8366.c | 35 ++++--- .../aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- .../cavium/liquidio/cn23xx_pf_device.c | 2 +- drivers/net/ethernet/freescale/fman/fman.c | 3 +- .../net/ethernet/freescale/fman/fman_dtsec.c | 4 +- .../net/ethernet/freescale/fman/fman_mac.h | 2 +- .../net/ethernet/freescale/fman/fman_memac.c | 3 +- .../net/ethernet/freescale/fman/fman_port.c | 9 +- .../net/ethernet/freescale/fman/fman_tgec.c | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 4 +- drivers/net/wan/lapbether.c | 10 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 4 + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 4 + .../broadcom/brcm80211/brcmfmac/sdio.c | 6 +- drivers/net/wireless/intel/iwlegacy/common.c | 4 +- .../wireless/marvell/mwifiex/sta_cmdresp.c | 22 +++-- drivers/net/wireless/ti/wl1251/event.c | 2 +- drivers/parisc/sba_iommu.c | 2 +- drivers/pci/access.c | 8 +- drivers/pci/controller/pcie-cadence-host.c | 9 +- drivers/pci/controller/vmd.c | 3 + drivers/pci/pcie/aspm.c | 1 + drivers/pci/quirks.c | 2 + drivers/phy/samsung/phy-exynos5-usbdrd.c | 4 +- drivers/pinctrl/pinctrl-single.c | 11 ++- drivers/platform/x86/intel-hid.c | 2 +- drivers/platform/x86/intel-vbtn.c | 2 +- drivers/power/supply/88pm860x_battery.c | 6 +- drivers/s390/net/qeth_l2_main.c | 4 + drivers/scsi/arm/cumana_2.c | 2 +- drivers/scsi/arm/eesox.c | 2 +- drivers/scsi/arm/powertec.c | 2 +- drivers/scsi/mesh.c | 8 +- drivers/scsi/scsi_debug.c | 6 ++ drivers/soc/qcom/rpmh-rsc.c | 1 + drivers/spi/spi-lantiq-ssc.c | 10 ++ drivers/spi/spidev.c | 21 ++-- drivers/staging/rtl8192u/r8192U_core.c | 2 +- .../ti-soc-thermal/ti-thermal-common.c | 2 +- drivers/usb/core/quirks.c | 16 ++- drivers/usb/dwc2/platform.c | 4 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 13 ++- drivers/usb/gadget/udc/bdc/bdc_ep.c | 16 +-- drivers/usb/gadget/udc/net2280.c | 4 +- drivers/usb/mtu3/mtu3_core.c | 6 +- drivers/usb/serial/cp210x.c | 19 ++++ drivers/usb/serial/iuu_phoenix.c | 14 +-- drivers/video/console/newport_con.c | 12 ++- drivers/video/fbdev/neofb.c | 1 + drivers/video/fbdev/pxafb.c | 4 +- drivers/video/fbdev/sm712fb.c | 2 + drivers/xen/balloon.c | 12 ++- drivers/xen/gntdev-dmabuf.c | 8 ++ fs/9p/v9fs.c | 5 +- fs/btrfs/extent_io.c | 2 + fs/dlm/lockspace.c | 6 +- fs/minix/inode.c | 36 ++++++- fs/minix/itree_common.c | 8 +- fs/nfs/pnfs.c | 46 +++------ fs/ocfs2/dlmglue.c | 8 +- fs/pstore/platform.c | 5 +- fs/xfs/scrub/bmap.c | 22 ++++- fs/xfs/xfs_reflink.c | 21 ++-- include/asm-generic/vmlinux.lds.h | 1 + include/linux/bitfield.h | 2 +- include/linux/tracepoint.h | 2 +- include/net/inet_connection_sock.h | 4 + include/net/ip_vs.h | 10 +- kernel/sched/fair.c | 23 +++-- kernel/sched/topology.c | 2 +- lib/dynamic_debug.c | 23 +++-- mm/mmap.c | 1 + net/bluetooth/6lowpan.c | 5 + net/ipv4/inet_connection_sock.c | 97 ++++++++++--------- net/ipv4/inet_hashtables.c | 1 + net/netfilter/ipvs/ip_vs_core.c | 12 ++- net/nfc/rawsock.c | 7 +- net/packet/af_packet.c | 9 +- net/socket.c | 2 +- net/sunrpc/xprtrdma/svc_rdma_rw.c | 28 ++++-- net/tls/tls_device.c | 3 +- security/smack/smackfs.c | 6 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/intel/boards/bxt_rt298.c | 2 + sound/soc/meson/axg-tdm-interface.c | 26 +++-- sound/usb/card.h | 1 + sound/usb/mixer_quirks.c | 1 + sound/usb/pcm.c | 6 ++ sound/usb/quirks-table.h | 64 +++++++++++- sound/usb/quirks.c | 3 + sound/usb/stream.c | 1 + tools/build/Build.include | 3 +- .../powerpc/benchmarks/context_switch.c | 21 +++- tools/testing/selftests/powerpc/utils.c | 37 ++++--- 176 files changed, 1085 insertions(+), 490 deletions(-) -- 2.25.1

1 169

Re: [Dev] [kernel] kernel arm build failed
by Xie XiuQi 25 Aug '20

25 Aug '20

Hi, On 2020/8/24 21:23, Sugar wrote: > Hi, everyone. > > I have been working on porting openeuler to a cortex-a7 based board. > Some errors hit me when building arm32 openeuler 4.19.90 kernel in *ubuntu-base-16.04-core-armhf.tar.gz* chroot environment emulated by qemu-user-static. > The errors were endless even though I commented on some CONFIG options and fixed some errors. > Here are some of my questions: > - Did openeuler test kernel arm32 build before the LTS-20.03 release, that maybe help me out? No. LTS-20.03 does not have an arm32 release and has not been tested on the arm32 platform. > - Will openeuler provide arm32 support in future version? And a detailed date? We do not have a plan to support ARM32 at this point, and it would be great if you could help to do it. IMHO, the patches merged into the openEuler kernel do not break the support for ARM32. So, select a proper config would be helpful for building on arm32 platform. > > Looking for your rely. > > _______________________________________________ > Dev mailing list -- dev(a)openeuler.org > To unsubscribe send an email to dev-leave(a)openeuler.org >

2 1

[PATCH] ACPI: GED: implement powerkey evged freeze function
by huangjun 24 Aug '20

24 Aug '20

From: Jun Huang <huangjun63(a)huawei.com> The acpi_execute_simple_method function uses a mutex, so it cannot be called in the timer. We replace timer with delayed work. Signed-off-by: Jun Huang <huangjun63(a)huawei.com> --- drivers/acpi/evged.c | 60 ++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c index 7354d8d..5bf65b1 100644 --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -34,7 +34,7 @@ * Method (_EVT, 1) { * if (Lequal(123, Arg0)) * { - * } + * }# * } * } * @@ -46,20 +46,23 @@ #include <linux/list.h> #include <linux/platform_device.h> #include <linux/acpi.h> -#include <linux/timer.h> #include <linux/jiffies.h> +#include <linux/workqueue.h> #define MODULE_NAME "acpi-ged" +static void gpp_enable_pwr_btn(struct work_struct *private_); + +static DECLARE_DELAYED_WORK(gpp_work, gpp_enable_pwr_btn); + struct acpi_ged_handle { - struct timer_list timer; /* For 4s anti-shake of power button */ acpi_handle gpp_handle; /* ACPI Handle: enable shutdown */ acpi_handle gpo_handle; /* ACPI Handle: set sleep flag */ }; struct acpi_ged_device { struct device *dev; - struct acpi_ged_handle *wakeup_handle; + struct acpi_ged_handle *ged_handle; struct list_head event_list; }; @@ -71,6 +74,8 @@ struct acpi_ged_event { acpi_handle handle; }; +static struct acpi_ged_handle *wakeup_handle; + static irqreturn_t acpi_ged_irq_handler(int irq, void *data) { struct acpi_ged_event *event = data; @@ -142,7 +147,6 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, #ifdef CONFIG_PM_SLEEP static void init_ged_handle(struct acpi_ged_device *geddev) { - struct acpi_ged_handle *wakeup_handle; acpi_handle gpo_handle = NULL; acpi_handle gpp_handle = NULL; acpi_status acpi_ret; @@ -151,10 +155,7 @@ static void init_ged_handle(struct acpi_ged_device *geddev) { if (!wakeup_handle) return; - geddev->wakeup_handle = wakeup_handle; - - /* Initialize wakeup_handle, prepare for ged suspend and resume */ - timer_setup(&wakeup_handle->timer, NULL, 0); + geddev->ged_handle = wakeup_handle; acpi_ret = acpi_get_handle(ACPI_HANDLE(geddev->dev), "_GPO", &gpo_handle); if (ACPI_FAILURE(acpi_ret)) @@ -204,8 +205,6 @@ static void ged_shutdown(struct platform_device *pdev) dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n", event->gsi, event->irq); } - if (geddev->wakeup_handle) - del_timer(&geddev->wakeup_handle->timer); } static int ged_remove(struct platform_device *pdev) @@ -220,23 +219,10 @@ static const struct acpi_device_id ged_acpi_ids[] = { }; #ifdef CONFIG_PM_SLEEP -static void ged_timer_callback(struct timer_list *t) -{ - struct acpi_ged_handle *wakeup_handle = from_timer(wakeup_handle, t, timer); - acpi_status acpi_ret; - - /* _GPP method enable power button */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); - if (ACPI_FAILURE(acpi_ret)) - pr_warn("_GPP method execution failed\n"); - } -} - static int ged_suspend(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; + //struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; acpi_status acpi_ret; @@ -255,18 +241,26 @@ static int ged_suspend(struct device *dev) return 0; } +static void gpp_enable_pwr_btn(struct work_struct *private_) +{ + acpi_status acpi_ret; + + /* _GPP method enable power button */ + if (wakeup_handle && wakeup_handle->gpp_handle) { + acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); + if (ACPI_FAILURE(acpi_ret)) + pr_warn("_GPP method execution failed\n"); + } + +} + static int ged_resume(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; - - /* use timer to complete 4s anti-shake */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - wakeup_handle->timer.expires = jiffies + (4 * HZ); - wakeup_handle->timer.function = ged_timer_callback; - add_timer(&wakeup_handle->timer); - } + + /* use delayed_work to complete 4s anti-shake */ + schedule_delayed_work(&gpp_work, 4 * HZ); list_for_each_entry_safe(event, next, &geddev->event_list, node) disable_irq_wake(event->irq); -- 2.23.0.windows.1

1 0

[PATCH] scripts: add helper script to generate backport patch changelog
by Xie XiuQi 23 Aug '20

23 Aug '20

hulk inclusion category: doc bugzilla: NA CVE: NA Link: https://gitee.com/openeuler/kernel/issues/I1SF7H ------------------------------------------------- provide a simple script to help generate mainline patch info. It is useful when backport many patches from mainline or stable tree. usage: 1) backport a patch from mainline ./scripts/pick -c <commit> --issue I1SF7H 2) insert patch info to exsit patch file ./scripts/pick -c <commit> --issue I1SF7H -i test.patch 3) backport a patch from stable branch ./scripts/pick -c <commit> -s --issue I1SF7H 4) insert patch info to a out-of-tree patch ./scripts/pick --from driver --issue I1SF7H -i 0001-driver.patch ./scripts/pick --from driver --cate feature --feat "xxx feature" --issue I1SF7H -i 0001-driver.patch 5) if the commit information is not provided in the argument, try to identify it from the input file. The following formats can be recognized: (cherry picked from commit 587a87b9d7e94927edcdea018565bc1939381eb1) commit 65caafd0d2145d1dd02072c4ced540624daeab40 upstream. ./scripts/pick --issue I1SF7H -i 0001-input.patch Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- scripts/pick | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100755 scripts/pick diff --git a/scripts/pick b/scripts/pick new file mode 100755 index 000000000000..1166a300f508 --- /dev/null +++ b/scripts/pick @@ -0,0 +1,205 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# pick - helpers for pick a patch from upstream +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# (C) Copyright 2015-2020 Huawei Technologies Co., Ltd +# +# Authors: Xie XiuQi <xiexiuqi(a)huawei.com> + +# +# usage: +# 1) backport a patch from mainline +# ./scripts/pick -c <commit> --issue I1SF7H +# +# 2) insert patch info to exsit patch file +# ./scripts/pick -c <commit> --issue I1SF7H -i test.patch +# +# 3) backport a patch from stable branch +# ./scripts/pick -c <commit> -s --issue I1SF7H +# +# 4) insert patch info to a out-of-tree patch +# ./scripts/pick --from driver --issue I1SF7H -i 0001-driver.patch +# ./scripts/pick --from driver --cate feature --feat "xxx feature" --issue I1SF7H -i 0001-driver.patch +# +# 5) if the commit information is not provided in the argument, +# try to identify it from the input file. +# The following formats can be recognized: +# (cherry picked from commit 587a87b9d7e94927edcdea018565bc1939381eb1) +# commit 65caafd0d2145d1dd02072c4ced540624daeab40 upstream. +# +# ./scripts/pick --issue I1SF7H -i 0001-input.patch +# + +# set -x + +COMMIT= +CVE=NA +BUG=NA +ISSUE=NA +WITH_ISSUE=0 +ISSUE_PREFIX=https://gitee.com/openeuler/kernel/issues +OUTPUT_PREFIX= +OUTPUT= +FROM=mainline # default +CATEGORY=bugfix # default +FEATURE="" +SUBJECT_PREFIX= +WITH_SOB= +INSERT_LINE=0 + +usage() +{ + echo "usage: $(basename $0) [options]" >&2 + echo " -h|--help show this help message" >&2 + echo " -s|--stable from stable (default mainline)" >&2 + echo " -f|--from where does the patch from (default mainline)" >&2 + echo " -C|--cve ID of CVE (without CVE prefix)" >&2 + echo " --cate category(feature/bugfix/...)" >&2 + echo " --feat feature" >&2 + echo " --subject-prefix " >&2 + echo " -b|--bugzilla ID of BUGZILLA" >&2 + echo " --issue issue id of gitee" >&2 + echo " -o|--output output filename, use input filename if no specific" >&2 + echo " -i|--input input patch filename" >&2 + echo " --output-prefix output filename" >&2 + echo " --with-sob with signed-off-by" >&2 + echo " -c|--commit <commit id>" >&2 +} + +options=$(getopt -o hr:u:c: "help,pick,stable,from:bugzilla:cate:feat:cve:commit" -- "$@") || die "getopt failed" + +eval set -- "$options" +while [[ $# -gt 0 ]]; do + case "$1" in + -h|--help) + usage + exit 0 + ;; + -f|--from) + FROM="$2" + shift + ;; + -s|--stable) + FROM="stable" + ;; + -C|--cve) + CVE="$2" + shift + ;; + --cate) + CATEGORY="$2" + shift + ;; + --feat) + FEATURE="$2" + shift + ;; + --subject-prefix) + SUBJECT_PREFIX=" $2" + shift + ;; + --with-sob) + WITH_SOB="-s" + ;; + -b|--bugzilla) + BUG="$2" + shift + ;; + --issue) + ISSUE=$2 + WITH_ISSUE=1 + shift + ;; + -i|--input) + INPUT=$2 + shift + ;; + -u|--utf8) + UTF8=1 + ;; + -c|--commit) + COMMIT=$2 + shift + ;; + esac + shift +done + +if [ -z "$COMMIT" ] && [ -z "$INPUT" ]; then + echo 'Your must specific at least commit or input filename' + exit 1 +fi + +if [ "$INPUT" != "" ] && [ "$COMMIT" == "" ]; then + COMMIT=$(grep "^(cherry picked from commit" $INPUT | sed 's/^(cherry picked from commit $[a-f0-9]*$.*/\1/g') + + if [ "$COMMIT" == "" ]; then + COMMIT=$(grep "^commit [a-f0-9]* upstream" $INPUT | sed 's/^commit $[a-f0-9]*$.*/\1/g') + fi +fi + +if [ "$PREFIX" != "" ]; then + PREFIX="[$PREFIX] " +fi + +if [ $(echo $CVE |grep CVE -c) -eq 0 ] && [ "$CVE" != "NA" ]; then + CVE=CVE-$CVE +fi + +TAG=$(git name-rev --tags $COMMIT |sed 's/^[a-f0-9]* tags\/v//g' | sed 's/~.*//' | sed 's/-.*//') + +trap 'rm -f "$TMPFILE"' EXIT +TMPFILE=$(mktemp) || exit 1 + +printf "%s\n" "$FROM inclusion" >> $TMPFILE +if [ $FROM == "mainline" ] || [ "$FROM" == "stable" ]; then + printf "%s\n" "from $FROM-$TAG" >> $TMPFILE + printf "%s\n" "commit $COMMIT" >> $TMPFILE +fi +printf "%s\n" "category: $CATEGORY" >> $TMPFILE + +if [ "$CATEGORY" == "feature" ]; then + if [ "$FEATURE" == "" ]; then + echo "please describe this feature" + exit 1 + else + printf "%s\n" "feature: $FEATURE" >> $TMPFILE + fi +fi + +printf "%s\n" "bugzilla: $BUG" >> $TMPFILE +printf "%s\n" "CVE: $CVE" >> $TMPFILE + +if [ "$BUG" == "NA" ] && [ "$ISSUE" == "NA" ]; +then + echo please set bugzilla id or issue id + exit 1 +fi + +if [ $WITH_ISSUE -eq 1 ] && [ "$ISSUE" != "" ]; then + printf "%s\n" "Link: $ISSUE_PREFIX/$ISSUE" >> $TMPFILE +fi + +printf "\n%s\n\n" "-------------------------------------------------" >> $TMPFILE + +if [ -z $INPUT ]; then + INPUT=$(git format-patch -1 $WITH_SOB --subject-prefix="PATCH$SUBJECT_PREFIX" $COMMIT) +fi + +if [ -z $OUTPUT ]; then + OUTPUT=$INPUT +fi + +INSERT_LINE=$(sed -n -e '/^$/=' $INPUT |head -n1) +sed -i "$INSERT_LINE"r" $TMPFILE" $OUTPUT -- 2.20.1

1 0

[PATCH 00/20] KVM: arm64 support vCPU preempted check and PV qspinlock
by Yang Yingliang 20 Aug '20

20 Aug '20

This patch set aims to support the vCPU preempted check and PV qspinlock under KVM/arm64. Christoffer Dall (1): KVM: arm/arm64: Factor out hypercall handling from PSCI code Qian Cai (1): arm64/spinlock: fix a -Wunused-function warning Steven Price (3): KVM: Implement kvm_put_guest() arm/arm64: Provide a wrapper for SMCCC 1.1 calls arm/arm64: Make use of the SMCCC 1.1 wrapper Waiman Long (1): locking/osq: Use optimized spinning loop for arm64 Wanpeng Li (2): KVM: Boost vCPUs that are delivering interrupts KVM: Check preempted_in_kernel for involuntary preemption Zengruan Ye (12): arm/paravirt: Use a single ops structure KVM: arm64: Document PV-sched interface KVM: arm64: Implement PV_SCHED_FEATURES call KVM: arm64: Support pvsched preempted via shared structure KVM: arm64: Add interface to support vCPU preempted check KVM: arm64: Support the vCPU preemption check KVM: arm64: Add SMCCC PV-sched to kick cpu KVM: arm64: Implement PV_SCHED_KICK_CPU call KVM: arm64: Add interface to support PV qspinlock KVM: arm64: Enable PV qspinlock KVM: arm64: Add tracepoints for PV qspinlock arm64: defconfig: add CONFIG_PARAVIRT_SPINLOCKS in default Documentation/virtual/kvm/arm/pvsched.txt | 72 ++++++++ arch/arm/include/asm/kvm_host.h | 25 +++ arch/arm/include/asm/paravirt.h | 9 +- arch/arm/kernel/paravirt.c | 4 +- arch/arm/kvm/Makefile | 2 +- arch/arm/kvm/handle_exit.c | 2 +- arch/arm/mm/proc-v7-bugs.c | 13 +- arch/arm64/Kconfig | 14 ++ arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/kvm_host.h | 20 +++ arch/arm64/include/asm/paravirt.h | 63 ++++++- arch/arm64/include/asm/pvsched-abi.h | 16 ++ arch/arm64/include/asm/qspinlock.h | 15 +- arch/arm64/include/asm/qspinlock_paravirt.h | 12 ++ arch/arm64/include/asm/spinlock.h | 26 +++ arch/arm64/kernel/Makefile | 3 +- arch/arm64/kernel/alternative.c | 5 +- arch/arm64/kernel/cpu_errata.c | 82 +++------ arch/arm64/kernel/paravirt-spinlocks.c | 18 ++ arch/arm64/kernel/paravirt.c | 188 +++++++++++++++++++- arch/arm64/kernel/setup.c | 2 + arch/arm64/kernel/trace-paravirt.h | 66 +++++++ arch/arm64/kvm/Makefile | 2 + arch/arm64/kvm/handle_exit.c | 5 +- arch/s390/kvm/interrupt.c | 2 +- drivers/xen/time.c | 4 + include/kvm/arm_hypercalls.h | 43 +++++ include/kvm/arm_psci.h | 2 +- include/linux/arm-smccc.h | 71 ++++++++ include/linux/cpuhotplug.h | 1 + include/linux/kvm_host.h | 23 +++ include/linux/kvm_types.h | 2 + kernel/locking/osq_lock.c | 23 ++- virt/kvm/arm/arm.c | 12 +- virt/kvm/arm/hypercalls.c | 72 ++++++++ virt/kvm/arm/psci.c | 76 +------- virt/kvm/arm/pvsched.c | 83 +++++++++ virt/kvm/arm/trace.h | 18 ++ virt/kvm/kvm_main.c | 17 +- 41 files changed, 939 insertions(+), 177 deletions(-) create mode 100644 Documentation/virtual/kvm/arm/pvsched.txt create mode 100644 arch/arm64/include/asm/pvsched-abi.h create mode 100644 arch/arm64/include/asm/qspinlock_paravirt.h create mode 100644 arch/arm64/kernel/paravirt-spinlocks.c create mode 100644 arch/arm64/kernel/trace-paravirt.h create mode 100644 include/kvm/arm_hypercalls.h create mode 100644 virt/kvm/arm/hypercalls.c create mode 100644 virt/kvm/arm/pvsched.c -- 2.25.1

1 20

[PATCH] printk: Export a symbol.
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Xu Qiang <xuqiang36(a)huawei.com> ascend inclusion category: feature Bugzilla: N/A CVE: N/A ------------------------------------------- Signed-off-by: Xu Qiang <xuqiang36(a)huawei.com> Acked-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/printk/printk_safe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c index af5f4e42ca54..63ba880a6df0 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -290,6 +290,7 @@ void printk_safe_flush_on_panic(void) printk_safe_flush(); } +EXPORT_SYMBOL_GPL(printk_safe_flush_on_panic); #ifdef CONFIG_PRINTK_NMI /* -- 2.25.1

1 0

[PATCH 1/7] serial: amba-pl011: Fix serial port discard interrupt when interrupt signal line of serial port is connected to mbigen.
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Xu Qiang <xuqiang36(a)huawei.com> ascend inclusion category: bugfix Bugzilla: N/A CVE: N/A --------------------------------------- Hisi when designing ascend chip, connect the serial port interrupt signal lines to mbigen equipment, mbigen write GICD_SETSPI_NSR register trigger the SPI interrupt. This can result in serial port drop interrupts. Signed-off-by: Xu Qiang <xuqiang36(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/tty/serial/Kconfig | 18 ++++++++++ drivers/tty/serial/amba-pl011.c | 64 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index df8bd0c7b97d..66e69c7d10a3 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -73,6 +73,24 @@ config SERIAL_AMBA_PL011_CONSOLE your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time.) +if ASCEND_FEATURES + +config SERIAL_ATTACHED_MBIGEN + bool "Serial port interrupt signal lines connected to the mbigen" + depends on SERIAL_AMBA_PL011=y + default n + help + Say Y here when the interrupt signal line of the serial port is + connected to the mbigne. The mbigen device has the function of + clearing interrupts automatically. However, the interrupt processing + function of the serial port driver may process multiple interrupts + at a time. The mbigen device cannot adapt to this scenario. + As a result, interrupts are lost.Because it maybe discard interrupt. + + If unsure, say N. + +endif + config SERIAL_EARLYCON_ARM_SEMIHOST bool "Early console using ARM semihosting" depends on ARM64 || ARM diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 1d501154e9f7..781a27eebf0b 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1473,6 +1473,63 @@ static void check_apply_cts_event_workaround(struct uart_amba_port *uap) dummy_read = pl011_read(uap, REG_ICR); } +#ifdef CONFIG_SERIAL_ATTACHED_MBIGEN +struct workaround_oem_info { + char oem_id[ACPI_OEM_ID_SIZE + 1]; + char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1]; + u32 oem_revision; +}; + +static bool pl011_enable_hisi_wkrd; +static struct workaround_oem_info pl011_wkrd_info[] = { + { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x300, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x301, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x400, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x401, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x402, + } +}; + +static void pl011_check_hisi_workaround(void) +{ + struct acpi_table_header *tbl; + acpi_status status = AE_OK; + int i; + + status = acpi_get_table(ACPI_SIG_MADT, 0, &tbl); + if (ACPI_FAILURE(status) || !tbl) + return; + + for (i = 0; i < ARRAY_SIZE(pl011_wkrd_info); i++) { + if (!memcmp(pl011_wkrd_info[i].oem_id, tbl->oem_id, ACPI_OEM_ID_SIZE) && + !memcmp(pl011_wkrd_info[i].oem_table_id, tbl->oem_table_id, ACPI_OEM_TABLE_ID_SIZE) && + pl011_wkrd_info[i].oem_revision == tbl->oem_revision) { + pl011_enable_hisi_wkrd = true; + break; + } + } +} + +#else +#define pl011_enable_hisi_wkrd 0 +static inline void pl011_check_hisi_workaround(void){ } +#endif + static irqreturn_t pl011_int(int irq, void *dev_id) { struct uart_amba_port *uap = dev_id; @@ -1510,6 +1567,11 @@ static irqreturn_t pl011_int(int irq, void *dev_id) handled = 1; } + if (pl011_enable_hisi_wkrd) { + pl011_write(0, uap, REG_IMSC); + pl011_write(uap->im, uap, REG_IMSC); + } + spin_unlock_irqrestore(&uap->port.lock, flags); return IRQ_RETVAL(handled); @@ -1687,6 +1749,8 @@ static int pl011_hwinit(struct uart_port *port) if (plat->init) plat->init(); } + + pl011_check_hisi_workaround(); return 0; } -- 2.25.1

1 6

[PATCH] iommu: fix a mistake for iommu_unregister_device_fault_handler
by Yang Yingliang 19 Aug '20

19 Aug '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