License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 17:07:57 +03:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2007-07-11 23:18:54 +04:00
|
|
|
/*
|
|
|
|
* header.S
|
|
|
|
*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*
|
|
|
|
* Based on bootsect.S and setup.S
|
|
|
|
* modified by more people than can be counted
|
|
|
|
*
|
|
|
|
* Rewritten as a common file by H. Peter Anvin (Apr 2007)
|
|
|
|
*
|
|
|
|
* BIG FAT NOTE: We're in real mode using 64k segments. Therefore segment
|
|
|
|
* addresses must be multiplied by 16 to obtain their respective linear
|
|
|
|
* addresses. To avoid confusion, linear addresses are written using leading
|
|
|
|
* hex while segment addresses are written as segment:offset.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <asm/segment.h>
|
|
|
|
#include <asm/boot.h>
|
2009-02-13 22:14:01 +03:00
|
|
|
#include <asm/page_types.h>
|
2007-07-11 23:18:54 +04:00
|
|
|
#include <asm/setup.h>
|
2013-01-27 22:43:28 +04:00
|
|
|
#include <asm/bootparam.h>
|
2007-07-11 23:18:54 +04:00
|
|
|
#include "boot.h"
|
2009-05-12 01:21:12 +04:00
|
|
|
#include "voffset.h"
|
|
|
|
#include "zoffset.h"
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
BOOTSEG = 0x07C0 /* original address of boot-sector */
|
2009-03-11 20:55:33 +03:00
|
|
|
SYSSEG = 0x1000 /* historical load address >> 4 */
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
#ifndef SVGA_MODE
|
|
|
|
#define SVGA_MODE ASK_VGA
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef ROOT_RDONLY
|
|
|
|
#define ROOT_RDONLY 1
|
|
|
|
#endif
|
|
|
|
|
|
|
|
.code16
|
|
|
|
.section ".bstext", "ax"
|
|
|
|
|
|
|
|
.global bootsect_start
|
|
|
|
bootsect_start:
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
#ifdef CONFIG_EFI_STUB
|
|
|
|
# "MZ", MS-DOS header
|
|
|
|
.byte 0x4d
|
|
|
|
.byte 0x5a
|
|
|
|
#endif
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
# Normalize the start address
|
|
|
|
ljmp $BOOTSEG, $start2
|
|
|
|
|
|
|
|
start2:
|
|
|
|
movw %cs, %ax
|
|
|
|
movw %ax, %ds
|
|
|
|
movw %ax, %es
|
|
|
|
movw %ax, %ss
|
|
|
|
xorw %sp, %sp
|
|
|
|
sti
|
|
|
|
cld
|
|
|
|
|
|
|
|
movw $bugger_off_msg, %si
|
|
|
|
|
|
|
|
msg_loop:
|
|
|
|
lodsb
|
|
|
|
andb %al, %al
|
|
|
|
jz bs_die
|
|
|
|
movb $0xe, %ah
|
|
|
|
movw $7, %bx
|
|
|
|
int $0x10
|
|
|
|
jmp msg_loop
|
|
|
|
|
|
|
|
bs_die:
|
|
|
|
# Allow the user to press a key, then reboot
|
|
|
|
xorw %ax, %ax
|
|
|
|
int $0x16
|
|
|
|
int $0x19
|
|
|
|
|
|
|
|
# int 0x19 should never return. In case it does anyway,
|
|
|
|
# invoke the BIOS reset code...
|
|
|
|
ljmp $0xf000,$0xfff0
|
|
|
|
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
#ifdef CONFIG_EFI_STUB
|
|
|
|
.org 0x3c
|
|
|
|
#
|
|
|
|
# Offset to the PE header.
|
|
|
|
#
|
|
|
|
.long pe_header
|
|
|
|
#endif /* CONFIG_EFI_STUB */
|
|
|
|
|
2007-07-11 23:18:54 +04:00
|
|
|
.section ".bsdata", "a"
|
|
|
|
bugger_off_msg:
|
2014-07-10 15:26:20 +04:00
|
|
|
.ascii "Use a boot loader.\r\n"
|
2007-07-11 23:18:54 +04:00
|
|
|
.ascii "\n"
|
2014-07-10 15:26:20 +04:00
|
|
|
.ascii "Remove disk and press any key to reboot...\r\n"
|
2007-07-11 23:18:54 +04:00
|
|
|
.byte 0
|
|
|
|
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
#ifdef CONFIG_EFI_STUB
|
|
|
|
pe_header:
|
|
|
|
.ascii "PE"
|
|
|
|
.word 0
|
|
|
|
|
|
|
|
coff_header:
|
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
.word 0x14c # i386
|
|
|
|
#else
|
|
|
|
.word 0x8664 # x86-64
|
|
|
|
#endif
|
2014-07-10 15:26:20 +04:00
|
|
|
.word 4 # nr_sections
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
.long 0 # TimeDateStamp
|
|
|
|
.long 0 # PointerToSymbolTable
|
|
|
|
.long 1 # NumberOfSymbols
|
|
|
|
.word section_table - optional_header # SizeOfOptionalHeader
|
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
.word 0x306 # Characteristics.
|
|
|
|
# IMAGE_FILE_32BIT_MACHINE |
|
|
|
|
# IMAGE_FILE_DEBUG_STRIPPED |
|
|
|
|
# IMAGE_FILE_EXECUTABLE_IMAGE |
|
|
|
|
# IMAGE_FILE_LINE_NUMS_STRIPPED
|
|
|
|
#else
|
|
|
|
.word 0x206 # Characteristics
|
|
|
|
# IMAGE_FILE_DEBUG_STRIPPED |
|
|
|
|
# IMAGE_FILE_EXECUTABLE_IMAGE |
|
|
|
|
# IMAGE_FILE_LINE_NUMS_STRIPPED
|
|
|
|
#endif
|
|
|
|
|
|
|
|
optional_header:
|
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
.word 0x10b # PE32 format
|
|
|
|
#else
|
|
|
|
.word 0x20b # PE32+ format
|
|
|
|
#endif
|
|
|
|
.byte 0x02 # MajorLinkerVersion
|
|
|
|
.byte 0x14 # MinorLinkerVersion
|
|
|
|
|
|
|
|
# Filled in by build.c
|
|
|
|
.long 0 # SizeOfCode
|
|
|
|
|
|
|
|
.long 0 # SizeOfInitializedData
|
|
|
|
.long 0 # SizeOfUninitializedData
|
|
|
|
|
|
|
|
# Filled in by build.c
|
|
|
|
.long 0x0000 # AddressOfEntryPoint
|
|
|
|
|
2012-03-23 20:35:05 +04:00
|
|
|
.long 0x0200 # BaseOfCode
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
.long 0 # data
|
|
|
|
#endif
|
|
|
|
|
|
|
|
extra_header_fields:
|
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
.long 0 # ImageBase
|
|
|
|
#else
|
|
|
|
.quad 0 # ImageBase
|
|
|
|
#endif
|
2015-08-07 11:36:56 +03:00
|
|
|
.long 0x20 # SectionAlignment
|
2012-06-07 20:05:21 +04:00
|
|
|
.long 0x20 # FileAlignment
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
.word 0 # MajorOperatingSystemVersion
|
|
|
|
.word 0 # MinorOperatingSystemVersion
|
|
|
|
.word 0 # MajorImageVersion
|
|
|
|
.word 0 # MinorImageVersion
|
|
|
|
.word 0 # MajorSubsystemVersion
|
|
|
|
.word 0 # MinorSubsystemVersion
|
|
|
|
.long 0 # Win32VersionValue
|
|
|
|
|
|
|
|
#
|
|
|
|
# The size of the bzImage is written in tools/build.c
|
|
|
|
#
|
|
|
|
.long 0 # SizeOfImage
|
|
|
|
|
|
|
|
.long 0x200 # SizeOfHeaders
|
|
|
|
.long 0 # CheckSum
|
|
|
|
.word 0xa # Subsystem (EFI application)
|
|
|
|
.word 0 # DllCharacteristics
|
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
.long 0 # SizeOfStackReserve
|
|
|
|
.long 0 # SizeOfStackCommit
|
|
|
|
.long 0 # SizeOfHeapReserve
|
|
|
|
.long 0 # SizeOfHeapCommit
|
|
|
|
#else
|
|
|
|
.quad 0 # SizeOfStackReserve
|
|
|
|
.quad 0 # SizeOfStackCommit
|
|
|
|
.quad 0 # SizeOfHeapReserve
|
|
|
|
.quad 0 # SizeOfHeapCommit
|
|
|
|
#endif
|
|
|
|
.long 0 # LoaderFlags
|
2012-03-23 20:35:06 +04:00
|
|
|
.long 0x6 # NumberOfRvaAndSizes
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
|
|
|
|
.quad 0 # ExportTable
|
|
|
|
.quad 0 # ImportTable
|
|
|
|
.quad 0 # ResourceTable
|
|
|
|
.quad 0 # ExceptionTable
|
|
|
|
.quad 0 # CertificationTable
|
|
|
|
.quad 0 # BaseRelocationTable
|
|
|
|
|
|
|
|
# Section table
|
|
|
|
section_table:
|
2012-06-07 20:05:21 +04:00
|
|
|
#
|
|
|
|
# The offset & size fields are filled in by build.c.
|
|
|
|
#
|
|
|
|
.ascii ".setup"
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
.byte 0
|
|
|
|
.byte 0
|
|
|
|
.long 0
|
|
|
|
.long 0x0 # startup_{32,64}
|
|
|
|
.long 0 # Size of initialized data
|
|
|
|
# on disk
|
|
|
|
.long 0x0 # startup_{32,64}
|
|
|
|
.long 0 # PointerToRelocations
|
|
|
|
.long 0 # PointerToLineNumbers
|
|
|
|
.word 0 # NumberOfRelocations
|
|
|
|
.word 0 # NumberOfLineNumbers
|
|
|
|
.long 0x60500020 # Characteristics (section flags)
|
|
|
|
|
|
|
|
#
|
|
|
|
# The EFI application loader requires a relocation section
|
2012-06-07 20:05:21 +04:00
|
|
|
# because EFI applications must be relocatable. The .reloc
|
|
|
|
# offset & size fields are filled in by build.c.
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
#
|
|
|
|
.ascii ".reloc"
|
|
|
|
.byte 0
|
|
|
|
.byte 0
|
2012-03-23 20:35:04 +04:00
|
|
|
.long 0
|
|
|
|
.long 0
|
|
|
|
.long 0 # SizeOfRawData
|
|
|
|
.long 0 # PointerToRawData
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
.long 0 # PointerToRelocations
|
|
|
|
.long 0 # PointerToLineNumbers
|
|
|
|
.word 0 # NumberOfRelocations
|
|
|
|
.word 0 # NumberOfLineNumbers
|
|
|
|
.long 0x42100040 # Characteristics (section flags)
|
2012-06-07 20:05:21 +04:00
|
|
|
|
|
|
|
#
|
|
|
|
# The offset & size fields are filled in by build.c.
|
|
|
|
#
|
|
|
|
.ascii ".text"
|
|
|
|
.byte 0
|
|
|
|
.byte 0
|
|
|
|
.byte 0
|
|
|
|
.long 0
|
|
|
|
.long 0x0 # startup_{32,64}
|
|
|
|
.long 0 # Size of initialized data
|
|
|
|
# on disk
|
|
|
|
.long 0x0 # startup_{32,64}
|
|
|
|
.long 0 # PointerToRelocations
|
|
|
|
.long 0 # PointerToLineNumbers
|
|
|
|
.word 0 # NumberOfRelocations
|
|
|
|
.word 0 # NumberOfLineNumbers
|
|
|
|
.long 0x60500020 # Characteristics (section flags)
|
|
|
|
|
2014-07-10 15:26:20 +04:00
|
|
|
#
|
|
|
|
# The offset & size fields are filled in by build.c.
|
|
|
|
#
|
|
|
|
.ascii ".bss"
|
|
|
|
.byte 0
|
|
|
|
.byte 0
|
|
|
|
.byte 0
|
|
|
|
.byte 0
|
|
|
|
.long 0
|
|
|
|
.long 0x0
|
|
|
|
.long 0 # Size of initialized data
|
|
|
|
# on disk
|
|
|
|
.long 0x0
|
|
|
|
.long 0 # PointerToRelocations
|
|
|
|
.long 0 # PointerToLineNumbers
|
|
|
|
.word 0 # NumberOfRelocations
|
|
|
|
.word 0 # NumberOfLineNumbers
|
|
|
|
.long 0xc8000080 # Characteristics (section flags)
|
|
|
|
|
x86, efi: EFI boot stub support
There is currently a large divide between kernel development and the
development of EFI boot loaders. The idea behind this patch is to give
the kernel developers full control over the EFI boot process. As
H. Peter Anvin put it,
"The 'kernel carries its own stub' approach been very successful in
dealing with BIOS, and would make a lot of sense to me for EFI as
well."
This patch introduces an EFI boot stub that allows an x86 bzImage to
be loaded and executed by EFI firmware. The bzImage appears to the
firmware as an EFI application. Luckily there are enough free bits
within the bzImage header so that it can masquerade as an EFI
application, thereby coercing the EFI firmware into loading it and
jumping to its entry point. The beauty of this masquerading approach
is that both BIOS and EFI boot loaders can still load and run the same
bzImage, thereby allowing a single kernel image to work in any boot
environment.
The EFI boot stub supports multiple initrds, but they must exist on
the same partition as the bzImage. Command-line arguments for the
kernel can be appended after the bzImage name when run from the EFI
shell, e.g.
Shell> bzImage console=ttyS0 root=/dev/sdb initrd=initrd.img
v7:
- Fix checkpatch warnings.
v6:
- Try to allocate initrd memory just below hdr->inird_addr_max.
v5:
- load_options_size is UTF-16, which needs dividing by 2 to convert
to the corresponding ASCII size.
v4:
- Don't read more than image->load_options_size
v3:
- Fix following warnings when compiling CONFIG_EFI_STUB=n
arch/x86/boot/tools/build.c: In function ‘main’:
arch/x86/boot/tools/build.c:138:24: warning: unused variable ‘pe_header’
arch/x86/boot/tools/build.c:138:15: warning: unused variable ‘file_sz’
- As reported by Matthew Garrett, some Apple machines have GOPs that
don't have hardware attached. We need to weed these out by
searching for ones that handle the PCIIO protocol.
- Don't allocate memory if no initrds are on cmdline
- Don't trust image->load_options_size
Maarten Lankhorst noted:
- Don't strip first argument when booted from efibootmgr
- Don't allocate too much memory for cmdline
- Don't update cmdline_size, the kernel considers it read-only
- Don't accept '\n' for initrd names
v2:
- File alignment was too large, was 8192 should be 512. Reported by
Maarten Lankhorst on LKML.
- Added UGA support for graphics
- Use VIDEO_TYPE_EFI instead of hard-coded number.
- Move linelength assignment until after we've assigned depth
- Dynamically fill out AddressOfEntryPoint in tools/build.c
- Don't use magic number for GDT/TSS stuff. Requested by Andi Kleen
- The bzImage may need to be relocated as it may have been loaded at
a high address address by the firmware. This was required to get my
macbook booting because the firmware loaded it at 0x7cxxxxxx, which
triggers this error in decompress_kernel(),
if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))
error("Destination address too large");
Cc: Mike Waychison <mikew@google.com>
Cc: Matthew Garrett <mjg@redhat.com>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1321383097.2657.9.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-12-13 01:27:52 +04:00
|
|
|
#endif /* CONFIG_EFI_STUB */
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
# Kernel attributes; used by setup. This is part 1 of the
|
|
|
|
# header, from the old boot sector.
|
|
|
|
|
|
|
|
.section ".header", "a"
|
2013-01-27 22:43:28 +04:00
|
|
|
.globl sentinel
|
|
|
|
sentinel: .byte 0xff, 0xff /* Used to detect broken loaders */
|
|
|
|
|
2007-07-11 23:18:54 +04:00
|
|
|
.globl hdr
|
|
|
|
hdr:
|
2009-03-11 20:55:33 +03:00
|
|
|
setup_sects: .byte 0 /* Filled in by build.c */
|
2007-07-11 23:18:54 +04:00
|
|
|
root_flags: .word ROOT_RDONLY
|
2009-03-11 20:55:33 +03:00
|
|
|
syssize: .long 0 /* Filled in by build.c */
|
|
|
|
ram_size: .word 0 /* Obsolete */
|
2007-07-11 23:18:54 +04:00
|
|
|
vid_mode: .word SVGA_MODE
|
2009-03-11 20:55:33 +03:00
|
|
|
root_dev: .word 0 /* Filled in by build.c */
|
2007-07-11 23:18:54 +04:00
|
|
|
boot_flag: .word 0xAA55
|
|
|
|
|
|
|
|
# offset 512, entry point
|
|
|
|
|
|
|
|
.globl _start
|
|
|
|
_start:
|
|
|
|
# Explicitly enter this as bytes, or the assembler
|
|
|
|
# tries to generate a 3-byte jump here, which causes
|
|
|
|
# everything else to push off to the wrong offset.
|
|
|
|
.byte 0xeb # short (2-byte) jump
|
|
|
|
.byte start_of_setup-1f
|
|
|
|
1:
|
|
|
|
|
|
|
|
# Part 2 of the header, from the old setup.S
|
|
|
|
|
|
|
|
.ascii "HdrS" # header signature
|
2019-11-12 16:46:40 +03:00
|
|
|
.word 0x020f # header version number (>= 0x0105)
|
2007-07-11 23:18:54 +04:00
|
|
|
# or else old loadlin-1.5 will fail)
|
|
|
|
.globl realmode_swtch
|
|
|
|
realmode_swtch: .word 0, 0 # default_switch, SETUPSEG
|
2009-03-11 20:55:33 +03:00
|
|
|
start_sys_seg: .word SYSSEG # obsolete and meaningless, but just
|
|
|
|
# in case something decided to "use" it
|
2007-07-11 23:18:54 +04:00
|
|
|
.word kernel_version-512 # pointing to kernel version string
|
|
|
|
# above section of header is compatible
|
|
|
|
# with loadlin-1.5 (header v1.5). Don't
|
|
|
|
# change it.
|
|
|
|
|
2009-03-11 20:55:33 +03:00
|
|
|
type_of_loader: .byte 0 # 0 means ancient bootloader, newer
|
|
|
|
# bootloaders know to change this.
|
2019-06-07 21:54:32 +03:00
|
|
|
# See Documentation/x86/boot.rst for
|
2007-07-11 23:18:54 +04:00
|
|
|
# assigned ids
|
|
|
|
|
|
|
|
# flags, unused bits must be zero (RFU) bit within loadflags
|
|
|
|
loadflags:
|
2013-01-27 22:43:28 +04:00
|
|
|
.byte LOADED_HIGH # The kernel is to be loaded high
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
setup_move_size: .word 0x8000 # size to move, when setup is not
|
|
|
|
# loaded at 0x90000. We will move setup
|
|
|
|
# to 0x90000 then just before jumping
|
|
|
|
# into the kernel. However, only the
|
|
|
|
# loader knows how much data behind
|
|
|
|
# us also needs to be loaded.
|
|
|
|
|
|
|
|
code32_start: # here loaders can put a different
|
|
|
|
# start address for 32-bit code.
|
|
|
|
.long 0x100000 # 0x100000 = default for big kernel
|
|
|
|
|
|
|
|
ramdisk_image: .long 0 # address of loaded ramdisk image
|
|
|
|
# Here the loader puts the 32-bit
|
|
|
|
# address where it loaded the image.
|
|
|
|
# This only will be read by the kernel.
|
|
|
|
|
|
|
|
ramdisk_size: .long 0 # its size in bytes
|
|
|
|
|
|
|
|
bootsect_kludge:
|
|
|
|
.long 0 # obsolete
|
|
|
|
|
2007-10-26 03:11:33 +04:00
|
|
|
heap_end_ptr: .word _end+STACK_SIZE-512
|
|
|
|
# (Header version 0x0201 or later)
|
2007-07-11 23:18:54 +04:00
|
|
|
# space from here (exclusive) down to
|
|
|
|
# end of setup code can be used by setup
|
|
|
|
# for local heap purposes.
|
|
|
|
|
2009-05-08 03:54:11 +04:00
|
|
|
ext_loader_ver:
|
|
|
|
.byte 0 # Extended boot loader version
|
|
|
|
ext_loader_type:
|
|
|
|
.byte 0 # Extended boot loader type
|
|
|
|
|
2007-07-11 23:18:54 +04:00
|
|
|
cmd_line_ptr: .long 0 # (Header version 0x0202 or later)
|
|
|
|
# If nonzero, a 32-bit pointer
|
|
|
|
# to the kernel command line.
|
|
|
|
# The command line should be
|
|
|
|
# located between the start of
|
|
|
|
# setup and the end of low
|
|
|
|
# memory (0xa0000), or it may
|
|
|
|
# get overwritten before it
|
|
|
|
# gets read. If this field is
|
|
|
|
# used, there is no longer
|
|
|
|
# anything magical about the
|
|
|
|
# 0x90000 segment; the setup
|
|
|
|
# can be located anywhere in
|
|
|
|
# low memory 0x10000 or higher.
|
|
|
|
|
2014-03-12 18:13:02 +04:00
|
|
|
initrd_addr_max: .long 0x7fffffff
|
2007-07-11 23:18:54 +04:00
|
|
|
# (Header version 0x0203 or later)
|
|
|
|
# The highest safe address for
|
|
|
|
# the contents of an initrd
|
2008-01-30 15:32:51 +03:00
|
|
|
# The current kernel allows up to 4 GB,
|
|
|
|
# but leave it at 2 GB to avoid
|
|
|
|
# possible bootloader bugs.
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
kernel_alignment: .long CONFIG_PHYSICAL_ALIGN #physical addr alignment
|
|
|
|
#required for protected mode
|
|
|
|
#kernel
|
|
|
|
#ifdef CONFIG_RELOCATABLE
|
|
|
|
relocatable_kernel: .byte 1
|
|
|
|
#else
|
|
|
|
relocatable_kernel: .byte 0
|
|
|
|
#endif
|
2009-05-12 02:56:08 +04:00
|
|
|
min_alignment: .byte MIN_KERNEL_ALIGN_LG2 # minimum alignment
|
2013-01-27 22:43:28 +04:00
|
|
|
|
|
|
|
xloadflags:
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
# define XLF0 XLF_KERNEL_64 /* 64-bit kernel */
|
|
|
|
#else
|
|
|
|
# define XLF0 0
|
|
|
|
#endif
|
2013-01-29 08:16:44 +04:00
|
|
|
|
2014-06-07 15:26:20 +04:00
|
|
|
#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_X86_64)
|
2013-01-29 08:16:44 +04:00
|
|
|
/* kernel/boot_param/ramdisk could be loaded above 4g */
|
|
|
|
# define XLF1 XLF_CAN_BE_LOADED_ABOVE_4G
|
|
|
|
#else
|
|
|
|
# define XLF1 0
|
|
|
|
#endif
|
|
|
|
|
2013-01-27 22:43:28 +04:00
|
|
|
#ifdef CONFIG_EFI_STUB
|
2014-01-10 22:52:06 +04:00
|
|
|
# ifdef CONFIG_EFI_MIXED
|
|
|
|
# define XLF23 (XLF_EFI_HANDOVER_32|XLF_EFI_HANDOVER_64)
|
2013-01-27 22:43:28 +04:00
|
|
|
# else
|
2014-01-10 22:52:06 +04:00
|
|
|
# ifdef CONFIG_X86_64
|
|
|
|
# define XLF23 XLF_EFI_HANDOVER_64 /* 64-bit EFI handover ok */
|
|
|
|
# else
|
|
|
|
# define XLF23 XLF_EFI_HANDOVER_32 /* 32-bit EFI handover ok */
|
|
|
|
# endif
|
2013-01-27 22:43:28 +04:00
|
|
|
# endif
|
|
|
|
#else
|
|
|
|
# define XLF23 0
|
|
|
|
#endif
|
2013-12-20 14:02:20 +04:00
|
|
|
|
2015-09-10 01:38:55 +03:00
|
|
|
#if defined(CONFIG_X86_64) && defined(CONFIG_EFI) && defined(CONFIG_KEXEC_CORE)
|
2013-12-20 14:02:20 +04:00
|
|
|
# define XLF4 XLF_EFI_KEXEC
|
|
|
|
#else
|
|
|
|
# define XLF4 0
|
|
|
|
#endif
|
|
|
|
|
2019-05-24 10:38:08 +03:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
#ifdef CONFIG_X86_5LEVEL
|
|
|
|
#define XLF56 (XLF_5LEVEL|XLF_5LEVEL_ENABLED)
|
|
|
|
#else
|
|
|
|
#define XLF56 XLF_5LEVEL
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
#define XLF56 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
.word XLF0 | XLF1 | XLF23 | XLF4 | XLF56
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
cmdline_size: .long COMMAND_LINE_SIZE-1 #length of the command line,
|
|
|
|
#added with boot protocol
|
|
|
|
#version 2.06
|
|
|
|
|
2007-10-22 03:41:35 +04:00
|
|
|
hardware_subarch: .long 0 # subarchitecture, added with 2.07
|
|
|
|
# default to 0 for normal x86 PC
|
|
|
|
|
|
|
|
hardware_subarch_data: .quad 0
|
|
|
|
|
2009-05-12 01:21:12 +04:00
|
|
|
payload_offset: .long ZO_input_data
|
|
|
|
payload_length: .long ZO_z_input_len
|
2008-02-13 23:54:58 +03:00
|
|
|
|
2008-03-28 05:49:44 +03:00
|
|
|
setup_data: .quad 0 # 64-bit physical pointer to
|
|
|
|
# single linked list of
|
|
|
|
# struct setup_data
|
|
|
|
|
2009-05-12 02:56:08 +04:00
|
|
|
pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
|
|
|
|
|
x86/KASLR: Update description for decompressor worst case size
The comment that describes the analysis for the size of the decompressor
code only took gzip into account (there are currently 6 other decompressors
that could be used). The actual z_extract_offset calculation in code was
already handling the correct maximum size, but this documentation hadn't
been updated. This updates the documentation, fixes several typos, moves
the comment to header.S, updates references, and adds a note at the end
of the decompressor include list to remind us about updating the comment
in the future.
(Instead of moving the comment to mkpiggy.c, where the calculation
is currently happening, it is being moved to header.S because
the calculations in mkpiggy.c will be removed in favor of header.S
calculations in a following patch, and it seemed like overkill to move
the giant comment twice, especially when there's already reference to
z_extract_offset in header.S.)
Signed-off-by: Baoquan He <bhe@redhat.com>
[ Rewrote changelog, cleaned up comment style, moved comments around. ]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: H.J. Lu <hjl.tools@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1461185746-8017-2-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-20 23:55:42 +03:00
|
|
|
#
|
|
|
|
# Getting to provably safe in-place decompression is hard. Worst case
|
|
|
|
# behaviours need to be analyzed. Here let's take the decompression of
|
|
|
|
# a gzip-compressed kernel as example, to illustrate it:
|
|
|
|
#
|
|
|
|
# The file layout of gzip compressed kernel is:
|
|
|
|
#
|
|
|
|
# magic[2]
|
|
|
|
# method[1]
|
|
|
|
# flags[1]
|
|
|
|
# timestamp[4]
|
|
|
|
# extraflags[1]
|
|
|
|
# os[1]
|
|
|
|
# compressed data blocks[N]
|
|
|
|
# crc[4] orig_len[4]
|
|
|
|
#
|
|
|
|
# ... resulting in +18 bytes overhead of uncompressed data.
|
|
|
|
#
|
|
|
|
# (For more information, please refer to RFC 1951 and RFC 1952.)
|
|
|
|
#
|
|
|
|
# Files divided into blocks
|
|
|
|
# 1 bit (last block flag)
|
|
|
|
# 2 bits (block type)
|
|
|
|
#
|
|
|
|
# 1 block occurs every 32K -1 bytes or when there 50% compression
|
|
|
|
# has been achieved. The smallest block type encoding is always used.
|
|
|
|
#
|
|
|
|
# stored:
|
|
|
|
# 32 bits length in bytes.
|
|
|
|
#
|
|
|
|
# fixed:
|
|
|
|
# magic fixed tree.
|
|
|
|
# symbols.
|
|
|
|
#
|
|
|
|
# dynamic:
|
|
|
|
# dynamic tree encoding.
|
|
|
|
# symbols.
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# The buffer for decompression in place is the length of the uncompressed
|
|
|
|
# data, plus a small amount extra to keep the algorithm safe. The
|
|
|
|
# compressed data is placed at the end of the buffer. The output pointer
|
|
|
|
# is placed at the start of the buffer and the input pointer is placed
|
|
|
|
# where the compressed data starts. Problems will occur when the output
|
|
|
|
# pointer overruns the input pointer.
|
|
|
|
#
|
|
|
|
# The output pointer can only overrun the input pointer if the input
|
|
|
|
# pointer is moving faster than the output pointer. A condition only
|
|
|
|
# triggered by data whose compressed form is larger than the uncompressed
|
|
|
|
# form.
|
|
|
|
#
|
|
|
|
# The worst case at the block level is a growth of the compressed data
|
|
|
|
# of 5 bytes per 32767 bytes.
|
|
|
|
#
|
|
|
|
# The worst case internal to a compressed block is very hard to figure.
|
|
|
|
# The worst case can at least be bounded by having one bit that represents
|
|
|
|
# 32764 bytes and then all of the rest of the bytes representing the very
|
|
|
|
# very last byte.
|
|
|
|
#
|
|
|
|
# All of which is enough to compute an amount of extra data that is required
|
|
|
|
# to be safe. To avoid problems at the block level allocating 5 extra bytes
|
|
|
|
# per 32767 bytes of data is sufficient. To avoid problems internal to a
|
|
|
|
# block adding an extra 32767 bytes (the worst case uncompressed block size)
|
|
|
|
# is sufficient, to ensure that in the worst case the decompressed data for
|
|
|
|
# block will stop the byte before the compressed data for a block begins.
|
|
|
|
# To avoid problems with the compressed data's meta information an extra 18
|
|
|
|
# bytes are needed. Leading to the formula:
|
|
|
|
#
|
x86/boot: Calculate decompression size during boot not build
Currently z_extract_offset is calculated in boot/compressed/mkpiggy.c.
This doesn't work well because mkpiggy.c doesn't know the details of the
decompressor in use. As a result, it can only make an estimation, which
has risks:
- output + output_len (VO) could be much bigger than input + input_len
(ZO). In this case, the decompressed kernel plus relocs could overwrite
the decompression code while it is running.
- The head code of ZO could be bigger than z_extract_offset. In this case
an overwrite could happen when the head code is running to move ZO to
the end of buffer. Though currently the size of the head code is very
small it's still a potential risk. Since there is no rule to limit the
size of the head code of ZO, it runs the risk of suddenly becoming a
(hard to find) bug.
Instead, this moves the z_extract_offset calculation into header.S, and
makes adjustments to be sure that the above two cases can never happen,
and further corrects the comments describing the calculations.
Since we have (in the previous patch) made ZO always be located against
the end of decompression buffer, z_extract_offset is only used here to
calculate an appropriate buffer size (INIT_SIZE), and is not longer used
elsewhere. As such, it can be removed from voffset.h.
Additionally clean up #if/#else #define to improve readability.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Baoquan He <bhe@redhat.com>
[ Rewrote the changelog and comments. ]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: lasse.collin@tukaani.org
Link: http://lkml.kernel.org/r/1461888548-32439-4-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-29 03:09:05 +03:00
|
|
|
# extra_bytes = (uncompressed_size >> 12) + 32768 + 18
|
x86/KASLR: Update description for decompressor worst case size
The comment that describes the analysis for the size of the decompressor
code only took gzip into account (there are currently 6 other decompressors
that could be used). The actual z_extract_offset calculation in code was
already handling the correct maximum size, but this documentation hadn't
been updated. This updates the documentation, fixes several typos, moves
the comment to header.S, updates references, and adds a note at the end
of the decompressor include list to remind us about updating the comment
in the future.
(Instead of moving the comment to mkpiggy.c, where the calculation
is currently happening, it is being moved to header.S because
the calculations in mkpiggy.c will be removed in favor of header.S
calculations in a following patch, and it seemed like overkill to move
the giant comment twice, especially when there's already reference to
z_extract_offset in header.S.)
Signed-off-by: Baoquan He <bhe@redhat.com>
[ Rewrote changelog, cleaned up comment style, moved comments around. ]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: H.J. Lu <hjl.tools@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1461185746-8017-2-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-20 23:55:42 +03:00
|
|
|
#
|
|
|
|
# Adding 8 bytes per 32K is a bit excessive but much easier to calculate.
|
|
|
|
# Adding 32768 instead of 32767 just makes for round numbers.
|
|
|
|
#
|
|
|
|
# Above analysis is for decompressing gzip compressed kernel only. Up to
|
|
|
|
# now 6 different decompressor are supported all together. And among them
|
|
|
|
# xz stores data in chunks and has maximum chunk of 64K. Hence safety
|
|
|
|
# margin should be updated to cover all decompressors so that we don't
|
|
|
|
# need to deal with each of them separately. Please check
|
|
|
|
# the description in lib/decompressor_xxx.c for specific information.
|
|
|
|
#
|
|
|
|
# extra_bytes = (uncompressed_size >> 12) + 65536 + 128
|
2017-08-27 16:55:24 +03:00
|
|
|
#
|
|
|
|
# LZ4 is even worse: data that cannot be further compressed grows by 0.4%,
|
|
|
|
# or one byte per 256 bytes. OTOH, we can safely get rid of the +128 as
|
|
|
|
# the size-dependent part now grows so fast.
|
|
|
|
#
|
|
|
|
# extra_bytes = (uncompressed_size >> 8) + 65536
|
x86/KASLR: Update description for decompressor worst case size
The comment that describes the analysis for the size of the decompressor
code only took gzip into account (there are currently 6 other decompressors
that could be used). The actual z_extract_offset calculation in code was
already handling the correct maximum size, but this documentation hadn't
been updated. This updates the documentation, fixes several typos, moves
the comment to header.S, updates references, and adds a note at the end
of the decompressor include list to remind us about updating the comment
in the future.
(Instead of moving the comment to mkpiggy.c, where the calculation
is currently happening, it is being moved to header.S because
the calculations in mkpiggy.c will be removed in favor of header.S
calculations in a following patch, and it seemed like overkill to move
the giant comment twice, especially when there's already reference to
z_extract_offset in header.S.)
Signed-off-by: Baoquan He <bhe@redhat.com>
[ Rewrote changelog, cleaned up comment style, moved comments around. ]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: H.J. Lu <hjl.tools@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1461185746-8017-2-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-20 23:55:42 +03:00
|
|
|
|
2017-08-27 16:55:24 +03:00
|
|
|
#define ZO_z_extra_bytes ((ZO_z_output_len >> 8) + 65536)
|
x86/boot: Calculate decompression size during boot not build
Currently z_extract_offset is calculated in boot/compressed/mkpiggy.c.
This doesn't work well because mkpiggy.c doesn't know the details of the
decompressor in use. As a result, it can only make an estimation, which
has risks:
- output + output_len (VO) could be much bigger than input + input_len
(ZO). In this case, the decompressed kernel plus relocs could overwrite
the decompression code while it is running.
- The head code of ZO could be bigger than z_extract_offset. In this case
an overwrite could happen when the head code is running to move ZO to
the end of buffer. Though currently the size of the head code is very
small it's still a potential risk. Since there is no rule to limit the
size of the head code of ZO, it runs the risk of suddenly becoming a
(hard to find) bug.
Instead, this moves the z_extract_offset calculation into header.S, and
makes adjustments to be sure that the above two cases can never happen,
and further corrects the comments describing the calculations.
Since we have (in the previous patch) made ZO always be located against
the end of decompression buffer, z_extract_offset is only used here to
calculate an appropriate buffer size (INIT_SIZE), and is not longer used
elsewhere. As such, it can be removed from voffset.h.
Additionally clean up #if/#else #define to improve readability.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Baoquan He <bhe@redhat.com>
[ Rewrote the changelog and comments. ]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: lasse.collin@tukaani.org
Link: http://lkml.kernel.org/r/1461888548-32439-4-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-29 03:09:05 +03:00
|
|
|
#if ZO_z_output_len > ZO_z_input_len
|
|
|
|
# define ZO_z_extract_offset (ZO_z_output_len + ZO_z_extra_bytes - \
|
|
|
|
ZO_z_input_len)
|
|
|
|
#else
|
|
|
|
# define ZO_z_extract_offset ZO_z_extra_bytes
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The extract_offset has to be bigger than ZO head section. Otherwise when
|
|
|
|
* the head code is running to move ZO to the end of the buffer, it will
|
|
|
|
* overwrite the head code itself.
|
|
|
|
*/
|
|
|
|
#if (ZO__ehead - ZO_startup_32) > ZO_z_extract_offset
|
|
|
|
# define ZO_z_min_extract_offset ((ZO__ehead - ZO_startup_32 + 4095) & ~4095)
|
|
|
|
#else
|
|
|
|
# define ZO_z_min_extract_offset ((ZO_z_extract_offset + 4095) & ~4095)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_min_extract_offset)
|
|
|
|
|
2009-05-12 02:56:08 +04:00
|
|
|
#define VO_INIT_SIZE (VO__end - VO__text)
|
|
|
|
#if ZO_INIT_SIZE > VO_INIT_SIZE
|
x86/boot: Calculate decompression size during boot not build
Currently z_extract_offset is calculated in boot/compressed/mkpiggy.c.
This doesn't work well because mkpiggy.c doesn't know the details of the
decompressor in use. As a result, it can only make an estimation, which
has risks:
- output + output_len (VO) could be much bigger than input + input_len
(ZO). In this case, the decompressed kernel plus relocs could overwrite
the decompression code while it is running.
- The head code of ZO could be bigger than z_extract_offset. In this case
an overwrite could happen when the head code is running to move ZO to
the end of buffer. Though currently the size of the head code is very
small it's still a potential risk. Since there is no rule to limit the
size of the head code of ZO, it runs the risk of suddenly becoming a
(hard to find) bug.
Instead, this moves the z_extract_offset calculation into header.S, and
makes adjustments to be sure that the above two cases can never happen,
and further corrects the comments describing the calculations.
Since we have (in the previous patch) made ZO always be located against
the end of decompression buffer, z_extract_offset is only used here to
calculate an appropriate buffer size (INIT_SIZE), and is not longer used
elsewhere. As such, it can be removed from voffset.h.
Additionally clean up #if/#else #define to improve readability.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Baoquan He <bhe@redhat.com>
[ Rewrote the changelog and comments. ]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: lasse.collin@tukaani.org
Link: http://lkml.kernel.org/r/1461888548-32439-4-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-29 03:09:05 +03:00
|
|
|
# define INIT_SIZE ZO_INIT_SIZE
|
2009-05-12 02:56:08 +04:00
|
|
|
#else
|
x86/boot: Calculate decompression size during boot not build
Currently z_extract_offset is calculated in boot/compressed/mkpiggy.c.
This doesn't work well because mkpiggy.c doesn't know the details of the
decompressor in use. As a result, it can only make an estimation, which
has risks:
- output + output_len (VO) could be much bigger than input + input_len
(ZO). In this case, the decompressed kernel plus relocs could overwrite
the decompression code while it is running.
- The head code of ZO could be bigger than z_extract_offset. In this case
an overwrite could happen when the head code is running to move ZO to
the end of buffer. Though currently the size of the head code is very
small it's still a potential risk. Since there is no rule to limit the
size of the head code of ZO, it runs the risk of suddenly becoming a
(hard to find) bug.
Instead, this moves the z_extract_offset calculation into header.S, and
makes adjustments to be sure that the above two cases can never happen,
and further corrects the comments describing the calculations.
Since we have (in the previous patch) made ZO always be located against
the end of decompression buffer, z_extract_offset is only used here to
calculate an appropriate buffer size (INIT_SIZE), and is not longer used
elsewhere. As such, it can be removed from voffset.h.
Additionally clean up #if/#else #define to improve readability.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Baoquan He <bhe@redhat.com>
[ Rewrote the changelog and comments. ]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: lasse.collin@tukaani.org
Link: http://lkml.kernel.org/r/1461888548-32439-4-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-29 03:09:05 +03:00
|
|
|
# define INIT_SIZE VO_INIT_SIZE
|
2009-05-12 02:56:08 +04:00
|
|
|
#endif
|
x86/boot: Calculate decompression size during boot not build
Currently z_extract_offset is calculated in boot/compressed/mkpiggy.c.
This doesn't work well because mkpiggy.c doesn't know the details of the
decompressor in use. As a result, it can only make an estimation, which
has risks:
- output + output_len (VO) could be much bigger than input + input_len
(ZO). In this case, the decompressed kernel plus relocs could overwrite
the decompression code while it is running.
- The head code of ZO could be bigger than z_extract_offset. In this case
an overwrite could happen when the head code is running to move ZO to
the end of buffer. Though currently the size of the head code is very
small it's still a potential risk. Since there is no rule to limit the
size of the head code of ZO, it runs the risk of suddenly becoming a
(hard to find) bug.
Instead, this moves the z_extract_offset calculation into header.S, and
makes adjustments to be sure that the above two cases can never happen,
and further corrects the comments describing the calculations.
Since we have (in the previous patch) made ZO always be located against
the end of decompression buffer, z_extract_offset is only used here to
calculate an appropriate buffer size (INIT_SIZE), and is not longer used
elsewhere. As such, it can be removed from voffset.h.
Additionally clean up #if/#else #define to improve readability.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Baoquan He <bhe@redhat.com>
[ Rewrote the changelog and comments. ]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: lasse.collin@tukaani.org
Link: http://lkml.kernel.org/r/1461888548-32439-4-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-29 03:09:05 +03:00
|
|
|
|
2009-05-12 02:56:08 +04:00
|
|
|
init_size: .long INIT_SIZE # kernel initialization size
|
2013-08-01 16:33:26 +04:00
|
|
|
handover_offset: .long 0 # Filled in by build.c
|
x86/boot: Introduce kernel_info
The relationships between the headers are analogous to the various data
sections:
setup_header = .data
boot_params/setup_data = .bss
What is missing from the above list? That's right:
kernel_info = .rodata
We have been (ab)using .data for things that could go into .rodata or .bss for
a long time, for lack of alternatives and -- especially early on -- inertia.
Also, the BIOS stub is responsible for creating boot_params, so it isn't
available to a BIOS-based loader (setup_data is, though).
setup_header is permanently limited to 144 bytes due to the reach of the
2-byte jump field, which doubles as a length field for the structure, combined
with the size of the "hole" in struct boot_params that a protected-mode loader
or the BIOS stub has to copy it into. It is currently 119 bytes long, which
leaves us with 25 very precious bytes. This isn't something that can be fixed
without revising the boot protocol entirely, breaking backwards compatibility.
boot_params proper is limited to 4096 bytes, but can be arbitrarily extended
by adding setup_data entries. It cannot be used to communicate properties of
the kernel image, because it is .bss and has no image-provided content.
kernel_info solves this by providing an extensible place for information about
the kernel image. It is readonly, because the kernel cannot rely on a
bootloader copying its contents anywhere, but that is OK; if it becomes
necessary it can still contain data items that an enabled bootloader would be
expected to copy into a setup_data chunk.
Do not bump setup_header version in arch/x86/boot/header.S because it
will be followed by additional changes coming into the Linux/x86 boot
protocol.
Suggested-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
Reviewed-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: ard.biesheuvel@linaro.org
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: dave.hansen@linux.intel.com
Cc: eric.snowberg@oracle.com
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Juergen Gross <jgross@suse.com>
Cc: kanth.ghatraju@oracle.com
Cc: linux-doc@vger.kernel.org
Cc: linux-efi <linux-efi@vger.kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: rdunlap@infradead.org
Cc: ross.philipson@oracle.com
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Cc: xen-devel@lists.xenproject.org
Link: https://lkml.kernel.org/r/20191112134640.16035-2-daniel.kiper@oracle.com
2019-11-12 16:46:38 +03:00
|
|
|
kernel_info_offset: .long 0 # Filled in by build.c
|
2009-05-12 02:56:08 +04:00
|
|
|
|
2007-07-11 23:18:54 +04:00
|
|
|
# End of setup header #####################################################
|
|
|
|
|
2009-04-02 05:08:28 +04:00
|
|
|
.section ".entrytext", "ax"
|
2007-07-11 23:18:54 +04:00
|
|
|
start_of_setup:
|
|
|
|
# Force %es = %ds
|
|
|
|
movw %ds, %ax
|
|
|
|
movw %ax, %es
|
|
|
|
cld
|
|
|
|
|
2007-11-27 14:35:13 +03:00
|
|
|
# Apparently some ancient versions of LILO invoked the kernel with %ss != %ds,
|
|
|
|
# which happened to work by accident for the old code. Recalculate the stack
|
|
|
|
# pointer if %ss is invalid. Otherwise leave it alone, LOADLIN sets up the
|
|
|
|
# stack behind its own code, so we can't blindly put it directly past the heap.
|
2007-10-26 03:11:33 +04:00
|
|
|
|
|
|
|
movw %ss, %dx
|
|
|
|
cmpw %ax, %dx # %ds == %ss?
|
|
|
|
movw %sp, %dx
|
2007-11-27 14:35:13 +03:00
|
|
|
je 2f # -> assume %sp is reasonably set
|
|
|
|
|
|
|
|
# Invalid %ss, make up a new stack
|
|
|
|
movw $_end, %dx
|
|
|
|
testb $CAN_USE_HEAP, loadflags
|
|
|
|
jz 1f
|
|
|
|
movw heap_end_ptr, %dx
|
|
|
|
1: addw $STACK_SIZE, %dx
|
|
|
|
jnc 2f
|
|
|
|
xorw %dx, %dx # Prevent wraparound
|
2007-10-26 03:11:33 +04:00
|
|
|
|
2007-11-27 14:35:13 +03:00
|
|
|
2: # Now %dx should point to the end of our stack space
|
2007-10-26 03:11:33 +04:00
|
|
|
andw $~3, %dx # dword align (might as well...)
|
|
|
|
jnz 3f
|
|
|
|
movw $0xfffc, %dx # Make sure we're not zero
|
2007-11-27 14:35:13 +03:00
|
|
|
3: movw %ax, %ss
|
2007-10-26 03:11:33 +04:00
|
|
|
movzwl %dx, %esp # Clear upper half of %esp
|
|
|
|
sti # Now we should have a working stack
|
|
|
|
|
|
|
|
# We will have entered with %cs = %ds+0x20, normalize %cs so
|
|
|
|
# it is on par with the other segments.
|
|
|
|
pushw %ds
|
|
|
|
pushw $6f
|
|
|
|
lretw
|
|
|
|
6:
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
# Check signature at end of setup
|
|
|
|
cmpl $0x5a5aaa55, setup_sig
|
|
|
|
jne setup_bad
|
|
|
|
|
|
|
|
# Zero the bss
|
|
|
|
movw $__bss_start, %di
|
|
|
|
movw $_end+3, %cx
|
|
|
|
xorl %eax, %eax
|
|
|
|
subw %di, %cx
|
|
|
|
shrw $2, %cx
|
|
|
|
rep; stosl
|
|
|
|
|
|
|
|
# Jump to C code (should not return)
|
|
|
|
calll main
|
|
|
|
|
|
|
|
# Setup corrupt somehow...
|
|
|
|
setup_bad:
|
|
|
|
movl $setup_corrupt, %eax
|
|
|
|
calll puts
|
|
|
|
# Fall through...
|
|
|
|
|
|
|
|
.globl die
|
|
|
|
.type die, @function
|
|
|
|
die:
|
|
|
|
hlt
|
|
|
|
jmp die
|
|
|
|
|
2007-09-11 01:39:02 +04:00
|
|
|
.size die, .-die
|
2007-07-11 23:18:54 +04:00
|
|
|
|
|
|
|
.section ".initdata", "a"
|
|
|
|
setup_corrupt:
|
|
|
|
.byte 7
|
2007-07-27 03:10:22 +04:00
|
|
|
.string "No setup signature found...\n"
|