Skip to content

[Dash] Update ENI Based Forwarding Orchagent #3905

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
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[Dash] Update ENI Based Forwarding Orchagent #3905

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7a75c94
Add option to parse string list
vivekrnv Sep 4, 2025
997fd82
[Dash] Make ENI Forward Orch compatible with new DPU table schema
vivekrnv Sep 4, 2025
8b08738
Support FNIC pipeline
vivekrnv Oct 6, 2025
8351b8c
Allow relaxed attribute parsing
vivekrnv Oct 7, 2025
0eddff8
Delete ACL Table if all ACL rules are deleted
vivekrnv Oct 10, 2025
cf35529
Merge branch 'master' into fix_enifwd_schema
dgsudharsan Oct 16, 2025
f184fed
Reduce the verbosity for high volume logs
vivekrnv Oct 20, 2025
74630c8
Add vni while creating Tunnel NH
vivekrnv Oct 31, 2025
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
134 changes: 30 additions & 104 deletions orchagent/dash/dashenifwdinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ using namespace swss;
using namespace std;

const int EniAclRule::BASE_PRIORITY = 9996;
const vector<string> EniAclRule::RULE_NAMES = {
"IN",
"OUT",
"IN_TERM",
"OUT_TERM"
};

unique_ptr<EniNH> EniNH::createNextHop(dpu_type_t type, const IpAddress& ip)
{
Expand Down Expand Up @@ -78,7 +72,11 @@ string RemoteEniNH::getRedirectVal()

void EniAclRule::setKey(EniInfo& eni)
{
name_ = string(ENI_REDIRECT_TABLE) + ":" + eni.toKey() + "_" + EniAclRule::RULE_NAMES[type_];
name_ = string(DashEniFwd::TABLE) + ":" + eni.toKey();
if (type_ == rule_type_t::TUNNEL_TERM)
{
name_ += "_TERM";
}
}

update_type_t EniAclRule::processUpdate(EniInfo& eni)
Expand All @@ -88,9 +86,9 @@ update_type_t EniAclRule::processUpdate(EniInfo& eni)
IpAddress primary_endp;
dpu_type_t primary_type = LOCAL;
update_type_t update_type = PRIMARY_UPDATE;
uint64_t primary_id;
std::string primary_id;

if (type_ == rule_type_t::INBOUND_TERM || type_ == rule_type_t::OUTBOUND_TERM)
if (type_ == rule_type_t::TUNNEL_TERM)
{
/* Tunnel term entries always use local endpoint regardless of primary id */
if (!eni.findLocalEp(primary_id))
Expand All @@ -106,7 +104,7 @@ update_type_t EniAclRule::processUpdate(EniInfo& eni)

if (!ctx->dpu_info.getType(primary_id, primary_type))
{
SWSS_LOG_ERROR("No primaryId in DPU Table %" PRIu64 "", primary_id);
SWSS_LOG_ERROR("No primary id %s in DPU Table", primary_id.c_str());
return update_type_t::INVALID;
}

Expand Down Expand Up @@ -182,9 +180,8 @@ void EniAclRule::fire(EniInfo& eni)
Delete the complete rule before updating it,
ACLOrch Doesn't support incremental updates
*/
ctx->rule_table->del(key);
ctx->deleteAclRule(key);
setState(rule_state_t::UNINSTALLED);
SWSS_LOG_NOTICE("EniFwd ACL Rule %s deleted", key.c_str());
}

if (nh_->getStatus() != endpoint_status_t::RESOLVED)
Expand All @@ -201,27 +198,17 @@ void EniAclRule::fire(EniInfo& eni)
{ ACTION_REDIRECT_ACTION, nh_->getRedirectVal() }
};

if (type_ == rule_type_t::INBOUND_TERM || type_ == rule_type_t::OUTBOUND_TERM)
if (type_ == rule_type_t::TUNNEL_TERM)
{
fv_.push_back({MATCH_TUNNEL_TERM, "true"});
}

if (type_ == rule_type_t::OUTBOUND || type_ == rule_type_t::OUTBOUND_TERM)
{
fv_.push_back({MATCH_TUNNEL_VNI, to_string(eni.getOutVni())});
}

ctx->rule_table->set(key, fv_);
ctx->createAclRule(key, fv_);
setState(INSTALLED);
SWSS_LOG_NOTICE("EniFwd ACL Rule %s installed", key.c_str());
}

string EniAclRule::getMacMatchDirection(EniInfo& eni)
{
if (type_ == OUTBOUND || type_ == OUTBOUND_TERM)
{
return eni.getOutMacLookup();
}
return MATCH_INNER_DST_MAC;
}

Expand All @@ -231,7 +218,7 @@ void EniAclRule::destroy(EniInfo& eni)
{
auto key = getKey();
auto& ctx = eni.getCtx();
ctx->rule_table->del(key);
ctx->deleteAclRule(key);
if (nh_ != nullptr)
{
nh_->destroy(eni);
Expand Down Expand Up @@ -292,10 +279,8 @@ bool EniInfo::create(const Request& db_request)
SWSS_LOG_ENTER();

auto updates = db_request.getAttrFieldNames();
auto itr_ep_list = updates.find(ENI_FWD_VDPU_IDS);
auto itr_primary_id = updates.find(ENI_FWD_PRIMARY);
auto itr_out_vni = updates.find(ENI_FWD_OUT_VNI);
auto itr_out_mac_dir = updates.find(ENI_FWD_OUT_MAC_LOOKUP);
auto itr_ep_list = updates.find(DashEniFwd::VDPU_IDS);
auto itr_primary_id = updates.find(DashEniFwd::PRIMARY);

/* Validation Checks */
if (itr_ep_list == updates.end() || itr_primary_id == updates.end())
Expand All @@ -304,85 +289,26 @@ bool EniInfo::create(const Request& db_request)
return false;
}

ep_list_ = db_request.getAttrUintList(ENI_FWD_VDPU_IDS);
primary_id_ = db_request.getAttrUint(ENI_FWD_PRIMARY);
ep_list_ = db_request.getAttrStringList(DashEniFwd::VDPU_IDS);
primary_id_ = db_request.getAttrString(DashEniFwd::PRIMARY);

uint64_t local_id;
std::string local_id;
bool tunn_term_allow = findLocalEp(local_id);
bool outbound_allow = false;

/* Create Rules */
rule_container_.emplace(piecewise_construct,
forward_as_tuple(rule_type_t::INBOUND),
forward_as_tuple(rule_type_t::INBOUND, *this));
rule_container_.emplace(piecewise_construct,
forward_as_tuple(rule_type_t::OUTBOUND),
forward_as_tuple(rule_type_t::OUTBOUND, *this));
forward_as_tuple(rule_type_t::NO_TUNNEL_TERM),
forward_as_tuple(rule_type_t::NO_TUNNEL_TERM, *this));

if (tunn_term_allow)
{
/* Create rules for tunnel termination if required */
rule_container_.emplace(piecewise_construct,
forward_as_tuple(rule_type_t::INBOUND_TERM),
forward_as_tuple(rule_type_t::INBOUND_TERM, *this));
/* Create rule for tunnel termination if required */
rule_container_.emplace(piecewise_construct,
forward_as_tuple(rule_type_t::OUTBOUND_TERM),
forward_as_tuple(rule_type_t::OUTBOUND_TERM, *this));
}

/* Infer Direction to check MAC for outbound rules */
if (itr_out_mac_dir == updates.end())
{
outbound_mac_lookup_ = MATCH_INNER_SRC_MAC;
}
else
{
auto str = db_request.getAttrString(ENI_FWD_OUT_MAC_LOOKUP);
if (str == OUT_MAC_DIR)
{
outbound_mac_lookup_ = MATCH_INNER_DST_MAC;
}
else
{
outbound_mac_lookup_ = MATCH_INNER_SRC_MAC;
}
}

/* Infer tunnel_vni for the outbound rules */
if (itr_out_vni == updates.end())
{
if (ctx->findVnetVni(vnet_name_, outbound_vni_))
{
outbound_allow = true;
}
else
{
SWSS_LOG_ERROR("Invalid VNET: No VNI. Cannot install outbound rules: %s", toKey().c_str());
}
}
else
{
outbound_vni_ = db_request.getAttrUint(ENI_FWD_OUT_VNI);
outbound_allow = true;
}

fireRule(rule_type_t::INBOUND);

if (tunn_term_allow)
{
fireRule(rule_type_t::INBOUND_TERM);
}

if (outbound_allow)
{
fireRule(rule_type_t::OUTBOUND);
}

if (tunn_term_allow && outbound_allow)
{
fireRule(rule_type_t::OUTBOUND_TERM);
forward_as_tuple(rule_type_t::TUNNEL_TERM),
forward_as_tuple(rule_type_t::TUNNEL_TERM, *this));
}

fireAllRules();
return true;
}

Expand All @@ -408,34 +334,34 @@ bool EniInfo::update(const Request& db_request)

/* Only primary_id is expected to change after ENI is created */
auto updates = db_request.getAttrFieldNames();
auto itr_primary_id = updates.find(ENI_FWD_PRIMARY);
auto itr_primary_id = updates.find(DashEniFwd::PRIMARY);

/* Validation Checks */
if (itr_primary_id == updates.end())
{
throw logic_error("Invalid DASH_ENI_FORWARD_TABLE update: No primary idx");
}

if (getPrimaryId() == db_request.getAttrUint(ENI_FWD_PRIMARY))
if (getPrimaryId() == db_request.getAttrString(DashEniFwd::PRIMARY))
{
/* No update in the primary id, return true */
return true;
}

/* Update local primary id and fire the rules */
primary_id_ = db_request.getAttrUint(ENI_FWD_PRIMARY);
primary_id_ = db_request.getAttrString(DashEniFwd::PRIMARY);
fireAllRules();

return true;
}

bool EniInfo::findLocalEp(uint64_t& local_endpoint) const
bool EniInfo::findLocalEp(std::string& local_endpoint) const
{
/* Check if atleast one of the endpoints is local */
bool found = false;
for (auto idx : ep_list_)
{
dpu_type_t val = dpu_type_t::EXTERNAL;
dpu_type_t val = dpu_type_t::CLUSTER;
if (ctx->dpu_info.getType(idx, val) && val == dpu_type_t::LOCAL)
{
if (!found)
Expand All @@ -445,8 +371,8 @@ bool EniInfo::findLocalEp(uint64_t& local_endpoint) const
}
else
{
SWSS_LOG_WARN("Multiple Local Endpoints for the ENI %s found, proceeding with %" PRIu64 "" ,
mac_.to_string().c_str(), local_endpoint);
SWSS_LOG_WARN("Multiple Local Endpoints for the ENI %s found, proceeding with %s",
mac_.to_string().c_str(), local_endpoint.c_str());
}
}
}
Expand Down
Loading
Loading