Skip to content

[vpp] Fix LAG subinterface hwif name resolution #1883

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
yue-fred-gao merged 4 commits into from
Jun 8, 2026
Merged

[vpp] Fix LAG subinterface hwif name resolution #1883

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c89c6f7
[vpp]: Fix LAG subinterface creation using wrong VPP hwif name
Bojun-Feng May 5, 2026
582a8af
[vpp]: Fix vpp_get_hwif_name returning parent name for LAG subinterfaces
Bojun-Feng May 5, 2026
f73cb01
[vpp] Use %u format specifier for uint32_t bond_info.id
Bojun-Feng May 26, 2026
a146bc3
[vpp]: Address review comments on LAG subinterface hwif fix
Bojun-Feng Jun 6, 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
61 changes: 46 additions & 15 deletions vslib/vpp/SwitchVppRif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,28 +343,32 @@ bool SwitchVpp::vpp_get_hwif_name (
{
SWSS_LOG_ENTER();

const char *hwifname;
Comment thread
Bojun-Feng marked this conversation as resolved.
Outdated
char hw_bondifname[32];

if (objectTypeQuery(object_id) == SAI_OBJECT_TYPE_LAG) {
platform_bond_info_t bond_info;
sai_status_t status = get_lag_bond_info(object_id, bond_info);
if (status != SAI_STATUS_SUCCESS)
{
return false;
}
ifname = std::string(BONDETHERNET_PREFIX) + std::to_string(bond_info.id);
return true;
}

std::string if_name;
bool found = getTapNameFromPortId(object_id, if_name);
snprintf(hw_bondifname, sizeof(hw_bondifname), "%s%u", BONDETHERNET_PREFIX, bond_info.id);
hwifname = hw_bondifname;
} else {
std::string if_name;
bool found = getTapNameFromPortId(object_id, if_name);

if (found == false)
{
SWSS_LOG_NOTICE("host interface for port id %s not found", sai_serialize_object_id(object_id).c_str());
return false;
if (found == false)
{
SWSS_LOG_ERROR("host interface for port id %s not found", sai_serialize_object_id(object_id).c_str());
return false;
}
hwifname = tap_to_hwif_name(if_name.c_str());
}

const char *hwifname = tap_to_hwif_name(if_name.c_str());
char hw_subifname[32];

char hw_subifname[64];
const char *hw_ifname;

if (vlan_id) {
Expand Down Expand Up @@ -1583,7 +1587,15 @@ sai_status_t SwitchVpp::vpp_create_router_interface(
snprintf(host_subifname, sizeof(host_subifname), "%s.%u", dev, vlan_id);

/* The host(tap) subinterface is also created as part of the vpp subinterface creation */
create_sub_interface(tap_to_hwif_name(dev), vlan_id, vlan_id);
const char *parent_hwif;
char hw_subif_parent[32];
if (ot == SAI_OBJECT_TYPE_LAG) {
snprintf(hw_subif_parent, sizeof(hw_subif_parent), "%s%u", BONDETHERNET_PREFIX, bond_info.id);
parent_hwif = hw_subif_parent;
} else {
parent_hwif = tap_to_hwif_name(dev);
}
create_sub_interface(parent_hwif, vlan_id, vlan_id);

/* Get new list of physical interfaces from VS */
refresh_interfaces_list();
Expand Down Expand Up @@ -1869,7 +1881,18 @@ sai_status_t SwitchVpp::vpp_remove_router_interface(sai_object_id_t rif_id)
uint16_t vlan_id = attr.value.u16;

std::string if_name;
bool found = getTapNameFromPortId(obj_id, if_name);
platform_bond_info_t bond_info;
bool found;
if (ot == SAI_OBJECT_TYPE_LAG) {
status = get_lag_bond_info(obj_id, bond_info);
if (status != SAI_STATUS_SUCCESS) {
return status;
}
if_name = std::string(PORTCHANNEL_PREFIX) + std::to_string(bond_info.id);
Comment thread
Bojun-Feng marked this conversation as resolved.
Outdated
found = true;
} else {
found = getTapNameFromPortId(obj_id, if_name);
}
if (found == false)
{
SWSS_LOG_ERROR("host interface for port id %s not found", sai_serialize_object_id(obj_id).c_str());
Expand All @@ -1878,7 +1901,15 @@ sai_status_t SwitchVpp::vpp_remove_router_interface(sai_object_id_t rif_id)

const char *dev = if_name.c_str();

delete_sub_interface(tap_to_hwif_name(dev), vlan_id);
const char *parent_hwif;
char hw_del_parent[32];
if (ot == SAI_OBJECT_TYPE_LAG) {
snprintf(hw_del_parent, sizeof(hw_del_parent), "%s%u", BONDETHERNET_PREFIX, bond_info.id);
parent_hwif = hw_del_parent;
} else {
parent_hwif = tap_to_hwif_name(dev);
}
delete_sub_interface(parent_hwif, vlan_id);
/* Get new list of physical interfaces from VS */
refresh_interfaces_list();

Expand Down
Loading