- Kernel - mailweb.openeuler.org

[PATCH openEuler-21.03 v1] park: Reserve park mem before kexec reserved
by sangyan＠huawei.com 10 Mar '21

10 Mar '21

From: Sang Yan <sangyan(a)huawei.com> hulk inclusion category: feature bugzilla: 48159 CVE: N/A ------------------------------ reserve_crashkernel or reserve_quick_kexec may find one sutiable memory region and reserves it, which address of the region is not fixed. As a result, cpu park reserves memory could be failed while specified address used by crashkernel or quickkexec. So, move reserve_park_mem before reserve_crashkernel and reserve_quick_kexec. Signed-off-by: Sang Yan <sangyan(a)huawei.com> --- arch/arm64/mm/init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index b343744..043a981 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -497,16 +497,16 @@ void __init arm64_memblock_init(void) else arm64_dma32_phys_limit = PHYS_MASK + 1; +#ifdef CONFIG_ARM64_CPU_PARK + reserve_park_mem(); +#endif + reserve_crashkernel(); #ifdef CONFIG_QUICK_KEXEC reserve_quick_kexec(); #endif -#ifdef CONFIG_ARM64_CPU_PARK - reserve_park_mem(); -#endif - reserve_pin_memory_res(); reserve_elfcorehdr(); -- 2.9.5

1 0

[PATCH openEuler-21.03 v4 1/2] arm64: Add memmap parameter and register pmem
by Zhuling 10 Mar '21

10 Mar '21

From: ZhuLing <zhuling8(a)huawei.com> hulk inclusion category: feature bugzilla: 48159 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 | 21 +++++++++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/pmem.c | 35 ++++++++++++++ arch/arm64/kernel/setup.c | 10 ++++ arch/arm64/mm/init.c | 97 ++++++++++++++++++++++++++++++++++++++ drivers/nvdimm/Kconfig | 5 ++ drivers/nvdimm/Makefile | 2 +- 7 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/kernel/pmem.c diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c451137ab..326f26d40 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -360,6 +360,27 @@ config ARM64_CPU_PARK config ARCH_HAS_CPU_RELAX def_bool y +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. + source "arch/arm64/Kconfig.platforms" menu "Kernel Features" diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 967cb3c6d..be996f3c1 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -67,6 +67,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 000000000..16eaf706f --- /dev/null +++ b/arch/arm64/kernel/pmem.c @@ -0,0 +1,35 @@ +// 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 5e282d31a..84c71c88d 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -57,6 +57,10 @@ static int num_standard_resources; static struct resource *standard_resources; +#ifdef CONFIG_ARM64_PMEM_RESERVE +extern struct resource pmem_res; +#endif + phys_addr_t __fdt_pointer __initdata; /* @@ -270,6 +274,12 @@ static void __init request_standard_resources(void) request_resource(res, &pin_memory_resource); #endif } + +#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) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index b3437440d..f22faea1a 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -66,6 +66,18 @@ EXPORT_SYMBOL(memstart_addr); phys_addr_t arm64_dma_phys_limit __ro_after_init; phys_addr_t arm64_dma32_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) { @@ -378,6 +390,87 @@ static int __init reserve_park_mem(void) } #endif +static int __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 -EINVAL; + } + + if (memblock_is_region_reserved(mem_start, mem_size)) { + pr_warn("cannot reserve mem: region overlaps reserved memory!\n"); + return -EINVAL; + } + + if (!IS_ALIGNED(mem_start, SZ_2M)) { + pr_warn("cannot reserve mem: base address is not 2MB aligned!\n"); + return -EINVAL; + } + + return 0; +} + +static int __init parse_memmap_one(char *p) +{ + char *oldp; + phys_addr_t start_at, mem_size; + + if (!p) + return -EINVAL; + + oldp = p; + mem_size = memparse(p, &p); + if (p == oldp) + return -EINVAL; + + if (!mem_size) + return -EINVAL; + + mem_size = PAGE_ALIGN(mem_size); + + if (*p == '!') { + start_at = memparse(p+1, &p); + + if (is_mem_valid(mem_size, start_at) != 0) + return -EINVAL; + + pr_info("pmem reserved: 0x%016llx - 0x%016llx (%lld MB)\n", + start_at, start_at + mem_size, mem_size >> 20); + pmem_start = start_at; + pmem_size = mem_size; + } else + pr_info("Unrecognized memmap option, please check the parameter.\n"); + + return *p == '\0' ? 0 : -EINVAL; +} + +static int __init parse_memmap_opt(char *str) +{ + while (str) { + char *k = strchr(str, ','); + + if (k) + *k++ = 0; + + parse_memmap_one(str); + str = k; + } + + return 0; +} +early_param("memmap", parse_memmap_opt); + +#ifdef CONFIG_ARM64_PMEM_RESERVE +static void __init reserve_pmem(void) +{ + 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); @@ -511,6 +604,10 @@ void __init arm64_memblock_init(void) reserve_elfcorehdr(); +#ifdef CONFIG_ARM64_PMEM_RESERVE + reserve_pmem(); +#endif + high_memory = __va(memblock_end_of_DRAM() - 1) + 1; dma_contiguous_reserve(arm64_dma32_phys_limit); diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index b7d1eb38b..ce4de7526 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -132,3 +132,8 @@ 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 29203f3d3..6f8dc9242 100644 --- a/drivers/nvdimm/Makefile +++ b/drivers/nvdimm/Makefile @@ -3,7 +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_X86_PMEM_LEGACY) += nd_e820.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.19.1

1 1

(no subject)
by 点击设置昵称 09 Mar '21

09 Mar '21

ok!

1 0

openEuler kernel sig meeting
by openEuler conference 08 Mar '21

08 Mar '21

4 7

[PATCH] kbuild: fix compile error in Makefile.lib
by fangyafenqidai＠163.com 08 Mar '21

08 Mar '21

From: Fang Yafen <yafen(a)iscas.ac.cn> Fix the following compile error when using bcm2711_defconfig (for RPi). /bin/sh: -c: line 0: syntax error near unexpected token `(' /bin/sh: -c: line 0: `set -e; echo ' DTCO arch/arm64/boot/dts/overlays/act-led.dtbo'; mkdir -p arch/arm64/boot/dts/overlays/ ; gcc -E -Wp,-MMD,arch/arm64/boot/dts/overlays/.act-led.dtbo.d.pre.tmp -nostdinc -I./scripts/dtc/include-prefixes -undef -D__DTS__ -x assembler-with-cpp -o arch/arm64/boot/dts/overlays/.act-led.dtbo.dts.tmp arch/arm64/boot/dts/overlays/act-led-overlay.dts ; ./scripts/dtc/dtc -@ -H epapr -O dtb -o arch/arm64/boot/dts/overlays/act-led.dtbo -b 0 -i arch/arm64/boot/dts/overlays/ -Wno-interrupt_provider -Wno-unit_address_vs_reg -Wno-unit_address_format -Wno-gpios_property -Wno-avoid_unnecessary_addr_size -Wno-alias_paths -Wno-graph_child_address -Wno-simple_bus_reg -Wno-unique_unit_address -Wno-pci_device_reg -Wno-interrupts_property ifeq (y,y) -Wno-label_is_string -Wno-reg_format -Wno-pci_device_bus_num -Wno-i2c_bus_reg -Wno-spi_bus_reg -Wno-avoid_default_addr_size endif -d arch/arm64/boot/dts/overlays/.act-led.dtbo.d.dtc.tmp arch/arm64/boot/dts/overlays/.act-led.dtbo.dts.tmp ; cat ...; rm -f arch/arm64/boot/dts/overlays/.act-led.dtbo.d' make[2]: *** [scripts/Makefile.lib;363: arch/arm64/boot/dts/overlays/act-led.dtbo] Error 1 make[2]: *** Waiting for unfinished jobs.... Related patches: ffa2d13ccc3 BCM2708: Add core Device Tree support 4894352ec98 kbuild: Silence unavoidable dtc overlay warnings a4a4d07f0cf kbuild: keep the original function for non-RPi Signed-off-by: Fang Yafen <yafen(a)iscas.ac.cn> --- scripts/Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index c23e3ae7ef40..a0e0e2543165 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -342,25 +342,25 @@ endef $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE $(call if_changed_rule,dtc,yaml) +ifeq ($(CONFIG_OPENEULER_RASPBERRYPI),y) quiet_cmd_dtco = DTCO $@ cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ $(DTC) -@ -H epapr -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ -Wno-interrupts_property \ -ifeq ($(CONFIG_OPENEULER_RASPBERRYPI),y) \ -Wno-label_is_string \ -Wno-reg_format \ -Wno-pci_device_bus_num \ -Wno-i2c_bus_reg \ -Wno-spi_bus_reg \ -Wno-avoid_default_addr_size \ -endif \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) $(obj)/%.dtbo: $(src)/%-overlay.dts FORCE $(call if_changed_dep,dtco) +endif dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) -- 2.27.0

2 1

[PATCH kernel-4.19 01/32] ascend: sharepool: don't enable the vmalloc to use hugepage default
by Yang Yingliang 08 Mar '21

08 Mar '21

From: Ding Tianhong <dingtianhong(a)huawei.com> ascend inclusion category: feature bugzilla: NA CVE: NA ------------------------------------------------- The commit 59a57a82fb2a ("mm/vmalloc: Hugepage vmalloc mappings") would enable the vmalloc for hugepage default when the alloc size is bigger than the PMD_SIZE, it looks like the transparent hugepage for mmap, the driver could not control the hugepage accurately and be break the logic, now the share pool already export the vmalloc_hugepage_xxx function to control the vmalloc hugepage allocation, it looks like the static hugepage for vmalloc, so disable the transparent hugepage function. This patch also fix the problem of breaking the kabi of vm_struct, the user could applied it for commercial version. Fixes: 59a57a82fb2a ("mm/vmalloc: Hugepage vmalloc mappings") Signed-off-by: Ding Tianhong <dingtianhong(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- include/linux/share_pool.h | 51 ++++++++++++++++++++++++++++---------- include/linux/vmalloc.h | 1 - mm/vmalloc.c | 47 ++++++++++++----------------------- 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/include/linux/share_pool.h b/include/linux/share_pool.h index c3120b7b24948..4a18c88d5a10e 100644 --- a/include/linux/share_pool.h +++ b/include/linux/share_pool.h @@ -211,15 +211,6 @@ static inline void sp_area_work_around(struct vm_unmapped_area_info *info) extern struct page *sp_alloc_pages(struct vm_struct *area, gfp_t mask, unsigned int page_order, int node); - -static inline void sp_free_pages(struct page *page, struct vm_struct *area) -{ - if (PageHuge(page)) - put_page(page); - else - __free_pages(page, area->page_order); -} - static inline bool sp_check_vm_share_pool(unsigned long vm_flags) { if (enable_ascend_share_pool && (vm_flags & VM_SHARE_POOL)) @@ -264,6 +255,30 @@ extern void *buff_vzalloc_hugepage_user(unsigned long size); void sp_exit_mm(struct mm_struct *mm); +static inline bool is_vmalloc_huge(unsigned long vm_flags) +{ + if (enable_ascend_share_pool && (vm_flags & VM_HUGE_PAGES)) + return true; + + return false; +} + +static inline bool is_vmalloc_sharepool(unsigned long vm_flags) +{ + if (enable_ascend_share_pool && (vm_flags & VM_SHAREPOOL)) + return true; + + return false; +} + +static inline void sp_free_pages(struct page *page, struct vm_struct *area) +{ + if (PageHuge(page)) + put_page(page); + else + __free_pages(page, is_vmalloc_huge(area->flags) ? PMD_SHIFT - PAGE_SHIFT : 0); +} + #else static inline int sp_group_add_task(int pid, int spg_id) @@ -400,10 +415,6 @@ static inline struct page *sp_alloc_pages(void *area, gfp_t mask, return NULL; } -static inline void sp_free_pages(struct page *page, struct vm_struct *area) -{ -} - static inline bool sp_check_vm_share_pool(unsigned long vm_flags) { return false; @@ -448,6 +459,20 @@ static inline void *buff_vzalloc_hugepage_user(unsigned long size) return NULL; } +static inline bool is_vmalloc_huge(struct vm_struct *vm) +{ + return NULL; +} + +static inline bool is_vmalloc_sharepool(struct vm_struct *vm) +{ + return NULL; +} + +static inline void sp_free_pages(struct page *page, struct vm_struct *area) +{ +} + #endif #endif /* LINUX_SHARE_POOL_H */ diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index bb814f6418fd9..298eff5579b21 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -43,7 +43,6 @@ struct vm_struct { unsigned long size; unsigned long flags; struct page **pages; - unsigned int page_order; unsigned int nr_pages; phys_addr_t phys_addr; const void *caller; diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 37b4762871142..8c70131e0b078 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2354,6 +2354,7 @@ struct vm_struct *remove_vm_area(const void *addr) static void __vunmap(const void *addr, int deallocate_pages) { struct vm_struct *area; + unsigned int page_order = 0; if (!addr) return; @@ -2369,13 +2370,14 @@ static void __vunmap(const void *addr, int deallocate_pages) return; } -#ifdef CONFIG_ASCEND_SHARE_POOL /* unmap a sharepool vm area will cause meamleak! */ - if (area->flags & VM_SHAREPOOL) { + if (is_vmalloc_sharepool(area->flags)) { WARN(1, KERN_ERR "Memory leak due to vfree() sharepool vm area (%p) !\n", addr); return; } -#endif + + if (is_vmalloc_huge(area->flags)) + page_order = PMD_SHIFT - PAGE_SHIFT; debug_check_no_locks_freed(area->addr, get_vm_area_size(area)); debug_check_no_obj_freed(area->addr, get_vm_area_size(area)); @@ -2384,14 +2386,14 @@ static void __vunmap(const void *addr, int deallocate_pages) if (deallocate_pages) { int i; - for (i = 0; i < area->nr_pages; i += 1U << area->page_order) { + for (i = 0; i < area->nr_pages; i += 1U << page_order) { struct page *page = area->pages[i]; BUG_ON(!page); if (sp_is_enabled()) sp_free_pages(page, area); else - __free_pages(page, area->page_order); + __free_pages(page, page_order); } kvfree(area->pages); @@ -2589,7 +2591,6 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, area->pages = pages; area->nr_pages = nr_pages; - area->page_order = page_order; for (i = 0; i < area->nr_pages; i += 1U << page_order) { struct page *page; @@ -2657,27 +2658,17 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, if (!size || (size >> PAGE_SHIFT) > totalram_pages) goto fail; - if (vmap_allow_huge && (pgprot_val(prot) == pgprot_val(PAGE_KERNEL))) { - unsigned long size_per_node; - + if (vmap_allow_huge && (pgprot_val(prot) == pgprot_val(PAGE_KERNEL)) && is_vmalloc_huge(vm_flags)) { /* - * Try huge pages. Only try for PAGE_KERNEL allocations, - * others like modules don't yet expect huge pages in - * their allocations due to apply_to_page_range not - * supporting them. + * Alloc huge pages. Only valid for PAGE_KERNEL allocations and + * VM_HUGE_PAGES flags. */ - size_per_node = size; - if (node == NUMA_NO_NODE && !sp_is_enabled()) - size_per_node /= num_online_nodes(); - if (size_per_node >= PMD_SIZE) { - shift = PMD_SHIFT; - align = max(real_align, 1UL << shift); - size = ALIGN(real_size, 1UL << shift); - } + shift = PMD_SHIFT; + align = max(real_align, 1UL << shift); + size = ALIGN(real_size, 1UL << shift); } -again: size = PAGE_ALIGN(size); area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | vm_flags, start, end, node, gfp_mask, caller); @@ -2706,12 +2697,6 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, return addr; fail: - if (shift > PAGE_SHIFT) { - shift = PAGE_SHIFT; - align = real_align; - size = real_size; - goto again; - } if (!area) { /* Warn for area allocation, page allocations already warn */ @@ -3776,7 +3761,7 @@ static int s_show(struct seq_file *m, void *p) seq_printf(m, " %pS", v->caller); if (v->nr_pages) - seq_printf(m, " pages=%d order=%d", v->nr_pages, v->page_order); + seq_printf(m, " pages=%d", v->nr_pages); if (v->phys_addr) seq_printf(m, " phys=%pa", &v->phys_addr); @@ -3796,8 +3781,8 @@ static int s_show(struct seq_file *m, void *p) if (is_vmalloc_addr(v->pages)) seq_puts(m, " vpages"); - if (sp_is_enabled()) - seq_printf(m, " order=%d", v->page_order); + if (is_vmalloc_huge(v->flags)) + seq_printf(m, " order=%d", PMD_SHIFT - PAGE_SHIFT); show_numa_info(m, v); seq_putc(m, '\n'); -- 2.25.1

1 31

[PATCH kernel-4.19] Certs: Fix a out-of-tree build Error
by Zhichang Yuan 08 Mar '21

08 Mar '21

openEuler inclusion category: bugfix bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=6 CVE: NA When performing the out-of-tree kernel 4.19 building, some error happened saying: cannot touch 'certs/pubring.gpg'. The detail can be checked in Gitee issue #I39160 or Bug 6 of openeuler bugzilla. This patch will fix that build error. Signed-off-by: Zhichang Yuan <erik.yuan(a)arm.com> Signed-off-by: Steve Capper <Steve.Capper(a)arm.com> --- certs/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/certs/Makefile b/certs/Makefile index 5053e3c86c97..5e56f9405758 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -5,11 +5,12 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o ifdef CONFIG_PGP_PRELOAD_PUBLIC_KEYS -ifneq ($(shell ls certs/pubring.gpg 2> /dev/null), certs/pubring.gpg) -$(shell touch certs/pubring.gpg) -endif -$(obj)/system_certificates.o: certs/pubring.gpg +$(obj)/system_certificates.o: $(obj)/pubring.gpg + +$(obj)/pubring.gpg: + $(Q)touch $@ endif + obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),"") obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o -- 2.23.0 IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

4 6

[PATCH kernel-4.19 00/50] backport stable-4.19.177
by Yang Yingliang 08 Mar '21

08 Mar '21

Alain Volmat (1): i2c: stm32f7: fix configuration of the digital filter Alexandre Belloni (1): ARM: dts: lpc32xx: Revert set default clock rate of HCLK PLL Alexandre Ghiti (1): riscv: virt_addr_valid must check the address belongs to linear mapping Amir Goldstein (1): ovl: skip getxattr of security labels Arun Easi (1): scsi: qla2xxx: Fix crash during driver load on big endian machines Borislav Petkov (1): x86/build: Disable CET instrumentation in the kernel for 32-bit too Bui Quang Minh (1): bpf: Check for integer overflow when using roundup_pow_of_two() Edwin Peer (1): net: watchdog: hold device global xmit lock during tx disable Fangrui Song (1): firmware_loader: align .builtin_fw to 8 Felipe Balbi (1): usb: dwc3: ulpi: fix checkpatch warning Florian Westphal (1): netfilter: conntrack: skip identical origin tuple in same zone only Greg Kroah-Hartman (1): Linux 4.19.177 Hans de Goede (1): platform/x86: hp-wmi: Disable tablet-mode reporting by default Jan Beulich (8): Xen/x86: don't bail early from clear_foreign_p2m_mapping() Xen/x86: also check kernel mapping in set_foreign_p2m_mapping() Xen/gntdev: correct dev_bus_addr handling in gntdev_map_grant_pages() Xen/gntdev: correct error checking in gntdev_map_grant_pages() xen-blkback: don't "handle" error by BUG() xen-netback: don't "handle" error by BUG() xen-scsiback: don't "handle" error by BUG() xen-blkback: fix error handling in xen_blkbk_map() Jozsef Kadlecsik (1): netfilter: xt_recent: Fix attempt to update deleted entry Juergen Gross (1): xen/netback: avoid race in xenvif_rx_ring_slots_available() Julien Grall (1): arm/xen: Don't probe xenbus as part of an early initcall Lai Jiangshan (1): kvm: check tlbs_dirty directly Lin Feng (1): bfq-iosched: Revert "bfq: Fix computation of shallow depth" Loic Poulain (1): net: qrtr: Fix port ID for control messages Lorenzo Bianconi (1): mt76: dma: fix a possible memory leak in mt76_add_fragment() Marc Zyngier (1): arm64: dts: rockchip: Fix PCIe DT properties on rk3399 Miklos Szeredi (3): ovl: perform vfs_getxattr() with mounter creds cap: fix conversions on getxattr ovl: expand warning in ovl_d_real() Mohammad Athari Bin Ismail (1): net: stmmac: set TxQ mode back to DCB after disabling CBS NeilBrown (1): net: fix iteration for sctp transport seq_files Norbert Slusarek (1): net/vmw_vsock: improve locking in vsock_connect_timeout() Paolo Bonzini (1): KVM: SEV: fix double locking due to incorrect backport Randy Dunlap (1): h8300: fix PREEMPTION build, TI_PRE_COUNT undefined Russell King (2): ARM: ensure the signal page contains defined contents ARM: kexec: fix oops after TLB are invalidated Sabyrzhan Tasbolatov (2): net/rds: restrict iovecs length for RDS_CMSG_RDMA_ARGS net/qrtr: restrict user-controlled length in qrtr_tun_write_iter() Serge Semin (1): usb: dwc3: ulpi: Replace CPU-based busyloop with Protocol-based one Stefano Garzarella (2): vsock/virtio: update credit only if socket is not closed vsock: fix locking in vsock_shutdown() Stefano Stabellini (1): xen/arm: don't ignore return errors from set_phys_to_machine Steven Rostedt (VMware) (2): tracing: Do not count ftrace events in top level enable output tracing: Check length before giving out the filter buffer Sven Auhagen (1): netfilter: flowtable: fix tcp and udp header checksum update Victor Lu (2): drm/amd/display: Fix dc_sink kref count in emulated_link_detect drm/amd/display: Free atomic state after drm_atomic_commit Makefile | 2 +- arch/arm/boot/dts/lpc32xx.dtsi | 3 - arch/arm/include/asm/kexec-internal.h | 12 ++++ arch/arm/kernel/asm-offsets.c | 5 ++ arch/arm/kernel/machine_kexec.c | 20 +++--- arch/arm/kernel/relocate_kernel.S | 38 +++-------- arch/arm/kernel/signal.c | 14 ++-- arch/arm/xen/enlighten.c | 2 - arch/arm/xen/p2m.c | 6 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- arch/h8300/kernel/asm-offsets.c | 3 + arch/riscv/include/asm/page.h | 5 +- arch/x86/Makefile | 6 +- arch/x86/kvm/svm.c | 1 - arch/x86/xen/p2m.c | 15 ++--- block/bfq-iosched.c | 8 +-- drivers/block/xen-blkback/blkback.c | 30 +++++---- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +++-- drivers/i2c/busses/i2c-stm32f7.c | 11 ++- .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 7 +- drivers/net/wireless/mediatek/mt76/dma.c | 8 ++- drivers/net/xen-netback/netback.c | 4 +- drivers/net/xen-netback/rx.c | 9 ++- drivers/platform/x86/hp-wmi.c | 14 ++-- drivers/scsi/qla2xxx/qla_tmpl.c | 9 +-- drivers/scsi/qla2xxx/qla_tmpl.h | 2 +- drivers/usb/dwc3/ulpi.c | 20 ++++-- drivers/xen/gntdev.c | 37 +++++----- drivers/xen/xen-scsiback.c | 4 +- drivers/xen/xenbus/xenbus.h | 1 - drivers/xen/xenbus/xenbus_probe.c | 2 +- fs/overlayfs/copy_up.c | 15 +++-- fs/overlayfs/inode.c | 2 + fs/overlayfs/super.c | 13 ++-- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/netdevice.h | 2 + include/xen/grant_table.h | 1 + include/xen/xenbus.h | 2 - kernel/bpf/stackmap.c | 2 + kernel/trace/trace.c | 2 +- kernel/trace/trace_events.c | 3 +- net/netfilter/nf_conntrack_core.c | 3 +- net/netfilter/nf_flow_table_core.c | 4 +- net/netfilter/xt_recent.c | 12 +++- net/qrtr/qrtr.c | 2 +- net/qrtr/tun.c | 6 ++ net/rds/rdma.c | 3 + net/sctp/proc.c | 16 +++-- net/vmw_vsock/af_vsock.c | 13 ++-- net/vmw_vsock/hyperv_transport.c | 4 -- net/vmw_vsock/virtio_transport_common.c | 4 +- security/commoncap.c | 67 ++++++++++++------- virt/kvm/kvm_main.c | 3 +- 53 files changed, 295 insertions(+), 204 deletions(-) create mode 100644 arch/arm/include/asm/kexec-internal.h -- 2.25.1

1 50

[PATCH kernel-4.19] arm64/mpam: Fix compile warning
by Yang Yingliang 08 Mar '21

08 Mar '21

From: Wang ShaoBo <bobo.shaobowang(a)huawei.com> hulk inclusion category: bugfix bugzilla: 34278 CVE: NA ------------------------------------------------- Set dentry before goto error handling branch. fs/resctrlfs.c: In function ‘resctrl_mount’: fs/resctrlfs.c:419:9: warning: ‘dentry’ may be used uninitialized in this function [-Wmaybe-uninitialized] return dentry; ^~~~~~ Fixes: 1b70f98921b10 ("arm64/mpam: resctrl: Use resctrl_group_init_alloc() for default group") Signed-off-by: Wang ShaoBo <bobo.shaobowang(a)huawei.com> Reviewed-by: Jian Cheng <cj.chengjian(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/resctrlfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/resctrlfs.c b/fs/resctrlfs.c index 190ad509714d5..df47b105609b9 100644 --- a/fs/resctrlfs.c +++ b/fs/resctrlfs.c @@ -351,8 +351,10 @@ static struct dentry *resctrl_mount(struct file_system_type *fs_type, } ret = resctrl_group_init_alloc(&resctrl_group_default); - if (ret < 0) + if (ret < 0) { + dentry = ERR_PTR(ret); goto out_schema; + } ret = resctrl_group_create_info_dir(resctrl_group_default.kn, &kn_info); if (ret) { -- 2.25.1

1 0

[PATCH kernel-4.19 00/25] backport stable-4.19.176
by Yang Yingliang 08 Mar '21

08 Mar '21

Cong Wang (1): af_key: relax availability checks for skb size calculation Dave Wysochanski (2): SUNRPC: Move simple_get_bytes and simple_get_netobj into private header SUNRPC: Handle 0 length opaque XDR object data properly David Collins (1): regulator: core: avoid regulator_resolve_supply() race condition Douglas Anderson (1): regulator: core: Clean enabling always-on regulators + their supplies Emmanuel Grumbach (1): iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap Greg Kroah-Hartman (1): Linux 4.19.176 Johannes Berg (3): iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time() iwlwifi: pcie: fix context info memory leak iwlwifi: mvm: guard against device removal in reprobe Mark Brown (1): regulator: Fix lockdep warning resolving supplies Masami Hiramatsu (1): tracing/kprobe: Fix to support kretprobe events on unloaded modules Ming Lei (2): block: don't hold q->sysfs_lock in elevator_init_mq blk-mq: don't hold q->sysfs_lock in blk_mq_map_swqueue Olliver Schinagl (1): regulator: core: enable power when setting up constraints Pan Bian (1): chtls: Fix potential resource leak Peter Gonda (1): Fix unsynchronized access to sev members through svm_register_enc_region Phillip Lougher (3): squashfs: add more sanity checks in id lookup squashfs: add more sanity checks in inode lookup squashfs: add more sanity checks in xattr id lookup Sibi Sankar (2): remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load remoteproc: qcom_q6v5_mss: Validate MBA firmware size before load Steven Rostedt (VMware) (1): fgraph: Initialize tracing_graph_pause at task creation Tobin C. Harding (1): lib/string: Add strscpy_pad() function Trond Myklebust (1): pNFS/NFSv4: Try to return invalid layout in pnfs_layout_process() Makefile | 2 +- arch/x86/kvm/svm.c | 18 ++-- block/blk-mq.c | 7 -- block/elevator.c | 14 ++-- drivers/crypto/chelsio/chtls/chtls_cm.c | 7 +- .../wireless/intel/iwlwifi/mvm/debugfs-vif.c | 3 + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 3 +- .../intel/iwlwifi/pcie/ctxt-info-gen3.c | 11 ++- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 ++ drivers/regulator/core.c | 84 +++++++++++++------ drivers/remoteproc/qcom_q6v5_pil.c | 11 ++- fs/nfs/pnfs.c | 8 +- fs/squashfs/export.c | 41 +++++++-- fs/squashfs/id.c | 40 +++++++-- fs/squashfs/squashfs_fs_sb.h | 1 + fs/squashfs/super.c | 6 +- fs/squashfs/xattr.h | 10 ++- fs/squashfs/xattr_id.c | 66 +++++++++++++-- include/linux/kprobes.h | 2 +- include/linux/string.h | 4 + include/linux/sunrpc/xdr.h | 3 +- init/init_task.c | 3 +- kernel/kprobes.c | 34 ++++++-- kernel/trace/ftrace.c | 2 - kernel/trace/trace_kprobe.c | 4 +- lib/string.c | 47 +++++++++-- net/key/af_key.c | 6 +- net/sunrpc/auth_gss/auth_gss.c | 30 +------ net/sunrpc/auth_gss/auth_gss_internal.h | 45 ++++++++++ net/sunrpc/auth_gss/gss_krb5_mech.c | 31 +------ 30 files changed, 375 insertions(+), 173 deletions(-) create mode 100644 net/sunrpc/auth_gss/auth_gss_internal.h -- 2.25.1

1 25

2024

2023

2022

2021

2020

2019

Kernel