| Message ID | 20240108095903.8427-5-tzimmermann@suse.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arch/x86: Remove unnecessary dependencies on bootparam.h | expand |
Hi Thomas,
kernel test robot noticed the following build errors:
[auto build test ERROR on tip/x86/core]
[also build test ERROR on efi/next tip/master tip/auto-latest linus/master v6.7 next-20240108]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thomas-Zimmermann/arch-x86-Move-UAPI-setup-structures-into-setup_data-h/20240108-180158
base: tip/x86/core
patch link: https://lore.kernel.org/r/20240108095903.8427-5-tzimmermann%40suse.de
patch subject: [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files
config: i386-allnoconfig (https://download.01.org/0day-ci/archive/20240109/202401090541.atvQk6V7-lkp@intel.com/config)
compiler: ClangBuiltLinux clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240109/202401090541.atvQk6V7-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202401090541.atvQk6V7-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from arch/x86/boot/compressed/cmdline.c:2:
>> arch/x86/boot/compressed/misc.h:154:5: error: incomplete definition of type 'struct boot_params'
154 | bp->cc_blob_address = 0;
| ~~^
arch/x86/include/asm/mem_encrypt.h:18:8: note: forward declaration of 'struct boot_params'
18 | struct boot_params;
| ^
1 error generated.
vim +154 arch/x86/boot/compressed/misc.h
cec49df9d331fe Joe Millenbach 2012-07-19 135
597cfe48212a3f Joerg Roedel 2020-09-07 136 #ifdef CONFIG_AMD_MEM_ENCRYPT
ec1c66af3a30d4 Michael Roth 2022-02-09 137 void sev_enable(struct boot_params *bp);
8c29f016540532 Nikunj A Dadhania 2023-01-18 138 void snp_check_features(void);
597cfe48212a3f Joerg Roedel 2020-09-07 139 void sev_es_shutdown_ghcb(void);
69add17a7c1992 Joerg Roedel 2020-09-07 140 extern bool sev_es_check_ghcb_fault(unsigned long address);
4f9c403e44e5e8 Brijesh Singh 2022-02-09 141 void snp_set_page_private(unsigned long paddr);
4f9c403e44e5e8 Brijesh Singh 2022-02-09 142 void snp_set_page_shared(unsigned long paddr);
76f61e1e89b32f Michael Roth 2022-02-24 143 void sev_prep_identity_maps(unsigned long top_level_pgt);
597cfe48212a3f Joerg Roedel 2020-09-07 144 #else
4b1c742407571e Michael Roth 2022-08-23 145 static inline void sev_enable(struct boot_params *bp)
4b1c742407571e Michael Roth 2022-08-23 146 {
4b1c742407571e Michael Roth 2022-08-23 147 /*
4b1c742407571e Michael Roth 2022-08-23 148 * bp->cc_blob_address should only be set by boot/compressed kernel.
4b1c742407571e Michael Roth 2022-08-23 149 * Initialize it to 0 unconditionally (thus here in this stub too) to
4b1c742407571e Michael Roth 2022-08-23 150 * ensure that uninitialized values from buggy bootloaders aren't
4b1c742407571e Michael Roth 2022-08-23 151 * propagated.
4b1c742407571e Michael Roth 2022-08-23 152 */
4b1c742407571e Michael Roth 2022-08-23 153 if (bp)
4b1c742407571e Michael Roth 2022-08-23 @154 bp->cc_blob_address = 0;
4b1c742407571e Michael Roth 2022-08-23 155 }
8c29f016540532 Nikunj A Dadhania 2023-01-18 156 static inline void snp_check_features(void) { }
597cfe48212a3f Joerg Roedel 2020-09-07 157 static inline void sev_es_shutdown_ghcb(void) { }
69add17a7c1992 Joerg Roedel 2020-09-07 158 static inline bool sev_es_check_ghcb_fault(unsigned long address)
69add17a7c1992 Joerg Roedel 2020-09-07 159 {
69add17a7c1992 Joerg Roedel 2020-09-07 160 return false;
69add17a7c1992 Joerg Roedel 2020-09-07 161 }
4f9c403e44e5e8 Brijesh Singh 2022-02-09 162 static inline void snp_set_page_private(unsigned long paddr) { }
4f9c403e44e5e8 Brijesh Singh 2022-02-09 163 static inline void snp_set_page_shared(unsigned long paddr) { }
76f61e1e89b32f Michael Roth 2022-02-24 164 static inline void sev_prep_identity_maps(unsigned long top_level_pgt) { }
597cfe48212a3f Joerg Roedel 2020-09-07 165 #endif
597cfe48212a3f Joerg Roedel 2020-09-07 166
Hi Thomas,
kernel test robot noticed the following build errors:
[auto build test ERROR on tip/x86/core]
[also build test ERROR on efi/next tip/master tip/auto-latest linus/master v6.7 next-20240108]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thomas-Zimmermann/arch-x86-Move-UAPI-setup-structures-into-setup_data-h/20240108-180158
base: tip/x86/core
patch link: https://lore.kernel.org/r/20240108095903.8427-5-tzimmermann%40suse.de
patch subject: [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files
config: x86_64-allnoconfig (https://download.01.org/0day-ci/archive/20240109/202401090850.YMrW5H2K-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240109/202401090850.YMrW5H2K-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202401090850.YMrW5H2K-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from arch/x86/boot/compressed/cmdline.c:2:
arch/x86/boot/compressed/misc.h: In function 'sev_enable':
>> arch/x86/boot/compressed/misc.h:154:19: error: invalid use of undefined type 'struct boot_params'
154 | bp->cc_blob_address = 0;
| ^~
vim +154 arch/x86/boot/compressed/misc.h
cec49df9d331fea Joe Millenbach 2012-07-19 135
597cfe48212a3f1 Joerg Roedel 2020-09-07 136 #ifdef CONFIG_AMD_MEM_ENCRYPT
ec1c66af3a30d45 Michael Roth 2022-02-09 137 void sev_enable(struct boot_params *bp);
8c29f0165405325 Nikunj A Dadhania 2023-01-18 138 void snp_check_features(void);
597cfe48212a3f1 Joerg Roedel 2020-09-07 139 void sev_es_shutdown_ghcb(void);
69add17a7c19925 Joerg Roedel 2020-09-07 140 extern bool sev_es_check_ghcb_fault(unsigned long address);
4f9c403e44e5e88 Brijesh Singh 2022-02-09 141 void snp_set_page_private(unsigned long paddr);
4f9c403e44e5e88 Brijesh Singh 2022-02-09 142 void snp_set_page_shared(unsigned long paddr);
76f61e1e89b32f3 Michael Roth 2022-02-24 143 void sev_prep_identity_maps(unsigned long top_level_pgt);
597cfe48212a3f1 Joerg Roedel 2020-09-07 144 #else
4b1c742407571ef Michael Roth 2022-08-23 145 static inline void sev_enable(struct boot_params *bp)
4b1c742407571ef Michael Roth 2022-08-23 146 {
4b1c742407571ef Michael Roth 2022-08-23 147 /*
4b1c742407571ef Michael Roth 2022-08-23 148 * bp->cc_blob_address should only be set by boot/compressed kernel.
4b1c742407571ef Michael Roth 2022-08-23 149 * Initialize it to 0 unconditionally (thus here in this stub too) to
4b1c742407571ef Michael Roth 2022-08-23 150 * ensure that uninitialized values from buggy bootloaders aren't
4b1c742407571ef Michael Roth 2022-08-23 151 * propagated.
4b1c742407571ef Michael Roth 2022-08-23 152 */
4b1c742407571ef Michael Roth 2022-08-23 153 if (bp)
4b1c742407571ef Michael Roth 2022-08-23 @154 bp->cc_blob_address = 0;
4b1c742407571ef Michael Roth 2022-08-23 155 }
8c29f0165405325 Nikunj A Dadhania 2023-01-18 156 static inline void snp_check_features(void) { }
597cfe48212a3f1 Joerg Roedel 2020-09-07 157 static inline void sev_es_shutdown_ghcb(void) { }
69add17a7c19925 Joerg Roedel 2020-09-07 158 static inline bool sev_es_check_ghcb_fault(unsigned long address)
69add17a7c19925 Joerg Roedel 2020-09-07 159 {
69add17a7c19925 Joerg Roedel 2020-09-07 160 return false;
69add17a7c19925 Joerg Roedel 2020-09-07 161 }
4f9c403e44e5e88 Brijesh Singh 2022-02-09 162 static inline void snp_set_page_private(unsigned long paddr) { }
4f9c403e44e5e88 Brijesh Singh 2022-02-09 163 static inline void snp_set_page_shared(unsigned long paddr) { }
76f61e1e89b32f3 Michael Roth 2022-02-24 164 static inline void sev_prep_identity_maps(unsigned long top_level_pgt) { }
597cfe48212a3f1 Joerg Roedel 2020-09-07 165 #endif
597cfe48212a3f1 Joerg Roedel 2020-09-07 166
diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c index 18d15d1ce87d..f196b1d1ddf8 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -5,6 +5,8 @@ #include "../string.h" #include "efi.h" +#include <asm/bootparam.h> + #include <linux/numa.h> /* diff --git a/arch/x86/boot/compressed/cmdline.c b/arch/x86/boot/compressed/cmdline.c index c1bb180973ea..e162d7f59cc5 100644 --- a/arch/x86/boot/compressed/cmdline.c +++ b/arch/x86/boot/compressed/cmdline.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include "misc.h" +#include <asm/bootparam.h> + static unsigned long fs; static inline void set_fs(unsigned long seg) { diff --git a/arch/x86/boot/compressed/efi.c b/arch/x86/boot/compressed/efi.c index 6edd034b0b30..f2e50f9758e6 100644 --- a/arch/x86/boot/compressed/efi.c +++ b/arch/x86/boot/compressed/efi.c @@ -7,6 +7,8 @@ #include "misc.h" +#include <asm/bootparam.h> + /** * efi_get_type - Given a pointer to boot_params, determine the type of EFI environment. * diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index c0d502bd8716..440ed9779ef3 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -33,7 +33,6 @@ #include <linux/elf.h> #include <asm/page.h> #include <asm/boot.h> -#include <asm/bootparam.h> #include <asm/desc_defs.h> #include "tdx.h" @@ -53,6 +52,8 @@ #define memptr unsigned #endif +struct boot_params; + /* boot/compressed/vmlinux start and end markers */ extern char _head[], _end[]; diff --git a/arch/x86/boot/compressed/pgtable_64.c b/arch/x86/boot/compressed/pgtable_64.c index 51f957b24ba7..c882e1f67af0 100644 --- a/arch/x86/boot/compressed/pgtable_64.c +++ b/arch/x86/boot/compressed/pgtable_64.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "misc.h" +#include <asm/bootparam.h> #include <asm/e820/types.h> #include <asm/processor.h> #include "pgtable.h" diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index 454acd7a2daf..13beae767e48 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -12,6 +12,7 @@ */ #include "misc.h" +#include <asm/bootparam.h> #include <asm/pgtable_types.h> #include <asm/sev.h> #include <asm/trapnr.h> diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index c9f6a6c5de3c..91ca9a9ee3a2 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h @@ -25,7 +25,6 @@ #include <asm/page.h> #include <asm/ptrace.h> -#include <asm/bootparam.h> struct kimage; diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h index 359ada486fa9..c1a8a3408c18 100644 --- a/arch/x86/include/asm/mem_encrypt.h +++ b/arch/x86/include/asm/mem_encrypt.h @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/cc_platform.h> -#include <asm/bootparam.h> +struct boot_params; #ifdef CONFIG_X86_MEM_ENCRYPT void __init mem_encrypt_init(void); diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 5b4a1ce3d368..8dad8b1613bf 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -13,7 +13,6 @@ #include <asm/insn.h> #include <asm/sev-common.h> -#include <asm/bootparam.h> #include <asm/coco.h> #define GHCB_PROTOCOL_MIN 1ULL @@ -22,6 +21,8 @@ #define VMGEXIT() { asm volatile("rep; vmmcall\n\r"); } +struct boot_params; + enum es_result { ES_OK, /* All good */ ES_UNSUPPORTED, /* Requested operation not supported */ diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index c878616a18b8..f062715578a0 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -2,8 +2,6 @@ #ifndef _ASM_X86_PLATFORM_H #define _ASM_X86_PLATFORM_H -#include <asm/bootparam.h> - struct ghcb; struct mpc_bus; struct mpc_cpu; diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index c92d88680dbf..564cff7ed33a 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -26,6 +26,7 @@ #include <linux/vmalloc.h> #include <linux/memblock.h> +#include <asm/bootparam.h> #include <asm/processor.h> #include <asm/hardirq.h> #include <asm/nmi.h> diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c index ccb0915e84e1..4962ec42dc68 100644 --- a/arch/x86/kernel/sev-shared.c +++ b/arch/x86/kernel/sev-shared.c @@ -9,6 +9,8 @@ * and is included directly into both code-bases. */ +#include <asm/setup_data.h> + #ifndef __BOOT_COMPRESSED #define error(v) pr_err(v) #define has_cpuflag(f) boot_cpu_has(f) diff --git a/arch/x86/platform/pvh/enlighten.c b/arch/x86/platform/pvh/enlighten.c index 00a92cb2c814..944e0290f2c0 100644 --- a/arch/x86/platform/pvh/enlighten.c +++ b/arch/x86/platform/pvh/enlighten.c @@ -3,6 +3,7 @@ #include <xen/hvc-console.h> +#include <asm/bootparam.h> #include <asm/io_apic.h> #include <asm/hypervisor.h> #include <asm/e820/api.h> diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index ada3868c02c2..9e9db601bd52 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -4,6 +4,7 @@ #include <xen/hvc-console.h> +#include <asm/bootparam.h> #include <asm/io_apic.h> #include <asm/hypervisor.h> #include <asm/e820/api.h> diff --git a/arch/x86/xen/vga.c b/arch/x86/xen/vga.c index d97adab8420f..f7547807b0bd 100644 --- a/arch/x86/xen/vga.c +++ b/arch/x86/xen/vga.c @@ -2,7 +2,6 @@ #include <linux/screen_info.h> #include <linux/init.h> -#include <asm/bootparam.h> #include <asm/setup.h> #include <xen/interface/xen.h>