Succesfully loaded return-only module on ia64-emu

grub-core/kern/dl.c

@@ -37,6 +37,10 @@
 #define GRUB_MODULES_MACHINE_READONLY
 #endif
 
+#ifdef GRUB_MACHINE_EMU
+#include <sys/mman.h>
+#endif
+
 
 
 grub_dl_t grub_dl_head = 0;
@@ -233,11 +237,24 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
       if (s->sh_flags & SHF_ALLOC)
 	{
 	  grub_dl_segment_t seg;
+	  grub_size_t tramp_size = 0;
 
 	  seg = (grub_dl_segment_t) grub_malloc (sizeof (*seg));
 	  if (! seg)
 	    return grub_errno;
 
+	  tramp_size = grub_arch_dl_get_tramp_size (e, i);
+	  if (tramp_size && s->sh_addralign < GRUB_ARCH_DL_TRAMP_ALIGN)
+	    {
+	      s->sh_addralign = GRUB_ARCH_DL_TRAMP_ALIGN;
+	      s->sh_size = ALIGN_UP (s->sh_size, GRUB_ARCH_DL_TRAMP_ALIGN) + tramp_size;
+	    }
+#ifdef GRUB_MACHINE_EMU
+	  if (s->sh_addralign < 8192)
+	    s->sh_addralign = 8192;
+	  s->sh_size = ALIGN_UP (s->sh_size, 8192);
+#endif
+
 	  if (s->sh_size)
 	    {
 	      void *addr;
@@ -260,6 +277,10 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
 		}
 
 	      seg->addr = addr;
+#ifdef GRUB_MACHINE_EMU
+	      if (s->sh_flags & SHF_EXECINSTR)
+		mprotect (addr, s->sh_size, PROT_READ | PROT_WRITE | PROT_EXEC);
+#endif
 	    }
 	  else
 	    seg->addr = 0;
@@ -343,9 +364,9 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
 	      return grub_errno;
 
 	  if (grub_strcmp (name, "grub_mod_init") == 0)
-	    mod->init = (void (*) (grub_dl_t)) sym->st_value;
+	    mod->init = sym->st_value;
 	  else if (grub_strcmp (name, "grub_mod_fini") == 0)
-	    mod->fini = (void (*) (void)) sym->st_value;
+	    mod->fini = sym->st_value;
 	  break;
 
 	case STT_SECTION:
@@ -370,7 +391,16 @@ static void
 grub_dl_call_init (grub_dl_t mod)
 {
   if (mod->init)
-    (mod->init) (mod);
+    {
+#ifndef __ia64__
+      ((void (*) (grub_dl_t)) mod->init) (mod);
+#else
+      char *jmp[2];
+      jmp[0] = (char *) mod->init;
+      jmp[1] = mod->gp;
+      ((void (*) (grub_dl_t)) jmp) (mod);
+#endif
+    }
 }
 
 static grub_err_t
@@ -533,7 +563,7 @@ grub_dl_load_core (void *addr, grub_size_t size)
   grub_dl_flush_cache (mod);
 
   grub_dprintf ("modules", "module name: %s\n", mod->name);
-  grub_dprintf ("modules", "init function: %p\n", mod->init);
+  grub_dprintf ("modules", "init function: %" PRIxGRUB_ADDR "\n", mod->init);
   grub_dl_call_init (mod);
 
   if (grub_dl_add (mod))
@@ -633,7 +663,16 @@ grub_dl_unload (grub_dl_t mod)
     return 0;
 
   if (mod->fini)
-    (mod->fini) ();
+    {
+#ifndef __ia64__
+      ((void (*) (void)) mod->fini) ();
+#else
+      char *jmp[2];
+      jmp[0] = (char *) mod->fini;
+      jmp[1] = mod->gp;
+      ((void (*) (void)) jmp) ();
+#endif
+    }
 
   grub_dl_remove (mod);
   grub_dl_unregister_symbols (mod);

grub-core/kern/emu/cache.S

@@ -10,6 +10,7 @@
 #include "../mips/cache.S"
 #elif defined(__powerpc__)
 #include "../powerpc/cache.S"
+#elif defined(__ia64__)
 #else
 #error "No target cpu type is defined"
 #endif

grub-core/kern/emu/cache.c

@@ -1,4 +1,5 @@
 
+#if defined(__ia64__)
 #include <grub/cache.h>
 
 void __clear_cache (char *beg, char *end);
@@ -8,3 +9,5 @@ grub_arch_sync_caches (void *address, grub_size_t len)
 {
   __clear_cache (address, (char *) address + len);
 }
+#endif
+

grub-core/kern/emu/full.c

@@ -48,3 +48,12 @@ grub_emu_init (void)
 {
   grub_no_autoload = 1;
 }
+
+#ifdef __ia64__
+grub_size_t
+grub_arch_dl_get_tramp_size (const void *ehdr __attribute__ ((unused)),
+			     unsigned sec  __attribute__ ((unused)))
+{
+  return ~(grub_size_t)0;
+}
+#endif

grub-core/kern/emu/lite.c

@@ -15,6 +15,8 @@
 #include "../mips/dl.c"
 #elif defined(__powerpc__)
 #include "../powerpc/dl.c"
+#elif defined(__ia64__)
+#include "../ia64/dl.c"
 #else
 #error "No target cpu type is defined"
 #endif

grub-core/kern/ia64/dl.c

@@ -0,0 +1,288 @@
+/* dl.c - arch-dependent part of loadable module support */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2004,2005,2007,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+#include <grub/elf.h>
+#include <grub/misc.h>
+#include <grub/err.h>
+#include <grub/mm.h>
+
+/* Check if EHDR is a valid ELF header.  */
+grub_err_t
+grub_arch_dl_check_header (void *ehdr)
+{
+  Elf_Ehdr *e = ehdr;
+
+  /* Check the magic numbers.  */
+  if (e->e_ident[EI_CLASS] != ELFCLASS64
+      || e->e_ident[EI_DATA] != ELFDATA2LSB
+      || e->e_machine != EM_IA_64)
+    return grub_error (GRUB_ERR_BAD_OS, "invalid arch specific ELF magic");
+
+  return GRUB_ERR_NONE;
+}
+
+#define MASK20 ((1 << 20) - 1)
+#define MASK19 ((1 << 19) - 1)
+
+static void
+add_value_to_slot13_20 (Elf_Word *addr, grub_uint32_t value, int slot)
+{
+  grub_uint32_t *p __attribute__ ((aligned (1)));
+  switch (slot)
+    {
+    case 0:
+      p = (grub_uint32_t *) (addr + 2);
+      *p = (((((*p >> 2) & MASK20) + value) & MASK20) << 2) | (*p & ~(MASK20 << 2));
+      break;
+    case 1:
+      p = (grub_uint32_t *) ((grub_uint8_t *) addr + 7);
+      *p = (((((*p >> 3) & MASK20) + value) & MASK20) << 3) | (*p & ~(MASK20 << 3));
+      break;
+    case 2:
+      p = (grub_uint32_t *) ((grub_uint8_t *) addr + 12);
+      *p = (((((*p >> 4) & MASK20) + value) & MASK20) << 4) | (*p & ~(MASK20 << 4));
+      break;
+    }
+}
+
+static grub_uint8_t nopm[5] =
+  {
+    /* [MLX]       nop.m 0x0 */
+    0x05, 0x00, 0x00, 0x00, 0x01
+  };
+
+static grub_uint8_t jump[0x20] =
+  {
+    /* ld8 r16=[r15],8 */
+    0x02, 0x80, 0x20, 0x1e, 0x18, 0x14,
+    /* mov r14=r1;; */
+    0xe0, 0x00, 0x04, 0x00, 0x42, 0x00,
+    /* nop.i 0x0 */
+    0x00, 0x00, 0x04, 0x00,
+    /* ld8 r1=[r15] */
+    0x11, 0x08, 0x00, 0x1e, 0x18, 0x10,
+    /* mov b6=r16 */
+    0x60, 0x80, 0x04, 0x80, 0x03, 0x00,
+    /* br.few b6;; */
+    0x60, 0x00, 0x80, 0x00
+  };
+
+struct ia64_trampoline
+{
+  /* nop.m */
+  grub_uint8_t nop[5];
+  /* movl r15 = addr*/
+  grub_uint8_t addr_hi[6];
+  grub_uint8_t e0;
+  grub_uint8_t addr_lo[4];
+  grub_uint8_t jump[0x20];
+};
+
+static void
+make_trampoline (struct ia64_trampoline *tr, grub_uint64_t addr)
+{
+  grub_memcpy (tr->nop, nopm, sizeof (tr->nop));
+  tr->addr_hi[0] = ((addr & 0xc00000) >> 18);
+  tr->addr_hi[1] = (addr >> 24) & 0xff;
+  tr->addr_hi[2] = (addr >> 32) & 0xff;
+  tr->addr_hi[3] = (addr >> 40) & 0xff;
+  tr->addr_hi[4] = (addr >> 48) & 0xff;
+  tr->addr_hi[5] = (addr >> 56) & 0xff;
+  tr->e0 = 0xe0;
+  tr->addr_lo[0] = ((addr & 0x000f) << 4) | 0x01;
+  tr->addr_lo[1] = ((addr & 0x0070) >> 4) | ((addr & 0x070000) >> 11) | ((addr & 0x200000) >> 17);
+  tr->addr_lo[2] = ((addr & 0x1f80) >> 5) | ((addr & 0x180000) >> 19);
+  tr->addr_lo[3] = ((addr & 0xe000) >> 13) | 0x60;
+  grub_memcpy (tr->jump, jump, sizeof (tr->jump));
+}
+
+grub_size_t
+grub_arch_dl_get_tramp_size (const void *ehdr, unsigned sec)
+{
+  const Elf_Ehdr *e = ehdr;
+  int cnt = 0;
+  const Elf_Shdr *s;
+  Elf_Word entsize;
+  unsigned i;
+
+  /* Find a symbol table.  */
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_SYMTAB)
+      break;
+
+  if (i == e->e_shnum)
+    return 0;
+
+  entsize = s->sh_entsize;
+
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_RELA)
+      {
+	Elf_Rela *rel, *max;
+
+	if (s->sh_info != sec)
+	  continue;
+	
+	for (rel = (Elf_Rela *) ((char *) e + s->sh_offset),
+	       max = rel + s->sh_size / s->sh_entsize;
+	     rel < max; rel++)
+	    if (ELF_R_TYPE (rel->r_info) == R_IA64_PCREL21B)
+	      cnt++;
+      }
+
+  return cnt * sizeof (struct ia64_trampoline);
+}
+
+/* Relocate symbols.  */
+grub_err_t
+grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+{
+  Elf_Ehdr *e = ehdr;
+  Elf_Shdr *s;
+  Elf_Word entsize;
+  unsigned i;
+  grub_uint64_t *gp, *gpptr;
+  grub_size_t gp_size = 0;
+
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_REL)
+      {
+	grub_dl_segment_t seg;
+
+	/* Find the target segment.  */
+	for (seg = mod->segment; seg; seg = seg->next)
+	  if (seg->section == s->sh_info)
+	    break;
+
+	if (seg)
+	  {
+	    Elf_Rel *rel, *max;
+
+	    for (rel = (Elf_Rel *) ((char *) e + s->sh_offset),
+		   max = rel + s->sh_size / s->sh_entsize;
+		 rel < max;
+		 rel++)
+		switch (ELF_R_TYPE (rel->r_info))
+		  {
+		  default: break;
+		  }
+	  }
+      }
+
+  if (gp_size > MASK19)
+    return grub_error (GRUB_ERR_OUT_OF_RANGE, "gp too big");
+
+  gpptr = gp = grub_malloc (gp_size);
+  if (!gp)
+    return grub_errno;
+  mod->gp = (char *) gp;
+
+  /* Find a symbol table.  */
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_SYMTAB)
+      break;
+
+  if (i == e->e_shnum)
+    return grub_error (GRUB_ERR_BAD_MODULE, "no symtab found");
+
+  entsize = s->sh_entsize;
+
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_RELA)
+      {
+	grub_dl_segment_t seg;
+
+	/* Find the target segment.  */
+	for (seg = mod->segment; seg; seg = seg->next)
+	  if (seg->section == s->sh_info)
+	    break;
+
+	if (seg)
+	  {
+	    Elf_Rela *rel, *max;
+	    struct ia64_trampoline *tr;
+
+	    for (rel = (Elf_Rela *) ((char *) e + s->sh_offset),
+		   max = rel + s->sh_size / s->sh_entsize;
+		 rel < max;
+		 rel++)
+	      {
+		Elf_Word *addr;
+		Elf_Sym *sym;
+		grub_uint64_t value;
+		int slot = 0;
+
+		if (seg->size < (rel->r_offset & ~3))
+		  return grub_error (GRUB_ERR_BAD_MODULE,
+				     "reloc offset is out of the segment");
+
+		tr = (void *) ((char *) seg->addr + ALIGN_UP (seg->size, GRUB_ARCH_DL_TRAMP_ALIGN));
+
+		if (ELF_R_TYPE (rel->r_info) == R_IA64_PCREL21B)
+		  {
+		    addr = (Elf_Word *) ((char *) seg->addr + (rel->r_offset & ~3));
+		    slot = rel->r_offset & 3;
+		  }
+		else
+		  addr = (Elf_Word *) ((char *) seg->addr + rel->r_offset);
+		sym = (Elf_Sym *) ((char *) mod->symtab
+				     + entsize * ELF_R_SYM (rel->r_info));
+
+		/* On the PPC the value does not have an explicit
+		   addend, add it.  */
+		value = sym->st_value + rel->r_addend;
+		switch (ELF_R_TYPE (rel->r_info))
+		  {
+		  case R_IA64_PCREL21B:
+		    {
+		      grub_uint64_t noff;
+		      make_trampoline (tr, value);
+		      noff = ((char *) tr - (char *) addr) >> 4;
+		      tr++;
+		      if (noff & ~MASK19)
+			return grub_error (GRUB_ERR_BAD_OS,
+					   "trampoline offset too big");
+		      add_value_to_slot13_20 (addr, noff, slot);
+		    }
+		    break;
+		  case R_IA64_SEGREL64LSB:
+		    *(grub_uint64_t *) addr += value - rel->r_offset;
+		    break;
+		  default:
+		    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+				       "this relocation (0x%x) is not implemented yet",
+				       ELF_R_TYPE (rel->r_info));
+		  }
+	      }
+	  }
+      }
+
+  return GRUB_ERR_NONE;
+}

include/grub/dl.h

@@ -90,8 +90,11 @@ struct grub_dl
   grub_dl_dep_t dep;
   grub_dl_segment_t segment;
   Elf_Sym *symtab;
-  void (*init) (struct grub_dl *mod);
+  grub_addr_t init;
-  void (*fini) (void);
+  grub_addr_t fini;
+#ifdef __ia64__
+  char *gp;
+#endif
   struct grub_dl *next;
 };
 typedef struct grub_dl *grub_dl_t;
@@ -119,4 +122,17 @@ grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 void grub_arch_dl_init_linker (void);
 #endif
 
+#ifdef __ia64__
+grub_size_t grub_arch_dl_get_tramp_size (const void *ehdr, unsigned sec);
+#define GRUB_ARCH_DL_TRAMP_ALIGN 16
+#else
+static inline grub_size_t
+grub_arch_dl_get_tramp_size (const void *ehdr __attribute__ ((unused)), int sec __attribute__ ((unused)))
+{
+  return 0;
+}
+#define GRUB_ARCH_DL_TRAMP_ALIGN 1
+#endif
+
+
 #endif /* ! GRUB_DL_H */

include/grub/types.h

@@ -95,8 +95,10 @@ typedef grub_int64_t	grub_ssize_t;
 
 # if GRUB_CPU_SIZEOF_LONG == 8
 #  define PRIxGRUB_SIZE	"lx"
+#  define PRIxGRUB_ADDR	"lx"
 # else
 #  define PRIxGRUB_SIZE	"llx"
+#  define PRIxGRUB_ADDR	"llx"
 # endif
 #else
 typedef grub_uint32_t	grub_addr_t;
@@ -104,6 +106,7 @@ typedef grub_uint32_t	grub_size_t;
 typedef grub_int32_t	grub_ssize_t;
 
 # define PRIxGRUB_SIZE	"x"
+# define PRIxGRUB_ADDR	"x"
 #endif
 
 #if GRUB_CPU_SIZEOF_LONG == 8