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 22:07:57 +08:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* linux/boot/head.S
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1991, 1992, 1993 Linus Torvalds
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* head.S contains the 32-bit startup code.
|
|
|
|
|
*
|
|
|
|
|
* NOTE!!! Startup happens at absolute address 0x00001000, which is also where
|
|
|
|
|
* the page directory will exist. The startup code will be overwritten by
|
|
|
|
|
* the page directory. [According to comments etc elsewhere on a compressed
|
|
|
|
|
* kernel it will end up at 0x1000 + 1Mb I hope so as I assume this. - AC]
|
|
|
|
|
*
|
2009-05-09 06:45:17 +08:00
|
|
|
* Page 0 is deliberately kept safe, since System Management Mode code in
|
2005-04-17 06:20:36 +08:00
|
|
|
* laptops may need to access the BIOS data stored there. This is also
|
2009-05-09 06:45:17 +08:00
|
|
|
* useful for future device drivers that either access the BIOS via VM86
|
2005-04-17 06:20:36 +08:00
|
|
|
* mode.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
|
|
|
|
|
*/
|
2009-05-09 06:45:17 +08:00
|
|
|
.text
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-09-17 04:44:27 +08:00
|
|
|
#include <linux/init.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/linkage.h>
|
|
|
|
|
#include <asm/segment.h>
|
2009-02-14 03:14:01 +08:00
|
|
|
#include <asm/page_types.h>
|
2006-12-07 09:14:04 +08:00
|
|
|
#include <asm/boot.h>
|
2007-10-22 07:41:35 +08:00
|
|
|
#include <asm/asm-offsets.h>
|
2015-02-19 15:34:58 +08:00
|
|
|
#include <asm/bootparam.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
x86/build: Build compressed x86 kernels as PIE
The 32-bit x86 assembler in binutils 2.26 will generate R_386_GOT32X
relocation to get the symbol address in PIC. When the compressed x86
kernel isn't built as PIC, the linker optimizes R_386_GOT32X relocations
to their fixed symbol addresses. However, when the compressed x86
kernel is loaded at a different address, it leads to the following
load failure:
Failed to allocate space for phdrs
during the decompression stage.
If the compressed x86 kernel is relocatable at run-time, it should be
compiled with -fPIE, instead of -fPIC, if possible and should be built as
Position Independent Executable (PIE) so that linker won't optimize
R_386_GOT32X relocation to its fixed symbol address.
Older linkers generate R_386_32 relocations against locally defined
symbols, _bss, _ebss, _got and _egot, in PIE. It isn't wrong, just less
optimal than R_386_RELATIVE. But the x86 kernel fails to properly handle
R_386_32 relocations when relocating the kernel. To generate
R_386_RELATIVE relocations, we mark _bss, _ebss, _got and _egot as
hidden in both 32-bit and 64-bit x86 kernels.
To build a 64-bit compressed x86 kernel as PIE, we need to disable the
relocation overflow check to avoid relocation overflow errors. We do
this with a new linker command-line option, -z noreloc-overflow, which
got added recently:
commit 4c10bbaa0912742322f10d9d5bb630ba4e15dfa7
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Mar 15 11:07:06 2016 -0700
Add -z noreloc-overflow option to x86-64 ld
Add -z noreloc-overflow command-line option to the x86-64 ELF linker to
disable relocation overflow check. This can be used to avoid relocation
overflow check if there will be no dynamic relocation overflow at
run-time.
The 64-bit compressed x86 kernel is built as PIE only if the linker supports
-z noreloc-overflow. So far 64-bit relocatable compressed x86 kernel
boots fine even when it is built as a normal executable.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.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: linux-kernel@vger.kernel.org
[ Edited the changelog and comments. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-03-17 11:04:35 +08:00
|
|
|
/*
|
|
|
|
|
* The 32-bit x86 assembler in binutils 2.26 will generate R_386_GOT32X
|
|
|
|
|
* relocation to get the symbol address in PIC. When the compressed x86
|
|
|
|
|
* kernel isn't built as PIC, the linker optimizes R_386_GOT32X
|
|
|
|
|
* relocations to their fixed symbol addresses. However, when the
|
|
|
|
|
* compressed x86 kernel is loaded at a different address, it leads
|
|
|
|
|
* to the following load failure:
|
|
|
|
|
*
|
|
|
|
|
* Failed to allocate space for phdrs
|
|
|
|
|
*
|
|
|
|
|
* during the decompression stage.
|
|
|
|
|
*
|
|
|
|
|
* If the compressed x86 kernel is relocatable at run-time, it should be
|
|
|
|
|
* compiled with -fPIE, instead of -fPIC, if possible and should be built as
|
|
|
|
|
* Position Independent Executable (PIE) so that linker won't optimize
|
|
|
|
|
* R_386_GOT32X relocation to its fixed symbol address. Older
|
|
|
|
|
* linkers generate R_386_32 relocations against locally defined symbols,
|
|
|
|
|
* _bss, _ebss, _got and _egot, in PIE. It isn't wrong, just less
|
|
|
|
|
* optimal than R_386_RELATIVE. But the x86 kernel fails to properly handle
|
|
|
|
|
* R_386_32 relocations when relocating the kernel. To generate
|
|
|
|
|
* R_386_RELATIVE relocations, we mark _bss, _ebss, _got and _egot as
|
|
|
|
|
* hidden:
|
|
|
|
|
*/
|
|
|
|
|
.hidden _bss
|
|
|
|
|
.hidden _ebss
|
|
|
|
|
.hidden _got
|
|
|
|
|
.hidden _egot
|
|
|
|
|
|
2009-09-17 04:44:27 +08:00
|
|
|
__HEAD
|
2009-02-14 05:50:23 +08:00
|
|
|
ENTRY(startup_32)
|
2007-10-27 01:29:04 +08:00
|
|
|
cld
|
2009-05-09 06:45:17 +08:00
|
|
|
/*
|
|
|
|
|
* Test KEEP_SEGMENTS flag to see if the bootloader is asking
|
|
|
|
|
* us to not reload segments
|
|
|
|
|
*/
|
2015-02-19 15:34:58 +08:00
|
|
|
testb $KEEP_SEGMENTS, BP_loadflags(%esi)
|
2009-05-09 06:45:17 +08:00
|
|
|
jnz 1f
|
2007-10-22 07:41:35 +08:00
|
|
|
|
2007-10-27 01:29:04 +08:00
|
|
|
cli
|
2009-05-09 06:45:17 +08:00
|
|
|
movl $__BOOT_DS, %eax
|
|
|
|
|
movl %eax, %ds
|
|
|
|
|
movl %eax, %es
|
|
|
|
|
movl %eax, %fs
|
|
|
|
|
movl %eax, %gs
|
|
|
|
|
movl %eax, %ss
|
2007-10-27 01:29:04 +08:00
|
|
|
1:
|
2007-10-22 07:41:35 +08:00
|
|
|
|
2009-05-09 06:45:17 +08:00
|
|
|
/*
|
|
|
|
|
* Calculate the delta between where we were compiled to run
|
2006-12-07 09:14:04 +08:00
|
|
|
* at and where we were actually loaded at. This can only be done
|
|
|
|
|
* with a short local call on x86. Nothing else will tell us what
|
|
|
|
|
* address we are running at. The reserved chunk of the real-mode
|
2007-07-12 03:18:33 +08:00
|
|
|
* data at 0x1e4 (defined as a scratch field) are used as the stack
|
|
|
|
|
* for this calculation. Only 4 bytes are needed.
|
2006-12-07 09:14:04 +08:00
|
|
|
*/
|
2009-05-09 06:45:17 +08:00
|
|
|
leal (BP_scratch+4)(%esi), %esp
|
|
|
|
|
call 1f
|
|
|
|
|
1: popl %ebp
|
|
|
|
|
subl $1b, %ebp
|
2006-12-07 09:14:04 +08:00
|
|
|
|
2009-05-09 06:45:17 +08:00
|
|
|
/*
|
|
|
|
|
* %ebp contains the address we are loaded at by the boot loader and %ebx
|
2006-12-07 09:14:04 +08:00
|
|
|
* contains the address where we should move the kernel image temporarily
|
|
|
|
|
* for safe in-place decompression.
|
2006-12-07 09:14:04 +08:00
|
|
|
*/
|
2006-12-07 09:14:04 +08:00
|
|
|
|
2006-12-07 09:14:04 +08:00
|
|
|
#ifdef CONFIG_RELOCATABLE
|
2009-05-09 06:45:17 +08:00
|
|
|
movl %ebp, %ebx
|
2009-05-12 06:56:08 +08:00
|
|
|
movl BP_kernel_alignment(%esi), %eax
|
|
|
|
|
decl %eax
|
|
|
|
|
addl %eax, %ebx
|
|
|
|
|
notl %eax
|
|
|
|
|
andl %eax, %ebx
|
2013-10-11 08:18:14 +08:00
|
|
|
cmpl $LOAD_PHYSICAL_ADDR, %ebx
|
|
|
|
|
jge 1f
|
2006-12-07 09:14:04 +08:00
|
|
|
#endif
|
2013-10-11 08:18:14 +08:00
|
|
|
movl $LOAD_PHYSICAL_ADDR, %ebx
|
|
|
|
|
1:
|
2006-12-07 09:14:04 +08:00
|
|
|
|
2009-05-09 08:42:16 +08:00
|
|
|
/* Target address to relocate to for decompression */
|
x86/boot: Move compressed kernel to the end of the decompression buffer
This change makes later calculations about where the kernel is located
easier to reason about. To better understand this change, we must first
clarify what 'VO' and 'ZO' are. These values were introduced in commits
by hpa:
77d1a4999502 ("x86, boot: make symbols from the main vmlinux available")
37ba7ab5e33c ("x86, boot: make kernel_alignment adjustable; new bzImage fields")
Specifically:
All names prefixed with 'VO_':
- relate to the uncompressed kernel image
- the size of the VO image is: VO__end-VO__text ("VO_INIT_SIZE" define)
All names prefixed with 'ZO_':
- relate to the bootable compressed kernel image (boot/compressed/vmlinux),
which is composed of the following memory areas:
- head text
- compressed kernel (VO image and relocs table)
- decompressor code
- the size of the ZO image is: ZO__end - ZO_startup_32 ("ZO_INIT_SIZE" define, though see below)
The 'INIT_SIZE' value is used to find the larger of the two image sizes:
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
#define VO_INIT_SIZE (VO__end - VO__text)
#if ZO_INIT_SIZE > VO_INIT_SIZE
# define INIT_SIZE ZO_INIT_SIZE
#else
# define INIT_SIZE VO_INIT_SIZE
#endif
The current code uses extract_offset to decide where to position the
copied ZO (i.e. ZO starts at extract_offset). (This is why ZO_INIT_SIZE
currently includes the extract_offset.)
Why does z_extract_offset exist? It's needed because we are trying to minimize
the amount of RAM used for the whole act of creating an uncompressed, executable,
properly relocation-linked kernel image in system memory. We do this so that
kernels can be booted on even very small systems.
To achieve the goal of minimal memory consumption we have implemented an in-place
decompression strategy: instead of cleanly separating the VO and ZO images and
also allocating some memory for the decompression code's runtime needs, we instead
create this elaborate layout of memory buffers where the output (decompressed)
stream, as it progresses, overlaps with and destroys the input (compressed)
stream. This can only be done safely if the ZO image is placed to the end of the
VO range, plus a certain amount of safety distance to make sure that when the last
bytes of the VO range are decompressed, the compressed stream pointer is safely
beyond the end of the VO range.
z_extract_offset is calculated in arch/x86/boot/compressed/mkpiggy.c during
the build process, at a point when we know the exact compressed and
uncompressed size of the kernel images and can calculate this safe minimum
offset value. (Note that the mkpiggy.c calculation is not perfect, because
we don't know the decompressor used at that stage, so the z_extract_offset
calculation is necessarily imprecise and is mostly based on gzip internals -
we'll improve that in the next patch.)
When INIT_SIZE is bigger than VO_INIT_SIZE (uncommon but possible),
the copied ZO occupies the memory from extract_offset to the end of
decompression buffer. It overlaps with the soon-to-be-uncompressed kernel
like this:
|-----compressed kernel image------|
V V
0 extract_offset +INIT_SIZE
|-----------|---------------|-------------------------|--------|
| | | |
VO__text startup_32 of ZO VO__end ZO__end
^ ^
|-------uncompressed kernel image---------|
When INIT_SIZE is equal to VO_INIT_SIZE (likely) there's still space
left from end of ZO to the end of decompressing buffer, like below.
|-compressed kernel image-|
V V
0 extract_offset +INIT_SIZE
|-----------|---------------|-------------------------|--------|
| | | |
VO__text startup_32 of ZO ZO__end VO__end
^ ^
|------------uncompressed kernel image-------------|
To simplify calculations and avoid special cases, it is cleaner to
always place the compressed kernel image in memory so that ZO__end
is at the end of the decompression buffer, instead of placing t at
the start of extract_offset as is currently done.
This patch adds BP_init_size (which is the INIT_SIZE as passed in from
the boot_params) into asm-offsets.c to make it visible to the assembly
code.
Then when moving the ZO, it calculates the starting position of
the copied ZO (via BP_init_size and the ZO run size) so that the VO__end
will be at the end of the decompression buffer. To make the position
calculation safe, the end of ZO is page aligned (and a comment is added
to the existing VO alignment for good measure).
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
[ Rewrote 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: Baoquan He <bhe@redhat.com>
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-3-git-send-email-keescook@chromium.org
[ Rewrote the changelog some more. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-29 08:09:04 +08:00
|
|
|
movl BP_init_size(%esi), %eax
|
|
|
|
|
subl $_end, %eax
|
|
|
|
|
addl %eax, %ebx
|
2006-12-07 09:14:04 +08:00
|
|
|
|
2009-05-09 07:27:41 +08:00
|
|
|
/* Set up the stack */
|
|
|
|
|
leal boot_stack_end(%ebx), %esp
|
|
|
|
|
|
2009-05-07 08:56:51 +08:00
|
|
|
/* Zero EFLAGS */
|
|
|
|
|
pushl $0
|
|
|
|
|
popfl
|
|
|
|
|
|
2009-05-09 06:45:17 +08:00
|
|
|
/*
|
|
|
|
|
* Copy the compressed kernel to the end of our buffer
|
2006-12-07 09:14:04 +08:00
|
|
|
* where decompression in place becomes safe.
|
|
|
|
|
*/
|
2009-05-09 06:45:17 +08:00
|
|
|
pushl %esi
|
2009-05-09 07:45:15 +08:00
|
|
|
leal (_bss-4)(%ebp), %esi
|
|
|
|
|
leal (_bss-4)(%ebx), %edi
|
2009-05-09 07:20:34 +08:00
|
|
|
movl $(_bss - startup_32), %ecx
|
2009-05-09 07:45:15 +08:00
|
|
|
shrl $2, %ecx
|
2006-12-07 09:14:04 +08:00
|
|
|
std
|
2009-05-09 07:45:15 +08:00
|
|
|
rep movsl
|
2006-12-07 09:14:04 +08:00
|
|
|
cld
|
2009-05-09 06:45:17 +08:00
|
|
|
popl %esi
|
2006-12-07 09:14:04 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2006-12-07 09:14:04 +08:00
|
|
|
* Jump to the relocated address.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2009-05-09 06:45:17 +08:00
|
|
|
leal relocated(%ebx), %eax
|
|
|
|
|
jmp *%eax
|
2009-02-14 05:50:23 +08:00
|
|
|
ENDPROC(startup_32)
|
|
|
|
|
|
2017-08-24 15:33:26 +08:00
|
|
|
#ifdef CONFIG_EFI_STUB
|
|
|
|
|
/*
|
|
|
|
|
* We don't need the return address, so set up the stack so efi_main() can find
|
|
|
|
|
* its arguments.
|
|
|
|
|
*/
|
|
|
|
|
ENTRY(efi_pe_entry)
|
|
|
|
|
add $0x4, %esp
|
|
|
|
|
|
|
|
|
|
call 1f
|
|
|
|
|
1: popl %esi
|
|
|
|
|
subl $1b, %esi
|
|
|
|
|
|
|
|
|
|
popl %ecx
|
|
|
|
|
movl %ecx, efi32_config(%esi) /* Handle */
|
|
|
|
|
popl %ecx
|
|
|
|
|
movl %ecx, efi32_config+8(%esi) /* EFI System table pointer */
|
|
|
|
|
|
|
|
|
|
/* Relocate efi_config->call() */
|
|
|
|
|
leal efi32_config(%esi), %eax
|
|
|
|
|
add %esi, 40(%eax)
|
|
|
|
|
pushl %eax
|
|
|
|
|
|
|
|
|
|
call make_boot_params
|
|
|
|
|
cmpl $0, %eax
|
|
|
|
|
je fail
|
|
|
|
|
movl %esi, BP_code32_start(%eax)
|
|
|
|
|
popl %ecx
|
|
|
|
|
pushl %eax
|
|
|
|
|
pushl %ecx
|
|
|
|
|
jmp 2f /* Skip efi_config initialization */
|
|
|
|
|
ENDPROC(efi_pe_entry)
|
|
|
|
|
|
|
|
|
|
ENTRY(efi32_stub_entry)
|
|
|
|
|
add $0x4, %esp
|
|
|
|
|
popl %ecx
|
|
|
|
|
popl %edx
|
|
|
|
|
|
|
|
|
|
call 1f
|
|
|
|
|
1: popl %esi
|
|
|
|
|
subl $1b, %esi
|
|
|
|
|
|
|
|
|
|
movl %ecx, efi32_config(%esi) /* Handle */
|
|
|
|
|
movl %edx, efi32_config+8(%esi) /* EFI System table pointer */
|
|
|
|
|
|
|
|
|
|
/* Relocate efi_config->call() */
|
|
|
|
|
leal efi32_config(%esi), %eax
|
|
|
|
|
add %esi, 40(%eax)
|
|
|
|
|
pushl %eax
|
|
|
|
|
2:
|
|
|
|
|
call efi_main
|
|
|
|
|
cmpl $0, %eax
|
|
|
|
|
movl %eax, %esi
|
|
|
|
|
jne 2f
|
|
|
|
|
fail:
|
|
|
|
|
/* EFI init failed, so hang. */
|
|
|
|
|
hlt
|
|
|
|
|
jmp fail
|
|
|
|
|
2:
|
|
|
|
|
movl BP_code32_start(%esi), %eax
|
|
|
|
|
leal startup_32(%eax), %eax
|
|
|
|
|
jmp *%eax
|
|
|
|
|
ENDPROC(efi32_stub_entry)
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-05-09 06:45:17 +08:00
|
|
|
.text
|
2006-12-07 09:14:04 +08:00
|
|
|
relocated:
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2009-05-09 07:27:41 +08:00
|
|
|
* Clear BSS (stack is currently empty)
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2009-05-09 06:45:17 +08:00
|
|
|
xorl %eax, %eax
|
2009-05-09 07:20:34 +08:00
|
|
|
leal _bss(%ebx), %edi
|
2009-05-09 06:45:17 +08:00
|
|
|
leal _ebss(%ebx), %ecx
|
|
|
|
|
subl %edi, %ecx
|
2009-05-09 07:45:15 +08:00
|
|
|
shrl $2, %ecx
|
|
|
|
|
rep stosl
|
2006-12-07 09:14:04 +08:00
|
|
|
|
2014-09-23 14:05:49 +08:00
|
|
|
/*
|
|
|
|
|
* Adjust our own GOT
|
|
|
|
|
*/
|
|
|
|
|
leal _got(%ebx), %edx
|
|
|
|
|
leal _egot(%ebx), %ecx
|
|
|
|
|
1:
|
|
|
|
|
cmpl %ecx, %edx
|
|
|
|
|
jae 2f
|
|
|
|
|
addl %ebx, (%edx)
|
|
|
|
|
addl $4, %edx
|
|
|
|
|
jmp 1b
|
|
|
|
|
2:
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2016-04-19 00:42:13 +08:00
|
|
|
* Do the extraction, and jump to the new kernel..
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2016-04-19 00:42:13 +08:00
|
|
|
/* push arguments for extract_kernel: */
|
2014-10-31 21:40:38 +08:00
|
|
|
pushl $z_output_len /* decompressed length, end of relocs */
|
x86/boot: Move compressed kernel to the end of the decompression buffer
This change makes later calculations about where the kernel is located
easier to reason about. To better understand this change, we must first
clarify what 'VO' and 'ZO' are. These values were introduced in commits
by hpa:
77d1a4999502 ("x86, boot: make symbols from the main vmlinux available")
37ba7ab5e33c ("x86, boot: make kernel_alignment adjustable; new bzImage fields")
Specifically:
All names prefixed with 'VO_':
- relate to the uncompressed kernel image
- the size of the VO image is: VO__end-VO__text ("VO_INIT_SIZE" define)
All names prefixed with 'ZO_':
- relate to the bootable compressed kernel image (boot/compressed/vmlinux),
which is composed of the following memory areas:
- head text
- compressed kernel (VO image and relocs table)
- decompressor code
- the size of the ZO image is: ZO__end - ZO_startup_32 ("ZO_INIT_SIZE" define, though see below)
The 'INIT_SIZE' value is used to find the larger of the two image sizes:
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
#define VO_INIT_SIZE (VO__end - VO__text)
#if ZO_INIT_SIZE > VO_INIT_SIZE
# define INIT_SIZE ZO_INIT_SIZE
#else
# define INIT_SIZE VO_INIT_SIZE
#endif
The current code uses extract_offset to decide where to position the
copied ZO (i.e. ZO starts at extract_offset). (This is why ZO_INIT_SIZE
currently includes the extract_offset.)
Why does z_extract_offset exist? It's needed because we are trying to minimize
the amount of RAM used for the whole act of creating an uncompressed, executable,
properly relocation-linked kernel image in system memory. We do this so that
kernels can be booted on even very small systems.
To achieve the goal of minimal memory consumption we have implemented an in-place
decompression strategy: instead of cleanly separating the VO and ZO images and
also allocating some memory for the decompression code's runtime needs, we instead
create this elaborate layout of memory buffers where the output (decompressed)
stream, as it progresses, overlaps with and destroys the input (compressed)
stream. This can only be done safely if the ZO image is placed to the end of the
VO range, plus a certain amount of safety distance to make sure that when the last
bytes of the VO range are decompressed, the compressed stream pointer is safely
beyond the end of the VO range.
z_extract_offset is calculated in arch/x86/boot/compressed/mkpiggy.c during
the build process, at a point when we know the exact compressed and
uncompressed size of the kernel images and can calculate this safe minimum
offset value. (Note that the mkpiggy.c calculation is not perfect, because
we don't know the decompressor used at that stage, so the z_extract_offset
calculation is necessarily imprecise and is mostly based on gzip internals -
we'll improve that in the next patch.)
When INIT_SIZE is bigger than VO_INIT_SIZE (uncommon but possible),
the copied ZO occupies the memory from extract_offset to the end of
decompression buffer. It overlaps with the soon-to-be-uncompressed kernel
like this:
|-----compressed kernel image------|
V V
0 extract_offset +INIT_SIZE
|-----------|---------------|-------------------------|--------|
| | | |
VO__text startup_32 of ZO VO__end ZO__end
^ ^
|-------uncompressed kernel image---------|
When INIT_SIZE is equal to VO_INIT_SIZE (likely) there's still space
left from end of ZO to the end of decompressing buffer, like below.
|-compressed kernel image-|
V V
0 extract_offset +INIT_SIZE
|-----------|---------------|-------------------------|--------|
| | | |
VO__text startup_32 of ZO ZO__end VO__end
^ ^
|------------uncompressed kernel image-------------|
To simplify calculations and avoid special cases, it is cleaner to
always place the compressed kernel image in memory so that ZO__end
is at the end of the decompression buffer, instead of placing t at
the start of extract_offset as is currently done.
This patch adds BP_init_size (which is the INIT_SIZE as passed in from
the boot_params) into asm-offsets.c to make it visible to the assembly
code.
Then when moving the ZO, it calculates the starting position of
the copied ZO (via BP_init_size and the ZO run size) so that the VO__end
will be at the end of the decompression buffer. To make the position
calculation safe, the end of ZO is page aligned (and a comment is added
to the existing VO alignment for good measure).
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
[ Rewrote 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: Baoquan He <bhe@redhat.com>
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-3-git-send-email-keescook@chromium.org
[ Rewrote the changelog some more. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-29 08:09:04 +08:00
|
|
|
|
|
|
|
|
movl BP_init_size(%esi), %eax
|
|
|
|
|
subl $_end, %eax
|
|
|
|
|
movl %ebx, %ebp
|
|
|
|
|
subl %eax, %ebp
|
2009-05-09 06:45:17 +08:00
|
|
|
pushl %ebp /* output address */
|
x86/boot: Move compressed kernel to the end of the decompression buffer
This change makes later calculations about where the kernel is located
easier to reason about. To better understand this change, we must first
clarify what 'VO' and 'ZO' are. These values were introduced in commits
by hpa:
77d1a4999502 ("x86, boot: make symbols from the main vmlinux available")
37ba7ab5e33c ("x86, boot: make kernel_alignment adjustable; new bzImage fields")
Specifically:
All names prefixed with 'VO_':
- relate to the uncompressed kernel image
- the size of the VO image is: VO__end-VO__text ("VO_INIT_SIZE" define)
All names prefixed with 'ZO_':
- relate to the bootable compressed kernel image (boot/compressed/vmlinux),
which is composed of the following memory areas:
- head text
- compressed kernel (VO image and relocs table)
- decompressor code
- the size of the ZO image is: ZO__end - ZO_startup_32 ("ZO_INIT_SIZE" define, though see below)
The 'INIT_SIZE' value is used to find the larger of the two image sizes:
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
#define VO_INIT_SIZE (VO__end - VO__text)
#if ZO_INIT_SIZE > VO_INIT_SIZE
# define INIT_SIZE ZO_INIT_SIZE
#else
# define INIT_SIZE VO_INIT_SIZE
#endif
The current code uses extract_offset to decide where to position the
copied ZO (i.e. ZO starts at extract_offset). (This is why ZO_INIT_SIZE
currently includes the extract_offset.)
Why does z_extract_offset exist? It's needed because we are trying to minimize
the amount of RAM used for the whole act of creating an uncompressed, executable,
properly relocation-linked kernel image in system memory. We do this so that
kernels can be booted on even very small systems.
To achieve the goal of minimal memory consumption we have implemented an in-place
decompression strategy: instead of cleanly separating the VO and ZO images and
also allocating some memory for the decompression code's runtime needs, we instead
create this elaborate layout of memory buffers where the output (decompressed)
stream, as it progresses, overlaps with and destroys the input (compressed)
stream. This can only be done safely if the ZO image is placed to the end of the
VO range, plus a certain amount of safety distance to make sure that when the last
bytes of the VO range are decompressed, the compressed stream pointer is safely
beyond the end of the VO range.
z_extract_offset is calculated in arch/x86/boot/compressed/mkpiggy.c during
the build process, at a point when we know the exact compressed and
uncompressed size of the kernel images and can calculate this safe minimum
offset value. (Note that the mkpiggy.c calculation is not perfect, because
we don't know the decompressor used at that stage, so the z_extract_offset
calculation is necessarily imprecise and is mostly based on gzip internals -
we'll improve that in the next patch.)
When INIT_SIZE is bigger than VO_INIT_SIZE (uncommon but possible),
the copied ZO occupies the memory from extract_offset to the end of
decompression buffer. It overlaps with the soon-to-be-uncompressed kernel
like this:
|-----compressed kernel image------|
V V
0 extract_offset +INIT_SIZE
|-----------|---------------|-------------------------|--------|
| | | |
VO__text startup_32 of ZO VO__end ZO__end
^ ^
|-------uncompressed kernel image---------|
When INIT_SIZE is equal to VO_INIT_SIZE (likely) there's still space
left from end of ZO to the end of decompressing buffer, like below.
|-compressed kernel image-|
V V
0 extract_offset +INIT_SIZE
|-----------|---------------|-------------------------|--------|
| | | |
VO__text startup_32 of ZO ZO__end VO__end
^ ^
|------------uncompressed kernel image-------------|
To simplify calculations and avoid special cases, it is cleaner to
always place the compressed kernel image in memory so that ZO__end
is at the end of the decompression buffer, instead of placing t at
the start of extract_offset as is currently done.
This patch adds BP_init_size (which is the INIT_SIZE as passed in from
the boot_params) into asm-offsets.c to make it visible to the assembly
code.
Then when moving the ZO, it calculates the starting position of
the copied ZO (via BP_init_size and the ZO run size) so that the VO__end
will be at the end of the decompression buffer. To make the position
calculation safe, the end of ZO is page aligned (and a comment is added
to the existing VO alignment for good measure).
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
[ Rewrote 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: Baoquan He <bhe@redhat.com>
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-3-git-send-email-keescook@chromium.org
[ Rewrote the changelog some more. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-29 08:09:04 +08:00
|
|
|
|
2009-05-09 08:42:16 +08:00
|
|
|
pushl $z_input_len /* input_len */
|
2009-05-09 06:45:17 +08:00
|
|
|
leal input_data(%ebx), %eax
|
|
|
|
|
pushl %eax /* input_data */
|
|
|
|
|
leal boot_heap(%ebx), %eax
|
|
|
|
|
pushl %eax /* heap area */
|
|
|
|
|
pushl %esi /* real mode pointer */
|
2016-04-19 00:42:13 +08:00
|
|
|
call extract_kernel /* returns kernel location in %eax */
|
2016-04-29 08:09:07 +08:00
|
|
|
addl $24, %esp
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/*
|
2016-04-19 00:42:13 +08:00
|
|
|
* Jump to the extracted kernel.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2009-05-09 06:45:17 +08:00
|
|
|
xorl %ebx, %ebx
|
2013-10-11 08:18:14 +08:00
|
|
|
jmp *%eax
|
2006-12-07 09:14:04 +08:00
|
|
|
|
2014-09-05 21:52:26 +08:00
|
|
|
#ifdef CONFIG_EFI_STUB
|
2014-09-23 14:05:49 +08:00
|
|
|
.data
|
2014-01-10 23:27:14 +08:00
|
|
|
efi32_config:
|
2017-02-06 19:22:40 +08:00
|
|
|
.fill 5,8,0
|
2014-01-10 23:27:14 +08:00
|
|
|
.long efi_call_phys
|
|
|
|
|
.long 0
|
|
|
|
|
.byte 0
|
2014-03-05 18:15:55 +08:00
|
|
|
#endif
|
2014-01-10 23:27:14 +08:00
|
|
|
|
2009-05-09 06:45:17 +08:00
|
|
|
/*
|
|
|
|
|
* Stack and heap for uncompression
|
|
|
|
|
*/
|
|
|
|
|
.bss
|
|
|
|
|
.balign 4
|
2008-04-08 18:54:30 +08:00
|
|
|
boot_heap:
|
|
|
|
|
.fill BOOT_HEAP_SIZE, 1, 0
|
|
|
|
|
boot_stack:
|
|
|
|
|
.fill BOOT_STACK_SIZE, 1, 0
|
|
|
|
|
boot_stack_end:
|
