[vpp] SAI RIF loopback packet action and pre-existing VPP vslib defect fixes by aaronber0614 · Pull Request #1983 · sonic-net/sonic-sairedis

aaronber0614 · 2026-07-09T21:07:44Z

Why I did it

Control-plane half of the RIF loopback packet action feature. Translate SAI_ROUTER_INTERFACE_ATTR_LOOPBACK_PACKET_ACTION into the sonic_ext plugin call iface_loopback_set_action, and surface the RIF tx_err counter from VPP. Reaching a green t1-lag-vpp run also required fixing pre-existing, feature-independent defects in the VS VPP layer that blocked the test at successive RIF shapes.

Feature tracking issue: sonic-net/sonic-buildimage#25788

How I did it

Feature:

Handle the attribute on RIF create, set, and remove.
Add a unified vpp_get_rif_hwif_name resolver (port, LAG, sub-port; VLAN resolves to bvi id).
Apply the action on the VLAN BVI create path.
Register the sonic_ext plugin msg_id_base and add the send and reply handlers for iface_loopback_set_action.
Add setRifStats to map VPP tx-error to SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS.

Pre-existing defect fixes (kept as separate commits, and can be split into their own PR if reviewers prefer):

vpp_safe_stoi guard for previously unguarded std::stoi calls.
Handle the Po id dot vlan and PortChannel id dot vlan RIF IP short form.
find_new_bond_id skips non-base PortChannel entries.

Note: an earlier version of this PR also carried a VLAN-RIF neighbor programming fix (dynamic hwif resolution via vpp_get_rif_hwif_name). That defect has since been fixed independently on master, which reworked addRemoveIpNbr with inline BVI (bvi id) resolution plus host-route and static-adjacency handling. On the latest merge from master this branch drops its own version in favor of the upstream implementation, so SwitchVppNbr.cpp carries no net change here.

Note: a mutex fix that was also found during this work is intentionally omitted here; it is already fixed upstream by #1971 and #1973.

How to verify it

Build libsaivs, deploy it into the syncd container, and run the iface_loopback_action sonic-mgmt module on vms-kvm-vpp-t1-lag. Expected result: 3 passed (basic, port_flap, reload).

This PR depends on the sonic_ext plugin PR in the series below; it includes the plugin API headers at build time.

Which release branch to backport (provide reason below if selected)

None.

Description for the changelog

Add SAI support for RIF loopback packet action on the VPP virtual switch, plus fixes for pre-existing VPP vslib defects.

Part of sonic-net/sonic-buildimage#25788.

PR series (landing order)

Tracking issue: sonic-net/sonic-buildimage#25788

HLD: [doc][vpp] HLD for Router Interface Loopback Packet Action on the VPP dataplane SONiC#2462
sonic_ext plugin, nodes and binary API: [vpp] Add sonic_ext RIF loopback packet action nodes and binary API sonic-platform-vpp#259
vslib/vpp SAI adapter and defect fixes: [vpp] SAI RIF loopback packet action and pre-existing VPP vslib defect fixes #1983 (depends on 2)
Testbed virtio ctrl_vlan off: [vpp][testbed] Disable virtio ctrl_vlan on VPP KVM DUTs sonic-mgmt#26035
Enablement, lands last: [vpp][ci] Enable iface_loopback_action test on the t1-lag-vpp testbed sonic-mgmt#26036 (depends on 2, 3, 4)

Translate SAI_ROUTER_INTERFACE_ATTR_LOOPBACK_PACKET_ACTION on router interface create and set into a call to the iface_loopback VPP plugin's binary API. SwitchVppRif: add vpp_set_interface_loopback_action(), wired into both vpp_create_router_interface and vpp_update_router_interface. The RIF is resolved to its hwif name via the existing vpp_get_hwif_name() helper (handles port, LAG/BondEthernet, and sub-ports); SAI_PACKET_ACTION_DROP maps to 1, everything else to 0 (forward). SaiVppXlate: add the iface_loopback plugin API include block, msg_id_base registration, the set_action reply handler, and a vpp_iface_loopback_set_action() send helper that resolves the hwif name to a sw_if_index via the existing get_swif_idx() helper. Depends on the iface_loopback plugin in sonic-platform-vpp. Issue: sonic-net/sonic-buildimage#25788 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Aaron Bernardino <aaronber@microsoft.com>

RIF counters (show interfaces counters rif) read 0 for every router interface on VPP because only PORT stats were wired to the VPP stats segment (setPortStats); ROUTER_INTERFACE fell through to the base virtual-switch handler which returns 0. Add setRifStats(), mirroring setPortStats(): resolve the RIF to its VPP hardware interface (port/LAG, including sub-ports via the outer VLAN id) and map the VPP interface counters to SAI_ROUTER_INTERFACE_STAT_*, including tx-error -> SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS. Wire it into getStatsExt for SAI_OBJECT_TYPE_ROUTER_INTERFACE. This makes RIF counters reflect dataplane activity and, in particular, surfaces the loopback (hairpin) drop tx-error increment in the RIF tx_err counter. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Aaron Bernardino <aaronber@microsoft.com>

VLAN router interfaces are backed by the bridge BVI (bvi<vlan-id>) rather than a port/LAG, so vpp_update_router_interface returned early for the VLAN type and never applied SAI_ROUTER_INTERFACE_ATTR_LOOPBACK_PACKET_ACTION, and setRifStats could not resolve their counters. Add a unified vpp_get_rif_hwif_name() resolver that maps any RIF (port, LAG, sub-port, or VLAN) to its backing VPP interface, handle the loopback action for VLAN RIFs on the BVI, and use the resolver in setRifStats so VLAN RIF counters are populated too. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Aaron Bernardino <aaronber@microsoft.com>

Fixes several pre-existing defects surfaced while enabling iface_loopback_action on the VPP KVM testbed, plus review hardening: - Guard every std::stoi on SONiC interface names with a shared vpp_safe_stoi() (SwitchVppUtils): an uncaught std::invalid_argument dropped syncd into shutdown-wait mode and stalled the whole pipeline. - Program VLAN RIF neighbors: resolve the backing VPP interface via vpp_get_rif_hwif_name() (bvi<id> for a VLAN RIF) in addRemoveIpNbr. - Add the PortChannel sub-port RIF IP on BondEthernet<id>.<vlan>, including SONiC's short Po<id>.<vlan> form, so the connected route resolves. - Skip PortChannel sub-interface entries in find_new_bond_id() so a bogus bond id 0 is not assigned to a real LAG. - Apply the loopback packet action symmetrically: on VLAN RIF create (vpp_create_bvi_interface) and clear it to FORWARD on RIF remove so a recycled interface does not inherit a stale DROP. - De-duplicate the loopback setters into vpp_apply_loopback_action and fix log/format hygiene (%u for uint32_t, descriptive parse tags, explicit <string>/<stdexcept> includes). Signed-off-by: Aaron Bernardino <aaronber@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

The RIF loopback packet action node moved from the standalone iface_loopback VPP plugin into the consolidated sonic_ext plugin (sonic-platform-vpp). Point the saivpp binding at sonic_ext's binary API: include the sonic_ext .api headers, look up the sonic_ext plugin msg-id base, and rename the api-version symbol. The API message name (iface_loopback_set_action) is unchanged, so the generated VL_API_* / vl_api_* symbols and the vpp_iface_loopback_set_action() send helper are unchanged. Signed-off-by: Aaron Bernardino <aaronber@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

mssonicbld · 2026-07-09T21:07:52Z

/azp run

azure-pipelines · 2026-07-09T21:08:06Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Aaron Bernardino <aaronber@microsoft.com> # Conflicts: # vslib/vpp/vppxlate/SaiVppXlate.c # vslib/vpp/vppxlate/SaiVppXlate.h

mssonicbld · 2026-07-21T11:57:20Z

/azp run

azure-pipelines · 2026-07-21T11:57:32Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Copilot

Pull request overview

Adds control-plane support in the VPP virtual switch layer for SAI RIF loopback packet action, wiring SAI_ROUTER_INTERFACE_ATTR_LOOPBACK_PACKET_ACTION through the sonic_ext VPP plugin, and enhances VPP-backed stats/translation utilities to unblock t1-lag-vpp testing across additional RIF shapes.

Changes:

Integrate sonic_ext plugin API into the VPP xlate layer and add an RPC (vpp_iface_loopback_set_action) to apply loopback action per interface.
Add a unified RIF→VPP hwif resolver (port/LAG/sub-port/VLAN BVI) and use it for VLAN-RIF neighbor programming and loopback action application (create/set/remove paths).
Improve robustness by adding vpp_safe_stoi, fixing PortChannel sub-interface name handling, tightening bond-id discovery filtering, and exposing VPP tx_error via RIF stats.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
vslib/vpp/vppxlate/SaiVppXlate.h	Declares the new VPP API shim for loopback action.
vslib/vpp/vppxlate/SaiVppXlate.c	Registers `sonic_ext` plugin message base + reply handler and implements `vpp_iface_loopback_set_action`.
vslib/vpp/SwitchVppUtils.h	Declares `vpp_safe_stoi` helper for guarded integer parsing.
vslib/vpp/SwitchVppUtils.cpp	Implements `vpp_safe_stoi` with exception handling + logging.
vslib/vpp/SwitchVppRif.cpp	Adds RIF hwif resolver and applies loopback action on RIF create/set/remove; replaces unsafe `stoi` call sites; improves PortChannel sub-port mapping.
vslib/vpp/SwitchVppNbr.cpp	Uses the unified RIF hwif resolver so VLAN RIF neighbors are programmed into VPP.
vslib/vpp/SwitchVppFdb.cpp	Applies loopback action on VLAN BVI create path; filters non-base PortChannel entries when discovering new bond IDs.
vslib/vpp/SwitchVpp.h	Declares new loopback helpers, hwif resolver, and `setRifStats`.
vslib/vpp/SwitchVpp.cpp	Implements `setRifStats` and hooks it into stats retrieval to surface VPP tx/rx error counters on RIFs.

+    const char *hwif_name = ifname.c_str();
+    int action = (packet_action == SAI_PACKET_ACTION_DROP) ? 1 : 0;
+
+    int ret = vpp_iface_loopback_set_action(hwif_name, action);
+    SWSS_LOG_NOTICE("Setting router interface loopback action %s to %s (ret %d)",
+                    hwif_name, action ? "drop" : "forward", ret);
+
+    return (ret != 0) ? SAI_STATUS_FAILURE : SAI_STATUS_SUCCESS;
+}



 namespace saivs
 {


Re-integrate the SAI RIF loopback packet action after upstream landed a large VPP vslib refactor (MPLS, mirror, hostif, port-speed, and a rework of the neighbor and BVI-update paths). Conflict resolutions: - SwitchVpp.h: keep both the loopback method decls and upstream vpp_set_port_speed. - SaiVppXlate.c: keep both the iface_loopback reply handler and upstream MPLS reply handlers in the msg-id table. - SwitchVppRif.cpp: keep all four loopback helpers alongside upstream vpp_set_port_speed; add the loopback attribute handler next to upstream's new MPLS handler in create/update RIF; on the VLAN branch, apply the loopback action then delegate to upstream's new vpp_update_bvi_interface (MAC/MTU). - SwitchVppNbr.cpp: take upstream's addRemoveIpNbr. Upstream independently reimplemented the VLAN-RIF neighbor programming (host-route + static adjacency, inline bvi<vlan-id> resolution), which supersedes this branch's earlier vpp_get_rif_hwif_name-based neighbor fix. Defect fixes vpp_safe_stoi, find_new_bond_id non-base skip, and the PortChannel Po<id>.<vlan> short-form handling are retained (auto-merged). The VLAN-RIF neighbor fix is dropped as redundant with upstream. Signed-off-by: Aaron Bernardino <aaronber@microsoft.com>

mssonicbld · 2026-08-14T13:31:22Z

/azp run

azure-pipelines · 2026-08-14T13:31:34Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Master advanced (sflow interface APIs, sonic_ext ip2me, PortChannel RIF fix). Conflict resolutions: - SaiVppXlate.c/.h: keep both the loopback and upstream sflow externs; converge the sonic_ext plugin msg-id registration onto upstream's canonical sonic_ext_msg_id_base / SONIC_EXT_MSG_ID (the iface_loopback message is a sonic_ext plugin message), dropping this branch's redundant iface_loopback_msg_id_base duplicate. - SwitchVppRif.cpp: upstream independently fixed the long-form PortChannel<id>.<vlan> RIF-IP resolution (defect sonic-net#4); take upstream's version and keep only this branch's additional Po<id>.<vlan> short-form branch that upstream lacks. Also address two Copilot review suggestions: - vpp_apply_loopback_action now rejects any sai_packet_action_t other than FORWARD/DROP (SAI_STATUS_NOT_SUPPORTED) instead of silently mapping TRAP/LOG/COPY to forward. - SwitchVppUtils.h includes <string> directly instead of relying on a transitive include. Signed-off-by: Aaron Bernardino <aaronber@microsoft.com>

mssonicbld · 2026-08-31T14:18:45Z

/azp run

azure-pipelines · 2026-08-31T14:18:59Z

Azure Pipelines: Successfully started running 1 pipeline(s).

aaronber0614 and others added 5 commits July 9, 2026 18:50

aaronber0614 requested review from lolyu, yejianquan and yue-fred-gao July 9, 2026 21:09

This was referenced Jul 9, 2026

[sonic-vpp][Data Plane][t1-lag] iface_loopback_action - Enable data plane testing on VPP KVM testbed sonic-net/sonic-buildimage#25788

Open

[doc][vpp] HLD for Router Interface Loopback Packet Action on the VPP dataplane sonic-net/SONiC#2462

Open

Merge remote-tracking branch 'upstream/master' into vpp-integ-test

c941fca

Signed-off-by: Aaron Bernardino <aaronber@microsoft.com> # Conflicts: # vslib/vpp/vppxlate/SaiVppXlate.c # vslib/vpp/vppxlate/SaiVppXlate.h

Copilot AI review requested due to automatic review settings July 21, 2026 11:57

Copilot started reviewing on behalf of aaronber0614 July 21, 2026 11:57 View session

Copilot AI reviewed Jul 21, 2026

View reviewed changes

Navigation Menu

[vpp] SAI RIF loopback packet action and pre-existing VPP vslib defect fixes - #1983

[vpp] SAI RIF loopback packet action and pre-existing VPP vslib defect fixes#1983
aaronber0614 wants to merge 8 commits into
sonic-net:masterfrom
aaronber0614:vpp-integ-test

aaronber0614 commented Jul 9, 2026 •

edited

Loading

Uh oh!

mssonicbld commented Jul 9, 2026

Uh oh!

azure-pipelines Bot commented Jul 9, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

azure-pipelines Bot commented Jul 21, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

mssonicbld commented Aug 14, 2026

Uh oh!

azure-pipelines Bot commented Aug 14, 2026

Uh oh!

mssonicbld commented Aug 31, 2026

Uh oh!

azure-pipelines Bot commented Aug 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

aaronber0614 commented Jul 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

PR series (landing order)

Uh oh!

mssonicbld commented Jul 9, 2026

Uh oh!

azure-pipelines Bot commented Jul 9, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

azure-pipelines Bot commented Jul 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

mssonicbld commented Aug 14, 2026

Uh oh!

azure-pipelines Bot commented Aug 14, 2026

Uh oh!

mssonicbld commented Aug 31, 2026

Uh oh!

azure-pipelines Bot commented Aug 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

aaronber0614 commented Jul 9, 2026 •

edited

Loading