- Kernel - mailweb.openeuler.org

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

22 Sep '20

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

1 36

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

18 Sep '20

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

1 0

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

17 Sep '20

5 7

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

15 Sep '20

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

3 2

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

15 Sep '20

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

1 0

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

15 Sep '20

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

1 1

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

14 Sep '20

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

1 6

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

14 Sep '20

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

1 7

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

11 Sep '20

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

1 10

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

11 Sep '20

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

1 2

2024

2023

2022

2021

2020

2019

Kernel