From b9720b9394e2895db8a14fa229eaec912968ec6b Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Jan 19 2022 16:17:31 +0000 Subject: Merge branch 'users/mbenes/SLE15-SP4/for-next' into SLE15-SP4 Pull KABI padding update from Miroslav Benes. --- diff --git a/patches.suse/prepare-arm64-kgraft b/patches.suse/prepare-arm64-kgraft deleted file mode 100644 index 4db0167..0000000 --- a/patches.suse/prepare-arm64-kgraft +++ /dev/null @@ -1,34 +0,0 @@ -From: Torsten Duwe -Subject: Be prepared to enable ARM64 live patching during SLE15 lifetime -Patch-mainline: Never, kabi -References: FATE#322421 - -SLE15 might ship without live patching on ARM64; -however, it will eventually be enabled during its lifetime. - -Given the experience with ppc64le, the biggest kABI breakage -results from a changing struct module, so include the 2 booleans -right from the start. - -Signed-off-by: Torsten Duwe - ---- a/include/linux/module.h -+++ b/include/linux/module.h -@@ -335,7 +335,7 @@ struct mod_kallsyms { - char *typetab; - }; - --#ifdef CONFIG_LIVEPATCH -+#if defined(CONFIG_LIVEPATCH) || defined(__aarch64__) - struct klp_modinfo { - Elf_Ehdr hdr; - Elf_Shdr *sechdrs; -@@ -477,7 +477,7 @@ struct module { - unsigned long *ftrace_callsites; - #endif - --#ifdef CONFIG_LIVEPATCH -+#if defined(CONFIG_LIVEPATCH) || defined(__aarch64__) - bool klp; /* Is this a livepatch module? */ - bool klp_alive; - diff --git a/patches.suse/prepare-arm64-klp b/patches.suse/prepare-arm64-klp new file mode 100644 index 0000000..b5427f6 --- /dev/null +++ b/patches.suse/prepare-arm64-klp @@ -0,0 +1,39 @@ +From: Torsten Duwe +Subject: Be prepared to enable ARM64 live patching during SLE15 lifetime +Patch-mainline: Never, kabi +References: bsc#1194892 + +SLE15 might ship without live patching on ARM64; +however, it will eventually be enabled during its lifetime. + +Given the experience with ppc64le, the biggest kABI breakage +results from a changing struct module, so include the 2 booleans +right from the start. + +Signed-off-by: Torsten Duwe +[ mb: references refreshed ] +Signed-off-by: Miroslav Benes +--- + include/linux/module.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -352,7 +352,7 @@ struct mod_kallsyms { + char *typetab; + }; + +-#ifdef CONFIG_LIVEPATCH ++#if defined(CONFIG_LIVEPATCH) || defined(__aarch64__) + struct klp_modinfo { + Elf_Ehdr hdr; + Elf_Shdr *sechdrs; +@@ -503,7 +503,7 @@ struct module { + struct static_call_site *static_call_sites; + #endif + +-#ifdef CONFIG_LIVEPATCH ++#if defined(CONFIG_LIVEPATCH) || defined(__aarch64__) + bool klp; /* Is this a livepatch module? */ + bool klp_alive; + diff --git a/series.conf b/series.conf index 6a1139c..8345ff4 100644 --- a/series.conf +++ b/series.conf @@ -8254,7 +8254,7 @@ patches.suse/0002-Add-a-void-suse_kabi_padding-placeholder-to-some-USB.patch patches.suse/0002-Add-a-void-suse_kabi_padding-placeholder-to-some-gsp.patch patches.suse/0001-typeC-add-kABI-padding.patch -+kabi_padding patches.suse/prepare-arm64-kgraft + patches.suse/prepare-arm64-klp patches.suse/0001-kABI-more-hooks-for-PCI-changes.patch patches.suse/QAT-add-suse_kabi_padding.patch patches.suse/crypto-add-suse_kabi_padding.patch