Skip to content

arch/x86: Remove unnecessary dependencies on bootparam.h

Thomas Zimmermann linux-arch linux-efi linux-integrity linux-pci linux-security-module lkml 5 versions – Applied

Status from this message: The following commit has been merged into the x86/build branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest4 patches 4 repliesApplied
  2. v44 patches 3 repliesSuperseded
  3. v34 patches 2 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v23 patches6 repliesSuperseded
v13 patches5 repliesSuperseded

Changes in v5 from the cover letter

* silence clang warnings for real-mode code (Nathan)
* revert boot/compressed/misc.h (kernel test robot)

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/4arch/x86: Move UAPI setup structures into setup_data.harch/x86/include/asm/pci.h arch/x86/include/uapi/asm/bootparam.h arch/x86/include/uapi/asm/setup_data.h+85 -720 replies
2/4arch/x86: Move internal setup_data structures into setup_data.harch/x86/Makefile arch/x86/boot/compressed/efi.h arch/x86/include/asm/efi.h +2 more+35 -310 replies
3/4arch/x86: Implement arch_ima_efi_boot_mode() in source filearch/x86/include/asm/efi.h arch/x86/platform/efi/efi.c+8 -20 replies
4/4arch/x86: Do not include <asm/bootparam.h> in several filesarch/x86/boot/compressed/acpi.c arch/x86/boot/compressed/cmdline.c arch/x86/boot/compressed/efi.c +11 more+16 -60 replies

Reviews trailers per patch

1 of 4 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchArd Biesheuvel
SeriesR-b
1/4
2/4
3/4
4/4A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH v5 0/4] arch/x86: Remove unnecessary dependencies on bootparam.h

Reduce build time in some cases by removing unnecessary include statements for <asm/bootparam.h>. Reorganize some header files accordingly.

While working on the kernel's boot-up graphics, I noticed that touching include/linux/screen_info.h triggers a complete rebuild of the kernel on x86. It turns out that the architecture's PCI and EFI headers include <asm/bootparam.h>, which depends on <linux/screen_info.h>. But none of the drivers have any business with boot parameters or the screen_info state.

The patchset moves code from bootparam.h and efi.h into separate header files and removes obsolete include statements on x86. I did

make allmodconfig
make -j28
touch include/linux/screen_info.h
time make -j28

to measure the time it takes to rebuild. Results without the patchset are around 20 minutes.

  real    20m46,705s
  user    354m29,166s
  sys     28m27,359s

And with the patchset applied it goes down to less than one minute.

  real    0m56,643s
  user    4m0,661s
  sys     0m32,956s

The test system is an Intel i5-13500.

v5:
* silence clang warnings for real-mode code (Nathan)
* revert boot/compressed/misc.h (kernel test robot)
v4:
* fix fwd declaration in compressed/misc.h (Ard)
v3:
* keep setup_header in bootparam.h (Ard)
* implement arch_ima_efi_boot_mode() in source file (Ard)
v2:
* only keep struct boot_params in bootparam.h (Ard)
* simplify arch_ima_efi_boot_mode define (Ard)
* updated cover letter

Thomas Zimmermann (4):
arch/x86: Move UAPI setup structures into setup_data.h arch/x86: Move internal setup_data structures into setup_data.h arch/x86: Implement arch_ima_efi_boot_mode() in source file arch/x86: Do not include <asm/bootparam.h> in several files

 arch/x86/Makefile                      |  3 +
 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/efi.h         |  9 ---
 arch/x86/boot/compressed/pgtable_64.c  |  1 +
 arch/x86/boot/compressed/sev.c         |  1 +
 arch/x86/include/asm/efi.h             | 14 +----
 arch/x86/include/asm/kexec.h           |  1 -
 arch/x86/include/asm/mem_encrypt.h     |  2 +-
 arch/x86/include/asm/pci.h             | 13 ----
 arch/x86/include/asm/setup_data.h      | 32 ++++++++++
 arch/x86/include/asm/sev.h             |  3 +-
 arch/x86/include/asm/x86_init.h        |  2 -
 arch/x86/include/uapi/asm/bootparam.h  | 72 +---------------------
 arch/x86/include/uapi/asm/setup_data.h | 83 ++++++++++++++++++++++++++
 arch/x86/kernel/crash.c                |  1 +
 arch/x86/kernel/sev-shared.c           |  2 +
 arch/x86/platform/efi/efi.c            |  5 ++
 arch/x86/platform/pvh/enlighten.c      |  1 +
 arch/x86/xen/enlighten_pvh.c           |  1 +
 arch/x86/xen/vga.c                     |  1 -
 22 files changed, 143 insertions(+), 110 deletions(-)
 create mode 100644 arch/x86/include/asm/setup_data.h
 create mode 100644 arch/x86/include/uapi/asm/setup_data.h
Signature · 1 line
2.43.0