Skip to content

Commit 32d0aa1

Browse files
nhooyrnhooyr
committed
mask.go: Cleanup assembly and add nbio benchmark
1 parent 9d1b1f6 commit 32d0aa1

File tree

11 files changed

+79
-29
lines changed

11 files changed

+79
-29
lines changed

‎frame.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func writeFrameHeader(h header, w *bufio.Writer, buf []byte) (err error) {
186186
// See https://github.com/golang/go/issues/31586
187187
//
188188
//lint:ignore U1000 mask.go
189-
func maskGo(key uint32, b []byte) uint32 {
189+
func maskGo(b []byte, key uint32) uint32 {
190190
if len(b) >= 8 {
191191
key64 := uint64(key)<<32 | uint64(key)
192192

‎frame_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func Test_mask(t *testing.T) {
9797
key := []byte{0xa, 0xb, 0xc, 0xff}
9898
key32 := binary.LittleEndian.Uint32(key)
9999
p := []byte{0xa, 0xb, 0xc, 0xf2, 0xc}
100-
gotKey32 := mask(key32, p)
100+
gotKey32 := mask(p, key32)
101101

102102
expP := []byte{0, 0, 0, 0x0d, 0x6}
103103
assert.Equal(t, "p", expP, p)

‎internal/thirdparty/frame_test.go

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,43 @@ import (
88

99
"github.com/gobwas/ws"
1010
_ "github.com/gorilla/websocket"
11+
_ "github.com/lesismal/nbio/nbhttp/websocket"
1112

1213
_ "nhooyr.io/websocket"
1314
)
1415

15-
func basicMask(maskKey [4]byte, pos int, b []byte) int {
16+
func basicMask(b []byte, maskKey [4]byte, pos int) int {
1617
for i := range b {
1718
b[i] ^= maskKey[pos&3]
1819
pos++
1920
}
2021
return pos & 3
2122
}
2223

23-
//go:linkname gorillaMaskBytes github.com/gorilla/websocket.maskBytes
24-
func gorillaMaskBytes(key [4]byte, pos int, b []byte) int
24+
//go:linkname maskGo nhooyr.io/websocket.maskGo
25+
func maskGo(b []byte, key32 uint32) int
2526

26-
//go:linkname mask nhooyr.io/websocket.mask
27-
func mask(key32 uint32, b []byte) int
27+
//go:linkname maskAsm nhooyr.io/websocket.maskAsm
28+
func maskAsm(b *byte, len int, key32 uint32) uint32
2829

29-
//go:linkname maskGo nhooyr.io/websocket.maskGo
30-
func maskGo(key32 uint32, b []byte) int
30+
//go:linkname nbioMaskBytes github.com/lesismal/nbio/nbhttp/websocket.maskXOR
31+
func nbioMaskBytes(b, key []byte) int
32+
33+
//go:linkname gorillaMaskBytes github.com/gorilla/websocket.maskBytes
34+
func gorillaMaskBytes(key [4]byte, pos int, b []byte) int
3135

3236
func Benchmark_mask(b *testing.B) {
3337
sizes := []int{
34-
2,
35-
3,
36-
4,
3738
8,
3839
16,
3940
32,
4041
128,
42+
256,
4143
512,
44+
1024,
45+
2048,
4246
4096,
47+
8192,
4348
16384,
4449
}
4550

@@ -51,7 +56,7 @@ func Benchmark_mask(b *testing.B) {
5156
name: "basic",
5257
fn: func(b *testing.B, key [4]byte, p []byte) {
5358
for i := 0; i < b.N; i++ {
54-
basicMask(key, 0, p)
59+
basicMask(p, key, 0)
5560
}
5661
},
5762
},
@@ -63,7 +68,7 @@ func Benchmark_mask(b *testing.B) {
6368
b.ResetTimer()
6469

6570
for i := 0; i < b.N; i++ {
66-
maskGo(key32, p)
71+
maskGo(p, key32)
6772
}
6873
},
6974
},
@@ -74,7 +79,7 @@ func Benchmark_mask(b *testing.B) {
7479
b.ResetTimer()
7580

7681
for i := 0; i < b.N; i++ {
77-
mask(key32, p)
82+
maskAsm(&p[0], len(p), key32)
7883
}
7984
},
8085
},
@@ -95,16 +100,25 @@ func Benchmark_mask(b *testing.B) {
95100
}
96101
},
97102
},
103+
{
104+
name: "nbio",
105+
fn: func(b *testing.B, key [4]byte, p []byte) {
106+
keyb := key[:]
107+
for i := 0; i < b.N; i++ {
108+
nbioMaskBytes(p, keyb)
109+
}
110+
},
111+
},
98112
}
99113

100114
key := [4]byte{1, 2, 3, 4}
101115

102-
for _, size := range sizes {
103-
p := make([]byte, size)
116+
for _, fn := range fns {
117+
b.Run(fn.name, func(b *testing.B) {
118+
for _, size := range sizes {
119+
p := make([]byte, size)
104120

105-
b.Run(strconv.Itoa(size), func(b *testing.B) {
106-
for _, fn := range fns {
107-
b.Run(fn.name, func(b *testing.B) {
121+
b.Run(strconv.Itoa(size), func(b *testing.B) {
108122
b.SetBytes(int64(size))
109123

110124
fn.fn(b, key, p)

‎internal/thirdparty/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
github.com/gin-gonic/gin v1.9.1
99
github.com/gobwas/ws v1.3.0
1010
github.com/gorilla/websocket v1.5.0
11+
github.com/lesismal/nbio v1.3.18
1112
nhooyr.io/websocket v0.0.0-00010101000000-000000000000
1213
)
1314

@@ -25,6 +26,7 @@ require (
2526
github.com/json-iterator/go v1.1.12 // indirect
2627
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
2728
github.com/leodido/go-urn v1.2.4 // indirect
29+
github.com/lesismal/llib v1.1.12 // indirect
2830
github.com/mattn/go-isatty v0.0.19 // indirect
2931
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3032
github.com/modern-go/reflect2 v1.0.2 // indirect

‎internal/thirdparty/go.sum

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZX
4141
github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
4242
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
4343
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
44+
github.com/lesismal/llib v1.1.12 h1:KJFB8bL02V+QGIvILEw/w7s6bKj9Ps9Px97MZP2EOk0=
45+
github.com/lesismal/llib v1.1.12/go.mod h1:70tFXXe7P1FZ02AU9l8LgSOK7d7sRrpnkUr3rd3gKSg=
46+
github.com/lesismal/nbio v1.3.18 h1:kmJZlxjQpVfuCPYcXdv0Biv9LHVViJZet5K99Xs3RAs=
47+
github.com/lesismal/nbio v1.3.18/go.mod h1:KWlouFT5cgDdW5sMX8RsHASUMGniea9X0XIellZ0B38=
4448
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
4549
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
4650
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -67,19 +71,51 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
6771
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
6872
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
6973
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
74+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
7075
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
7176
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
7277
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
78+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
79+
golang.org/x/crypto v0.0.0-20210513122933-cd7d49e622d5/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
80+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
81+
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
7382
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
7483
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
84+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
85+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
86+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
87+
golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
88+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
89+
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
7590
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
7691
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
92+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
93+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
94+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
95+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
96+
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
97+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
98+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
7799
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
100+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
101+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
78102
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
79103
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
80104
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
105+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
106+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
107+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
108+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
109+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
110+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
111+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
112+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
81113
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
82114
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
115+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
116+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
117+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
118+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
83119
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
84120
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
85121
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=

‎mask.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
package websocket
44

5-
func mask(key uint32, b []byte) uint32 {
6-
return maskGo(key, b)
5+
func mask(b []byte, key uint32) uint32 {
6+
return maskGo(b, key)
77
}

‎mask_amd64.s

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ TEXT ·maskAsm(SB), NOSPLIT, $0-28
1919

2020
CMPQ CX, $8
2121
JL less_than_8
22-
CMPQ CX, $64
23-
JL less_than_64
2422
CMPQ CX, $512
2523
JLE sse
2624
TESTQ $31, AX

‎mask_arm64.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
TEXT ·maskAsm(SB), NOSPLIT, $0-28
55
// R0 = b
66
// R1 = len
7-
// R2 = uint64(key)<<32 | uint64(key)
87
// R3 = key (uint32)
8+
// R2 = uint64(key)<<32 | uint64(key)
99
MOVD b_ptr+0(FP), R0
1010
MOVD b_len+8(FP), R1
1111
MOVWU key+16(FP), R3

‎mask_asm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package websocket
44

5-
func mask(key uint32, b []byte) uint32 {
5+
func mask(b []byte, key uint32) uint32 {
66
if len(b) > 0 {
77
return maskAsm(&b[0], len(b), key)
88
}

‎read.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ func (c *Conn) handleControl(ctx context.Context, h header) (err error) {
289289
}
290290

291291
if h.masked {
292-
mask(h.maskKey, b)
292+
mask(b, h.maskKey)
293293
}
294294

295295
switch h.opcode {
@@ -453,7 +453,7 @@ func (mr *msgReader) read(p []byte) (int, error) {
453453
mr.payloadLength -= int64(n)
454454

455455
if !mr.c.client {
456-
mr.maskKey = mask(mr.maskKey, p)
456+
mr.maskKey = mask(p, mr.maskKey)
457457
}
458458

459459
return n, nil

‎write.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ func (c *Conn) writeFramePayload(p []byte) (n int, err error) {
365365
return n, err
366366
}
367367

368-
maskKey = mask(maskKey, c.writeBuf[i:c.bw.Buffered()])
368+
maskKey = mask(c.writeBuf[i:c.bw.Buffered()], maskKey)
369369

370370
p = p[j:]
371371
n += j

0 commit comments

Comments
 (0)