d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kboot: Refinements to host_kexec_load

Browse Source 
Move kexec_segments to host_syscall.h and pre-pend host_ to it.  Correct
args to host_exec_load.

Sponsored by:		Netflix
This commit is contained in:
Warner Losh 2022-06-28 10:40:04 -06:00
parent 8fa9263f67
commit ffb0d016df
6 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stand/kboot/arch/amd64/syscall_nr.h
View File

@ -18,6 +18,3 @@
#define SYS_symlinkat 266
#define SYS_uname 63
#define SYS_write 1
#define KEXEC_ARCH_X86_64 62
#define KEXEC_ARCH KEXEC_ARCH_X86_64

2
stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c
View File

@ -153,7 +153,7 @@ ppc64_elf_exec(struct preloaded_file *fp)
panic("architecture did not provide kexec segment mapping");
archsw.arch_kexec_kseg_get(&nseg, &kseg);
error = host_kexec_load(trampolinebase, nseg, (uintptr_t)kseg, KEXEC_ARCH << 16);
error = host_kexec_load(trampolinebase, nseg, kseg, HOST_KEXEC_ARCH_PPC64);
if (error != 0)
panic("kexec_load returned error: %d", error);

3
stand/kboot/arch/powerpc64/syscall_nr.h
View File

@ -19,6 +19,3 @@
#define SYS_symlinkat 295
#define SYS_uname 120
#define SYS_write 4
#define KEXEC_ARCH_PPC64 21
#define KEXEC_ARCH KEXEC_ARCH_PPC64

25
stand/kboot/host_syscall.h
View File

@ -95,6 +95,29 @@ struct host_timeval {
#define HOST_REBOOT_MAGIC2 672274793
#define HOST_REBOOT_CMD_KEXEC 0x45584543
/*
* Values from linux/tools/include/uapi/linux/kexec.h
*/
/*
* Values match ELF architecture types.
*/
#define HOST_KEXEC_ARCH_X86_64 (62 << 16)
#define HOST_KEXEC_ARCH_PPC64 (21 << 16)
#define HOST_KEXEC_ARCH_ARM (40 << 16)
#define HOST_KEXEC_ARCH_AARCH64 (183 << 16)
#define HOST_KEXEC_ARCH_RISCV (243 << 16)
/* Arbitrary cap on segments */
#define HOST_KEXEC_SEGMENT_MAX 16
struct host_kexec_segment {
void *buf;
int bufsz;
void *mem;
int memsz;
};
/*
* System Calls
*/
@ -104,7 +127,7 @@ int host_fstat(int fd, struct host_kstat *sb);
int host_getdents(int fd, void *dirp, int count);
int host_getpid(void);
int host_gettimeofday(struct host_timeval *a, void *b);
int host_kexec_load(uint32_t start, int nsegs, uint32_t segs, uint32_t flags);
int host_kexec_load(unsigned long entry, unsigned long nsegs, struct host_kexec_segment *segs, unsigned long flags);
ssize_t host_llseek(int fd, int32_t offset_high, int32_t offset_lo, uint64_t *result, int whence);
int host_mkdir(const char *, host_mode_t);
void *host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off);

4
stand/kboot/host_syscalls.c
View File

@ -44,9 +44,9 @@ host_gettimeofday(struct host_timeval *a, void *b)
}
int
host_kexec_load(uint32_t start, int nsegs, uint32_t segs, uint32_t flags)
host_kexec_load(unsigned long entry, unsigned long nsegs, struct host_kexec_segment *segs, unsigned long flags)
{
return host_syscall(SYS_kexec_load, start, nsegs, segs, flags);
return host_syscall(SYS_kexec_load, entry, nsegs, segs, flags);
}
ssize_t

9
stand/kboot/main.c
View File

@ -340,14 +340,7 @@ time(time_t *tloc)
return (rv);
}
struct kexec_segment {
void *buf;
int bufsz;
void *mem;
int memsz;
};
struct kexec_segment loaded_segments[128];
struct host_kexec_segment loaded_segments[128];
int nkexec_segments = 0;
static ssize_t