Skip to content

fix(saiserver): remove VLAN member OID from MEMBER_LIST in RemoveVlanMember #763

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

Open
mohankarthik wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(saiserver): remove VLAN member OID from MEMBER_LIST in RemoveVlanMember #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60d3b48
fix(saiserver): synchronize vlan server map access with vlan.mu
mohankarthik Oct 21, 2026
7a7efd2
fix(saiserver): remove VLAN member OID from MEMBER_LIST in RemoveVlan…
mohankarthik Oct 21, 2026
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
90 changes: 77 additions & 13 deletions dataplane/saiserver/routing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ type vlanMember struct {
}

type vlan struct {
mu sync.Mutex
mu sync.RWMutex
saipb.UnimplementedVlanServer
mgr *attrmgr.AttrMgr
dataplane switchDataplaneAPI
Expand All @@ -1300,6 +1300,8 @@ func newVlan(mgr *attrmgr.AttrMgr, dataplane switchDataplaneAPI, s *grpc.Server)
}

func (vlan *vlan) vidByOid(oid uint64) (uint32, error) {
vlan.mu.RLock()
defer vlan.mu.RUnlock()
for v, o := range vlan.oidByVId {
if o == oid {
return v, nil
Expand All @@ -1309,6 +1311,8 @@ func (vlan *vlan) vidByOid(oid uint64) (uint32, error) {
}

func (vlan *vlan) memberByOid(oid uint64) *vlanMember {
vlan.mu.RLock()
defer vlan.mu.RUnlock()
for _, v := range vlan.vlans {
for mOid, member := range v {
if mOid == oid {
Expand All @@ -1320,8 +1324,8 @@ func (vlan *vlan) memberByOid(oid uint64) *vlanMember {
}

func (vlan *vlan) memberByPortId(oid uint64) *vlanMember {
vlan.mu.Lock()
defer vlan.mu.Unlock()
vlan.mu.RLock()
defer vlan.mu.RUnlock()
for _, v := range vlan.vlans {
for _, member := range v {
if member.PortID == oid {
Expand All @@ -1332,9 +1336,10 @@ func (vlan *vlan) memberByPortId(oid uint64) *vlanMember {
return nil
}

// oidByVid returns the VLAN OID for the given VLAN ID.
func (vlan *vlan) oidByVid(vid uint32) (uint64, bool) {
vlan.mu.Lock()
defer vlan.mu.Unlock()
vlan.mu.RLock()
defer vlan.mu.RUnlock()
oid, ok := vlan.oidByVId[vid]
return oid, ok
}
Expand Down Expand Up @@ -1368,9 +1373,6 @@ func (vlan *vlan) CreateVlan(ctx context.Context, r *saipb.CreateVlanRequest) (*
TamObject: []uint64{},
}
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()},
Expand All @@ -1388,6 +1390,14 @@ func (vlan *vlan) CreateVlan(ctx context.Context, r *saipb.CreateVlanRequest) (*
return nil, err
}

vlan.mu.Lock()
if _, ok := vlan.oidByVId[r.GetVlanId()]; ok {
vlan.mu.Unlock()
return nil, fmt.Errorf("found existing VLAN %d", r.GetVlanId())
}
vlan.vlans[id] = map[uint64]*vlanMember{}
vlan.oidByVId[r.GetVlanId()] = id
vlan.mu.Unlock()
return &saipb.CreateVlanResponse{
Oid: id,
}, nil
Expand Down Expand Up @@ -1530,7 +1540,12 @@ func (vlan *vlan) CreateVlanMember(ctx context.Context, r *saipb.CreateVlanMembe
vlanAttrResp.GetAttr().MemberList = append(vlanAttrResp.GetAttr().MemberList, mOid)
vlan.mgr.StoreAttributes(vOid, vlanAttrResp.GetAttr())
vlan.mu.Lock()
vlan.vlans[vOid][mOid] = &vlanMember{
members, ok := vlan.vlans[vOid]
if !ok {
vlan.mu.Unlock()
return nil, fmt.Errorf("cannot find VLAN with OID %d", vOid)
}
members[mOid] = &vlanMember{
Oid: mOid,
PortID: portID,
Vid: vId,
Expand All @@ -1541,7 +1556,10 @@ func (vlan *vlan) CreateVlanMember(ctx context.Context, r *saipb.CreateVlanMembe

// Fetch the original vlan from the old vlan member and remove the member from that vlan
if member != nil {
preVlanOid, _ := vlan.oidByVid(member.Vid)
preVlanOid, ok := vlan.oidByVid(member.Vid)
if !ok {
return nil, fmt.Errorf("cannot find VLAN OID for VID %d", member.Vid)
}
vlanAttrReq = &saipb.GetVlanAttributeRequest{Oid: preVlanOid, AttrType: []saipb.VlanAttr{saipb.VlanAttr_VLAN_ATTR_MEMBER_LIST}}
vlanAttrResp = &saipb.GetVlanAttributeResponse{}
if err := vlan.mgr.PopulateAttributes(vlanAttrReq, vlanAttrResp); err != nil {
Expand All @@ -1564,9 +1582,11 @@ func (vlan *vlan) CreateVlanMember(ctx context.Context, r *saipb.CreateVlanMembe
}

func (vlan *vlan) RemoveVlanMember(ctx context.Context, r *saipb.RemoveVlanMemberRequest) (*saipb.RemoveVlanMemberResponse, error) {
// Claim the member under the lock so that concurrent removals of the same
// OID cannot both proceed, then release the lock before issuing dataplane
// RPCs so vlan.mu is never held across calls into the dataplane. If the
// dataplane removal fails, the claim is undone so the call can be retried.
vlan.mu.Lock()
defer vlan.mu.Unlock()

var member *vlanMember
var targetVlanOid uint64
found := false
Expand All @@ -1581,18 +1601,24 @@ func (vlan *vlan) RemoveVlanMember(ctx context.Context, r *saipb.RemoveVlanMembe
}

if !found {
vlan.mu.Unlock()
return nil, fmt.Errorf("cannot find member with OID %d", r.GetOid())
}
delete(vlan.vlans[targetVlanOid], r.GetOid())
vlan.mu.Unlock()

nid, err := vlan.dataplane.ObjectNID(ctx, &fwdpb.ObjectNIDRequest{
ContextId: &fwdpb.ContextId{Id: vlan.dataplane.ID()},
ObjectId: &fwdpb.ObjectId{Id: fmt.Sprint(member.PortID)},
})
if err != nil {
slog.InfoContext(ctx, "Failed to find NID for port", "bridge_port", member.PortID, "err", err)
vlan.restoreMember(targetVlanOid, member)
return nil, err
}
if _, err := vlan.dataplane.TableEntryRemove(ctx, fwdconfig.TableEntryRemoveRequest(vlan.dataplane.ID(), VlanTable).AppendEntry(
fwdconfig.EntryDesc(fwdconfig.ExactEntry(fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_PORT_INPUT).WithUint64(nid.GetNid())))).Build()); err != nil {
vlan.restoreMember(targetVlanOid, member)
return nil, err
}
floodID := fmt.Sprintf("vlan_flood_%d", member.Vid)
Expand All @@ -1603,14 +1629,50 @@ func (vlan *vlan) RemoveVlanMember(ctx context.Context, r *saipb.RemoveVlanMembe
AggregateDel: &fwdpb.AggregatePortRemoveMemberUpdateDesc{PortId: &fwdpb.PortId{ObjectId: &fwdpb.ObjectId{Id: fmt.Sprint(member.PortID)}}},
}},
}); err != nil {
vlanReq := fwdconfig.TableEntryAddRequest(vlan.dataplane.ID(), VlanTable).AppendEntry(
fwdconfig.EntryDesc(fwdconfig.ExactEntry(fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_PORT_INPUT).WithUint64(nid.GetNid())))).Build()
if member.Mode != 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).WithValue(binary.BigEndian.AppendUint16(nil, uint16(member.Vid)))).Build(),
}
}
if _, rerr := vlan.dataplane.TableEntryAdd(ctx, vlanReq); rerr != nil {
slog.WarnContext(ctx, "RemoveVlanMember: failed to re-add VlanTable entry after PortUpdate failure", "port_id", member.PortID, "err", rerr)
}
vlan.restoreMember(targetVlanOid, member)
return nil, err
}

delete(vlan.vlans[targetVlanOid], r.GetOid())
// Remove the member OID from the parent VLAN's MEMBER_LIST attribute
// only once the dataplane removal has succeeded.
vlanAttrReq := &saipb.GetVlanAttributeRequest{Oid: targetVlanOid, AttrType: []saipb.VlanAttr{saipb.VlanAttr_VLAN_ATTR_MEMBER_LIST}}
vlanAttrResp := &saipb.GetVlanAttributeResponse{}
if err := vlan.mgr.PopulateAttributes(vlanAttrReq, vlanAttrResp); err != nil {
return nil, err
}
newMemList := []uint64{}
for _, id := range vlanAttrResp.GetAttr().GetMemberList() {
if id != r.GetOid() {
newMemList = append(newMemList, id)
}
}
vlanAttrResp.GetAttr().MemberList = newMemList
vlan.mgr.StoreAttributes(targetVlanOid, vlanAttrResp.GetAttr())

return &saipb.RemoveVlanMemberResponse{}, nil
}

// restoreMember re-inserts a member claimed by RemoveVlanMember after its
// dataplane removal failed, unless the parent VLAN has since been removed.
func (vlan *vlan) restoreMember(vlanOid uint64, member *vlanMember) {
vlan.mu.Lock()
defer vlan.mu.Unlock()
if members, ok := vlan.vlans[vlanOid]; ok {
members[member.Oid] = member
}
}

func (vlan *vlan) CreateVlanMembers(ctx context.Context, r *saipb.CreateVlanMembersRequest) (*saipb.CreateVlanMembersResponse, error) {
resp := &saipb.CreateVlanMembersResponse{}
for _, req := range r.GetReqs() {
Expand All @@ -1625,6 +1687,8 @@ func (vlan *vlan) CreateVlanMembers(ctx context.Context, r *saipb.CreateVlanMemb

func (vlan *vlan) Reset() {
slog.Info("resetting vlan")
vlan.mu.Lock()
defer vlan.mu.Unlock()
vlan.oidByVId = map[uint32]uint64{}
vlan.vlans = map[uint64]map[uint64]*vlanMember{}
}
Expand Down
Loading
Loading