netstack/icmp: logs, replies in goroutine

Author: ignoramous

intra/netstack/forwarders.go

@@ -27,7 +27,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"math/rand"
-	"runtime/debug"
 	"sync"
 	"time"
 
@@ -143,10 +142,6 @@ type processor struct {
 
 // start starts the processor goroutine; thread-safe.
 func (p *processor) start(wg *sync.WaitGroup) {
-	debug.SetPanicOnFault(true)
-	// defer core.RecoverFn("ns.forwaders.start", p.e.notifyRestart)
-	defer core.Recover(core.Exit11, "ns.forwarder.start")
-
 	defer wg.Done()
 	defer p.sleeper.Done()
 	for {
@@ -166,14 +161,10 @@ func (p *processor) start(wg *sync.WaitGroup) {
 // deliverPackets delivers packets to the endpoint; thread-safe.
 func (p *processor) deliverPackets() {
 	testpanic := settings.PanicAtRandom.Load() && rand10pc()
-	code := core.Exit11
 	if testpanic {
-		code = core.DontExit
+		defer core.Recover(core.DontExit, "ns.forwarder.deliverPackets")
 	}
 
-	debug.SetPanicOnFault(true)
-	defer core.Recover(code, "ns.forwarder.deliverPackets")
-
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	for p.pkts.Len() > 0 {
@@ -317,9 +308,8 @@ func (m *supervisor) queuePacket(pkt *stack.PacketBuffer, hasEthHeader bool) {
 
 	p.mu.Lock()
 	defer p.mu.Unlock()
-	pkt.IncRef()
-	p.pkts.PushBack(pkt) // enqueue.
-	m.ready[pIdx] = true // ready to deliver enqueued packets.
+	p.pkts.PushBack(pkt.IncRef()) // enqueue.
+	m.ready[pIdx] = true          // ready to deliver enqueued packets.
 }
 
 // stop stops all processor goroutines.

intra/netstack/icmp.go

@@ -95,7 +95,7 @@ func (f *icmpForwarder) reply4(id stack.TransportEndpointID, pkt *stack.PacketBu
 	route, err := f.s.FindRoute(pkt.NICID, localAddr, l3.SourceAddress(), pkt.NetworkProtocolNumber, false /* multicastLoop */)
 	if err != nil {
 		log.W("icmp: v4: %s: no route on %v to %s <= %s", f.o, pkt.NICID, l3.DestinationAddress(), l3.SourceAddress())
-		return false // not handled
+		return // not handled
 	}
 
 	// github.com/google/gvisor/blob/9b4a7aa00/pkg/tcpip/network/ipv6/icmp.go#L1180

intra/netstack/icmpecho.go

@@ -162,8 +162,10 @@ func (r *icmpResponder) forward(h *icmpForwarder, pkt *stack.PacketBuffer, src,
 	// and netstack/icmp/icmp.go:func (h *icmpForwarder) reply6
 	local := dst.Addr().AsSlice()
 	remote := src.Addr().AsSlice()
-	if len(local) == 0 || len(remote) == 0 {
-		log.W("icmp: responder: forward: (sz: %d) empty addr; %s => %s", pkt.Size(), src, dst)
+
+	notok := len(local) == 0 || len(remote) == 0
+	logwv(notok)("icmp: responder: forward: (sz: %d) empty addr; %s => %s", pkt.Size(), src, dst)
+	if notok {
 		return false
 	}
 
@@ -174,9 +176,11 @@ func (r *icmpResponder) forward(h *icmpForwarder, pkt *stack.PacketBuffer, src,
 
 	switch pkt.NetworkProtocolNumber {
 	case header.IPv4ProtocolNumber:
-		return h.reply4(id, pkt)
+		core.Gx("icmpecho.reply4", func() { h.reply4(id, pkt) })
+		return true
 	case header.IPv6ProtocolNumber:
-		return h.reply6(id, pkt)
+		core.Gx("icmpecho.reply6", func() { h.reply6(id, pkt) })
+		return true
 	}
 
 	log.W("icmp: responder: unsupported proto: %d; %s => %s",