From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ncT36-0001T5-P2 for mharc-grub-devel@gnu.org; Thu, 07 Apr 2022 10:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncItm-0005cg-Vu for grub-devel@gnu.org; Wed, 06 Apr 2022 23:33:30 -0400 Received: from mail.ispras.ru ([83.149.199.84]:38864) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncItk-0007RC-Nc for grub-devel@gnu.org; Wed, 06 Apr 2022 23:33:30 -0400 Received: from localhost.localdomain (unknown [80.240.223.29]) by mail.ispras.ru (Postfix) with ESMTPSA id C2D884076B36; Thu, 7 Apr 2022 03:32:59 +0000 (UTC) From: Baskov Evgeniy To: grub-devel@gnu.org Cc: Baskov Evgeniy Subject: [PATCH RFC 2/3] relocator: allocate trampoline in lower 640k Date: Thu, 7 Apr 2022 06:32:27 +0300 Message-Id: <20220407033228.30242-3-baskov@ispras.ru> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407033228.30242-1-baskov@ispras.ru> References: <20220407033228.30242-1-baskov@ispras.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=83.149.199.84; envelope-from=baskov@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 07 Apr 2022 10:23:41 -0400 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2022 03:33:31 -0000 For simplification, allocate trampoline in lower memory for every x86 variation. This would help setting right attributes for memory in UEFI environments that restricts execution of some memory regions. Signed-off-by: Baskov Evgeniy diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c index 54a1dcd8b..0b5a22dea 100644 --- a/grub-core/lib/i386/relocator.c +++ b/grub-core/lib/i386/relocator.c @@ -172,14 +172,13 @@ grub_relocator16_boot (struct grub_relocator *rel, grub_err_t grub_relocator64_boot (struct grub_relocator *rel, - struct grub_relocator64_state state, - grub_addr_t min_addr, grub_addr_t max_addr) + struct grub_relocator64_state state) { grub_err_t err; void *relst; grub_relocator_chunk_t ch; - err = grub_relocator_alloc_chunk_align_safe (rel, &ch, min_addr, max_addr, + err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0x1000, 0xa0000, RELOCATOR_SIZEOF (64), 16, GRUB_RELOCATOR_PREFERENCE_NONE, 0); if (err) diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c index 68ef1289a..131b6859f 100644 --- a/grub-core/lib/relocator.c +++ b/grub-core/lib/relocator.c @@ -24,6 +24,7 @@ #include #include #include +#include GRUB_MOD_LICENSE ("GPLv3+"); diff --git a/grub-core/lib/x86_64/efi/relocator.c b/grub-core/lib/x86_64/efi/relocator.c index 7d200a125..d438f9a05 100644 --- a/grub-core/lib/x86_64/efi/relocator.c +++ b/grub-core/lib/x86_64/efi/relocator.c @@ -47,10 +47,10 @@ grub_relocator64_efi_boot (struct grub_relocator *rel, grub_relocator_chunk_t ch; /* - * 64-bit relocator code may live above 4 GiB quite well. - * However, I do not want ask for problems. Just in case. + * GRUB relocator may be placed at any address but GRUB EFI setup code + * only guaranties the range [0x1000; 0xa0000) to be executable. */ - err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0, 0x100000000, + err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0, 0xa0000, RELOCATOR_SIZEOF (64_efi), 16, GRUB_RELOCATOR_PREFERENCE_NONE, 1); if (err) diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c index 799a24cd2..8b4ae5ba2 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -763,7 +763,7 @@ grub_freebsd_boot (void) stack[0] = entry; stack[1] = bi.tags; stack[2] = kern_end; - return grub_relocator64_boot (relocator, state, 0, 0x40000000); + return grub_relocator64_boot (relocator, state); } else { diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h index 2a56c3b54..0dbd1f25c 100644 --- a/include/grub/i386/relocator.h +++ b/include/grub/i386/relocator.h @@ -87,8 +87,7 @@ grub_err_t grub_relocator32_boot (struct grub_relocator *rel, int avoid_efi_bootservices); grub_err_t grub_relocator64_boot (struct grub_relocator *rel, - struct grub_relocator64_state state, - grub_addr_t min_addr, grub_addr_t max_addr); + struct grub_relocator64_state state); #ifdef GRUB_MACHINE_EFI #ifdef __x86_64__ -- 2.35.1