Skip to content

feat(saiserver): add FDB/Flood tables, VLAN flood ports, and L2 tagging #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hardikharti merged 1 commit into from
Oct 26, 2026
Merged

feat(saiserver): add FDB/Flood tables, VLAN flood ports, and L2 tagging #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 2 additions & 18 deletions dataplane/saiserver/ports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ var getInterface = net.InterfaceByName
func getPreIngressPipeline() []*fwdpb.ActionDesc {
return []*fwdpb.ActionDesc{
fwdconfig.Action(fwdconfig.LookupAction(tunTermTable)).Build(), // Decap the packet if we have a tunnel.
fwdconfig.Action(fwdconfig.LookupAction(VlanTable)).Build(), // Classify incoming packets to VLAN.
fwdconfig.Action(fwdconfig.LookupAction(inputIfaceTable)).Build(), // Match packet to interface.
fwdconfig.Action(fwdconfig.LookupAction(IngressVRFTable)).Build(), // Match interface to VRF.
fwdconfig.Action(fwdconfig.LookupAction(PreIngressActionTable)).Build(), // Run pre-ingress actions.
Expand Down Expand Up @@ -101,7 +102,7 @@ func getL3Pipeline(skipIPValidation bool) []*fwdpb.ActionDesc {
func getL2Pipeline() []*fwdpb.ActionDesc {
return []*fwdpb.ActionDesc{
fwdconfig.Action(fwdconfig.LookupAction(IngressActionTable)).Build(), // Run ingress action.
fwdconfig.Action(fwdconfig.LookupAction(outputTable)).Build(), // Take final decision on forward, drop, or trap.
fwdconfig.Action(fwdconfig.LookupAction(FloodTable)).Build(), // Match VLAN tag or fallback to outputTable.
Comment thread
hardikharti marked this conversation as resolved.
{
ActionType: fwdpb.ActionType_ACTION_TYPE_OUTPUT,
},
Expand Down Expand Up @@ -327,23 +328,6 @@ func (port *port) CreatePort(ctx context.Context, req *saipb.CreatePortRequest)
NumberOfActivePorts: proto.Uint32(uint32(len(portList))),
})

nid, err := port.dataplane.ObjectNID(ctx, &fwdpb.ObjectNIDRequest{
ContextId: &fwdpb.ContextId{Id: port.dataplane.ID()},
ObjectId: &fwdpb.ObjectId{Id: fmt.Sprint(id)},
})
if err != nil {
slog.InfoContext(ctx, "Failed to find NID for port", "port", id, "err", err)
return nil, err
}
vlanReq := fwdconfig.TableEntryAddRequest(port.dataplane.ID(), VlanTable).AppendEntry(
fwdconfig.EntryDesc(fwdconfig.ExactEntry(fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_PORT_INPUT).WithUint64(nid.GetNid())))).Build()
vlanReq.Entries[0].Actions = []*fwdpb.ActionDesc{
fwdconfig.Action(fwdconfig.EncapAction(fwdpb.PacketHeaderId_PACKET_HEADER_ID_ETHERNET_VLAN)).Build(),
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG).WithUint64Value(uint64(attrs.GetPortVlanId()))).Build(),
}
if _, err := port.dataplane.TableEntryAdd(ctx, vlanReq); err != nil {
return nil, err
}
return &saipb.CreatePortResponse{
Oid: id,
}, nil
Expand Down
74 changes: 73 additions & 1 deletion dataplane/saiserver/routing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,6 +1360,24 @@ func (vlan *vlan) CreateVlan(ctx context.Context, r *saipb.CreateVlanRequest) (*
vlan.mgr.StoreAttributes(id, attrs)
vlan.vlans[id] = map[uint64]*vlanMember{}
vlan.oidByVId[r.GetVlanId()] = id

floodID := fmt.Sprintf("vlan_flood_%d", r.GetVlanId())
if _, err := vlan.dataplane.PortCreate(ctx, &fwdpb.PortCreateRequest{
ContextId: &fwdpb.ContextId{Id: vlan.dataplane.ID()},
Port: &fwdpb.PortDesc{PortType: fwdpb.PortType_PORT_TYPE_AGGREGATE_PORT, PortId: &fwdpb.PortId{ObjectId: &fwdpb.ObjectId{Id: floodID}}},
}); err != nil {
return nil, err
}
if _, err := vlan.dataplane.PortUpdate(ctx, &fwdpb.PortUpdateRequest{
ContextId: &fwdpb.ContextId{Id: vlan.dataplane.ID()},
PortId: &fwdpb.PortId{ObjectId: &fwdpb.ObjectId{Id: floodID}},
Update: &fwdpb.PortUpdateDesc{Port: &fwdpb.PortUpdateDesc_AggregateAlgo{
AggregateAlgo: &fwdpb.AggregatePortAlgorithmUpdateDesc{Hash: fwdpb.AggregateHashAlgorithm_AGGREGATE_HASH_ALGORITHM_FLOOD},
}},
}); err != nil {
return nil, err
}

return &saipb.CreateVlanResponse{
Oid: id,
}, nil
Expand Down Expand Up @@ -1442,12 +1460,56 @@ func (vlan *vlan) CreateVlanMember(ctx context.Context, r *saipb.CreateVlanMembe
if r.GetVlanTaggingMode() != saipb.VlanTaggingMode_VLAN_TAGGING_MODE_TAGGED {
vlanReq.Entries[0].Actions = []*fwdpb.ActionDesc{
fwdconfig.Action(fwdconfig.EncapAction(fwdpb.PacketHeaderId_PACKET_HEADER_ID_ETHERNET_VLAN)).Build(),
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG).WithUint64Value(uint64(vId))).Build(),
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG).WithValue(binary.BigEndian.AppendUint16(nil, uint16(vId)))).Build(),
}
}
if _, err := vlan.dataplane.TableEntryAdd(ctx, vlanReq); err != nil {
return nil, err
}
outputActions := []*fwdpb.ActionDesc{}
if r.GetVlanTaggingMode() == saipb.VlanTaggingMode_VLAN_TAGGING_MODE_UNTAGGED || r.GetVlanTaggingMode() == saipb.VlanTaggingMode_VLAN_TAGGING_MODE_PRIORITY_TAGGED {
outputActions = []*fwdpb.ActionDesc{
fwdconfig.Action(fwdconfig.DecapAction(fwdpb.PacketHeaderId_PACKET_HEADER_ID_ETHERNET_VLAN)).Build(),
}
}
portUpd := &fwdpb.PortUpdateRequest{
ContextId: &fwdpb.ContextId{Id: vlan.dataplane.ID()},
PortId: &fwdpb.PortId{ObjectId: &fwdpb.ObjectId{Id: fmt.Sprint(portID)}},
Update: &fwdpb.PortUpdateDesc{
Port: &fwdpb.PortUpdateDesc_Kernel{
Kernel: &fwdpb.KernelPortUpdateDesc{
Inputs: getPreIngressPipeline(),
Outputs: outputActions,
},
},
},
}
if _, err := vlan.dataplane.PortUpdate(ctx, portUpd); err != nil {
return nil, err
}
Comment thread
hardikharti marked this conversation as resolved.

floodID := fmt.Sprintf("vlan_flood_%d", vId)
if _, err := vlan.dataplane.PortUpdate(ctx, &fwdpb.PortUpdateRequest{
ContextId: &fwdpb.ContextId{Id: vlan.dataplane.ID()},
PortId: &fwdpb.PortId{ObjectId: &fwdpb.ObjectId{Id: floodID}},
Update: &fwdpb.PortUpdateDesc{Port: &fwdpb.PortUpdateDesc_AggregateAdd{
AggregateAdd: &fwdpb.AggregatePortAddMemberUpdateDesc{PortId: &fwdpb.PortId{ObjectId: &fwdpb.ObjectId{Id: fmt.Sprint(portID)}}, InstanceCount: 1},
}},
}); err != nil {
return nil, err
}
floodReq := fwdconfig.TableEntryAddRequest(vlan.dataplane.ID(), FloodTable).AppendEntry(
fwdconfig.EntryDesc(fwdconfig.ExactEntry(
fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG).WithBytes(binary.BigEndian.AppendUint16(nil, uint16(vId))),
fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_ACTION).WithBytes([]byte{1}),
)),
fwdconfig.TransmitAction(floodID),
fwdconfig.BridgeLearnAction(FDBTable),
fwdconfig.LookupAction(FDBTable),
).Build()
if _, err := vlan.dataplane.TableEntryAdd(ctx, floodReq); err != nil {
return nil, err
}
// Update the attributes and internal data.
vlanAttrReq := &saipb.GetVlanAttributeRequest{Oid: vOid, AttrType: []saipb.VlanAttr{saipb.VlanAttr_VLAN_ATTR_MEMBER_LIST}}
vlanAttrResp := &saipb.GetVlanAttributeResponse{}
Expand Down Expand Up @@ -1516,6 +1578,16 @@ func (vlan *vlan) RemoveVlanMember(ctx context.Context, r *saipb.RemoveVlanMembe
fwdconfig.EntryDesc(fwdconfig.ExactEntry(fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_PORT_INPUT).WithUint64(nid.GetNid())))).Build()); err != nil {
return nil, err
}
floodID := fmt.Sprintf("vlan_flood_%d", member.Vid)
if _, err := vlan.dataplane.PortUpdate(ctx, &fwdpb.PortUpdateRequest{
ContextId: &fwdpb.ContextId{Id: vlan.dataplane.ID()},
PortId: &fwdpb.PortId{ObjectId: &fwdpb.ObjectId{Id: floodID}},
Update: &fwdpb.PortUpdateDesc{Port: &fwdpb.PortUpdateDesc_AggregateDel{
AggregateDel: &fwdpb.AggregatePortRemoveMemberUpdateDesc{PortId: &fwdpb.PortId{ObjectId: &fwdpb.ObjectId{Id: fmt.Sprint(member.PortID)}}},
}},
}); err != nil {
return nil, err
}

delete(vlan.vlans[targetVlanOid], r.GetOid())

Expand Down
37 changes: 36 additions & 1 deletion dataplane/saiserver/switch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ const (
tunTermTable = "tun-term"
VlanTable = "vlan"
L2MCGroupTable = "l2mcg"
FDBTable = "fdb"
FloodTable = "flood"
policerTabler = "policerTable"
invalidIngress = "invalid-ingress"
invalidIngressV4Table = "invalid-ingress-v4"
Expand Down Expand Up @@ -410,7 +412,7 @@ func (sw *saiSwitch) CreateSwitch(ctx context.Context, _ *saipb.CreateSwitchRequ
Desc: &fwdpb.TableDesc{
TableType: fwdpb.TableType_TABLE_TYPE_EXACT,
TableId: &fwdpb.TableId{ObjectId: &fwdpb.ObjectId{Id: VlanTable}},
Actions: []*fwdpb.ActionDesc{{ActionType: fwdpb.ActionType_ACTION_TYPE_DROP}},
Actions: []*fwdpb.ActionDesc{{ActionType: fwdpb.ActionType_ACTION_TYPE_CONTINUE}},
Table: &fwdpb.TableDesc_Exact{
Exact: &fwdpb.ExactTableDesc{
FieldIds: []*fwdpb.PacketFieldId{{
Expand Down Expand Up @@ -773,6 +775,39 @@ func (sw *saiSwitch) CreateSwitch(ctx context.Context, _ *saipb.CreateSwitchRequ
return nil, err
}

fdbReq := &fwdpb.TableCreateRequest{
ContextId: &fwdpb.ContextId{Id: sw.dataplane.ID()},
Desc: &fwdpb.TableDesc{
TableType: fwdpb.TableType_TABLE_TYPE_BRIDGE,
TableId: &fwdpb.TableId{ObjectId: &fwdpb.ObjectId{Id: FDBTable}},
Table: &fwdpb.TableDesc_Bridge{
Bridge: &fwdpb.BridgeTableDesc{},
},
},
}
if _, err := sw.dataplane.TableCreate(ctx, fdbReq); err != nil {
return nil, err
}
floodReq := &fwdpb.TableCreateRequest{
ContextId: &fwdpb.ContextId{Id: sw.dataplane.ID()},
Desc: &fwdpb.TableDesc{
TableType: fwdpb.TableType_TABLE_TYPE_EXACT,
TableId: &fwdpb.TableId{ObjectId: &fwdpb.ObjectId{Id: FloodTable}},
Actions: []*fwdpb.ActionDesc{fwdconfig.Action(fwdconfig.LookupAction(outputTable)).Build()},
Table: &fwdpb.TableDesc_Exact{
Exact: &fwdpb.ExactTableDesc{
FieldIds: []*fwdpb.PacketFieldId{
{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG}},
{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_ACTION}},
},
},
},
},
}
if _, err := sw.dataplane.TableCreate(ctx, floodReq); err != nil {
return nil, err
}

myMAC := &fwdpb.TableCreateRequest{
ContextId: &fwdpb.ContextId{Id: sw.dataplane.ID()},
Desc: &fwdpb.TableDesc{
Expand Down
8 changes: 4 additions & 4 deletions dataplane/saiserver/vlan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package saiserver

import (
"context"
"encoding/binary"
"fmt"
"testing"

Expand Down Expand Up @@ -403,7 +404,7 @@ func TestCreateVlanMemberTaggingMode(t *testing.T) {
taggingMode: saipb.VlanTaggingMode_VLAN_TAGGING_MODE_UNTAGGED,
wantActions: []*fwdpb.ActionDesc{
fwdconfig.Action(fwdconfig.EncapAction(fwdpb.PacketHeaderId_PACKET_HEADER_ID_ETHERNET_VLAN)).Build(),
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG).WithUint64Value(uint64(vlanID))).Build(),
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG).WithValue(binary.BigEndian.AppendUint16(nil, uint16(vlanID)))).Build(),
},
}, {
desc: "tagged member preserves existing 802.1Q header without re-encapsulating",
Expand Down Expand Up @@ -447,8 +448,8 @@ func TestCreateVlanMemberTaggingMode(t *testing.T) {
t.Fatalf("CreateVlanMember failed: %v", err)
}

if len(dplane.gotEntryAddReqs) != 1 {
t.Fatalf("got %d TableEntryAdd requests, want 1", len(dplane.gotEntryAddReqs))
if len(dplane.gotEntryAddReqs) != 2 {
t.Fatalf("got %d TableEntryAdd requests, want 2", len(dplane.gotEntryAddReqs))
}
gotEntries := dplane.gotEntryAddReqs[0].GetEntries()
if len(gotEntries) != 1 {
Expand All @@ -460,4 +461,3 @@ func TestCreateVlanMemberTaggingMode(t *testing.T) {
})
}
}

Loading