netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Enable leak checker in sharedmem tests.

Browse Source 
This change also adds packet cleanup after qDisc queue is closed. This is
required for sharedmem_server_test to pass.

PiperOrigin-RevId: 422682841
This commit is contained in:
Lucas Manning
2022-01-18 17:09:42 -08:00
committed by gVisor bot
parent 8c9dc0babf
commit 30f36c9c87
4 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tcpip/link/qdisc/fifo/fifo.go
+7
View File
@@ -69,6 +69,13 @@ func New(lower stack.LinkWriter, n int, queueLen int) stack.QueueingDiscipline {
go func() {
defer d.wg.Done()
qd.dispatchLoop()
qd.mu.Lock()
for qd.queue.Front() != nil {
p := qd.queue.Front()
qd.queue.Remove(p)
p.DecRef()
}
qd.mu.Unlock()
}()
}
return d
pkg/tcpip/link/sharedmem/BUILD
+4
View File
@@ -39,6 +39,8 @@ go_test(
srcs = ["sharedmem_test.go"],
library = ":sharedmem",
deps = [
"//pkg/refs",
"//pkg/refsvfs2",
"//pkg/sync",
"//pkg/tcpip",
"//pkg/tcpip/buffer",
@@ -57,6 +59,8 @@ go_test(
deps = [
":sharedmem",
"//pkg/log",
"//pkg/refs",
"//pkg/refsvfs2",
"//pkg/tcpip",
"//pkg/tcpip/adapters/gonet",
"//pkg/tcpip/header",
pkg/tcpip/link/sharedmem/sharedmem_server_test.go
+10
View File
@@ -22,6 +22,7 @@ import (
"io"
"net"
"net/http"
"os"
"strings"
"syscall"
"testing"
@@ -29,6 +30,8 @@ import (
"golang.org/x/sync/errgroup"
"golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/log"
"gvisor.dev/gvisor/pkg/refs"
"gvisor.dev/gvisor/pkg/refsvfs2"
"gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
"gvisor.dev/gvisor/pkg/tcpip/header"
@@ -287,3 +290,10 @@ func TestServerRoundTripStress(t *testing.T) {
t.Fatalf("request failed: %s", err)
}
}
func TestMain(m *testing.M) {
refs.SetLeakMode(refs.LeaksPanic)
code := m.Run()
refsvfs2.DoLeakCheck()
os.Exit(code)
}
pkg/tcpip/link/sharedmem/sharedmem_test.go
+25
View File
@@ -20,11 +20,14 @@ package sharedmem
import (
"bytes"
"math/rand"
"os"
"strings"
"testing"
"time"
"golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/refs"
"gvisor.dev/gvisor/pkg/refsvfs2"
"gvisor.dev/gvisor/pkg/sync"
"gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/buffer"
@@ -235,6 +238,7 @@ func TestSimpleSend(t *testing.T) {
pkt.NetworkProtocolNumber = proto
var pkts stack.PacketBufferList
pkts.PushBack(pkt)
defer pkts.DecRef()
if _, err := c.ep.WritePackets(pkts); err != nil {
t.Fatalf("WritePackets failed: %s", err)
}
@@ -310,6 +314,7 @@ func TestPreserveSrcAddressInSend(t *testing.T) {
pkt.NetworkProtocolNumber = proto
var pkts stack.PacketBufferList
defer pkts.DecRef()
pkts.PushBack(pkt)
if _, err := c.ep.WritePackets(pkts); err != nil {
t.Fatalf("WritePackets failed: %s", err)
@@ -360,6 +365,8 @@ func TestFillTxQueue(t *testing.T) {
// Each packet is uses no more than 40 bytes, so write that many packets
// until the tx queue if full.
// Each packet uses no more than 40 bytes, so write that many packets
// until the tx queue if full.
ids := make(map[uint64]struct{})
for i := queuePipeSize / 40; i > 0; i-- {
pkt := stack.NewPacketBuffer(stack.PacketBufferOptions{
@@ -372,8 +379,10 @@ func TestFillTxQueue(t *testing.T) {
var pkts stack.PacketBufferList
pkts.PushBack(pkt)
if _, err := c.ep.WritePackets(pkts); err != nil {
pkts.DecRef()
t.Fatalf("WritePackets failed unexpectedly: %s", err)
}
pkts.DecRef()
// Check that they have different IDs.
desc := c.txq.tx.Pull()
@@ -398,6 +407,7 @@ func TestFillTxQueue(t *testing.T) {
if _, ok := err.(*tcpip.ErrWouldBlock); !ok {
t.Fatalf("got WritePackets(...) = %s, want %s", err, &tcpip.ErrWouldBlock{})
}
pkts.DecRef()
}
// TestFillTxQueueAfterBadCompletion sends a bad completion, then sends packets
@@ -431,6 +441,7 @@ func TestFillTxQueueAfterBadCompletion(t *testing.T) {
if _, err := c.ep.WritePackets(pkts); err != nil {
t.Fatalf("WritePackets failed unexpectedly: %s", err)
}
pkts.DecRef()
}
// Complete the two writes twice.
@@ -458,6 +469,7 @@ func TestFillTxQueueAfterBadCompletion(t *testing.T) {
if _, err := c.ep.WritePackets(pkts); err != nil {
t.Fatalf("WritePackets failed unexpectedly: %s", err)
}
pkts.DecRef()
// Check that they have different IDs.
desc := c.txq.tx.Pull()
@@ -481,6 +493,7 @@ func TestFillTxQueueAfterBadCompletion(t *testing.T) {
if _, ok := err.(*tcpip.ErrWouldBlock); !ok {
t.Fatalf("got WritePackets(...) = %s, want %s", err, &tcpip.ErrWouldBlock{})
}
pkts.DecRef()
}
// TestFillTxMemory sends packets until the we run out of shared memory.
@@ -510,6 +523,7 @@ func TestFillTxMemory(t *testing.T) {
if _, err := c.ep.WritePackets(pkts); err != nil {
t.Fatalf("WritePackets failed unexpectedly: %s", err)
}
pkts.DecRef()
// Check that they have different IDs.
desc := c.txq.tx.Pull()
@@ -534,6 +548,7 @@ func TestFillTxMemory(t *testing.T) {
if _, ok := err.(*tcpip.ErrWouldBlock); !ok {
t.Fatalf("got WritePackets(...) = %s, want %s", err, &tcpip.ErrWouldBlock{})
}
pkts.DecRef()
}
// TestFillTxMemoryWithMultiBuffer sends packets until the we run out of
@@ -564,6 +579,7 @@ func TestFillTxMemoryWithMultiBuffer(t *testing.T) {
if _, err := c.ep.WritePackets(pkts); err != nil {
t.Fatalf("WritePackets failed unexpectedly: %s", err)
}
pkts.DecRef()
// Pull the posted buffer.
c.txq.tx.Pull()
@@ -584,6 +600,7 @@ func TestFillTxMemoryWithMultiBuffer(t *testing.T) {
if _, ok := err.(*tcpip.ErrWouldBlock); !ok {
t.Fatalf("got WritePackets(...) = %s, want %s", err, &tcpip.ErrWouldBlock{})
}
pkts.DecRef()
}
// Attempt to write the one-buffer packet again. It must succeed.
@@ -599,6 +616,7 @@ func TestFillTxMemoryWithMultiBuffer(t *testing.T) {
if _, err := c.ep.WritePackets(pkts); err != nil {
t.Fatalf("WritePackets failed unexpectedly: %s", err)
}
pkts.DecRef()
}
}
@@ -815,3 +833,10 @@ func TestCloseWhileWaitingToPost(t *testing.T) {
cleaned = true
c.ep.Wait()
}
func TestMain(m *testing.M) {
refs.SetLeakMode(refs.LeaksPanic)
code := m.Run()
refsvfs2.DoLeakCheck()
os.Exit(code)
}