Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dataplane/forwarding/fwdaction/actions/mirror_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ func TestMirror(t *testing.T) {
mirrored.EXPECT().Log().Return(testr.New(t)).AnyTimes()
mirrored.EXPECT().LogMsgs().Return(nil).AnyTimes()
mirrored.EXPECT().Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_MAC_DST, 0)).Return([]byte{0}, nil).AnyTimes()
mirrored.EXPECT().Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_TYPE, 0)).Return([]byte{0x08, 0x00}, nil).AnyTimes()
mirrored.EXPECT().Update(opFID, fwdpacket.OpSet, gomock.Any()).Return(nil).AnyTimes()
mirrored.EXPECT().Update(inFID, fwdpacket.OpSet, gomock.Any()).Return(nil).AnyTimes()
mirrored.EXPECT().Update(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_MAC_DST, 0),
Expand All @@ -217,6 +218,7 @@ func TestMirror(t *testing.T) {
original.EXPECT().Attributes().Return(nil).AnyTimes()
original.EXPECT().Log().Return(testr.New(t)).AnyTimes()
original.EXPECT().Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_MAC_SRC, 0)).Return([]byte{0}, nil).AnyTimes()
original.EXPECT().Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_TYPE, 0)).Return([]byte{0x08, 0x00}, nil).AnyTimes()
original.EXPECT().Field(opFID).Return(make([]byte, protocol.SizeUint64), nil).AnyTimes()
original.EXPECT().Field(inFID).Return(make([]byte, protocol.SizeUint64), nil).AnyTimes()

Expand Down
30 changes: 30 additions & 0 deletions dataplane/forwarding/fwdport/port.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ var CounterList = []fwdpb.CounterId{
fwdpb.CounterId_COUNTER_ID_TX_MULTICAST_PACKETS,
fwdpb.CounterId_COUNTER_ID_RX_BROADCAST_PACKETS,
fwdpb.CounterId_COUNTER_ID_RX_MULTICAST_PACKETS,
fwdpb.CounterId_COUNTER_ID_RX_IPV6_PACKETS,
fwdpb.CounterId_COUNTER_ID_TX_IPV6_PACKETS,
fwdpb.CounterId_COUNTER_ID_RX_IPV6_DROP_PACKETS,
fwdpb.CounterId_COUNTER_ID_TX_IPV6_DROP_PACKETS,
}

// A Port is an entry or exit point within the forwarding plane. Each port
Expand Down Expand Up @@ -271,6 +275,11 @@ func Input(port Port, packet fwdpacket.Packet, dir fwdpb.PortAction, ctx *fwdcon
}
}

ethType, err := packet.Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_TYPE, 0))
if err == nil && len(ethType) >= 2 && binary.BigEndian.Uint16(ethType) == 0x86dd {
port.Increment(fwdpb.CounterId_COUNTER_ID_RX_IPV6_PACKETS, 1)
}

packet.Log().V(1).Info("input packet", "port", port.ID(), "frame", fwdpacket.IncludeFrameInLog)
state, err := fwdaction.ProcessPacket(packet, port.Actions(dir), port)
if err != nil {
Expand All @@ -282,6 +291,12 @@ func Input(port Port, packet fwdpacket.Packet, dir fwdpb.PortAction, ctx *fwdcon
case fwdaction.DROP:
packet.Log().V(1).Info("input dropped frame", "port", port.ID(), "frame", fwdpacket.IncludeFrameInLog)
Increment(port, packet.Length(), fwdpb.CounterId_COUNTER_ID_RX_DROP_PACKETS, fwdpb.CounterId_COUNTER_ID_RX_DROP_OCTETS)

ethType, err := packet.Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_TYPE, 0))
if err == nil && len(ethType) >= 2 && binary.BigEndian.Uint16(ethType) == 0x86dd {
port.Increment(fwdpb.CounterId_COUNTER_ID_RX_IPV6_DROP_PACKETS, 1)
}

return nil

case fwdaction.CONSUME:
Expand All @@ -292,6 +307,10 @@ func Input(port Port, packet fwdpacket.Packet, dir fwdpb.PortAction, ctx *fwdcon
out, err := OutputPort(packet, ctx)
if err != nil {
Increment(port, packet.Length(), fwdpb.CounterId_COUNTER_ID_RX_DROP_PACKETS, fwdpb.CounterId_COUNTER_ID_RX_DROP_OCTETS)
ethType, err := packet.Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_TYPE, 0))
if err == nil && len(ethType) >= 2 && binary.BigEndian.Uint16(ethType) == 0x86dd {
port.Increment(fwdpb.CounterId_COUNTER_ID_RX_IPV6_DROP_PACKETS, 1)
}
return nil
}
packet.Log().V(3).Info("transmitting packet", "port", out.ID())
Expand Down Expand Up @@ -329,6 +348,11 @@ func Output(port Port, packet fwdpacket.Packet, dir fwdpb.PortAction, _ *fwdcont
}
}

ethType, err := packet.Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_TYPE, 0))
if err == nil && len(ethType) >= 2 && binary.BigEndian.Uint16(ethType) == 0x86dd {
port.Increment(fwdpb.CounterId_COUNTER_ID_TX_IPV6_PACKETS, 1)
}

packet.Log().V(3).Info("output packet", "frame", fwdpacket.IncludeFrameInLog)
state, err := fwdaction.ProcessPacket(packet, port.Actions(dir), port)
if err == nil && state == fwdaction.CONTINUE {
Expand All @@ -342,6 +366,12 @@ func Output(port Port, packet fwdpacket.Packet, dir fwdpb.PortAction, _ *fwdcont
case fwdaction.DROP:
packet.Log().V(1).Info("output dropped frame", "port", port.ID(), "frame", fwdpacket.IncludeFrameInLog)
Increment(port, packet.Length(), fwdpb.CounterId_COUNTER_ID_TX_DROP_PACKETS, fwdpb.CounterId_COUNTER_ID_TX_DROP_OCTETS)

ethType, err := packet.Field(fwdpacket.NewFieldIDFromNum(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_TYPE, 0))
if err == nil && len(ethType) >= 2 && binary.BigEndian.Uint16(ethType) == 0x86dd {
port.Increment(fwdpb.CounterId_COUNTER_ID_TX_IPV6_DROP_PACKETS, 1)
}

return nil
case fwdaction.CONSUME:
packet.Log().V(1).Info("consumed frame", "port", port.ID(), "frame", fwdpacket.IncludeFrameInLog)
Expand Down
6 changes: 6 additions & 0 deletions dataplane/saiserver/ports.go
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,12 @@ func (port *port) GetPortStats(ctx context.Context, req *saipb.GetPortStatsReque
resp.Values = append(resp.Values, counterMap[fwdpb.CounterId_COUNTER_ID_RX_DROP_PACKETS])
case saipb.PortStat_PORT_STAT_IF_OUT_DISCARDS:
resp.Values = append(resp.Values, counterMap[fwdpb.CounterId_COUNTER_ID_TX_DROP_PACKETS])
case saipb.PortStat_PORT_STAT_IPV6_IN_RECEIVES:
resp.Values = append(resp.Values, counterMap[fwdpb.CounterId_COUNTER_ID_RX_IPV6_PACKETS])
case saipb.PortStat_PORT_STAT_IPV6_IN_DISCARDS:
resp.Values = append(resp.Values, counterMap[fwdpb.CounterId_COUNTER_ID_RX_IPV6_DROP_PACKETS])
case saipb.PortStat_PORT_STAT_IPV6_OUT_UCAST_PKTS, saipb.PortStat_PORT_STAT_IPV6_OUT_NON_UCAST_PKTS, saipb.PortStat_PORT_STAT_IPV6_OUT_MCAST_PKTS:
resp.Values = append(resp.Values, counterMap[fwdpb.CounterId_COUNTER_ID_TX_IPV6_PACKETS])
default:
resp.Values = append(resp.Values, 0)
}
Expand Down
35 changes: 28 additions & 7 deletions proto/forwarding/forwarding_common.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions proto/forwarding/forwarding_common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,10 @@ enum CounterId {
COUNTER_ID_TX_MULTICAST_PACKETS = 42;
COUNTER_ID_RX_BROADCAST_PACKETS = 43;
COUNTER_ID_RX_MULTICAST_PACKETS = 44;
COUNTER_ID_RX_IPV6_PACKETS = 45;
COUNTER_ID_TX_IPV6_PACKETS = 46;
COUNTER_ID_RX_IPV6_DROP_PACKETS = 47;
COUNTER_ID_TX_IPV6_DROP_PACKETS = 48;
COUNTER_ID_MAX = 255; // Maximum counter id.
}

Expand Down
Loading