- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6 v2] kabi: reserve space for struct ptp_clock
by Yang Yingliang 02 Feb '24

02 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8Z2NU CVE: NA ------------------------------- reserve space for struct ptp_clock. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/ptp/ptp_private.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h index b8d4f61f14be..22ada6de9057 100644 --- a/drivers/ptp/ptp_private.h +++ b/drivers/ptp/ptp_private.h @@ -15,6 +15,7 @@ #include <linux/ptp_clock.h> #include <linux/ptp_clock_kernel.h> #include <linux/time.h> +#include <linux/kabi.h> #define PTP_MAX_TIMESTAMPS 128 #define PTP_BUF_TIMESTAMPS 30 @@ -53,6 +54,10 @@ struct ptp_clock { struct mutex n_vclocks_mux; /* protect concurrent n_vclocks access */ bool is_virtual_clock; bool has_cycles; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; #define info_to_vclock(d) container_of((d), struct ptp_vclock, info) -- 2.25.1

2 1

[PATCH OLK-6.6 v2] kabi: reserve space for struct ptp_clock
by Yang Yingliang 02 Feb '24

02 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8Z2NU CVE: NA ------------------------------- reserve space for struct ptp_clock. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/ptp/ptp_private.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h index b8d4f61f14be..22ada6de9057 100644 --- a/drivers/ptp/ptp_private.h +++ b/drivers/ptp/ptp_private.h @@ -15,6 +15,7 @@ #include <linux/ptp_clock.h> #include <linux/ptp_clock_kernel.h> #include <linux/time.h> +#include <linux/kabi.h> #define PTP_MAX_TIMESTAMPS 128 #define PTP_BUF_TIMESTAMPS 30 @@ -53,6 +54,10 @@ struct ptp_clock { struct mutex n_vclocks_mux; /* protect concurrent n_vclocks access */ bool is_virtual_clock; bool has_cycles; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; #define info_to_vclock(d) container_of((d), struct ptp_vclock, info) -- 2.25.1

2 1

[PATCH v5 OLK-6.6 00/22] kabi reserve patches
by Lin Yujun 02 Feb '24

02 Feb '24

*** BLURB HERE *** Chen Jiahao (1): KABI: reserve space for struct input_dev Jialin Zhang (1): kabi: reserve space for power management related structure Lin Ruizhe (5): msi: Add kabi_reserve in msi.h interrupt: Add kabi_reserve in interrupt.h irq: Add kabi_reserve in irq irq_desc: Add kabi_reserve in irq_desc irqdomain: Add kabi_reserve in irqdomain Lin Yujun (14): drm: drm_atomic.h: Add kabi_reserve drm: drm_client.h: Add kabi_reserve drm: drm_connector.h: Add kabi_reserve drm: drm_crtc.h: Add kabi_reserve drm: drm_device.h: Add kabi_reserve drm: drm_drv.h: Add kabi_reserve drm: drm_fb_helper.h: Add kabi_reserve drm: drm_file.h: Add kabi_reserve drm: drm_fourcc.h: Add kabi_reserve drm: drm_gem.h: Add kabi_reserve pm: pm_domain.h: Add kabi_reserve pm: pm.h: Add kabi_reserve energy_model: Add kabi_reserve kabi: reserve space for arm64 cpufeature related structure Yang Yingliang (1): kabi: reserve space for struct cpu_stop_work arch/arm64/tools/cpucaps | 30 ++++++++++++++++++++++++++++++ include/drm/drm_atomic.h | 6 ++++++ include/drm/drm_client.h | 7 +++++++ include/drm/drm_connector.h | 18 ++++++++++++++++++ include/drm/drm_crtc.h | 7 +++++++ include/drm/drm_device.h | 4 ++++ include/drm/drm_drv.h | 5 +++++ include/drm/drm_fb_helper.h | 8 ++++++++ include/drm/drm_file.h | 8 ++++++++ include/drm/drm_fourcc.h | 5 +++++ include/drm/drm_gem.h | 8 ++++++++ include/linux/energy_model.h | 5 +++++ include/linux/input.h | 4 ++++ include/linux/interrupt.h | 6 ++++++ include/linux/irq.h | 8 ++++++++ include/linux/irqdesc.h | 4 +++- include/linux/irqdomain.h | 3 +++ include/linux/msi.h | 7 +++++++ include/linux/pm.h | 14 ++++++++++++++ include/linux/pm_domain.h | 10 ++++++++++ include/linux/pm_qos.h | 7 +++++++ include/linux/pm_wakeup.h | 4 ++++ include/linux/stop_machine.h | 3 +++ 23 files changed, 180 insertions(+), 1 deletion(-) -- 2.34.1

1 22

[PATCH OLK-5.10 v2 0/3] patchset for CVE-2023-52340
by Ziyang Xuan 02 Feb '24

02 Feb '24

The patchset for CVE-2023-52340. v2: - Fix comment head for patch 3. Jon Maxwell (2): ipv6: remove max_size check inline with ipv4 ipv6: Document that max_size sysctl is deprecated Ziyang Xuan (1): ipv6: fix kabi change in struct dst_ops Documentation/networking/ip-sysctl.rst | 3 +++ include/net/dst_ops.h | 2 +- net/core/dst.c | 8 ++------ net/ipv6/route.c | 13 +++++-------- 4 files changed, 11 insertions(+), 15 deletions(-) -- 2.25.1

2 4

[PATCH OLK-6.6 0/1] Remove unnecessary KABI reservation
by GUO Zihua 02 Feb '24

02 Feb '24

This patch set removes unnecessary KABI reservation. GUO Zihua (1): crypto: kabi: Removed unnecessary KABI reservation include/crypto/rng.h | 2 -- 1 file changed, 2 deletions(-) -- 2.34.1

2 2

[PATCH OLK-5.10 0/3] patchset for CVE-2023-52340
by Ziyang Xuan 02 Feb '24

02 Feb '24

The patchset for CVE-2023-52340. Jon Maxwell (2): ipv6: remove max_size check inline with ipv4 ipv6: Document that max_size sysctl is deprecated Ziyang Xuan (1): ipv6: fix kabi change in struct dst_ops Documentation/networking/ip-sysctl.rst | 3 +++ include/net/dst_ops.h | 2 +- net/core/dst.c | 8 ++------ net/ipv6/route.c | 13 +++++-------- 4 files changed, 11 insertions(+), 15 deletions(-) -- 2.25.1

2 4

[PATCH OLK-6.6 v2] reserve space for enum cc_attr.
by liwei 02 Feb '24

02 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I90N74 -------------------------------- Signed-off-by: liwei <liwei728(a)huawei.com> --- include/linux/cc_platform.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/cc_platform.h b/include/linux/cc_platform.h index cb0d6cd1c12f..8737411227a6 100644 --- a/include/linux/cc_platform.h +++ b/include/linux/cc_platform.h @@ -90,6 +90,12 @@ enum cc_attr { * Examples include TDX Guest. */ CC_ATTR_HOTPLUG_DISABLED, + + /* KABI reserve */ + CC_ATTR_KABI_RES1, + CC_ATTR_KABI_RES2, + CC_ATTR_KABI_RES3, + CC_ATTR_KABI_RES4, }; #ifdef CONFIG_ARCH_HAS_CC_PLATFORM -- 2.25.1

2 1

[PATCH OLK-6.6] reserve space for enum cc_attr.
by liwei 02 Feb '24

02 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I90N74 -------------------------------- Signed-off-by: liwei <liwei728(a)huawei.com> --- include/linux/cc_platform.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/cc_platform.h b/include/linux/cc_platform.h index cb0d6cd1c12f..60d1879244af 100644 --- a/include/linux/cc_platform.h +++ b/include/linux/cc_platform.h @@ -12,6 +12,7 @@ #include <linux/types.h> #include <linux/stddef.h> +#include <linux/kabi.h> /** * enum cc_attr - Confidential computing attributes @@ -90,6 +91,11 @@ enum cc_attr { * Examples include TDX Guest. */ CC_ATTR_HOTPLUG_DISABLED, + + CC_ATTR_KABI_RES1, + CC_ATTR_KABI_RES2, + CC_ATTR_KABI_RES3, + CC_ATTR_KABI_RES4, }; #ifdef CONFIG_ARCH_HAS_CC_PLATFORM -- 2.25.1

2 1

[PATCH OLK-6.6 0/2] kabi: reserve space for pci subsystem and thread_info
by Jialin Zhang 02 Feb '24

02 Feb '24

Reserve space for pci subsystem and thread_info Jialin Zhang (1): kabi: reserve space for thread_info structure Tan Xiaojun (1): kabi: reserve space for pci subsystem related structure arch/arm64/include/asm/thread_info.h | 4 ++++ arch/x86/include/asm/thread_info.h | 4 ++++ drivers/pci/pci.h | 9 ++++++++ include/linux/pci.h | 34 ++++++++++++++++++++++++++++ include/linux/pci_hotplug.h | 18 +++++++++++++++ 5 files changed, 69 insertions(+) -- 2.25.1

2 3

[PATCH OLK-6.6] openeuler_defconfig: enable CONFIG_PAGE_CACHE_LIMIT
by Ze Zuo 02 Feb '24

02 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8NIKC -------------------------------- Enable CONFIG_PAGE_CACHE_LIMIT for x86, arm64 by default. Signed-off-by: Ze Zuo <zuoze1(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 2 +- arch/x86/configs/openeuler_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 2ddea5999010..e6c9474e032a 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1161,7 +1161,7 @@ CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y # CONFIG_ASCEND_FEATURES is not set # CONFIG_ASCEND_OOM is not set -# CONFIG_PAGE_CACHE_LIMIT is not set +CONFIG_PAGE_CACHE_LIMIT=y # CONFIG_CLEAR_FREELIST_PAGE is not set CONFIG_MEMORY_RELIABLE=y CONFIG_DYNAMIC_POOL=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 77f0c7ae79c1..e97820a0ec30 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -1172,7 +1172,7 @@ CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y # CONFIG_ASCEND_OOM is not set -# CONFIG_PAGE_CACHE_LIMIT is not set +CONFIG_PAGE_CACHE_LIMIT=y CONFIG_DYNAMIC_POOL=y CONFIG_ETMEM_SCAN=m CONFIG_ETMEM_SWAP=m -- 2.25.1

2 1