summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/image/elfboot.c110
-rw-r--r--src/arch/i386/include/bits/errfile.h1
-rw-r--r--src/config.h3
-rw-r--r--src/core/config.c5
-rw-r--r--src/image/elf.c29
-rw-r--r--src/include/gpxe/features.h1
6 files changed, 120 insertions, 29 deletions
diff --git a/src/arch/i386/image/elfboot.c b/src/arch/i386/image/elfboot.c
new file mode 100644
index 00000000..52510aa9
--- /dev/null
+++ b/src/arch/i386/image/elfboot.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2008 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <errno.h>
+#include <elf.h>
+#include <gpxe/image.h>
+#include <gpxe/elf.h>
+#include <gpxe/features.h>
+#include <gpxe/init.h>
+
+/**
+ * @file
+ *
+ * ELF bootable image
+ *
+ */
+
+FEATURE ( FEATURE_IMAGE, "ELF", DHCP_EB_FEATURE_ELF, 1 );
+
+struct image_type elfboot_image_type __image_type ( PROBE_NORMAL );
+
+/**
+ * Execute ELF image
+ *
+ * @v image ELF image
+ * @ret rc Return status code
+ */
+static int elfboot_exec ( struct image *image ) {
+ physaddr_t entry = image->priv.phys;
+
+ /* An ELF image has no callback interface, so we need to shut
+ * down before invoking it.
+ */
+ shutdown();
+
+ /* Jump to OS with flat physical addressing */
+ __asm__ __volatile__ ( PHYS_CODE ( "call *%%edi\n\t" )
+ : : "D" ( entry )
+ : "eax", "ebx", "ecx", "edx", "esi", "ebp",
+ "memory" );
+
+ DBGC ( image, "ELF %p returned\n", image );
+
+ /* It isn't safe to continue after calling shutdown() */
+ while ( 1 ) {}
+
+ return -ECANCELED; /* -EIMPOSSIBLE, anyone? */
+}
+
+/**
+ * Load ELF image into memory
+ *
+ * @v image ELF file
+ * @ret rc Return status code
+ */
+static int elfboot_load ( struct image *image ) {
+ Elf32_Ehdr ehdr;
+ static const uint8_t e_ident[] = {
+ [EI_MAG0] = ELFMAG0,
+ [EI_MAG1] = ELFMAG1,
+ [EI_MAG2] = ELFMAG2,
+ [EI_MAG3] = ELFMAG3,
+ [EI_CLASS] = ELFCLASS32,
+ [EI_DATA] = ELFDATA2LSB,
+ [EI_VERSION] = EV_CURRENT,
+ };
+ int rc;
+
+ /* Read ELF header */
+ copy_from_user ( &ehdr, image->data, 0, sizeof ( ehdr ) );
+ if ( memcmp ( ehdr.e_ident, e_ident, sizeof ( e_ident ) ) != 0 ) {
+ DBG ( "Invalid ELF identifier\n" );
+ return -ENOEXEC;
+ }
+
+ /* This is an ELF image, valid or otherwise */
+ if ( ! image->type )
+ image->type = &elfboot_image_type;
+
+ /* Load the image using core ELF support */
+ if ( ( rc = elf_load ( image ) ) != 0 ) {
+ DBGC ( image, "ELF %p could not load: %s\n",
+ image, strerror ( rc ) );
+ return rc;
+ }
+
+ return 0;
+}
+
+/** ELF image type */
+struct image_type elfboot_image_type __image_type ( PROBE_NORMAL ) = {
+ .name = "ELF",
+ .load = elfboot_load,
+ .exec = elfboot_exec,
+};
diff --git a/src/arch/i386/include/bits/errfile.h b/src/arch/i386/include/bits/errfile.h
index 678be045..c5b04a26 100644
--- a/src/arch/i386/include/bits/errfile.h
+++ b/src/arch/i386/include/bits/errfile.h
@@ -20,6 +20,7 @@
#define ERRFILE_multiboot ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00030000 )
#define ERRFILE_nbi ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00040000 )
#define ERRFILE_pxe_image ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00050000 )
+#define ERRFILE_elfboot ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00060000 )
#define ERRFILE_undi ( ERRFILE_ARCH | ERRFILE_NET | 0x00000000 )
#define ERRFILE_undiload ( ERRFILE_ARCH | ERRFILE_NET | 0x00010000 )
diff --git a/src/config.h b/src/config.h
index 2d0980b0..e695b015 100644
--- a/src/config.h
+++ b/src/config.h
@@ -121,8 +121,7 @@
*
*/
#undef IMAGE_NBI /* NBI image support */
-#undef IMAGE_ELF64 /* ELF64 image support */
-#undef IMAGE_ELF /* ELF image support */
+#define IMAGE_ELF /* ELF image support */
#undef IMAGE_FREEBSD /* FreeBSD kernel image support */
#define IMAGE_MULTIBOOT /* MultiBoot image support */
#undef IMAGE_AOUT /* a.out image support */
diff --git a/src/core/config.c b/src/core/config.c
index 01f709c6..018f084a 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -131,11 +131,8 @@ REQUIRE_OBJECT ( nmb );
#ifdef IMAGE_NBI
REQUIRE_OBJECT ( nbi );
#endif
-#ifdef IMAGE_ELF64
-REQUIRE_OBJECT ( elf64 );
-#endif
#ifdef IMAGE_ELF
-REQUIRE_OBJECT ( elf );
+REQUIRE_OBJECT ( elfboot );
#endif
#ifdef IMAGE_FREEBSD
REQUIRE_OBJECT ( freebsd );
diff --git a/src/image/elf.c b/src/image/elf.c
index 75c976ea..b932ff58 100644
--- a/src/image/elf.c
+++ b/src/image/elf.c
@@ -21,6 +21,9 @@
*
* ELF image format
*
+ * A "pure" ELF image is not a bootable image. There are various
+ * bootable formats based upon ELF (e.g. Multiboot), which share
+ * common ELF-related functionality.
*/
#include <errno.h>
@@ -30,23 +33,11 @@
#include <gpxe/image.h>
#include <gpxe/elf.h>
-struct image_type elf_image_type __image_type ( PROBE_NORMAL );
-
typedef Elf32_Ehdr Elf_Ehdr;
typedef Elf32_Phdr Elf_Phdr;
typedef Elf32_Off Elf_Off;
/**
- * Execute ELF image
- *
- * @v image ELF file
- * @ret rc Return status code
- */
-static int elf_exec ( struct image *image __unused ) {
- return -ENOTSUP;
-}
-
-/**
* Load ELF segment into memory
*
* @v image ELF file
@@ -112,6 +103,9 @@ int elf_load ( struct image *image ) {
unsigned int phnum;
int rc;
+ /* Image type must already have been set by caller */
+ assert ( image->type != NULL );
+
/* Read ELF header */
copy_from_user ( &ehdr, image->data, 0, sizeof ( ehdr ) );
if ( memcmp ( &ehdr.e_ident[EI_MAG0], ELFMAG, SELFMAG ) != 0 ) {
@@ -119,10 +113,6 @@ int elf_load ( struct image *image ) {
return -ENOEXEC;
}
- /* This is an ELF image, valid or otherwise */
- if ( ! image->type )
- image->type = &elf_image_type;
-
/* Read ELF program headers */
for ( phoff = ehdr.e_phoff , phnum = ehdr.e_phnum ; phnum ;
phoff += ehdr.e_phentsize, phnum-- ) {
@@ -141,10 +131,3 @@ int elf_load ( struct image *image ) {
return 0;
}
-
-/** ELF image type */
-struct image_type elf_image_type __image_type ( PROBE_NORMAL ) = {
- .name = "ELF",
- .load = elf_load,
- .exec = elf_exec,
-};
diff --git a/src/include/gpxe/features.h b/src/include/gpxe/features.h
index a520131f..54498b5f 100644
--- a/src/include/gpxe/features.h
+++ b/src/include/gpxe/features.h
@@ -43,6 +43,7 @@
#define DHCP_EB_FEATURE_MULTIBOOT 0x19 /**< Multiboot format */
#define DHCP_EB_FEATURE_NBI 0x20 /**< NBI format */
#define DHCP_EB_FEATURE_PXE 0x21 /**< PXE format */
+#define DHCP_EB_FEATURE_ELF 0x22 /**< ELF format */
/** @} */
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-10 05:05:42 +0200