- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6 0/2] support ext3/ext4 netlink error report.
by Baokun Li 06 Jan '24

06 Jan '24

Zhao Minmin (1): ext4: report error to userspace by netlink Zhihao Cheng (1): Add new config 'CONFIG_EXT4_ERROR_REPORT' to control ext3/4 error reporting arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/ext4/Kconfig | 8 +++ fs/ext4/ext4.h | 11 ++++ fs/ext4/super.c | 71 ++++++++++++++++++++++++++ include/uapi/linux/netlink.h | 1 + 6 files changed, 93 insertions(+) -- 2.31.1

2 3

[PATCH OLK-6.6 0/3] cgroup kabi
by Chen Ridong 05 Jan '24

05 Jan '24

Chen Ridong (3): cgroup: kabi: reserve space for cgroup frame namespace: kabi: reserve for future namespace development cgroup/psi: reserve kabi for future psi development include/linux/cgroup-defs.h | 32 ++++++++++++++++++++++++++++++++ include/linux/ipc_namespace.h | 6 ++++++ include/linux/nsproxy.h | 9 +++++++++ include/linux/pid_namespace.h | 2 ++ include/linux/psi_types.h | 16 ++++++++++++++++ include/linux/user_namespace.h | 33 +++++++++++++++++++++++++++++++++ kernel/ucount.c | 18 ++++++++++++++++++ 7 files changed, 116 insertions(+) -- 2.34.1

2 4

[PATCH OLK-6.6] arm64: cpufeature: add cmdline option for disable lse
by Wei Li 05 Jan '24

05 Jan '24

From: Xie XiuQi <xiexiuqi(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4JBSJ CVE: NA ---------------------------------------- LSE atomic instruction might introduce performance regression on specific benchmark or business. So add a cmdline option to disable/enable it. "lse=off" cmdline option means disable LSE atomic instruction. Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> [liwei: Fix compile warning with CONFIG_ARM64_LSE_ATOMICS=n] Signed-off-by: Wei Li <liwei391(a)huawei.com> --- arch/arm64/kernel/cpufeature.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 3517dd2b0358..6d12bbc54728 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1431,6 +1431,22 @@ u64 __read_sysreg_by_encoding(u32 sys_id) #include <linux/irqchip/arm-gic-v3.h> +#ifdef CONFIG_ARM64_LSE_ATOMICS +static bool lse_disabled; + +static int __init parse_lse(char *str) +{ + if (str == NULL) + return 1; + + if (!strncmp(str, "off", 3)) + lse_disabled = true; + + return 0; +} +early_param("lse", parse_lse); +#endif + static bool has_always(const struct arm64_cpu_capabilities *entry, int scope) { @@ -1539,6 +1555,20 @@ static bool has_32bit_el0(const struct arm64_cpu_capabilities *entry, int scope) return true; } +#ifdef CONFIG_ARM64_LSE_ATOMICS +static bool has_cpuid_feature_lse(const struct arm64_cpu_capabilities *entry, + int scope) +{ + if (lse_disabled) { + pr_info_once("%s forced OFF by command line option\n", + entry->desc); + return false; + } + + return has_cpuid_feature(entry, scope); +} +#endif + static bool has_useable_gicv3_cpuif(const struct arm64_cpu_capabilities *entry, int scope) { bool has_sre; @@ -2316,7 +2346,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .desc = "LSE atomic instructions", .capability = ARM64_HAS_LSE_ATOMICS, .type = ARM64_CPUCAP_SYSTEM_FEATURE, - .matches = has_cpuid_feature, + .matches = has_cpuid_feature_lse, ARM64_CPUID_FIELDS(ID_AA64ISAR0_EL1, ATOMIC, IMP) }, #endif /* CONFIG_ARM64_LSE_ATOMICS */ -- 2.25.1

2 1

[PATCH OLK-6.6 0/4] JFFS2: Fix the race issues caused by the GC of jffs2
by ZhaoLong Wang 05 Jan '24

05 Jan '24

Hou Tao (4): jffs2: protect no-raw-node-ref check of inocache by erase_completion_lock jffs2: handle INO_STATE_CLEARING in jffs2_do_read_inode() jffs2: make the overwritten xattr invisible after remount jffs2: reset pino_nlink to 0 when inode creation failed fs/jffs2/dir.c | 28 ++++++++++++++++++---- fs/jffs2/nodelist.c | 7 ++++++ fs/jffs2/readinode.c | 11 ++++++++- fs/jffs2/xattr.c | 55 +++++++++++++++++++++++++++++++++++++++----- 4 files changed, 90 insertions(+), 11 deletions(-) -- 2.39.2

2 5

[PATCH OLK-6.6 0/4] JFFS2: Fix the race issues caused by the GC of jffs2
by ZhaoLong Wang 05 Jan '24

05 Jan '24

Hou Tao (4): jffs2: protect no-raw-node-ref check of inocache by erase_completion_lock jffs2: handle INO_STATE_CLEARING in jffs2_do_read_inode() jffs2: make the overwritten xattr invisible after remount jffs2: reset pino_nlink to 0 when inode creation failed fs/jffs2/dir.c | 28 ++++++++++++++++++---- fs/jffs2/nodelist.c | 7 ++++++ fs/jffs2/readinode.c | 11 ++++++++- fs/jffs2/xattr.c | 55 +++++++++++++++++++++++++++++++++++++++----- 4 files changed, 90 insertions(+), 11 deletions(-) -- 2.39.2

2 6

[PATCH OLK-6.6] kernel: add OPENEULER_VERSION_CODE to version.h
by Wei Li 05 Jan '24

05 Jan '24

From: Xie XiuQi <xiexiuqi(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I7LEXY --------------------------------------------- Add OPENEULER_VERSION_CODE to version.h, so modules or applications can identify the specific kernel version. In most cases, the out-of-tree module needs to identify the release version of the openEuler for interface adaptation. The existing OPENEULER_VERSION() and OPENEULER_VERSION_CODE() cannot distinguish between LTS versions and innovative versions. Therefore, a new macro OPENEULER_LTS is introduced. The version information is generated in "linux/version.h", as bellow: include/generated/uapi/linux/version.h ``` #define OPENEULER_LTS 0 // 1: LTS; 0: none LTS #define OPENEULER_MAJOR 9999 // OS Major version, 9999: none released #define OPENEULER_MINOR 0 // SP release version #define OPENEULER_VERSION(a,b) (((a) << 8) + (b)) #define OPENEULER_VERSION_CODE 2559744 ``` Use Makefile.oever to avoid future merge conflicts. Link:https://gitee.com/openeuler/kernel/issues/I575IT Link:https://gitee.com/openeuler/kernel/issues/I7761D Link:https://gitee.com/openeuler/kernel/pulls/1442 Link:https://gitee.com/openeuler/kernel/pulls/1219 Link:https://gitee.com/openeuler/kernel/pulls/195 Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Wei Li <liwei391(a)huawei.com> --- Makefile | 11 ++++++++++- Makefile.oever | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Makefile.oever diff --git a/Makefile b/Makefile index 5c418efbe89b..e458c8265d75 100644 --- a/Makefile +++ b/Makefile @@ -1226,6 +1226,9 @@ uapi-asm-generic: # Generate some files # --------------------------------------------------------------------------- +# openEuler version variables +include $(srctree)/Makefile.oever + # KERNELRELEASE can change from a few different places, meaning version.h # needs to be updated, so this check is forced on all builds @@ -1250,7 +1253,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ - echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL) + echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL); \ + echo \#define OPENEULER_LTS $(OPENEULER_LTS); \ + echo \#define OPENEULER_MAJOR $(OPENEULER_MAJOR); \ + echo \#define OPENEULER_MINOR $(OPENEULER_MINOR); \ + echo '#define OPENEULER_VERSION(a,b) (((a) << 8) + (b))'; \ + echo \#define OPENEULER_VERSION_CODE $(shell \ + expr $(OPENEULER_MAJOR) \* 256 + $(OPENEULER_MINOR)) endef $(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0) diff --git a/Makefile.oever b/Makefile.oever new file mode 100644 index 000000000000..96beccf3569c --- /dev/null +++ b/Makefile.oever @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +OPENEULER_LTS = 0 +OPENEULER_MAJOR = 9999 +OPENEULER_MINOR = 0 -- 2.25.1

2 1

[PATCH OLK-6.6 00/10] Backport etmem feature to OLK 6.6
by Yuchen Tang 05 Jan '24

05 Jan '24

v1 -> v2 - make independent patches to export symbols we need - make independent patches for etmem scan and swap config - fix indentation and code style problems Yuchen Tang (10): etmem: a tiered memory manager etmem: etmem scan, the page hotness tracker mm: Export symbol __pud_trans_huge_lock mm: Export symbol walk_page_range etmem: add etmem scan feature to openEuler mm: Export symbol reclaim_pages etmem: add etmem swap feature to openEuler etmem: add original kernel swap enabled options etmem: add swapcache reclaim to etmem etmem: enable etmem configurations arch/arm64/configs/openeuler_defconfig | 3 + arch/x86/configs/openeuler_defconfig | 3 + fs/proc/Makefile | 3 + fs/proc/base.c | 8 + fs/proc/etmem_proc.c | 216 ++++ fs/proc/etmem_scan.c | 1383 ++++++++++++++++++++++++ fs/proc/etmem_scan.h | 149 +++ fs/proc/etmem_swap.c | 283 +++++ fs/proc/internal.h | 4 + include/linux/etmem.h | 75 ++ include/linux/mm.h | 4 + include/linux/mm_types.h | 5 + include/linux/swap.h | 1 + include/uapi/asm-generic/mman-common.h | 4 + mm/Kconfig | 33 + mm/Makefile | 1 + mm/etmem.c | 384 +++++++ mm/huge_memory.c | 1 + mm/internal.h | 1 - mm/madvise.c | 16 + mm/pagewalk.c | 1 + mm/swap_state.c | 4 + mm/vmscan.c | 16 + virt/kvm/kvm_main.c | 8 + 24 files changed, 2605 insertions(+), 1 deletion(-) create mode 100644 fs/proc/etmem_proc.c create mode 100644 fs/proc/etmem_scan.c create mode 100644 fs/proc/etmem_scan.h create mode 100644 fs/proc/etmem_swap.c create mode 100644 include/linux/etmem.h create mode 100644 mm/etmem.c -- 2.33.0

2 11

[PATCH OLK-6.6 v6 0/2] optimize inlining
by Yuntao Liu 05 Jan '24

05 Jan '24

Guo Xuenan (2): Revert "compiler: remove CONFIG_OPTIMIZE_INLINING entirely" make OPTIMIZE_INLINING config editable arch/arm64/kvm/sys_regs.h | 7 +++++- arch/x86/configs/i386_defconfig | 1 + arch/x86/configs/x86_64_defconfig | 1 + .../net/ethernet/mellanox/mlx5/core/health.c | 24 +++++++++++++++++++ .../ethernet/mellanox/mlx5/core/mlx5_core.h | 24 ------------------- .../pci/hive_isp_css_include/print_support.h | 4 ++++ include/linux/compiler_types.h | 8 +++++++ include/trace/trace_events.h | 2 +- kernel/configs/tiny.config | 1 + lib/Kconfig.debug | 13 ++++++++++ 10 files changed, 59 insertions(+), 26 deletions(-) -- 2.34.1

2 3

[PATCH OLK-6.6 v3 0/8] introduce smart_grid zone
by Yipeng Zou 05 Jan '24

05 Jan '24

The patch sets include two parts: 1. patch 1~3: Rebase smart_grid from OLK-5.10 to OLK-6.6 2. patch 4~7: introduce smart_grid zone qos and cpufreq Since V2: 1. move new sysctl form sysctl.c to fair.c 2. add smart_grid cmdline Since V1: 1. Don't init smart_grid cpufreq with dynamic_affinity disable. 2. Forbid smart_grid cgroup interface with dynamic_affinity disable. Hui Tang (1): sched: Introduce smart grid scheduling strategy for cfs Wang ShaoBo (2): sched: smart grid: init sched_grid_qos structure on QOS purpose config: enable CONFIG_QOS_SCHED_SMART_GRID by default Yipeng Zou (5): sched: introduce smart grid qos zone smart_grid: introduce /proc/pid/smart_grid_level smart_grid: introduce smart_grid_strategy_ctrl sysctl smart_grid: cpufreq: introduce smart_grid cpufreq control smart_grid: introduce smart_grid cmdline arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + drivers/cpufreq/cpufreq.c | 244 +++++++++++ fs/proc/array.c | 16 + fs/proc/base.c | 84 ++++ include/linux/cpufreq.h | 11 + include/linux/sched.h | 31 ++ include/linux/sched/grid_qos.h | 135 +++++++ init/Kconfig | 13 + kernel/fork.c | 14 + kernel/sched/Makefile | 1 + kernel/sched/core.c | 181 +++++++++ kernel/sched/fair.c | 538 ++++++++++++++++++++++++- kernel/sched/grid/Makefile | 2 + kernel/sched/grid/internal.h | 6 + kernel/sched/grid/power.c | 27 ++ kernel/sched/grid/qos.c | 279 +++++++++++++ kernel/sched/grid/stat.c | 47 +++ kernel/sched/sched.h | 48 ++- mm/mempolicy.c | 11 +- 20 files changed, 1679 insertions(+), 11 deletions(-) create mode 100644 include/linux/sched/grid_qos.h create mode 100644 kernel/sched/grid/Makefile create mode 100644 kernel/sched/grid/internal.h create mode 100644 kernel/sched/grid/power.c create mode 100644 kernel/sched/grid/qos.c create mode 100644 kernel/sched/grid/stat.c -- 2.34.1

2 9

[openEuler-23.09] livepatch/core: Fix miss disable ro for MOD_RO_AFTER_INIT memory
by Zheng Yejian 05 Jan '24

05 Jan '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8HNHM -------------------------------- It was missed to set MOD_RO_AFTER_INIT type memory to be writable when porting e1e064674b6b ("livepatch/core: Revert module_enable_ro and module_disable_ro"). Thanks the report from laokz in https://gitee.com/laokz/klpmake/issues/I8HFMR. Fixes: e1e064674b6b ("livepatch/core: Revert module_enable_ro and module_disable_ro") Signed-off-by: Zheng Yejian <zhengyejian1(a)huawei.com> --- kernel/module/strict_rwx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/module/strict_rwx.c b/kernel/module/strict_rwx.c index 397e18f50517..575bf99c723a 100644 --- a/kernel/module/strict_rwx.c +++ b/kernel/module/strict_rwx.c @@ -46,6 +46,7 @@ void module_disable_ro(const struct module *mod) module_set_memory(mod, MOD_INIT_TEXT, set_memory_rw); module_set_memory(mod, MOD_RODATA, set_memory_rw); module_set_memory(mod, MOD_INIT_RODATA, set_memory_rw); + module_set_memory(mod, MOD_RO_AFTER_INIT, set_memory_rw); } #endif /* CONFIG_LIVEPATCH_WO_FTRACE */ -- 2.25.1

1 0