arm64: Use default kernel offset when the image file can't be seeked
Marc Zyngier
maintainerPATCH 1/1 arm64: Use default kernel offset when the image file can't be seeked
While introducing new code to extract the kernel offset from the image, commit fd0a05b ("arm64: Obtain text offset from kernel image") introduced a regression where something such as:
./lkvm run -c 8 -p earlycon <(zcat /boot/vmlinuz-5.8.0-rc5-00172-ga161216e31ba)
now fails to load the kernel, as the file descriptor cannot be seeked.
Let's assume the good old 0x80000 offset when the seek syscall fails, with a warning for a good measure.
--- arm/aarch64/kvm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arm/aarch64/kvm.c +8 -3
@@ -15,6 +15,7 @@ unsigned long long kvm__arch_get_kern_offset(struct kvm *kvm, int fd)struct arm64_image_header header;off_t cur_offset;ssize_t size; +const char *warn_str;/* the 32bit kernel offset is a well known value */ if (kvm->cfg.arch.aarch32_guest)
@@ -22,8 +23,10 @@ unsigned long long kvm__arch_get_kern_offset(struct kvm *kvm, int fd) cur_offset =lseek (fd,0 ,SEEK_CUR );if (cur_offset == (off_t)-1 || -lseek (fd,0 ,SEEK_SET ) == (off_t)-1 ) -die ("Failed to seek in image file" ); +lseek (fd,0 ,SEEK_SET ) == (off_t)-1 ) { + warn_str ="Failed to seek in kernel image file" ; + goto fail; + } size =xread (fd, &header,sizeof (header));if (size <0 || (size_t )size <sizeof (header))
@@ -37,7 +40,9 @@ unsigned long long kvm__arch_get_kern_offset(struct kvm *kvm, int fd)if (le64_to_cpu (header.image_size))return le64_to_cpu (header.text_offset); -pr_warning ("Image size is 0, assuming TEXT_OFFSET to be 0x80000" ); + warn_str ="Image size is 0" ; +fail: +pr_warning ("%s, assuming TEXT_OFFSET to be 0x80000" , warn_str);return 0x80000 ; }
Signature · 6 lines
2.27.0 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Will Deacon
AppliedQuoted 10 lines · Marc Zyngier
While introducing new code to extract the kernel offset from the image, commit fd0a05b ("arm64: Obtain text offset from kernel image") introduced a regression where something such as:
./lkvm run -c 8 -p earlycon <(zcat
/boot/vmlinuz-5.8.0-rc5-00172-ga161216e31ba)now fails to load the kernel, as the file descriptor cannot be seeked.
[...]
Applied to kvmtool (master), thanks!
[1/1] arm64: Use default kernel offset when the image file can't be seeked
https://git.kernel.org/will/kvmtool/c/c9acdae1d2e7
Cheers,
Signature · 9 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm