* [PATCH v4 1/4] arch/x86: Move UAPI setup structures into setup_data.h
2024-01-08 9:57 [PATCH v4 0/4] arch/x86: Remove unnecessary dependencies on bootparam.h Thomas Zimmermann
@ 2024-01-08 9:57 ` Thomas Zimmermann
2024-01-08 9:57 ` [PATCH v4 2/4] arch/x86: Move internal setup_data " Thomas Zimmermann
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Thomas Zimmermann @ 2024-01-08 9:57 UTC (permalink / raw)
To: ardb, tglx, mingo, bp, dave.hansen, x86, hpa, bhelgaas, arnd,
zohar, dmitry.kasatkin, paul, jmorris, serge, javierm
Cc: linux-arch, linux-efi, linux-kernel, linux-pci, linux-integrity,
linux-security-module, Thomas Zimmermann
The type definition of struct pci_setup_rom in <asm/pci.h> requires
struct setup_data from <asm/bootparam.h>. Many drivers include
<linux/pci.h>, but do not use boot parameters. Changes to bootparam.h
or its included header files could easily trigger a large, unnecessary
rebuild of the kernel.
Moving struct setup_data and related code into its own header file
avoids including <asm/bootparam.h> in <asm/pci.h>. Instead include the
new header <asm/screen_data.h> and remove the include statement for
x86_init.h, which is unnecessary but pulls in bootparams.h.
Suggested-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
v3:
* keep setup_header and friends in bootparam.h (Ard)
---
arch/x86/include/asm/pci.h | 2 +-
arch/x86/include/uapi/asm/bootparam.h | 72 +---------------------
arch/x86/include/uapi/asm/setup_data.h | 83 ++++++++++++++++++++++++++
3 files changed, 85 insertions(+), 72 deletions(-)
create mode 100644 arch/x86/include/uapi/asm/setup_data.h
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index b40c462b4af3..f6100df3652e 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -10,7 +10,7 @@
#include <linux/numa.h>
#include <asm/io.h>
#include <asm/memtype.h>
-#include <asm/x86_init.h>
+#include <asm/setup_data.h>
struct pci_sysdata {
int domain; /* PCI domain */
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
index 01d19fc22346..4a38e7917756 100644
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
@@ -2,21 +2,7 @@
#ifndef _ASM_X86_BOOTPARAM_H
#define _ASM_X86_BOOTPARAM_H
-/* setup_data/setup_indirect types */
-#define SETUP_NONE 0
-#define SETUP_E820_EXT 1
-#define SETUP_DTB 2
-#define SETUP_PCI 3
-#define SETUP_EFI 4
-#define SETUP_APPLE_PROPERTIES 5
-#define SETUP_JAILHOUSE 6
-#define SETUP_CC_BLOB 7
-#define SETUP_IMA 8
-#define SETUP_RNG_SEED 9
-#define SETUP_ENUM_MAX SETUP_RNG_SEED
-
-#define SETUP_INDIRECT (1<<31)
-#define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT)
+#include <asm/setup_data.h>
/* ram_size flags */
#define RAMDISK_IMAGE_START_MASK 0x07FF
@@ -48,22 +34,6 @@
#include <asm/ist.h>
#include <video/edid.h>
-/* extensible setup data list node */
-struct setup_data {
- __u64 next;
- __u32 type;
- __u32 len;
- __u8 data[];
-};
-
-/* extensible setup indirect data node */
-struct setup_indirect {
- __u32 type;
- __u32 reserved; /* Reserved, must be set to zero. */
- __u64 len;
- __u64 addr;
-};
-
struct setup_header {
__u8 setup_sects;
__u16 root_flags;
@@ -136,51 +106,11 @@ struct efi_info {
*/
#define E820_MAX_ENTRIES_ZEROPAGE 128
-/*
- * The E820 memory region entry of the boot protocol ABI:
- */
-struct boot_e820_entry {
- __u64 addr;
- __u64 size;
- __u32 type;
-} __attribute__((packed));
-
/*
* Smallest compatible version of jailhouse_setup_data required by this kernel.
*/
#define JAILHOUSE_SETUP_REQUIRED_VERSION 1
-/*
- * The boot loader is passing platform information via this Jailhouse-specific
- * setup data structure.
- */
-struct jailhouse_setup_data {
- struct {
- __u16 version;
- __u16 compatible_version;
- } __attribute__((packed)) hdr;
- struct {
- __u16 pm_timer_address;
- __u16 num_cpus;
- __u64 pci_mmconfig_base;
- __u32 tsc_khz;
- __u32 apic_khz;
- __u8 standard_ioapic;
- __u8 cpu_ids[255];
- } __attribute__((packed)) v1;
- struct {
- __u32 flags;
- } __attribute__((packed)) v2;
-} __attribute__((packed));
-
-/*
- * IMA buffer setup data information from the previous kernel during kexec
- */
-struct ima_setup_data {
- __u64 addr;
- __u64 size;
-} __attribute__((packed));
-
/* The so-called "zeropage" */
struct boot_params {
struct screen_info screen_info; /* 0x000 */
diff --git a/arch/x86/include/uapi/asm/setup_data.h b/arch/x86/include/uapi/asm/setup_data.h
new file mode 100644
index 000000000000..b111b0c18544
--- /dev/null
+++ b/arch/x86/include/uapi/asm/setup_data.h
@@ -0,0 +1,83 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI_ASM_X86_SETUP_DATA_H
+#define _UAPI_ASM_X86_SETUP_DATA_H
+
+/* setup_data/setup_indirect types */
+#define SETUP_NONE 0
+#define SETUP_E820_EXT 1
+#define SETUP_DTB 2
+#define SETUP_PCI 3
+#define SETUP_EFI 4
+#define SETUP_APPLE_PROPERTIES 5
+#define SETUP_JAILHOUSE 6
+#define SETUP_CC_BLOB 7
+#define SETUP_IMA 8
+#define SETUP_RNG_SEED 9
+#define SETUP_ENUM_MAX SETUP_RNG_SEED
+
+#define SETUP_INDIRECT (1<<31)
+#define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT)
+
+#ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
+/* extensible setup data list node */
+struct setup_data {
+ __u64 next;
+ __u32 type;
+ __u32 len;
+ __u8 data[];
+};
+
+/* extensible setup indirect data node */
+struct setup_indirect {
+ __u32 type;
+ __u32 reserved; /* Reserved, must be set to zero. */
+ __u64 len;
+ __u64 addr;
+};
+
+/*
+ * The E820 memory region entry of the boot protocol ABI:
+ */
+struct boot_e820_entry {
+ __u64 addr;
+ __u64 size;
+ __u32 type;
+} __attribute__((packed));
+
+/*
+ * The boot loader is passing platform information via this Jailhouse-specific
+ * setup data structure.
+ */
+struct jailhouse_setup_data {
+ struct {
+ __u16 version;
+ __u16 compatible_version;
+ } __attribute__((packed)) hdr;
+ struct {
+ __u16 pm_timer_address;
+ __u16 num_cpus;
+ __u64 pci_mmconfig_base;
+ __u32 tsc_khz;
+ __u32 apic_khz;
+ __u8 standard_ioapic;
+ __u8 cpu_ids[255];
+ } __attribute__((packed)) v1;
+ struct {
+ __u32 flags;
+ } __attribute__((packed)) v2;
+} __attribute__((packed));
+
+/*
+ * IMA buffer setup data information from the previous kernel during kexec
+ */
+struct ima_setup_data {
+ __u64 addr;
+ __u64 size;
+} __attribute__((packed));
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _UAPI_ASM_X86_SETUP_DATA_H */
--
2.43.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
2024-01-08 9:57 [PATCH v4 0/4] arch/x86: Remove unnecessary dependencies on bootparam.h Thomas Zimmermann
2024-01-08 9:57 ` [PATCH v4 1/4] arch/x86: Move UAPI setup structures into setup_data.h Thomas Zimmermann
@ 2024-01-08 9:57 ` Thomas Zimmermann
2024-01-09 0:28 ` kernel test robot
2024-01-08 9:57 ` [PATCH v4 3/4] arch/x86: Implement arch_ima_efi_boot_mode() in source file Thomas Zimmermann
2024-01-08 9:57 ` [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files Thomas Zimmermann
3 siblings, 1 reply; 11+ messages in thread
From: Thomas Zimmermann @ 2024-01-08 9:57 UTC (permalink / raw)
To: ardb, tglx, mingo, bp, dave.hansen, x86, hpa, bhelgaas, arnd,
zohar, dmitry.kasatkin, paul, jmorris, serge, javierm
Cc: linux-arch, linux-efi, linux-kernel, linux-pci, linux-integrity,
linux-security-module, Thomas Zimmermann
The type definition of struct pci_setup_rom in <asm/pci.h> requires
struct setup_data from <asm/bootparam.h>. Many drivers include
<linux/pci.h>, but do not use boot parameters. Changes to bootparam.h
or its included header files could easily trigger a large, unnecessary
rebuild of the kernel.
Moving struct pci_setup_rom into its own header file avoids including
<asm/bootparam.h> in <asm/pci.h>. Moving struct_efi_setup_data allows
to unify duplicated definition of the data structure in a single place.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
arch/x86/boot/compressed/efi.h | 9 ---------
arch/x86/include/asm/efi.h | 9 ---------
arch/x86/include/asm/pci.h | 13 -------------
arch/x86/include/asm/setup_data.h | 32 +++++++++++++++++++++++++++++++
4 files changed, 32 insertions(+), 31 deletions(-)
create mode 100644 arch/x86/include/asm/setup_data.h
diff --git a/arch/x86/boot/compressed/efi.h b/arch/x86/boot/compressed/efi.h
index 866c0af8b5b9..b22300970f97 100644
--- a/arch/x86/boot/compressed/efi.h
+++ b/arch/x86/boot/compressed/efi.h
@@ -97,15 +97,6 @@ typedef struct {
u32 tables;
} efi_system_table_32_t;
-/* kexec external ABI */
-struct efi_setup_data {
- u64 fw_vendor;
- u64 __unused;
- u64 tables;
- u64 smbios;
- u64 reserved[8];
-};
-
struct efi_unaccepted_memory {
u32 version;
u32 unit_size;
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index c4555b269a1b..a5d7a83e4c2a 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -143,15 +143,6 @@ extern void efi_free_boot_services(void);
void arch_efi_call_virt_setup(void);
void arch_efi_call_virt_teardown(void);
-/* kexec external ABI */
-struct efi_setup_data {
- u64 fw_vendor;
- u64 __unused;
- u64 tables;
- u64 smbios;
- u64 reserved[8];
-};
-
extern u64 efi_setup;
#ifdef CONFIG_EFI
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index f6100df3652e..b3ab80a03365 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -10,7 +10,6 @@
#include <linux/numa.h>
#include <asm/io.h>
#include <asm/memtype.h>
-#include <asm/setup_data.h>
struct pci_sysdata {
int domain; /* PCI domain */
@@ -124,16 +123,4 @@ cpumask_of_pcibus(const struct pci_bus *bus)
}
#endif
-struct pci_setup_rom {
- struct setup_data data;
- uint16_t vendor;
- uint16_t devid;
- uint64_t pcilen;
- unsigned long segment;
- unsigned long bus;
- unsigned long device;
- unsigned long function;
- uint8_t romdata[];
-};
-
#endif /* _ASM_X86_PCI_H */
diff --git a/arch/x86/include/asm/setup_data.h b/arch/x86/include/asm/setup_data.h
new file mode 100644
index 000000000000..77c51111a893
--- /dev/null
+++ b/arch/x86/include/asm/setup_data.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_X86_SETUP_DATA_H
+#define _ASM_X86_SETUP_DATA_H
+
+#include <uapi/asm/setup_data.h>
+
+#ifndef __ASSEMBLY__
+
+struct pci_setup_rom {
+ struct setup_data data;
+ uint16_t vendor;
+ uint16_t devid;
+ uint64_t pcilen;
+ unsigned long segment;
+ unsigned long bus;
+ unsigned long device;
+ unsigned long function;
+ uint8_t romdata[];
+};
+
+/* kexec external ABI */
+struct efi_setup_data {
+ u64 fw_vendor;
+ u64 __unused;
+ u64 tables;
+ u64 smbios;
+ u64 reserved[8];
+};
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _ASM_X86_SETUP_DATA_H */
--
2.43.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
2024-01-08 9:57 ` [PATCH v4 2/4] arch/x86: Move internal setup_data " Thomas Zimmermann
@ 2024-01-09 0:28 ` kernel test robot
2024-01-09 17:58 ` Nathan Chancellor
0 siblings, 1 reply; 11+ messages in thread
From: kernel test robot @ 2024-01-09 0:28 UTC (permalink / raw)
To: Thomas Zimmermann, ardb, tglx, mingo, bp, dave.hansen, x86, hpa,
bhelgaas, arnd, zohar, dmitry.kasatkin, paul, jmorris, serge,
javierm
Cc: llvm, oe-kbuild-all, linux-arch, linux-efi, linux-kernel,
linux-pci, linux-integrity, linux-security-module,
Thomas Zimmermann
Hi Thomas,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tip/x86/core]
[also build test WARNING 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-3-tzimmermann%40suse.de
patch subject: [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
config: x86_64-rhel-8.3-bpf (https://download.01.org/0day-ci/archive/20240109/202401090800.UOBEKB3W-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/202401090800.UOBEKB3W-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/202401090800.UOBEKB3W-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from arch/x86/realmode/rm/wakemain.c:3:
In file included from arch/x86/boot/boot.h:24:
In file included from arch/x86/include/asm/setup.h:10:
In file included from arch/x86/include/asm/page_types.h:7:
In file included from include/linux/mem_encrypt.h:17:
In file included from arch/x86/include/asm/mem_encrypt.h:18:
In file included from arch/x86/include/uapi/asm/bootparam.h:5:
>> arch/x86/include/asm/setup_data.h:10:20: warning: field 'data' with variable sized type 'struct setup_data' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
10 | struct setup_data data;
| ^
1 warning generated.
vim +10 arch/x86/include/asm/setup_data.h
8
9 struct pci_setup_rom {
> 10 struct setup_data data;
11 uint16_t vendor;
12 uint16_t devid;
13 uint64_t pcilen;
14 unsigned long segment;
15 unsigned long bus;
16 unsigned long device;
17 unsigned long function;
18 uint8_t romdata[];
19 };
20
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
2024-01-09 0:28 ` kernel test robot
@ 2024-01-09 17:58 ` Nathan Chancellor
2024-01-11 9:50 ` Thomas Zimmermann
0 siblings, 1 reply; 11+ messages in thread
From: Nathan Chancellor @ 2024-01-09 17:58 UTC (permalink / raw)
To: kernel test robot
Cc: Thomas Zimmermann, ardb, tglx, mingo, bp, dave.hansen, x86, hpa,
bhelgaas, arnd, zohar, dmitry.kasatkin, paul, jmorris, serge,
javierm, llvm, oe-kbuild-all, linux-arch, linux-efi, linux-kernel,
linux-pci, linux-integrity, linux-security-module
On Tue, Jan 09, 2024 at 08:28:59AM +0800, kernel test robot wrote:
> Hi Thomas,
>
> kernel test robot noticed the following build warnings:
>
> [auto build test WARNING on tip/x86/core]
> [also build test WARNING 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-3-tzimmermann%40suse.de
> patch subject: [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
> config: x86_64-rhel-8.3-bpf (https://download.01.org/0day-ci/archive/20240109/202401090800.UOBEKB3W-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/202401090800.UOBEKB3W-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/202401090800.UOBEKB3W-lkp@intel.com/
>
> All warnings (new ones prefixed by >>):
>
> In file included from arch/x86/realmode/rm/wakemain.c:3:
> In file included from arch/x86/boot/boot.h:24:
> In file included from arch/x86/include/asm/setup.h:10:
> In file included from arch/x86/include/asm/page_types.h:7:
> In file included from include/linux/mem_encrypt.h:17:
> In file included from arch/x86/include/asm/mem_encrypt.h:18:
> In file included from arch/x86/include/uapi/asm/bootparam.h:5:
> >> arch/x86/include/asm/setup_data.h:10:20: warning: field 'data' with variable sized type 'struct setup_data' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
> 10 | struct setup_data data;
> | ^
> 1 warning generated.
I think this warning is expected. This structure is now included in the
realmode part of arch/x86, which has its own set of build flags,
including -Wall, which includes -Wgnu on clang. The kernel obviously
uses GNU extensions and states this clearly with '-std=gnu11', so
-Wno-gnu is unconditionally added to KBUILD_CFLAGS for clang. It seems
that same treatment is needed for REALMODE_CFLAGS, which also matches
arch/x86/boot/compressed/Makefile, see commit 6c3b56b19730 ("x86/boot:
Disable Clang warnings about GNU extensions"):
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 1a068de12a56..24076db59783 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -53,6 +53,9 @@ REALMODE_CFLAGS += -fno-stack-protector
REALMODE_CFLAGS += -Wno-address-of-packed-member
REALMODE_CFLAGS += $(cc_stack_align4)
REALMODE_CFLAGS += $(CLANG_FLAGS)
+ifdef CONFIG_CC_IS_CLANG
+REALMODE_CFLAGS += -Wno-gnu
+endif
export REALMODE_CFLAGS
# BITS is used as extension for files which are available in a 32 bit
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
2024-01-09 17:58 ` Nathan Chancellor
@ 2024-01-11 9:50 ` Thomas Zimmermann
2024-01-11 22:41 ` Nathan Chancellor
0 siblings, 1 reply; 11+ messages in thread
From: Thomas Zimmermann @ 2024-01-11 9:50 UTC (permalink / raw)
To: Nathan Chancellor, kernel test robot
Cc: ardb, tglx, mingo, bp, dave.hansen, x86, hpa, bhelgaas, arnd,
zohar, dmitry.kasatkin, paul, jmorris, serge, javierm, llvm,
oe-kbuild-all, linux-arch, linux-efi, linux-kernel, linux-pci,
linux-integrity, linux-security-module
[-- Attachment #1.1: Type: text/plain, Size: 3846 bytes --]
Hi
Am 09.01.24 um 18:58 schrieb Nathan Chancellor:
> On Tue, Jan 09, 2024 at 08:28:59AM +0800, kernel test robot wrote:
>> Hi Thomas,
>>
>> kernel test robot noticed the following build warnings:
>>
>> [auto build test WARNING on tip/x86/core]
>> [also build test WARNING 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-3-tzimmermann%40suse.de
>> patch subject: [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
>> config: x86_64-rhel-8.3-bpf (https://download.01.org/0day-ci/archive/20240109/202401090800.UOBEKB3W-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/202401090800.UOBEKB3W-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/202401090800.UOBEKB3W-lkp@intel.com/
>>
>> All warnings (new ones prefixed by >>):
>>
>> In file included from arch/x86/realmode/rm/wakemain.c:3:
>> In file included from arch/x86/boot/boot.h:24:
>> In file included from arch/x86/include/asm/setup.h:10:
>> In file included from arch/x86/include/asm/page_types.h:7:
>> In file included from include/linux/mem_encrypt.h:17:
>> In file included from arch/x86/include/asm/mem_encrypt.h:18:
>> In file included from arch/x86/include/uapi/asm/bootparam.h:5:
>>>> arch/x86/include/asm/setup_data.h:10:20: warning: field 'data' with variable sized type 'struct setup_data' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
>> 10 | struct setup_data data;
>> | ^
>> 1 warning generated.
>
> I think this warning is expected. This structure is now included in the
> realmode part of arch/x86, which has its own set of build flags,
> including -Wall, which includes -Wgnu on clang. The kernel obviously
> uses GNU extensions and states this clearly with '-std=gnu11', so
> -Wno-gnu is unconditionally added to KBUILD_CFLAGS for clang. It seems
> that same treatment is needed for REALMODE_CFLAGS, which also matches
> arch/x86/boot/compressed/Makefile, see commit 6c3b56b19730 ("x86/boot:
> Disable Clang warnings about GNU extensions"):
>
> diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> index 1a068de12a56..24076db59783 100644
> --- a/arch/x86/Makefile
> +++ b/arch/x86/Makefile
> @@ -53,6 +53,9 @@ REALMODE_CFLAGS += -fno-stack-protector
> REALMODE_CFLAGS += -Wno-address-of-packed-member
> REALMODE_CFLAGS += $(cc_stack_align4)
> REALMODE_CFLAGS += $(CLANG_FLAGS)
> +ifdef CONFIG_CC_IS_CLANG
> +REALMODE_CFLAGS += -Wno-gnu
> +endif
Thanks. Shall I include this change in the patchset?
Best regards
Thomas
> export REALMODE_CFLAGS
>
> # BITS is used as extension for files which are available in a 32 bit
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
2024-01-11 9:50 ` Thomas Zimmermann
@ 2024-01-11 22:41 ` Nathan Chancellor
0 siblings, 0 replies; 11+ messages in thread
From: Nathan Chancellor @ 2024-01-11 22:41 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: kernel test robot, ardb, tglx, mingo, bp, dave.hansen, x86, hpa,
bhelgaas, arnd, zohar, dmitry.kasatkin, paul, jmorris, serge,
javierm, llvm, oe-kbuild-all, linux-arch, linux-efi, linux-kernel,
linux-pci, linux-integrity, linux-security-module
On Thu, Jan 11, 2024 at 10:50:43AM +0100, Thomas Zimmermann wrote:
> Hi
>
> Am 09.01.24 um 18:58 schrieb Nathan Chancellor:
> > On Tue, Jan 09, 2024 at 08:28:59AM +0800, kernel test robot wrote:
> > > Hi Thomas,
> > >
> > > kernel test robot noticed the following build warnings:
> > >
> > > [auto build test WARNING on tip/x86/core]
> > > [also build test WARNING 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-3-tzimmermann%40suse.de
> > > patch subject: [PATCH v4 2/4] arch/x86: Move internal setup_data structures into setup_data.h
> > > config: x86_64-rhel-8.3-bpf (https://download.01.org/0day-ci/archive/20240109/202401090800.UOBEKB3W-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/202401090800.UOBEKB3W-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/202401090800.UOBEKB3W-lkp@intel.com/
> > >
> > > All warnings (new ones prefixed by >>):
> > >
> > > In file included from arch/x86/realmode/rm/wakemain.c:3:
> > > In file included from arch/x86/boot/boot.h:24:
> > > In file included from arch/x86/include/asm/setup.h:10:
> > > In file included from arch/x86/include/asm/page_types.h:7:
> > > In file included from include/linux/mem_encrypt.h:17:
> > > In file included from arch/x86/include/asm/mem_encrypt.h:18:
> > > In file included from arch/x86/include/uapi/asm/bootparam.h:5:
> > > > > arch/x86/include/asm/setup_data.h:10:20: warning: field 'data' with variable sized type 'struct setup_data' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
> > > 10 | struct setup_data data;
> > > | ^
> > > 1 warning generated.
> >
> > I think this warning is expected. This structure is now included in the
> > realmode part of arch/x86, which has its own set of build flags,
> > including -Wall, which includes -Wgnu on clang. The kernel obviously
> > uses GNU extensions and states this clearly with '-std=gnu11', so
> > -Wno-gnu is unconditionally added to KBUILD_CFLAGS for clang. It seems
> > that same treatment is needed for REALMODE_CFLAGS, which also matches
> > arch/x86/boot/compressed/Makefile, see commit 6c3b56b19730 ("x86/boot:
> > Disable Clang warnings about GNU extensions"):
> >
> > diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> > index 1a068de12a56..24076db59783 100644
> > --- a/arch/x86/Makefile
> > +++ b/arch/x86/Makefile
> > @@ -53,6 +53,9 @@ REALMODE_CFLAGS += -fno-stack-protector
> > REALMODE_CFLAGS += -Wno-address-of-packed-member
> > REALMODE_CFLAGS += $(cc_stack_align4)
> > REALMODE_CFLAGS += $(CLANG_FLAGS)
> > +ifdef CONFIG_CC_IS_CLANG
> > +REALMODE_CFLAGS += -Wno-gnu
> > +endif
>
> Thanks. Shall I include this change in the patchset?
Yes, I think so to keep the build clean.
> Best regards
> Thomas
>
> > export REALMODE_CFLAGS
> > # BITS is used as extension for files which are available in a 32 bit
>
> --
> Thomas Zimmermann
> Graphics Driver Developer
> SUSE Software Solutions Germany GmbH
> Frankenstrasse 146, 90461 Nuernberg, Germany
> GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
> HRB 36809 (AG Nuernberg)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v4 3/4] arch/x86: Implement arch_ima_efi_boot_mode() in source file
2024-01-08 9:57 [PATCH v4 0/4] arch/x86: Remove unnecessary dependencies on bootparam.h Thomas Zimmermann
2024-01-08 9:57 ` [PATCH v4 1/4] arch/x86: Move UAPI setup structures into setup_data.h Thomas Zimmermann
2024-01-08 9:57 ` [PATCH v4 2/4] arch/x86: Move internal setup_data " Thomas Zimmermann
@ 2024-01-08 9:57 ` Thomas Zimmermann
2024-01-08 9:57 ` [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files Thomas Zimmermann
3 siblings, 0 replies; 11+ messages in thread
From: Thomas Zimmermann @ 2024-01-08 9:57 UTC (permalink / raw)
To: ardb, tglx, mingo, bp, dave.hansen, x86, hpa, bhelgaas, arnd,
zohar, dmitry.kasatkin, paul, jmorris, serge, javierm
Cc: linux-arch, linux-efi, linux-kernel, linux-pci, linux-integrity,
linux-security-module, Thomas Zimmermann
The x86 implementation of arch_ima_efi_boot_mode() uses the global
boot_param state. Move it into a source file to clean up the header.
Avoid potential rebuilds of unrelated source files if boot_params
changes.
Suggested-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
arch/x86/include/asm/efi.h | 5 +++--
arch/x86/platform/efi/efi.c | 5 +++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index a5d7a83e4c2a..1dc600fa3ba5 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -409,8 +409,9 @@ extern int __init efi_memmap_split_count(efi_memory_desc_t *md,
extern void __init efi_memmap_insert(struct efi_memory_map *old_memmap,
void *buf, struct efi_mem_range *mem);
-#define arch_ima_efi_boot_mode \
- ({ extern struct boot_params boot_params; boot_params.secure_boot; })
+extern enum efi_secureboot_mode __x86_ima_efi_boot_mode(void);
+
+#define arch_ima_efi_boot_mode __x86_ima_efi_boot_mode()
#ifdef CONFIG_EFI_RUNTIME_MAP
int efi_get_runtime_map_size(void);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index e9f99c56f3ce..f090ec972d7b 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -950,3 +950,8 @@ umode_t efi_attr_is_visible(struct kobject *kobj, struct attribute *attr, int n)
}
return attr->mode;
}
+
+enum efi_secureboot_mode __x86_ima_efi_boot_mode(void)
+{
+ return boot_params.secure_boot;
+}
--
2.43.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files
2024-01-08 9:57 [PATCH v4 0/4] arch/x86: Remove unnecessary dependencies on bootparam.h Thomas Zimmermann
` (2 preceding siblings ...)
2024-01-08 9:57 ` [PATCH v4 3/4] arch/x86: Implement arch_ima_efi_boot_mode() in source file Thomas Zimmermann
@ 2024-01-08 9:57 ` Thomas Zimmermann
2024-01-08 21:44 ` kernel test robot
2024-01-09 0:29 ` kernel test robot
3 siblings, 2 replies; 11+ messages in thread
From: Thomas Zimmermann @ 2024-01-08 9:57 UTC (permalink / raw)
To: ardb, tglx, mingo, bp, dave.hansen, x86, hpa, bhelgaas, arnd,
zohar, dmitry.kasatkin, paul, jmorris, serge, javierm
Cc: linux-arch, linux-efi, linux-kernel, linux-pci, linux-integrity,
linux-security-module, Thomas Zimmermann
Remove the include statement for <asm/bootparam.h> from several files
that don't require it. Limits the exposure of the boot parameters
within the Linux kernel code.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
---
v4:
* fix fwd declaration in compressed/misc.h (Ard)
v3:
* revert of e820/types.h required
v2:
* clean up misc.h and e820/types.h
* include bootparam.h in several source files
---
arch/x86/boot/compressed/acpi.c | 2 ++
arch/x86/boot/compressed/cmdline.c | 2 ++
arch/x86/boot/compressed/efi.c | 2 ++
arch/x86/boot/compressed/misc.h | 3 ++-
arch/x86/boot/compressed/pgtable_64.c | 1 +
arch/x86/boot/compressed/sev.c | 1 +
arch/x86/include/asm/kexec.h | 1 -
arch/x86/include/asm/mem_encrypt.h | 2 +-
arch/x86/include/asm/sev.h | 3 ++-
arch/x86/include/asm/x86_init.h | 2 --
arch/x86/kernel/crash.c | 1 +
arch/x86/kernel/sev-shared.c | 2 ++
arch/x86/platform/pvh/enlighten.c | 1 +
arch/x86/xen/enlighten_pvh.c | 1 +
arch/x86/xen/vga.c | 1 -
15 files changed, 18 insertions(+), 7 deletions(-)
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>
--
2.43.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files
2024-01-08 9:57 ` [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files Thomas Zimmermann
@ 2024-01-08 21:44 ` kernel test robot
2024-01-09 0:29 ` kernel test robot
1 sibling, 0 replies; 11+ messages in thread
From: kernel test robot @ 2024-01-08 21:44 UTC (permalink / raw)
To: Thomas Zimmermann, ardb, tglx, mingo, bp, dave.hansen, x86, hpa,
bhelgaas, arnd, zohar, dmitry.kasatkin, paul, jmorris, serge,
javierm
Cc: llvm, oe-kbuild-all, linux-arch, linux-efi, linux-kernel,
linux-pci, linux-integrity, linux-security-module,
Thomas Zimmermann
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
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files
2024-01-08 9:57 ` [PATCH v4 4/4] arch/x86: Do not include <asm/bootparam.h> in several files Thomas Zimmermann
2024-01-08 21:44 ` kernel test robot
@ 2024-01-09 0:29 ` kernel test robot
1 sibling, 0 replies; 11+ messages in thread
From: kernel test robot @ 2024-01-09 0:29 UTC (permalink / raw)
To: Thomas Zimmermann, ardb, tglx, mingo, bp, dave.hansen, x86, hpa,
bhelgaas, arnd, zohar, dmitry.kasatkin, paul, jmorris, serge,
javierm
Cc: oe-kbuild-all, linux-arch, linux-efi, linux-kernel, linux-pci,
linux-integrity, linux-security-module, Thomas Zimmermann
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
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 11+ messages in thread