Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

internal/poll: simplify WriteMsg and ReadMsg on Windows

Browse source 
Let newWSAMsg retrieve the socket from the sync pool for unconnected
sockets instead of forcing the caller to do it.

Change-Id: I9b3d30bf3f5be187cbde5735d519b3b14f7b3008
Reviewed-on: https://go-review.googlesource.com/c/go/+/704116
Reviewed-by: Damien Neil <dneil@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Junyang Shao <shaojunyang@google.com>
This commit is contained in:
qmuntal 2025-09-16 09:14:47 +02:00 • committed by Quim Muntal
parent 16ae11a9e1
commit 15fbe3480b
2 changed files with 23 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/internal/poll/fd_windows.go
View file

@ -168,7 +168,7 @@ var wsaMsgPool = sync.Pool{
// newWSAMsg creates a new WSAMsg with the provided parameters. // newWSAMsg creates a new WSAMsg with the provided parameters.
// Use [freeWSAMsg] to free it. // Use [freeWSAMsg] to free it.
func newWSAMsg(p []byte, oob []byte, flags int, rsa *syscall.RawSockaddrAny) *windows.WSAMsg { func newWSAMsg(p []byte, oob []byte, flags int, unconnected bool) *windows.WSAMsg {
// The returned object can't be allocated in the stack because it is accessed asynchronously // The returned object can't be allocated in the stack because it is accessed asynchronously
// by Windows in between several system calls. If the stack frame is moved while that happens, // by Windows in between several system calls. If the stack frame is moved while that happens,
// then Windows may access invalid memory. // then Windows may access invalid memory.
@ -183,11 +183,9 @@ func newWSAMsg(p []byte, oob []byte, flags int, rsa *syscall.RawSockaddrAny) *wi
Buf: unsafe.SliceData(oob), Buf: unsafe.SliceData(oob),
} }
msg.Flags = uint32(flags) msg.Flags = uint32(flags)
msg.Name = syscall.Pointer(unsafe.Pointer(rsa)) if unconnected {
if rsa != nil { msg.Name = wsaRsaPool.Get().(*syscall.RawSockaddrAny)
msg.Namelen = int32(unsafe.Sizeof(*rsa)) msg.Namelen = int32(unsafe.Sizeof(syscall.RawSockaddrAny{}))
} else {
msg.Namelen = 0
} }
return msg return msg
} }
@ -198,6 +196,12 @@ func freeWSAMsg(msg *windows.WSAMsg) {
msg.Buffers.Buf = nil msg.Buffers.Buf = nil
msg.Control.Len = 0 msg.Control.Len = 0
msg.Control.Buf = nil msg.Control.Buf = nil
if msg.Name != nil {
*msg.Name = syscall.RawSockaddrAny{}
wsaRsaPool.Put(msg.Name)
msg.Name = nil
msg.Namelen = 0
}
wsaMsgPool.Put(msg) wsaMsgPool.Put(msg)
} }
@ -1355,9 +1359,7 @@ func (fd *FD) ReadMsg(p []byte, oob []byte, flags int) (int, int, int, syscall.S
p = p[:maxRW] p = p[:maxRW]
} }
rsa := wsaRsaPool.Get().(*syscall.RawSockaddrAny) msg := newWSAMsg(p, oob, flags, true)
defer wsaRsaPool.Put(rsa)
msg := newWSAMsg(p, oob, flags, rsa)
defer freeWSAMsg(msg) defer freeWSAMsg(msg)
n, err := fd.execIO(&fd.rop, func(o *operation) (qty uint32, err error) { n, err := fd.execIO(&fd.rop, func(o *operation) (qty uint32, err error) {
err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil) err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil)
@ -1366,7 +1368,7 @@ func (fd *FD) ReadMsg(p []byte, oob []byte, flags int) (int, int, int, syscall.S
err = fd.eofError(n, err) err = fd.eofError(n, err)
var sa syscall.Sockaddr var sa syscall.Sockaddr
if err == nil { if err == nil {
sa, err = rsa.Sockaddr() sa, err = msg.Name.Sockaddr()
} }
return n, int(msg.Control.Len), int(msg.Flags), sa, err return n, int(msg.Control.Len), int(msg.Flags), sa, err
} }
@ -1382,9 +1384,7 @@ func (fd *FD) ReadMsgInet4(p []byte, oob []byte, flags int, sa4 *syscall.Sockadd
p = p[:maxRW] p = p[:maxRW]
} }
rsa := wsaRsaPool.Get().(*syscall.RawSockaddrAny) msg := newWSAMsg(p, oob, flags, true)
defer wsaRsaPool.Put(rsa)
msg := newWSAMsg(p, oob, flags, rsa)
defer freeWSAMsg(msg) defer freeWSAMsg(msg)
n, err := fd.execIO(&fd.rop, func(o *operation) (qty uint32, err error) { n, err := fd.execIO(&fd.rop, func(o *operation) (qty uint32, err error) {
err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil) err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil)
@ -1392,7 +1392,7 @@ func (fd *FD) ReadMsgInet4(p []byte, oob []byte, flags int, sa4 *syscall.Sockadd
}) })
err = fd.eofError(n, err) err = fd.eofError(n, err)
if err == nil { if err == nil {
rawToSockaddrInet4(rsa, sa4) rawToSockaddrInet4(msg.Name, sa4)
} }
return n, int(msg.Control.Len), int(msg.Flags), err return n, int(msg.Control.Len), int(msg.Flags), err
} }
@ -1408,9 +1408,7 @@ func (fd *FD) ReadMsgInet6(p []byte, oob []byte, flags int, sa6 *syscall.Sockadd
p = p[:maxRW] p = p[:maxRW]
} }
rsa := wsaRsaPool.Get().(*syscall.RawSockaddrAny) msg := newWSAMsg(p, oob, flags, true)
defer wsaRsaPool.Put(rsa)
msg := newWSAMsg(p, oob, flags, rsa)
defer freeWSAMsg(msg) defer freeWSAMsg(msg)
n, err := fd.execIO(&fd.rop, func(o *operation) (qty uint32, err error) { n, err := fd.execIO(&fd.rop, func(o *operation) (qty uint32, err error) {
err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil) err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil)
@ -1418,7 +1416,7 @@ func (fd *FD) ReadMsgInet6(p []byte, oob []byte, flags int, sa6 *syscall.Sockadd
}) })
err = fd.eofError(n, err) err = fd.eofError(n, err)
if err == nil { if err == nil {
rawToSockaddrInet6(rsa, sa6) rawToSockaddrInet6(msg.Name, sa6)
} }
return n, int(msg.Control.Len), int(msg.Flags), err return n, int(msg.Control.Len), int(msg.Flags), err
} }
@ -1434,16 +1432,11 @@ func (fd *FD) WriteMsg(p []byte, oob []byte, sa syscall.Sockaddr) (int, int, err
} }
defer fd.writeUnlock() defer fd.writeUnlock()
var rsa *syscall.RawSockaddrAny msg := newWSAMsg(p, oob, 0, sa != nil)
if sa != nil {
rsa = wsaRsaPool.Get().(*syscall.RawSockaddrAny)
defer wsaRsaPool.Put(rsa)
}
msg := newWSAMsg(p, oob, 0, rsa)
defer freeWSAMsg(msg) defer freeWSAMsg(msg)
if sa != nil { if sa != nil {
var err error var err error
msg.Namelen, err = sockaddrToRaw(rsa, sa) msg.Namelen, err = sockaddrToRaw(msg.Name, sa)
if err != nil { if err != nil {
return 0, 0, err return 0, 0, err
} }
@ -1466,15 +1459,10 @@ func (fd *FD) WriteMsgInet4(p []byte, oob []byte, sa *syscall.SockaddrInet4) (in
} }
defer fd.writeUnlock() defer fd.writeUnlock()
var rsa *syscall.RawSockaddrAny msg := newWSAMsg(p, oob, 0, sa != nil)
if sa != nil {
rsa = wsaRsaPool.Get().(*syscall.RawSockaddrAny)
defer wsaRsaPool.Put(rsa)
}
msg := newWSAMsg(p, oob, 0, rsa)
defer freeWSAMsg(msg) defer freeWSAMsg(msg)
if sa != nil { if sa != nil {
msg.Namelen = sockaddrInet4ToRaw(rsa, sa) msg.Namelen = sockaddrInet4ToRaw(msg.Name, sa)
} }
n, err := fd.execIO(&fd.wop, func(o *operation) (qty uint32, err error) { n, err := fd.execIO(&fd.wop, func(o *operation) (qty uint32, err error) {
err = windows.WSASendMsg(fd.Sysfd, msg, 0, nil, &o.o, nil) err = windows.WSASendMsg(fd.Sysfd, msg, 0, nil, &o.o, nil)
@ -1494,15 +1482,10 @@ func (fd *FD) WriteMsgInet6(p []byte, oob []byte, sa *syscall.SockaddrInet6) (in
} }
defer fd.writeUnlock() defer fd.writeUnlock()
var rsa *syscall.RawSockaddrAny msg := newWSAMsg(p, oob, 0, sa != nil)
if sa != nil {
rsa = wsaRsaPool.Get().(*syscall.RawSockaddrAny)
defer wsaRsaPool.Put(rsa)
}
msg := newWSAMsg(p, oob, 0, rsa)
defer freeWSAMsg(msg) defer freeWSAMsg(msg)
if sa != nil { if sa != nil {
msg.Namelen = sockaddrInet6ToRaw(rsa, sa) msg.Namelen = sockaddrInet6ToRaw(msg.Name, sa)
} }
n, err := fd.execIO(&fd.wop, func(o *operation) (qty uint32, err error) { n, err := fd.execIO(&fd.wop, func(o *operation) (qty uint32, err error) {
err = windows.WSASendMsg(fd.Sysfd, msg, 0, nil, &o.o, nil) err = windows.WSASendMsg(fd.Sysfd, msg, 0, nil, &o.o, nil)

2
src/internal/syscall/windows/syscall_windows.go
View file

@ -261,7 +261,7 @@ var sendRecvMsgFunc struct {
} }
type WSAMsg struct { type WSAMsg struct {
Name syscall.Pointer Name *syscall.RawSockaddrAny
Namelen int32 Namelen int32
Buffers *syscall.WSABuf Buffers *syscall.WSABuf
BufferCount uint32 BufferCount uint32