Convert []byte to string without copying in usermem.CopyStringIn.
This is the same technique used by Go's strings.Builder (https://golang.org/src/strings/builder.go#L45), and for the same reason. (We can't just use strings.Builder because there's no way to get the underlying []byte to pass to usermem.IO.CopyIn.) PiperOrigin-RevId: 240594892 Change-Id: Ic070e7e480aee53a71289c7c120850991358c52c
This commit is contained in:
parent
beb71ab681
commit
26583e413e
|
@ -25,6 +25,7 @@ go_library(
|
|||
"bytes_io_unsafe.go",
|
||||
"usermem.go",
|
||||
"usermem_arm64.go",
|
||||
"usermem_unsafe.go",
|
||||
"usermem_x86.go",
|
||||
],
|
||||
importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/usermem",
|
||||
|
|
|
@ -37,6 +37,8 @@ type IO interface {
|
|||
//
|
||||
// Preconditions: The caller must not hold mm.MemoryManager.mappingMu or
|
||||
// any following locks in the lock order.
|
||||
//
|
||||
// Postconditions: CopyOut does not retain src.
|
||||
CopyOut(ctx context.Context, addr Addr, src []byte, opts IOOpts) (int, error)
|
||||
|
||||
// CopyIn copies len(dst) bytes from the memory mapped at addr to dst.
|
||||
|
@ -45,6 +47,8 @@ type IO interface {
|
|||
//
|
||||
// Preconditions: The caller must not hold mm.MemoryManager.mappingMu or
|
||||
// any following locks in the lock order.
|
||||
//
|
||||
// Postconditions: CopyIn does not retain dst.
|
||||
CopyIn(ctx context.Context, addr Addr, dst []byte, opts IOOpts) (int, error)
|
||||
|
||||
// ZeroOut sets toZero bytes to 0, starting at addr. It returns the number
|
||||
|
@ -237,7 +241,7 @@ func CopyStringIn(ctx context.Context, uio IO, addr Addr, maxlen int, opts IOOpt
|
|||
if !ok {
|
||||
// Last page of kernel memory. The application can't use this
|
||||
// anyway.
|
||||
return string(buf[:done]), syserror.EFAULT
|
||||
return stringFromImmutableBytes(buf[:done]), syserror.EFAULT
|
||||
}
|
||||
// Read up to copyStringIncrement bytes at a time.
|
||||
readlen := copyStringIncrement
|
||||
|
@ -246,7 +250,7 @@ func CopyStringIn(ctx context.Context, uio IO, addr Addr, maxlen int, opts IOOpt
|
|||
}
|
||||
end, ok := start.AddLength(uint64(readlen))
|
||||
if !ok {
|
||||
return string(buf[:done]), syserror.EFAULT
|
||||
return stringFromImmutableBytes(buf[:done]), syserror.EFAULT
|
||||
}
|
||||
// Shorten the read to avoid crossing page boundaries, since faulting
|
||||
// in a page unnecessarily is expensive. This also ensures that partial
|
||||
|
@ -259,15 +263,15 @@ func CopyStringIn(ctx context.Context, uio IO, addr Addr, maxlen int, opts IOOpt
|
|||
// hitting err.
|
||||
for i, c := range buf[done : done+n] {
|
||||
if c == 0 {
|
||||
return string(buf[:done+i]), nil
|
||||
return stringFromImmutableBytes(buf[:done+i]), nil
|
||||
}
|
||||
}
|
||||
done += n
|
||||
if err != nil {
|
||||
return string(buf[:done]), err
|
||||
return stringFromImmutableBytes(buf[:done]), err
|
||||
}
|
||||
}
|
||||
return string(buf), syserror.ENAMETOOLONG
|
||||
return stringFromImmutableBytes(buf), syserror.ENAMETOOLONG
|
||||
}
|
||||
|
||||
// CopyOutVec copies bytes from src to the memory mapped at ars in uio. The
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
// Copyright 2019 Google LLC
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package usermem
|
||||
|
||||
import (
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
// stringFromImmutableBytes is equivalent to string(bs), except that it never
|
||||
// copies even if escape analysis can't prove that bs does not escape. This is
|
||||
// only valid if bs is never mutated after stringFromImmutableBytes returns.
|
||||
func stringFromImmutableBytes(bs []byte) string {
|
||||
// Compare strings.Builder.String().
|
||||
return *(*string)(unsafe.Pointer(&bs))
|
||||
}
|
Loading…
Reference in New Issue