From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 13 Jul 2020 19:34:17 +0000 (+0100)
Subject: [PATCH] Allow the kernel to start earlier than VM_MAX_ADDRESS
X-Git-Tag: archive/raspbian/2.31-1+rpi1^2~90
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c6150245fbef173fa19ffefc61fd8afec2ad931c;p=glibc.git

[PATCH] Allow the kernel to start earlier than VM_MAX_ADDRESS

VM_MAX_ADDRESS shouldn't be hardcoded in libc, the kernel should be able to
decide about it dynamically. This fixes glibc into supporting that. It's however
a bit hackish.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name tg-bigmem.diff
---

diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 574e25283..061d037a3 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -88,12 +88,28 @@ static void fmh(void) {
 	max=a; break;}
       fmha=a+=fmhs;}
     if (err) assert(err==KERN_NO_SPACE);
-    if (!fmha)fmhs=0;else{
-    fmhs=max-fmha;
-    err = __vm_map (__mach_task_self (),
-		    &fmha, fmhs, 0, 0, MACH_PORT_NULL, 0, 1,
-		    VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
-    assert_perror(err);}
+    if (!fmha)
+      fmhs=0;
+    else
+      while (1) {
+	fmhs=max-fmha;
+	if (fmhs == 0)
+	  break;
+	err = __vm_map (__mach_task_self (),
+			&fmha, fmhs, 0, 0, MACH_PORT_NULL, 0, 1,
+			VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
+	if (!err)
+	  break;
+	if (err != KERN_INVALID_ADDRESS && err != KERN_NO_SPACE)
+	  assert_perror(err);
+	vm_address_t new_max = (max - 1) & 0xf0000000U;
+	if (new_max >= max) {
+	  fmhs = 0;
+	  fmha = 0;
+	  break;
+	}
+	max = new_max;
+      }
   }
 /* XXX loser kludge for vm_map kernel bug */
 #endif