Use a pool of arrays to avoid slice headers from escaping in TCP options pool.

By putting slices into the pool, the slice header escapes. This can be avoided
by not putting the slice header into the pool.

This removes an allocation from the TCP segment send path.

PiperOrigin-RevId: 299215480
This commit is contained in:
Ian Gudger 2020-03-05 15:55:40 -08:00 committed by gVisor bot
parent 6ec669631f
commit 9b3aad33c4
3 changed files with 34 additions and 3 deletions

View File

@ -32,6 +32,7 @@ go_library(
srcs = [ srcs = [
"accept.go", "accept.go",
"connect.go", "connect.go",
"connect_unsafe.go",
"cubic.go", "cubic.go",
"cubic_state.go", "cubic_state.go",
"dispatcher.go", "dispatcher.go",

View File

@ -624,17 +624,17 @@ func parseSynSegmentOptions(s *segment) header.TCPSynOptions {
var optionPool = sync.Pool{ var optionPool = sync.Pool{
New: func() interface{} { New: func() interface{} {
return make([]byte, maxOptionSize) return &[maxOptionSize]byte{}
}, },
} }
func getOptions() []byte { func getOptions() []byte {
return optionPool.Get().([]byte) return (*optionPool.Get().(*[maxOptionSize]byte))[:]
} }
func putOptions(options []byte) { func putOptions(options []byte) {
// Reslice to full capacity. // Reslice to full capacity.
optionPool.Put(options[0:cap(options)]) optionPool.Put(optionsToArray(options))
} }
func makeSynOptions(opts header.TCPSynOptions) []byte { func makeSynOptions(opts header.TCPSynOptions) []byte {

View File

@ -0,0 +1,30 @@
// Copyright 2018 The gVisor Authors.
//
// 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 tcp
import (
"reflect"
"unsafe"
)
// optionsToArray converts a slice of capacity >-= maxOptionSize to an array.
//
// optionsToArray panics if the capacity of options is smaller than
// maxOptionSize.
func optionsToArray(options []byte) *[maxOptionSize]byte {
// Reslice to full capacity.
options = options[0:maxOptionSize]
return (*[maxOptionSize]byte)(unsafe.Pointer((*reflect.SliceHeader)(unsafe.Pointer(&options)).Data))
}