net/batching: fix gro size handling for misordered UDP_GRO messages (#17842)

Fixes #17835

Signed-off-by: Sachin Iyer <siyer@detail.dev>
bradfitz/eventbus_too_slow
Sachin Iyer 3 weeks ago committed by GitHub
parent d37884c734
commit 16e90dcb27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -353,7 +353,7 @@ func getGSOSizeFromControl(control []byte) (int, error) {
)
for len(rem) > unix.SizeofCmsghdr {
hdr, data, rem, err = unix.ParseOneSocketControlMessage(control)
hdr, data, rem, err = unix.ParseOneSocketControlMessage(rem)
if err != nil {
return 0, fmt.Errorf("error parsing socket control message: %w", err)
}

@ -8,8 +8,11 @@ import (
"net"
"testing"
"unsafe"
"github.com/tailscale/wireguard-go/conn"
"golang.org/x/net/ipv6"
"golang.org/x/sys/unix"
"tailscale.com/net/packet"
)
@ -314,3 +317,36 @@ func TestMinReadBatchMsgsLen(t *testing.T) {
t.Fatalf("IdealBatchSize: %d != conn.IdealBatchSize(): %d", IdealBatchSize, conn.IdealBatchSize)
}
}
func Test_getGSOSizeFromControl_MultipleMessages(t *testing.T) {
// Test that getGSOSizeFromControl correctly parses UDP_GRO when it's not the first control message.
const expectedGSOSize = 1420
// First message: IP_TOS
firstMsgLen := unix.CmsgSpace(1)
firstMsg := make([]byte, firstMsgLen)
hdr1 := (*unix.Cmsghdr)(unsafe.Pointer(&firstMsg[0]))
hdr1.Level = unix.SOL_IP
hdr1.Type = unix.IP_TOS
hdr1.SetLen(unix.CmsgLen(1))
firstMsg[unix.SizeofCmsghdr] = 0
// Second message: UDP_GRO
secondMsgLen := unix.CmsgSpace(2)
secondMsg := make([]byte, secondMsgLen)
hdr2 := (*unix.Cmsghdr)(unsafe.Pointer(&secondMsg[0]))
hdr2.Level = unix.SOL_UDP
hdr2.Type = unix.UDP_GRO
hdr2.SetLen(unix.CmsgLen(2))
binary.NativeEndian.PutUint16(secondMsg[unix.SizeofCmsghdr:], expectedGSOSize)
control := append(firstMsg, secondMsg...)
gsoSize, err := getGSOSizeFromControl(control)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if gsoSize != expectedGSOSize {
t.Errorf("got GSO size %d, want %d", gsoSize, expectedGSOSize)
}
}

Loading…
Cancel
Save