登录 注册
开源 企业版 高校版 私有云 Gitee AI NEW
扫描微信二维码支付
取消
支付完成
Watch
不关注 关注所有动态 仅关注版本发行动态 关注但不提醒动态
1 Star 0 Fork 98

nov1ce/grub2

forked from 余诗/grub2 
代码 Issues 0 Pull Requests 0 Wiki 统计 流水线
服务
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目，私有仓库也完全免费 ：）
免费加入
该仓库未声明开源许可证文件（LICENSE），使用请关注具体项目描述及其代码上游依赖。
项目仓库所选许可证以仓库主分支所使用许可证为准
克隆/下载
0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch 8.18 KB
一键复制 编辑 原始数据 按行查看 历史
zhangqiumiao 提交于 2022-03-07 17:05 . update to version 2.06
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Peter Jones <pjones@redhat.com>

Date: Thu, 11 Jul 2019 17:17:02 +0200

Subject: [PATCH] Try to pick better locations for kernel and initrd



- Don't limit allocations on 64-bit platforms to < 0x[37f]fffffff if

  we're using the "large" code model ; use __UINTPTR_MAX__.

- Get the comparison right to check the address we've allocated.

- Fix the allocation for the command line as well.



*But*, when we did this some systems started failing badly; coudln't

parse partition tables, etc.  What's going on here is the disk controller

is silently failing DMAs to addresses above 4GB, so we're trying to parse

uninitialized (or HW zeroed) ram when looking for the partition table,

etc.



So to limit this, we make grub_malloc() pick addresses below 4GB on

x86_64, but the direct EFI page allocation functions can get addresses

above that.



Additionally, we now try to locate kernel+initrd+cmdline+etc below

0x7fffffff, and if they're too big to fit any memory window there, then

we try a higher address.



Signed-off-by: Peter Jones <pjones@redhat.com>

[david.abdurachmanov: fix macro for riscv64]

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

Signed-off-by: Robbie Harwood <rharwood@redhat.com>

---

 grub-core/kern/efi/mm.c           |  8 ++++----

 grub-core/loader/i386/efi/linux.c | 24 +++++++++++++++++-------

 include/grub/arm/efi/memory.h     |  1 +

 include/grub/arm64/efi/memory.h   |  1 +

 include/grub/i386/efi/memory.h    |  1 +

 include/grub/ia64/efi/memory.h    |  1 +

 include/grub/riscv64/efi/memory.h |  1 +

 include/grub/x86_64/efi/memory.h  |  4 +++-

 8 files changed, 29 insertions(+), 12 deletions(-)



diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c

index 85ad4b4494c..e84961d078c 100644

--- a/grub-core/kern/efi/mm.c

+++ b/grub-core/kern/efi/mm.c

@@ -122,7 +122,7 @@ grub_efi_allocate_pages_max (grub_efi_physical_address_t max,

   grub_efi_boot_services_t *b;

   grub_efi_physical_address_t address = max;

 

-  if (max > 0xffffffff)

+  if (max > GRUB_EFI_MAX_USABLE_ADDRESS)

     return 0;

 

   b = grub_efi_system_table->boot_services;

@@ -480,7 +480,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,

     {

       if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY

 #if 1

-	  && desc->physical_start <= GRUB_EFI_MAX_USABLE_ADDRESS

+	  && desc->physical_start <= GRUB_EFI_MAX_ALLOCATION_ADDRESS

 #endif

 	  && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000

 	  && desc->num_pages != 0)

@@ -498,9 +498,9 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,

 #if 1

 	  if (BYTES_TO_PAGES (filtered_desc->physical_start)

 	      + filtered_desc->num_pages

-	      > BYTES_TO_PAGES_DOWN (GRUB_EFI_MAX_USABLE_ADDRESS))

+	      > BYTES_TO_PAGES_DOWN (GRUB_EFI_MAX_ALLOCATION_ADDRESS))

 	    filtered_desc->num_pages

-	      = (BYTES_TO_PAGES_DOWN (GRUB_EFI_MAX_USABLE_ADDRESS)

+	      = (BYTES_TO_PAGES_DOWN (GRUB_EFI_MAX_ALLOCATION_ADDRESS)

 		 - BYTES_TO_PAGES (filtered_desc->physical_start));

 #endif

 

diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

index 3017d0f3e52..33e981e76e7 100644

--- a/grub-core/loader/i386/efi/linux.c

+++ b/grub-core/loader/i386/efi/linux.c

@@ -27,6 +27,7 @@

 #include <grub/lib/cmdline.h>

 #include <grub/efi/efi.h>

 #include <grub/efi/linux.h>

+#include <grub/cpu/efi/memory.h>

 

 GRUB_MOD_LICENSE ("GPLv3+");

 

@@ -106,7 +107,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),

       size += ALIGN_UP (grub_file_size (files[i]), 4);

     }

 

-  initrd_mem = grub_efi_allocate_pages_max (0x3fffffff, BYTES_TO_PAGES(size));

+  initrd_mem = grub_efi_allocate_pages_max (GRUB_EFI_MAX_ALLOCATION_ADDRESS, BYTES_TO_PAGES(size));

+  if (!initrd_mem)

+    initrd_mem = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS, BYTES_TO_PAGES(size));

   if (!initrd_mem)

     {

       grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate initrd"));

@@ -202,8 +205,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

       goto fail;

     }

 

-  params = grub_efi_allocate_pages_max (0x3fffffff,

+  params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_ALLOCATION_ADDRESS,

 					BYTES_TO_PAGES(sizeof(*params)));

+  if (!params)

+    params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS,

+					  BYTES_TO_PAGES(sizeof(*params)));

   if (! params)

     {

       grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate kernel parameters");

@@ -273,8 +279,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

 #endif

 

   grub_dprintf ("linux", "setting up cmdline\n");

-  linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,

-					 BYTES_TO_PAGES(lh->cmdline_size + 1));

+  linux_cmdline = grub_efi_allocate_pages_max(GRUB_EFI_MAX_ALLOCATION_ADDRESS,

+					      BYTES_TO_PAGES(lh->cmdline_size + 1));

+  if (!linux_cmdline)

+    linux_cmdline = grub_efi_allocate_pages_max(GRUB_EFI_MAX_USABLE_ADDRESS,

+						BYTES_TO_PAGES(lh->cmdline_size + 1));

   if (!linux_cmdline)

     {

       grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));

@@ -301,11 +310,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

 

   kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,

 					   BYTES_TO_PAGES(lh->init_size));

-

   if (!kernel_mem)

-    kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,

+    kernel_mem = grub_efi_allocate_pages_max(GRUB_EFI_MAX_ALLOCATION_ADDRESS,

+					     BYTES_TO_PAGES(lh->init_size));

+  if (!kernel_mem)

+    kernel_mem = grub_efi_allocate_pages_max(GRUB_EFI_MAX_USABLE_ADDRESS,

 					     BYTES_TO_PAGES(lh->init_size));

-

   if (!kernel_mem)

     {

       grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel"));

diff --git a/include/grub/arm/efi/memory.h b/include/grub/arm/efi/memory.h

index 2c64918e3f7..a4c2ec83502 100644

--- a/include/grub/arm/efi/memory.h

+++ b/include/grub/arm/efi/memory.h

@@ -2,5 +2,6 @@

 #include <grub/efi/memory.h>

 

 #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff

+#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS

 

 #endif /* ! GRUB_MEMORY_CPU_HEADER */

diff --git a/include/grub/arm64/efi/memory.h b/include/grub/arm64/efi/memory.h

index c6cb3241714..acb61dca44b 100644

--- a/include/grub/arm64/efi/memory.h

+++ b/include/grub/arm64/efi/memory.h

@@ -2,5 +2,6 @@

 #include <grub/efi/memory.h>

 

 #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffffffULL

+#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS

 

 #endif /* ! GRUB_MEMORY_CPU_HEADER */

diff --git a/include/grub/i386/efi/memory.h b/include/grub/i386/efi/memory.h

index 2c64918e3f7..a4c2ec83502 100644

--- a/include/grub/i386/efi/memory.h

+++ b/include/grub/i386/efi/memory.h

@@ -2,5 +2,6 @@

 #include <grub/efi/memory.h>

 

 #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff

+#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS

 

 #endif /* ! GRUB_MEMORY_CPU_HEADER */

diff --git a/include/grub/ia64/efi/memory.h b/include/grub/ia64/efi/memory.h

index 2c64918e3f7..a4c2ec83502 100644

--- a/include/grub/ia64/efi/memory.h

+++ b/include/grub/ia64/efi/memory.h

@@ -2,5 +2,6 @@

 #include <grub/efi/memory.h>

 

 #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff

+#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS

 

 #endif /* ! GRUB_MEMORY_CPU_HEADER */

diff --git a/include/grub/riscv64/efi/memory.h b/include/grub/riscv64/efi/memory.h

index c6cb3241714..acb61dca44b 100644

--- a/include/grub/riscv64/efi/memory.h

+++ b/include/grub/riscv64/efi/memory.h

@@ -2,5 +2,6 @@

 #include <grub/efi/memory.h>

 

 #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffffffULL

+#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS

 

 #endif /* ! GRUB_MEMORY_CPU_HEADER */

diff --git a/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h

index 46e9145a308..e81cfb32213 100644

--- a/include/grub/x86_64/efi/memory.h

+++ b/include/grub/x86_64/efi/memory.h

@@ -2,9 +2,11 @@

 #include <grub/efi/memory.h>

 

 #if defined (__code_model_large__)

-#define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff

+#define GRUB_EFI_MAX_USABLE_ADDRESS __UINTPTR_MAX__

+#define GRUB_EFI_MAX_ALLOCATION_ADDRESS 0x7fffffff

 #else

 #define GRUB_EFI_MAX_USABLE_ADDRESS 0x7fffffff

+#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS

 #endif

 

 #endif /* ! GRUB_MEMORY_CPU_HEADER */
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/mynov1ce/grub2.git
git@gitee.com:mynov1ce/grub2.git
mynov1ce
grub2
grub2
master
点此查找更多帮助

搜索帮助

Git 命令在线学习 如何在 Gitee 导入 GitHub 仓库
Git 仓库基础操作
企业版和社区版功能对比
SSH 公钥设置
如何处理代码冲突
仓库体积过大，如何减小？
如何找回被删除的仓库数据
Gitee 产品配额说明
GitHub仓库快速导入Gitee及同步更新
什么是 Release（发行版）
将 PHP 项目自动发布到 packagist.org
仓库举报
回到顶部