kexec-tools: add support for Xen 4.3
Subsystems (2)
v4 cover kexec-tools: add support for Xen 4.3
The series adds support for the new hypercall ABI which should be provided by Xen 4.4. Images are loaded into Xen directly with no kernel involvement.
Please do not apply until the hypervisor side patches are applied to Xen.
Patch 1 is unrelated but kexec wouldn't work for me without it. Not sure why I had problems, perhaps a toolstack specific issue?
Patch 2 makes libxc 4.4 mandatory for Xen support.
Patch 3-4 removes a use of /proc/iomem in favour of libxc.
Patch 5 adds the support for loading, unloading, and exec'ing an image in Xen.
This series explicitly drops support for older version of libxc/Xen as supporting kexec on these hypervisors requires kernel support that will never be available upstream.
Changes in v4:
- KEXEC_ARCH_DEFAULT => EM_386
- add segment in the crash case for the backup src.
Changes in v3 (not posted):
- Rebased
Changes in v2:
- Patch from Don Sultz: use libxc for vmcoreinfo.
- Use xc_get_max_cpus() to get number of PCPUs.
- Enable unload and exec of images.
David
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v4 1/5 purgatory: put variables altered by kexec in .data not .bss
From: David Vrabel <[email protected]>
elf_rel_set_symbol() fails if the symbol is in the .bss section.
--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)
purgatory/arch/i386/console-x86.c +3 -3
@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ /* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;#define XMTRDY 0x20
purgatory/arch/i386/crashdump_backup.c +5 -3
@@ -21,13 +21,15 @@#include <stdint.h> #include <string.h> +#include <purgatory.h> +/* Backup region start gets set after /proc/iomem has been parsed. */ /* We reuse the same code for x86_64 also so changing backup_start to unsigned long */ -unsigned long backup_start =0 ; +unsigned long backup_start __data =0 ; -unsigned long backup_src_start =0 ; -unsigned long backup_src_size =0 ; +unsigned long backup_src_start __data =0 ; +unsigned long backup_src_size __data =0 ;/* Backup first 640K of memory to backup region as reserved by kexec. * Assuming first 640K has to be present on i386 machines and no address
purgatory/arch/x86_64/purgatory-x86_64.c +3 -3
@@ -3,11 +3,11 @@#include <purgatory.h> #include "purgatory-x86_64.h" -uint8_t reset_vga =0 ; +uint8_t reset_vga __data = 0;uint8_t legacy_pic =0 ; -uint8_t panic_kernel =0 ; +uint8_t panic_kernel __data = 0;unsigned long jump_back_entry =0 ; -char *cmdline_end =NULL ; +char *cmdline_end __data = NULL;void setup_arch (void ) {
purgatory/include/purgatory.h +4 -0
@@ -1,6 +1,10 @@#ifndef PURGATORY_H #define PURGATORY_H +/* Force variables that are adjusted by kexec to be in .data not +.bss. */ +#define __data __attribute__((section("data"))) +void putchar (int ch);void sprintf (char *buffer,const char *fmt, ...);void printf (const char *fmt, ...);
purgatory/purgatory.c +2 -2
@@ -6,8 +6,8 @@#include <string.h> #include "../kexec/kexec-sha256.h" -struct sha256_region sha256_regions[SHA256_REGIONS ] = {}; -sha256_digest_t sha256_digest = { }; +struct sha256_region sha256_regions[SHA256_REGIONS] __data = {}; +sha256_digest_t sha256_digest __data = { };int verify_sha256_digest (void ) {
Signature · 1 line
1.7.2.5
PATCH v4 1/5 purgatory: put variables altered by kexec in .data not .bss
In reply to David VrabelFrom: David Vrabel <[email protected]>
elf_rel_set_symbol() fails if the symbol is in the .bss section.
--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)
purgatory/arch/i386/console-x86.c +3 -3
@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ /* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;#define XMTRDY 0x20
purgatory/arch/i386/crashdump_backup.c +5 -3
@@ -21,13 +21,15 @@#include <stdint.h> #include <string.h> +#include <purgatory.h> +/* Backup region start gets set after /proc/iomem has been parsed. */ /* We reuse the same code for x86_64 also so changing backup_start to unsigned long */ -unsigned long backup_start =0 ; +unsigned long backup_start __data =0 ; -unsigned long backup_src_start =0 ; -unsigned long backup_src_size =0 ; +unsigned long backup_src_start __data =0 ; +unsigned long backup_src_size __data =0 ;/* Backup first 640K of memory to backup region as reserved by kexec. * Assuming first 640K has to be present on i386 machines and no address
purgatory/arch/x86_64/purgatory-x86_64.c +3 -3
@@ -3,11 +3,11 @@#include <purgatory.h> #include "purgatory-x86_64.h" -uint8_t reset_vga =0 ; +uint8_t reset_vga __data = 0;uint8_t legacy_pic =0 ; -uint8_t panic_kernel =0 ; +uint8_t panic_kernel __data = 0;unsigned long jump_back_entry =0 ; -char *cmdline_end =NULL ; +char *cmdline_end __data = NULL;void setup_arch (void ) {
purgatory/include/purgatory.h +4 -0
@@ -1,6 +1,10 @@#ifndef PURGATORY_H #define PURGATORY_H +/* Force variables that are adjusted by kexec to be in .data not +.bss. */ +#define __data __attribute__((section("data"))) +void putchar (int ch);void sprintf (char *buffer,const char *fmt, ...);void printf (const char *fmt, ...);
purgatory/purgatory.c +2 -2
@@ -6,8 +6,8 @@#include <string.h> #include "../kexec/kexec-sha256.h" -struct sha256_region sha256_regions[SHA256_REGIONS ] = {}; -sha256_digest_t sha256_digest = { }; +struct sha256_region sha256_regions[SHA256_REGIONS] __data = {}; +sha256_digest_t sha256_digest __data = { };int verify_sha256_digest (void ) {
Signature · 7 lines
1.7.2.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
Quoted 18 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0
purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 9 lines
purgatory/arch/i386/console-x86.c +3
-3@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ /* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;
Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Daniel
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
In reply to David VrabelQuoted 18 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0
purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 9 lines
purgatory/arch/i386/console-x86.c +3
-3@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ /* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;
Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
Quoted 21 lines · Daniel Kiper
Quoted 20 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/
Quoted 11 lines
purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 7 lines
purgatory/arch/i386/console-x86.c +3
-3/* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Regardless of whether it works with some tools, it doesn't make a whole lot of sense to try and set the value of symbols in the .bss section. .bss is only for symbols with a value of zero.
David
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
In reply to Daniel KiperQuoted 21 lines · Daniel Kiper
Quoted 20 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/
Quoted 11 lines
purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 7 lines
purgatory/arch/i386/console-x86.c +3
-3/* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Regardless of whether it works with some tools, it doesn't make a whole lot of sense to try and set the value of symbols in the .bss section. .bss is only for symbols with a value of zero.
David
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
Quoted 34 lines · David Vrabel
Quoted 21 lines · Daniel Kiper
Quoted 20 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ Quoted 11 lines
purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 7 lines
purgatory/arch/i386/console-x86.c +3
-3/* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Quoted 3 lines
Regardless of whether it works with some tools, it doesn't make a whole lot of sense to try and set the value of symbols in the .bss section. .bss is only for symbols with a value of zero.
To be precise .bss is only for uninitialized symbols. Anyway, probably your compiler is screwed. In my case it sees that a given symbol is initialized and places it in .data section itself.
Daniel
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
In reply to David VrabelQuoted 34 lines · David Vrabel
Quoted 21 lines · Daniel Kiper
Quoted 20 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ Quoted 11 lines
purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 7 lines
purgatory/arch/i386/console-x86.c +3
-3/* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Quoted 3 lines
Regardless of whether it works with some tools, it doesn't make a whole lot of sense to try and set the value of symbols in the .bss section. .bss is only for symbols with a value of zero.
To be precise .bss is only for uninitialized symbols. Anyway, probably your compiler is screwed. In my case it sees that a given symbol is initialized and places it in .data section itself.
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
Quoted 35 lines · Daniel Kiper
Quoted 34 lines · David Vrabel
Quoted 32 lines · Daniel Kiper
Quoted 18 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 9 lines
purgatory/arch/i386/console-x86.c +3
-3@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ /* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Quoted 7 lines
Quoted 3 lines
Regardless of whether it works with some tools, it doesn't make a whole lot of sense to try and set the value of symbols in the .bss section. .bss is only for symbols with a value of zero.
To be precise .bss is only for uninitialized symbols. Anyway, probably your compiler is screwed. In my case it sees that a given symbol is initialized and places it in .data section itself.
David, are you using a compiler that doesn't support -fno-zero-initialized-in-bss? If that's a supported optoin, then the __data markers are indeed necessary.
Tim.
Re: [Xen-devel] [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
In reply to Daniel KiperQuoted 35 lines · Daniel Kiper
Quoted 34 lines · David Vrabel
Quoted 32 lines · Daniel Kiper
Quoted 18 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 9 lines
purgatory/arch/i386/console-x86.c +3
-3@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ /* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Quoted 7 lines
Quoted 3 lines
Regardless of whether it works with some tools, it doesn't make a whole lot of sense to try and set the value of symbols in the .bss section. .bss is only for symbols with a value of zero.
To be precise .bss is only for uninitialized symbols. Anyway, probably your compiler is screwed. In my case it sees that a given symbol is initialized and places it in .data section itself.
David, are you using a compiler that doesn't support -fno-zero-initialized-in-bss? If that's a supported optoin, then the __data markers are indeed necessary.
Tim.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
Quoted 40 lines · Tim Deegan
Quoted 39 lines · Daniel Kiper
Quoted 37 lines · David Vrabel
Quoted 21 lines · Daniel Kiper
Quoted 20 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ Quoted 11 lines
purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 7 lines
purgatory/arch/i386/console-x86.c +3
-3/* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Regardless of whether it works with some tools, it doesn't make a whole lot of sense to try and set the value of symbols in the .bss section. .bss is only for symbols with a value of zero.
Quoted 7 lines
Quoted 3 lines
To be precise .bss is only for uninitialized symbols. Anyway, probably your compiler is screwed. In my case it sees that a given symbol is initialized and places it in .data section itself.
David, are you using a compiler that doesn't support -fno-zero-initialized-in-bss? If that's a supported optoin, then the
__datamarkers are indeed necessary.
I'm using 4.7.2 and it does support the option and it is correctly being used when building purgatory. Not sure how I ended up with something that wasn't working before.
I'll drop this patch.
David
Re: [Xen-devel] [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
In reply to Tim DeeganQuoted 40 lines · Tim Deegan
Quoted 39 lines · Daniel Kiper
Quoted 37 lines · David Vrabel
Quoted 21 lines · Daniel Kiper
Quoted 20 lines · David Vrabel
From: David Vrabel <[email protected]>
elf_rel_set_symbol()fails if the symbol is in the .bss section.Signed-off-by David Vrabel <[email protected]>--- purgatory/arch/i386/console-x86.c | 6 +++--- purgatory/arch/i386/crashdump_backup.c | 8 +++++--- purgatory/arch/x86_64/purgatory-x86_64.c | 6 +++--- purgatory/include/purgatory.h | 4 ++++ purgatory/purgatory.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-)purgatory/arch/i386/console-x86.c +0
-0@@ -55,9 +55,9 @@ static void putchar_vga(int ch)*/ Quoted 11 lines
purgatory/arch/i386/console-x86.c static void putchar_vga(int ch) · line 60
Quoted 7 lines
purgatory/arch/i386/console-x86.c +3
-3/* Base Address */ -uint8_t console_serial =0 ; -uint16_t serial_base =0x3f8 ;/* TTYS0 */ -uint32_t serial_baud =0 ; +uint8_t console_serial __data = 0; +uint16_t serial_base __data = 0x3f8; /* TTYS0 */ +uint32_t serial_baud __data = 0;Hmmm... I do not know why we need this patch. I can build kexec-tools in my env without it. I suppose that most of people can too. Could you check what is wrong with your build system?
Regardless of whether it works with some tools, it doesn't make a whole lot of sense to try and set the value of symbols in the .bss section. .bss is only for symbols with a value of zero.
Quoted 7 lines
Quoted 3 lines
To be precise .bss is only for uninitialized symbols. Anyway, probably your compiler is screwed. In my case it sees that a given symbol is initialized and places it in .data section itself.
David, are you using a compiler that doesn't support -fno-zero-initialized-in-bss? If that's a supported optoin, then the
__datamarkers are indeed necessary.
I'm using 4.7.2 and it does support the option and it is correctly being used when building purgatory. Not sure how I ended up with something that wasn't working before.
I'll drop this patch.
David
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
Quoted 2 lines · David Vrabel
I'm using 4.7.2 and it does support the option and it is correctly being
4.4.5.
David
Re: [Xen-devel] [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss
In reply to David VrabelQuoted 2 lines · David Vrabel
I'm using 4.7.2 and it does support the option and it is correctly being
4.4.5.
David
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v4 2/5 kexec/xen: require libxc from Xen 4.4
In reply to David VrabelFrom: David Vrabel <[email protected]>
libxc from Xen 4.4 added xc_kexec_load() which will be required to load images into Xen in the future.
Remove all the #ifdef'ery for older versions of libxc.
--- configure.ac | 5 +- kexec/arch/i386/crashdump-x86.c | 110 ------------------------------------ kexec/arch/i386/kexec-x86-common.c | 103 --------------------------------- kexec/crashdump-xen.c | 12 ---- 4 files changed, 1 insertions(+), 229 deletions(-)
configure.ac +1 -4
@@ -161,11 +161,8 @@ fi dnl find Xen control stack libraries if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, - AC_CHECK_LIB(xenctrl, xc_version, , + AC_CHECK_LIB(xenctrl, xc_kexec_load, , AC_MSG_NOTICE([Xen support disabled]))) - if test "$ac_cv_lib_xenctrl_xc_version" = yes ; then - AC_CHECK_FUNCS(xc_get_machine_memory_map) - fi fi dnl ---Sanity checks
kexec/arch/i386/crashdump-x86.c +0 -110
143 lines not on this page · raw message
kexec/arch/i386/kexec-x86-common.c +0 -103
135 lines not on this page · raw message
kexec/crashdump-xen.c +0 -12
@@ -131,30 +131,18 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info)#ifdef HAVE_LIBXENCTRL int rc;xen_capabilities_info_t capabilities; -#ifdef XENCTRL_HAS_XC_INTERFACE xc_interface *xc; -#else -int xc; -#endif if (!xen_present ()) goto out;memset (capabilities,'0' ,XEN_CAPABILITIES_INFO_LEN ); -#ifdef XENCTRL_HAS_XC_INTERFACE xc =xc_interface_open (NULL ,NULL ,0 );if ( !xc ) {fprintf (stderr,"failed to open xen control interface.\n" ); goto out; } -#else - xc =xc_interface_open (); -if ( xc ==-1 ) { -fprintf (stderr,"failed to open xen control interface.\n" ); - goto out; - } -#endif rc =xc_version (xc, XENVER_capabilities, &capabilities[0 ]);if ( rc ==-1 ) {
Signature · 1 line
1.7.2.5
PATCH v4 2/5 kexec/xen: require libxc from Xen 4.4
In reply to David VrabelFrom: David Vrabel <[email protected]>
libxc from Xen 4.4 added xc_kexec_load() which will be required to load images into Xen in the future.
Remove all the #ifdef'ery for older versions of libxc.
--- configure.ac | 5 +- kexec/arch/i386/crashdump-x86.c | 110 ------------------------------------ kexec/arch/i386/kexec-x86-common.c | 103 --------------------------------- kexec/crashdump-xen.c | 12 ---- 4 files changed, 1 insertions(+), 229 deletions(-)
configure.ac +1 -4
@@ -161,11 +161,8 @@ fi dnl find Xen control stack libraries if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, - AC_CHECK_LIB(xenctrl, xc_version, , + AC_CHECK_LIB(xenctrl, xc_kexec_load, , AC_MSG_NOTICE([Xen support disabled]))) - if test "$ac_cv_lib_xenctrl_xc_version" = yes ; then - AC_CHECK_FUNCS(xc_get_machine_memory_map) - fi fi dnl ---Sanity checks
kexec/arch/i386/crashdump-x86.c +0 -110
143 lines not on this page · raw message
kexec/arch/i386/kexec-x86-common.c +0 -103
135 lines not on this page · raw message
kexec/crashdump-xen.c +0 -12
@@ -131,30 +131,18 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info)#ifdef HAVE_LIBXENCTRL int rc;xen_capabilities_info_t capabilities; -#ifdef XENCTRL_HAS_XC_INTERFACE xc_interface *xc; -#else -int xc; -#endif if (!xen_present ()) goto out;memset (capabilities,'0' ,XEN_CAPABILITIES_INFO_LEN ); -#ifdef XENCTRL_HAS_XC_INTERFACE xc =xc_interface_open (NULL ,NULL ,0 );if ( !xc ) {fprintf (stderr,"failed to open xen control interface.\n" ); goto out; } -#else - xc =xc_interface_open (); -if ( xc ==-1 ) { -fprintf (stderr,"failed to open xen control interface.\n" ); - goto out; - } -#endif rc =xc_version (xc, XENVER_capabilities, &capabilities[0 ]);if ( rc ==-1 ) {
Signature · 7 lines
1.7.2.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH v4 3/5 kexec/xen: use libxc to get location of crash notes
In reply to David VrabelFrom: David Vrabel <[email protected]>
Use xc_kexec_get_range(KEXEC_RANGE_MA_CPU) instead of parsing /proc/iomem (which is only populated by non-upstream ("classic") Xen kernels).
--- kexec/crashdump-xen.c | 67 +++++++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 27 deletions(-)
kexec/crashdump-xen.c +40 -27
@@ -163,42 +163,55 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info)return machine; } -static int xen_crash_note_callback (void *UNUSED (data ),int nr, -char *UNUSED (str ), -unsigned long base, -unsigned long length) -{ -struct crash_note_info *note = xen_phys_notes + nr; - - note->base = base; - note->length = length; - -return 0 ; -} - +#ifdef HAVE_LIBXENCTRL int xen_get_nr_phys_cpus (void ) { -char *match ="Crash note\n" ; -int cpus, n; +xc_interface *xc; +int max_cpus; +int cpu;if (xen_phys_cpus)return xen_phys_cpus; -if ((cpus =kexec_iomem_for_each_line (match,NULL ,NULL ))) { - n =sizeof (struct crash_note_info ) * cpus; - xen_phys_notes =malloc (n); -if (!xen_phys_notes) { -fprintf (stderr,"failed to allocate xen_phys_notes.\n" ); -return -1 ; - } -memset (xen_phys_notes,0 , n); -kexec_iomem_for_each_line (match, - xen_crash_note_callback,NULL ); - xen_phys_cpus = cpus; + xc =xc_interface_open (NULL ,NULL ,0 ); +if (!xc) { +fprintf (stderr,"failed to open xen control interface.\n" ); +return -1 ; + } + + max_cpus =xc_get_max_cpus (xc); +if (max_cpus <=0 ) +return -1 ; + + xen_phys_notes =calloc (max_cpus,sizeof (*xen_phys_notes)); +if (xen_phys_notes ==NULL ) +return -1 ; + +for (cpu =0 ; cpu < max_cpus; cpu++) { +uint64_t size, start; +int ret; + + ret =xc_kexec_get_range (xc,KEXEC_RANGE_MA_CPU , cpu, &size, &start); +if (ret <0 ) +break ; + + xen_phys_notes[cpu].base = start; + xen_phys_notes[cpu].length = size; } -return cpus; +xc_interface_close (xc); + + xen_phys_cpus = cpu; + +return cpu; } +#else +int xen_get_nr_phys_cpus (void ) +{ +return -1 ; +} +#endif +int xen_get_note (int cpu,uint64_t *addr,uint64_t *len) {
Signature · 1 line
1.7.2.5
PATCH v4 3/5 kexec/xen: use libxc to get location of crash notes
In reply to David VrabelFrom: David Vrabel <[email protected]>
Use xc_kexec_get_range(KEXEC_RANGE_MA_CPU) instead of parsing /proc/iomem (which is only populated by non-upstream ("classic") Xen kernels).
--- kexec/crashdump-xen.c | 67 +++++++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 27 deletions(-)
kexec/crashdump-xen.c +40 -27
@@ -163,42 +163,55 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info)return machine; } -static int xen_crash_note_callback (void *UNUSED (data ),int nr, -char *UNUSED (str ), -unsigned long base, -unsigned long length) -{ -struct crash_note_info *note = xen_phys_notes + nr; - - note->base = base; - note->length = length; - -return 0 ; -} - +#ifdef HAVE_LIBXENCTRL int xen_get_nr_phys_cpus (void ) { -char *match ="Crash note\n" ; -int cpus, n; +xc_interface *xc; +int max_cpus; +int cpu;if (xen_phys_cpus)return xen_phys_cpus; -if ((cpus =kexec_iomem_for_each_line (match,NULL ,NULL ))) { - n =sizeof (struct crash_note_info ) * cpus; - xen_phys_notes =malloc (n); -if (!xen_phys_notes) { -fprintf (stderr,"failed to allocate xen_phys_notes.\n" ); -return -1 ; - } -memset (xen_phys_notes,0 , n); -kexec_iomem_for_each_line (match, - xen_crash_note_callback,NULL ); - xen_phys_cpus = cpus; + xc =xc_interface_open (NULL ,NULL ,0 ); +if (!xc) { +fprintf (stderr,"failed to open xen control interface.\n" ); +return -1 ; + } + + max_cpus =xc_get_max_cpus (xc); +if (max_cpus <=0 ) +return -1 ; + + xen_phys_notes =calloc (max_cpus,sizeof (*xen_phys_notes)); +if (xen_phys_notes ==NULL ) +return -1 ; + +for (cpu =0 ; cpu < max_cpus; cpu++) { +uint64_t size, start; +int ret; + + ret =xc_kexec_get_range (xc,KEXEC_RANGE_MA_CPU , cpu, &size, &start); +if (ret <0 ) +break ; + + xen_phys_notes[cpu].base = start; + xen_phys_notes[cpu].length = size; } -return cpus; +xc_interface_close (xc); + + xen_phys_cpus = cpu; + +return cpu; } +#else +int xen_get_nr_phys_cpus (void ) +{ +return -1 ; +} +#endif +int xen_get_note (int cpu,uint64_t *addr,uint64_t *len) {
Signature · 7 lines
1.7.2.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 3/5] kexec/xen: use libxc to get location of crash notes
Quoted 53 lines · David Vrabel
From: David Vrabel <[email protected]>
Use
xc_kexec_get_range(KEXEC_RANGE_MA_CPU)instead of parsing/proc/iomem(which is only populated by non-upstream ("classic") Xen kernels).Signed-off-by David Vrabel <[email protected]>--- kexec/crashdump-xen.c | 67 +++++++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 27 deletions(-)kexec/crashdump-xen.c +4
-24@@ -163,42 +163,55 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info)return machine; } -static int xen_crash_note_callback (void *UNUSED (data ),int nr, -char *UNUSED (str ), -unsigned long base, -unsigned long length) -{ -struct crash_note_info *note = xen_phys_notes + nr; - - note->base = base; - note->length = length; - -return 0 ; -} - +#ifdef HAVE_LIBXENCTRL int xen_get_nr_phys_cpus (void ) { -char *match ="Crash note\n" ; -int cpus, n; +xc_interface *xc; +int max_cpus; +int cpu;if (xen_phys_cpus)return xen_phys_cpus; -if ((cpus =kexec_iomem_for_each_line (match,NULL ,NULL ))) { - n =sizeof (struct crash_note_info ) * cpus; - xen_phys_notes =malloc (n); -if (!xen_phys_notes) { -fprintf (stderr,"failed to allocate xen_phys_notes.\n" ); -return -1 ; - } -memset (xen_phys_notes,0 , n); - kexec_iomem_for_each_line(match,
kexec/crashdump-xen.c unsigned long xen_architecture(struct crash_elf_info *elf_info) · line 183
Quoted 10 lines
kexec/crashdump-xen.c +8
-2- xen_crash_note_callback, NULL); - xen_phys_cpus = cpus; + xc =xc_interface_open (NULL ,NULL ,0 ); +if (!xc) { +fprintf (stderr,"failed to open xen control interface.\n" ); +return -1 ; + } + + max_cpus =xc_get_max_cpus (xc); +if (max_cpus <=0 )
Shouldn't you also call xc_interface_close ?
kexec/crashdump-xen.c unsigned long xen_architecture(struct crash_elf_info *elf_info) · line 188
Quoted 5 lines
kexec/crashdump-xen.c +5
-0+return -1 ; + + xen_phys_notes =calloc (max_cpus,sizeof (*xen_phys_notes)); +if (xen_phys_notes ==NULL ) +return -1 ;
Ditto - call xc_interface_close?
Quoted 38 lines
kexec/crashdump-xen.c +23
-1+ +for (cpu =0 ; cpu < max_cpus; cpu++) { +uint64_t size, start; +int ret; + + ret =xc_kexec_get_range (xc,KEXEC_RANGE_MA_CPU , cpu, &size, &start); +if (ret <0 ) +break ; + + xen_phys_notes[cpu].base = start; + xen_phys_notes[cpu].length = size; } -return cpus; +xc_interface_close (xc); + + xen_phys_cpus = cpu; + + return cpu; } +#else +int xen_get_nr_phys_cpus (void ) +{ +return -1 ; +} +#endif +int xen_get_note (int cpu,uint64_t *addr,uint64_t *len) {Signature · 7 lines
1.7.2.5 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 3/5] kexec/xen: use libxc to get location of crash notes
In reply to David VrabelQuoted 53 lines · David Vrabel
From: David Vrabel <[email protected]>
Use
xc_kexec_get_range(KEXEC_RANGE_MA_CPU)instead of parsing/proc/iomem(which is only populated by non-upstream ("classic") Xen kernels).Signed-off-by David Vrabel <[email protected]>--- kexec/crashdump-xen.c | 67 +++++++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 27 deletions(-)kexec/crashdump-xen.c +4
-24@@ -163,42 +163,55 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info)return machine; } -static int xen_crash_note_callback (void *UNUSED (data ),int nr, -char *UNUSED (str ), -unsigned long base, -unsigned long length) -{ -struct crash_note_info *note = xen_phys_notes + nr; - - note->base = base; - note->length = length; - -return 0 ; -} - +#ifdef HAVE_LIBXENCTRL int xen_get_nr_phys_cpus (void ) { -char *match ="Crash note\n" ; -int cpus, n; +xc_interface *xc; +int max_cpus; +int cpu;if (xen_phys_cpus)return xen_phys_cpus; -if ((cpus =kexec_iomem_for_each_line (match,NULL ,NULL ))) { - n =sizeof (struct crash_note_info ) * cpus; - xen_phys_notes =malloc (n); -if (!xen_phys_notes) { -fprintf (stderr,"failed to allocate xen_phys_notes.\n" ); -return -1 ; - } -memset (xen_phys_notes,0 , n); - kexec_iomem_for_each_line(match,
kexec/crashdump-xen.c unsigned long xen_architecture(struct crash_elf_info *elf_info) · line 183
Quoted 10 lines
kexec/crashdump-xen.c +8
-2- xen_crash_note_callback, NULL); - xen_phys_cpus = cpus; + xc =xc_interface_open (NULL ,NULL ,0 ); +if (!xc) { +fprintf (stderr,"failed to open xen control interface.\n" ); +return -1 ; + } + + max_cpus =xc_get_max_cpus (xc); +if (max_cpus <=0 )
Shouldn't you also call xc_interface_close ?
kexec/crashdump-xen.c unsigned long xen_architecture(struct crash_elf_info *elf_info) · line 188
Quoted 5 lines
kexec/crashdump-xen.c +5
-0+return -1 ; + + xen_phys_notes =calloc (max_cpus,sizeof (*xen_phys_notes)); +if (xen_phys_notes ==NULL ) +return -1 ;
Ditto - call xc_interface_close?
Quoted 38 lines
kexec/crashdump-xen.c +23
-1+ +for (cpu =0 ; cpu < max_cpus; cpu++) { +uint64_t size, start; +int ret; + + ret =xc_kexec_get_range (xc,KEXEC_RANGE_MA_CPU , cpu, &size, &start); +if (ret <0 ) +break ; + + xen_phys_notes[cpu].base = start; + xen_phys_notes[cpu].length = size; } -return cpus; +xc_interface_close (xc); + + xen_phys_cpus = cpu; + + return cpu; } +#else +int xen_get_nr_phys_cpus (void ) +{ +return -1 ; +} +#endif +int xen_get_note (int cpu,uint64_t *addr,uint64_t *len) {Signature · 7 lines
1.7.2.5 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v4 4/5 kexec/xen: switch to use xc_kexec_get_range for get_xen_vmcoreinfo.
In reply to David VrabelFrom: Don Slutz <[email protected]>
--- kexec/crashdump-xen.c | 25 +++++++++++++++++++++++++ kexec/crashdump.c | 5 ----- 2 files changed, 25 insertions(+), 5 deletions(-)
kexec/crashdump-xen.c +25 -0
@@ -164,6 +164,26 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info) }#ifdef HAVE_LIBXENCTRL +int get_xen_vmcoreinfo (uint64_t *addr,uint64_t *len) +{ +xc_interface *xc; +int ret =0 ; + + xc =xc_interface_open (NULL ,NULL ,0 ); +if (!xc) { +fprintf (stderr,"failed to open xen control interface.\n" ); +return -1 ; + } + + ret =xc_kexec_get_range (xc,KEXEC_RANGE_MA_VMCOREINFO ,0 , len, addr); + +xc_interface_close (xc); + +if (ret <0 ) +return -1 ; +return 0 ; +} +int xen_get_nr_phys_cpus (void ) {xc_interface *xc;
@@ -206,6 +226,11 @@ int xen_get_nr_phys_cpus(void) return cpu; }#else +int get_xen_vmcoreinfo (uint64_t *addr,uint64_t *len) +{ +return -1 ; +} +int xen_get_nr_phys_cpus (void ) {return -1 ;
kexec/crashdump.c +0 -5
@@ -157,8 +157,3 @@ int get_kernel_vmcoreinfo(uint64_t *addr, uint64_t *len) {return get_vmcoreinfo ("/sys/kernel/vmcoreinfo" , addr, len); } - -int get_xen_vmcoreinfo (uint64_t *addr,uint64_t *len) -{ -return get_vmcoreinfo ("/sys/hypervisor/vmcoreinfo" , addr, len); -}
Signature · 1 line
1.7.2.5
PATCH v4 5/5 kexec/xen: directly load images images into Xen
In reply to David VrabelFrom: David Vrabel <[email protected]>
Xen 4.4 has an improvided kexec hypercall ABI that allows images to be loaded and executed without any kernel involvement. Use the API provided by libxc to load images when running in a Xen guest.
Support for loading images via the kexec_load syscall in non-upstream ("classic") Xen kernels is no longer supported.
--- kexec/Makefile | 1 + kexec/arch/i386/crashdump-x86.c | 20 +++++- kexec/crashdump-xen.c | 34 ++++++++++ kexec/crashdump.h | 3 +- kexec/kexec-xen.c | 134 +++++++++++++++++++++++++++++++++++++++ kexec/kexec.c | 24 ++++++-- kexec/kexec.h | 5 ++ 7 files changed, 213 insertions(+), 8 deletions(-) create mode 100644 kexec/kexec-xen.c
kexec/Makefile +1 -0
@@ -25,6 +25,7 @@ KEXEC_SRCS_base += kexec/phys_arch.c KEXEC_SRCS_base += kexec/kernel_version.c KEXEC_SRCS_base += kexec/lzma.c KEXEC_SRCS_base += kexec/zlib.c +KEXEC_SRCS_base += kexec/kexec-xen.c KEXEC_GENERATED_SRCS += $(PURGATORY_HEX_C)
kexec/arch/i386/crashdump-x86.c +18 -2
@@ -990,8 +990,24 @@ static int crashkernel_mem_callback(void *UNUSED(data), int nr,int is_crashkernel_mem_reserved (void ) { - crash_reserved_mem_nr =kexec_iomem_for_each_line ("Crash kernel\n" , - crashkernel_mem_callback,NULL ); +int ret; + +if (xen_present ()) { +uint64_t start, end; + + ret =xen_get_crashkernel_region (&start, &end); +if (ret <0 ) +return 0 ; + + crash_reserved_mem[0 ].start = start; + crash_reserved_mem[0 ].end = end; + crash_reserved_mem[0 ].type =RANGE_RAM ; + crash_reserved_mem_nr =1 ; + }else { + ret =kexec_iomem_for_each_line ("Crash kernel\n" , + crashkernel_mem_callback,NULL ); + crash_reserved_mem_nr = ret; + }return !!crash_reserved_mem_nr; }
kexec/crashdump-xen.c +34 -0
@@ -252,3 +252,37 @@ int xen_get_note(int cpu, uint64_t *addr, uint64_t *len)return 0 ; } + +#ifdef HAVE_LIBXENCTRL +int xen_get_crashkernel_region (uint64_t *start,uint64_t *end) +{ +uint64_t size; +xc_interface *xc; +int rc =-1 ; + + xc =xc_interface_open (NULL ,NULL ,0 ); +if (!xc) { +fprintf (stderr,"failed to open xen control interface.\n" ); + goto out; + } + + rc =xc_kexec_get_range (xc,KEXEC_RANGE_MA_CRASH ,0 , &size, start); +if (rc <0 ) { +fprintf (stderr,"failed to get crash region from hypervisor.\n" ); + goto out_close; + } + + *end = *start + size -1 ; + +out_close: +xc_interface_close (xc); + +out: +return rc; +} +#else +int xen_get_crashkernel_region (uint64_t *start,uint64_t *end) +{ +return -1 ; +} +#endif
kexec/crashdump.h +2 -1
@@ -1,6 +1,7 @@#ifndef CRASHDUMP_H #define CRASHDUMP_H +int get_crashkernel_region (uint64_t *start,uint64_t *end);extern int get_crash_notes_per_cpu (int cpu,uint64_t *addr,uint64_t *len);extern int get_kernel_vmcoreinfo (uint64_t *addr,uint64_t *len);extern int get_xen_vmcoreinfo (uint64_t *addr,uint64_t *len);
@@ -56,9 +57,9 @@ unsigned long crash_architecture(struct crash_elf_info *elf_info);unsigned long phys_to_virt (struct crash_elf_info *elf_info,unsigned long paddr); -int xen_present (void );unsigned long xen_architecture (struct crash_elf_info *elf_info);int xen_get_nr_phys_cpus (void );int xen_get_note (int cpu,uint64_t *addr,uint64_t *len); +int xen_get_crashkernel_region (uint64_t *start,uint64_t *end);#endif /* CRASHDUMP_H */
kexec/kexec-xen.c new file +134 -0
134 lines not on this page · raw message
kexec/kexec.c +19 -5
@@ -764,8 +764,12 @@ static int my_load(const char *type, int fileind, int argc, char **argv,if (kexec_debug)print_segments (stderr, &info); - result =kexec_load ( - info.entry, info.nr_segments, info.segment, info.kexec_flags); +if (xen_present ()) + result =xen_kexec_load (&info); +else + result =kexec_load (info.entry, + info.nr_segments, info.segment, + info.kexec_flags);if (result !=0 ) {/* The load failed, print some debugging information */ fprintf(stderr, "kexec_load failed: %s\n",
@@ -789,10 +793,13 @@ static int k_unload (unsigned long kexec_flags) } kexec_flags |= native_arch; - result =kexec_load (NULL ,0 ,NULL , kexec_flags); +if (xen_present ()) + result =xen_kexec_unload (kexec_flags); +else + result =kexec_load (NULL ,0 ,NULL , kexec_flags);if (result !=0 ) {/* The unload failed, print some debugging information */ -fprintf (stderr,"kexec_load (0 segments) failed: %s\n" , +fprintf (stderr,"kexec unload failed: %s\n" ,strerror (errno)); }return result;
@@ -823,7 +830,10 @@ static int my_shutdown(void)*/ static int my_exec (void ) { -reboot (LINUX_REBOOT_CMD_KEXEC ); +if (xen_present ()) +xen_kexec_exec (); +else +reboot (LINUX_REBOOT_CMD_KEXEC );/* I have failed if I make it here */ fprintf (stderr,"kexec failed: %s\n" ,strerror (errno));
@@ -928,6 +938,10 @@ static int kexec_loaded(void)char *p;char line[3 ]; +/* No way to tell if an image is loaded under Xen, assume it is. */ +if (xen_present ()) +return 1 ; + fp =fopen ("/sys/kernel/kexec_loaded" ,"r" );if (fp ==NULL )return -1 ;
kexec/kexec.h +5 -0
@@ -289,4 +289,9 @@ const char * proc_iomem(void);char *concat_cmdline (const char *base,const char *append); +int xen_present (void ); +int xen_kexec_load (struct kexec_info *info); +int xen_kexec_unload (uint64_t kexec_flags); +void xen_kexec_exec (void ); +#endif /* KEXEC_H */
Signature · 1 line
1.7.2.5
PATCH v4 5/5 kexec/xen: directly load images images into Xen
In reply to David VrabelFrom: David Vrabel <[email protected]>
Xen 4.4 has an improvided kexec hypercall ABI that allows images to be loaded and executed without any kernel involvement. Use the API provided by libxc to load images when running in a Xen guest.
Support for loading images via the kexec_load syscall in non-upstream ("classic") Xen kernels is no longer supported.
--- kexec/Makefile | 1 + kexec/arch/i386/crashdump-x86.c | 20 +++++- kexec/crashdump-xen.c | 34 ++++++++++ kexec/crashdump.h | 3 +- kexec/kexec-xen.c | 134 +++++++++++++++++++++++++++++++++++++++ kexec/kexec.c | 24 ++++++-- kexec/kexec.h | 5 ++ 7 files changed, 213 insertions(+), 8 deletions(-) create mode 100644 kexec/kexec-xen.c
kexec/Makefile +1 -0
@@ -25,6 +25,7 @@ KEXEC_SRCS_base += kexec/phys_arch.c KEXEC_SRCS_base += kexec/kernel_version.c KEXEC_SRCS_base += kexec/lzma.c KEXEC_SRCS_base += kexec/zlib.c +KEXEC_SRCS_base += kexec/kexec-xen.c KEXEC_GENERATED_SRCS += $(PURGATORY_HEX_C)
kexec/arch/i386/crashdump-x86.c +18 -2
@@ -990,8 +990,24 @@ static int crashkernel_mem_callback(void *UNUSED(data), int nr,int is_crashkernel_mem_reserved (void ) { - crash_reserved_mem_nr =kexec_iomem_for_each_line ("Crash kernel\n" , - crashkernel_mem_callback,NULL ); +int ret; + +if (xen_present ()) { +uint64_t start, end; + + ret =xen_get_crashkernel_region (&start, &end); +if (ret <0 ) +return 0 ; + + crash_reserved_mem[0 ].start = start; + crash_reserved_mem[0 ].end = end; + crash_reserved_mem[0 ].type =RANGE_RAM ; + crash_reserved_mem_nr =1 ; + }else { + ret =kexec_iomem_for_each_line ("Crash kernel\n" , + crashkernel_mem_callback,NULL ); + crash_reserved_mem_nr = ret; + }return !!crash_reserved_mem_nr; }
kexec/crashdump-xen.c +34 -0
@@ -252,3 +252,37 @@ int xen_get_note(int cpu, uint64_t *addr, uint64_t *len)return 0 ; } + +#ifdef HAVE_LIBXENCTRL +int xen_get_crashkernel_region (uint64_t *start,uint64_t *end) +{ +uint64_t size; +xc_interface *xc; +int rc =-1 ; + + xc =xc_interface_open (NULL ,NULL ,0 ); +if (!xc) { +fprintf (stderr,"failed to open xen control interface.\n" ); + goto out; + } + + rc =xc_kexec_get_range (xc,KEXEC_RANGE_MA_CRASH ,0 , &size, start); +if (rc <0 ) { +fprintf (stderr,"failed to get crash region from hypervisor.\n" ); + goto out_close; + } + + *end = *start + size -1 ; + +out_close: +xc_interface_close (xc); + +out: +return rc; +} +#else +int xen_get_crashkernel_region (uint64_t *start,uint64_t *end) +{ +return -1 ; +} +#endif
kexec/crashdump.h +2 -1
@@ -1,6 +1,7 @@#ifndef CRASHDUMP_H #define CRASHDUMP_H +int get_crashkernel_region (uint64_t *start,uint64_t *end);extern int get_crash_notes_per_cpu (int cpu,uint64_t *addr,uint64_t *len);extern int get_kernel_vmcoreinfo (uint64_t *addr,uint64_t *len);extern int get_xen_vmcoreinfo (uint64_t *addr,uint64_t *len);
@@ -56,9 +57,9 @@ unsigned long crash_architecture(struct crash_elf_info *elf_info);unsigned long phys_to_virt (struct crash_elf_info *elf_info,unsigned long paddr); -int xen_present (void );unsigned long xen_architecture (struct crash_elf_info *elf_info);int xen_get_nr_phys_cpus (void );int xen_get_note (int cpu,uint64_t *addr,uint64_t *len); +int xen_get_crashkernel_region (uint64_t *start,uint64_t *end);#endif /* CRASHDUMP_H */
kexec/kexec-xen.c new file +134 -0
134 lines not on this page · raw message
kexec/kexec.c +19 -5
@@ -764,8 +764,12 @@ static int my_load(const char *type, int fileind, int argc, char **argv,if (kexec_debug)print_segments (stderr, &info); - result =kexec_load ( - info.entry, info.nr_segments, info.segment, info.kexec_flags); +if (xen_present ()) + result =xen_kexec_load (&info); +else + result =kexec_load (info.entry, + info.nr_segments, info.segment, + info.kexec_flags);if (result !=0 ) {/* The load failed, print some debugging information */ fprintf(stderr, "kexec_load failed: %s\n",
@@ -789,10 +793,13 @@ static int k_unload (unsigned long kexec_flags) } kexec_flags |= native_arch; - result =kexec_load (NULL ,0 ,NULL , kexec_flags); +if (xen_present ()) + result =xen_kexec_unload (kexec_flags); +else + result =kexec_load (NULL ,0 ,NULL , kexec_flags);if (result !=0 ) {/* The unload failed, print some debugging information */ -fprintf (stderr,"kexec_load (0 segments) failed: %s\n" , +fprintf (stderr,"kexec unload failed: %s\n" ,strerror (errno)); }return result;
@@ -823,7 +830,10 @@ static int my_shutdown(void)*/ static int my_exec (void ) { -reboot (LINUX_REBOOT_CMD_KEXEC ); +if (xen_present ()) +xen_kexec_exec (); +else +reboot (LINUX_REBOOT_CMD_KEXEC );/* I have failed if I make it here */ fprintf (stderr,"kexec failed: %s\n" ,strerror (errno));
@@ -928,6 +938,10 @@ static int kexec_loaded(void)char *p;char line[3 ]; +/* No way to tell if an image is loaded under Xen, assume it is. */ +if (xen_present ()) +return 1 ; + fp =fopen ("/sys/kernel/kexec_loaded" ,"r" );if (fp ==NULL )return -1 ;
kexec/kexec.h +5 -0
@@ -289,4 +289,9 @@ const char * proc_iomem(void);char *concat_cmdline (const char *base,const char *append); +int xen_present (void ); +int xen_kexec_load (struct kexec_info *info); +int xen_kexec_unload (uint64_t kexec_flags); +void xen_kexec_exec (void ); +#endif /* KEXEC_H */
Signature · 7 lines
1.7.2.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec