forked from Minki/linux
40c50c1fec
The purgatory code defines global variables which are referenced via a
symbol lookup in the kexec code (core and arch).
A recent commit addressing sparse warnings made these static and thereby
broke kexec_file.
Why did this happen? Simply because the whole machinery is undocumented and
lacks any form of forward declarations. The variable names are unspecific
and lack a prefix, so adding forward declarations creates shadow variables
in the core code. Aside of that the code relies on magic constants and
duplicate struct definitions with no way to ensure that these things stay
in sync. The section placement of the purgatory variables happened by
chance and not by design.
Unbreak kexec and cleanup the mess:
- Add proper forward declarations and document the usage
- Use common struct definition
- Use the proper common defines instead of magic constants
- Add a purgatory_ prefix to have a proper name space
- Use ARRAY_SIZE() instead of a homebrewn reimplementation
- Add proper sections to the purgatory variables [ From Mike ]
Fixes: 72042a8c7b ("x86/purgatory: Make functions and variables static")
Reported-by: Mike Galbraith <<efault@gmx.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Nicholas Mc Guire <der.herr@hofr.at>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: "Tobin C. Harding" <me@tobin.cc>
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1703101315140.3681@nanos
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
60 lines
1.1 KiB
ArmAsm
60 lines
1.1 KiB
ArmAsm
/*
|
|
* purgatory: setup code
|
|
*
|
|
* Copyright (C) 2003,2004 Eric Biederman (ebiederm@xmission.com)
|
|
* Copyright (C) 2014 Red Hat Inc.
|
|
*
|
|
* This code has been taken from kexec-tools.
|
|
*
|
|
* This source code is licensed under the GNU General Public License,
|
|
* Version 2. See the file COPYING for more details.
|
|
*/
|
|
#include <asm/purgatory.h>
|
|
|
|
.text
|
|
.globl purgatory_start
|
|
.balign 16
|
|
purgatory_start:
|
|
.code64
|
|
|
|
/* Load a gdt so I know what the segment registers are */
|
|
lgdt gdt(%rip)
|
|
|
|
/* load the data segments */
|
|
movl $0x18, %eax /* data segment */
|
|
movl %eax, %ds
|
|
movl %eax, %es
|
|
movl %eax, %ss
|
|
movl %eax, %fs
|
|
movl %eax, %gs
|
|
|
|
/* Setup a stack */
|
|
leaq lstack_end(%rip), %rsp
|
|
|
|
/* Call the C code */
|
|
call purgatory
|
|
jmp entry64
|
|
|
|
.section ".rodata"
|
|
.balign 16
|
|
gdt: /* 0x00 unusable segment
|
|
* 0x08 unused
|
|
* so use them as the gdt ptr
|
|
*/
|
|
.word gdt_end - gdt - 1
|
|
.quad gdt
|
|
.word 0, 0, 0
|
|
|
|
/* 0x10 4GB flat code segment */
|
|
.word 0xFFFF, 0x0000, 0x9A00, 0x00AF
|
|
|
|
/* 0x18 4GB flat data segment */
|
|
.word 0xFFFF, 0x0000, 0x9200, 0x00CF
|
|
gdt_end:
|
|
|
|
.bss
|
|
.balign 4096
|
|
lstack:
|
|
.skip 4096
|
|
lstack_end:
|