Merge release-20201216.0-85-ge06c2b126 (automated)

2 files changed, 28 insertions, 0 deletions

diff --git a/pkg/sentry/memmap/file_range.go b/pkg/sentry/memmap/file_range.go
index e4c852a66..6f0b4bde4 100644
--- a/pkg/sentry/memmap/file_range.go
+++ b/pkg/sentry/memmap/file_range.go
@@ -13,27 +13,37 @@ type FileRange struct {
 
 // WellFormed returns true if r.Start <= r.End. All other methods on a Range
 // require that the Range is well-formed.
+//
+//go:nosplit
 func (r FileRange) WellFormed() bool {
 	return r.Start <= r.End
 }
 
 // Length returns the length of the range.
+//
+//go:nosplit
 func (r FileRange) Length() uint64 {
 	return r.End - r.Start
 }
 
 // Contains returns true if r contains x.
+//
+//go:nosplit
 func (r FileRange) Contains(x uint64) bool {
 	return r.Start <= x && x < r.End
 }
 
 // Overlaps returns true if r and r2 overlap.
+//
+//go:nosplit
 func (r FileRange) Overlaps(r2 FileRange) bool {
 	return r.Start < r2.End && r2.Start < r.End
 }
 
 // IsSupersetOf returns true if r is a superset of r2; that is, the range r2 is
 // contained within r.
+//
+//go:nosplit
 func (r FileRange) IsSupersetOf(r2 FileRange) bool {
 	return r.Start <= r2.Start && r.End >= r2.End
 }
@@ -41,6 +51,8 @@ func (r FileRange) IsSupersetOf(r2 FileRange) bool {
 // Intersect returns a range consisting of the intersection between r and r2.
 // If r and r2 do not overlap, Intersect returns a range with unspecified
 // bounds, but for which Length() == 0.
+//
+//go:nosplit
 func (r FileRange) Intersect(r2 FileRange) FileRange {
 	if r.Start < r2.Start {
 		r.Start = r2.Start
@@ -57,6 +69,8 @@ func (r FileRange) Intersect(r2 FileRange) FileRange {
 // CanSplitAt returns true if it is legal to split a segment spanning the range
 // r at x; that is, splitting at x would produce two ranges, both of which have
 // non-zero length.
+//
+//go:nosplit
 func (r FileRange) CanSplitAt(x uint64) bool {
 	return r.Contains(x) && r.Start < x
 }
diff --git a/pkg/sentry/memmap/mappable_range.go b/pkg/sentry/memmap/mappable_range.go
index 6b6c2c685..7b7312cb6 100644
--- a/pkg/sentry/memmap/mappable_range.go
+++ b/pkg/sentry/memmap/mappable_range.go
@@ -13,27 +13,37 @@ type MappableRange struct {
 
 // WellFormed returns true if r.Start <= r.End. All other methods on a Range
 // require that the Range is well-formed.
+//
+//go:nosplit
 func (r MappableRange) WellFormed() bool {
 	return r.Start <= r.End
 }
 
 // Length returns the length of the range.
+//
+//go:nosplit
 func (r MappableRange) Length() uint64 {
 	return r.End - r.Start
 }
 
 // Contains returns true if r contains x.
+//
+//go:nosplit
 func (r MappableRange) Contains(x uint64) bool {
 	return r.Start <= x && x < r.End
 }
 
 // Overlaps returns true if r and r2 overlap.
+//
+//go:nosplit
 func (r MappableRange) Overlaps(r2 MappableRange) bool {
 	return r.Start < r2.End && r2.Start < r.End
 }
 
 // IsSupersetOf returns true if r is a superset of r2; that is, the range r2 is
 // contained within r.
+//
+//go:nosplit
 func (r MappableRange) IsSupersetOf(r2 MappableRange) bool {
 	return r.Start <= r2.Start && r.End >= r2.End
 }
@@ -41,6 +51,8 @@ func (r MappableRange) IsSupersetOf(r2 MappableRange) bool {
 // Intersect returns a range consisting of the intersection between r and r2.
 // If r and r2 do not overlap, Intersect returns a range with unspecified
 // bounds, but for which Length() == 0.
+//
+//go:nosplit
 func (r MappableRange) Intersect(r2 MappableRange) MappableRange {
 	if r.Start < r2.Start {
 		r.Start = r2.Start
@@ -57,6 +69,8 @@ func (r MappableRange) Intersect(r2 MappableRange) MappableRange {
 // CanSplitAt returns true if it is legal to split a segment spanning the range
 // r at x; that is, splitting at x would produce two ranges, both of which have
 // non-zero length.
+//
+//go:nosplit
 func (r MappableRange) CanSplitAt(x uint64) bool {
 	return r.Contains(x) && r.Start < x
 }