Skip to content

Commit

Permalink
[VRF]: submit vrf feature (sonic-net#943)
Browse files Browse the repository at this point in the history 
Dataplane vrf feature
  • Loading branch information
@prsunny
Tyler Li authored and prsunny committed Nov 6, 2019
1 parent 5604566 commit 85ff17d
Show file tree
Hide file tree
Showing 27 changed files with 3,695 additions and 668 deletions.
161 changes: 130 additions & 31 deletions cfgmgr/intfmgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ using namespace swss;
#define LAG_PREFIX "PortChannel"
#define LOOPBACK_PREFIX "Loopback"
#define VNET_PREFIX "Vnet"
#define VRF_PREFIX "Vrf"

#define LOOPBACK_DEFAULT_MTU_STR "65536"

IntfMgr::IntfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames) :
Orch(cfgDb, tableNames),
Expand Down Expand Up @@ -58,7 +61,7 @@ void IntfMgr::setIntfIp(const string &alias, const string &opCmd,
}
}

void IntfMgr::setIntfVrf(const string &alias, const string vrfName)
void IntfMgr::setIntfVrf(const string &alias, const string &vrfName)
{
stringstream cmd;
string res;
Expand All @@ -71,7 +74,97 @@ void IntfMgr::setIntfVrf(const string &alias, const string vrfName)
{
cmd << IP_CMD << " link set " << shellquote(alias) << " nomaster";
}
EXEC_WITH_ERROR_THROW(cmd.str(), res);
int ret = swss::exec(cmd.str(), res);
if (ret)
{
SWSS_LOG_ERROR("Command '%s' failed with rc %d", cmd.str().c_str(), ret);
}
}

void IntfMgr::addLoopbackIntf(const string &alias)
{
stringstream cmd;
string res;

cmd << IP_CMD << " link add " << alias << " mtu " << LOOPBACK_DEFAULT_MTU_STR << " type dummy && ";
cmd << IP_CMD << " link set " << alias << " up";
int ret = swss::exec(cmd.str(), res);
if (ret)
{
SWSS_LOG_ERROR("Command '%s' failed with rc %d", cmd.str().c_str(), ret);
}
}

void IntfMgr::delLoopbackIntf(const string &alias)
{
stringstream cmd;
string res;

cmd << IP_CMD << " link del " << alias;
int ret = swss::exec(cmd.str(), res);
if (ret)
{
SWSS_LOG_ERROR("Command '%s' failed with rc %d", cmd.str().c_str(), ret);
}
}

int IntfMgr::getIntfIpCount(const string &alias)
{
stringstream cmd;
string res;

/* query ip address of the device with master name, it is much faster */
// ip address show {{intf_name}}
// $(ip link show {{intf_name}} | grep -o 'master [^\\s]*') ==> [master {{vrf_name}}]
// | grep inet | grep -v 'inet6 fe80:' | wc -l
cmd << IP_CMD << " address show " << alias
<< " $(" << IP_CMD << " link show " << alias << " | grep -o 'master [^\\s]*')"
<< " | grep inet | grep -v 'inet6 fe80:' | wc -l";

int ret = swss::exec(cmd.str(), res);
if (ret)
{
SWSS_LOG_ERROR("Command '%s' failed with rc %d", cmd.str().c_str(), ret);
return 0;
}

return std::stoi(res);
}

bool IntfMgr::isIntfCreated(const string &alias)
{
vector<FieldValueTuple> temp;

if (m_stateIntfTable.get(alias, temp))
{
SWSS_LOG_DEBUG("Intf %s is ready", alias.c_str());
return true;
}

return false;
}

bool IntfMgr::isIntfChangeVrf(const string &alias, const string &vrfName)
{
vector<FieldValueTuple> temp;

if (m_stateIntfTable.get(alias, temp))
{
for (auto idx : temp)
{
const auto &field = fvField(idx);
const auto &value = fvValue(idx);
if (field == "vrf")
{
if (value == vrfName)
return false;
else
return true;
}
}
}

return false;
}

bool IntfMgr::isIntfStateOk(const string &alias)
Expand Down Expand Up @@ -102,6 +195,14 @@ bool IntfMgr::isIntfStateOk(const string &alias)
return true;
}
}
else if (!alias.compare(0, strlen(VRF_PREFIX), VRF_PREFIX))
{
if (m_stateVrfTable.get(alias, temp))
{
SWSS_LOG_DEBUG("Vrf %s is ready", alias.c_str());
return true;
}
}
else if (m_statePortTable.get(alias, temp))
{
SWSS_LOG_DEBUG("Port %s is ready", alias.c_str());
Expand Down Expand Up @@ -149,32 +250,38 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
return false;
}

// Set Interface VRF except for lo
if (!is_lo)
/* if to change vrf then skip */
if (isIntfChangeVrf(alias, vrf_name))
{
if (!vrf_name.empty())
{
setIntfVrf(alias, vrf_name);
}
m_appIntfTableProducer.set(alias, data);
SWSS_LOG_ERROR("%s can not change to %s directly, skipping", alias.c_str(), vrf_name.c_str());
return true;
}
else
if (is_lo)
{
m_appIntfTableProducer.set("lo", data);
addLoopbackIntf(alias);
}
if (!vrf_name.empty())
{
setIntfVrf(alias, vrf_name);
}
m_appIntfTableProducer.set(alias, data);
m_stateIntfTable.hset(alias, "vrf", vrf_name);
}
else if (op == DEL_COMMAND)
{
// Set Interface VRF except for lo
if (!is_lo)
/* make sure all ip addresses associated with interface are removed, otherwise these ip address would
be set with global vrf and it may cause ip address confliction. */
if (getIntfIpCount(alias))
{
setIntfVrf(alias, "");
m_appIntfTableProducer.del(alias);
return false;
}
else
setIntfVrf(alias, "");
if (is_lo)
{
m_appIntfTableProducer.del("lo");
delLoopbackIntf(alias);
}
m_appIntfTableProducer.del(alias);
m_stateIntfTable.del(alias);
}
else
{
Expand All @@ -192,26 +299,21 @@ bool IntfMgr::doIntfAddrTask(const vector<string>& keys,

string alias(keys[0]);
IpPrefix ip_prefix(keys[1]);
bool is_lo = !alias.compare(0, strlen(LOOPBACK_PREFIX), LOOPBACK_PREFIX);
string appKey = (is_lo ? "lo" : keys[0]) + ":" + keys[1];
string appKey = keys[0] + ":" + keys[1];

if (op == SET_COMMAND)
{
/*
* Don't proceed if port/LAG/VLAN is not ready yet.
* Don't proceed if port/LAG/VLAN and intfGeneral are not ready yet.
* The pending task will be checked periodically and retried.
*/
if (!isIntfStateOk(alias))
if (!isIntfStateOk(alias) || !isIntfCreated(alias))
{
SWSS_LOG_DEBUG("Interface is not ready, skipping %s", alias.c_str());
return false;
}

// Set Interface IP except for lo
if (!is_lo)
{
setIntfIp(alias, "add", ip_prefix);
}
setIntfIp(alias, "add", ip_prefix);

std::vector<FieldValueTuple> fvVector;
FieldValueTuple f("family", ip_prefix.isV4() ? IPV4_NAME : IPV6_NAME);
Expand All @@ -224,11 +326,8 @@ bool IntfMgr::doIntfAddrTask(const vector<string>& keys,
}
else if (op == DEL_COMMAND)
{
// Set Interface IP except for lo
if (!is_lo)
{
setIntfIp(alias, "del", ip_prefix);
}
setIntfIp(alias, "del", ip_prefix);

m_appIntfTableProducer.del(appKey);
m_stateIntfTable.del(keys[0] + state_db_key_delimiter + keys[1]);
}
Expand Down
7 changes: 6 additions & 1 deletion cfgmgr/intfmgr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@ class IntfMgr : public Orch
Table m_statePortTable, m_stateLagTable, m_stateVlanTable, m_stateVrfTable, m_stateIntfTable;

void setIntfIp(const std::string &alias, const std::string &opCmd, const IpPrefix &ipPrefix);
void setIntfVrf(const std::string &alias, const std::string vrfName);
void setIntfVrf(const std::string &alias, const std::string &vrfName);
bool doIntfGeneralTask(const std::vector<std::string>& keys, const std::vector<FieldValueTuple>& data, const std::string& op);
bool doIntfAddrTask(const std::vector<std::string>& keys, const std::vector<FieldValueTuple>& data, const std::string& op);
void doTask(Consumer &consumer);
bool isIntfStateOk(const std::string &alias);
bool isIntfCreated(const std::string &alias);
bool isIntfChangeVrf(const std::string &alias, const std::string &vrfName);
int getIntfIpCount(const std::string &alias);
void addLoopbackIntf(const std::string &alias);
void delLoopbackIntf(const std::string &alias);
};

}
Expand Down
23 changes: 2 additions & 21 deletions cfgmgr/nbrmgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@

using namespace swss;

#define VLAN_PREFIX "Vlan"
#define LAG_PREFIX "PortChannel"

static bool send_message(struct nl_sock *sk, struct nl_msg *msg)
{
bool rc = false;
Expand Down Expand Up @@ -67,25 +64,9 @@ bool NbrMgr::isIntfStateOk(const string &alias)
{
vector<FieldValueTuple> temp;

if (!alias.compare(0, strlen(VLAN_PREFIX), VLAN_PREFIX))
{
if (m_stateVlanTable.get(alias, temp))
{
SWSS_LOG_DEBUG("Vlan %s is ready", alias.c_str());
return true;
}
}
else if (!alias.compare(0, strlen(LAG_PREFIX), LAG_PREFIX))
{
if (m_stateLagTable.get(alias, temp))
{
SWSS_LOG_DEBUG("Lag %s is ready", alias.c_str());
return true;
}
}
else if (m_statePortTable.get(alias, temp))
if (m_stateIntfTable.get(alias, temp))
{
SWSS_LOG_DEBUG("Port %s is ready", alias.c_str());
SWSS_LOG_DEBUG("Intf %s is ready", alias.c_str());
return true;
}

Expand Down
68 changes: 59 additions & 9 deletions cfgmgr/vrfmgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@

#define VRF_TABLE_START 1001
#define VRF_TABLE_END 2000
#define TABLE_LOCAL_PREF 1001 // after l3mdev-table

using namespace swss;

VrfMgr::VrfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames) :
Orch(cfgDb, tableNames),
m_appVrfTableProducer(appDb, APP_VRF_TABLE_NAME),
m_appVnetTableProducer(appDb, APP_VNET_TABLE_NAME),
m_stateVrfTable(stateDb, STATE_VRF_TABLE_NAME)
m_stateVrfTable(stateDb, STATE_VRF_TABLE_NAME),
m_stateVrfObjectTable(stateDb, STATE_VRF_OBJECT_TABLE_NAME)
{
for (uint32_t i = VRF_TABLE_START; i < VRF_TABLE_END; i++)
{
Expand Down Expand Up @@ -63,6 +65,18 @@ VrfMgr::VrfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, con
break;
}
}

cmd.str("");
cmd.clear();
cmd << IP_CMD << " rule | grep '^0:'";
if (swss::exec(cmd.str(), res) == 0)
{
cmd.str("");
cmd.clear();
cmd << IP_CMD << " rule add pref " << TABLE_LOCAL_PREF << " table local && " << IP_CMD << " rule del pref 0 && "
<< IP_CMD << " -6 rule add pref " << TABLE_LOCAL_PREF << " table local && " << IP_CMD << " -6 rule del pref 0";
EXEC_WITH_ERROR_THROW(cmd.str(), res);
}
}

uint32_t VrfMgr::getFreeTable(void)
Expand Down Expand Up @@ -139,6 +153,19 @@ bool VrfMgr::setLink(const string& vrfName)
return true;
}

bool VrfMgr::isVrfObjExist(const string& vrfName)
{
vector<FieldValueTuple> temp;

if (m_stateVrfObjectTable.get(vrfName, temp))
{
SWSS_LOG_DEBUG("Vrf %s object exist", vrfName.c_str());
return true;
}

return false;
}

void VrfMgr::doTask(Consumer &consumer)
{
SWSS_LOG_ENTER();
Expand Down Expand Up @@ -173,20 +200,43 @@ void VrfMgr::doTask(Consumer &consumer)
}
else if (op == DEL_COMMAND)
{
if (!delLink(vrfName))
{
SWSS_LOG_ERROR("Failed to remove vrf netdev %s", vrfName.c_str());
}

m_stateVrfTable.del(vrfName);

/*
* Delay delLink until vrf object deleted in orchagent to ensure fpmsyncd can get vrf ifname.
* Now state VRF_TABLE|Vrf represent vrf exist in appDB, if it exist vrf device is always effective.
* VRFOrch add/del state VRF_OBJECT_TABLE|Vrf to represent object existence. VNETOrch is not do so now.
*/
if (consumer.getTableName() == CFG_VRF_TABLE_NAME)
{
m_appVrfTableProducer.del(vrfName);
vector<FieldValueTuple> temp;

if (m_stateVrfTable.get(vrfName, temp))
{
/* VRFOrch add delay so wait */
if (!isVrfObjExist(vrfName))
{
it++;
continue;
}

m_appVrfTableProducer.del(vrfName);
m_stateVrfTable.del(vrfName);
}

if (isVrfObjExist(vrfName))
{
it++;
continue;
}
}
else
{
m_appVnetTableProducer.del(vrfName);
m_stateVrfTable.del(vrfName);
}

if (!delLink(vrfName))
{
SWSS_LOG_ERROR("Failed to remove vrf netdev %s", vrfName.c_str());
}

SWSS_LOG_NOTICE("Removed vrf netdev %s", vrfName.c_str());
Expand Down
Loading

0 comments on commit 85ff17d

Please sign in to comment.