Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jHbGe-0006HK-57 for mharc-grub-devel@gnu.org; Thu, 26 Mar 2020 18:46:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50550) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHbGb-0006HB-1U for grub-devel@gnu.org; Thu, 26 Mar 2020 18:46:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHbGZ-0004O9-0w for grub-devel@gnu.org; Thu, 26 Mar 2020 18:46:24 -0400 Received: from mga06.intel.com ([134.134.136.31]:27826) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHbGY-0004I9-OZ for grub-devel@gnu.org; Thu, 26 Mar 2020 18:46:22 -0400 IronPort-SDR: akfVWnye3RmCGb40NIC5duXoxzmaf1UAoGRYNOxUyoQyBSaRS6K9x6Ms5h+Cc44FwxnVoRYGRn fB0wqA6uYglg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2020 15:46:18 -0700 IronPort-SDR: xMPoMRhpfsiWqBGzlQPiNEDZ1YEWUXGAzt02vb+/NNNtyGtQSDMcJz7hrEUhG+Zx+a+yXPSrOl iEKSyCtFn9zA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,310,1580803200"; d="scan'208";a="358309329" Received: from nmnguye1-mobl.amr.corp.intel.com (HELO zedchen-MOBL.amr.corp.intel.com) ([10.255.74.48]) by fmsmga001.fm.intel.com with ESMTP; 26 Mar 2020 15:46:17 -0700 From: Zide Chen To: grub-devel@gnu.org Cc: Zide Chen Subject: [PATCH] multiboot2: enable quirk-modules-after-kernel Date: Thu, 26 Mar 2020 15:46:16 -0700 Message-Id: <1585262776-191-1-git-send-email-zide.chen@intel.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 134.134.136.31 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 22:46:26 -0000 In multiboot2, currently there is no way to control where to load the modules. In case of user wants to reserve low address for specific usage, this quirk is useful. Signed-off-by: Zide Chen --- grub-core/loader/i386/multiboot_mbi.c | 1 - grub-core/loader/multiboot.c | 23 ++++++++++++----------- grub-core/loader/multiboot_elfxx.c | 7 ++++--- grub-core/loader/multiboot_mbi2.c | 2 ++ include/grub/multiboot.h | 1 + include/grub/multiboot2.h | 8 ++++++++ 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c index ad3cc292fd18..18aaac847011 100644 --- a/grub-core/loader/i386/multiboot_mbi.c +++ b/grub-core/loader/i386/multiboot_mbi.c @@ -63,7 +63,6 @@ static int bootdev_set; static grub_size_t elf_sec_num, elf_sec_entsize; static unsigned elf_sec_shstrndx; static void *elf_sections; -grub_multiboot_quirks_t grub_multiboot_quirks; static grub_err_t load_kernel (grub_file_t file, const char *filename, diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c index 4a98d7082598..f9f66378dfb2 100644 --- a/grub-core/loader/multiboot.c +++ b/grub-core/loader/multiboot.c @@ -32,6 +32,8 @@ #include #define GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER GRUB_MULTIBOOT2_CONSOLE_FRAMEBUFFER #define GRUB_MULTIBOOT_CONSOLE_EGA_TEXT GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT +#define GRUB_MULTIBOOT_QUIRKS_NONE GRUB_MULTIBOOT2_QUIRKS_NONE +#define GRUB_MULTIBOOT_QUIRK_MODULES_AFTER_KERNEL GRUB_MULTIBOOT2_QUIRK_MODULES_AFTER_KERNEL #define GRUB_MULTIBOOT(x) grub_multiboot2_ ## x #else #include @@ -210,7 +212,8 @@ grub_multiboot_unload (void) return GRUB_ERR_NONE; } -static grub_uint64_t highest_load; +GRUB_MULTIBOOT (quirks_t) GRUB_MULTIBOOT (quirks); +grub_uint64_t GRUB_MULTIBOOT (highest_load); #define MULTIBOOT_LOAD_ELF64 #include "multiboot_elfxx.c" @@ -291,32 +294,32 @@ grub_cmd_multiboot (grub_command_t cmd __attribute__ ((unused)), grub_loader_unset (); - highest_load = 0; + GRUB_MULTIBOOT (highest_load) = 0; -#ifndef GRUB_USE_MULTIBOOT2 - grub_multiboot_quirks = GRUB_MULTIBOOT_QUIRKS_NONE; + GRUB_MULTIBOOT (quirks) = GRUB_MULTIBOOT_QUIRKS_NONE; int option_found = 0; do { option_found = 0; +#ifndef GRUB_USE_MULTIBOOT2 if (argc != 0 && grub_strcmp (argv[0], "--quirk-bad-kludge") == 0) { argc--; argv++; option_found = 1; - grub_multiboot_quirks |= GRUB_MULTIBOOT_QUIRK_BAD_KLUDGE; + GRUB_MULTIBOOT (quirks) |= GRUB_MULTIBOOT_QUIRK_BAD_KLUDGE; } +#endif if (argc != 0 && grub_strcmp (argv[0], "--quirk-modules-after-kernel") == 0) { argc--; argv++; option_found = 1; - grub_multiboot_quirks |= GRUB_MULTIBOOT_QUIRK_MODULES_AFTER_KERNEL; + GRUB_MULTIBOOT (quirks) |= GRUB_MULTIBOOT_QUIRK_MODULES_AFTER_KERNEL; } } while (option_found); -#endif if (argc == 0) return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); @@ -392,11 +395,9 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)), if (! file) return grub_errno; -#ifndef GRUB_USE_MULTIBOOT2 lowest_addr = 0x100000; - if (grub_multiboot_quirks & GRUB_MULTIBOOT_QUIRK_MODULES_AFTER_KERNEL) - lowest_addr = ALIGN_UP (highest_load + 1048576, 4096); -#endif + if (GRUB_MULTIBOOT (quirks) & GRUB_MULTIBOOT_QUIRK_MODULES_AFTER_KERNEL) + lowest_addr = ALIGN_UP (GRUB_MULTIBOOT (highest_load) + 1048576, 4096); size = grub_file_size (file); if (size) diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c index 70cd1db513e6..8adce7b3489b 100644 --- a/grub-core/loader/multiboot_elfxx.c +++ b/grub-core/loader/multiboot_elfxx.c @@ -89,17 +89,18 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) if (phdr(i)->p_type == PT_LOAD) { mld->link_base_addr = grub_min (mld->link_base_addr, phdr(i)->p_paddr); - highest_load = grub_max (highest_load, phdr(i)->p_paddr + phdr(i)->p_memsz); + GRUB_MULTIBOOT (highest_load) = grub_max (GRUB_MULTIBOOT (highest_load), + phdr(i)->p_paddr + phdr(i)->p_memsz); } #ifdef MULTIBOOT_LOAD_ELF64 - if (highest_load >= 0x100000000) + if (GRUB_MULTIBOOT(highest_load) >= 0x100000000) return grub_error (GRUB_ERR_BAD_OS, "segment crosses 4 GiB border"); #endif if (mld->relocatable) { - load_size = highest_load - mld->link_base_addr; + load_size = GRUB_MULTIBOOT(highest_load) - mld->link_base_addr; grub_dprintf ("multiboot_loader", "align=0x%lx, preference=0x%x, " "load_size=0x%x, avoid_efi_boot_services=%d\n", diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c index 18e766c7b31c..3883732df531 100644 --- a/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c @@ -315,8 +315,10 @@ grub_multiboot2_load (grub_file_t file, const char *filename) grub_free (mld.buffer); return err; } + mld.link_base_addr = load_addr; mld.load_base_addr = get_physical_target_address (ch); + grub_multiboot2_highest_load = mld.load_base_addr + code_size; source = get_virtual_current_address (ch); grub_dprintf ("multiboot_loader", "link_base_addr=0x%x, load_base_addr=0x%x, " diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h index bd0a9873e6c1..3d7c5ad29318 100644 --- a/include/grub/multiboot.h +++ b/include/grub/multiboot.h @@ -107,6 +107,7 @@ grub_multiboot_load_elf (mbi_load_data_t *mld); extern grub_size_t grub_multiboot_pure_size; extern grub_size_t grub_multiboot_alloc_mbi; extern grub_uint32_t grub_multiboot_payload_eip; +extern grub_uint64_t grub_multiboot_highest_load; #endif /* ! GRUB_MULTIBOOT_HEADER */ diff --git a/include/grub/multiboot2.h b/include/grub/multiboot2.h index 502d34ef1804..fa74508afcda 100644 --- a/include/grub/multiboot2.h +++ b/include/grub/multiboot2.h @@ -27,6 +27,13 @@ #include #include +typedef enum + { + GRUB_MULTIBOOT2_QUIRKS_NONE = 0, + GRUB_MULTIBOOT2_QUIRK_MODULES_AFTER_KERNEL = 1 + } grub_multiboot2_quirks_t; +extern grub_multiboot2_quirks_t grub_multiboot2_quirks; + extern struct grub_relocator *grub_multiboot2_relocator; void grub_multiboot2 (int argc, char *argv[]); @@ -99,6 +106,7 @@ grub_multiboot2_load_elf (mbi_load_data_t *mld); extern grub_size_t grub_multiboot2_pure_size; extern grub_size_t grub_multiboot2_alloc_mbi; extern grub_uint32_t grub_multiboot2_payload_eip; +extern grub_uint64_t grub_multiboot2_highest_load; #endif /* ! GRUB_MULTIBOOT_HEADER */ -- 2.17.1