From: Jeremy Faller <jeremy@golang.org>
Date: Wed, 22 Apr 2020 16:13:33 +0000 (-0400)
Subject: [dev.link] cmd/link: only allow heap area to grow to 10MB
X-Git-Tag: go1.15beta1~401^2^2~2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7466cad9c4f9a08133bfb9b3c99c70b4897eed0d;p=gostls13.git

[dev.link] cmd/link: only allow heap area to grow to 10MB

With CL 228782, we've removed file I/O, but we're growing the memory too
much. This change will periodically flush the heap area to the mmapped
area (if possible).

Change-Id: I1622c738ee5a1a6d02bff5abb0a5751caf8095c7
Reviewed-on: https://go-review.googlesource.com/c/go/+/229439
Run-TryBot: Jeremy Faller <jeremy@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
---

diff --git a/src/cmd/link/internal/ld/outbuf.go b/src/cmd/link/internal/ld/outbuf.go
index b58dee368b..cee589fc05 100644
--- a/src/cmd/link/internal/ld/outbuf.go
+++ b/src/cmd/link/internal/ld/outbuf.go
@@ -113,7 +113,9 @@ func (out *OutBuf) Close() error {
 		return viewCloseError
 	}
 	if out.isMmapped() {
-		return out.Munmap()
+		out.copyHeap()
+		out.munmap()
+		return nil
 	}
 	if out.f == nil {
 		return nil
@@ -135,26 +137,33 @@ func (out *OutBuf) isMmapped() bool {
 	return len(out.buf) != 0
 }
 
-// Munmap cleans up all the output buffer.
-func (out *OutBuf) Munmap() error {
-	wasMapped := out.isMmapped()
+// copyHeap copies the heap to the mmapped section of memory, returning true if
+// a copy takes place.
+func (out *OutBuf) copyHeap() bool {
+	if !out.isMmapped() { // only valuable for mmapped OutBufs.
+		return false
+	}
+	if out.isView {
+		panic("can't copyHeap a view")
+	}
+
 	bufLen := len(out.buf)
 	heapLen := len(out.heap)
 	total := uint64(bufLen + heapLen)
-	if wasMapped {
-		out.munmap()
-		if heapLen != 0 {
-			if err := out.Mmap(total); err != nil {
-				return err
-			}
-			copy(out.buf[bufLen:], out.heap[:heapLen])
-			out.heap = nil
-			out.munmap()
+	out.munmap()
+	if heapLen != 0 {
+		if err := out.Mmap(total); err != nil {
+			panic(err)
 		}
+		copy(out.buf[bufLen:], out.heap[:heapLen])
+		out.heap = out.heap[:0]
 	}
-	return nil
+	return true
 }
 
+// maxOutBufHeapLen limits the growth of the heap area.
+const maxOutBufHeapLen = 10 << 20
+
 // writeLoc determines the write location if a buffer is mmaped.
 // We maintain two write buffers, an mmapped section, and a heap section for
 // writing. When the mmapped section is full, we switch over the heap memory
@@ -176,6 +185,11 @@ func (out *OutBuf) writeLoc(lenToWrite int64) (int64, []byte) {
 		if out.isView {
 			panic("cannot write to heap in parallel")
 		}
+		// See if our heap would grow to be too large, and if so, copy it to the end
+		// of the mmapped area.
+		if heapLen > maxOutBufHeapLen && out.copyHeap() {
+			heapPos, heapLen, lenNeeded = 0, 0, lenToWrite
+		}
 		out.heap = append(out.heap, make([]byte, lenNeeded-heapLen)...)
 	}
 	return heapPos, out.heap