- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10] crypto:rmd320 rmd128 rmd256-remove RIPE-MD 320 128 256 hash algorithm
by Wen Zhiwei 18 Jan '22

18 Jan '22

mainlin inclusion category: performance bugzilla: NA CVE: NA ----------------------------------------------------------- RIPE-MD 256 is never referenced anywhere in the kernel, and unlikely to be depended upon by userspace via AF_ALG. So let's remove it Signed-off-by: Ard Biesheuvel <ardb(a)kernel.org> Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au> Signed-off-by: Wen Zhiwei <wenzhiwei(a)kylinos.cn> --- crypto/tcrypt.c | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 8609174e036e..c8b0d31631f5 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -71,7 +71,7 @@ static const char *check[] = { "blowfish", "twofish", "serpent", "sha384", "sha512", "md4", "aes", "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", "fcrypt", - "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320", + "camellia", "seed", "salsa20", "rmd160", "lzo", "lzo-rle", "cts", "sha3-224", "sha3-256", "sha3-384", "sha3-512", "streebog256", "streebog512", NULL @@ -1860,22 +1860,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) ret += tcrypt_test("cts(cbc(aes))"); break; - case 39: - ret += tcrypt_test("rmd128"); - break; - case 40: ret += tcrypt_test("rmd160"); break; - case 41: - ret += tcrypt_test("rmd256"); - break; - - case 42: - ret += tcrypt_test("rmd320"); - break; - case 43: ret += tcrypt_test("ecb(seed)"); break; @@ -1948,10 +1936,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) ret += tcrypt_test("xcbc(aes)"); break; - case 107: - ret += tcrypt_test("hmac(rmd128)"); - break; - case 108: ret += tcrypt_test("hmac(rmd160)"); break; @@ -2402,22 +2386,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) test_hash_speed("sha224", sec, generic_hash_speed_template); if (mode > 300 && mode < 400) break; fallthrough; - case 314: - test_hash_speed("rmd128", sec, generic_hash_speed_template); - if (mode > 300 && mode < 400) break; - fallthrough; case 315: test_hash_speed("rmd160", sec, generic_hash_speed_template); if (mode > 300 && mode < 400) break; fallthrough; - case 316: - test_hash_speed("rmd256", sec, generic_hash_speed_template); - if (mode > 300 && mode < 400) break; - fallthrough; - case 317: - test_hash_speed("rmd320", sec, generic_hash_speed_template); - if (mode > 300 && mode < 400) break; - fallthrough; case 318: klen = 16; test_hash_speed("ghash", sec, generic_hash_speed_template); @@ -2526,22 +2498,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) test_ahash_speed("sha224", sec, generic_hash_speed_template); if (mode > 400 && mode < 500) break; fallthrough; - case 414: - test_ahash_speed("rmd128", sec, generic_hash_speed_template); - if (mode > 400 && mode < 500) break; - fallthrough; case 415: test_ahash_speed("rmd160", sec, generic_hash_speed_template); if (mode > 400 && mode < 500) break; fallthrough; - case 416: - test_ahash_speed("rmd256", sec, generic_hash_speed_template); - if (mode > 400 && mode < 500) break; - fallthrough; - case 417: - test_ahash_speed("rmd320", sec, generic_hash_speed_template); - if (mode > 400 && mode < 500) break; - fallthrough; case 418: test_ahash_speed("sha3-224", sec, generic_hash_speed_template); if (mode > 400 && mode < 500) break; -- 2.30.0

2 1

[PATCH OLK-5.10 0/2] change arm64 and x86 configs
by Chao Liu 18 Jan '22

18 Jan '22

change arm64 and x86 configs openEuler inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4OFDI CVE: NA -------------------------------- Chao Liu (2): change arm64 configs change x86 configs arch/arm64/configs/openeuler_defconfig | 287 ++++++++----- arch/x86/configs/openeuler_defconfig | 540 +++++++++---------------- 2 files changed, 374 insertions(+), 453 deletions(-) -- 2.27.0

1 2

[PATCH openEuler-1.0-LTS] ip_gre: validate csum_start only on pull
by Yang Yingliang 18 Jan '22

18 Jan '22

From: Willem de Bruijn <willemb(a)google.com> mainline inclusion from mainline-v5.14 commit 8a0ed250f911da31a2aef52101bc707846a800ff category: bugfix bugzilla: NA CVE: CVE-2021-39633 ------------------------------------------------- The GRE tunnel device can pull existing outer headers in ipge_xmit. This is a rare path, apparently unique to this device. The below commit ensured that pulling does not move skb->data beyond csum_start. But it has a false positive if ip_summed is not CHECKSUM_PARTIAL and thus csum_start is irrelevant. Refine to exclude this. At the same time simplify and strengthen the test. Simplify, by moving the check next to the offending pull, making it more self documenting and removing an unnecessary branch from other code paths. Strengthen, by also ensuring that the transport header is correct and therefore the inner headers will be after skb_reset_inner_headers. The transport header is set to csum_start in skb_partial_csum_set. Link: https://lore.kernel.org/netdev/YS+h%2FtqCJJiQei+W@shredder/ Fixes: 1d011c4803c7 ("ip_gre: add validation for csum_start") Reported-by: Ido Schimmel <idosch(a)idosch.org> Suggested-by: Alexander Duyck <alexander.duyck(a)gmail.com> Signed-off-by: Willem de Bruijn <willemb(a)google.com> Reviewed-by: Alexander Duyck <alexanderduyck(a)fb.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Huang Guobin <huangguobin4(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- net/ipv4/ip_gre.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index a8a37d1128201..0c431fd4b1200 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -449,8 +449,6 @@ static void __gre_xmit(struct sk_buff *skb, struct net_device *dev, static int gre_handle_offloads(struct sk_buff *skb, bool csum) { - if (csum && skb_checksum_start(skb) < skb->data) - return -EINVAL; return iptunnel_handle_offloads(skb, csum ? SKB_GSO_GRE_CSUM : SKB_GSO_GRE); } @@ -682,15 +680,20 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, } if (dev->header_ops) { + const int pull_len = tunnel->hlen + sizeof(struct iphdr); + if (skb_cow_head(skb, 0)) goto free_skb; tnl_params = (const struct iphdr *)skb->data; + if (pull_len > skb_transport_offset(skb)) + goto free_skb; + /* Pull skb since ip_tunnel_xmit() needs skb->data pointing * to gre header. */ - skb_pull(skb, tunnel->hlen + sizeof(struct iphdr)); + skb_pull(skb, pull_len); skb_reset_mac_header(skb); } else { if (skb_cow_head(skb, dev->needed_headroom)) -- 2.25.1

1 0

[PATCH openEuler-5.10 01/82] clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses
by Zheng Zengkai 17 Jan '22

17 Jan '22

From: Marc Zyngier <maz(a)kernel.org> mainline inclusion from mainline-v5.16-rc1 commit 4775bc63f880 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4QCBG CVE: NA -------------------------- As we are about to change the registers that are used by the driver, start by adding build-time checks to ensure that we always handle all registers and access modes. Suggested-by: Mark Rutland <mark.rutland(a)arm.com> Signed-off-by: Marc Zyngier <maz(a)kernel.org> Link: https://lore.kernel.org/r/20211017124225.3018098-2-maz@kernel.org Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> Signed-off-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- arch/arm/include/asm/arch_timer.h | 12 ++++++++++++ arch/arm64/include/asm/arch_timer.h | 13 ++++++++++++- drivers/clocksource/arm_arch_timer.c | 8 ++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h index 99175812d903..a5d27cff28fa 100644 --- a/arch/arm/include/asm/arch_timer.h +++ b/arch/arm/include/asm/arch_timer.h @@ -34,6 +34,8 @@ void arch_timer_reg_write_cp15(int access, enum arch_timer_reg reg, u32 val) case ARCH_TIMER_REG_TVAL: asm volatile("mcr p15, 0, %0, c14, c2, 0" : : "r" (val)); break; + default: + BUILD_BUG(); } } else if (access == ARCH_TIMER_VIRT_ACCESS) { switch (reg) { @@ -43,7 +45,11 @@ void arch_timer_reg_write_cp15(int access, enum arch_timer_reg reg, u32 val) case ARCH_TIMER_REG_TVAL: asm volatile("mcr p15, 0, %0, c14, c3, 0" : : "r" (val)); break; + default: + BUILD_BUG(); } + } else { + BUILD_BUG(); } isb(); @@ -62,6 +68,8 @@ u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg) case ARCH_TIMER_REG_TVAL: asm volatile("mrc p15, 0, %0, c14, c2, 0" : "=r" (val)); break; + default: + BUILD_BUG(); } } else if (access == ARCH_TIMER_VIRT_ACCESS) { switch (reg) { @@ -71,7 +79,11 @@ u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg) case ARCH_TIMER_REG_TVAL: asm volatile("mrc p15, 0, %0, c14, c3, 0" : "=r" (val)); break; + default: + BUILD_BUG(); } + } else { + BUILD_BUG(); } return val; diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index ce37c14f9417..7dfb7c6261bb 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -112,6 +112,8 @@ void arch_timer_reg_write_cp15(int access, enum arch_timer_reg reg, u32 val) case ARCH_TIMER_REG_TVAL: write_sysreg(val, cntp_tval_el0); break; + default: + BUILD_BUG(); } } else if (access == ARCH_TIMER_VIRT_ACCESS) { switch (reg) { @@ -121,7 +123,11 @@ void arch_timer_reg_write_cp15(int access, enum arch_timer_reg reg, u32 val) case ARCH_TIMER_REG_TVAL: write_sysreg(val, cntv_tval_el0); break; + default: + BUILD_BUG(); } + } else { + BUILD_BUG(); } isb(); @@ -136,6 +142,8 @@ u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg) return read_sysreg(cntp_ctl_el0); case ARCH_TIMER_REG_TVAL: return arch_timer_reg_read_stable(cntp_tval_el0); + default: + BUILD_BUG(); } } else if (access == ARCH_TIMER_VIRT_ACCESS) { switch (reg) { @@ -143,10 +151,13 @@ u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg) return read_sysreg(cntv_ctl_el0); case ARCH_TIMER_REG_TVAL: return arch_timer_reg_read_stable(cntv_tval_el0); + default: + BUILD_BUG(); } } - BUG(); + BUILD_BUG(); + unreachable(); } static inline u32 arch_timer_get_cntfrq(void) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 3ea1c22314f9..f3c65e5181ec 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -103,6 +103,8 @@ void arch_timer_reg_write(int access, enum arch_timer_reg reg, u32 val, case ARCH_TIMER_REG_TVAL: writel_relaxed(val, timer->base + CNTP_TVAL); break; + default: + BUILD_BUG(); } } else if (access == ARCH_TIMER_MEM_VIRT_ACCESS) { struct arch_timer *timer = to_arch_timer(clk); @@ -113,6 +115,8 @@ void arch_timer_reg_write(int access, enum arch_timer_reg reg, u32 val, case ARCH_TIMER_REG_TVAL: writel_relaxed(val, timer->base + CNTV_TVAL); break; + default: + BUILD_BUG(); } } else { arch_timer_reg_write_cp15(access, reg, val); @@ -134,6 +138,8 @@ u32 arch_timer_reg_read(int access, enum arch_timer_reg reg, case ARCH_TIMER_REG_TVAL: val = readl_relaxed(timer->base + CNTP_TVAL); break; + default: + BUILD_BUG(); } } else if (access == ARCH_TIMER_MEM_VIRT_ACCESS) { struct arch_timer *timer = to_arch_timer(clk); @@ -144,6 +150,8 @@ u32 arch_timer_reg_read(int access, enum arch_timer_reg reg, case ARCH_TIMER_REG_TVAL: val = readl_relaxed(timer->base + CNTV_TVAL); break; + default: + BUILD_BUG(); } } else { val = arch_timer_reg_read_cp15(access, reg); -- 2.20.1

1 81

[PATCH OLK-5.10 v3 1/3] arm64: Add memmap parameter for pmem
by Zhuling 17 Jan '22

17 Jan '22

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4O31I?from=project-issue CVE: NA Add "!" in memmap parameter, use memmap(memmap=nn[KMG]!ss[KMG]) reserve memory for pmem which register persistent memory in arm64. Signed-off-by: Zhuling <zhuling8(a)huawei.com> --- Documentation/admin-guide/kernel-parameters.txt | 9 +++++++-- arch/arm64/mm/init.c | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 64be32b..1953570 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2829,10 +2829,15 @@ will be eaten. memmap=nn[KMG]!ss[KMG] - [KNL,X86] Mark specific memory as protected. + [KNL,X86,ARM64] Mark specific memory as protected. Region of memory to be used, from ss to ss+nn. - The memory region may be marked as e820 type 12 (0xc) + [X86]The memory region may be marked as e820 type 12 (0xc) and is NVDIMM or ADR memory. + [ARM64]Reserve memory for persistent storage when the kernel + restart or update. the data in PMEM will not be lost and can + be loaded faster + Example: + memmap=100K!0x1a0000000 memmap=<size>%<offset>-<oldtype>+<newtype> [KNL,ACPI] Convert memory within the specified region diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 6ebfabd..b9eb312 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -56,6 +56,8 @@ s64 memstart_addr __ro_after_init = -1; EXPORT_SYMBOL(memstart_addr); +phys_addr_t start_at, mem_size; + #ifdef CONFIG_PIN_MEMORY struct resource pin_memory_resource = { .name = "Pin memory", @@ -111,6 +113,8 @@ static void __init reserve_pin_memory_res(void) */ phys_addr_t arm64_dma_phys_limit __ro_after_init; +static unsigned long long pmem_size, pmem_start; + #ifndef CONFIG_KEXEC_CORE static void __init reserve_crashkernel(void) { @@ -442,6 +446,10 @@ static int __init parse_memmap_one(char *p) start_at = memparse(p + 1, &p); memblock_reserve(start_at, mem_size); memblock_mark_memmap(start_at, mem_size); + } else if (*p == '!') { + start_at = memparse(p+1, &p); + pmem_start = start_at; + pmem_size = mem_size; } else pr_info("Unrecognized memmap option, please check the parameter.\n"); -- 2.9.5

3 7

[PATCH openEuler-1.0-LTS 1/2] hugetlbfs: extend the definition of hugepages parameter to support node allocation
by Yang Yingliang 17 Jan '22

17 Jan '22

From: Zhenguo Yao <yaozhenguo1(a)gmail.com> mainline inclusion from mainline-v5.16-rc1 commit b5389086ad7be0453c55e0069a89856d1fbdf605 category: feature bugzilla: 186043 CVE: NA -------------------------------- We can specify the number of hugepages to allocate at boot. But the hugepages is balanced in all nodes at present. In some scenarios, we only need hugepages in one node. For example: DPDK needs hugepages which are in the same node as NIC. If DPDK needs four hugepages of 1G size in node1 and system has 16 numa nodes we must reserve 64 hugepages on the kernel cmdline. But only four hugepages are used. The others should be free after boot. If the system memory is low(for example: 64G), it will be an impossible task. So extend the hugepages parameter to support specifying hugepages on a specific node. For example add following parameter: hugepagesz=1G hugepages=0:1,1:3 It will allocate 1 hugepage in node0 and 3 hugepages in node1. Link: https://lkml.kernel.org/r/20211005054729.86457-1-yaozhenguo1@gmail.com Signed-off-by: Zhenguo Yao <yaozhenguo1(a)gmail.com> Reviewed-by: Mike Kravetz <mike.kravetz(a)oracle.com> Cc: Zhenguo Yao <yaozhenguo1(a)gmail.com> Cc: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: Nathan Chancellor <nathan(a)kernel.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Mike Rapoport <rppt(a)kernel.org> Cc: Matthew Wilcox (Oracle) <willy(a)infradead.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Conflicts: Documentation/admin-guide/kernel-parameters.txt Documentation/admin-guide/mm/hugetlbpage.rst arch/powerpc/mm/hugetlbpage.c include/linux/hugetlb.h mm/hugetlb.c 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> --- .../admin-guide/kernel-parameters.txt | 5 + arch/powerpc/mm/hugetlbpage.c | 9 +- include/linux/hugetlb.h | 6 +- mm/hugetlb.c | 142 +++++++++++++++--- 4 files changed, 137 insertions(+), 25 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 420f7317aa6af..5623a9d1cf813 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1402,6 +1402,11 @@ registers. Default set by CONFIG_HPET_MMAP_DEFAULT. hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. + If using node format, the number of pages to allocate + per-node can be specified. + Format: <integer> or (node format) + <node>:<integer>[,<node>:<integer>] + hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. On x86-64 and powerpc, this option can be specified multiple times interleaved with hugepages= to reserve diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index cef0b7ee10246..163b0ef7d156e 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -241,17 +241,22 @@ int __init pseries_alloc_bootmem_huge_page(struct hstate *hstate) m->hstate = hstate; return 1; } + +bool __init hugetlb_node_alloc_supported(void) +{ + return false; +} #endif -int __init alloc_bootmem_huge_page(struct hstate *h) +int __init alloc_bootmem_huge_page(struct hstate *h, int nid) { #ifdef CONFIG_PPC_BOOK3S_64 if (firmware_has_feature(FW_FEATURE_LPAR) && !radix_enabled()) return pseries_alloc_bootmem_huge_page(h); #endif - return __alloc_bootmem_huge_page(h); + return __alloc_bootmem_huge_page(h, nid); } #if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 561e7679fadc4..588f9f2a44fce 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -347,6 +347,7 @@ struct hstate { unsigned long nr_overcommit_huge_pages; struct list_head hugepage_activelist; struct list_head hugepage_freelists[MAX_NUMNODES]; + unsigned int max_huge_pages_node[MAX_NUMNODES]; unsigned int nr_huge_pages_node[MAX_NUMNODES]; unsigned int free_huge_pages_node[MAX_NUMNODES]; unsigned int surplus_huge_pages_node[MAX_NUMNODES]; @@ -409,8 +410,9 @@ int hugetlb_insert_hugepage(struct vm_area_struct *vma, unsigned long addr, struct page *hpage, pgprot_t prot); /* arch callback */ -int __init __alloc_bootmem_huge_page(struct hstate *h); -int __init alloc_bootmem_huge_page(struct hstate *h); +int __init __alloc_bootmem_huge_page(struct hstate *h, int nid); +int __init alloc_bootmem_huge_page(struct hstate *h, int nid); +bool __init hugetlb_node_alloc_supported(void); void __init hugetlb_bad_size(void); void __init hugetlb_add_hstate(unsigned order); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b2ed9174bfd73..8286a6f8cb050 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -56,6 +56,7 @@ static struct hstate * __initdata parsed_hstate; static unsigned long __initdata default_hstate_max_huge_pages; static unsigned long __initdata default_hstate_size; static bool __initdata parsed_valid_hugepagesz = true; +static unsigned int default_hugepages_in_node[MAX_NUMNODES] __initdata; int enable_charge_mighp __read_mostly; /* @@ -2241,33 +2242,39 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, return ERR_PTR(-ENOSPC); } -int alloc_bootmem_huge_page(struct hstate *h) +int alloc_bootmem_huge_page(struct hstate *h, int nid) __attribute__ ((weak, alias("__alloc_bootmem_huge_page"))); -int __alloc_bootmem_huge_page(struct hstate *h) +int __alloc_bootmem_huge_page(struct hstate *h, int nid) { - struct huge_bootmem_page *m; + struct huge_bootmem_page *m = NULL; /* initialize for clang */ int nr_nodes, node; + if (nid >= nr_online_nodes) + return 0; + /* do node specific alloc */ + if (nid != NUMA_NO_NODE) { + m = memblock_virt_alloc_try_nid_raw(huge_page_size(h), huge_page_size(h), + 0, MEMBLOCK_ALLOC_ACCESSIBLE, nid); + if (!m) + return 0; + goto found; + } + /* allocate from next node when distributing huge pages */ for_each_node_mask_to_alloc(h, nr_nodes, node, &node_states[N_MEMORY]) { - void *addr; - - addr = memblock_virt_alloc_try_nid_raw( + m = memblock_virt_alloc_try_nid_raw( huge_page_size(h), huge_page_size(h), 0, BOOTMEM_ALLOC_ACCESSIBLE, node); - if (addr) { - /* - * Use the beginning of the huge page to store the - * huge_bootmem_page struct (until gather_bootmem - * puts them into the mem_map). - */ - m = addr; - goto found; - } + /* + * Use the beginning of the huge page to store the + * huge_bootmem_page struct (until gather_bootmem + * puts them into the mem_map). + */ + if (!m) + return 0; + goto found; } - return 0; found: - BUG_ON(!IS_ALIGNED(virt_to_phys(m), huge_page_size(h))); /* Put them into a private list first because mem_map is not up yet */ INIT_LIST_HEAD(&m->list); list_add(&m->list, &huge_boot_pages); @@ -2310,12 +2317,55 @@ static void __init gather_bootmem_prealloc(void) cond_resched(); } } +static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, int nid) +{ + unsigned long i; + char buf[32]; + + for (i = 0; i < h->max_huge_pages_node[nid]; ++i) { + if (hstate_is_gigantic(h)) { + if (!alloc_bootmem_huge_page(h, nid)) + break; + } else { + struct page *page; + gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE; + + page = alloc_fresh_huge_page(h, gfp_mask, nid, + &node_states[N_MEMORY], NULL); + if (!page) + break; + put_page(page); /* free it into the hugepage allocator */ + } + cond_resched(); + } + if (i == h->max_huge_pages_node[nid]) + return; + + string_get_size(huge_page_size(h), 1, STRING_UNITS_2, buf, 32); + pr_warn("HugeTLB: allocating %u of page size %s failed node%d. Only allocated %lu hugepages.\n", + h->max_huge_pages_node[nid], buf, nid, i); + h->max_huge_pages -= (h->max_huge_pages_node[nid] - i); + h->max_huge_pages_node[nid] = i; +} static void __init hugetlb_hstate_alloc_pages(struct hstate *h) { unsigned long i; nodemask_t *node_alloc_noretry; + bool node_specific_alloc = false; + + /* do node specific alloc */ + for (i = 0; i < nr_online_nodes; i++) { + if (h->max_huge_pages_node[i] > 0) { + hugetlb_hstate_alloc_pages_onenode(h, i); + node_specific_alloc = true; + } + } + + if (node_specific_alloc) + return; + /* below will do all node balanced alloc */ if (!hstate_is_gigantic(h)) { /* * Bit mask controlling how hard we retry per-node allocations. @@ -2336,7 +2386,7 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) for (i = 0; i < h->max_huge_pages; ++i) { if (hstate_is_gigantic(h)) { - if (!alloc_bootmem_huge_page(h)) + if (!alloc_bootmem_huge_page(h, NUMA_NO_NODE)) break; } else if (!alloc_pool_huge_page(h, &node_states[N_MEMORY], @@ -2991,8 +3041,13 @@ static int __init hugetlb_init(void) } default_hstate_idx = hstate_index(size_to_hstate(default_hstate_size)); if (default_hstate_max_huge_pages) { - if (!default_hstate.max_huge_pages) + if (!default_hstate.max_huge_pages) { default_hstate.max_huge_pages = default_hstate_max_huge_pages; + + for (i = 0; i < nr_online_nodes; i++) + default_hstate.max_huge_pages_node[i] = + default_hugepages_in_node[i]; + } } hugetlb_init_hstates(); @@ -3052,10 +3107,19 @@ void __init hugetlb_add_hstate(unsigned int order) parsed_hstate = h; } +bool __init __weak hugetlb_node_alloc_supported(void) +{ + return true; +} + static int __init hugetlb_nrpages_setup(char *s) { unsigned long *mhp; static unsigned long *last_mhp; + int node = NUMA_NO_NODE; + int count; + unsigned long tmp; + char *p = s; if (!parsed_valid_hugepagesz) { pr_warn("hugepages = %s preceded by " @@ -3077,8 +3141,40 @@ static int __init hugetlb_nrpages_setup(char *s) return 1; } - if (sscanf(s, "%lu", mhp) <= 0) - *mhp = 0; + while (*p) { + count = 0; + if (sscanf(p, "%lu%n", &tmp, &count) != 1) + goto invalid; + /* Parameter is node format */ + if (p[count] == ':') { + if (!hugetlb_node_alloc_supported()) { + pr_warn("HugeTLB: architecture can't support node specific alloc, ignoring!\n"); + return 0; + } + node = tmp; + p += count + 1; + if (node < 0 || node >= nr_online_nodes) + goto invalid; + /* Parse hugepages */ + if (sscanf(p, "%lu%n", &tmp, &count) != 1) + goto invalid; + if (!hugetlb_max_hstate) + default_hugepages_in_node[node] = tmp; + else + parsed_hstate->max_huge_pages_node[node] = tmp; + *mhp += tmp; + /* Go to parse next node*/ + if (p[count] == ',') + p += count + 1; + else + break; + } else { + if (p != s) + goto invalid; + *mhp = tmp; + break; + } + } /* * Global state is always initialized later in hugetlb_init. @@ -3091,6 +3187,10 @@ static int __init hugetlb_nrpages_setup(char *s) last_mhp = mhp; return 1; + +invalid: + pr_warn("HugeTLB: Invalid hugepages parameter %s\n", p); + return 0; } __setup("hugepages=", hugetlb_nrpages_setup); -- 2.25.1

1 1

回复:答复: openEuler kernel技术分享第十七期 & 双周例会
by Zhengyuan Liu 17 Jan '22

17 Jan '22

你好 rdma这个议题什么气候开始呢 ---------- 该邮件从移动设备发送 --------------原始邮件-------------- 发件人："tangjiayuan "<tangjiayuan(a)huawei.com>; 发送时间：2022年1月17日(星期一) 下午3:10 收件人："kernel(a)openeuler.org" <kernel(a)openeuler.org>;"kernel-discuss(a)openeuler.org" <kernel-discuss(a)openeuler.org>; 抄送："xie xiuqi "<xiexiuqi(a)huawei.com>;"chengjian (D) "<cj.chengjian(a)huawei.com>;"qiulaibin "<qiulaibin(a)huawei.com>; 主题：答复: openEuler kernel技术分享第十七期 & 双周例会 ----------------------------------- Kernel SIG增加一个议题：希望在内核态支持RDMA通信 -----邮件原件----- 发件人: openEuler conference [mailto:public@openeuler.org] 发送时间: 2021年12月27日 10:20 收件人: kernel(a)openeuler.org; tc(a)openeuler.org; dev(a)openeuler.org; kernel-discuss(a)openeuler.org 主题: openEuler kernel技术分享第十七期 & 双周例会您好！ Kernel SIG 邀请您参加 2021-12-31 14:00 召开的ZOOM会议(自动录制) 会议主题：openEuler kernel技术分享第十七期 & 双周例会会议内容： 14:10-15:30 openEuler kernel 技术分享第17期 - cgroup介绍会议链接：https://us06web.zoom.us/j/83118407147?pwd=elVzMVhGc2YzaDQ1TGorN2tPa1NhZz09 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the ZOOM conference(auto recording) will be held at 2021-12-31 14:00, The subject of the conference is openEuler kernel技术分享第十七期 & 双周例会, Summary: 14:10-15:30 openEuler kernel 技术分享第17期 - cgroup介绍 You can join the meeting at https://us06web.zoom.us/j/83118407147?pwd=elVzMVhGc2YzaDQ1TGorN2tPa1NhZz09. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/ _______________________________________________ Kernel-discuss mailing list -- kernel-discuss(a)openeuler.org To unsubscribe send an email to kernel-discuss-leave(a)openeuler.org _______________________________________________ Kernel mailing list -- kernel(a)openeuler.org To unsubscribe send an email to kernel-leave(a)openeuler.org

1 0

[PATCH openEuler-1.0-LTS 1/2] share pool: use rwsem to protect sp group exit
by Yang Yingliang 17 Jan '22

17 Jan '22

From: Guo Mengqi <guomengqi3(a)huawei.com> ascend inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4ODMN CVE: NA ------------------------------------------------- Fix following situation: when the last process in a group exits, and a second process tries to add to this group. The second process may get a invalid spg. However the group's use_count is increased by 1, which caused the first process failed to free the group when it exits. And then second process called sp_group_drop --> free_sp_group and cause a double request of rwsem. Signed-off-by: Guo Mengqi <guomengqi3(a)huawei.com> Reviewed-by: Weilong Chen <chenweilong(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/share_pool.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/mm/share_pool.c b/mm/share_pool.c index 428742f5d4044..c79ea4bb06026 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -711,20 +711,25 @@ static void free_new_spg_id(bool new, int spg_id) free_sp_group_id(spg_id); } -static void free_sp_group(struct sp_group *spg) +static void free_sp_group_locked(struct sp_group *spg) { fput(spg->file); fput(spg->file_hugetlb); free_spg_stat(spg->id); - down_write(&sp_group_sem); idr_remove(&sp_group_idr, spg->id); - up_write(&sp_group_sem); free_sp_group_id((unsigned int)spg->id); kfree(spg); system_group_count--; WARN(system_group_count < 0, "unexpected group count\n"); } +static void free_sp_group(struct sp_group *spg) +{ + down_write(&sp_group_sem); + free_sp_group_locked(spg); + up_write(&sp_group_sem); +} + static void sp_group_drop(struct sp_group *spg) { if (atomic_dec_and_test(&spg->use_count)) @@ -4460,14 +4465,15 @@ void sp_group_post_exit(struct mm_struct *mm) sp_proc_stat_drop(stat); } - /* lockless traverse */ + down_write(&sp_group_sem); list_for_each_entry_safe(spg_node, tmp, &master->node_list, group_node) { spg = spg_node->spg; /* match with refcount inc in sp_group_add_task */ - sp_group_drop(spg); + if (atomic_dec_and_test(&spg->use_count)) + free_sp_group_locked(spg); kfree(spg_node); } - + up_write(&sp_group_sem); kfree(master); } -- 2.25.1

1 1

[PATCH openEuler-1.0-LTS 1/9] Revert "svm: Add svm_set_user_mpam_en to enable/disable mpam for smmu"
by Yang Yingliang 17 Jan '22

17 Jan '22

From: Xingang Wang <wangxingang5(a)huawei.com> ascend inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I49RB2 CVE: NA ------------------------------------------------- This reverts commit c50ad40d63ef0cc9e0b158354af08f1f98419273. The commit "svm: Add svm_set_user_mpam_en to enable/disable mpam for smmu" add and export interface in svm module, this makes the mpam depend on the svm module, just revert this to avoid coupling. Signed-off-by: Xingang Wang <wangxingang5(a)huawei.com> Reviewed-by: Weilong Chen <chenweilong(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/char/svm.c | 64 ------------------------------------- include/linux/ascend_smmu.h | 3 -- 2 files changed, 67 deletions(-) diff --git a/drivers/char/svm.c b/drivers/char/svm.c index c877c75fdcd5f..000b9ad01c350 100644 --- a/drivers/char/svm.c +++ b/drivers/char/svm.c @@ -135,14 +135,11 @@ struct meminfo { struct svm_mpam { #define SVM_GET_DEV_MPAM (1 << 0) #define SVM_SET_DEV_MPAM (1 << 1) -#define SVM_GET_USER_MPAM_EN (1 << 2) -#define SVM_SET_USER_MPAM_EN (1 << 3) int flags; int pasid; int partid; int pmg; int s1mpam; - int user_mpam_en; }; struct phymeminfo { @@ -1505,14 +1502,6 @@ static int svm_get_core_mpam(struct device *dev, void *data) } } - if (mpam->flags & SVM_GET_USER_MPAM_EN) { - err = arm_smmu_get_dev_user_mpam_en(dev, &mpam->user_mpam_en); - if (err) { - dev_err(dev, "set user_mpam_en failed, %d\n", err); - return err; - } - } - return err; } @@ -1554,14 +1543,6 @@ static int svm_set_core_mpam(struct device *dev, void *data) } } - if (mpam->flags & SVM_SET_USER_MPAM_EN) { - err = arm_smmu_set_dev_user_mpam_en(dev, mpam->user_mpam_en); - if (err) { - dev_err(dev, "set user_mpam_en failed, %d\n", err); - return err; - } - } - return 0; } @@ -1655,51 +1636,6 @@ int svm_get_mpam(int pasid, int *partid, int *pmg, int *s1mpam) } EXPORT_SYMBOL_GPL(svm_get_mpam); -/** - * svm_set_user_mpam_en() - set user_mpam_en - * @user_mpam_en: 0 for smmu mpam, 1 for user mpam - */ -int svm_set_user_mpam_en(int user_mpam_en) -{ - int err; - struct svm_mpam mpam, old_mpam; - - old_mpam.flags = SVM_GET_USER_MPAM_EN; - err = __svm_get_mpam(&old_mpam); - - mpam.flags = SVM_SET_USER_MPAM_EN, - mpam.user_mpam_en = user_mpam_en, - err = __svm_set_mpam(&mpam); - if (err) - goto rollback; - - return 0; - -rollback: - __svm_set_mpam(&mpam); - return err; -} -EXPORT_SYMBOL_GPL(svm_set_user_mpam_en); - -/** - * svm_set_user_mpam_en() - set user_mpam_en - * @user_mpam_en: pointer to user_mpam_en - */ -int svm_get_user_mpam_en(int *user_mpam_en) -{ - int err; - struct svm_mpam mpam; - - mpam.flags = SVM_GET_USER_MPAM_EN; - err = __svm_get_mpam(&mpam); - if (err) - return err; - - *user_mpam_en = mpam.user_mpam_en; - return 0; -} -EXPORT_SYMBOL_GPL(svm_get_user_mpam_en); - static int svm_set_rc(unsigned long __user *arg) { unsigned long addr, size, rc; diff --git a/include/linux/ascend_smmu.h b/include/linux/ascend_smmu.h index 32241a02a8a89..e570acfc8f6ac 100644 --- a/include/linux/ascend_smmu.h +++ b/include/linux/ascend_smmu.h @@ -15,7 +15,4 @@ extern int arm_smmu_get_dev_user_mpam_en(struct device *dev, int *user_mpam_en); extern int svm_get_mpam(int pasid, int *partid, int *pmg, int *s1mpam); extern int svm_set_mpam(int pasid, int partid, int pmg, int s1mpam); -extern int svm_set_user_mpam_en(int user_mpam_en); -extern int svm_get_user_mpam_en(int *user_mpam_en); - #endif /* __LINUX_ASCEND_SMMU_H */ -- 2.25.1

1 8

[PATCH openEuler-1.0-LTS 1/3] Revert "svm: Add svm_set_user_mpam_en to enable/disable mpam for smmu"
by Yang Yingliang 17 Jan '22

17 Jan '22

From: Xingang Wang <wangxingang5(a)huawei.com> ascend inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I49RB2 CVE: NA ------------------------------------------------- This reverts commit c50ad40d63ef0cc9e0b158354af08f1f98419273. The commit "svm: Add svm_set_user_mpam_en to enable/disable mpam for smmu" add and export interface in svm module, this makes the mpam depend on the svm module, just revert this to avoid coupling. Signed-off-by: Xingang Wang <wangxingang5(a)huawei.com> Reviewed-by: Weilong Chen <chenweilong(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/char/svm.c | 64 ------------------------------------- include/linux/ascend_smmu.h | 3 -- 2 files changed, 67 deletions(-) diff --git a/drivers/char/svm.c b/drivers/char/svm.c index c877c75fdcd5f..000b9ad01c350 100644 --- a/drivers/char/svm.c +++ b/drivers/char/svm.c @@ -135,14 +135,11 @@ struct meminfo { struct svm_mpam { #define SVM_GET_DEV_MPAM (1 << 0) #define SVM_SET_DEV_MPAM (1 << 1) -#define SVM_GET_USER_MPAM_EN (1 << 2) -#define SVM_SET_USER_MPAM_EN (1 << 3) int flags; int pasid; int partid; int pmg; int s1mpam; - int user_mpam_en; }; struct phymeminfo { @@ -1505,14 +1502,6 @@ static int svm_get_core_mpam(struct device *dev, void *data) } } - if (mpam->flags & SVM_GET_USER_MPAM_EN) { - err = arm_smmu_get_dev_user_mpam_en(dev, &mpam->user_mpam_en); - if (err) { - dev_err(dev, "set user_mpam_en failed, %d\n", err); - return err; - } - } - return err; } @@ -1554,14 +1543,6 @@ static int svm_set_core_mpam(struct device *dev, void *data) } } - if (mpam->flags & SVM_SET_USER_MPAM_EN) { - err = arm_smmu_set_dev_user_mpam_en(dev, mpam->user_mpam_en); - if (err) { - dev_err(dev, "set user_mpam_en failed, %d\n", err); - return err; - } - } - return 0; } @@ -1655,51 +1636,6 @@ int svm_get_mpam(int pasid, int *partid, int *pmg, int *s1mpam) } EXPORT_SYMBOL_GPL(svm_get_mpam); -/** - * svm_set_user_mpam_en() - set user_mpam_en - * @user_mpam_en: 0 for smmu mpam, 1 for user mpam - */ -int svm_set_user_mpam_en(int user_mpam_en) -{ - int err; - struct svm_mpam mpam, old_mpam; - - old_mpam.flags = SVM_GET_USER_MPAM_EN; - err = __svm_get_mpam(&old_mpam); - - mpam.flags = SVM_SET_USER_MPAM_EN, - mpam.user_mpam_en = user_mpam_en, - err = __svm_set_mpam(&mpam); - if (err) - goto rollback; - - return 0; - -rollback: - __svm_set_mpam(&mpam); - return err; -} -EXPORT_SYMBOL_GPL(svm_set_user_mpam_en); - -/** - * svm_set_user_mpam_en() - set user_mpam_en - * @user_mpam_en: pointer to user_mpam_en - */ -int svm_get_user_mpam_en(int *user_mpam_en) -{ - int err; - struct svm_mpam mpam; - - mpam.flags = SVM_GET_USER_MPAM_EN; - err = __svm_get_mpam(&mpam); - if (err) - return err; - - *user_mpam_en = mpam.user_mpam_en; - return 0; -} -EXPORT_SYMBOL_GPL(svm_get_user_mpam_en); - static int svm_set_rc(unsigned long __user *arg) { unsigned long addr, size, rc; diff --git a/include/linux/ascend_smmu.h b/include/linux/ascend_smmu.h index 32241a02a8a89..e570acfc8f6ac 100644 --- a/include/linux/ascend_smmu.h +++ b/include/linux/ascend_smmu.h @@ -15,7 +15,4 @@ extern int arm_smmu_get_dev_user_mpam_en(struct device *dev, int *user_mpam_en); extern int svm_get_mpam(int pasid, int *partid, int *pmg, int *s1mpam); extern int svm_set_mpam(int pasid, int partid, int pmg, int s1mpam); -extern int svm_set_user_mpam_en(int user_mpam_en); -extern int svm_get_user_mpam_en(int *user_mpam_en); - #endif /* __LINUX_ASCEND_SMMU_H */ -- 2.25.1

1 2

[PATCH openEuler-1.0-LTS 1/7] cgroup: Use open-time credentials for process migraton perm checks
by Yang Yingliang 17 Jan '22

17 Jan '22

From: Tejun Heo <tj(a)kernel.org> mainline inclusion from mainline-v5.16-9 commit 1756d7994ad85c2479af6ae5a9750b92324685af category: bugfix bugzilla: NA CVE: CVE-2021-4197 --------------------------------------------------- cgroup process migration permission checks are performed at write time as whether a given operation is allowed or not is dependent on the content of the write - the PID. This currently uses current's credentials which is a potential security weakness as it may allow scenarios where a less privileged process tricks a more privileged one into writing into a fd that it created. This patch makes both cgroup2 and cgroup1 process migration interfaces to use the credentials saved at the time of open (file->f_cred) instead of current's. Reported-by: "Eric W. Biederman" <ebiederm(a)xmission.com> Suggested-by: Linus Torvalds <torvalds(a)linuxfoundation.org> Fixes: 187fe84067bd ("cgroup: require write perm on common ancestor when moving processes on the default hierarchy") Reviewed-by: Michal Koutný <mkoutny(a)suse.com> Signed-off-by: Tejun Heo <tj(a)kernel.org> Conflicts: kernel/cgroup/cgroup.c Signed-off-by: Lu Jialin <lujialin4(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/cgroup/cgroup-v1.c | 7 ++++--- kernel/cgroup/cgroup.c | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index 055063c9c2a38..7a3ea4d6b54cf 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c @@ -535,10 +535,11 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, goto out_unlock; /* - * Even if we're attaching all tasks in the thread group, we only - * need to check permissions on one of them. + * Even if we're attaching all tasks in the thread group, we only need + * to check permissions on one of them. Check permissions using the + * credentials from file open to protect against inherited fd attacks. */ - cred = current_cred(); + cred = of->file->f_cred; tcred = get_task_cred(task); if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) && !uid_eq(cred->euid, tcred->uid) && diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 6f4dcdd6f77b2..49e8bf7ee9c73 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -4490,6 +4490,7 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of, { struct cgroup *src_cgrp, *dst_cgrp; struct task_struct *task; + const struct cred *saved_cred; ssize_t ret; dst_cgrp = cgroup_kn_lock_live(of->kn, false); @@ -4506,8 +4507,16 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of, src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root); spin_unlock_irq(&css_set_lock); + /* + * Process and thread migrations follow same delegation rule. Check + * permissions using the credentials from file open to protect against + * inherited fd attacks. + */ + + saved_cred = override_creds(of->file->f_cred); ret = cgroup_procs_write_permission(src_cgrp, dst_cgrp, of->file->f_path.dentry->d_sb); + revert_creds(saved_cred); if (ret) goto out_finish; @@ -4531,6 +4540,7 @@ static ssize_t cgroup_threads_write(struct kernfs_open_file *of, { struct cgroup *src_cgrp, *dst_cgrp; struct task_struct *task; + const struct cred *saved_cred; ssize_t ret; buf = strstrip(buf); @@ -4549,9 +4559,16 @@ static ssize_t cgroup_threads_write(struct kernfs_open_file *of, src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root); spin_unlock_irq(&css_set_lock); - /* thread migrations follow the cgroup.procs delegation rule */ + /* + * Process and thread migrations follow same delegation rule. Check + * permissions using the credentials from file open to protect against + * inherited fd attacks. + */ + + saved_cred = override_creds(of->file->f_cred); ret = cgroup_procs_write_permission(src_cgrp, dst_cgrp, of->file->f_path.dentry->d_sb); + revert_creds(saved_cred); if (ret) goto out_finish; -- 2.25.1

1 6

[PATCH openEuler-5.10 1/2] x86: hugepage: use nt copy hugepage to AEP in x86
by Zheng Zengkai 15 Jan '22

15 Jan '22

From: Kemeng Shi <shikemeng(a)huawei.com> euleros inclusion category: feature feature: etmem bugzilla: https://gitee.com/openeuler/kernel/issues/I4OODH?from=project-issue CVE: NA ------------------------------------------------- Add proc/sys/vm/hugepage_nocache_copy switch. Set 1 to copy hugepage with movnt SSE instructoin if cpu support it. Set 0 to copy hugepage as usual. Signed-off-by: Kemeng Shi <shikemeng(a)huawei.com> Reviewed-by: louhongxiang <louhongxiang(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- arch/x86/include/asm/page_64.h | 6 ++ arch/x86/lib/Makefile | 1 + arch/x86/lib/copy_highpages.c | 105 +++++++++++++++++++++++++++++++++ arch/x86/lib/copy_page_64.S | 73 +++++++++++++++++++++++ include/linux/highmem.h | 14 +++++ mm/migrate.c | 6 +- 6 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 arch/x86/lib/copy_highpages.c diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index 939b1cff4a7b..d9fbc486728a 100644 --- a/arch/x86/include/asm/page_64.h +++ b/arch/x86/include/asm/page_64.h @@ -56,6 +56,12 @@ static inline void clear_page(void *page) void copy_page(void *to, void *from); +void copy_page_nocache(void *to, void *from); +void copy_page_nocache_barrir(void); + +struct page; +#define __HAVE_ARCH_COPY_HUGEPAGES 1 +void copy_highpages(struct page *to, struct page *from, int nr_pages); #endif /* !__ASSEMBLY__ */ #ifdef CONFIG_X86_VSYSCALL_EMULATION diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index bad4dee4f0e4..ab0d91b808be 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -70,4 +70,5 @@ else lib-y += memmove_64.o memset_64.o lib-y += copy_user_64.o lib-y += cmpxchg16b_emu.o + lib-y += copy_highpages.o endif diff --git a/arch/x86/lib/copy_highpages.c b/arch/x86/lib/copy_highpages.c new file mode 100644 index 000000000000..ed95b8a7b906 --- /dev/null +++ b/arch/x86/lib/copy_highpages.c @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * accelerate copying page to pmem with non-temproal stroes + */ +#include <linux/sched.h> +#include <linux/mmzone.h> +#include <linux/highmem.h> +#include <linux/sysctl.h> + +DEFINE_STATIC_KEY_FALSE(hugepage_nocache_copy); +#ifdef CONFIG_SYSCTL +static void set_hugepage_nocache_copy(bool enabled) +{ + if (enabled) + static_branch_enable(&hugepage_nocache_copy); + else + static_branch_disable(&hugepage_nocache_copy); +} + +int sysctl_hugepage_nocache_copy(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + struct ctl_table t; + int err; + int state; + + if (write && !capable(CAP_SYS_ADMIN)) + return -EPERM; + + state = static_branch_unlikely(&hugepage_nocache_copy); + t = *table; + t.data = &state; + err = proc_dointvec_minmax(&t, write, buffer, lenp, ppos); + if (err < 0) + return err; + if (write) + set_hugepage_nocache_copy(state); + return err; +} + +static struct ctl_table copy_highpages_table[] = { + { + .procname = "hugepage_nocache_copy", + .data = NULL, + .maxlen = sizeof(unsigned int), + .mode = 0600, + .proc_handler = sysctl_hugepage_nocache_copy, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, + {} +}; + +static struct ctl_table copy_highpages_root_table[] = { + { + .procname = "vm", + .mode = 0555, + .child = copy_highpages_table, + }, + {} +}; + +static __init int copy_highpages_init(void) +{ + return register_sysctl_table(copy_highpages_root_table) ? 0 : -ENOMEM; +} +__initcall(copy_highpages_init); +#endif + +static void copy_highpages_nocache(struct page *to, struct page *from, int nr_pages) +{ + char *vfrom, *vto; + int i; + + for (i = 0; i < nr_pages; i++) { + cond_resched(); + vfrom = kmap_atomic(from); + vto = kmap_atomic(to); + copy_page_nocache(vto, vfrom); + kunmap_atomic(vto); + kunmap_atomic(vfrom); + to++; + from++; + } + copy_page_nocache_barrir(); +} + +static void copy_highpages_cache(struct page *to, struct page *from, int nr_pages) +{ + int i; + + for (i = 0; i < nr_pages; i++) { + cond_resched(); + copy_highpage(to + i, from + i); + } +} + +void copy_highpages(struct page *to, struct page *from, int nr_pages) +{ + if (static_branch_unlikely(&hugepage_nocache_copy) && + get_node_type(page_to_nid(to)) == NODE_TYPE_PMEM) + return copy_highpages_nocache(to, from, nr_pages); + + return copy_highpages_cache(to, from, nr_pages); +} diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S index 2402d4c489d2..16ca196d349b 100644 --- a/arch/x86/lib/copy_page_64.S +++ b/arch/x86/lib/copy_page_64.S @@ -87,3 +87,76 @@ SYM_FUNC_START_LOCAL(copy_page_regs) addq $2*8, %rsp ret SYM_FUNC_END(copy_page_regs) + +SYM_FUNC_START(copy_page_nocache) + ALTERNATIVE "jmp copy_page", "", X86_FEATURE_XMM2 + subq $2*8, %rsp + movq %rbx, (%rsp) + movq %r12, 1*8(%rsp) + + movl $(4096/64)-5, %ecx + .p2align 4 +.LoopNT64: + dec %rcx + movq 0x8*0(%rsi), %rax + movq 0x8*1(%rsi), %rbx + movq 0x8*2(%rsi), %rdx + movq 0x8*3(%rsi), %r8 + movq 0x8*4(%rsi), %r9 + movq 0x8*5(%rsi), %r10 + movq 0x8*6(%rsi), %r11 + movq 0x8*7(%rsi), %r12 + + prefetcht0 5*64(%rsi) + + movnti %rax, 0x8*0(%rdi) + movnti %rbx, 0x8*1(%rdi) + movnti %rdx, 0x8*2(%rdi) + movnti %r8, 0x8*3(%rdi) + movnti %r9, 0x8*4(%rdi) + movnti %r10, 0x8*5(%rdi) + movnti %r11, 0x8*6(%rdi) + movnti %r12, 0x8*7(%rdi) + + leaq 64 (%rsi), %rsi + leaq 64 (%rdi), %rdi + + jnz .LoopNT64 + + movl $5, %ecx + .p2align 4 +.LoopNT2: + decl %ecx + + movq 0x8*0(%rsi), %rax + movq 0x8*1(%rsi), %rbx + movq 0x8*2(%rsi), %rdx + movq 0x8*3(%rsi), %r8 + movq 0x8*4(%rsi), %r9 + movq 0x8*5(%rsi), %r10 + movq 0x8*6(%rsi), %r11 + movq 0x8*7(%rsi), %r12 + + movnti %rax, 0x8*0(%rdi) + movnti %rbx, 0x8*1(%rdi) + movnti %rdx, 0x8*2(%rdi) + movnti %r8, 0x8*3(%rdi) + movnti %r9, 0x8*4(%rdi) + movnti %r10, 0x8*5(%rdi) + movnti %r11, 0x8*6(%rdi) + movnti %r12, 0x8*7(%rdi) + + leaq 64(%rdi), %rdi + leaq 64(%rsi), %rsi + jnz .LoopNT2 + + movq (%rsp), %rbx + movq 1*8(%rsp), %r12 + addq $2*8, %rsp + ret +SYM_FUNC_END(copy_page_nocache) + +SYM_FUNC_START(copy_page_nocache_barrir) + ALTERNATIVE "", "sfence", X86_FEATURE_XMM2 + ret +SYM_FUNC_END(copy_page_nocache_barrir) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 8e21fe82b3a3..6b27af8fe624 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -356,4 +356,18 @@ static inline void copy_highpage(struct page *to, struct page *from) #endif +#ifndef __HAVE_ARCH_COPY_HUGEPAGES + +static inline void copy_highpages(struct page *to, struct page *from, int nr_pages) +{ + int i; + + for (i = 0; i < nr_pages; i++) { + cond_resched(); + copy_highpage(to + i, from + i); + } +} + +#endif /* __HAVE_ARCH_COPY_HUGEPAGES */ + #endif /* _LINUX_HIGHMEM_H */ diff --git a/mm/migrate.c b/mm/migrate.c index 8a57a09ad665..14c4db23b3ed 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -578,7 +578,6 @@ static void __copy_gigantic_page(struct page *dst, struct page *src, static void copy_huge_page(struct page *dst, struct page *src) { - int i; int nr_pages; if (PageHuge(src)) { @@ -596,10 +595,7 @@ static void copy_huge_page(struct page *dst, struct page *src) nr_pages = thp_nr_pages(src); } - for (i = 0; i < nr_pages; i++) { - cond_resched(); - copy_highpage(dst + i, src + i); - } + copy_highpages(dst, src, nr_pages); } /* -- 2.20.1

1 1

[PATCH OLK-5.10] Add Intel SGX hardware bits
by zhangyue 15 Jan '22

15 Jan '22

mainline inclusion category: feature bugzilla:https://gitee.com/openeuler/kernel/issues/I4CMMB?from=project-issue CVE: NA Populate X86_FEATURE_SGX feature from CPUID and tie it to the Kconfig option with disabled-features.h. IA32_FEATURE_CONTROL.SGX_ENABLE must be examined in addition to the CPUID bits to enable full SGX support. The BIOS must both set this bit and lock IA32_FEATURE_CONTROL for SGX to be supported (Intel SDM section 36.7.1). The setting or clearing of this bit has no impact on the CPUID bits above, which is why it needs to be detected separately. Signed-off-by: Sean Christopherson <sean.j.christopherson(a)intel.com> Co-developed-by: Jarkko Sakkinen <jarkko(a)kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org> Signed-off-by: Borislav Petkov <bp(a)suse.de> Acked-by: Jethro Beekman <jethro(a)fortanix.com> Signed-off-by: zhangyue <zhangyue1(a)kylinos.cn> --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/disabled-features.h | 8 +++++++- arch/x86/include/asm/msr-index.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index dad350d42ecf..1181f5c7bbef 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -241,6 +241,7 @@ /* Intel-defined CPU features, CPUID level 0x00000007:0 (EBX), word 9 */ #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/ #define X86_FEATURE_TSC_ADJUST ( 9*32+ 1) /* TSC adjustment MSR 0x3B */ +#define X86_FEATURE_SGX ( 9*32+ 2) /* Software Guard Extensions */ #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */ #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */ #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */ diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index 09db5b8f1444..24d66717c642 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -59,6 +59,12 @@ /* Force disable because it's broken beyond repair */ #define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) +#ifdef CONFIG_X86_SGX +#define DISABLE_SGX 0 +#else +#define DISABLE_SGX (1 << (X86_FEATURE_SGX & 31)) +#endif + /* * Make sure to add features to the correct mask */ @@ -71,7 +77,7 @@ #define DISABLED_MASK6 0 #define DISABLED_MASK7 (DISABLE_PTI) #define DISABLED_MASK8 0 -#define DISABLED_MASK9 (DISABLE_SMAP) +#define DISABLED_MASK9 (DISABLE_SMAP|DISABLE_SGX) #define DISABLED_MASK10 0 #define DISABLED_MASK11 0 #define DISABLED_MASK12 0 diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 972a34d93505..258d555d22f2 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -609,6 +609,7 @@ #define FEAT_CTL_LOCKED BIT(0) #define FEAT_CTL_VMX_ENABLED_INSIDE_SMX BIT(1) #define FEAT_CTL_VMX_ENABLED_OUTSIDE_SMX BIT(2) +#define FEAT_CTL_SGX_ENABLED BIT(18) #define FEAT_CTL_LMCE_ENABLED BIT(20) #define MSR_IA32_TSC_ADJUST 0x0000003b -- 2.30.0

2 1

[PATCH OLK-5.10] x86/config: enable btrfs feature
by Jiao Fenfang 15 Jan '22

15 Jan '22

From: JiaoFenfang <jiaofenfang(a)uniontech.com> openEuler inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4KVP7?from=project-issue Signed-off-by: Jiao Fenfang <jiaofenfang(a)uniontech.com> --- arch/x86/configs/openeuler_defconfig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 7b608301823c..01a902eba3b9 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -7451,7 +7451,13 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_DLM=y # CONFIG_OCFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=m +# CONFIG_BTRFS_FS_POSIX_ACL is not set +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +# CONFIG_BTRFS_FS_REF_VERIFY is not set # CONFIG_NILFS2_FS is not set # CONFIG_F2FS_FS is not set # CONFIG_ZONEFS_FS is not set -- 2.20.1

2 1

[PATCH openEuler-5.10 00/92] Backport 5.10.88 LTS
by Zheng Zengkai 14 Jan '22

14 Jan '22

Backport 5.10.88 LTS patches from upstream. Alex Bee (1): arm64: dts: rockchip: fix audio-supply for Rock Pi 4 Alyssa Ross (1): dmaengine: st_fdma: fix MODULE_ALIAS Amelie Delaunay (1): usb: dwc2: fix STM ID/VBUS detection startup delay in dwc2_driver_probe Artem Lapkin (1): arm64: dts: rockchip: remove mmc-hs400-enhanced-strobe from rk3399-khadas-edge Baowen Zheng (1): flow_offload: return EOPNOTSUPP for the unsupported mpls action type Cyril Novikov (1): ixgbe: set X550 MDIO speed before talking to PHY D. Wythe (1): net/smc: Prevent smc_release() from long blocking Dan Carpenter (2): vdpa: check that offsets are within bounds tee: amdtee: fix an IS_ERR() vs NULL bug Daniel Borkmann (3): bpf: Fix signed bounds propagation after mov32 bpf: Make 32->64 bounds propagation slightly more robust bpf, selftests: Add test case trying to taint map value pointer Daniele Palmas (1): USB: serial: option: add Telit FN990 compositions David Ahern (3): selftests: Add duplicate config only for MD5 VRF tests selftests: Fix raw socket bind tests with VRF selftests: Fix IPv6 address bind tests Davide Caratti (1): net/sched: sch_ets: don't remove idle classes from the round-robin list Dinh Nguyen (1): ARM: socfpga: dts: fix qspi node compatible Eric Dumazet (3): sch_cake: do not call cake_destroy() from cake_init() inet_diag: fix kernel-infoleak for UDP sockets sit: do not call ipip6_dev_free() from sit_init_net() Fabio Estevam (2): arm64: dts: imx8mp-evk: Improve the Ethernet PHY description ARM: dts: imx6ull-pinfunc: Fix CSI_DATA07__ESAI_TX0 pad name Felix Fietkau (2): mac80211: fix regression in SSN handling of addba tx mac80211: send ADDBA requests using the tid/queue of the aggregation session Filipe Manana (1): btrfs: fix double free of anon_dev after failure to create subvolume Florian Fainelli (1): net: systemport: Add global locking for descriptor lifecycle Florian Westphal (1): mptcp: clear 'kern' flag from fallback sockets Gal Pressman (1): net: Fix double 0x prefix print in SKB dump George Kennedy (4): libata: if T_LENGTH is zero, dma direction should be DMA_NONE scsi: scsi_debug: Don't call kcalloc() if size arg is zero scsi: scsi_debug: Fix type in min_t to avoid stack OOB scsi: scsi_debug: Sanity check block descriptor length in resp_mode_select() Greg Kroah-Hartman (1): Revert "usb: early: convert to readl_poll_timeout_atomic()" Hangbin Liu (1): selftest/net/forwarding: declare NETIFS p9 p10 Hu Weiwen (1): ceph: fix duplicate increment of opened_inodes metric Jerome Marchand (1): recordmcount.pl: look for jgnop instruction as well as bcrl on s390 Ji-Ze Hong (Peter Hong) (1): serial: 8250_fintek: Fix garbled text for console Jianglei Nie (1): btrfs: fix memory leak in __add_inode_ref() Jiasheng Jiang (2): drm/ast: potential dereference of null pointer sfc_ef100: potential dereference of null pointer Jie Wang (1): net: hns3: fix use-after-free bug in hclgevf_send_mbx_msg Jie2x Zhou (1): selftests: net: Correct ping6 expected rc from 2 to 1 Jimmy Wang (1): USB: NO_LPM quirk Lenovo USB-C to Ethernet Adapher(RTL8153-04) Joakim Zhang (1): arm64: dts: imx8m: correct assigned clocks for FEC Joe Thornber (1): dm btree remove: fix use after free in rebalance_children() Johan Hovold (1): USB: serial: cp210x: fix CP2105 GPIO registration Johannes Berg (5): mac80211: mark TX-during-stop for TX in in_reconfig mac80211: validate extended element ID is present mac80211: track only QoS data frames for admission control mac80211: agg-tx: don't schedule_and_wake_txq() under sta->lock mac80211: fix lookup when adding AddBA extension element John Keeping (2): arm64: dts: rockchip: fix rk3308-roc-cc vcc-sd supply arm64: dts: rockchip: fix rk3399-leez-p710 vcc3v3-lan supply Juergen Gross (5): xen/blkfront: harden blkfront against event channel storms xen/netfront: harden netfront against event channel storms xen/console: harden hvc_xen against event channel storms xen/netback: fix rx queue stall detection xen/netback: don't queue unlimited number of packages Karen Sornek (1): igb: Fix removal of unicast MAC filters of VFs Lang Yu (1): drm/amd/pm: fix a potential gpu_metrics_table memory leak Le Ma (1): drm/amdgpu: correct register access for RLC_JUMP_TABLE_RESTORE Letu Ren (1): igbvf: fix double free in `igbvf_probe` Magnus Karlsson (2): xsk: Do not sleep in poll() when need_wakeup set Revert "xsk: Do not sleep in poll() when need_wakeup set" Martin KaFai Lau (1): bpf, selftests: Fix racing issue in btf_skc_cls_ingress test Mike Tipton (1): clk: Don't parent clks until the parent is fully registered Miklos Szeredi (2): fuse: annotate lock in fuse_reverse_inval_entry() ovl: fix warning in ovl_create_real() Naohiro Aota (1): zonefs: add MODULE_ALIAS_FS Nathan Chancellor (2): soc/tegra: fuse: Fix bitwise vs. logical OR warning Input: touchscreen - avoid bitwise vs logical OR warning Nehal Bakulchandra Shah (1): usb: xhci: Extend support for runtime power management for AMD's Yellow carp. Paolo Bonzini (1): KVM: downgrade two BUG_ONs to WARN_ON_ONCE Paul E. McKenney (1): rcu: Mark accesses to rcu_state.n_force_qs Pavel Skripkin (1): media: mxl111sf: change mutex_init() location Philipp Rudo (1): s390/kexec_file: fix error handling when applying relocations Robert Schlabbach (1): ixgbe: Document how to enable NBASE-T support Sasha Neftin (1): igc: Fix typo in i225 LTR functions Stefan Roese (1): PCI/MSI: Mask MSI-X vectors only on success Stephan Gerhold (1): soc: imx: Register SoC device only on i.MX boards Sudeep Holla (1): firmware: arm_scpi: Fix string overflow in SCPI genpd driver Tejun Heo (1): iocost: Fix divide-by-zero on donation from low hweight cgroup Tetsuo Handa (1): tty: n_hdlc: make n_hdlc_tty_wakeup() asynchronous Thomas Gleixner (1): PCI/MSI: Clear PCI_MSIX_FLAGS_MASKALL on error Tony Lindgren (1): bus: ti-sysc: Fix variable set but not used warning for reinit_modules Vitaly Kuznetsov (2): KVM: selftests: Make sure kvm_create_max_vcpus test won't hit RLIMIT_NOFILE KVM: x86: Drop guest CPUID check for host initiated writes to MSR_IA32_PERF_CAPABILITIES Wei Wang (1): virtio/vsock: fix the transport to work with VMADDR_CID_ANY Will Deacon (1): virtio_ring: Fix querying of maximum DMA mapping size for virtio device Willem de Bruijn (1): net/packet: rx_owner_map depends on pg_vec Xiubo Li (1): ceph: initialize pathlen variable in reconnect_caps_cb .../device_drivers/ethernet/intel/ixgbe.rst | 16 +++ arch/arm/boot/dts/imx6ull-pinfunc.h | 2 +- .../boot/dts/socfpga_arria10_socdk_qspi.dts | 2 +- arch/arm/boot/dts/socfpga_arria5_socdk.dts | 2 +- arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 2 +- arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 2 +- .../boot/dts/socfpga_cyclone5_socrates.dts | 2 +- arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 2 +- .../boot/dts/socfpga_cyclone5_vining_fpga.dts | 4 +- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 7 +- arch/arm64/boot/dts/freescale/imx8mn.dtsi | 7 +- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 2 + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 7 +- .../arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 2 +- .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 1 - .../boot/dts/rockchip/rk3399-leez-p710.dts | 2 +- .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 2 +- arch/s390/kernel/machine_kexec_file.c | 7 +- arch/x86/kvm/x86.c | 2 +- block/blk-iocost.c | 9 +- drivers/ata/libata-scsi.c | 15 ++- drivers/block/xen-blkfront.c | 15 ++- drivers/bus/ti-sysc.c | 3 +- drivers/clk/clk.c | 15 ++- drivers/dma/st_fdma.c | 2 +- drivers/firmware/scpi_pm_domain.c | 10 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- .../gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 + drivers/gpu/drm/ast/ast_mode.c | 5 +- drivers/input/touchscreen/of_touchscreen.c | 42 +++--- drivers/md/persistent-data/dm-btree-remove.c | 2 +- drivers/media/usb/dvb-usb-v2/mxl111sf.c | 16 ++- drivers/net/ethernet/broadcom/bcmsysport.c | 5 +- drivers/net/ethernet/broadcom/bcmsysport.h | 1 + .../hisilicon/hns3/hns3vf/hclgevf_mbx.c | 3 +- drivers/net/ethernet/intel/igb/igb_main.c | 28 ++-- drivers/net/ethernet/intel/igbvf/netdev.c | 1 + drivers/net/ethernet/intel/igc/igc_i225.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 + drivers/net/ethernet/sfc/ef100_nic.c | 3 + drivers/net/xen-netback/common.h | 1 + drivers/net/xen-netback/rx.c | 77 +++++++---- drivers/net/xen-netfront.c | 125 +++++++++++++----- drivers/pci/msi.c | 15 ++- drivers/scsi/scsi_debug.c | 42 +++--- drivers/soc/imx/soc-imx.c | 4 + drivers/soc/tegra/fuse/fuse-tegra.c | 2 +- drivers/soc/tegra/fuse/fuse.h | 2 +- drivers/tee/amdtee/core.c | 5 +- drivers/tty/hvc/hvc_xen.c | 30 ++++- drivers/tty/n_hdlc.c | 23 +++- drivers/tty/serial/8250/8250_fintek.c | 20 --- drivers/usb/core/quirks.c | 3 + drivers/usb/dwc2/platform.c | 3 + drivers/usb/early/xhci-dbc.c | 15 ++- drivers/usb/host/xhci-pci.c | 6 +- drivers/usb/serial/cp210x.c | 6 +- drivers/usb/serial/option.c | 8 ++ drivers/vhost/vdpa.c | 2 +- drivers/virtio/virtio_ring.c | 2 +- fs/btrfs/disk-io.c | 8 ++ fs/btrfs/tree-log.c | 1 + fs/ceph/caps.c | 16 +-- fs/ceph/mds_client.c | 3 +- fs/fuse/dir.c | 2 +- fs/overlayfs/dir.c | 3 +- fs/overlayfs/overlayfs.h | 1 + fs/overlayfs/super.c | 12 +- fs/zonefs/super.c | 1 + kernel/bpf/verifier.c | 28 ++-- kernel/rcu/tree.c | 10 +- net/core/skbuff.c | 2 +- net/ipv4/inet_diag.c | 4 +- net/ipv6/sit.c | 1 - net/mac80211/agg-rx.c | 5 +- net/mac80211/agg-tx.c | 16 ++- net/mac80211/driver-ops.h | 5 +- net/mac80211/mlme.c | 13 +- net/mac80211/sta_info.h | 1 + net/mac80211/util.c | 7 +- net/mptcp/protocol.c | 4 +- net/packet/af_packet.c | 5 +- net/sched/cls_api.c | 1 + net/sched/sch_cake.c | 6 +- net/sched/sch_ets.c | 4 +- net/smc/af_smc.c | 4 +- net/vmw_vsock/virtio_transport_common.c | 3 +- scripts/recordmcount.pl | 2 +- .../bpf/prog_tests/btf_skc_cls_ingress.c | 16 ++- .../selftests/bpf/verifier/value_ptr_arith.c | 23 ++++ .../selftests/kvm/kvm_create_max_vcpus.c | 30 +++++ tools/testing/selftests/net/fcnal-test.sh | 49 +++++-- .../net/forwarding/forwarding.config.sample | 2 + virt/kvm/kvm_main.c | 6 +- 95 files changed, 670 insertions(+), 279 deletions(-) -- 2.20.1

1 92

[PATCH openEuler-5.10 00/32] Backport 5.10.87 LTS
by Zheng Zengkai 14 Jan '22

14 Jan '22

Backport 5.10.87 LTS patches from upstream. Adrian Hunter (8): perf inject: Fix itrace space allowed for new attributes perf intel-pt: Fix some PGE (packet generation enable/control flow packets) usage perf intel-pt: Fix sync state when a PSB (synchronization) packet is found perf intel-pt: Fix intel_pt_fup_event() assumptions about setting state type perf intel-pt: Fix state setting when receiving overflow (OVF) packet perf intel-pt: Fix next 'err' value, walking trace perf intel-pt: Fix missing 'instruction' events with 'q' option perf intel-pt: Fix error timestamp setting on the decoder error path Alexander Stein (1): Revert "tty: serial: fsl_lpuart: drop earlycon entry for i.MX8QXP" Antoine Tenart (1): ethtool: do not perform operations on net devices being unregistered Armin Wolf (1): hwmon: (dell-smm) Fix warning on /proc/i8k creation error Bui Quang Minh (1): bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc Chen Jun (1): tracing: Fix a kmemleak false positive in tracing_map Erik Ekman (1): net/mlx4_en: Update reported link modes for 1/10G Harshit Mogalapalli (1): net: netlink: af_netlink: Prevent empty skb by adding a check on len. Helge Deller (1): parisc/agp: Annotate parisc agp init functions with __init Ilie Halip (1): s390/test_unwind: use raw opcode instead of invalid instruction Kai Vehmanen (2): ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid ALSA: hda/hdmi: fix HDA codec entry table order for ADL-P Marc Zyngier (1): KVM: arm64: Save PSTATE early on exit Mike Rapoport (4): memblock: free_unused_memmap: use pageblock units instead of MAX_ORDER memblock: align freed memory map on pageblock boundaries with SPARSEMEM arm: extend pfn_valid to take into account freed memory map alignment arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM Miklos Szeredi (1): fuse: make sure reclaim doesn't write the inode Mustapha Ghaddar (1): drm/amd/display: Fix for the no Audio bug with Tiled Displays Nikita Yushchenko (1): staging: most: dim2: use device release method Ondrej Jirman (1): i2c: rk3x: Handle a spurious start completion interrupt flag Perry Yuan (1): drm/amd/display: add connector type check for CRC source set Philip Chen (1): drm/msm/dsi: set default num_data_lanes Sean Christopherson (1): KVM: x86: Ignore sparse banks size for an "all CPUs", non-sparse IPI req Tadeusz Struk (1): nfc: fix segfault in nfc_genl_dump_devices_done arch/arm/mm/init.c | 37 ++++++--- arch/arm/mm/ioremap.c | 4 +- arch/arm64/kvm/hyp/include/hyp/switch.h | 6 ++ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 7 +- arch/s390/lib/test_unwind.c | 5 +- arch/x86/kvm/hyperv.c | 7 +- drivers/char/agp/parisc-agp.c | 6 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 8 ++ .../gpu/drm/amd/display/dc/core/dc_resource.c | 4 + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 + drivers/hwmon/dell-smm-hwmon.c | 7 +- drivers/i2c/busses/i2c-rk3x.c | 4 +- .../net/ethernet/mellanox/mlx4/en_ethtool.c | 6 +- drivers/staging/most/dim2/dim2.c | 55 ++++++------ drivers/tty/serial/fsl_lpuart.c | 1 + fs/fuse/dir.c | 8 ++ fs/fuse/file.c | 15 ++++ fs/fuse/fuse_i.h | 1 + fs/fuse/inode.c | 3 + kernel/bpf/devmap.c | 4 +- kernel/trace/tracing_map.c | 3 + net/core/sock_map.c | 2 +- net/ethtool/netlink.h | 3 + net/netlink/af_netlink.c | 5 ++ net/nfc/netlink.c | 6 +- sound/pci/hda/hda_intel.c | 12 ++- sound/pci/hda/patch_hdmi.c | 3 +- tools/perf/builtin-inject.c | 2 +- .../util/intel-pt-decoder/intel-pt-decoder.c | 83 ++++++++++++------- tools/perf/util/intel-pt.c | 1 + 30 files changed, 220 insertions(+), 90 deletions(-) -- 2.20.1

1 32

[PATCH openEuler-5.10 1/5] cgroup: cgroup.{procs,threads} factor out common parts
by Zheng Zengkai 14 Jan '22

14 Jan '22

From: Michal Koutný <mkoutny(a)suse.com> mainline inclusion from mainline-v5.12-rc1 commit da70862efe0065bada33d67a903270cdbbaf07d9 bugzilla: 186050 https://gitee.com/openeuler/kernel/issues/I4DDEL CVE: CVE-2021-4197 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- The functions cgroup_threads_write and cgroup_procs_write are almost identical. In order to reduce duplication, factor out the common code in similar fashion we already do for other threadgroup/task functions. No functional changes are intended. Suggested-by: Hao Lee <haolee.swjtu(a)gmail.com> Signed-off-by: Michal Koutný <mkoutny(a)suse.com> Reviewed-by: Daniel Jordan <daniel.m.jordan(a)oracle.com> Signed-off-by: Tejun Heo <tj(a)kernel.org> Signed-off-by: Lu Jialin <lujialin4(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- kernel/cgroup/cgroup.c | 55 +++++++++++------------------------------- 1 file changed, 14 insertions(+), 41 deletions(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 353369a1bc6b..c76dbb03e887 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -4835,8 +4835,8 @@ static int cgroup_attach_permissions(struct cgroup *src_cgrp, return ret; } -static ssize_t cgroup_procs_write(struct kernfs_open_file *of, - char *buf, size_t nbytes, loff_t off) +static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf, + bool threadgroup) { struct cgroup *src_cgrp, *dst_cgrp; struct task_struct *task; @@ -4847,7 +4847,7 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of, if (!dst_cgrp) return -ENODEV; - task = cgroup_procs_write_start(buf, true, &locked); + task = cgroup_procs_write_start(buf, threadgroup, &locked); ret = PTR_ERR_OR_ZERO(task); if (ret) goto out_unlock; @@ -4857,19 +4857,26 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of, src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root); spin_unlock_irq(&css_set_lock); + /* process and thread migrations follow same delegation rule */ ret = cgroup_attach_permissions(src_cgrp, dst_cgrp, - of->file->f_path.dentry->d_sb, true); + of->file->f_path.dentry->d_sb, threadgroup); if (ret) goto out_finish; - ret = cgroup_attach_task(dst_cgrp, task, true); + ret = cgroup_attach_task(dst_cgrp, task, threadgroup); out_finish: cgroup_procs_write_finish(task, locked); out_unlock: cgroup_kn_unlock(of->kn); - return ret ?: nbytes; + return ret; +} + +static ssize_t cgroup_procs_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, loff_t off) +{ + return __cgroup_procs_write(of, buf, true) ?: nbytes; } static void *cgroup_threads_start(struct seq_file *s, loff_t *pos) @@ -4880,41 +4887,7 @@ static void *cgroup_threads_start(struct seq_file *s, loff_t *pos) static ssize_t cgroup_threads_write(struct kernfs_open_file *of, char *buf, size_t nbytes, loff_t off) { - struct cgroup *src_cgrp, *dst_cgrp; - struct task_struct *task; - ssize_t ret; - bool locked; - - buf = strstrip(buf); - - dst_cgrp = cgroup_kn_lock_live(of->kn, false); - if (!dst_cgrp) - return -ENODEV; - - task = cgroup_procs_write_start(buf, false, &locked); - ret = PTR_ERR_OR_ZERO(task); - if (ret) - goto out_unlock; - - /* find the source cgroup */ - spin_lock_irq(&css_set_lock); - src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root); - spin_unlock_irq(&css_set_lock); - - /* thread migrations follow the cgroup.procs delegation rule */ - ret = cgroup_attach_permissions(src_cgrp, dst_cgrp, - of->file->f_path.dentry->d_sb, false); - if (ret) - goto out_finish; - - ret = cgroup_attach_task(dst_cgrp, task, false); - -out_finish: - cgroup_procs_write_finish(task, locked); -out_unlock: - cgroup_kn_unlock(of->kn); - - return ret ?: nbytes; + return __cgroup_procs_write(of, buf, false) ?: nbytes; } /* cgroup core interface files for the default hierarchy */ -- 2.20.1

1 4

[PATCH openEuler-5.10] netfilter: selftest: conntrack_vrf.sh: fix file permission
by Zheng Zengkai 14 Jan '22

14 Jan '22

From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> stable inclusion from stable-v5.10.86 commit 32414491834c80ab39519467deb3f8d1e4f5bade bugzilla: 186045 https://gitee.com/openeuler/kernel/issues/I4QVPD Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- When backporting 33b8aad21ac1 ("selftests: netfilter: add a vrf+conntrack testcase") to this stable branch, the executable bits were not properly set on the tools/testing/selftests/netfilter/conntrack_vrf.sh file due to quilt not honoring them. Fix this up manually by setting the correct mode. Reported-by: "Rantala, Tommi T. (Nokia - FI/Espoo)" <tommi.t.rantala(a)nokia.com> Link: https://lore.kernel.org/r/234d7a6a81664610fdf21ac72730f8bd10d3f46f.camel@no… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- tools/testing/selftests/netfilter/conntrack_vrf.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/testing/selftests/netfilter/conntrack_vrf.sh diff --git a/tools/testing/selftests/netfilter/conntrack_vrf.sh b/tools/testing/selftests/netfilter/conntrack_vrf.sh old mode 100644 new mode 100755 -- 2.20.1

1 0

[PATCH openEuler-5.10 000/131] Backport 5.10.85 LTS
by Zheng Zengkai 14 Jan '22

14 Jan '22

Backport 5.10.85 LTS patches from upstream. Alan Young (1): ALSA: ctl: Fix copy of updated id with element read/write Alexander Stein (1): dt-bindings: net: Reintroduce PHY no lane swap binding Alexander Sverdlin (1): nfsd: Fix nsfd startup race (again) Alyssa Ross (1): iio: trigger: stm32-timer: fix MODULE_ALIAS Andrea Mayer (1): seg6: fix the iif in the IPv6 socket control block Arnaldo Carvalho de Melo (1): tools build: Remove needless libpython-version feature check that breaks test-all fast path Bas Nieuwenhuizen (1): drm/syncobj: Deal with signalled fences in drm_syncobj_find_fence. Benjamin Tissoires (1): HID: bigbenff: prevent null pointer dereference Billy Tsai (1): irqchip/aspeed-scu: Replace update_bits with write_bits. Björn Töpel (1): bpf, x86: Fix "no previous prototype" warning Brian Silverman (1): can: m_can: Disable and ignore ELO interrupt Dan Carpenter (3): can: sja1000: fix use after free in ems_pcmcia_add_card() net: altera: set a couple error code in probe() net/qla3xxx: fix an error code in ql_adapter_up() Davidlohr Bueso (1): block: fix ioprio_get(IOPRIO_WHO_PGRP) vs setuid(2) Dmitry Baryshkov (1): clk: qcom: regmap-mux: fix parent clock lookup Eric Biggers (5): wait: add wake_up_pollfree() binder: use wake_up_pollfree() signalfd: use wake_up_pollfree() aio: keep poll requests on waitqueue until completed aio: fix use-after-free due to missing POLLFREE handling Eric Dumazet (5): bonding: make tx_rebalance_counter an atomic netfilter: conntrack: annotate data-races around ct->timeout devlink: fix netns refcount leak in devlink_nl_cmd_reload() net/sched: fq_pie: prevent dismantle issue net, neigh: clear whole pneigh_entry at alloc time Evgeny Boger (1): iio: adc: axp20x_adc: fix charging current reporting on AXP22x Fabrice Gasnier (1): iio: adc: stm32: fix a current leak by resetting pcsel before disabling vdda Florian Westphal (1): selftests: netfilter: add a vrf+conntrack testcase Greg Kroah-Hartman (7): HID: add hid_is_usb() function to make it simpler for USB detection HID: add USB_HID dependancy to hid-prodikeys HID: add USB_HID dependancy to hid-chicony HID: add USB_HID dependancy on some USB HID drivers HID: wacom: fix problems when device is not a valid USB device HID: check for valid USB device for many HID drivers USB: gadget: zero allocate endpoint 0 buffers Gwendal Grignou (1): iio: at91-sama5d2: Fix incorrect sign extension Hannes Reinecke (1): libata: add horkage for ASMedia 1092 Hans de Goede (1): HID: quirks: Add quirk for the Microsoft Surface 3 type-cover Herve Codina (2): mtd: rawnand: fsmc: Take instruction delay into account mtd: rawnand: fsmc: Fix timing computation Ian Rogers (1): perf tools: Fix SMT detection fast read path Igor Pylypiv (1): scsi: pm80xx: Do not call scsi_remove_host() in pm8001_alloc() J. Bruce Fields (1): nfsd: fix use-after-free due to delegation race James Zhu (3): drm/amdkfd: separate kfd_iommu_resume from kfd_resume drm/amdgpu: add amdgpu_amdkfd_resume_iommu drm/amdgpu: move iommu_resume before ip init/resume Jesse Brandeburg (1): ice: ignore dropped packets during init Jeya R (1): misc: fastrpc: fix improper packet size calculation Jianglei Nie (1): nfp: Fix memory leak in nfp_cpp_area_cache_add() Jianguo Wu (1): udp: using datalen to cap max gso segments Jimmy Assarsson (2): can: kvaser_usb: get CAN clock frequency from device can: kvaser_pciefd: kvaser_pciefd_rx_error_frame(): increase correct stats->{rx,tx}_errors counter Joakim Zhang (1): net: fec: only clear interrupt of handling queue in fec_enet_rx_queue() Josef Bacik (1): btrfs: clear extent buffer uptodate when we fail to write it Kai-Heng Feng (1): xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending Kailang Yang (1): ALSA: hda/realtek - Add headset Mic support for Lenovo ALC897 platform Karen Sornek (1): i40e: Fix failed opcode appearing if handling messages from VF Kelly Devilliv (1): csky: fix typo of fpu config macro Kister Genesis Jimenez (1): iio: gyro: adxrs290: fix data signedness Krzysztof Kozlowski (1): nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done Lang Yu (1): drm/amd/amdkfd: adjust dummy functions' placement Lars-Peter Clausen (8): iio: trigger: Fix reference counting iio: stk3310: Don't return error code in interrupt handler iio: mma8452: Fix trigger reference couting iio: ltr501: Don't return error code in trigger handler iio: kxsd9: Don't return error code in trigger handler iio: itg3200: Call iio_trigger_notify_done() on error iio: dln2: Check return value of devm_iio_trigger_register() iio: ad7768-1: Call iio_trigger_notify_done() on error Lee Jones (1): net: cdc_ncm: Allow for dwNtbOutMaxSize to be unset or zero Louis Amas (1): net: mvpp2: fix XDP rx queues registering Lukas Bulwahn (1): MAINTAINERS: adjust GCC PLUGINS after gcc-plugin.sh removal Manish Chopra (1): qede: validate non LSO skb length Manjong Lee (1): mm: bdi: initialize bdi_min_ratio when bdi is unregistered Marek Behún (1): Revert "PCI: aardvark: Fix support for PCI_ROM_ADDRESS1 on emulated bridge" Markus Hochholdinger (1): md: fix update super 1.0 on rdev size change Masahiro Yamada (3): gcc-plugins: simplify GCC plugin-dev capability test kbuild: simplify GCC_PLUGINS enablement in dummy-tools/gcc doc: gcc-plugins: update gcc-plugins.rst Mateusz Palczewski (1): i40e: Fix pre-set max number of queues for VF Mathias Nyman (1): xhci: avoid race between disable slot command and host runtime suspend Maxim Mikityanskiy (2): bpf: Fix the off-by-two error in range markings bpf: Add selftests to cover packet access corner cases Michal Maloszewski (1): iavf: Fix reporting when setting descriptor count Mike Marciniszyn (4): IB/hfi1: Insure use of smp_processor_id() is preempt disabled IB/hfi1: Fix early init panic IB/hfi1: Fix leak of rcvhdrtail_dummy_kvaddr IB/hfi1: Correct guard on eager buffer deallocation Miles Chen (1): clk: imx: use module_platform_driver Mitch Williams (1): iavf: restore MSI state on reset Nicolas Dichtel (1): vrf: don't run conntrack on vrf with !dflt qdisc Noralf Trønnes (1): iio: dln2-adc: Fix lockdep complaint Norbert Zulinski (1): i40e: Fix NULL pointer dereference in i40e_dbg_dump_desc Pali Rohár (2): irqchip/armada-370-xp: Fix return value of armada_370_xp_msi_alloc() irqchip/armada-370-xp: Fix support for Multi-MSI interrupts Pavel Hofman (2): usb: core: config: fix validation of wMaxPacketValue entries usb: core: config: using bit mask instead of individual bits Peilin Ye (1): selftests/fib_tests: Rework fib_rp_filter_test() Qu Wenruo (1): btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handling Rafael J. Wysocki (1): PM: runtime: Fix pm_runtime_active() kerneldoc comment Rob Clark (1): ASoC: rt5682: Fix crash due to out of scope stack vars Robert Karszniewicz (1): Documentation/Kbuild: Remove references to gcc-plugin.sh Roman Bolshakov (1): scsi: qla2xxx: Format log strings only if needed Sebastian Andrzej Siewior (1): Documentation/locking/locktypes: Update migrate_disable() bits. Shin'ichiro Kawasaki (1): scsi: scsi_debug: Fix buffer size of REPORT ZONES command Srinivas Kandagatla (4): ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer ASoC: codecs: wsa881x: fix return values from kcontrol put ASoC: codecs: wcd934x: handle channel mappping list correctly ASoC: codecs: wcd934x: return correct value from mixer put Stefano Brivio (1): nft_set_pipapo: Fix bucket load in AVX2 lookup routine for six 8-bit groups Steven Rostedt (VMware) (2): tracefs: Have new files inherit the ownership of their parent tracefs: Set all files to the same group ownership as the mount option Takashi Iwai (3): ALSA: pcm: oss: Fix negative period/buffer sizes ALSA: pcm: oss: Limit the period size to 16MB ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*() Thomas Haemmerle (1): usb: gadget: uvc: fix multiple opens Tom Lendacky (1): x86/sme: Explicitly map new EFI memmap table as encrypted Valdis Kletnieks (1): gcc-plugins: fix gcc 11 indigestion with plugins... Vincent Mailhol (1): can: pch_can: pch_can_rx_normal: fix use after free Vitaly Kuznetsov (1): KVM: x86: Wait for IPIs to be delivered when handling Hyper-V TLB flush hypercall Vladimir Murzin (1): irqchip: nvic: Fix offset for Interrupt Priority Offsets Werner Sembach (1): ALSA: hda/realtek: Fix quirk for TongFang PHxTxX1 Wolfram Sang (1): mmc: renesas_sdhi: initialize variable properly when tuning Wudi Wang (1): irqchip/irq-gic-v3-its.c: Force synchronisation when issuing INVALL Yang Yingliang (1): iio: accel: kxcjk-1013: Fix possible memory leak in probe and remove Yangyang Li (2): RDMA/hns: Do not halt commands during reset until later RDMA/hns: Do not destroy QP resources in the hw resetting phase Yifan Zhang (2): drm/amdgpu: init iommu after amdkfd device init drm/amdkfd: fix boot failure when iommu is disabled in Picasso. xiazhengqiao (1): HID: google: add eel USB id .../devicetree/bindings/net/ethernet-phy.yaml | 8 + Documentation/kbuild/gcc-plugins.rst | 47 +- Documentation/locking/locktypes.rst | 9 +- MAINTAINERS | 1 - arch/csky/kernel/traps.c | 4 +- arch/x86/Kconfig | 1 + arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/platform/efi/quirks.c | 3 +- block/ioprio.c | 3 + drivers/android/binder.c | 21 +- drivers/ata/libata-core.c | 2 + drivers/clk/imx/clk-imx8qxp-lpcg.c | 2 +- drivers/clk/imx/clk-imx8qxp.c | 2 +- drivers/clk/qcom/clk-regmap-mux.c | 2 +- drivers/clk/qcom/common.c | 12 + drivers/clk/qcom/common.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 97 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 145 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 15 +- drivers/gpu/drm/drm_syncobj.c | 11 +- drivers/hid/Kconfig | 10 +- drivers/hid/hid-asus.c | 6 +- drivers/hid/hid-bigbenff.c | 2 +- drivers/hid/hid-chicony.c | 8 +- drivers/hid/hid-corsair.c | 7 +- drivers/hid/hid-elan.c | 2 +- drivers/hid/hid-elo.c | 3 + drivers/hid/hid-google-hammer.c | 2 + drivers/hid/hid-holtek-kbd.c | 9 +- drivers/hid/hid-holtek-mouse.c | 9 + drivers/hid/hid-ids.h | 2 + drivers/hid/hid-lg.c | 10 +- drivers/hid/hid-logitech-dj.c | 2 +- drivers/hid/hid-prodikeys.c | 10 +- drivers/hid/hid-quirks.c | 1 + drivers/hid/hid-roccat-arvo.c | 3 + drivers/hid/hid-roccat-isku.c | 3 + drivers/hid/hid-roccat-kone.c | 3 + drivers/hid/hid-roccat-koneplus.c | 3 + drivers/hid/hid-roccat-konepure.c | 3 + drivers/hid/hid-roccat-kovaplus.c | 3 + drivers/hid/hid-roccat-lua.c | 3 + drivers/hid/hid-roccat-pyra.c | 3 + drivers/hid/hid-roccat-ryos.c | 3 + drivers/hid/hid-roccat-savu.c | 3 + drivers/hid/hid-samsung.c | 3 + drivers/hid/hid-u2fzero.c | 2 +- drivers/hid/hid-uclogic-core.c | 3 + drivers/hid/hid-uclogic-params.c | 3 +- drivers/hid/wacom_sys.c | 19 +- drivers/iio/accel/kxcjk-1013.c | 5 +- drivers/iio/accel/kxsd9.c | 6 +- drivers/iio/accel/mma8452.c | 2 +- drivers/iio/adc/ad7768-1.c | 2 +- drivers/iio/adc/at91-sama5d2_adc.c | 3 +- drivers/iio/adc/axp20x_adc.c | 18 +- drivers/iio/adc/dln2-adc.c | 21 +- drivers/iio/adc/stm32-adc.c | 1 + drivers/iio/gyro/adxrs290.c | 5 +- drivers/iio/gyro/itg3200_buffer.c | 2 +- drivers/iio/industrialio-trigger.c | 1 - drivers/iio/light/ltr501.c | 2 +- drivers/iio/light/stk3310.c | 6 +- drivers/iio/trigger/stm32-timer-trigger.c | 2 +- drivers/infiniband/hw/hfi1/chip.c | 2 + drivers/infiniband/hw/hfi1/driver.c | 2 + drivers/infiniband/hw/hfi1/init.c | 40 +- drivers/infiniband/hw/hfi1/sdma.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 14 +- drivers/irqchip/irq-armada-370-xp.c | 16 +- drivers/irqchip/irq-aspeed-scu-ic.c | 4 +- drivers/irqchip/irq-gic-v3-its.c | 2 +- drivers/irqchip/irq-nvic.c | 2 +- drivers/md/md.c | 1 + drivers/misc/fastrpc.c | 10 +- drivers/mmc/host/renesas_sdhi_core.c | 2 +- drivers/mtd/nand/raw/fsmc_nand.c | 36 +- drivers/net/bonding/bond_alb.c | 14 +- drivers/net/can/kvaser_pciefd.c | 8 +- drivers/net/can/m_can/m_can.c | 14 +- drivers/net/can/pch_can.c | 2 +- drivers/net/can/sja1000/ems_pcmcia.c | 7 +- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 101 ++- drivers/net/ethernet/altera/altera_tse_main.c | 9 +- drivers/net/ethernet/freescale/fec.h | 3 + drivers/net/ethernet/freescale/fec_main.c | 2 +- .../net/ethernet/intel/i40e/i40e_debugfs.c | 8 + .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 75 ++- .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 2 + .../net/ethernet/intel/iavf/iavf_ethtool.c | 43 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 1 + drivers/net/ethernet/intel/ice/ice_main.c | 3 + .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +- .../netronome/nfp/nfpcore/nfp_cppcore.c | 4 +- drivers/net/ethernet/qlogic/qede/qede_fp.c | 7 + drivers/net/ethernet/qlogic/qla3xxx.c | 19 +- drivers/net/usb/cdc_ncm.c | 2 + drivers/net/vrf.c | 8 +- drivers/pci/controller/pci-aardvark.c | 9 - drivers/scsi/pm8001/pm8001_init.c | 6 +- drivers/scsi/qla2xxx/qla_dbg.c | 3 + drivers/scsi/scsi_debug.c | 2 +- drivers/usb/core/config.c | 6 +- drivers/usb/gadget/function/uvc.h | 2 + drivers/usb/gadget/function/uvc_v4l2.c | 49 +- drivers/usb/gadget/legacy/dbgp.c | 2 +- drivers/usb/host/xhci-hub.c | 1 + drivers/usb/host/xhci-ring.c | 1 - drivers/usb/host/xhci.c | 26 +- fs/aio.c | 184 ++++- fs/btrfs/extent_io.c | 6 + fs/btrfs/root-tree.c | 3 +- fs/nfsd/nfs4recover.c | 1 + fs/nfsd/nfs4state.c | 9 +- fs/nfsd/nfsctl.c | 14 +- fs/signalfd.c | 12 +- fs/tracefs/inode.c | 76 +++ include/linux/bpf.h | 1 + include/linux/hid.h | 5 + include/linux/pm_runtime.h | 2 +- include/linux/wait.h | 26 + include/net/bond_alb.h | 2 +- include/net/netfilter/nf_conntrack.h | 6 +- include/uapi/asm-generic/poll.h | 2 +- kernel/bpf/verifier.c | 2 +- kernel/sched/wait.c | 7 + mm/backing-dev.c | 7 + net/core/devlink.c | 16 +- net/core/neighbour.c | 3 +- net/ipv4/udp.c | 2 +- net/ipv6/seg6_iptunnel.c | 8 + net/netfilter/nf_conntrack_core.c | 6 +- net/netfilter/nf_conntrack_netlink.c | 2 +- net/netfilter/nf_flow_table_core.c | 4 +- net/netfilter/nft_set_pipapo_avx2.c | 2 +- net/nfc/netlink.c | 6 +- net/sched/sch_fq_pie.c | 1 + scripts/dummy-tools/gcc | 10 +- scripts/gcc-plugin.sh | 19 - scripts/gcc-plugins/Kconfig | 2 +- scripts/gcc-plugins/Makefile | 4 +- sound/core/control_compat.c | 3 + sound/core/oss/pcm_oss.c | 37 +- sound/pci/hda/patch_realtek.c | 80 ++- sound/soc/codecs/rt5682.c | 10 +- sound/soc/codecs/wcd934x.c | 126 +++- sound/soc/codecs/wsa881x.c | 16 +- sound/soc/qcom/qdsp6/q6routing.c | 8 +- tools/build/Makefile.feature | 1 - tools/build/feature/Makefile | 4 - tools/build/feature/test-all.c | 5 - tools/build/feature/test-libpython-version.c | 11 - tools/perf/Makefile.config | 2 - tools/perf/util/smt.c | 2 +- .../bpf/verifier/xdp_direct_packet_access.c | 632 +++++++++++++++++- tools/testing/selftests/net/fib_tests.sh | 59 +- tools/testing/selftests/netfilter/Makefile | 3 +- .../selftests/netfilter/conntrack_vrf.sh | 241 +++++++ 159 files changed, 2201 insertions(+), 681 deletions(-) delete mode 100755 scripts/gcc-plugin.sh delete mode 100644 tools/build/feature/test-libpython-version.c create mode 100644 tools/testing/selftests/netfilter/conntrack_vrf.sh -- 2.20.1

1 131

[PATCH openEuler-5.10 1/3] rds: memory leak in __rds_conn_create()
by Zheng Zengkai 14 Jan '22

14 Jan '22

From: Hangyu Hua <hbh25y(a)gmail.com> mainline inclusion from mainline-v5.16-rc6 commit 5f9562ebe710c307adc5f666bf1a2162ee7977c0 bugzilla: 185989 https://gitee.com/openeuler/kernel/issues/I4DDEL CVE: CVE-2021-45480 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- __rds_conn_create() did not release conn->c_path when loop_trans != 0 and trans->t_prefer_loopback != 0 and is_outgoing == 0. Fixes: aced3ce57cd3 ("RDS tcp loopback connection can hang") Signed-off-by: Hangyu Hua <hbh25y(a)gmail.com> Reviewed-by: Sharath Srinivasan <sharath.srinivasan(a)oracle.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Baisong Zhong zhongbaisong(a)huawei.com Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- net/rds/connection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/rds/connection.c b/net/rds/connection.c index a3bc4b54d491..b4cc699c5fad 100644 --- a/net/rds/connection.c +++ b/net/rds/connection.c @@ -253,6 +253,7 @@ static struct rds_connection *__rds_conn_create(struct net *net, * should end up here, but if it * does, reset/destroy the connection. */ + kfree(conn->c_path); kmem_cache_free(rds_conn_slab, conn); conn = ERR_PTR(-EOPNOTSUPP); goto out; -- 2.20.1

1 2

[PATCH openEuler-5.10 000/121] Backport 5.10.84 LTS
by Zheng Zengkai 14 Jan '22

14 Jan '22

Backport 5.10.84 LTS patches from upstream. Aaro Koskinen (1): i2c: cbus-gpio: set atomic transfer callback Alain Volmat (3): i2c: stm32f7: flush TX FIFO upon transfer errors i2c: stm32f7: recover the bus on access timeout i2c: stm32f7: stop dma transfer in case of NACK Alexey Kardashevskiy (1): powerpc/pseries/ddw: Revert "Extend upper limit for huge DMA window for persistent memory" Andreas Gruenbacher (1): gfs2: Fix length of holes reported at end-of-file Arnd Bergmann (1): siphash: use _unaligned version by default Badhri Jagan Sridharan (1): usb: typec: tcpm: Wait in SNK_DEBOUNCED until disconnect Baokun Li (2): sata_fsl: fix UAF in sata_fsl_port_stop when rmmod sata_fsl sata_fsl: fix warning in remove_proc_entry when rmmod sata_fsl Benjamin Coddington (1): NFSv42: Fix pagecache invalidation after COPY/CLONE Benjamin Poirier (1): net: mpls: Fix notifications when deleting a device Bernard Zhao (1): drm/amd/amdgpu: fix potential memleak Bob Peterson (1): gfs2: release iopen glock early in evict Catalin Marinas (1): KVM: arm64: Avoid setting the upper 32 bits of TCR_EL2 and CPTR_EL2 to 1 Christophe JAILLET (1): net: marvell: mvpp2: Fix the computation of shared CPUs Dan Carpenter (1): KVM: VMX: Set failure code in prepare_vmcs02() Dmitry Bogdanov (2): atlantic: Increase delay for fw transactions atlantic: Fix statistics logic for production hardware Dongliang Mu (1): dpaa2-eth: destroy workqueue at the end of remove function Douglas Anderson (1): drm/msm/a6xx: Allocate enough space for GMU registers Dust Li (1): net/smc: fix wrong list_del in smc_lgr_cleanup_early Eiichi Tsukata (2): rxrpc: Fix rxrpc_peer leak in rxrpc_look_up_bundle() rxrpc: Fix rxrpc_local leak in rxrpc_lookup_peer() Eric Dumazet (2): net: annotate data-races on txq->xmit_lock_owner ipv4: convert fib_num_tclassid_users to atomic_t Feng Tang (2): x86/tsc: Add a timer to make sure TSC_adjust is always checked x86/tsc: Disable clocksource watchdog for TSC on qualified platorms Gustavo A. R. Silva (1): wireguard: ratelimiter: use kvcalloc() instead of kvzalloc() Helge Deller (3): parisc: Fix KBUILD_IMAGE for self-extracting kernel parisc: Fix "make install" on newer debian releases parisc: Mark cr16 CPU clocksource unstable on all SMP machines Ian Rogers (2): perf hist: Fix memory leak of a perf_hpp_fmt perf report: Fix memory leaks around perf_tip() Ioanna Alifieraki (1): ipmi: Move remove_work to dedicated workqueue Jason A. Donenfeld (6): wireguard: selftests: increase default dmesg log size wireguard: allowedips: add missing __rcu annotation to satisfy sparse wireguard: selftests: actually test for routing loops wireguard: device: reset peer src endpoint when netns exits wireguard: receive: use ring buffer for incoming handshakes wireguard: receive: drop handshakes if queue lock is contended Jay Dolan (2): serial: 8250_pci: Fix ACCES entries in pci_serial_quirks array serial: 8250_pci: rewrite pericom_do_set_divisor() Jimmy Wang (1): platform/x86: thinkpad_acpi: Add support for dual fan control Joerg Roedel (1): x86/64/mm: Map all kernel memory into trampoline_pgd Johan Hovold (1): serial: core: fix transmit-buffer reset and memleak Jordy Zomer (1): ipv6: check return value of ipv6_skip_exthdr Juergen Gross (1): x86/pv: Switch SWAPGS to ALTERNATIVE Julian Braha (1): drm/sun4i: fix unmet dependency on RESET_CONTROLLER for PHY_SUN6I_MIPI_DPHY Lai Jiangshan (4): KVM: X86: Use vcpu->arch.walk_mmu for kvm_mmu_invlpg() x86/entry: Use the correct fence macro after swapgs in kernel CR3 x86/xen: Add xenpv_restore_regs_and_return_to_usermode() x86/entry: Add a fence for kernel entry SWAPGS in paranoid_entry() Li Zhijian (2): wireguard: selftests: rename DEBUG_PI_LIST to DEBUG_PLIST selftests: net: Correct case name Like Xu (1): KVM: x86/pmu: Fix reserved bits for AMD PerfEvtSeln register Lorenzo Bianconi (1): mt76: mt7915: fix NULL pointer dereference in mt7915_get_phy_mode Lukas Wunner (1): serial: 8250: Fix RTS modem control while in rs485 mode Maciej W. Rozycki (1): vgacon: Propagate console boot parameters before calling `vc_resize' Manaf Meethalavalappu Pallikunhi (1): thermal: core: Reset previous low and high trip during thermal zone init Mario Limonciello (2): ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile ACPI: Add stubs for wakeup handler functions Mark Rutland (1): arm64: ftrace: add missing BTIs Masami Hiramatsu (1): kprobes: Limit max data_size of the kretprobe instances Mathias Nyman (1): xhci: Fix commad ring abort, write all 64 bits to CRCR register. Michael Sterritt (1): x86/sev: Fix SEV-ES INS/OUTS instructions for word, dword, and qword Mike Christie (1): scsi: iscsi: Unblock session then wake up error handler Miklos Szeredi (2): ovl: simplify file splice ovl: fix deadlock in splice write Mordechay Goodstein (1): iwlwifi: mvm: retry init flow if failed Nicholas Kazlauskas (1): drm/amd/display: Allow DSC on supported MST branch devices Nikita Danilov (2): atlatnic: enable Nbase-t speeds with base-t atlantic: Add missing DIDs and fix 115c. Niklas Schnelle (1): s390/pci: move pseudo-MMIO to prevent MIO overlap Ole Ernst (1): USB: NO_LPM quirk Lenovo Powered USB-C Travel Hub Paolo Abeni (1): tcp: fix page frag corruption on page fault Paolo Bonzini (1): KVM: x86: Use a stable condition around all VT-d PI paths Patrik John (1): serial: tegra: Change lower tolerance baud rate limit for tegra20 and tegra30 Pierre Gondois (1): serial: pl011: Add ACPI SBSA UART match id Pierre-Louis Bossart (1): ALSA: intel-dsp-config: add quirk for CML devices based on ES8336 codec Qais Yousef (1): sched/uclamp: Fix rq->uclamp_max not set on first enqueue Randy Dunlap (1): natsemi: xtensa: fix section mismatch warnings Rob Clark (1): drm/msm: Do hw_init() before capturing GPU state Sameer Pujar (9): ASoC: tegra: Fix wrong value type in ADMAIF ASoC: tegra: Fix wrong value type in I2S ASoC: tegra: Fix wrong value type in DMIC ASoC: tegra: Fix wrong value type in DSPK ASoC: tegra: Fix kcontrol put callback in ADMAIF ASoC: tegra: Fix kcontrol put callback in I2S ASoC: tegra: Fix kcontrol put callback in DMIC ASoC: tegra: Fix kcontrol put callback in DSPK ASoC: tegra: Fix kcontrol put callback in AHUB Sameer Saurabh (3): atlantic: Fix to display FW bundle version instead of FW mac version. Remove Half duplex mode speed capabilities. atlantic: Remove warn trace message. Sean Christopherson (2): KVM: Disallow user memslot with size that exceeds "unsigned long" KVM: nVMX: Flush current VPID (L1 vs. L2) for KVM_REQ_TLB_FLUSH_GUEST Slark Xiao (1): platform/x86: thinkpad_acpi: Fix WWAN device disabled issue after S3 deep Stanislaw Gruszka (1): rt2x00: do not mark device gone on EPROTO errors during start Stephen Suryaputra (1): vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmit Steven Rostedt (VMware) (1): tracing/histograms: String compares should not care about signed values Sven Eckelmann (1): tty: serial: msm_serial: Deactivate RX DMA for polling support Sven Schuchmann (1): net: usb: lan78xx: lan78xx_phy_init(): use PHY_POLL instead of "0" if no IRQ is available Teng Qi (2): ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port() net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock() Tianjia Zhang (1): net/tls: Fix authentication failure in CCM mode Tony Lu (1): net/smc: Keep smc_close_final rc during active close Vasily Gorbik (1): s390/setup: avoid using memblock_enforce_memory_limit Wang Yugui (1): btrfs: check-integrity: fix a warning on write caching disabled disk Wei Yongjun (1): ipmi: msghandler: Make symbol 'remove_work_wq' static Wen Gu (2): net/smc: Transfer remaining wait queue entries during fallback net/smc: Avoid warning of possible recursive locking William Kucharski (1): net/rds: correct socket tunable error in rds_tcp_tune() Xing Song (1): mac80211: do not access the IV when it was stripped Zhang Changzhong (1): can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM Zhou Qingyang (2): net: qlogic: qlcnic: Fix a NULL pointer dereference in qlcnic_83xx_add_rings() net/mlx4_en: Fix an use-after-free bug in mlx4_en_try_alloc_resources() liuguoqiang (1): net: return correct error code msizanoen1 (1): ipv6: fix memory leak in fib6_rule_suppress shaoyunl (1): drm/amd/amdkfd: Fix kernel panic when reset failed and been triggered again zhangyue (1): net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound arch/arm64/include/asm/kvm_arm.h | 4 +- arch/arm64/kernel/entry-ftrace.S | 6 + arch/parisc/Makefile | 5 + arch/parisc/install.sh | 1 + arch/parisc/kernel/time.c | 24 +- arch/powerpc/platforms/pseries/iommu.c | 9 - arch/s390/include/asm/pci_io.h | 7 +- arch/s390/kernel/setup.c | 3 - arch/x86/entry/entry_64.S | 45 ++- arch/x86/include/asm/irqflags.h | 20 +- arch/x86/include/asm/paravirt.h | 20 -- arch/x86/include/asm/paravirt_types.h | 2 - arch/x86/kernel/asm-offsets_64.c | 1 - arch/x86/kernel/paravirt.c | 1 - arch/x86/kernel/paravirt_patch.c | 3 - arch/x86/kernel/sev-es.c | 57 ++-- arch/x86/kernel/tsc.c | 28 +- arch/x86/kernel/tsc_sync.c | 41 +++ arch/x86/kvm/mmu/mmu.c | 2 +- arch/x86/kvm/svm/pmu.c | 2 +- arch/x86/kvm/vmx/nested.c | 4 +- arch/x86/kvm/vmx/posted_intr.c | 20 +- arch/x86/kvm/vmx/vmx.c | 23 +- arch/x86/realmode/init.c | 12 +- arch/x86/xen/enlighten_pv.c | 3 - arch/x86/xen/xen-asm.S | 20 ++ drivers/ata/ahci.c | 1 + drivers/ata/sata_fsl.c | 20 +- drivers/char/ipmi/ipmi_msghandler.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 1 + .../drm/amd/amdkfd/kfd_device_queue_manager.c | 5 + .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 20 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 4 +- drivers/gpu/drm/msm/msm_debugfs.c | 1 + drivers/gpu/drm/sun4i/Kconfig | 1 + drivers/i2c/busses/i2c-cbus-gpio.c | 5 +- drivers/i2c/busses/i2c-stm32f7.c | 31 +- .../ethernet/aquantia/atlantic/aq_common.h | 27 +- .../net/ethernet/aquantia/atlantic/aq_hw.h | 2 + .../net/ethernet/aquantia/atlantic/aq_nic.c | 10 +- .../ethernet/aquantia/atlantic/aq_pci_func.c | 7 +- .../net/ethernet/aquantia/atlantic/aq_vec.c | 3 - .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 15 +- .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 3 - .../aquantia/atlantic/hw_atl2/hw_atl2.c | 22 +- .../aquantia/atlantic/hw_atl2/hw_atl2.h | 2 + .../aquantia/atlantic/hw_atl2/hw_atl2_utils.h | 38 ++- .../atlantic/hw_atl2/hw_atl2_utils_fw.c | 110 +++++-- drivers/net/ethernet/dec/tulip/de4x5.c | 34 +- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 + .../ethernet/hisilicon/hns/hns_dsaf_misc.c | 4 + .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- .../net/ethernet/mellanox/mlx4/en_netdev.c | 9 +- drivers/net/ethernet/natsemi/xtsonic.c | 2 +- .../ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 10 +- drivers/net/usb/lan78xx.c | 2 +- drivers/net/vrf.c | 2 + drivers/net/wireguard/allowedips.c | 2 +- drivers/net/wireguard/device.c | 39 +-- drivers/net/wireguard/device.h | 9 +- drivers/net/wireguard/queueing.c | 6 +- drivers/net/wireguard/queueing.h | 2 +- drivers/net/wireguard/ratelimiter.c | 4 +- drivers/net/wireguard/receive.c | 39 ++- drivers/net/wireguard/socket.c | 2 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 22 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 3 + .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 24 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 3 + .../net/wireless/mediatek/mt76/mt7915/mcu.c | 4 +- .../net/wireless/ralink/rt2x00/rt2x00usb.c | 3 + drivers/platform/x86/thinkpad_acpi.c | 13 +- drivers/scsi/scsi_transport_iscsi.c | 6 +- drivers/thermal/thermal_core.c | 2 + drivers/tty/serial/8250/8250_pci.c | 39 ++- drivers/tty/serial/8250/8250_port.c | 7 - drivers/tty/serial/amba-pl011.c | 1 + drivers/tty/serial/msm_serial.c | 3 + drivers/tty/serial/serial-tegra.c | 4 +- drivers/tty/serial/serial_core.c | 18 +- drivers/usb/core/quirks.c | 3 + drivers/usb/host/xhci-ring.c | 21 +- drivers/usb/typec/tcpm/tcpm.c | 4 - drivers/video/console/vgacon.c | 14 +- fs/btrfs/disk-io.c | 14 +- fs/gfs2/bmap.c | 2 +- fs/gfs2/super.c | 14 +- fs/nfs/nfs42proc.c | 5 +- fs/overlayfs/file.c | 59 ++-- include/linux/acpi.h | 9 + include/linux/kprobes.h | 2 + include/linux/netdevice.h | 19 +- include/linux/siphash.h | 14 +- include/net/dst_cache.h | 11 + include/net/fib_rules.h | 4 +- include/net/ip_fib.h | 2 +- include/net/netns/ipv4.h | 2 +- include/net/sock.h | 13 +- kernel/kprobes.c | 3 + kernel/sched/core.c | 2 +- kernel/trace/trace_events_hist.c | 2 +- lib/siphash.c | 12 +- net/can/j1939/transport.c | 6 + net/core/dev.c | 5 +- net/core/dst_cache.c | 19 ++ net/core/fib_rules.c | 2 +- net/ipv4/devinet.c | 2 +- net/ipv4/fib_frontend.c | 2 +- net/ipv4/fib_rules.c | 5 +- net/ipv4/fib_semantics.c | 4 +- net/ipv6/esp6.c | 6 + net/ipv6/fib6_rules.c | 4 +- net/mac80211/rx.c | 3 +- net/mpls/af_mpls.c | 68 +++- net/rds/tcp.c | 2 +- net/rxrpc/conn_client.c | 14 +- net/rxrpc/peer_object.c | 14 +- net/smc/af_smc.c | 14 + net/smc/smc_close.c | 8 +- net/smc/smc_core.c | 7 +- net/tls/tls_sw.c | 4 +- sound/hda/intel-dsp-config.c | 10 + sound/soc/tegra/tegra186_dspk.c | 181 +++++++++-- sound/soc/tegra/tegra210_admaif.c | 140 +++++++-- sound/soc/tegra/tegra210_ahub.c | 11 +- sound/soc/tegra/tegra210_dmic.c | 184 ++++++++--- sound/soc/tegra/tegra210_i2s.c | 296 +++++++++++++----- tools/perf/builtin-report.c | 15 +- tools/perf/ui/hist.c | 28 +- tools/perf/util/hist.h | 1 - tools/perf/util/util.c | 14 +- tools/perf/util/util.h | 2 +- tools/testing/selftests/net/fcnal-test.sh | 4 +- tools/testing/selftests/wireguard/netns.sh | 30 +- .../selftests/wireguard/qemu/debug.config | 2 +- .../selftests/wireguard/qemu/kernel.config | 1 + virt/kvm/kvm_main.c | 3 +- 138 files changed, 1694 insertions(+), 677 deletions(-) -- 2.20.1

1 121

[PATCH openEuler-5.10 000/119] Backport 5.10.83 LTS
by Zheng Zengkai 14 Jan '22

14 Jan '22

Backport 5.10.83 LTS patches from upstream. Adrian Hunter (1): mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB Albert Wang (1): usb: dwc3: gadget: Fix null pointer exception Alex Deucher (1): drm/amdgpu/gfx9: switch to golden tsc registers for renoir+ Alexander Aring (1): net: ieee802154: handle iftypes as u32 Alexander Mikhalitsyn (1): shm: extend forced shm destroy to support objects from several IPC nses Amit Cohen (1): mlxsw: spectrum: Protect driver from buggy firmware Arjun Roy (1): tcp: correctly handle increased zerocopy args struct size Christophe Leroy (1): powerpc/32: Fix hardlockup on vmap stack overflow Dan Carpenter (4): usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect() drm/nouveau/acr: fix a couple NULL vs IS_ERR() checks drm/vc4: fix error code in vc4_create_object() Daniele Palmas (1): USB: serial: option: add Telit LE910S1 0x9200 composition Danielle Ratson (1): mlxsw: Verify the accessed index doesn't exceed the array length David Hildenbrand (2): proc/vmcore: fix clearing user buffer by properly using clear_user() s390/mm: validate VMA in PGSTE manipulation functions Davide Caratti (1): net/sched: sch_ets: don't peek at classes beyond 'nbands' Diana Wang (1): nfp: checking parameter process for rx-usecs/tx-usecs is invalid Dylan Hung (1): mdio: aspeed: Fix "Link is Down" issue Eric Dumazet (3): mptcp: fix delack timer ipv6: fix typos in __ip6_finish_output() tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows Florent Fourcot (2): netfilter: ctnetlink: fix filtering with CTA_TUPLE_REPLY netfilter: ctnetlink: do not erase error code with EINVAL Florian Fainelli (3): ARM: dts: BCM5301X: Fix I2C controller interrupt ARM: dts: BCM5301X: Add interrupt properties to GPIO node ARM: dts: bcm2711: Fix PCIe interrupts Guo DaXing (1): net/smc: Fix loop in smc_listen Hans Verkuil (1): media: cec: copy sequence field for the reply Heiner Kallweit (1): lan743x: fix deadlock in lan743x_phy_link_status_change() Helge Deller (1): Revert "parisc: Fix backtrace to always include init funtion names" Holger Assmann (1): net: stmmac: retain PTP clock time during SIOCSHWTSTAMP ioctls Huang Jianan (1): erofs: fix deadlock when shrink erofs slab Huang Pei (2): MIPS: loongson64: fix FTLB configuration MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48 Jakub Kicinski (2): tls: splice_read: fix record type check tls: fix replacing proto_ops Jason Gerecke (1): HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts Jeff Layton (1): ceph: properly handle statfs on multifs setups Jesse Brandeburg (1): igb: fix netpoll exit with traffic Jiri Olsa (1): tracing/uprobe: Fix uprobe_perf_open probes iteration Joakim Zhang (2): net: stmmac: fix system hang caused by eee_ctrl_timer during suspend/resume net: stmmac: platform: fix build warning when with !CONFIG_PM_SLEEP Joerg Roedel (1): iommu/amd: Clarify AMD IOMMUv2 initialization messages Juergen Gross (9): xen: sync include/xen/interface/io/ring.h with Xen's newest version xen/blkfront: read response from backend only once xen/blkfront: don't take local copy of a request from the ring page xen/blkfront: don't trust the backend response data blindly xen/netfront: read response from backend only once xen/netfront: don't read data from request on the ring page xen/netfront: disentangle tx_skb_freelist xen/netfront: don't trust the backend response data blindly tty: hvc: replace BUG_ON() with negative return value Karsten Graul (1): net/smc: Fix NULL pointer dereferencing in smc_vlan_by_tcpsk() Kumar Thangavel (1): net/ncsi : Add payload to be 32-bit aligned to fix dropped packets Maciej Fijalkowski (1): ice: fix vsi->txq_map sizing Marek Behún (2): PCI: aardvark: Deduplicate code in advk_pcie_rd_conf() net: marvell: mvpp2: increase MTU limit when XDP enabled Mark Rutland (1): sched/scs: Reset task stack state in bringup_cpu() Marta Plantykow (1): ice: avoid bpf_prog refcount underflow Mathias Nyman (2): usb: hub: Fix usb enumeration issue due to address0 race usb: hub: Fix locking issues with address0_mutex Maurizio Lombardi (1): nvmet: use IOCB_NOWAIT only if the filesystem supports it Michael Kelley (1): firmware: smccc: Fix check for ARCH_SOC_ID not implemented Mike Christie (1): scsi: core: sysfs: Fix setting device state to SDEV_RUNNING Miklos Szeredi (1): fuse: release pipe buf after last use Minas Harutyunyan (1): usb: dwc2: gadget: Fix ISOC flow for elapsed frames Mingjie Zhang (1): USB: serial: option: add Fibocom FM101-GL variants Nathan Chancellor (1): usb: dwc2: hcd_queue: Fix use of floating point literal Nicholas Kazlauskas (1): drm/amd/display: Set plane update flags for all planes in reset Nicholas Piggin (1): KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB Nikolay Aleksandrov (3): net: nexthop: fix null pointer dereference when IPv6 is not enabled net: ipv6: add fib6_nh_release_dsts stub net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group Nitesh B Venkatesh (1): iavf: Prevent changing static ITR values if adaptive moderation is on Noralf Trønnes (1): staging/fbtft: Fix backlight Ondrej Jirman (1): usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts Pali Rohár (4): PCI: aardvark: Update comment about disabling link training PCI: aardvark: Implement re-issuing config requests on CRS response PCI: aardvark: Simplify initialization of rootcap on virtual bridge PCI: aardvark: Fix link training Peng Fan (1): firmware: arm_scmi: pm: Propagate return value to caller Pierre-Louis Bossart (1): ALSA: intel-dsp-config: add quirk for JSL devices based on ES8336 codec Russell King (Oracle) (2): net: phylink: Force link down and retrigger resolve on interface change net: phylink: Force retrigger in case of latched link-fail indicator Sakari Ailus (1): ACPI: Get acpi_device's parent from the parent field Shin'ichiro Kawasaki (1): scsi: scsi_debug: Zero clear zones at reset write pointer Sreekanth Reddy (1): scsi: mpt3sas: Fix kernel panic during drive powercycle test Srinivas Kandagatla (3): ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer ASoC: qdsp6: q6asm: fix q6asm_dai_prepare error handling ASoC: codecs: wcd934x: return error code correctly from hw_params Stefano Garzarella (1): vhost/vsock: fix incorrect used length reported to the guest Stefano Stabellini (2): xen: don't continue xenstore initialization in case of errors xen: detect uninitialized xenbus in xenbus_init Steve French (1): smb3: do not error on fsync when readonly Steven Rostedt (VMware) (2): tracing: Fix pid filtering when triggers are attached tracing: Check pid filtering when creating events Takashi Iwai (5): ALSA: ctxfi: Fix out-of-range access ALSA: hda/realtek: Fix LED on HP ProBook 435 G7 staging: greybus: Add missing rwsem around snd_ctl_remove() calls ASoC: topology: Add missing rwsem around snd_ctl_remove() calls ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE Thinh Nguyen (2): usb: dwc3: gadget: Ignore NoStream after End Transfer usb: dwc3: gadget: Check for L1/L2/U3 for Start Transfer Thomas Zeitlhofer (1): PM: hibernate: use correct mode for swsusp_close() Tim Harvey (1): mmc: sdhci-esdhc-imx: disable CMDQ support Todd Kjos (1): binder: fix test regression due to sender_euid change Tony Lu (2): net/smc: Ensure the active closing peer first closes clcsock net/smc: Don't call clcsock shutdown twice when smc shutdown Trond Myklebust (1): NFSv42: Don't fail clone() unless the OP_CLONE operation failed Varun Prakash (1): nvmet-tcp: fix incomplete data digest send Vladimir Oltean (2): net: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP net: mscc: ocelot: correctly report the timestamping RX filters in ethtool Volodymyr Mytnyk (1): net: marvell: prestera: fix double free issue on err path Weichao Guo (1): f2fs: set SBI_NEED_FSCK flag when inconsistent node block found Werner Sembach (1): ALSA: hda/realtek: Add quirk for ASRock NUC Box 1100 Will Mortensen (1): netfilter: flowtable: fix IPv6 tunnel addr match Ziyang Xuan (1): net: vlan: fix underflow for the real_dev refcnt yangxingwu (1): netfilter: ipvs: Fix reuse connection if RS weight is 0 Documentation/networking/ipvs-sysctl.rst | 3 +- arch/arm/boot/dts/bcm2711.dtsi | 8 +- arch/arm/boot/dts/bcm5301x.dtsi | 4 +- arch/arm/mach-socfpga/core.h | 2 +- arch/arm/mach-socfpga/platsmp.c | 8 +- arch/mips/Kconfig | 2 +- arch/mips/kernel/cpu-probe.c | 4 +- arch/parisc/kernel/vmlinux.lds.S | 3 +- arch/powerpc/kernel/head_32.h | 6 +- arch/powerpc/kvm/book3s_hv_builtin.c | 5 +- arch/s390/mm/pgtable.c | 13 + drivers/acpi/property.c | 11 +- drivers/android/binder.c | 2 +- drivers/block/xen-blkfront.c | 126 +++++--- drivers/firmware/arm_scmi/scmi_pm_domain.c | 4 +- drivers/firmware/smccc/soc_id.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 46 ++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 6 +- .../gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 6 +- drivers/gpu/drm/vc4/vc4_bo.c | 2 +- drivers/hid/wacom_wac.c | 8 +- drivers/hid/wacom_wac.h | 1 + drivers/iommu/amd/iommu_v2.c | 6 +- drivers/media/cec/core/cec-adap.c | 1 + drivers/mmc/host/sdhci-esdhc-imx.c | 2 - drivers/mmc/host/sdhci.c | 21 +- drivers/mmc/host/sdhci.h | 4 +- .../net/ethernet/intel/iavf/iavf_ethtool.c | 30 +- drivers/net/ethernet/intel/ice/ice_lib.c | 9 +- drivers/net/ethernet/intel/ice/ice_main.c | 18 +- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 +- .../marvell/prestera/prestera_switchdev.c | 6 +- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 + .../net/ethernet/mellanox/mlxsw/spectrum.c | 5 + .../ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 + .../ethernet/mellanox/mlxsw/spectrum_router.c | 3 + .../mellanox/mlxsw/spectrum_switchdev.c | 4 + drivers/net/ethernet/microchip/lan743x_main.c | 12 +- drivers/net/ethernet/mscc/ocelot.c | 11 +- drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 - .../ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 139 +++++---- .../ethernet/stmicro/stmmac/stmmac_platform.c | 44 +++ drivers/net/mdio/mdio-aspeed.c | 7 + drivers/net/phy/phylink.c | 26 +- drivers/net/xen-netfront.c | 272 ++++++++++------- drivers/nvme/target/io-cmd-file.c | 4 +- drivers/nvme/target/tcp.c | 7 +- drivers/pci/controller/pci-aardvark.c | 235 +++++++-------- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/scsi_debug.c | 5 + drivers/scsi/scsi_sysfs.c | 2 +- drivers/staging/fbtft/fb_ssd1351.c | 4 - drivers/staging/fbtft/fbtft-core.c | 9 +- drivers/staging/greybus/audio_helper.c | 8 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +- drivers/tty/hvc/hvc_xen.c | 17 +- drivers/usb/chipidea/ci_hdrc_imx.c | 18 +- drivers/usb/core/hub.c | 24 +- drivers/usb/dwc2/gadget.c | 17 +- drivers/usb/dwc2/hcd_queue.c | 2 +- drivers/usb/dwc3/gadget.c | 39 ++- drivers/usb/serial/option.c | 5 + drivers/usb/typec/tcpm/fusb302.c | 6 +- drivers/vhost/vsock.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 27 +- fs/ceph/super.c | 11 +- fs/cifs/file.c | 35 ++- fs/erofs/utils.c | 8 +- fs/f2fs/node.c | 1 + fs/fuse/dev.c | 10 +- fs/nfs/nfs42xdr.c | 3 +- fs/proc/vmcore.c | 16 +- include/linux/ipc_namespace.h | 15 + include/linux/sched/task.h | 2 +- include/net/ip6_fib.h | 1 + include/net/ipv6_stubs.h | 1 + include/net/nl802154.h | 7 +- include/xen/interface/io/ring.h | 278 ++++++++++-------- ipc/shm.c | 189 +++++++++--- kernel/cpu.c | 7 + kernel/power/hibernate.c | 6 +- kernel/sched/core.c | 4 - kernel/trace/trace.h | 24 +- kernel/trace/trace_events.c | 10 + kernel/trace/trace_uprobe.c | 1 + net/8021q/vlan.c | 3 - net/8021q/vlan_dev.c | 3 + net/ipv4/nexthop.c | 35 ++- net/ipv4/tcp.c | 4 +- net/ipv4/tcp_cubic.c | 5 +- net/ipv6/af_inet6.c | 1 + net/ipv6/ip6_output.c | 2 +- net/ipv6/route.c | 19 ++ net/mptcp/options.c | 3 +- net/ncsi/ncsi-cmd.c | 24 +- net/netfilter/ipvs/ip_vs_core.c | 8 +- net/netfilter/nf_conntrack_netlink.c | 6 +- net/netfilter/nf_flow_table_offload.c | 4 +- net/sched/sch_ets.c | 8 +- net/smc/af_smc.c | 12 +- net/smc/smc_close.c | 6 + net/smc/smc_core.c | 35 +-- net/tls/tls_main.c | 47 ++- net/tls/tls_sw.c | 23 +- sound/hda/intel-dsp-config.c | 9 + sound/pci/ctxfi/ctamixer.c | 14 +- sound/pci/ctxfi/ctdaio.c | 16 +- sound/pci/ctxfi/ctresource.c | 7 +- sound/pci/ctxfi/ctresource.h | 4 +- sound/pci/ctxfi/ctsrc.c | 7 +- sound/pci/hda/patch_realtek.c | 28 ++ sound/soc/codecs/wcd934x.c | 3 +- sound/soc/qcom/qdsp6/q6asm-dai.c | 19 +- sound/soc/qcom/qdsp6/q6routing.c | 6 +- sound/soc/soc-topology.c | 3 + 119 files changed, 1539 insertions(+), 815 deletions(-) -- 2.20.1

1 119

[PATCH openEuler-5.10 01/16] USB: gadget: detect too-big endpoint 0 requests
by Zheng Zengkai 14 Jan '22

14 Jan '22

From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> stable inclusion form stable-v5.10.85 commit 7193ad3e50e596ac2192531c58ba83b9e6d2444b bugzilla: 185937 https://gitee.com/openeuler/kernel/issues/I4DDEL CVE: CVE-2021-39685 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- Sometimes USB hosts can ask for buffers that are too large from endpoint 0, which should not be allowed. If this happens for OUT requests, stall the endpoint, but for IN requests, trim the request size to the endpoint buffer size. Co-developed-by: Szymon Heidrich <szymon.heidrich(a)gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/usb/gadget/composite.c | 12 ++++++++++++ drivers/usb/gadget/legacy/dbgp.c | 13 +++++++++++++ drivers/usb/gadget/legacy/inode.c | 16 +++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a8704e6498ab..426132988512 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1648,6 +1648,18 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) struct usb_function *f = NULL; u8 endp; + if (w_length > USB_COMP_EP0_BUFSIZ) { + if (ctrl->bRequestType == USB_DIR_OUT) { + goto done; + } else { + /* Cast away the const, we are going to overwrite on purpose. */ + __le16 *temp = (__le16 *)&ctrl->wLength; + + *temp = cpu_to_le16(USB_COMP_EP0_BUFSIZ); + w_length = USB_COMP_EP0_BUFSIZ; + } + } + /* partial re-init of the response message; the function or the * gadget might need to intercept e.g. a control-OUT completion * when we delegate to it. diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c index e1d566c9918a..e567afcb2794 100644 --- a/drivers/usb/gadget/legacy/dbgp.c +++ b/drivers/usb/gadget/legacy/dbgp.c @@ -345,6 +345,19 @@ static int dbgp_setup(struct usb_gadget *gadget, void *data = NULL; u16 len = 0; + if (length > DBGP_REQ_LEN) { + if (ctrl->bRequestType == USB_DIR_OUT) { + return err; + } else { + /* Cast away the const, we are going to overwrite on purpose. */ + __le16 *temp = (__le16 *)&ctrl->wLength; + + *temp = cpu_to_le16(DBGP_REQ_LEN); + length = DBGP_REQ_LEN; + } + } + + if (request == USB_REQ_GET_DESCRIPTOR) { switch (value>>8) { case USB_DT_DEVICE: diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c index 71e7d10dd76b..04b9c4f5f129 100644 --- a/drivers/usb/gadget/legacy/inode.c +++ b/drivers/usb/gadget/legacy/inode.c @@ -110,6 +110,8 @@ enum ep0_state { /* enough for the whole queue: most events invalidate others */ #define N_EVENT 5 +#define RBUF_SIZE 256 + struct dev_data { spinlock_t lock; refcount_t count; @@ -144,7 +146,7 @@ struct dev_data { struct dentry *dentry; /* except this scratch i/o buffer for ep0 */ - u8 rbuf [256]; + u8 rbuf[RBUF_SIZE]; }; static inline void get_dev (struct dev_data *data) @@ -1333,6 +1335,18 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) u16 w_value = le16_to_cpu(ctrl->wValue); u16 w_length = le16_to_cpu(ctrl->wLength); + if (w_length > RBUF_SIZE) { + if (ctrl->bRequestType == USB_DIR_OUT) { + return value; + } else { + /* Cast away the const, we are going to overwrite on purpose. */ + __le16 *temp = (__le16 *)&ctrl->wLength; + + *temp = cpu_to_le16(RBUF_SIZE); + w_length = RBUF_SIZE; + } + } + spin_lock (&dev->lock); dev->setup_abort = 0; if (dev->state == STATE_DEV_UNCONNECTED) { -- 2.20.1

1 15

[PATCH openEuler-5.10 000/146] Backport LTS 5.10.82
by Zheng Zengkai 14 Jan '22

14 Jan '22

Backport LTS 5.10.82 patches from upstream. Adrian Hunter (2): scsi: ufs: core: Fix task management completion scsi: ufs: core: Fix task management completion timeout race Alex Elder (1): net: ipa: disable HOLB drop when updating timer Alexander Antonov (2): perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server perf/x86/intel/uncore: Fix IIO event constraints for Skylake Server Alexander Mikhalitsyn (1): ipc: WARN if trying to remove ipc object which is absent Alistair Delva (1): block: Check ADMIN before NICE for IOPRIO_CLASS_RT Alvin Lee (1): drm/amd/display: Update swizzle mode enums Amit Kumar Mahapatra (1): arm64: zynqmp: Do not duplicate flash partition label property Anatolij Gustschin (1): powerpc/5200: dts: fix memory node unit name AngeloGioacchino Del Regno (1): arm64: dts: qcom: msm8998: Fix CPU/L2 idle state latency and residency Arjun Roy (3): net-zerocopy: Copy straggler unaligned data for TCP Rx. zerocopy. net-zerocopy: Refactor skb frag fast-forward op. tcp: Fix uninitialized access in skb frags array for Rx 0cp. Baoquan He (1): s390/kexec: fix memory leak of ipl report buffer Bart Van Assche (1): MIPS: sni: Fix the build Bjorn Andersson (1): pinctrl: qcom: sdm845: Enable dual edge errata Bongsu Jeon (1): net: nfc: nci: Change the NCI close sequence Chao Yu (1): f2fs: fix incorrect return value in f2fs_sanity_check_ckpt() Chengfeng Ye (1): ALSA: gus: fix null pointer dereference on pointer block Christian Lamparter (1): ARM: BCM53016: Specify switch ports for Meraki MR32 Christophe JAILLET (1): platform/x86: hp_accel: Fix an error handling path in 'lis3lv02d_probe()' Christophe Leroy (2): powerpc/8xx: Fix Oops with STRICT_KERNEL_RWX without DEBUG_RODATA_TEST powerpc/8xx: Fix pinned TLBs with CONFIG_STRICT_KERNEL_RWX Colin Ian King (1): MIPS: generic/yamon-dt: fix uninitialized variable error David Heidelberg (1): ARM: dts: qcom: fix memory and mdio nodes naming for RB3011 Dmitry Baryshkov (1): clk: qcom: gcc-msm8996: Drop (again) gcc_aggre1_pnoc_ahb_clk Eric Dumazet (1): net: reduce indentation level in sk_clone_lock() Eryk Rybak (3): i40e: Fix correct max_pkt_size on VF RX queue i40e: Fix changing previously set num_queue_pairs for PFs i40e: Fix ping is lost after configuring ADq on VF Ewan D. Milne (1): scsi: qla2xxx: Fix mailbox direction flags in qla2xxx_get_adapter_id() Fabio Aiuto (1): staging: rtl8723bs: remove possible deadlock when disconnect (v2) Gao Xiang (1): f2fs: fix up f2fs_lookup tracepoints Grzegorz Szczurek (2): iavf: Fix for setting queues to 0 i40e: Fix display error code in dmesg Guanghui Feng (1): tty: tty_buffer: Fix the softlockup issue in flush_to_ldisc Guo Zhi (1): scsi: advansys: Fix kernel pointer leak Hans Verkuil (1): drm/nouveau: hdmigv100.c: fix corrupted HDMI Vendor InfoFrame Hans de Goede (1): ASoC: nau8824: Add DMI quirk mechanism for active-high jack-detect Heiko Carstens (1): s390/kexec: fix return code handling Hyeong-Jun Kim (1): f2fs: compress: disallow disabling compress on non-empty compressed file Ian Rogers (1): perf bpf: Avoid memory leak from perf_env__insert_btf() Imre Deak (1): drm/i915/dp: Ensure sink rate values are always valid Jacob Keller (1): iavf: prevent accidental free of filter structure James Clark (1): perf tests: Remove bash construct from record+zstd_comp_decomp.sh James Smart (1): scsi: lpfc: Fix list_add() corruption in lpfc_drain_txq() Jan Kara (1): udf: Fix crash after seekdir Jedrzej Jagielski (1): i40e: Fix creation of first queue by omitting it if is not power of two Jesse Brandeburg (1): e100: fix device suspend/resume Joel Stanley (1): clk/ast2600: Fix soc revision for AHB Johan Hovold (1): drm/udl: fix control-message timeout Jonathan Davies (1): net: virtio_net_hdr_to_skb: count transport header in UFO Josef Bacik (2): fs: export an inode_update_time helper btrfs: update device path inode time instead of bd_inode Jérôme Pouiller (1): staging: wfx: ensure IRQ is ready before enabling it Karen Sornek (1): i40e: Fix warning message and call stack during rmmod i40e driver Keoseong Park (1): f2fs: fix to use WHINT_MODE Leon Romanovsky (2): RDMA/netlink: Add __maybe_unused to static inline in C file ice: Delete always true check of PF pointer Li Yang (2): ARM: dts: ls1021a: move thermal-zones node out of soc/ ARM: dts: ls1021a-tsn: use generic "jedec,spi-nor" compatible for flash Like Xu (1): perf/x86/vlbr: Add c->flags to vlbr event constraints Lin Ma (3): NFC: reorganize the functions in nci_request NFC: reorder the logic in nfc_{un,}register_device NFC: add NCI_UNREG flag to eliminate the race Linus Walleij (1): ARM: dts: ux500: Skomer regulator fixes Lu Wei (1): maple: fix wrong return value of maple_bus_init(). Luis Chamberlain (1): firmware_loader: fix pre-allocated buf built-in firmware use Maher Sanalla (1): net/mlx5: Lag, update tracker when state change event received Masami Hiramatsu (1): tracing/histogram: Do not copy the fixed-size char array field over the field size Mateusz Palczewski (1): iavf: Fix return of set the new channel count Matthew Hagan (1): ARM: dts: NSP: Fix mpcore, mmc node names Matthias Brugger (1): arm64: dts: rockchip: Disable CDN DP on Pinebook Pro Maxim Levitsky (1): KVM: nVMX: don't use vcpu->arch.efer when checking host state on nested state load Maxime Ripard (3): ARM: dts: sunxi: Fix OPPs node name arm64: dts: allwinner: h5: Fix GPU thermal zone node name arm64: dts: allwinner: a100: Fix thermal zone node name Meng Li (1): net: stmmac: socfpga: add runtime suspend/resume callback for stratix10 platform Michael Ellerman (2): powerpc/dcr: Use cmplwi instead of 3-argument cmpli KVM: PPC: Book3S HV: Use GLOBAL_TOC for kvmppc_h_set_dabr/xdabr() Michael Walle (2): arm64: dts: hisilicon: fix arm,sp805 compatible string arm64: dts: freescale: fix arm,sp805 compatible string Michal Maloszewski (1): i40e: Fix NULL ptr dereference on VSI filter sync Michal Simek (1): arm64: zynqmp: Fix serial compatible string Mike Christie (3): scsi: target: Fix ordered tag handling scsi: target: Fix alua_tg_pt_gps_count tracking scsi: core: sysfs: Fix hang when device state is set via sysfs Mitch Williams (1): iavf: validate pointers Nathan Chancellor (2): hexagon: export raw I/O routines for modules hexagon: clean up timer-regs.h Nguyen Dinh Phi (1): cfg80211: call cfg80211_stop_ap when switch from P2P_GO type Nicholas Nunley (2): iavf: check for null in iavf_fix_features iavf: free q_vectors before queues in iavf_disable_vf Nick Desaulniers (2): sh: check return code of request_irq arm64: vdso32: suppress error message for 'make mrproper' Nicolas Dichtel (1): tun: fix bonding active backup with arp monitoring Nikolay Borisov (1): btrfs: fix memory ordering between normal and ordered work functions Ondrej Mosnacek (1): selinux: fix NULL-pointer dereference when hashtab allocation fails Paul Cercueil (1): clk: ingenic: Fix bugs with divided dividers Pavel Skripkin (2): net: bnx2x: fix variable dereferenced before check net: dpaa2-eth: fix use-after-free in dpaa2_eth_remove Pierre-Louis Bossart (4): ASoC: SOF: Intel: hda-dai: fix potential locking issue ALSA: intel-dsp-config: add quirk for APL/GLK/TGL devices based on ES8336 codec ALSA: hda: hdac_ext_stream: fix potential locking issues ALSA: hda: hdac_stream: fix potential locking issue in snd_hdac_stream_assign() Piotr Marczak (1): iavf: Fix failure to exit out from last all-multicast mode Punit Agrawal (1): net: stmmac: dwmac-rk: Fix ethernet on rk3399 based devices Raed Salem (1): net/mlx5: E-Switch, return error if encap isn't supported Randy Dunlap (8): ALSA: ISA: not for M68K sh: fix kconfig unmet dependency warning for FRAME_POINTER sh: math-emu: drop unused functions sh: define __BIG_ENDIAN for math-emu mips: BCM63XX: ensure that CPU_SUPPORTS_32BIT_KERNEL is set mips: bcm63xx: add support for clk_get_parent() mips: lantiq: add support for clk_get_parent() x86/Kconfig: Fix an unused variable error in dell-smm-hwmon Roger Quadros (1): ARM: dts: omap: fix gpmc,mux-add-data type Roi Dayan (1): net/mlx5: E-Switch, Change mode lock from mutex to rw semaphore Rustam Kovhaev (1): mm: kmemleak: slob: respect SLAB_NOLEAKTRACE flag Sasha Levin (1): Revert "perf: Rework perf_event_exit_event()" Sean Christopherson (1): x86/hyperv: Fix NULL deref in set_hv_tscchange_cb() if Hyper-V setup fails Selvin Xavier (1): RDMA/bnxt_re: Check if the vlan is valid before reporting Shawn Guo (1): arm64: dts: qcom: ipq6018: Fix qcom,controlled-remotely property Sohaib Mohamed (1): perf bench futex: Fix memory leak of perf_cpu_map__new() Sriharsha Basavapatna (1): bnxt_en: reject indirect blk offload when hw-tc-offload is off Stefan Riedmueller (1): clk: imx: imx6ul: Move csi_sel mux to correct base register Steven Rostedt (VMware) (1): tracing: Add length protection to histogram string copies Surabhi Boob (1): iavf: Fix for the false positive ASQ/ARQ errors while issuing VF reset Sven Peter (1): usb: typec: tipd: Remove WARN_ON in tps6598x_block_read Sven Schnelle (1): parisc/sticon: fix reverse colors Tadeusz Struk (1): tipc: check for null after calling kmemdup Takashi Iwai (1): ASoC: DAPM: Cover regression by kctl change notification fix Teng Qi (1): iio: imu: st_lsm6dsx: Avoid potential array overflow in st_lsm6dsx_set_odr() Tetsuo Handa (1): sock: fix /proc/net/sockstat underflow in sk_clone_lock() Tony Lindgren (2): bus: ti-sysc: Add quirk handling for reinit on context lost bus: ti-sysc: Use context lost quirk for otg Uwe Kleine-König (1): usb: max-3421: Use driver data instead of maintaining a list of bound devices Valentine Fatiev (1): net/mlx5e: nullify cq->dbg pointer in mlx5_debug_cq_remove() Vincent Donnefort (1): sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain() Wen Gu (1): net/smc: Make sure the link_id is unique Xin Long (2): tipc: only accept encrypted MSG_CRYPTO msgs net: sched: act_mirred: drop dst for the direction from egress to ingress Yang Yingliang (2): usb: musb: tusb6010: check return value after calling platform_get_resource() usb: host: ohci-tmio: check return value after calling platform_get_resource() hongao (1): drm/amdgpu: fix set scaling mode Full/Full aspect/Center not works on vga and dvi connectors arch/arm/boot/dts/bcm-nsp.dtsi | 4 +- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 22 ++ arch/arm/boot/dts/ls1021a-tsn.dts | 2 +- arch/arm/boot/dts/ls1021a.dtsi | 66 +++--- arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 2 +- .../boot/dts/omap3-overo-tobiduo-common.dtsi | 2 +- arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 6 +- .../arm/boot/dts/ste-ux500-samsung-skomer.dts | 8 +- arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 4 +- arch/arm/boot/dts/sun8i-h3.dtsi | 4 +- .../arm64/boot/dts/allwinner/sun50i-a100.dtsi | 6 +- .../dts/allwinner/sun50i-a64-cpu-opp.dtsi | 2 +- .../boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- .../boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi | 2 +- .../arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 16 +- .../arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 16 +- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 +- arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 +- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8998.dtsi | 20 +- .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 - .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 +- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +- arch/arm64/kernel/vdso32/Makefile | 3 +- arch/hexagon/include/asm/timer-regs.h | 26 --- arch/hexagon/include/asm/timex.h | 3 +- arch/hexagon/kernel/time.c | 12 +- arch/hexagon/lib/io.c | 4 + arch/mips/Kconfig | 3 + arch/mips/bcm63xx/clk.c | 6 + arch/mips/generic/yamon-dt.c | 2 +- arch/mips/lantiq/clk.c | 6 + arch/mips/sni/time.c | 4 +- arch/powerpc/boot/dts/charon.dts | 2 +- arch/powerpc/boot/dts/digsy_mtc.dts | 2 +- arch/powerpc/boot/dts/lite5200.dts | 2 +- arch/powerpc/boot/dts/lite5200b.dts | 2 +- arch/powerpc/boot/dts/media5200.dts | 2 +- arch/powerpc/boot/dts/mpc5200b.dtsi | 2 +- arch/powerpc/boot/dts/o2d.dts | 2 +- arch/powerpc/boot/dts/o2d.dtsi | 2 +- arch/powerpc/boot/dts/o2dnt2.dts | 2 +- arch/powerpc/boot/dts/o3dnt.dts | 2 +- arch/powerpc/boot/dts/pcm032.dts | 2 +- arch/powerpc/boot/dts/tqm5200.dts | 2 +- arch/powerpc/kernel/head_8xx.S | 13 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +- arch/powerpc/sysdev/dcr-low.S | 2 +- arch/s390/include/asm/kexec.h | 6 + arch/s390/kernel/ipl.c | 3 +- arch/s390/kernel/machine_kexec_file.c | 18 +- arch/sh/Kconfig.debug | 1 + arch/sh/include/asm/sfp-machine.h | 8 + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +- arch/sh/math-emu/math.c | 103 ---------- arch/x86/Kconfig | 3 +- arch/x86/events/intel/core.c | 4 +- arch/x86/events/intel/uncore_snbep.c | 4 + arch/x86/hyperv/hv_init.c | 3 + arch/x86/kvm/vmx/nested.c | 22 +- block/ioprio.c | 9 +- drivers/base/firmware_loader/main.c | 13 +- drivers/bus/ti-sysc.c | 110 +++++++++- drivers/clk/clk-ast2600.c | 12 +- drivers/clk/imx/clk-imx6ul.c | 2 +- drivers/clk/ingenic/cgu.c | 6 +- drivers/clk/qcom/gcc-msm8996.c | 15 -- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 4 +- .../amd/display/dc/dml/display_mode_enums.h | 4 +- drivers/gpu/drm/i915/display/intel_dp.c | 11 + .../drm/nouveau/nvkm/engine/disp/hdmigv100.c | 1 - drivers/gpu/drm/udl/udl_connector.c | 2 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 12 +- .../ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 2 +- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- drivers/net/ethernet/intel/e100.c | 18 +- drivers/net/ethernet/intel/i40e/i40e.h | 2 + drivers/net/ethernet/intel/i40e/i40e_main.c | 160 +++++++++------ .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 121 ++++------- .../net/ethernet/intel/iavf/iavf_ethtool.c | 30 ++- drivers/net/ethernet/intel/iavf/iavf_main.c | 14 +- drivers/net/ethernet/intel/ice/ice_main.c | 3 - drivers/net/ethernet/mellanox/mlx5/core/cq.c | 5 +- .../net/ethernet/mellanox/mlx5/core/debugfs.c | 4 +- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 11 +- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- .../mellanox/mlx5/core/eswitch_offloads.c | 28 +-- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 28 ++- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 5 + .../ethernet/stmicro/stmmac/dwmac-socfpga.c | 24 ++- drivers/net/ipa/ipa_endpoint.c | 2 + drivers/net/tun.c | 5 + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 + drivers/platform/x86/hp_accel.c | 2 + drivers/scsi/advansys.c | 4 +- drivers/scsi/lpfc/lpfc_sli.c | 1 + drivers/scsi/qla2xxx/qla_mbx.c | 6 +- drivers/scsi/scsi_sysfs.c | 30 ++- drivers/scsi/ufs/ufshcd.c | 57 +++--- drivers/scsi/ufs/ufshcd.h | 1 + drivers/sh/maple/maple.c | 5 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 10 +- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 22 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 16 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 - drivers/staging/wfx/bus_sdio.c | 17 +- drivers/target/target_core_alua.c | 1 - drivers/target/target_core_device.c | 2 + drivers/target/target_core_internal.h | 1 + drivers/target/target_core_transport.c | 76 +++++-- drivers/tty/tty_buffer.c | 3 + drivers/usb/host/max3421-hcd.c | 25 +-- drivers/usb/host/ohci-tmio.c | 2 +- drivers/usb/musb/tusb6010.c | 5 + drivers/usb/typec/tps6598x.c | 2 +- drivers/video/console/sticon.c | 12 +- fs/btrfs/async-thread.c | 14 ++ fs/btrfs/volumes.c | 21 +- fs/f2fs/f2fs.h | 3 +- fs/f2fs/super.c | 4 +- fs/inode.c | 7 +- fs/udf/dir.c | 32 ++- fs/udf/namei.c | 3 + fs/udf/super.c | 2 + include/linux/fs.h | 2 + include/linux/perf_event.h | 1 - include/linux/platform_data/ti-sysc.h | 1 + include/linux/trace_events.h | 2 +- include/linux/virtio_net.h | 7 +- include/net/nfc/nci_core.h | 1 + include/rdma/rdma_netlink.h | 2 +- include/sound/hdaudio_ext.h | 2 + include/target/target_core_base.h | 6 +- include/trace/events/f2fs.h | 12 +- include/uapi/linux/tcp.h | 2 + ipc/util.c | 6 +- kernel/events/core.c | 142 ++++++------- kernel/sched/core.c | 3 + kernel/trace/trace_events_hist.c | 14 +- mm/slab.h | 2 +- net/core/sock.c | 189 +++++++++--------- net/ipv4/tcp.c | 122 ++++++++--- net/nfc/core.c | 32 +-- net/nfc/nci/core.c | 34 +++- net/sched/act_mirred.c | 11 +- net/smc/smc_core.c | 3 +- net/tipc/crypto.c | 4 + net/tipc/link.c | 7 +- net/wireless/util.c | 1 + security/selinux/ss/hashtab.c | 17 +- sound/core/Makefile | 2 + sound/hda/ext/hdac_ext_stream.c | 46 +++-- sound/hda/hdac_stream.c | 4 +- sound/hda/intel-dsp-config.c | 22 +- sound/isa/Kconfig | 2 +- sound/isa/gus/gus_dma.c | 2 + sound/pci/Kconfig | 1 + sound/soc/codecs/nau8824.c | 40 ++++ sound/soc/soc-dapm.c | 29 ++- sound/soc/sof/intel/hda-dai.c | 7 +- tools/perf/bench/futex-lock-pi.c | 1 + tools/perf/bench/futex-requeue.c | 1 + tools/perf/bench/futex-wake-parallel.c | 1 + tools/perf/bench/futex-wake.c | 1 + .../tests/shell/record+zstd_comp_decomp.sh | 2 +- tools/perf/util/bpf-event.c | 6 +- tools/perf/util/env.c | 5 +- tools/perf/util/env.h | 2 +- 174 files changed, 1413 insertions(+), 964 deletions(-) delete mode 100644 arch/hexagon/include/asm/timer-regs.h -- 2.20.1

1 146

[PATCH openEuler-5.10 01/16] drm/i915/guc: Update to use firmware v49.0.1
by Zheng Zengkai 14 Jan '22

14 Jan '22

From: John Harrison <John.C.Harrison(a)Intel.com> mainline inclusion from mainline-5.11-rc1 commit c784e5249e773689e38d2bc1749f08b986621a26 bugzilla: 185850 https://gitee.com/openeuler/kernel/issues/I4DDEL CVE: CVE-2020-12363, CVE-2020-12364 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- The latest GuC firmware includes a number of interface changes that require driver updates to match. * Starting from Gen11, the ID to be provided to GuC needs to contain the engine class in bits [0..2] and the instance in bits [3..6]. NOTE: this patch breaks pointer dereferences in some existing GuC functions that use the guc_id to dereference arrays but these functions are not used for now as we have GuC submission disabled and we will update these functions in follow up patch which requires new IDs. * The new GuC requires the additional data structure (ADS) and associated 'private_data' pointer to be setup. This is basically a scratch area of memory that the GuC owns. The size is read from the CSS header. * There is now a physical to logical engine mapping table in the ADS which needs to be configured in order for the firmware to load. For now, the table is initialised with a 1 to 1 mapping. * GUC_CTL_CTXINFO has been removed from the initialization params. * reg_state_buffer is maintained internally by the GuC as part of the private data. * The ADS layout has changed significantly. This patch updates the shared structure and also adds better documentation of the layout. * While i915 does not use GuC doorbells, the firmware now requires that some initialisation is done. * The number of engine classes and instances supported in the ADS has been increased. Signed-off-by: John Harrison <John.C.Harrison(a)Intel.com> Signed-off-by: Matthew Brost <matthew.brost(a)intel.com> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio(a)intel.com> Signed-off-by: Oscar Mateo <oscar.mateo(a)intel.com> Signed-off-by: Michel Thierry <michel.thierry(a)intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Signed-off-by: Michal Wajdeczko <michal.wajdeczko(a)intel.com> Cc: Michal Winiarski <michal.winiarski(a)intel.com> Cc: Tomasz Lis <tomasz.lis(a)intel.com> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio(a)intel.com> Signed-off-by: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20201028145826.2949180-2-John… Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 18 --- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 131 +++++++++++++++---- drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 80 +++++------ drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 5 + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 27 ++-- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 6 +- 8 files changed, 176 insertions(+), 96 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index a19537706ed1..c940ac3aae2f 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -305,8 +305,9 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) engine->i915 = i915; engine->gt = gt; engine->uncore = gt->uncore; - engine->hw_id = engine->guc_id = info->hw_id; engine->mmio_base = __engine_mmio_base(i915, info->mmio_bases); + engine->hw_id = info->hw_id; + engine->guc_id = MAKE_GUC_ID(info->class, info->instance); engine->class = info->class; engine->instance = info->instance; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c index 942c7c187adb..6909da1e1a73 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c @@ -213,23 +213,6 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc) return flags; } -static u32 guc_ctl_ctxinfo_flags(struct intel_guc *guc) -{ - u32 flags = 0; - - if (intel_guc_submission_is_used(guc)) { - u32 ctxnum, base; - - base = intel_guc_ggtt_offset(guc, guc->stage_desc_pool); - ctxnum = GUC_MAX_STAGE_DESCRIPTORS / 16; - - base >>= PAGE_SHIFT; - flags |= (base << GUC_CTL_BASE_ADDR_SHIFT) | - (ctxnum << GUC_CTL_CTXNUM_IN16_SHIFT); - } - return flags; -} - static u32 guc_ctl_log_params_flags(struct intel_guc *guc) { u32 offset = intel_guc_ggtt_offset(guc, guc->log.vma) >> PAGE_SHIFT; @@ -291,7 +274,6 @@ static void guc_init_params(struct intel_guc *guc) BUILD_BUG_ON(sizeof(guc->params) != GUC_CTL_MAX_DWORDS * sizeof(u32)); - params[GUC_CTL_CTXINFO] = guc_ctl_ctxinfo_flags(guc); params[GUC_CTL_LOG_PARAMS] = guc_ctl_log_params_flags(guc); params[GUC_CTL_FEATURE] = guc_ctl_feature_flags(guc); params[GUC_CTL_DEBUG] = guc_ctl_debug_flags(guc); diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c index d44061033f23..7950d28beb8c 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c @@ -10,11 +10,52 @@ /* * The Additional Data Struct (ADS) has pointers for different buffers used by - * the GuC. One single gem object contains the ADS struct itself (guc_ads), the - * scheduling policies (guc_policies), a structure describing a collection of - * register sets (guc_mmio_reg_state) and some extra pages for the GuC to save - * its internal state for sleep. + * the GuC. One single gem object contains the ADS struct itself (guc_ads) and + * all the extra buffers indirectly linked via the ADS struct's entries. + * + * Layout of the ADS blob allocated for the GuC: + * + * +---------------------------------------+ <== base + * | guc_ads | + * +---------------------------------------+ + * | guc_policies | + * +---------------------------------------+ + * | guc_gt_system_info | + * +---------------------------------------+ + * | guc_clients_info | + * +---------------------------------------+ + * | guc_ct_pool_entry[size] | + * +---------------------------------------+ + * | padding | + * +---------------------------------------+ <== 4K aligned + * | private data | + * +---------------------------------------+ + * | padding | + * +---------------------------------------+ <== 4K aligned */ +struct __guc_ads_blob { + struct guc_ads ads; + struct guc_policies policies; + struct guc_gt_system_info system_info; + struct guc_clients_info clients_info; + struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE]; +} __packed; + +static u32 guc_ads_private_data_size(struct intel_guc *guc) +{ + return PAGE_ALIGN(guc->fw.private_data_size); +} + +static u32 guc_ads_private_data_offset(struct intel_guc *guc) +{ + return PAGE_ALIGN(sizeof(struct __guc_ads_blob)); +} + +static u32 guc_ads_blob_size(struct intel_guc *guc) +{ + return guc_ads_private_data_offset(guc) + + guc_ads_private_data_size(guc); +} static void guc_policy_init(struct guc_policy *policy) { @@ -48,26 +89,37 @@ static void guc_ct_pool_entries_init(struct guc_ct_pool_entry *pool, u32 num) memset(pool, 0, num * sizeof(*pool)); } +static void guc_mapping_table_init(struct intel_gt *gt, + struct guc_gt_system_info *system_info) +{ + unsigned int i, j; + struct intel_engine_cs *engine; + enum intel_engine_id id; + + /* Table must be set to invalid values for entries not used */ + for (i = 0; i < GUC_MAX_ENGINE_CLASSES; ++i) + for (j = 0; j < GUC_MAX_INSTANCES_PER_CLASS; ++j) + system_info->mapping_table[i][j] = + GUC_MAX_INSTANCES_PER_CLASS; + + for_each_engine(engine, gt, id) { + u8 guc_class = engine->class; + + system_info->mapping_table[guc_class][engine->instance] = + engine->instance; + } +} + /* * The first 80 dwords of the register state context, containing the * execlists and ppgtt registers. */ #define LR_HW_CONTEXT_SIZE (80 * sizeof(u32)) -/* The ads obj includes the struct itself and buffers passed to GuC */ -struct __guc_ads_blob { - struct guc_ads ads; - struct guc_policies policies; - struct guc_mmio_reg_state reg_state; - struct guc_gt_system_info system_info; - struct guc_clients_info clients_info; - struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE]; - u8 reg_state_buffer[GUC_S3_SAVE_SPACE_PAGES * PAGE_SIZE]; -} __packed; - static void __guc_ads_init(struct intel_guc *guc) { struct intel_gt *gt = guc_to_gt(guc); + struct drm_i915_private *i915 = gt->i915; struct __guc_ads_blob *blob = guc->ads_blob; const u32 skipped_size = LRC_PPHWSP_SZ * PAGE_SIZE + LR_HW_CONTEXT_SIZE; u32 base; @@ -99,13 +151,25 @@ static void __guc_ads_init(struct intel_guc *guc) } /* System info */ - blob->system_info.slice_enabled = hweight8(gt->info.sseu.slice_mask); - blob->system_info.rcs_enabled = 1; - blob->system_info.bcs_enabled = 1; + blob->system_info.engine_enabled_masks[RENDER_CLASS] = 1; + blob->system_info.engine_enabled_masks[COPY_ENGINE_CLASS] = 1; + blob->system_info.engine_enabled_masks[VIDEO_DECODE_CLASS] = VDBOX_MASK(gt); + blob->system_info.engine_enabled_masks[VIDEO_ENHANCEMENT_CLASS] = VEBOX_MASK(gt); + + blob->system_info.generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_SLICE_ENABLED] = + hweight8(gt->info.sseu.slice_mask); + blob->system_info.generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_VDBOX_SFC_SUPPORT_MASK] = + gt->info.vdbox_sfc_access; + + if (INTEL_GEN(i915) >= 12 && !IS_DGFX(i915)) { + u32 distdbreg = intel_uncore_read(gt->uncore, + GEN12_DIST_DBS_POPULATED); + blob->system_info.generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_DOORBELL_COUNT_PER_SQIDI] = + ((distdbreg >> GEN12_DOORBELLS_PER_SQIDI_SHIFT) & + GEN12_DOORBELLS_PER_SQIDI) + 1; + } - blob->system_info.vdbox_enable_mask = VDBOX_MASK(gt); - blob->system_info.vebox_enable_mask = VEBOX_MASK(gt); - blob->system_info.vdbox_sfc_support_mask = gt->info.vdbox_sfc_access; + guc_mapping_table_init(guc_to_gt(guc), &blob->system_info); base = intel_guc_ggtt_offset(guc, guc->ads_vma); @@ -118,11 +182,12 @@ static void __guc_ads_init(struct intel_guc *guc) /* ADS */ blob->ads.scheduler_policies = base + ptr_offset(blob, policies); - blob->ads.reg_state_buffer = base + ptr_offset(blob, reg_state_buffer); - blob->ads.reg_state_addr = base + ptr_offset(blob, reg_state); blob->ads.gt_system_info = base + ptr_offset(blob, system_info); blob->ads.clients_info = base + ptr_offset(blob, clients_info); + /* Private Data */ + blob->ads.private_data = base + guc_ads_private_data_offset(guc); + i915_gem_object_flush_map(guc->ads_vma->obj); } @@ -135,14 +200,15 @@ static void __guc_ads_init(struct intel_guc *guc) */ int intel_guc_ads_create(struct intel_guc *guc) { - const u32 size = PAGE_ALIGN(sizeof(struct __guc_ads_blob)); + u32 size; int ret; GEM_BUG_ON(guc->ads_vma); + size = guc_ads_blob_size(guc); + ret = intel_guc_allocate_and_map_vma(guc, size, &guc->ads_vma, (void **)&guc->ads_blob); - if (ret) return ret; @@ -156,6 +222,18 @@ void intel_guc_ads_destroy(struct intel_guc *guc) i915_vma_unpin_and_release(&guc->ads_vma, I915_VMA_RELEASE_MAP); } +static void guc_ads_private_data_reset(struct intel_guc *guc) +{ + u32 size; + + size = guc_ads_private_data_size(guc); + if (!size) + return; + + memset((void *)guc->ads_blob + guc_ads_private_data_offset(guc), 0, + size); +} + /** * intel_guc_ads_reset() - prepares GuC Additional Data Struct for reuse * @guc: intel_guc struct @@ -168,5 +246,8 @@ void intel_guc_ads_reset(struct intel_guc *guc) { if (!guc->ads_vma) return; + __guc_ads_init(guc); + + guc_ads_private_data_reset(guc); } diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h index a6b733c146c9..79c560d9c0b6 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h @@ -26,8 +26,8 @@ #define GUC_VIDEO_ENGINE2 4 #define GUC_MAX_ENGINES_NUM (GUC_VIDEO_ENGINE2 + 1) -#define GUC_MAX_ENGINE_CLASSES 5 -#define GUC_MAX_INSTANCES_PER_CLASS 16 +#define GUC_MAX_ENGINE_CLASSES 16 +#define GUC_MAX_INSTANCES_PER_CLASS 32 #define GUC_DOORBELL_INVALID 256 @@ -62,12 +62,7 @@ #define GUC_STAGE_DESC_ATTR_PCH BIT(6) #define GUC_STAGE_DESC_ATTR_TERMINATED BIT(7) -/* New GuC control data */ -#define GUC_CTL_CTXINFO 0 -#define GUC_CTL_CTXNUM_IN16_SHIFT 0 -#define GUC_CTL_BASE_ADDR_SHIFT 12 - -#define GUC_CTL_LOG_PARAMS 1 +#define GUC_CTL_LOG_PARAMS 0 #define GUC_LOG_VALID (1 << 0) #define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1) #define GUC_LOG_ALLOC_IN_MEGABYTE (1 << 3) @@ -79,11 +74,11 @@ #define GUC_LOG_ISR_MASK (0x7 << GUC_LOG_ISR_SHIFT) #define GUC_LOG_BUF_ADDR_SHIFT 12 -#define GUC_CTL_WA 2 -#define GUC_CTL_FEATURE 3 +#define GUC_CTL_WA 1 +#define GUC_CTL_FEATURE 2 #define GUC_CTL_DISABLE_SCHEDULER (1 << 14) -#define GUC_CTL_DEBUG 4 +#define GUC_CTL_DEBUG 3 #define GUC_LOG_VERBOSITY_SHIFT 0 #define GUC_LOG_VERBOSITY_LOW (0 << GUC_LOG_VERBOSITY_SHIFT) #define GUC_LOG_VERBOSITY_MED (1 << GUC_LOG_VERBOSITY_SHIFT) @@ -97,12 +92,37 @@ #define GUC_LOG_DISABLED (1 << 6) #define GUC_PROFILE_ENABLED (1 << 7) -#define GUC_CTL_ADS 5 +#define GUC_CTL_ADS 4 #define GUC_ADS_ADDR_SHIFT 1 #define GUC_ADS_ADDR_MASK (0xFFFFF << GUC_ADS_ADDR_SHIFT) #define GUC_CTL_MAX_DWORDS (SOFT_SCRATCH_COUNT - 2) /* [1..14] */ +/* Generic GT SysInfo data types */ +#define GUC_GENERIC_GT_SYSINFO_SLICE_ENABLED 0 +#define GUC_GENERIC_GT_SYSINFO_VDBOX_SFC_SUPPORT_MASK 1 +#define GUC_GENERIC_GT_SYSINFO_DOORBELL_COUNT_PER_SQIDI 2 +#define GUC_GENERIC_GT_SYSINFO_MAX 16 + +/* + * The class goes in bits [0..2] of the GuC ID, the instance in bits [3..6]. + * Bit 7 can be used for operations that apply to all engine classes&instances. + */ +#define GUC_ENGINE_CLASS_SHIFT 0 +#define GUC_ENGINE_CLASS_MASK (0x7 << GUC_ENGINE_CLASS_SHIFT) +#define GUC_ENGINE_INSTANCE_SHIFT 3 +#define GUC_ENGINE_INSTANCE_MASK (0xf << GUC_ENGINE_INSTANCE_SHIFT) +#define GUC_ENGINE_ALL_INSTANCES BIT(7) + +#define MAKE_GUC_ID(class, instance) \ + (((class) << GUC_ENGINE_CLASS_SHIFT) | \ + ((instance) << GUC_ENGINE_INSTANCE_SHIFT)) + +#define GUC_ID_TO_ENGINE_CLASS(guc_id) \ + (((guc_id) & GUC_ENGINE_CLASS_MASK) >> GUC_ENGINE_CLASS_SHIFT) +#define GUC_ID_TO_ENGINE_INSTANCE(guc_id) \ + (((guc_id) & GUC_ENGINE_INSTANCE_MASK) >> GUC_ENGINE_INSTANCE_SHIFT) + /* Work item for submitting workloads into work queue of GuC. */ struct guc_wq_item { u32 header; @@ -336,11 +356,6 @@ struct guc_policies { } __packed; /* GuC MMIO reg state struct */ - - -#define GUC_REGSET_MAX_REGISTERS 64 -#define GUC_S3_SAVE_SPACE_PAGES 10 - struct guc_mmio_reg { u32 offset; u32 value; @@ -348,28 +363,18 @@ struct guc_mmio_reg { #define GUC_REGSET_MASKED (1 << 0) } __packed; -struct guc_mmio_regset { - struct guc_mmio_reg registers[GUC_REGSET_MAX_REGISTERS]; - u32 values_valid; - u32 number_of_registers; -} __packed; - /* GuC register sets */ -struct guc_mmio_reg_state { - struct guc_mmio_regset engine_reg[GUC_MAX_ENGINE_CLASSES][GUC_MAX_INSTANCES_PER_CLASS]; - u32 reserved[98]; +struct guc_mmio_reg_set { + u32 address; + u16 count; + u16 reserved; } __packed; /* HW info */ struct guc_gt_system_info { - u32 slice_enabled; - u32 rcs_enabled; - u32 reserved0; - u32 bcs_enabled; - u32 vdbox_enable_mask; - u32 vdbox_sfc_support_mask; - u32 vebox_enable_mask; - u32 reserved[9]; + u8 mapping_table[GUC_MAX_ENGINE_CLASSES][GUC_MAX_INSTANCES_PER_CLASS]; + u32 engine_enabled_masks[GUC_MAX_ENGINE_CLASSES]; + u32 generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_MAX]; } __packed; /* Clients info */ @@ -390,15 +395,16 @@ struct guc_clients_info { /* GuC Additional Data Struct */ struct guc_ads { - u32 reg_state_addr; - u32 reg_state_buffer; + struct guc_mmio_reg_set reg_state_list[GUC_MAX_ENGINE_CLASSES][GUC_MAX_INSTANCES_PER_CLASS]; + u32 reserved0; u32 scheduler_policies; u32 gt_system_info; u32 clients_info; u32 control_data; u32 golden_context_lrca[GUC_MAX_ENGINE_CLASSES]; u32 eng_state_size[GUC_MAX_ENGINE_CLASSES]; - u32 reserved[16]; + u32 private_data; + u32 reserved[15]; } __packed; /* GuC logging structures */ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h index 1949346e714e..b37fc2ffaef2 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h @@ -118,6 +118,11 @@ struct guc_doorbell_info { #define GEN8_DRB_VALID (1<<0) #define GEN8_DRBREGU(x) _MMIO(0x1000 + (x) * 8 + 4) +#define GEN12_DIST_DBS_POPULATED _MMIO(0xd08) +#define GEN12_DOORBELLS_PER_SQIDI_SHIFT 16 +#define GEN12_DOORBELLS_PER_SQIDI (0xff) +#define GEN12_SQIDIS_DOORBELL_EXIST (0xffff) + #define DE_GUCRMR _MMIO(0x44054) #define GUC_BCS_RCS_IER _MMIO(0xC550) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index 80e8b6c3bc8c..ee4ac3922277 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -44,23 +44,19 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, * List of required GuC and HuC binaries per-platform. * Must be ordered based on platform + revid, from newer to older. * - * TGL 35.2 is interface-compatible with 33.0 for previous Gens. The deltas - * between 33.0 and 35.2 are only related to new additions to support new Gen12 - * features. - * * Note that RKL uses the same firmware as TGL. */ #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \ - fw_def(ROCKETLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 5, 0)) \ - fw_def(TIGERLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 5, 0)) \ - fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \ - fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \ - fw_def(COMETLAKE, 5, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0)) \ - fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \ - fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 4, 0, 0)) \ - fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \ - fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 2, 0, 0)) \ - fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 2, 0, 0)) + fw_def(ROCKETLAKE, 0, guc_def(tgl, 49, 0, 1), huc_def(tgl, 7, 5, 0)) \ + fw_def(TIGERLAKE, 0, guc_def(tgl, 49, 0, 1), huc_def(tgl, 7, 5, 0)) \ + fw_def(ELKHARTLAKE, 0, guc_def(ehl, 49, 0, 1), huc_def(ehl, 9, 0, 0)) \ + fw_def(ICELAKE, 0, guc_def(icl, 49, 0, 1), huc_def(icl, 9, 0, 0)) \ + fw_def(COMETLAKE, 5, guc_def(cml, 49, 0, 1), huc_def(cml, 4, 0, 0)) \ + fw_def(COFFEELAKE, 0, guc_def(kbl, 49, 0, 1), huc_def(kbl, 4, 0, 0)) \ + fw_def(GEMINILAKE, 0, guc_def(glk, 49, 0, 1), huc_def(glk, 4, 0, 0)) \ + fw_def(KABYLAKE, 0, guc_def(kbl, 49, 0, 1), huc_def(kbl, 4, 0, 0)) \ + fw_def(BROXTON, 0, guc_def(bxt, 49, 0, 1), huc_def(bxt, 2, 0, 0)) \ + fw_def(SKYLAKE, 0, guc_def(skl, 49, 0, 1), huc_def(skl, 2, 0, 0)) #define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \ "i915/" \ @@ -371,6 +367,9 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) } } + if (uc_fw->type == INTEL_UC_FW_TYPE_GUC) + uc_fw->private_data_size = css->private_data_size; + obj = i915_gem_object_create_shmem_from_data(i915, fw->data, fw->size); if (IS_ERR(obj)) { err = PTR_ERR(obj); diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h index 23d3a423ac0f..99bb1fe1af66 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h @@ -88,6 +88,8 @@ struct intel_uc_fw { u32 rsa_size; u32 ucode_size; + + u32 private_data_size; }; #ifdef CONFIG_DRM_I915_DEBUG_GUC diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h index 029214cdedd5..e41ffc7a7fbc 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h @@ -69,7 +69,11 @@ struct uc_css_header { #define CSS_SW_VERSION_UC_MAJOR (0xFF << 16) #define CSS_SW_VERSION_UC_MINOR (0xFF << 8) #define CSS_SW_VERSION_UC_PATCH (0xFF << 0) - u32 reserved[14]; + u32 reserved0[13]; + union { + u32 private_data_size; /* only applies to GuC */ + u32 reserved1; + }; u32 header_info; } __packed; static_assert(sizeof(struct uc_css_header) == 128); -- 2.20.1

1 15

[PATCH OLK-5.10] x86/tsc: Make cur->adjusted values in package#1 to be the same
by LeoLiuoc 14 Jan '22

14 Jan '22

When resume from S4 on Zhaoxin 2 packages platform that support X86_FEATURE_TSC_ADJUST, the following warning messages appear: [ 327.445302] [Firmware Bug]: TSC ADJUST differs: CPU15 45960750 --> 78394770. Restoring [ 329.209120] [Firmware Bug]: TSC ADJUST differs: CPU14 45960750 --> 78394770. Restoring [ 329.209128] [Firmware Bug]: TSC ADJUST differs: CPU13 45960750 --> 78394770. Restoring [ 329.209138] [Firmware Bug]: TSC ADJUST differs: CPU12 45960750 --> 78394770. Restoring [ 329.209151] [Firmware Bug]: TSC ADJUST differs: CPU11 45960750 --> 78394770. Restoring [ 329.209160] [Firmware Bug]: TSC ADJUST differs: CPU10 45960750 --> 78394770. Restoring [ 329.209169] [Firmware Bug]: TSC ADJUST differs: CPU9 45960750 --> 78394770. Restoring The reason is: Step 1: Bring up. TSC is sync after bring up with following settings: MSR 0x3b cur->adjusted Package#0 CPU 0-7 0 0 Package#1 first CPU value1 value1 Package#1 non-first CPU value1 value1 Step 2: Suspend to S4. Settings in Step 1 are not changed in this Step. Step 3: Bring up caused by S4 wake up event. TSC is sync when bring up with following settings: MSR 0x3b cur->adjusted Package#0 CPU 0-7 0 0 Package#1 first CPU value2 value2 Package#1 non-first CPU value2 value2 Step 4: Resume from S4. When resuming from S4, Current TSC synchronous mechanism cause following settings: MSR 0x3b cur->adjusted Package#0 CPU 0-7 0 0 Package#1 first CPU value2 value2 Package#1 non-first CPU value2 value1 In these Steps, value1 != 0 and value2 != value1. In Step4, as function tsc_store_and_check_tsc_adjust() do, when the value of MSR 0x3b on the non-first online CPU in package#1 is equal to the value of cur->adjusted on the first online CPU in the same package, the cur->adjusted value on this non-first online CPU will hold the old value1. This cause function tsc_verify_tsc_adjust() set the value of MSR 0x3b on the non-first online CPUs in the package#1 to the old value1 and print the beginning warning messages. Fix it by setting cur->adjusted value on the non-first online CPU in a package to the value of MSR 0x3b on the same CPU when they are not equal. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- arch/x86/kernel/tsc_sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index 3d3c761eb..19a0bed9b 100644 --- a/arch/x86/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c @@ -190,6 +190,8 @@ bool tsc_store_and_check_tsc_adjust(bool bootcpu) if (bootval != ref->adjusted) { cur->adjusted = ref->adjusted; wrmsrl(MSR_IA32_TSC_ADJUST, ref->adjusted); + } else if (cur->adjusted != bootval) { + cur->adjusted = bootval; } /* * We have the TSCs forced to be in sync on this package. Skip sync -- 2.20.1

1 0

[PATCH OLK-5.10] Add support for PxSCT.LPM set based on actual LPM circumstances
by LeoLiuoc 14 Jan '22

14 Jan '22

AHCI Spec shows that the PxSCTL.IPM field in each port must be programmed to disallow device initiated LPM requests when HBA can not support transitions to the LPM state. The current LPM driver has no restrictions on LPM transitions when enabling device initiated LPM. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/ata/libata-sata.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c index c16423e44..7e1296b55 100644 --- a/drivers/ata/libata-sata.c +++ b/drivers/ata/libata-sata.c @@ -394,9 +394,18 @@ int sata_link_scr_lpm(struct ata_link *link, enum ata_lpm_policy policy, case ATA_LPM_MED_POWER_WITH_DIPM: case ATA_LPM_MIN_POWER_WITH_PARTIAL: case ATA_LPM_MIN_POWER: - if (ata_link_nr_enabled(link) > 0) + if (ata_link_nr_enabled(link) > 0) { /* no restrictions on LPM transitions */ scontrol &= ~(0x7 << 8); + /* if Host does not support partial, then disallows it, + * the same for slumber + */ + if (!(link->ap->host->flags & ATA_HOST_PART)) + scontrol |= (0x1 << 8); + + if (!(link->ap->host->flags & ATA_HOST_SSC)) + scontrol |= (0x2 << 8); + } else { /* empty port, power off */ scontrol &= ~0xf; -- 2.20.1

1 0

[PATCH OLK-5.10] Add support for PxSCT.LPM setting based on actual LPM circumstances
by LeoLiuoc 14 Jan '22

14 Jan '22

In AHCI spec, PhyRdy Change Interrupt cannot coexist with Link Power Management (LPM). While LPM driver would disable PhyRdy Change interrupt without checking whether HBA supports LPM or not before enabling it. Therefore, if enabling LPM from LPM driver by default, we can not disable it from BIOS without influence Hotplug out capability. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/ata/ahci.c | 9 +++++++++ drivers/ata/libata-eh.c | 4 ++++ include/linux/libata.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index f8059eed3..2d1ac1b5b 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1883,6 +1883,15 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) else dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n"); + if (hpriv->cap & HOST_CAP_PART) + host->flags |= ATA_HOST_PART; + + if (hpriv->cap & HOST_CAP_SSC) + host->flags |= ATA_HOST_SSC; + + if (hpriv->cap2 & HOST_CAP2_SDS) + host->flags |= ATA_HOST_DEVSLP; + if (pi.flags & ATA_FLAG_EM) ahci_reset_em(host); diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index b6f92050e..ff6e660d6 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -3237,6 +3237,10 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, unsigned int err_mask; int rc; + /* if Host does not support lpm, then sets no LPM flags*/ + if (!(ap->host->flags & (ATA_HOST_PART | ATA_HOST_SSC | ATA_HOST_DEVSLP))) + link->flags |= ATA_LFLAG_NO_LPM; + /* if the link or host doesn't do LPM, noop */ if (!IS_ENABLED(CONFIG_SATA_HOST) || (link->flags & ATA_LFLAG_NO_LPM) || (ap && !ap->ops->set_lpm)) diff --git a/include/linux/libata.h b/include/linux/libata.h index 5f550eb27..81124ddc2 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -260,6 +260,10 @@ enum { ATA_HOST_PARALLEL_SCAN = (1 << 2), /* Ports on this host can be scanned in parallel */ ATA_HOST_IGNORE_ATA = (1 << 3), /* Ignore ATA devices on this host. */ + ATA_HOST_PART = (1 << 4), /* Host support partial.*/ + ATA_HOST_SSC = (1 << 5), /* Host support slumber.*/ + ATA_HOST_DEVSLP = (1 << 6), /* Host support devslp.*/ + /* bits 24:31 of host->flags are reserved for LLD specific flags */ /* various lengths of time */ -- 2.20.1

1 0

[PATCH OLK-5.10] Fix some bugs like plugin support and sata link stability when user enable ahci RTD3
by LeoLiuoc 14 Jan '22

14 Jan '22

The kernel driver now will disable interrupt when port is suspended, causing plugin not work. It is useful to make plugin work，when the plugin interrupt is enabled with power management status. Adding pm_request_resume() is to reume port for plugin or PME signal waking up controller which in D3. with the AHCI controller frequently enters into D3 and leaves from D3, the identify cmd may be timeout when controller resumes and establishes a connect with the device.it is effective to delay 10ms between controller resume and port resume，with link’s smooth transition. with non power management request and power management competing with each other in queue, it is often found that block IO hang 120s when system disk is suspending or resuming.it is now guaranteed that PM requests will enter the queue no matter other non-PM requests are waiting. Increase the pm_only counter before checking whether any non-PM blk_queue_enter() calls are in progress. Meanwhile, the new blk_pm_request_resume() call is necessary to occur during request assigned to a queue when device is suspended. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/ata/ahci.c | 13 +++++++++++++ drivers/ata/libahci.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 33192a8f6..617cfcb2b 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -868,6 +868,19 @@ static int ahci_pci_device_runtime_resume(struct device *dev) if (rc) return rc; ahci_pci_init_controller(host); + + /* controller delay for 10ms when being reusmed && + * port resume for Zx platform + */ + if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) { + ata_msleep(NULL, 10); + for (rc = 0; rc < host->n_ports; rc++) { + struct ata_port *ap = host->ports[rc]; + + pm_request_resume(&ap->tdev); + } + } + return 0; } diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index fec2e9754..a37eac335 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -826,6 +826,12 @@ static void ahci_power_down(struct ata_port *ap) void __iomem *port_mmio = ahci_port_base(ap); u32 cmd, scontrol; + /* port suspended enable Plugin intr for Zx platform */ + struct pci_dev *pdev = to_pci_dev(ap->host->dev); + + if ((pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) && (!ap->link.device->sdev)) + writel(PORT_IRQ_CONNECT, port_mmio + PORT_IRQ_MASK); + if (!(hpriv->cap & HOST_CAP_SSS)) return; @@ -1703,6 +1709,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) struct ata_eh_info *active_ehi; bool fbs_need_dec = false; u32 serror; + struct pci_dev *pdev; /* determine active link with error */ if (pp->fbs_enabled) { @@ -1791,6 +1798,13 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) ata_ehi_push_desc(host_ehi, "%s", irq_stat & PORT_IRQ_CONNECT ? "connection status changed" : "PHY RDY changed"); + /* when plugin intr happen,now resume suspended port for Zx platform */ + pdev = to_pci_dev(ap->host->dev); + if ((pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) && + (ap->pflags & ATA_PFLAG_SUSPENDED)) { + pm_request_resume(&ap->tdev); + return; + } } /* okay, let's hand over to EH */ -- 2.20.1

1 0

[PATCH OLK-5.10] EHCI:Clear wakeup signal locked in S0 state when device plug in
by LeoLiuoc 14 Jan '22

14 Jan '22

If we plug in a LS/FS device on USB2 port of EHCI, it will latch a wakeup signal in EHCI internal. This is a bug of EHCI for Some project of ZhaoXin. If enable EHCI runtime suspend and no device attach. PM core will let EHCI go to D3 to save power. However, once EHCI go to D3, it will release wakeup signal that latched on device connect to port during S0. Which will generate a SCI interrupt and bring EHCI to D0. But without device connect, EHCI will go to D3 again. So, there is suspend-resume loop and generate SCI interrupt Continuously. In order to fix this issues, we need to clear the wakeup signal latched in EHCI when EHCI suspend function is called. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/pci/pci-driver.c | 6 +++++- drivers/usb/host/ehci-hcd.c | 21 +++++++++++++++++++++ drivers/usb/host/ehci-pci.c | 4 ++++ drivers/usb/host/ehci.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 8b587fc97..c33d7e0a6 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -518,7 +518,11 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev) } pci_restore_state(pci_dev); - pci_pme_restore(pci_dev); + if (!((pci_dev->vendor == PCI_VENDOR_ID_ZHAOXIN) && + (pci_dev->device == 0x3104) && + ((pci_dev->revision & 0xf0) == 0x90)) || + !(pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)) + pci_pme_restore(pci_dev); return 0; } diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 8aff19ff8..586e2735d 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1142,6 +1142,27 @@ int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup) return -EBUSY; } + /*clear wakeup signal locked in S0 state when device plug in*/ + if (ehci->zx_wakeup_clear == 1) { + u32 __iomem *reg = &ehci->regs->port_status[4]; + u32 t1 = ehci_readl(ehci, reg); + + t1 &= (u32)~0xf0000; + t1 |= PORT_TEST_FORCE; + ehci_writel(ehci, t1, reg); + t1 = ehci_readl(ehci, reg); + usleep_range(1000, 2000); + t1 &= (u32)~0xf0000; + ehci_writel(ehci, t1, reg); + usleep_range(1000, 2000); + t1 = ehci_readl(ehci, reg); + ehci_writel(ehci, t1 | PORT_CSC, reg); + udelay(500); + t1 = ehci_readl(ehci, &ehci->regs->status); + ehci_writel(ehci, t1 & STS_PCD, &ehci->regs->status); + ehci_readl(ehci, &ehci->regs->status); + } + return 0; } EXPORT_SYMBOL_GPL(ehci_suspend); diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index e87cf3a00..a5e27deda 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -222,6 +222,10 @@ static int ehci_pci_setup(struct usb_hcd *hcd) ehci->has_synopsys_hc_bug = 1; } break; + case PCI_VENDOR_ID_ZHAOXIN: + if (pdev->device == 0x3104 && (pdev->revision & 0xf0) == 0x90) + ehci->zx_wakeup_clear = 1; + break; } /* optional debug port, normally in the first BAR */ diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 59fd523c5..8da080a54 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -219,6 +219,7 @@ struct ehci_hcd { /* one per controller */ unsigned need_oc_pp_cycle:1; /* MPC834X port power */ unsigned imx28_write_fix:1; /* For Freescale i.MX28 */ unsigned is_aspeed:1; + unsigned zx_wakeup_clear:1; /* required for usb32 quirk */ #define OHCI_CTRL_HCFS (3 << 6) -- 2.25.1

1 0

[PATCH OLK-5.10] XHCI:Fix some device identify fail when enable xHCI runtime suspend
by LeoLiuoc 14 Jan '22

14 Jan '22

If plug out device form xhci with runtime suspend enabled. On the one hand, driver will disconnect this device and send disabled slot command to xhci. On the other hand, without no device connect to xhci, PM core will call xhci suspend function to let xhci go to D3 to save power. However there is a temporal competition to get xhci lock between disable slot command interrupt and xhci suspend. If xhci suspend function get xhci lock first, then this function will clear xhci command ring. It will get error command trb when driver to handle disable slot command interrupt. This is a serious error for driver and driver will cleanup xhci. So，any device connect to this xhci port again will not be recognized. In order to fix this issues, we let disable slot command interrupt ISR to get xhci lock first. So, add a delay in xhci suspend function before to get xhci lock. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/usb/host/xhci-pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 583a8e895..83aa8e179 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -272,6 +272,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_ZHAOXIN_HOST; } + if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) + xhci->quirks |= XHCI_SUSPEND_DELAY; /* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */ if (pdev->vendor == PCI_VENDOR_ID_VIA && -- 2.20.1

1 0

[PATCH OLK-5.10] rtc: Fix set RTC time delay 500ms on some Zhaoxin SOCs
by LeoLiuoc 14 Jan '22

14 Jan '22

When the RTC divider is changed from reset to an operating time base, the first update cycle should be 500ms later. But on some Zhaoxin SOCs, this first update cycle is one second later. So set RTC time on these Zhaoxin SOCs will causing 500ms delay. Skip setup RTC divider on these SOCs in mc146818_set_time to fix it. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/rtc/rtc-mc146818-lib.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c index 2ecd8752b..96d9d0219 100644 --- a/drivers/rtc/rtc-mc146818-lib.c +++ b/drivers/rtc/rtc-mc146818-lib.c @@ -171,8 +171,17 @@ int mc146818_set_time(struct rtc_time *time) save_control = CMOS_READ(RTC_CONTROL); CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL); +#ifdef CONFIG_X86 + if (!((boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR || + boot_cpu_data.x86_vendor == X86_VENDOR_ZHAOXIN) && + (boot_cpu_data.x86 <= 7 && boot_cpu_data.x86_model <= 59))) { + save_freq_select = CMOS_READ(RTC_FREQ_SELECT); + CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); + } +#else save_freq_select = CMOS_READ(RTC_FREQ_SELECT); CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); +#endif #ifdef CONFIG_MACH_DECSTATION CMOS_WRITE(real_yrs, RTC_DEC_YEAR); @@ -190,7 +199,14 @@ int mc146818_set_time(struct rtc_time *time) #endif CMOS_WRITE(save_control, RTC_CONTROL); +#ifdef CONFIG_X86 + if (!((boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR || + boot_cpu_data.x86_vendor == X86_VENDOR_ZHAOXIN) && + (boot_cpu_data.x86 <= 7 && boot_cpu_data.x86_model <= 59))) + CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); +#else CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); +#endif spin_unlock_irqrestore(&rtc_lock, flags); -- 2.20.1

1 0

[PATCH OLK-5.10 v2 1/3] arm64: Add memmap parameter for pmem
by Zhuling 14 Jan '22

14 Jan '22

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4O31I?from=project-issue CVE: NA Add "!" in memmap parameter, use memmap(memmap=nn[KMG]!ss[KMG]) reserve memory for pmem which register persistent memory in arm64. Signed-off-by: Zhuling <zhuling8(a)huawei.com> --- Documentation/admin-guide/kernel-parameters.txt | 9 +++++++-- arch/arm64/mm/init.c | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 64be32b..ab42db4 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2829,10 +2829,15 @@ will be eaten. memmap=nn[KMG]!ss[KMG] - [KNL,X86] Mark specific memory as protected. + [KNL,X86,ARM64] Mark specific memory as protected. Region of memory to be used, from ss to ss+nn. - The memory region may be marked as e820 type 12 (0xc) + [X86]The memory region may be marked as e820 type 12 (0xc) and is NVDIMM or ADR memory. + [ARM64]Reserve memory for persistent storage when the kernel + restart or update. the data in PMEM will not be lost and can + be loaded faster + Example: + memmap=100K!0x1a0000000 memmap=<size>%<offset>-<oldtype>+<newtype> [KNL,ACPI] Convert memory within the specified region diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 6ebfabd..b6512dc 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -56,6 +56,8 @@ s64 memstart_addr __ro_after_init = -1; EXPORT_SYMBOL(memstart_addr); +phys_addr_t start_at, mem_size; + #ifdef CONFIG_PIN_MEMORY struct resource pin_memory_resource = { .name = "Pin memory", @@ -442,6 +444,10 @@ static int __init parse_memmap_one(char *p) start_at = memparse(p + 1, &p); memblock_reserve(start_at, mem_size); memblock_mark_memmap(start_at, mem_size); + } else if (*p == '!') { + start_at = memparse(p+1, &p); + pmem_start = start_at; + pmem_size = mem_size; } else pr_info("Unrecognized memmap option, please check the parameter.\n"); -- 2.9.5

1 2

openEuler kernel技术分享第十七期 & 双周例会
by openEuler conference 14 Jan '22

14 Jan '22

您好！ Kernel SIG 邀请您参加 2021-12-31 14:00 召开的ZOOM会议(自动录制) 会议主题：openEuler kernel技术分享第十七期 & 双周例会会议内容： 14:10-15:30 openEuler kernel 技术分享第17期 - cgroup介绍会议链接：https://us06web.zoom.us/j/83118407147?pwd=elVzMVhGc2YzaDQ1TGorN2tPa1NhZz09 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the ZOOM conference(auto recording) will be held at 2021-12-31 14:00, The subject of the conference is openEuler kernel技术分享第十七期 & 双周例会, Summary: 14:10-15:30 openEuler kernel 技术分享第17期 - cgroup介绍 You can join the meeting at https://us06web.zoom.us/j/83118407147?pwd=elVzMVhGc2YzaDQ1TGorN2tPa1NhZz09. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

3 2

openEuler kernel SIG 双周例会
by openEuler conference 14 Jan '22

14 Jan '22

您好！ Kernel SIG 邀请您参加 2022-01-14 14:00 召开的ZOOM会议(自动录制) 会议主题：openEuler kernel SIG 双周例会会议内容：议题：ebpf增加机制以支持非主线helper从而保证一定的兼容性会议链接：https://us06web.zoom.us/j/86252266487?pwd=VjRNTVJzdkVwaXl6K2V1VUcxTWpEQT09 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the ZOOM conference(auto recording) will be held at 2022-01-14 14:00, The subject of the conference is openEuler kernel SIG 双周例会, Summary: 议题：ebpf增加机制以支持非主线helper从而保证一定的兼容性 You can join the meeting at https://us06web.zoom.us/j/86252266487?pwd=VjRNTVJzdkVwaXl6K2V1VUcxTWpEQT09. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

2 1

[PATCH OLK-5.10] scsi: core: Stop using DRIVER_ERROR
by Zhang Yi 14 Jan '22

14 Jan '22

From: Hannes Reinecke <hare(a)suse.de> mainline inclusion from mainline-5.14-rc1 commit ced202f7bd78eb6a79c441a8b217e0f3d38bccfc category: bugfix bugzilla: 185813 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… --------------------------- Return the actual error code in __scsi_execute() (which, according to the documentation, should have happened anyway). And audit all callers to cope with negative return values from __scsi_execute() and friends. [mkp: resolve conflict and return bool] Link: https://lore.kernel.org/r/20210427083046.31620-7-hare@suse.de Reviewed-by: Bart Van Assche <bvanassche(a)acm.org> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Hannes Reinecke <hare(a)suse.de> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> Signed-off-by: Zhang Yi <yi.zhang(a)huawei.com> --- drivers/ata/libata-scsi.c | 8 ++++++++ drivers/scsi/ch.c | 3 ++- drivers/scsi/cxlflash/superpipe.c | 2 +- drivers/scsi/scsi.c | 2 ++ drivers/scsi/scsi_ioctl.c | 4 +++- drivers/scsi/scsi_lib.c | 15 +++++++++------ drivers/scsi/scsi_scan.c | 4 ++-- drivers/scsi/scsi_transport_spi.c | 2 +- drivers/scsi/sd.c | 15 +++++++++------ drivers/scsi/sd_zbc.c | 2 +- drivers/scsi/sr_ioctl.c | 4 ++++ drivers/scsi/ufs/ufshcd.c | 2 +- drivers/scsi/virtio_scsi.c | 2 +- include/scsi/scsi.h | 7 +++++-- 14 files changed, 49 insertions(+), 23 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 48b8934970f3..c5129b9e3afd 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -409,6 +409,10 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize, sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL); + if (cmd_result < 0) { + rc = cmd_result; + goto error; + } if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ u8 *desc = sensebuf + 8; cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */ @@ -490,6 +494,10 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0, sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL); + if (cmd_result < 0) { + rc = cmd_result; + goto error; + } if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ u8 *desc = sensebuf + 8; cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */ diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index cb74ab1ae5a4..0e7d1214c3d8 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c @@ -198,7 +198,8 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd, int cmd_len, result = scsi_execute_req(ch->device, cmd, direction, buffer, buflength, &sshdr, timeout * HZ, MAX_RETRIES, NULL); - + if (result < 0) + return result; if (driver_byte(result) == DRIVER_SENSE) { if (debug) scsi_print_sense_hdr(ch->device, ch->name, &sshdr); diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c index 5dddf67dfa24..3ebb7ac86a64 100644 --- a/drivers/scsi/cxlflash/superpipe.c +++ b/drivers/scsi/cxlflash/superpipe.c @@ -369,7 +369,7 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli) goto out; } - if (driver_byte(result) == DRIVER_SENSE) { + if (result > 0 && driver_byte(result) == DRIVER_SENSE) { result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */ if (result & SAM_STAT_CHECK_CONDITION) { switch (sshdr.sense_key) { diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 6ad834d61d4c..f561caabc771 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -495,6 +495,8 @@ int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer, result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buffer, len, &sshdr, 30 * HZ, 3, NULL); + if (result < 0) + return result; if (result && scsi_sense_valid(&sshdr) && sshdr.sense_key == ILLEGAL_REQUEST && (sshdr.asc == 0x20 || sshdr.asc == 0x24) && sshdr.ascq == 0x00) diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index 14872c9dc78c..d34e1b41dc71 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c @@ -101,6 +101,8 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd, SCSI_LOG_IOCTL(2, sdev_printk(KERN_INFO, sdev, "Ioctl returned 0x%x\n", result)); + if (result < 0) + goto out; if (driver_byte(result) == DRIVER_SENSE && scsi_sense_valid(&sshdr)) { switch (sshdr.sense_key) { @@ -133,7 +135,7 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd, break; } } - +out: SCSI_LOG_IOCTL(2, sdev_printk(KERN_INFO, sdev, "IOCTL Releasing command\n")); return result; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 0a265a3e3dc6..9352a309fe55 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -245,20 +245,23 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, { struct request *req; struct scsi_request *rq; - int ret = DRIVER_ERROR << 24; + int ret; req = blk_get_request(sdev->request_queue, data_direction == DMA_TO_DEVICE ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, rq_flags & RQF_PM ? BLK_MQ_REQ_PM : 0); if (IS_ERR(req)) - return ret; - rq = scsi_req(req); + return PTR_ERR(req); - if (bufflen && blk_rq_map_kern(sdev->request_queue, req, - buffer, bufflen, GFP_NOIO)) - goto out; + rq = scsi_req(req); + if (bufflen) { + ret = blk_rq_map_kern(sdev->request_queue, req, + buffer, bufflen, GFP_NOIO); + if (ret) + goto out; + } rq->cmd_len = COMMAND_SIZE(cmd[0]); memcpy(rq->cmd, cmd, rq->cmd_len); rq->retries = retries; diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 8e474b145249..57002529174f 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -599,7 +599,7 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, "scsi scan: INQUIRY %s with code 0x%x\n", result ? "failed" : "successful", result)); - if (result) { + if (result > 0) { /* * not-ready to ready transition [asc/ascq=0x28/0x0] * or power-on, reset [asc/ascq=0x29/0x0], continue. @@ -614,7 +614,7 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, (sshdr.ascq == 0)) continue; } - } else { + } else if (result == 0) { /* * if nothing was transferred, we try * again. It's a workaround for some USB diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index c37dd15d16d2..a9bb7ae2fafd 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c @@ -127,7 +127,7 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd, REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER, RQF_PM, NULL); - if (driver_byte(result) != DRIVER_SENSE || + if (result < 0 || driver_byte(result) != DRIVER_SENSE || sshdr->sense_key != UNIT_ATTENTION) break; } diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 97713f595a29..3fc184e9702f 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1673,7 +1673,7 @@ static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing) &sshdr); /* failed to execute TUR, assume media not present */ - if (host_byte(retval)) { + if (retval < 0 || host_byte(retval)) { set_media_not_present(sdkp); goto out; } @@ -1734,6 +1734,9 @@ static int sd_sync_cache(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr) if (res) { sd_print_result(sdkp, "Synchronize Cache(10) failed", res); + if (res < 0) + return res; + if (driver_byte(res) == DRIVER_SENSE) sd_print_sense_hdr(sdkp, sshdr); @@ -1842,7 +1845,7 @@ static int sd_pr_command(struct block_device *bdev, u8 sa, result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, &data, sizeof(data), &sshdr, SD_TIMEOUT, sdkp->max_retries, NULL); - if (driver_byte(result) == DRIVER_SENSE && + if (result > 0 && driver_byte(result) == DRIVER_SENSE && scsi_sense_valid(&sshdr)) { sdev_printk(KERN_INFO, sdev, "PR command failed: %d\n", result); scsi_print_sense_hdr(sdev, NULL, &sshdr); @@ -2194,7 +2197,7 @@ sd_spinup_disk(struct scsi_disk *sdkp) ((driver_byte(the_result) == DRIVER_SENSE) && sense_valid && sshdr.sense_key == UNIT_ATTENTION))); - if (driver_byte(the_result) != DRIVER_SENSE) { + if (the_result < 0 || driver_byte(the_result) != DRIVER_SENSE) { /* no sense, TUR either succeeded or failed * with a status error */ if(!spintime && !scsi_status_is_good(the_result)) { @@ -2379,7 +2382,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, if (media_not_present(sdkp, &sshdr)) return -ENODEV; - if (the_result) { + if (the_result > 0) { sense_valid = scsi_sense_valid(&sshdr); if (sense_valid && sshdr.sense_key == ILLEGAL_REQUEST && @@ -2464,7 +2467,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, if (media_not_present(sdkp, &sshdr)) return -ENODEV; - if (the_result) { + if (the_result > 0) { sense_valid = scsi_sense_valid(&sshdr); if (sense_valid && sshdr.sense_key == UNIT_ATTENTION && @@ -3614,7 +3617,7 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start) SD_TIMEOUT, sdkp->max_retries, 0, RQF_PM, NULL); if (res) { sd_print_result(sdkp, "Start/Stop Unit failed", res); - if (driver_byte(res) == DRIVER_SENSE) + if (res > 0 && driver_byte(res) == DRIVER_SENSE) sd_print_sense_hdr(sdkp, &sshdr); if (scsi_sense_valid(&sshdr) && /* 0x3a is medium not present */ diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 01088f333dbc..6834e029906a 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -116,7 +116,7 @@ static int sd_zbc_do_report_zones(struct scsi_disk *sdkp, unsigned char *buf, sd_printk(KERN_ERR, sdkp, "REPORT ZONES start lba %llu failed\n", lba); sd_print_result(sdkp, "REPORT ZONES", result); - if (driver_byte(result) == DRIVER_SENSE && + if (result > 0 && driver_byte(result) == DRIVER_SENSE && scsi_sense_valid(&sshdr)) sd_print_sense_hdr(sdkp, &sshdr); return -EIO; diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c index ffcf902da390..4c1de11e69fb 100644 --- a/drivers/scsi/sr_ioctl.c +++ b/drivers/scsi/sr_ioctl.c @@ -205,6 +205,10 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc) cgc->timeout, IOCTL_RETRIES, 0, 0, NULL); /* Minimal error checking. Ignore cases we know about, and report the rest. */ + if (result < 0) { + err = result; + goto out; + } if (driver_byte(result) != 0) { switch (sshdr->sense_key) { case UNIT_ATTENTION: diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 930f35863cbb..b8462f54cb72 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8354,7 +8354,7 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, sdev_printk(KERN_WARNING, sdp, "START_STOP failed for power mode: %d, result %x\n", pwr_mode, ret); - if (driver_byte(ret) == DRIVER_SENSE) + if (ret > 0 && driver_byte(ret) == DRIVER_SENSE) scsi_print_sense_hdr(sdp, NULL, &sshdr); } diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 6dac58ae6120..fabbad5cda60 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -355,7 +355,7 @@ static void virtscsi_rescan_hotunplug(struct virtio_scsi *vscsi) if (result == 0 && inq_result[0] >> 5) { /* PQ indicates the LUN is not attached */ scsi_remove_device(sdev); - } else if (host_byte(result) == DID_BAD_TARGET) { + } else if (result > 0 && host_byte(result) == DID_BAD_TARGET) { /* * If all LUNs of a virtio-scsi device are unplugged * it will respond with BAD TARGET on any INQUIRY diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 7ac50dbee475..6f227b610681 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -256,10 +256,13 @@ static inline int scsi_is_wlun(u64 lun) * This returns true for known good conditions that may be treated as * command completed normally */ -static inline int scsi_status_is_good(int status) +static inline bool scsi_status_is_good(int status) { + if (status < 0) + return false; + if (host_byte(status) == DID_NO_CONNECT) - return 0; + return false; /* * FIXME: bit0 is listed as reserved in SCSI-2, but is -- 2.31.1

1 0

[PATCH OLK-5.10] SCSI: spfc: Update lb mode acquired solution
by Yanling Song 14 Jan '22

14 Jan '22

Ramaxel inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4QLBP CVE: NA Changes: 1. Read lb mode from chip 2. Disable fake vf function 3. Remove unnecessary code Signed-off-by: Yanling Song <songyl(a)ramaxel.com> Reviewed-by: Yun Xu <xuyun(a)ramaxel.com> --- .../ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h | 3 +- .../ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c | 3 + .../ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h | 3 + drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c | 43 +-- drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c | 10 +- drivers/scsi/spfc/hw/spfc_cqm_main.c | 299 +----------------- drivers/scsi/spfc/hw/spfc_cqm_main.h | 3 - drivers/scsi/spfc/hw/spfc_cqm_object.c | 21 -- 8 files changed, 29 insertions(+), 356 deletions(-) diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h index 23644958e33a..63b89e71c552 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h @@ -40,7 +40,8 @@ struct cfg_cmd_dev_cap { u8 sf_svc_attr; u8 func_sf_en; - u16 rsvd_sf; + u8 lb_mode; + u8 smf_pg; u32 max_conn_num; u16 max_stick2cache_num; diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c index 5d6a53307f0a..4b2674ec66f0 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c @@ -112,6 +112,9 @@ static void parse_pub_res_cap(struct sphw_hwdev *hwdev, else cap->sf_en = false; + cap->lb_mode = dev_cap->lb_mode; + cap->smf_pg = dev_cap->smf_pg; + cap->timer_en = (u8)timer_enable; /* timer enable */ cap->host_oq_id_mask_val = dev_cap->host_oq_id_mask_val; cap->max_connect_num = dev_cap->max_conn_num; diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h index 1147beeb76ad..1b48e0991563 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h @@ -201,6 +201,9 @@ struct service_cap { u8 timer_en; /* 0:disable, 1:enable */ u8 bloomfilter_en; /* 0:disable, 1:enable*/ + u8 lb_mode; + u8 smf_pg; + /* For test */ u32 test_mode; u32 test_qpc_num; diff --git a/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c b/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c index 30fb56a9bfed..0c1d97d9e3e6 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c @@ -53,17 +53,6 @@ cqm_bat_fill_cla_common_gpa(struct cqm_handle *cqm_handle, gpa.acs_spu_en = 0; } - /* In fake mode, fake_vf_en in the GPA address of the BAT - * must be set to 1. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) { - gpa.fake_vf_en = 1; - func_attr = &cqm_handle->parent_cqm_handle->func_attribute; - gpa.pf_id = func_attr->func_global_idx; - } else { - gpa.fake_vf_en = 0; - } - memcpy(&cla_gpa_h, &gpa, sizeof(u32)); bat_entry_standerd->cla_gpa_h = cla_gpa_h; @@ -379,13 +368,8 @@ s32 cqm_bat_update(struct cqm_handle *cqm_handle) CQM_PTR_CHECK_RET(buf_in, CQM_FAIL, CQM_ALLOC_FAIL(buf_in)); buf_in->size = sizeof(struct cqm_cmdq_bat_update); - /* In non-fake mode, func_id is set to 0xffff, indicating the current func. - * In fake mode, the value of func_id is specified. This is a fake func_id. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - func_id = cqm_handle->func_attribute.func_global_idx; - else - func_id = 0xffff; + /* In non-fake mode, func_id is set to 0xffff */ + func_id = 0xffff; /* The LB scenario is supported. * The normal mode is the traditional mode and is configured on SMF0. @@ -545,19 +529,6 @@ s32 cqm_cla_fill_buf(struct cqm_handle *cqm_handle, struct cqm_buf *cla_base_buf spu_en = 0; } - /* fake enable */ - if (cqm_handle->func_capability.fake_func_type == - CQM_FAKE_FUNC_CHILD) { - fake_en = 1ULL << 62; - func_attr = - &cqm_handle->parent_cqm_handle->func_attribute; - pf_id = func_attr->func_global_idx; - pf_id = (pf_id & 0x1f) << 57; - } else { - fake_en = 0; - pf_id = 0; - } - *base = (((((cla_sub_buf->buf_list[i].pa & CQM_CHIP_GPA_MASK) | spu_en) | fake_en) | @@ -1248,14 +1219,8 @@ s32 cqm_cla_update(struct cqm_handle *cqm_handle, struct cqm_buf_list *buf_node_ } } - /* In non-fake mode, set func_id to 0xffff. - * Indicates the current func fake mode, set func_id to the - * specified value, This is a fake func_id. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - cmd.func_id = cqm_handle->func_attribute.func_global_idx; - else - cmd.func_id = 0xffff; + /* In non-fake mode, set func_id to 0xffff. */ + cmd.func_id = 0xffff; /* Mode 0 is hashed to 4 SMF engines (excluding PPF) by func ID. */ if (cqm_handle->func_capability.lb_mode == CQM_LB_MODE_NORMAL || diff --git a/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c b/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c index 4e482776a14f..21100e8db8f4 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c @@ -405,14 +405,8 @@ s32 cqm_cla_cache_invalid(struct cqm_handle *cqm_handle, dma_addr_t gpa, u32 cac cmd.gpa_h = CQM_ADDR_HI(gpa); cmd.gpa_l = CQM_ADDR_LW(gpa); - /* In non-fake mode, set func_id to 0xffff. - * Indicate the current func fake mode. - * The value of func_id is a fake func ID. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - cmd.func_id = cqm_handle->func_attribute.func_global_idx; - else - cmd.func_id = 0xffff; + /* In non-fake mode, set func_id to 0xffff. */ + cmd.func_id = 0xffff; /* Mode 0 is hashed to 4 SMF engines (excluding PPF) by func ID. */ if (cqm_handle->func_capability.lb_mode == CQM_LB_MODE_NORMAL || diff --git a/drivers/scsi/spfc/hw/spfc_cqm_main.c b/drivers/scsi/spfc/hw/spfc_cqm_main.c index a4c8e60971b1..52cc2c7838e9 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_main.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_main.c @@ -11,21 +11,8 @@ #include "sphw_crm.h" #include "sphw_hw.h" #include "sphw_hw_cfg.h" - #include "spfc_cqm_main.h" -static unsigned char cqm_lb_mode = CQM_LB_MODE_NORMAL; -module_param(cqm_lb_mode, byte, 0644); -MODULE_PARM_DESC(cqm_lb_mode, "for cqm lb mode (default=0xff)"); - -static unsigned char cqm_fake_mode = CQM_FAKE_MODE_DISABLE; -module_param(cqm_fake_mode, byte, 0644); -MODULE_PARM_DESC(cqm_fake_mode, "for cqm fake mode (default=0 disable)"); - -static unsigned char cqm_platform_mode = CQM_FPGA_MODE; -module_param(cqm_platform_mode, byte, 0644); -MODULE_PARM_DESC(cqm_platform_mode, "for cqm platform mode (default=0 FPGA)"); - s32 cqm3_init(void *ex_handle) { struct sphw_hwdev *handle = (struct sphw_hwdev *)ex_handle; @@ -63,19 +50,6 @@ s32 cqm3_init(void *ex_handle) goto err1; } - /* In FAKE mode, only the bitmap of the timer of the function is - * enabled, and resources are not initialized. Otherwise, the - * configuration of the fake function is overwritten. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD_CONFLICT) { - if (sphw_func_tmr_bitmap_set(ex_handle, true) != CQM_SUCCESS) - cqm_err(handle->dev_hdl, "Timer start: enable timer bitmap failed\n"); - - handle->cqm_hdl = NULL; - kfree(cqm_handle); - return CQM_SUCCESS; - } - /* Initialize memory entries such as BAT, CLA, and bitmap. */ if (cqm_mem_init(ex_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_mem_init)); @@ -287,64 +261,6 @@ void cqm_service_capability_init(struct cqm_handle *cqm_handle, cqm_service_capability_init_fc(cqm_handle, (void *)service_capability); } -s32 cqm_get_fake_func_type(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - u32 parent_func, child_func_start, child_func_number, i; - u32 idx = cqm_handle->func_attribute.func_global_idx; - - /* Currently, only one set of fake configurations is implemented. - * fake_cfg_number = 1 - */ - for (i = 0; i < func_cap->fake_cfg_number; i++) { - parent_func = func_cap->fake_cfg[i].parent_func; - child_func_start = func_cap->fake_cfg[i].child_func_start; - child_func_number = func_cap->fake_cfg[i].child_func_number; - - if (idx == parent_func) { - return CQM_FAKE_FUNC_PARENT; - } else if ((idx >= child_func_start) && - (idx < (child_func_start + child_func_number))) { - return CQM_FAKE_FUNC_CHILD_CONFLICT; - } - } - - return CQM_FAKE_FUNC_NORMAL; -} - -s32 cqm_get_child_func_start(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct sphw_func_attr *func_attr = &cqm_handle->func_attribute; - u32 i; - - /* Currently, only one set of fake configurations is implemented. - * fake_cfg_number = 1 - */ - for (i = 0; i < func_cap->fake_cfg_number; i++) { - if (func_attr->func_global_idx == - func_cap->fake_cfg[i].parent_func) - return (s32)(func_cap->fake_cfg[i].child_func_start); - } - - return CQM_FAIL; -} - -s32 cqm_get_child_func_number(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct sphw_func_attr *func_attr = &cqm_handle->func_attribute; - u32 i; - - for (i = 0; i < func_cap->fake_cfg_number; i++) { - if (func_attr->func_global_idx == - func_cap->fake_cfg[i].parent_func) - return (s32)(func_cap->fake_cfg[i].child_func_number); - } - - return CQM_FAIL; -} - /* Set func_type in fake_cqm_handle to ppf, pf, or vf. */ void cqm_set_func_type(struct cqm_handle *cqm_handle) { @@ -358,41 +274,20 @@ void cqm_set_func_type(struct cqm_handle *cqm_handle) cqm_handle->func_attribute.func_type = CQM_VF; } -void cqm_lb_fake_mode_init(struct cqm_handle *cqm_handle) +void cqm_lb_fake_mode_init(struct cqm_handle *cqm_handle, struct service_cap *svc_cap) { struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct cqm_fake_cfg *cfg = func_cap->fake_cfg; - func_cap->lb_mode = cqm_lb_mode; - func_cap->fake_mode = cqm_fake_mode; + func_cap->lb_mode = svc_cap->lb_mode; /* Initializing the LB Mode */ - if (func_cap->lb_mode == CQM_LB_MODE_NORMAL) { + if (func_cap->lb_mode == CQM_LB_MODE_NORMAL) func_cap->smf_pg = 0; - } else { - /* The LB mode is tailored on the FPGA. - * Only SMF0 and SMF2 are instantiated. - */ - if (cqm_platform_mode == CQM_FPGA_MODE) - func_cap->smf_pg = 0x5; - else - func_cap->smf_pg = 0xF; - } + else + func_cap->smf_pg = svc_cap->smf_pg; - /* Initializing the FAKE Mode */ - if (func_cap->fake_mode == CQM_FAKE_MODE_DISABLE) { - func_cap->fake_cfg_number = 0; - func_cap->fake_func_type = CQM_FAKE_FUNC_NORMAL; - } else { - func_cap->fake_cfg_number = 1; - - /* When configuring fake mode, ensure that the parent function - * cannot be contained in the child function; otherwise, the - * system will be initialized repeatedly. - */ - cfg[0].child_func_start = CQM_FAKE_CFUNC_START; - func_cap->fake_func_type = cqm_get_fake_func_type(cqm_handle); - } + func_cap->fake_cfg_number = 0; + func_cap->fake_func_type = CQM_FAKE_FUNC_NORMAL; } s32 cqm_capability_init(void *ex_handle) @@ -465,10 +360,9 @@ s32 cqm_capability_init(void *ex_handle) func_cap->gpa_check_enable = true; - cqm_lb_fake_mode_init(cqm_handle); + cqm_lb_fake_mode_init(cqm_handle, service_capability); cqm_info(handle->dev_hdl, "Cap init: lb_mode=%u\n", func_cap->lb_mode); cqm_info(handle->dev_hdl, "Cap init: smf_pg=%u\n", func_cap->smf_pg); - cqm_info(handle->dev_hdl, "Cap init: fake_mode=%u\n", func_cap->fake_mode); cqm_info(handle->dev_hdl, "Cap init: fake_func_type=%u\n", func_cap->fake_func_type); cqm_info(handle->dev_hdl, "Cap init: fake_cfg_number=%u\n", func_cap->fake_cfg_number); @@ -517,153 +411,6 @@ s32 cqm_capability_init(void *ex_handle) return err; } -void cqm_fake_uninit(struct cqm_handle *cqm_handle) -{ - u32 i; - - if (cqm_handle->func_capability.fake_func_type != - CQM_FAKE_FUNC_PARENT) - return; - - for (i = 0; i < CQM_FAKE_FUNC_MAX; i++) { - kfree(cqm_handle->fake_cqm_handle[i]); - cqm_handle->fake_cqm_handle[i] = NULL; - } -} - -s32 cqm_fake_init(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_func_capability *func_cap = NULL; - struct cqm_handle *fake_cqm_handle = NULL; - struct sphw_func_attr *func_attr = NULL; - s32 child_func_start, child_func_number; - u32 i; - - func_cap = &cqm_handle->func_capability; - if (func_cap->fake_func_type != CQM_FAKE_FUNC_PARENT) - return CQM_SUCCESS; - - child_func_start = cqm_get_child_func_start(cqm_handle); - if (child_func_start == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_start)); - return CQM_FAIL; - } - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return CQM_FAIL; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = kmalloc(sizeof(*fake_cqm_handle), GFP_KERNEL | __GFP_ZERO); - if (!fake_cqm_handle) { - cqm_err(handle->dev_hdl, - CQM_ALLOC_FAIL(fake_cqm_handle)); - goto err; - } - - /* Copy the attributes of the parent CQM handle to the child CQM - * handle and modify the values of function. - */ - memcpy(fake_cqm_handle, cqm_handle, sizeof(struct cqm_handle)); - func_attr = &fake_cqm_handle->func_attribute; - func_cap = &fake_cqm_handle->func_capability; - func_attr->func_global_idx = (u16)(child_func_start + i); - cqm_set_func_type(fake_cqm_handle); - func_cap->fake_func_type = CQM_FAKE_FUNC_CHILD; - cqm_info(handle->dev_hdl, "Fake func init: function[%u] type %d(0:PF,1:VF,2:PPF)\n", - func_attr->func_global_idx, func_attr->func_type); - - fake_cqm_handle->parent_cqm_handle = cqm_handle; - cqm_handle->fake_cqm_handle[i] = fake_cqm_handle; - } - - return CQM_SUCCESS; - -err: - cqm_fake_uninit(cqm_handle); - return CQM_FAIL; -} - -void cqm_fake_mem_uninit(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_handle *fake_cqm_handle = NULL; - s32 child_func_number; - u32 i; - - if (cqm_handle->func_capability.fake_func_type != CQM_FAKE_FUNC_PARENT) - return; - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = cqm_handle->fake_cqm_handle[i]; - cqm_object_table_uninit(fake_cqm_handle); - cqm_bitmap_uninit(fake_cqm_handle); - cqm_cla_uninit(fake_cqm_handle, CQM_BAT_ENTRY_MAX); - cqm_bat_uninit(fake_cqm_handle); - } -} - -s32 cqm_fake_mem_init(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_handle *fake_cqm_handle = NULL; - s32 child_func_number; - u32 i; - - if (cqm_handle->func_capability.fake_func_type != - CQM_FAKE_FUNC_PARENT) - return CQM_SUCCESS; - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return CQM_FAIL; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = cqm_handle->fake_cqm_handle[i]; - - if (cqm_bat_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_bat_init)); - goto err; - } - - if (cqm_cla_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_cla_init)); - goto err; - } - - if (cqm_bitmap_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_bitmap_init)); - goto err; - } - - if (cqm_object_table_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_object_table_init)); - goto err; - } - } - - return CQM_SUCCESS; - -err: - cqm_fake_mem_uninit(cqm_handle); - return CQM_FAIL; -} - s32 cqm_mem_init(void *ex_handle) { struct sphw_hwdev *handle = (struct sphw_hwdev *)ex_handle; @@ -671,49 +418,35 @@ s32 cqm_mem_init(void *ex_handle) cqm_handle = (struct cqm_handle *)(handle->cqm_hdl); - if (cqm_fake_init(cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_fake_init)); - return CQM_FAIL; - } - - if (cqm_fake_mem_init(cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_fake_mem_init)); - goto err1; - } - if (cqm_bat_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_bat_init)); - goto err2; + return CQM_FAIL; } if (cqm_cla_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_cla_init)); - goto err3; + goto err1; } if (cqm_bitmap_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_bitmap_init)); - goto err4; + goto err2; } if (cqm_object_table_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_object_table_init)); - goto err5; + goto err3; } return CQM_SUCCESS; -err5: - cqm_bitmap_uninit(cqm_handle); -err4: - cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); err3: - cqm_bat_uninit(cqm_handle); + cqm_bitmap_uninit(cqm_handle); err2: - cqm_fake_mem_uninit(cqm_handle); + cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); err1: - cqm_fake_uninit(cqm_handle); + cqm_bat_uninit(cqm_handle); return CQM_FAIL; } @@ -728,8 +461,6 @@ void cqm_mem_uninit(void *ex_handle) cqm_bitmap_uninit(cqm_handle); cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); cqm_bat_uninit(cqm_handle); - cqm_fake_mem_uninit(cqm_handle); - cqm_fake_uninit(cqm_handle); } s32 cqm_event_init(void *ex_handle) diff --git a/drivers/scsi/spfc/hw/spfc_cqm_main.h b/drivers/scsi/spfc/hw/spfc_cqm_main.h index 1b8cf8bdb3b7..cf10d7f5c339 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_main.h +++ b/drivers/scsi/spfc/hw/spfc_cqm_main.h @@ -328,9 +328,6 @@ void cqm_mem_uninit(void *ex_handle); s32 cqm_event_init(void *ex_handle); void cqm_event_uninit(void *ex_handle); u8 cqm_aeq_callback(void *ex_handle, u8 event, u8 *data); -s32 cqm_get_fake_func_type(struct cqm_handle *cqm_handle); -s32 cqm_get_child_func_start(struct cqm_handle *cqm_handle); -s32 cqm_get_child_func_number(struct cqm_handle *cqm_handle); s32 cqm3_init(void *ex_handle); void cqm3_uninit(void *ex_handle); diff --git a/drivers/scsi/spfc/hw/spfc_cqm_object.c b/drivers/scsi/spfc/hw/spfc_cqm_object.c index b895d37aebae..165794e9c7e5 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_object.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_object.c @@ -155,8 +155,6 @@ struct cqm_qpc_mpt *cqm3_object_qpc_mpt_create(void *ex_handle, u32 service_type struct cqm_qpc_mpt_info *qpc_mpt_info = NULL; struct cqm_handle *cqm_handle = NULL; s32 ret = CQM_FAIL; - u32 relative_index; - u32 fake_func_id; CQM_PTR_CHECK_RET(ex_handle, NULL, CQM_PTR_NULL(ex_handle)); @@ -180,25 +178,6 @@ struct cqm_qpc_mpt *cqm3_object_qpc_mpt_create(void *ex_handle, u32 service_type return NULL; } - /* fake vf adaption, switch to corresponding VF. */ - if (cqm_handle->func_capability.fake_func_type == - CQM_FAKE_FUNC_PARENT) { - fake_func_id = index / cqm_handle->func_capability.qpc_number; - relative_index = index % cqm_handle->func_capability.qpc_number; - - cqm_info(handle->dev_hdl, "qpc create: fake_func_id=%u, relative_index=%u\n", - fake_func_id, relative_index); - - if ((s32)fake_func_id >= - cqm_get_child_func_number(cqm_handle)) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(fake_func_id)); - return NULL; - } - - index = relative_index; - cqm_handle = cqm_handle->fake_cqm_handle[fake_func_id]; - } - qpc_mpt_info = kmalloc(sizeof(*qpc_mpt_info), GFP_ATOMIC | __GFP_ZERO); CQM_PTR_CHECK_RET(qpc_mpt_info, NULL, CQM_ALLOC_FAIL(qpc_mpt_info)); -- 2.32.0

1 0

[PATCH v1 OLK-5.10 0/4] Add four modifications
by Yanling Song 14 Jan '22

14 Jan '22

1.Remove unused functions about ceq 2.Remove unused clp hardware channels 3.Remove the code of polling mode 4.Remove the code about little endian and big endian conversion Yanling Song (4): net/spnic:Remove unused functions about ceq net/spnic:Remove unused clp hardware channels net/spnic:Remove the code of polling mode net/spnic:Remove the code about little endian and big endian conversion .../net/ethernet/ramaxel/spnic/hw/sphw_cmdq.c | 58 +-- .../ethernet/ramaxel/spnic/hw/sphw_common.h | 12 - .../net/ethernet/ramaxel/spnic/hw/sphw_crm.h | 2 - .../net/ethernet/ramaxel/spnic/hw/sphw_csr.h | 13 - .../net/ethernet/ramaxel/spnic/hw/sphw_eqs.c | 104 +--- .../net/ethernet/ramaxel/spnic/hw/sphw_hw.h | 2 - .../ethernet/ramaxel/spnic/hw/sphw_hwdev.c | 31 -- .../ethernet/ramaxel/spnic/hw/sphw_hwdev.h | 2 - .../net/ethernet/ramaxel/spnic/hw/sphw_hwif.c | 27 +- .../net/ethernet/ramaxel/spnic/hw/sphw_mbox.c | 20 +- .../net/ethernet/ramaxel/spnic/hw/sphw_mbox.h | 2 - .../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.c | 487 ------------------ .../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.h | 50 -- .../net/ethernet/ramaxel/spnic/hw/sphw_mt.h | 1 - .../net/ethernet/ramaxel/spnic/spnic_nic_io.h | 6 +- .../net/ethernet/ramaxel/spnic/spnic_nic_qp.h | 7 +- drivers/net/ethernet/ramaxel/spnic/spnic_rx.c | 39 +- drivers/net/ethernet/ramaxel/spnic/spnic_tx.c | 20 +- 18 files changed, 41 insertions(+), 842 deletions(-) -- 2.23.0

1 4

[PATCH openEuler-1.0-LTS] ext4: Fix BUG_ON in ext4_bread when write quota data
by Yang Yingliang 13 Jan '22

13 Jan '22

From: Ye Bin <yebin10(a)huawei.com> mainline inclusion from mainline-v5.17 commit ce85548ab4295234b4f8e63a0eea0c157d2f6b25 category: bugfix bugzilla: 185930 CVE: NA ----------------------------------------------- We got issue as follows when run syzkaller: [ 167.936972] EXT4-fs error (device loop0): __ext4_remount:6314: comm rep: Abort forced by user [ 167.938306] EXT4-fs (loop0): Remounting filesystem read-only [ 167.981637] Assertion failure in ext4_getblk() at fs/ext4/inode.c:847: '(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY) || handle != NULL || create == 0' [ 167.983601] ------------[ cut here ]------------ [ 167.984245] kernel BUG at fs/ext4/inode.c:847! [ 167.984882] invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI [ 167.985624] CPU: 7 PID: 2290 Comm: rep Tainted: G B 5.16.0-rc5-next-20211217+ #123 [ 167.986823] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20190727_073836-buildvm-ppc64le-16.ppc.fedoraproject.org-3.fc31 04/01/2014 [ 167.988590] RIP: 0010:ext4_getblk+0x17e/0x504 [ 167.989189] Code: c6 01 74 28 49 c7 c0 a0 a3 5c 9b b9 4f 03 00 00 48 c7 c2 80 9c 5c 9b 48 c7 c6 40 b6 5c 9b 48 c7 c7 20 a4 5c 9b e8 77 e3 fd ff <0f> 0b 8b 04 244 [ 167.991679] RSP: 0018:ffff8881736f7398 EFLAGS: 00010282 [ 167.992385] RAX: 0000000000000094 RBX: 1ffff1102e6dee75 RCX: 0000000000000000 [ 167.993337] RDX: 0000000000000001 RSI: ffffffff9b6e29e0 RDI: ffffed102e6dee66 [ 167.994292] RBP: ffff88816a076210 R08: 0000000000000094 R09: ffffed107363fa09 [ 167.995252] R10: ffff88839b1fd047 R11: ffffed107363fa08 R12: ffff88816a0761e8 [ 167.996205] R13: 0000000000000000 R14: 0000000000000021 R15: 0000000000000001 [ 167.997158] FS: 00007f6a1428c740(0000) GS:ffff88839b000000(0000) knlGS:0000000000000000 [ 167.998238] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 167.999025] CR2: 00007f6a140716c8 CR3: 0000000133216000 CR4: 00000000000006e0 [ 167.999987] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 168.000944] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 168.001899] Call Trace: [ 168.002235] <TASK> [ 168.007167] ext4_bread+0xd/0x53 [ 168.007612] ext4_quota_write+0x20c/0x5c0 [ 168.010457] write_blk+0x100/0x220 [ 168.010944] remove_free_dqentry+0x1c6/0x440 [ 168.011525] free_dqentry.isra.0+0x565/0x830 [ 168.012133] remove_tree+0x318/0x6d0 [ 168.014744] remove_tree+0x1eb/0x6d0 [ 168.017346] remove_tree+0x1eb/0x6d0 [ 168.019969] remove_tree+0x1eb/0x6d0 [ 168.022128] qtree_release_dquot+0x291/0x340 [ 168.023297] v2_release_dquot+0xce/0x120 [ 168.023847] dquot_release+0x197/0x3e0 [ 168.024358] ext4_release_dquot+0x22a/0x2d0 [ 168.024932] dqput.part.0+0x1c9/0x900 [ 168.025430] __dquot_drop+0x120/0x190 [ 168.025942] ext4_clear_inode+0x86/0x220 [ 168.026472] ext4_evict_inode+0x9e8/0xa22 [ 168.028200] evict+0x29e/0x4f0 [ 168.028625] dispose_list+0x102/0x1f0 [ 168.029148] evict_inodes+0x2c1/0x3e0 [ 168.030188] generic_shutdown_super+0xa4/0x3b0 [ 168.030817] kill_block_super+0x95/0xd0 [ 168.031360] deactivate_locked_super+0x85/0xd0 [ 168.031977] cleanup_mnt+0x2bc/0x480 [ 168.033062] task_work_run+0xd1/0x170 [ 168.033565] do_exit+0xa4f/0x2b50 [ 168.037155] do_group_exit+0xef/0x2d0 [ 168.037666] __x64_sys_exit_group+0x3a/0x50 [ 168.038237] do_syscall_64+0x3b/0x90 [ 168.038751] entry_SYSCALL_64_after_hwframe+0x44/0xae In order to reproduce this problem, the following conditions need to be met: 1. Ext4 filesystem with no journal; 2. Filesystem image with incorrect quota data; 3. Abort filesystem forced by user; 4. umount filesystem; As in ext4_quota_write: ... if (EXT4_SB(sb)->s_journal && !handle) { ext4_msg(sb, KERN_WARNING, "Quota write (off=%llu, len=%llu)" " cancelled because transaction is not started", (unsigned long long)off, (unsigned long long)len); return -EIO; } ... We only check handle if NULL when filesystem has journal. There is need check handle if NULL even when filesystem has no journal. Signed-off-by: Ye Bin <yebin10(a)huawei.com> Reviewed-by: Jan Kara <jack(a)suse.cz> Link: https://lore.kernel.org/r/20211223015506.297766-1-yebin10@huawei.com Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Cc: stable(a)kernel.org Signed-off-by: Ye Bin <yebin10(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 587817ac60990..b89f431ec78d3 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6245,7 +6245,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type, struct buffer_head *bh; handle_t *handle = journal_current_handle(); - if (EXT4_SB(sb)->s_journal && !handle) { + if (!handle) { ext4_msg(sb, KERN_WARNING, "Quota write (off=%llu, len=%llu)" " cancelled because transaction is not started", (unsigned long long)off, (unsigned long long)len); -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] PM: hibernate: use correct mode for swsusp_close()
by Yang Yingliang 13 Jan '22

13 Jan '22

From: Thomas Zeitlhofer <thomas.zeitlhofer+lkml(a)ze-it.at> stable inclusion from linux-v4.19.219 commit 68945e943519df1532e598fafab16ac54488933f --------------------------------------------------- [ Upstream commit cefcf24b4d351daf70ecd945324e200d3736821e ] Commit 39fbef4b0f77 ("PM: hibernate: Get block device exclusively in swsusp_check()") changed the opening mode of the block device to (FMODE_READ | FMODE_EXCL). In the corresponding calls to swsusp_close(), the mode is still just FMODE_READ which triggers the warning in blkdev_flush_mapping() on resume from hibernate. So, use the mode (FMODE_READ | FMODE_EXCL) also when closing the device. Fixes: 39fbef4b0f77 ("PM: hibernate: Get block device exclusively in swsusp_check()") Signed-off-by: Thomas Zeitlhofer <thomas.zeitlhofer+lkml(a)ze-it.at> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Ye Bin <yebin10(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/power/hibernate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 72ef9df2a29cd..fc6466351e62f 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -686,7 +686,7 @@ static int load_image_and_restore(void) goto Unlock; error = swsusp_read(&flags); - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); if (!error) hibernation_restore(flags & SF_PLATFORM_MODE); @@ -896,7 +896,7 @@ static int software_resume(void) /* The snapshot device should not be opened while we're running */ if (!atomic_add_unless(&snapshot_device_available, -1, 0)) { error = -EBUSY; - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); goto Unlock; } @@ -925,7 +925,7 @@ static int software_resume(void) pm_pr_dbg("Hibernation image not present or could not be loaded.\n"); return error; Close_Finish: - swsusp_close(FMODE_READ); + swsusp_close(FMODE_READ | FMODE_EXCL); goto Finish; } -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] Revert "watchdog: Fix check_preemption_disabled() error"
by Yang Yingliang 13 Jan '22

13 Jan '22

hulk inclusion category: bugfix bugzilla: 173968, https://gitee.com/openeuler/kernel/issues/I3J87Y CVE: NA --------------------------- This reverts commit b2e484e966ac2f211f8f8cf56083e9bc4d5d3c6a. When CONFIG_LOCKDEP and CONFIG_DEBUG_LOCKDEP are enabled, it detects the following error: [ 10.145007] BUG: sleeping function called from invalid context at mm/slab.h:418 [ 10.145394] in_atomic(): 1, irqs_disabled(): 0, pid: 1, name: swapper/0 [ 10.145765] Preemption disabled at: [ 10.145978] [<ffff000008f8e7b4>] hardlockup_detector_perf_init+0x20/0x100 [ 10.146770] CPU: 6 PID: 1 Comm: swapper/0 Not tainted 4.19.90+ #3 [ 10.148242] Hardware name: linux,dummy-virt (DT) [ 10.148572] Call trace: [ 10.148667] dump_backtrace+0x0/0x190 [ 10.148765] show_stack+0x24/0x30 [ 10.148875] dump_stack+0xa4/0xf8 [ 10.148964] ___might_sleep+0x150/0x180 [ 10.149065] __might_sleep+0x58/0x90 [ 10.149199] kmem_cache_alloc_trace+0x244/0x2b0 [ 10.149308] perf_event_alloc+0x74/0x680 [ 10.149402] perf_event_create_kernel_counter+0x2c/0x190 [ 10.149516] arch_probe_cpu_freq+0x84/0x1ac [ 10.149611] hw_nmi_get_sample_period+0xb8/0x180 [ 10.149713] hardlockup_detector_event_create+0x28/0xfc [ 10.149827] hardlockup_detector_perf_init+0x24/0x100 [ 10.149943] watchdog_nmi_probe+0x14/0x1c [ 10.150037] lockup_detector_init+0x58/0x98 [ 10.150173] kernel_init_freeable+0x10c/0x1c4 [ 10.150298] kernel_init+0x18/0x110 [ 10.150422] ret_from_fork+0x10/0x18 In 'b2e484e966ac ("watchdog: Fix check_preemption_disabled() error")', we tried to fix check_preemption_disabled() error by disabling preemption in hardlockup_detector_perf_init(), but missed that function perf_event_create_kernel_counter() may sleep. The preemption is always disabled, the problem that wanted be fixed is not existed, so just revert this commit. Fixes: b2e484e966ac ("watchdog: Fix check_preemption_disabled() error") Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/watchdog_hld.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_hld.c index a5aff8ffa48ce..43832b1023693 100644 --- a/kernel/watchdog_hld.c +++ b/kernel/watchdog_hld.c @@ -508,17 +508,14 @@ void __init hardlockup_detector_perf_restart(void) */ int __init hardlockup_detector_perf_init(void) { - int ret; + int ret = hardlockup_detector_event_create(); - preempt_disable(); - ret = hardlockup_detector_event_create(); if (ret) { pr_info("Perf NMI watchdog permanently disabled\n"); } else { perf_event_release_kernel(this_cpu_read(watchdog_ev)); this_cpu_write(watchdog_ev, NULL); } - preempt_enable(); return ret; } #endif /* CONFIG_HARDLOCKUP_DETECTOR_PERF */ -- 2.25.1

1 0

[PATCH OLK-5.10] SCSI: spfc: Update lb mode acquired solution
by Yanling Song 13 Jan '22

13 Jan '22

Ramaxel inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4QLBP CVE: NA Changes: 1. Read lb mode from chip 2. Disable fake vf function 3. Remove unnecessary code Signed-off-by: Yanling Song <songyl(a)ramaxel.com> Reviewed-by: Yun Xu <xuyun(a)ramaxel.com> --- .../ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h | 3 +- .../ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c | 3 + .../ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h | 3 + drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c | 43 +-- drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c | 10 +- drivers/scsi/spfc/hw/spfc_cqm_main.c | 299 +----------------- drivers/scsi/spfc/hw/spfc_cqm_main.h | 3 - drivers/scsi/spfc/hw/spfc_cqm_object.c | 21 -- 8 files changed, 29 insertions(+), 356 deletions(-) diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h index 23644958e33a..63b89e71c552 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_cfg_cmd.h @@ -40,7 +40,8 @@ struct cfg_cmd_dev_cap { u8 sf_svc_attr; u8 func_sf_en; - u16 rsvd_sf; + u8 lb_mode; + u8 smf_pg; u32 max_conn_num; u16 max_stick2cache_num; diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c index 5d6a53307f0a..4b2674ec66f0 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c @@ -112,6 +112,9 @@ static void parse_pub_res_cap(struct sphw_hwdev *hwdev, else cap->sf_en = false; + cap->lb_mode = dev_cap->lb_mode; + cap->smf_pg = dev_cap->smf_pg; + cap->timer_en = (u8)timer_enable; /* timer enable */ cap->host_oq_id_mask_val = dev_cap->host_oq_id_mask_val; cap->max_connect_num = dev_cap->max_conn_num; diff --git a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h index 1147beeb76ad..1b48e0991563 100644 --- a/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h +++ b/drivers/net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.h @@ -201,6 +201,9 @@ struct service_cap { u8 timer_en; /* 0:disable, 1:enable */ u8 bloomfilter_en; /* 0:disable, 1:enable*/ + u8 lb_mode; + u8 smf_pg; + /* For test */ u32 test_mode; u32 test_qpc_num; diff --git a/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c b/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c index 30fb56a9bfed..0c1d97d9e3e6 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_bat_cla.c @@ -53,17 +53,6 @@ cqm_bat_fill_cla_common_gpa(struct cqm_handle *cqm_handle, gpa.acs_spu_en = 0; } - /* In fake mode, fake_vf_en in the GPA address of the BAT - * must be set to 1. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) { - gpa.fake_vf_en = 1; - func_attr = &cqm_handle->parent_cqm_handle->func_attribute; - gpa.pf_id = func_attr->func_global_idx; - } else { - gpa.fake_vf_en = 0; - } - memcpy(&cla_gpa_h, &gpa, sizeof(u32)); bat_entry_standerd->cla_gpa_h = cla_gpa_h; @@ -379,13 +368,8 @@ s32 cqm_bat_update(struct cqm_handle *cqm_handle) CQM_PTR_CHECK_RET(buf_in, CQM_FAIL, CQM_ALLOC_FAIL(buf_in)); buf_in->size = sizeof(struct cqm_cmdq_bat_update); - /* In non-fake mode, func_id is set to 0xffff, indicating the current func. - * In fake mode, the value of func_id is specified. This is a fake func_id. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - func_id = cqm_handle->func_attribute.func_global_idx; - else - func_id = 0xffff; + /* In non-fake mode, func_id is set to 0xffff */ + func_id = 0xffff; /* The LB scenario is supported. * The normal mode is the traditional mode and is configured on SMF0. @@ -545,19 +529,6 @@ s32 cqm_cla_fill_buf(struct cqm_handle *cqm_handle, struct cqm_buf *cla_base_buf spu_en = 0; } - /* fake enable */ - if (cqm_handle->func_capability.fake_func_type == - CQM_FAKE_FUNC_CHILD) { - fake_en = 1ULL << 62; - func_attr = - &cqm_handle->parent_cqm_handle->func_attribute; - pf_id = func_attr->func_global_idx; - pf_id = (pf_id & 0x1f) << 57; - } else { - fake_en = 0; - pf_id = 0; - } - *base = (((((cla_sub_buf->buf_list[i].pa & CQM_CHIP_GPA_MASK) | spu_en) | fake_en) | @@ -1248,14 +1219,8 @@ s32 cqm_cla_update(struct cqm_handle *cqm_handle, struct cqm_buf_list *buf_node_ } } - /* In non-fake mode, set func_id to 0xffff. - * Indicates the current func fake mode, set func_id to the - * specified value, This is a fake func_id. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - cmd.func_id = cqm_handle->func_attribute.func_global_idx; - else - cmd.func_id = 0xffff; + /* In non-fake mode, set func_id to 0xffff. */ + cmd.func_id = 0xffff; /* Mode 0 is hashed to 4 SMF engines (excluding PPF) by func ID. */ if (cqm_handle->func_capability.lb_mode == CQM_LB_MODE_NORMAL || diff --git a/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c b/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c index 4e482776a14f..21100e8db8f4 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_bitmap_table.c @@ -405,14 +405,8 @@ s32 cqm_cla_cache_invalid(struct cqm_handle *cqm_handle, dma_addr_t gpa, u32 cac cmd.gpa_h = CQM_ADDR_HI(gpa); cmd.gpa_l = CQM_ADDR_LW(gpa); - /* In non-fake mode, set func_id to 0xffff. - * Indicate the current func fake mode. - * The value of func_id is a fake func ID. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD) - cmd.func_id = cqm_handle->func_attribute.func_global_idx; - else - cmd.func_id = 0xffff; + /* In non-fake mode, set func_id to 0xffff. */ + cmd.func_id = 0xffff; /* Mode 0 is hashed to 4 SMF engines (excluding PPF) by func ID. */ if (cqm_handle->func_capability.lb_mode == CQM_LB_MODE_NORMAL || diff --git a/drivers/scsi/spfc/hw/spfc_cqm_main.c b/drivers/scsi/spfc/hw/spfc_cqm_main.c index a4c8e60971b1..52cc2c7838e9 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_main.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_main.c @@ -11,21 +11,8 @@ #include "sphw_crm.h" #include "sphw_hw.h" #include "sphw_hw_cfg.h" - #include "spfc_cqm_main.h" -static unsigned char cqm_lb_mode = CQM_LB_MODE_NORMAL; -module_param(cqm_lb_mode, byte, 0644); -MODULE_PARM_DESC(cqm_lb_mode, "for cqm lb mode (default=0xff)"); - -static unsigned char cqm_fake_mode = CQM_FAKE_MODE_DISABLE; -module_param(cqm_fake_mode, byte, 0644); -MODULE_PARM_DESC(cqm_fake_mode, "for cqm fake mode (default=0 disable)"); - -static unsigned char cqm_platform_mode = CQM_FPGA_MODE; -module_param(cqm_platform_mode, byte, 0644); -MODULE_PARM_DESC(cqm_platform_mode, "for cqm platform mode (default=0 FPGA)"); - s32 cqm3_init(void *ex_handle) { struct sphw_hwdev *handle = (struct sphw_hwdev *)ex_handle; @@ -63,19 +50,6 @@ s32 cqm3_init(void *ex_handle) goto err1; } - /* In FAKE mode, only the bitmap of the timer of the function is - * enabled, and resources are not initialized. Otherwise, the - * configuration of the fake function is overwritten. - */ - if (cqm_handle->func_capability.fake_func_type == CQM_FAKE_FUNC_CHILD_CONFLICT) { - if (sphw_func_tmr_bitmap_set(ex_handle, true) != CQM_SUCCESS) - cqm_err(handle->dev_hdl, "Timer start: enable timer bitmap failed\n"); - - handle->cqm_hdl = NULL; - kfree(cqm_handle); - return CQM_SUCCESS; - } - /* Initialize memory entries such as BAT, CLA, and bitmap. */ if (cqm_mem_init(ex_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_mem_init)); @@ -287,64 +261,6 @@ void cqm_service_capability_init(struct cqm_handle *cqm_handle, cqm_service_capability_init_fc(cqm_handle, (void *)service_capability); } -s32 cqm_get_fake_func_type(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - u32 parent_func, child_func_start, child_func_number, i; - u32 idx = cqm_handle->func_attribute.func_global_idx; - - /* Currently, only one set of fake configurations is implemented. - * fake_cfg_number = 1 - */ - for (i = 0; i < func_cap->fake_cfg_number; i++) { - parent_func = func_cap->fake_cfg[i].parent_func; - child_func_start = func_cap->fake_cfg[i].child_func_start; - child_func_number = func_cap->fake_cfg[i].child_func_number; - - if (idx == parent_func) { - return CQM_FAKE_FUNC_PARENT; - } else if ((idx >= child_func_start) && - (idx < (child_func_start + child_func_number))) { - return CQM_FAKE_FUNC_CHILD_CONFLICT; - } - } - - return CQM_FAKE_FUNC_NORMAL; -} - -s32 cqm_get_child_func_start(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct sphw_func_attr *func_attr = &cqm_handle->func_attribute; - u32 i; - - /* Currently, only one set of fake configurations is implemented. - * fake_cfg_number = 1 - */ - for (i = 0; i < func_cap->fake_cfg_number; i++) { - if (func_attr->func_global_idx == - func_cap->fake_cfg[i].parent_func) - return (s32)(func_cap->fake_cfg[i].child_func_start); - } - - return CQM_FAIL; -} - -s32 cqm_get_child_func_number(struct cqm_handle *cqm_handle) -{ - struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct sphw_func_attr *func_attr = &cqm_handle->func_attribute; - u32 i; - - for (i = 0; i < func_cap->fake_cfg_number; i++) { - if (func_attr->func_global_idx == - func_cap->fake_cfg[i].parent_func) - return (s32)(func_cap->fake_cfg[i].child_func_number); - } - - return CQM_FAIL; -} - /* Set func_type in fake_cqm_handle to ppf, pf, or vf. */ void cqm_set_func_type(struct cqm_handle *cqm_handle) { @@ -358,41 +274,20 @@ void cqm_set_func_type(struct cqm_handle *cqm_handle) cqm_handle->func_attribute.func_type = CQM_VF; } -void cqm_lb_fake_mode_init(struct cqm_handle *cqm_handle) +void cqm_lb_fake_mode_init(struct cqm_handle *cqm_handle, struct service_cap *svc_cap) { struct cqm_func_capability *func_cap = &cqm_handle->func_capability; - struct cqm_fake_cfg *cfg = func_cap->fake_cfg; - func_cap->lb_mode = cqm_lb_mode; - func_cap->fake_mode = cqm_fake_mode; + func_cap->lb_mode = svc_cap->lb_mode; /* Initializing the LB Mode */ - if (func_cap->lb_mode == CQM_LB_MODE_NORMAL) { + if (func_cap->lb_mode == CQM_LB_MODE_NORMAL) func_cap->smf_pg = 0; - } else { - /* The LB mode is tailored on the FPGA. - * Only SMF0 and SMF2 are instantiated. - */ - if (cqm_platform_mode == CQM_FPGA_MODE) - func_cap->smf_pg = 0x5; - else - func_cap->smf_pg = 0xF; - } + else + func_cap->smf_pg = svc_cap->smf_pg; - /* Initializing the FAKE Mode */ - if (func_cap->fake_mode == CQM_FAKE_MODE_DISABLE) { - func_cap->fake_cfg_number = 0; - func_cap->fake_func_type = CQM_FAKE_FUNC_NORMAL; - } else { - func_cap->fake_cfg_number = 1; - - /* When configuring fake mode, ensure that the parent function - * cannot be contained in the child function; otherwise, the - * system will be initialized repeatedly. - */ - cfg[0].child_func_start = CQM_FAKE_CFUNC_START; - func_cap->fake_func_type = cqm_get_fake_func_type(cqm_handle); - } + func_cap->fake_cfg_number = 0; + func_cap->fake_func_type = CQM_FAKE_FUNC_NORMAL; } s32 cqm_capability_init(void *ex_handle) @@ -465,10 +360,9 @@ s32 cqm_capability_init(void *ex_handle) func_cap->gpa_check_enable = true; - cqm_lb_fake_mode_init(cqm_handle); + cqm_lb_fake_mode_init(cqm_handle, service_capability); cqm_info(handle->dev_hdl, "Cap init: lb_mode=%u\n", func_cap->lb_mode); cqm_info(handle->dev_hdl, "Cap init: smf_pg=%u\n", func_cap->smf_pg); - cqm_info(handle->dev_hdl, "Cap init: fake_mode=%u\n", func_cap->fake_mode); cqm_info(handle->dev_hdl, "Cap init: fake_func_type=%u\n", func_cap->fake_func_type); cqm_info(handle->dev_hdl, "Cap init: fake_cfg_number=%u\n", func_cap->fake_cfg_number); @@ -517,153 +411,6 @@ s32 cqm_capability_init(void *ex_handle) return err; } -void cqm_fake_uninit(struct cqm_handle *cqm_handle) -{ - u32 i; - - if (cqm_handle->func_capability.fake_func_type != - CQM_FAKE_FUNC_PARENT) - return; - - for (i = 0; i < CQM_FAKE_FUNC_MAX; i++) { - kfree(cqm_handle->fake_cqm_handle[i]); - cqm_handle->fake_cqm_handle[i] = NULL; - } -} - -s32 cqm_fake_init(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_func_capability *func_cap = NULL; - struct cqm_handle *fake_cqm_handle = NULL; - struct sphw_func_attr *func_attr = NULL; - s32 child_func_start, child_func_number; - u32 i; - - func_cap = &cqm_handle->func_capability; - if (func_cap->fake_func_type != CQM_FAKE_FUNC_PARENT) - return CQM_SUCCESS; - - child_func_start = cqm_get_child_func_start(cqm_handle); - if (child_func_start == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_start)); - return CQM_FAIL; - } - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return CQM_FAIL; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = kmalloc(sizeof(*fake_cqm_handle), GFP_KERNEL | __GFP_ZERO); - if (!fake_cqm_handle) { - cqm_err(handle->dev_hdl, - CQM_ALLOC_FAIL(fake_cqm_handle)); - goto err; - } - - /* Copy the attributes of the parent CQM handle to the child CQM - * handle and modify the values of function. - */ - memcpy(fake_cqm_handle, cqm_handle, sizeof(struct cqm_handle)); - func_attr = &fake_cqm_handle->func_attribute; - func_cap = &fake_cqm_handle->func_capability; - func_attr->func_global_idx = (u16)(child_func_start + i); - cqm_set_func_type(fake_cqm_handle); - func_cap->fake_func_type = CQM_FAKE_FUNC_CHILD; - cqm_info(handle->dev_hdl, "Fake func init: function[%u] type %d(0:PF,1:VF,2:PPF)\n", - func_attr->func_global_idx, func_attr->func_type); - - fake_cqm_handle->parent_cqm_handle = cqm_handle; - cqm_handle->fake_cqm_handle[i] = fake_cqm_handle; - } - - return CQM_SUCCESS; - -err: - cqm_fake_uninit(cqm_handle); - return CQM_FAIL; -} - -void cqm_fake_mem_uninit(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_handle *fake_cqm_handle = NULL; - s32 child_func_number; - u32 i; - - if (cqm_handle->func_capability.fake_func_type != CQM_FAKE_FUNC_PARENT) - return; - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = cqm_handle->fake_cqm_handle[i]; - cqm_object_table_uninit(fake_cqm_handle); - cqm_bitmap_uninit(fake_cqm_handle); - cqm_cla_uninit(fake_cqm_handle, CQM_BAT_ENTRY_MAX); - cqm_bat_uninit(fake_cqm_handle); - } -} - -s32 cqm_fake_mem_init(struct cqm_handle *cqm_handle) -{ - struct sphw_hwdev *handle = cqm_handle->ex_handle; - struct cqm_handle *fake_cqm_handle = NULL; - s32 child_func_number; - u32 i; - - if (cqm_handle->func_capability.fake_func_type != - CQM_FAKE_FUNC_PARENT) - return CQM_SUCCESS; - - child_func_number = cqm_get_child_func_number(cqm_handle); - if (child_func_number == CQM_FAIL) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(child_func_number)); - return CQM_FAIL; - } - - for (i = 0; i < (u32)child_func_number; i++) { - fake_cqm_handle = cqm_handle->fake_cqm_handle[i]; - - if (cqm_bat_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_bat_init)); - goto err; - } - - if (cqm_cla_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_cla_init)); - goto err; - } - - if (cqm_bitmap_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_bitmap_init)); - goto err; - } - - if (cqm_object_table_init(fake_cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, - CQM_FUNCTION_FAIL(cqm_object_table_init)); - goto err; - } - } - - return CQM_SUCCESS; - -err: - cqm_fake_mem_uninit(cqm_handle); - return CQM_FAIL; -} - s32 cqm_mem_init(void *ex_handle) { struct sphw_hwdev *handle = (struct sphw_hwdev *)ex_handle; @@ -671,49 +418,35 @@ s32 cqm_mem_init(void *ex_handle) cqm_handle = (struct cqm_handle *)(handle->cqm_hdl); - if (cqm_fake_init(cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_fake_init)); - return CQM_FAIL; - } - - if (cqm_fake_mem_init(cqm_handle) != CQM_SUCCESS) { - cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_fake_mem_init)); - goto err1; - } - if (cqm_bat_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_bat_init)); - goto err2; + return CQM_FAIL; } if (cqm_cla_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_cla_init)); - goto err3; + goto err1; } if (cqm_bitmap_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_bitmap_init)); - goto err4; + goto err2; } if (cqm_object_table_init(cqm_handle) != CQM_SUCCESS) { cqm_err(handle->dev_hdl, CQM_FUNCTION_FAIL(cqm_object_table_init)); - goto err5; + goto err3; } return CQM_SUCCESS; -err5: - cqm_bitmap_uninit(cqm_handle); -err4: - cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); err3: - cqm_bat_uninit(cqm_handle); + cqm_bitmap_uninit(cqm_handle); err2: - cqm_fake_mem_uninit(cqm_handle); + cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); err1: - cqm_fake_uninit(cqm_handle); + cqm_bat_uninit(cqm_handle); return CQM_FAIL; } @@ -728,8 +461,6 @@ void cqm_mem_uninit(void *ex_handle) cqm_bitmap_uninit(cqm_handle); cqm_cla_uninit(cqm_handle, CQM_BAT_ENTRY_MAX); cqm_bat_uninit(cqm_handle); - cqm_fake_mem_uninit(cqm_handle); - cqm_fake_uninit(cqm_handle); } s32 cqm_event_init(void *ex_handle) diff --git a/drivers/scsi/spfc/hw/spfc_cqm_main.h b/drivers/scsi/spfc/hw/spfc_cqm_main.h index 1b8cf8bdb3b7..cf10d7f5c339 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_main.h +++ b/drivers/scsi/spfc/hw/spfc_cqm_main.h @@ -328,9 +328,6 @@ void cqm_mem_uninit(void *ex_handle); s32 cqm_event_init(void *ex_handle); void cqm_event_uninit(void *ex_handle); u8 cqm_aeq_callback(void *ex_handle, u8 event, u8 *data); -s32 cqm_get_fake_func_type(struct cqm_handle *cqm_handle); -s32 cqm_get_child_func_start(struct cqm_handle *cqm_handle); -s32 cqm_get_child_func_number(struct cqm_handle *cqm_handle); s32 cqm3_init(void *ex_handle); void cqm3_uninit(void *ex_handle); diff --git a/drivers/scsi/spfc/hw/spfc_cqm_object.c b/drivers/scsi/spfc/hw/spfc_cqm_object.c index b895d37aebae..165794e9c7e5 100644 --- a/drivers/scsi/spfc/hw/spfc_cqm_object.c +++ b/drivers/scsi/spfc/hw/spfc_cqm_object.c @@ -155,8 +155,6 @@ struct cqm_qpc_mpt *cqm3_object_qpc_mpt_create(void *ex_handle, u32 service_type struct cqm_qpc_mpt_info *qpc_mpt_info = NULL; struct cqm_handle *cqm_handle = NULL; s32 ret = CQM_FAIL; - u32 relative_index; - u32 fake_func_id; CQM_PTR_CHECK_RET(ex_handle, NULL, CQM_PTR_NULL(ex_handle)); @@ -180,25 +178,6 @@ struct cqm_qpc_mpt *cqm3_object_qpc_mpt_create(void *ex_handle, u32 service_type return NULL; } - /* fake vf adaption, switch to corresponding VF. */ - if (cqm_handle->func_capability.fake_func_type == - CQM_FAKE_FUNC_PARENT) { - fake_func_id = index / cqm_handle->func_capability.qpc_number; - relative_index = index % cqm_handle->func_capability.qpc_number; - - cqm_info(handle->dev_hdl, "qpc create: fake_func_id=%u, relative_index=%u\n", - fake_func_id, relative_index); - - if ((s32)fake_func_id >= - cqm_get_child_func_number(cqm_handle)) { - cqm_err(handle->dev_hdl, CQM_WRONG_VALUE(fake_func_id)); - return NULL; - } - - index = relative_index; - cqm_handle = cqm_handle->fake_cqm_handle[fake_func_id]; - } - qpc_mpt_info = kmalloc(sizeof(*qpc_mpt_info), GFP_ATOMIC | __GFP_ZERO); CQM_PTR_CHECK_RET(qpc_mpt_info, NULL, CQM_ALLOC_FAIL(qpc_mpt_info)); -- 2.32.0

1 0

[PATCH openEuler-5.10 01/30] net: hns3: refactor hns3 makefile to support hns3_common module
by Zheng Zengkai 12 Jan '22

12 Jan '22

From: Jie Wang <wangjie125(a)huawei.com> mainline inclusion from mainline-br26_refactor2 commit 5f20be4e90e6 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4Q02P CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ---------------------------------------------------------------------- Currently we plan to refactor PF and VF cmdq module. A new file folder hns3_common will be created to store new common APIs used by PF and VF cmdq module. Thus the PF and VF compilation process will both depends on the hns3_common. This may cause parallel building problems if we add a new makefile building unit. So this patch combined the PF and VF makefile scripts to the top level makefile to support the new hns3_common which will be created in the next patch. Signed-off-by: Jie Wang <wangjie125(a)huawei.com> Signed-off-by: Guangbin Huang <huangguangbin2(a)huawei.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Reviewed-by: Jian Shen <shenjian15(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/net/ethernet/hisilicon/hns3/Makefile | 14 +++++++++++--- .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 12 ------------ .../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 10 ---------- 3 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile diff --git a/drivers/net/ethernet/hisilicon/hns3/Makefile b/drivers/net/ethernet/hisilicon/hns3/Makefile index 7aa2fac76c5e..32e24e0945f5 100644 --- a/drivers/net/ethernet/hisilicon/hns3/Makefile +++ b/drivers/net/ethernet/hisilicon/hns3/Makefile @@ -4,9 +4,8 @@ # ccflags-y += -I$(srctree)/$(src) - -obj-$(CONFIG_HNS3) += hns3pf/ -obj-$(CONFIG_HNS3) += hns3vf/ +ccflags-y += -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3pf +ccflags-y += -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3vf obj-$(CONFIG_HNS3) += hnae3.o @@ -14,3 +13,12 @@ obj-$(CONFIG_HNS3_ENET) += hns3.o hns3-objs = hns3_enet.o hns3_ethtool.o hns3_debugfs.o hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o + +obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o +hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_cmd.o hns3vf/hclgevf_mbx.o hns3vf/hclgevf_devlink.o + +obj-$(CONFIG_HNS3_HCLGE) += hclge.o +hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_cmd.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o \ + hns3pf/hclge_mbx.o hns3pf/hclge_err.o hns3pf/hclge_debugfs.o hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o + +hclge-$(CONFIG_HNS3_DCB) += hns3pf/hclge_dcb.o diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile b/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile deleted file mode 100644 index d1bf5c4c0abb..000000000000 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Makefile for the HISILICON network device drivers. -# - -ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 -ccflags-y += -I $(srctree)/$(src) - -obj-$(CONFIG_HNS3_HCLGE) += hclge.o -hclge-objs = hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o hclge_mbx.o hclge_err.o hclge_debugfs.o hclge_ptp.o hclge_devlink.o - -hclge-$(CONFIG_HNS3_DCB) += hclge_dcb.o diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile b/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile deleted file mode 100644 index 51ff7d86ee90..000000000000 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Makefile for the HISILICON network device drivers. -# - -ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 -ccflags-y += -I $(srctree)/$(src) - -obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o -hclgevf-objs = hclgevf_main.o hclgevf_cmd.o hclgevf_mbx.o hclgevf_devlink.o -- 2.20.1

1 29

[PATCH OLK-5.10 0/8] revert bcache prefetch temporarily
by Zheng Zengkai 12 Jan '22

12 Jan '22

This patch set introduce many conflicts while backporting mainline bcache patches, revert it temporarily. Zheng Zengkai (8): Revert "bcache: always record start time of a sample" Revert "bcache: do not collect data insert info created by write_moving" Revert "bcache: Rewrite patch to delay to invalidate cache data" Revert "bcache: Add a sample of userspace prefetch client" Revert "bcache: Delay to invalidate cache data in writearound write" Revert "bcache: inflight prefetch requests block overlapped normal requests" Revert "bcache: provide a switch to bypass all IO requests" Revert "bcache: add a framework to perform prefetch" Documentation/admin-guide/bcache.rst | 4 - drivers/md/bcache/Makefile | 2 +- drivers/md/bcache/acache.c | 586 --------------------------- drivers/md/bcache/acache.h | 79 ---- drivers/md/bcache/bcache.h | 3 - drivers/md/bcache/btree.c | 4 +- drivers/md/bcache/request.c | 161 +++----- drivers/md/bcache/request.h | 45 -- drivers/md/bcache/stats.c | 13 - drivers/md/bcache/stats.h | 3 - drivers/md/bcache/super.c | 6 - drivers/md/bcache/sysfs.c | 12 - include/trace/events/bcache.h | 22 - samples/acache_client/Makefile | 13 - samples/acache_client/connect.c | 144 ------- samples/acache_client/connect.h | 74 ---- samples/acache_client/main.c | 133 ------ 17 files changed, 59 insertions(+), 1245 deletions(-) delete mode 100644 drivers/md/bcache/acache.c delete mode 100644 drivers/md/bcache/acache.h delete mode 100644 samples/acache_client/Makefile delete mode 100644 samples/acache_client/connect.c delete mode 100644 samples/acache_client/connect.h delete mode 100644 samples/acache_client/main.c -- 2.20.1

2 9

[PATCH openEuler-5.10 01/17] tcp: Add some stub info for KABI consistency
by Zheng Zengkai 11 Jan '22

11 Jan '22

From: Baisong Zhong <zhongbaisong(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4PY1Q CVE: NA -------------------------------- We add stub info in some structures to maintain the consistency of KABI Signed-off-by: Baisong Zhong <zhongbaisong(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- include/linux/skbuff.h | 2 ++ include/net/ipv6.h | 2 +- include/net/sock.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 9e3a454d2377..d485f17ff33a 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -36,6 +36,7 @@ #include <linux/splice.h> #include <linux/in6.h> #include <linux/if_packet.h> +#include <linux/llist.h> #include <net/flow.h> #include <net/page_pool.h> #include <linux/kabi.h> @@ -732,6 +733,7 @@ struct sk_buff { }; struct rb_node rbnode; /* used in netem, ip4 defrag, and tcp stack */ struct list_head list; + struct llist_node ll_node; }; union { diff --git a/include/net/ipv6.h b/include/net/ipv6.h index bd1f396cc9c7..c0273ae50296 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -344,9 +344,9 @@ struct ipcm6_cookie { struct sockcm_cookie sockc; __s16 hlimit; __s16 tclass; + __u16 gso_size; __s8 dontfrag; struct ipv6_txoptions *opt; - __u16 gso_size; }; static inline void ipcm6_init(struct ipcm6_cookie *ipc6) diff --git a/include/net/sock.h b/include/net/sock.h index 712bb7b09f96..b3d451878640 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -63,6 +63,7 @@ #include <linux/atomic.h> #include <linux/refcount.h> +#include <linux/llist.h> #include <net/dst.h> #include <net/checksum.h> #include <net/tcp_states.h> @@ -405,6 +406,8 @@ struct sock { struct sk_buff *head; struct sk_buff *tail; } sk_backlog; + struct llist_head defer_list; + #define sk_rmem_alloc sk_backlog.rmem_alloc int sk_forward_alloc; -- 2.20.1

2 17

[PATCH OLK-5.10] arm64: Add memmap parameter and register pmem
by Zhuling 10 Jan '22

10 Jan '22

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4O31I?from=project-issue CVE: NA ------------------------------ Register pmem in arm64: Use memmap(memmap=nn[KMG]!ss[KMG]) reserve memory and e820(driver/nvdimm/e820.c) function to register persistent memory in arm64. when the kernel restart or update, the data in PMEM will not be lost and can be loaded faster. this is a general features. driver/nvdimm/e820.c: The function of this file is scan "iomem_resource" and take advantage of nvdimm resource discovery mechanism by registering a resource named "Persistent Memory (legacy)", this function doesn't depend on architecture. We will push the feature to linux kernel community and discuss to modify the file name. because people have a mistaken notion that the e820.c is depend on x86. If you want use this features, you need do as follows: 1.Reserve memory: add memmap to reserve memory in grub.cfg memmap=nn[KMG]!ss[KMG] exp:memmap=100K!0x1a0000000. 2.Insmod nd_e820.ko: modprobe nd_e820. 3.Check pmem device in /dev exp: /dev/pmem0 Signed-off-by: Zhuling <zhuling8(a)huawei.com> --- arch/arm64/Kconfig | 22 ++++++++++++++++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/pmem.c | 36 ++++++++++++++++++++++++++ arch/arm64/kernel/setup.c | 11 ++++++++ arch/arm64/mm/init.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/nvdimm/Kconfig | 6 +++++ drivers/nvdimm/Makefile | 1 + 7 files changed, 140 insertions(+) create mode 100644 arch/arm64/kernel/pmem.c diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 405e5ce..2231eac 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1322,6 +1322,28 @@ config RODATA_FULL_DEFAULT_ENABLED This requires the linear region to be mapped down to pages, which may adversely affect performance in some cases. +config ARM64_PMEM_RESERVE + bool "Reserve memory for persistent storage" + default n + help + Use memmap=nn[KMG]!ss[KMG](memmap=100K!0x1a0000000) reserve + memory for persistent storage. + + Say y here to enable this feature. + +config ARM64_PMEM_LEGACY_DEVICE + bool "Create persistent storage" + depends on BLK_DEV + depends on LIBNVDIMM + select ARM64_PMEM_RESERVE + help + Use reserved memory for persistent storage when the kernel + restart or update. the data in PMEM will not be lost and + can be loaded faster. + + Say y if unsure. + + config ARM64_SW_TTBR0_PAN bool "Emulate Privileged Access Never using TTBR0_EL1 switching" help diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 169d90f..f615325 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -68,6 +68,7 @@ obj-$(CONFIG_ARM64_PTR_AUTH) += pointer_auth.o obj-$(CONFIG_SHADOW_CALL_STACK) += scs.o obj-$(CONFIG_ARM64_MTE) += mte.o obj-$(CONFIG_MPAM) += mpam/ +obj-$(CONFIG_ARM64_PMEM_LEGACY_DEVICE) += pmem.o obj-y += vdso/ probes/ obj-$(CONFIG_COMPAT_VDSO) += vdso32/ diff --git a/arch/arm64/kernel/pmem.c b/arch/arm64/kernel/pmem.c new file mode 100644 index 0000000..d1efdc8 --- /dev/null +++ b/arch/arm64/kernel/pmem.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright(c) 2021 Huawei Technologies Co., Ltd + * + * Derived from x86 and arm64 implement PMEM. + */ +#include <linux/platform_device.h> +#include <linux/init.h> +#include <linux/ioport.h> +#include <linux/module.h> + +static int found(struct resource *res, void *data) +{ + return 1; +} + +static int __init register_e820_pmem(void) +{ + struct platform_device *pdev; + int rc; + + rc = walk_iomem_res_desc(IORES_DESC_PERSISTENT_MEMORY_LEGACY, + IORESOURCE_MEM, 0, -1, NULL, found); + if (rc <= 0) + return 0; + + /* + * See drivers/nvdimm/e820.c for the implementation, this is + * simply here to trigger the module to load on demand. + */ + pdev = platform_device_alloc("e820_pmem", -1); + + return platform_device_add(pdev); +} +device_initcall(register_e820_pmem); + diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 92d75e3..1a8a4d2 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -70,6 +70,11 @@ static int __init arm64_enable_cpu0_hotplug(char *str) __setup("arm64_cpu0_hotplug", arm64_enable_cpu0_hotplug); #endif +#ifdef CONFIG_ARM64_PMEM_RESERVE +extern struct resource pmem_res; +#endif + + phys_addr_t __fdt_pointer __initdata; /* @@ -305,6 +310,12 @@ static void __init request_standard_resources(void) } } +#ifdef CONFIG_ARM64_PMEM_RESERVE + if (pmem_res.end && pmem_res.start) + request_resource(&iomem_resource, &pmem_res); +#endif + + static int __init reserve_memblock_reserved_regions(void) { u64 i, j; diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 6ebfabd..3b6907f 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -56,6 +56,8 @@ s64 memstart_addr __ro_after_init = -1; EXPORT_SYMBOL(memstart_addr); +phys_addr_t start_at, mem_size; + #ifdef CONFIG_PIN_MEMORY struct resource pin_memory_resource = { .name = "Pin memory", @@ -111,6 +113,18 @@ static void __init reserve_pin_memory_res(void) */ phys_addr_t arm64_dma_phys_limit __ro_after_init; +static unsigned long long pmem_size, pmem_start; + +#ifdef CONFIG_ARM64_PMEM_RESERVE +struct resource pmem_res = { + .name = "Persistent Memory (legacy)", + .start = 0, + .end = 0, + .flags = IORESOURCE_MEM, + .desc = IORES_DESC_PERSISTENT_MEMORY_LEGACY +}; +#endif + #ifndef CONFIG_KEXEC_CORE static void __init reserve_crashkernel(void) { @@ -403,6 +417,26 @@ static int __init reserve_park_mem(void) return -EINVAL; } #endif +static bool __init is_mem_valid(unsigned long long mem_size, unsigned long long mem_start) +{ + if (!memblock_is_region_memory(mem_start, mem_size)) { + pr_warn("cannot reserve mem: region is not memory!\n"); + return false; + } + + if (memblock_is_region_reserved(mem_start, mem_size)) { + pr_warn("cannot reserve mem: region overlaps reserved memory!\n"); + return false; + } + + if (!IS_ALIGNED(mem_start, SZ_2M)) { + pr_warn("cannot reserve mem: base address is not 2MB aligned!\n"); + return false; + } + + return true; +} + static int need_remove_real_memblock __initdata; @@ -442,7 +476,17 @@ static int __init parse_memmap_one(char *p) start_at = memparse(p + 1, &p); memblock_reserve(start_at, mem_size); memblock_mark_memmap(start_at, mem_size); +<<<<<<< HEAD + } else if (*p == '!') { + start_at = memparse(p+1, &p); + + pmem_start = start_at; + pmem_size = mem_size; + + }else +======= } else +>>>>>>> 374db2be8805428b4f54b5ef793b0d3f5069c5f9 pr_info("Unrecognized memmap option, please check the parameter.\n"); return *p == '\0' ? 0 : -EINVAL; @@ -464,6 +508,20 @@ static int __init parse_memmap_opt(char *str) } early_param("memmap", parse_memmap_opt); +#ifdef CONFIG_ARM64_PMEM_RESERVE +static void __init reserve_pmem(void) +{ + if (!is_mem_valid(mem_size, start_at)) + return; + + memblock_remove(pmem_start, pmem_size); + pr_info("pmem reserved: 0x%016llx - 0x%016llx (%lld MB)\n", + pmem_start, pmem_start + pmem_size, pmem_size >> 20); + pmem_res.start = pmem_start; + pmem_res.end = pmem_start + pmem_size - 1; +} +#endif + void __init arm64_memblock_init(void) { const s64 linear_region_size = BIT(vabits_actual - 1); @@ -638,6 +696,11 @@ void __init bootmem_init(void) reserve_quick_kexec(); #endif +#ifdef CONFIG_ARM64_PMEM_RESERVE + reserve_pmem(); +#endif + + reserve_pin_memory_res(); memblock_dump_all(); diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index b7d1eb3..9567cca 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -132,3 +132,9 @@ config NVDIMM_TEST_BUILD infrastructure. endif + +config PMEM_LEGACY + tristate "Pmem_legacy" + select X86_PMEM_LEGACY if X86 + select ARM64_PMEM_LEGACY_DEVICE if ARM64 + diff --git a/drivers/nvdimm/Makefile b/drivers/nvdimm/Makefile index 0407753..6f8dc92 100644 --- a/drivers/nvdimm/Makefile +++ b/drivers/nvdimm/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o +obj-$(CONFIG_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o -- 2.9.5

3 3

[PATCH openEuler-5.10] BMA: Fix format string compile warning in arm32 builds
by Zheng Zengkai 10 Jan '22

10 Jan '22

driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4ETXO CVE: NA ----------------------------------------- Fix following build warnings in arm32 builds: drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c: In function ‘bma_cdev_add_msg’: drivers/net/ethernet/huawei/bma/edma_drv/bma_pci.h:92:20: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 5 has type ‘size_t {aka unsigned int}’ [-Wformat=] drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c: In function ‘veth_recv_pkt’: drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c:74:37: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 7 has type ‘dma_addr_t {aka unsigned int}’ [-Wformat=] Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- .../bma/cdev_veth_drv/virtual_cdev_eth_net.c | 14 +++++++------- .../net/ethernet/huawei/bma/edma_drv/bma_devintf.c | 2 +- .../net/ethernet/huawei/bma/edma_drv/edma_host.c | 2 +- drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/huawei/bma/cdev_veth_drv/virtual_cdev_eth_net.c b/drivers/net/ethernet/huawei/bma/cdev_veth_drv/virtual_cdev_eth_net.c index 04ea55f4e0a2..d8c3ab655566 100644 --- a/drivers/net/ethernet/huawei/bma/cdev_veth_drv/virtual_cdev_eth_net.c +++ b/drivers/net/ethernet/huawei/bma/cdev_veth_drv/virtual_cdev_eth_net.c @@ -605,7 +605,7 @@ static int edma_veth_cut_tx_packet_send(struct edma_eth_dev_s *eth_dev, do_queue_rate_limit(eth_dev->ptx_queue); while (length > 0) { - LOG(DLOG_DEBUG, "length: %u/%lu", length, len); + LOG(DLOG_DEBUG, "length: %u/%zu", length, len); if (length > BSPPACKET_MTU_MAX) { /* fragment. */ @@ -1689,7 +1689,7 @@ static ssize_t cdev_copy_packet_to_user(struct edma_eth_dev_s *dev, start = dev->rx_packet[dev->rx_packet_head].packet + g_read_pos; LOG(DLOG_DEBUG, - "User needs %ld bytes, pos: %u, total len: %u, left: %ld.", + "User needs %zu bytes, pos: %u, total len: %u, left: %zd.", count, g_read_pos, dev->rx_packet[dev->rx_packet_head].len, left); if (left <= 0) { /* No more data in this message, retry. */ @@ -1721,7 +1721,7 @@ static ssize_t cdev_copy_packet_to_user(struct edma_eth_dev_s *dev, } LOG(DLOG_DEBUG, - "Copied bytes: %ld, pos: %d, buf len: %lu, free_packet: %d.", + "Copied bytes: %zd, pos: %d, buf len: %zu, free_packet: %d.", length, g_read_pos, count, free_packet); if (packet) { @@ -1807,11 +1807,11 @@ ssize_t cdev_read(struct file *filp, char __user *data, if (!data || count >= MAX_PACKET_LEN) return -EFAULT; - LOG(DLOG_DEBUG, "read begin, count: %ld, pos: %u.", count, g_read_pos); + LOG(DLOG_DEBUG, "read begin, count: %zu, pos: %u.", count, g_read_pos); length = cdev_copy_packet_to_user(dev, data, count); - LOG(DLOG_DEBUG, "read done, length: %ld, pos: %u.", length, g_read_pos); + LOG(DLOG_DEBUG, "read done, length: %zd, pos: %u.", length, g_read_pos); return length; } @@ -1837,7 +1837,7 @@ ssize_t cdev_write(struct file *filp, const char __user *data, g_peer_not_ready = 0; } - LOG(DLOG_DEBUG, "data length is %lu, pos: %u (%u/%u)", + LOG(DLOG_DEBUG, "data length is %zu, pos: %u (%u/%u)", count, g_read_pos, pdev->ptx_queue->pshmqhd_v->count, pdev->ptx_queue->pshmqhd_v->total); @@ -1859,4 +1859,4 @@ MODULE_DESCRIPTION("HUAWEI CDEV DRIVER"); MODULE_LICENSE("GPL"); module_init(edma_cdev_init); -module_exit(edma_cdev_exit); \ No newline at end of file +module_exit(edma_cdev_exit); diff --git a/drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c b/drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c index 7817f58f8635..acf6bbfc50ff 100644 --- a/drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c +++ b/drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c @@ -497,7 +497,7 @@ int bma_cdev_add_msg(void *handle, const char __user *msg, size_t msg_len) hdr->sub_type = priv->user.sub_type; hdr->user_id = priv->user.user_id; hdr->datalen = msg_len; - BMA_LOG(DLOG_DEBUG, "msg_len is %ld\n", msg_len); + BMA_LOG(DLOG_DEBUG, "msg_len is %zu\n", msg_len); if (copy_from_user(hdr->data, msg, msg_len)) { BMA_LOG(DLOG_ERROR, "copy_from_user error\n"); diff --git a/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c b/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c index 2d5f4ffd79d9..3525d41c865f 100644 --- a/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c +++ b/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c @@ -789,7 +789,7 @@ static int edma_host_send_msg(struct edma_host_s *edma_host) if (edma_host->msg_send_write > HOST_MAX_SEND_MBX_LEN - SIZE_OF_MBX_HDR) { BMA_LOG(DLOG_ERROR, - "Length of send message %u is larger than %lu\n", + "Length of send message %u is larger than %zu\n", edma_host->msg_send_write, HOST_MAX_SEND_MBX_LEN - SIZE_OF_MBX_HDR); edma_host->msg_send_write = 0; diff --git a/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c b/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c index 9681ce3bfc7b..240db31d7178 100644 --- a/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c +++ b/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c @@ -1488,8 +1488,8 @@ s32 veth_recv_pkt(struct bspveth_rxtx_q *prx_queue, int queue) skb->len, skb->protocol); VETH_LOG(DLOG_DEBUG, - "dma_p=0x%llx,dma_map=0x%llx,", - pbd_v->dma_p, dma_map); + "dma_p=0x%llx,dma_map=%pad,", + pbd_v->dma_p, &dma_map); VETH_LOG(DLOG_DEBUG, "skb=%p,skb->data=%p,skb->len=%d,tail=%d,shm_off=%d\n", -- 2.20.1

1 0

[PATCH openEuler-5.10 01/21] RDMA/hns: Enable stash feature of HIP09
by Zheng Zengkai 08 Jan '22

08 Jan '22

From: Yixing Liu <liuyixing1(a)huawei.com> mainline inclusion from mainline-v5.15-rc1 commit 260f64a40198 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4O23M CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ---------------------------------------------------------------------------- The stash feature is enabled by default on HIP09. Fixes: f93c39bc9547 ("RDMA/hns: Add support for QP stash") Fixes: bfefae9f108d ("RDMA/hns: Add support for CQ stash") Link: https://lore.kernel.org/r/1629539607-33217-3-git-send-email-liangwenpeng@hu… Signed-off-by: Yixing Liu <liuyixing1(a)huawei.com> Signed-off-by: Wenpeng Liang <liangwenpeng(a)huawei.com> Signed-off-by: Jason Gunthorpe <jgg(a)nvidia.com> sigend-off-by: Guofeng Yue <yueguofeng(a)hisilicon.com> Reviewed-by: Yangyang Li <liyangyang20(a)huawei.com> Acked-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index aea6a6a7b238..4f8738bda0a2 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -2004,6 +2004,7 @@ static void set_default_caps(struct hns_roce_dev *hr_dev) caps->gid_table_len[0] = HNS_ROCE_V2_GID_INDEX_NUM; if (hr_dev->pci_dev->revision >= PCI_REVISION_ID_HIP09) { + caps->flags |= HNS_ROCE_CAP_FLAG_STASH; caps->max_sq_inline = HNS_ROCE_V3_MAX_SQ_INLINE; } else { caps->max_sq_inline = HNS_ROCE_V2_MAX_SQ_INLINE; -- 2.20.1

1 20

[PATCH OLK-5.10] BMA: Fix format string compile warning in arm32 builds
by Zheng Zengkai 08 Jan '22

08 Jan '22

driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4ETXO CVE: NA ----------------------------------------- Fix following build warnings in arm32 builds: drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c: In function ‘bma_cdev_add_msg’: drivers/net/ethernet/huawei/bma/edma_drv/bma_pci.h:92:20: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 5 has type ‘size_t {aka unsigned int}’ [-Wformat=] Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- .../bma/cdev_veth_drv/virtual_cdev_eth_net.c | 14 +++++++------- .../net/ethernet/huawei/bma/edma_drv/bma_devintf.c | 2 +- .../net/ethernet/huawei/bma/edma_drv/edma_host.c | 2 +- drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/huawei/bma/cdev_veth_drv/virtual_cdev_eth_net.c b/drivers/net/ethernet/huawei/bma/cdev_veth_drv/virtual_cdev_eth_net.c index 04ea55f4e0a2..99466848c034 100644 --- a/drivers/net/ethernet/huawei/bma/cdev_veth_drv/virtual_cdev_eth_net.c +++ b/drivers/net/ethernet/huawei/bma/cdev_veth_drv/virtual_cdev_eth_net.c @@ -605,7 +605,7 @@ static int edma_veth_cut_tx_packet_send(struct edma_eth_dev_s *eth_dev, do_queue_rate_limit(eth_dev->ptx_queue); while (length > 0) { - LOG(DLOG_DEBUG, "length: %u/%lu", length, len); + LOG(DLOG_DEBUG, "length: %u/%u", length, len); if (length > BSPPACKET_MTU_MAX) { /* fragment. */ @@ -1689,7 +1689,7 @@ static ssize_t cdev_copy_packet_to_user(struct edma_eth_dev_s *dev, start = dev->rx_packet[dev->rx_packet_head].packet + g_read_pos; LOG(DLOG_DEBUG, - "User needs %ld bytes, pos: %u, total len: %u, left: %ld.", + "User needs %d bytes, pos: %u, total len: %u, left: %d.", count, g_read_pos, dev->rx_packet[dev->rx_packet_head].len, left); if (left <= 0) { /* No more data in this message, retry. */ @@ -1721,7 +1721,7 @@ static ssize_t cdev_copy_packet_to_user(struct edma_eth_dev_s *dev, } LOG(DLOG_DEBUG, - "Copied bytes: %ld, pos: %d, buf len: %lu, free_packet: %d.", + "Copied bytes: %d, pos: %d, buf len: %u, free_packet: %d.", length, g_read_pos, count, free_packet); if (packet) { @@ -1807,11 +1807,11 @@ ssize_t cdev_read(struct file *filp, char __user *data, if (!data || count >= MAX_PACKET_LEN) return -EFAULT; - LOG(DLOG_DEBUG, "read begin, count: %ld, pos: %u.", count, g_read_pos); + LOG(DLOG_DEBUG, "read begin, count: %d, pos: %u.", count, g_read_pos); length = cdev_copy_packet_to_user(dev, data, count); - LOG(DLOG_DEBUG, "read done, length: %ld, pos: %u.", length, g_read_pos); + LOG(DLOG_DEBUG, "read done, length: %d, pos: %u.", length, g_read_pos); return length; } @@ -1837,7 +1837,7 @@ ssize_t cdev_write(struct file *filp, const char __user *data, g_peer_not_ready = 0; } - LOG(DLOG_DEBUG, "data length is %lu, pos: %u (%u/%u)", + LOG(DLOG_DEBUG, "data length is %u, pos: %u (%u/%u)", count, g_read_pos, pdev->ptx_queue->pshmqhd_v->count, pdev->ptx_queue->pshmqhd_v->total); @@ -1859,4 +1859,4 @@ MODULE_DESCRIPTION("HUAWEI CDEV DRIVER"); MODULE_LICENSE("GPL"); module_init(edma_cdev_init); -module_exit(edma_cdev_exit); \ No newline at end of file +module_exit(edma_cdev_exit); diff --git a/drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c b/drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c index 7817f58f8635..2d63e44f0ed2 100644 --- a/drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c +++ b/drivers/net/ethernet/huawei/bma/edma_drv/bma_devintf.c @@ -497,7 +497,7 @@ int bma_cdev_add_msg(void *handle, const char __user *msg, size_t msg_len) hdr->sub_type = priv->user.sub_type; hdr->user_id = priv->user.user_id; hdr->datalen = msg_len; - BMA_LOG(DLOG_DEBUG, "msg_len is %ld\n", msg_len); + BMA_LOG(DLOG_DEBUG, "msg_len is %d\n", msg_len); if (copy_from_user(hdr->data, msg, msg_len)) { BMA_LOG(DLOG_ERROR, "copy_from_user error\n"); diff --git a/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c b/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c index 2d5f4ffd79d9..a89a4160dedd 100644 --- a/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c +++ b/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c @@ -789,7 +789,7 @@ static int edma_host_send_msg(struct edma_host_s *edma_host) if (edma_host->msg_send_write > HOST_MAX_SEND_MBX_LEN - SIZE_OF_MBX_HDR) { BMA_LOG(DLOG_ERROR, - "Length of send message %u is larger than %lu\n", + "Length of send message %u is larger than %u\n", edma_host->msg_send_write, HOST_MAX_SEND_MBX_LEN - SIZE_OF_MBX_HDR); edma_host->msg_send_write = 0; diff --git a/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c b/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c index 9681ce3bfc7b..7b511c05c2e9 100644 --- a/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c +++ b/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.c @@ -1488,7 +1488,7 @@ s32 veth_recv_pkt(struct bspveth_rxtx_q *prx_queue, int queue) skb->len, skb->protocol); VETH_LOG(DLOG_DEBUG, - "dma_p=0x%llx,dma_map=0x%llx,", + "dma_p=0x%llx,dma_map=0x%x,", pbd_v->dma_p, dma_map); VETH_LOG(DLOG_DEBUG, -- 2.20.1

2 1

[PATCH openEuler-5.10 001/125] kabi: Generalize naming of kabi helper macros
by Zheng Zengkai 07 Jan '22

07 Jan '22

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4K3S5 -------------------------- Generalize naming of some kabi helper macros. Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- include/linux/kabi.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/linux/kabi.h b/include/linux/kabi.h index 713f63cf56cb..0bc7ca2483f4 100644 --- a/include/linux/kabi.h +++ b/include/linux/kabi.h @@ -151,7 +151,7 @@ * approaches can (and often are) combined. * * To use this for 'struct foo' (the "base structure"), define a new - * structure called 'struct foo_rh'; this new struct is called "auxiliary + * structure called 'struct foo_resvd'; this new struct is called "auxiliary * structure". Then add KABI_AUX_EMBED or KABI_AUX_PTR to the end * of the base structure. The argument is the name of the base structure, * without the 'struct' keyword. @@ -174,7 +174,7 @@ * end. Note the auxiliary structure cannot be shrunk in size later (i.e., * fields cannot be removed, only deprecated). Any code accessing fields * from the aux struct must guard the access using the KABI_AUX macro. - * The access itself is then done via a '_rh' field in the base struct. + * The access itself is then done via a '_resvd' field in the base struct. * * The auxiliary structure is not guaranteed for access by modules unless * explicitly commented as such in the declaration of the aux struct @@ -182,7 +182,7 @@ * * Example: * - * struct foo_rh { + * struct foo_resvd { * int newly_added; * }; * @@ -194,20 +194,20 @@ * void use(struct foo *f) * { * if (KABI_AUX(f, foo, newly_added)) - * f->_rh->newly_added = 123; + * f->_resvd->newly_added = 123; * else * // the field 'newly_added' is not present in the passed * // struct, fall back to old behavior * f->big_hammer = true; * } * - * static struct foo_rh my_foo_rh { + * static struct foo_resvd my_foo_resvd { * .newly_added = 0; * } * * static struct foo my_foo = { * .big_hammer = false, - * ._rh = &my_foo_rh, + * ._resvd = &my_foo_resvd, * KABI_AUX_INIT_SIZE(foo) * }; * @@ -218,7 +218,7 @@ * * Example: * - * struct foo_rh { + * struct foo_resvd { * }; * * struct foo { @@ -385,7 +385,7 @@ _Static_assert(__alignof__(struct{_new;}) <= __alignof__(struct{_orig;}), \ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_orig) " is not aligned the same as " __stringify(_new) KABI_ALIGN_WARNING); \ } -# define __ABI_CHECK_SIZE(_item, _size) \ +# define __KABI_CHECK_SIZE(_item, _size) \ _Static_assert(sizeof(struct{_item;}) <= _size, \ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_item) " is larger than the reserved size (" __stringify(_size) " bytes)" KABI_ALIGN_WARNING) #else @@ -451,14 +451,14 @@ }) #define _KABI_AUX_PTR(_struct) \ - size_t _struct##_size_rh; \ - _KABI_EXCLUDE(struct _struct##_rh *_rh) + size_t _struct##_size_resvd; \ + _KABI_EXCLUDE(struct _struct##_resvd *_resvd) #define KABI_AUX_PTR(_struct) \ _KABI_AUX_PTR(_struct); #define _KABI_AUX_EMBED(_struct) \ - size_t _struct##_size_rh; \ - _KABI_EXCLUDE(struct _struct##_rh _rh) + size_t _struct##_size_resvd; \ + _KABI_EXCLUDE(struct _struct##_resvd _resvd) #define KABI_AUX_EMBED(_struct) \ _KABI_AUX_EMBED(_struct); @@ -468,7 +468,7 @@ /* * KABI_AUX_SET_SIZE calculates and sets the size of the extended struct and - * stores it in the size_rh field for structs that are dynamically allocated. + * stores it in the size_resvd field for structs that are dynamically allocated. * This macro MUST be called when expanding a base struct with * KABI_SIZE_AND_EXTEND, and it MUST be called from the allocation site * regardless of being allocated in the kernel or a module. @@ -476,28 +476,28 @@ * a semicolon is necessary at the end of the line where it is invoked. */ #define KABI_AUX_SET_SIZE(_name, _struct) ({ \ - (_name)->_struct##_size_rh = sizeof(struct _struct##_rh); \ + (_name)->_struct##_size_resvd = sizeof(struct _struct##_resvd); \ }) /* * KABI_AUX_INIT_SIZE calculates and sets the size of the extended struct and - * stores it in the size_rh field for structs that are statically allocated. + * stores it in the size_resvd field for structs that are statically allocated. * This macro MUST be called when expanding a base struct with * KABI_SIZE_AND_EXTEND, and it MUST be called from the declaration site * regardless of being allocated in the kernel or a module. */ #define KABI_AUX_INIT_SIZE(_struct) \ - ._struct##_size_rh = sizeof(struct _struct##_rh), + ._struct##_size_resvd = sizeof(struct _struct##_resvd), /* * KABI_AUX verifies allocated memory exists. This MUST be called to - * verify that memory in the _rh struct is valid, and can be called + * verify that memory in the _resvd struct is valid, and can be called * regardless if KABI_SIZE_AND_EXTEND or KABI_SIZE_AND_EXTEND_PTR is * used. */ #define KABI_AUX(_ptr, _struct, _field) ({ \ - size_t __off = offsetof(struct _struct##_rh, _field); \ - (_ptr)->_struct##_size_rh > __off ? true : false; \ + size_t __off = offsetof(struct _struct##_resvd, _field); \ + (_ptr)->_struct##_size_resvd > __off ? true : false; \ }) #endif /* _LINUX_KABI_H */ -- 2.20.1

1 124