Skip to content
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

[syncd] Add support for a clear fdb cli #279

Merged
merged 4 commits into from
Jan 26, 2018
Merged

[syncd] Add support for a clear fdb cli #279

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ece9d4
Merge pull request #1 from Azure/master
keboliu Jan 12, 2018
10d4011
add code to support clear fdb cli
keboliu Jan 12, 2018
b50306c
remove redundant code and revise the error log
keboliu Jan 16, 2018
4609487
remove the fdb flush trigger from syncd
keboliu Jan 24, 2018
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
123 changes: 117 additions & 6 deletions syncd/syncd_notifications.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,130 @@ void redisPutFdbEntryToAsicView(
return;
}

if ((fdb->event_type == SAI_FDB_EVENT_AGED)||(fdb->event_type == SAI_FDB_EVENT_FLUSHED))
if (fdb->event_type == SAI_FDB_EVENT_AGED)
{
if (fdb->event_type == SAI_FDB_EVENT_AGED)
SWSS_LOG_DEBUG("remove fdb entry %s for SAI_FDB_EVENT_AGED",key.c_str());
g_redisClient->del(key);
return;
}

if (fdb->event_type == SAI_FDB_EVENT_FLUSHED)
{
sai_vlan_id_t vlan_id = fdb->fdb_entry.vlan_id;
sai_object_id_t port_oid = 0;
bool port_oid_found = false;

for (uint32_t i = 0; i < fdb->attr_count; i++)
{
SWSS_LOG_DEBUG("remove fdb entry %s for SAI_FDB_EVENT_AGED",key.c_str());
if(fdb->attr[i].id == SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID)
{
port_oid = fdb->attr[i].value.oid;
port_oid_found = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note, you can break from here once port_oid_found is set to true

}
}
if (fdb->event_type == SAI_FDB_EVENT_FLUSHED)

if (!port_oid_found)
{
SWSS_LOG_DEBUG("remove fdb entry %s for SAI_FDB_EVENT_FLUSHED",key.c_str());
SWSS_LOG_ERROR("Failed to get bridge port ID for FDB entry %s",strFdbEntry.c_str());
return;
}
g_redisClient->del(key);

if (!port_oid && !vlan_id)
{
/* we got a flush all fdb event here */
/* example of a flush all fdb event */
/*
[{
"fdb_entry":"{
\"bridge_id\":\"oid:0x0\",
\"bridge_type\":\"SAI_FDB_ENTRY_BRIDGE_TYPE_1Q\",
\"mac\":\"00:00:00:00:00:00\",
\"switch_id\":\"oid:0x21000000000000\",
\"vlan\":\"0\"}",
"fdb_event":"SAI_FDB_EVENT_FLUSHED",
"list":[
{"id":"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID","value":"oid:0x0"},
{"id":"SAI_FDB_ENTRY_ATTR_TYPE","value":"SAI_FDB_ENTRY_TYPE_DYNAMIC"},
{"id":"SAI_FDB_ENTRY_ATTR_PACKET_ACTION","value":"SAI_PACKET_ACTION_FORWARD"}
]
}]
*/
SWSS_LOG_NOTICE("received a flush all fdb event");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this behaviour is not described in SAI headers that when no port and no vlan id then 1 notification is send to notify that all have been flushed from the device, please put that description (and consult with SAI community?) whether that behavior is good
for example,
-all entries were flushed if "mac == all 0, vlanid == 0, bridge_id == 0"

this is fine by me, but please update SAI headers

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will talk to SAI guys see whether they already have something similar if not may ask them to add.

std::string pattern = ASIC_STATE_TABLE + std::string(":SAI_OBJECT_TYPE_FDB_ENTRY:*");
for (const auto &fdbkey: g_redisClient->keys(pattern))
{
/* we only remove dynamic fdb entries here, static fdb entries need to be deleted manually by user instead of flush */
auto pEntryType = g_redisClient->hget(fdbkey, "SAI_FDB_ENTRY_ATTR_TYPE");
if (pEntryType != NULL)
{
std::string strEntryType = *pEntryType;
if (strEntryType == "SAI_FDB_ENTRY_TYPE_DYNAMIC")
{
SWSS_LOG_DEBUG("remove fdb entry %s for SAI_FDB_EVENT_FLUSHED",fdbkey.c_str());
g_redisClient->del(fdbkey);
}
}
else
{
SWSS_LOG_ERROR("found unknown type fdb entry, key %s", fdbkey.c_str());
}
}
}
else if( port_oid && !vlan_id )
{
/* we got a flush port fdb event here */
/* not supported yet, this is a place holder */
/* example of a flush port fdb event */
/*
[{
"fdb_entry":"{
\"bridge_id\":\"oid:0x0\",
\"bridge_type\":\"SAI_FDB_ENTRY_BRIDGE_TYPE_1Q\",
\"mac\":\"00:00:00:00:00:00\",
\"switch_id\":\"oid:0x21000000000000\",
\"vlan\":\"0\"}",
"fdb_event":"SAI_FDB_EVENT_FLUSHED",
"list":[
{"id":"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID","value":"oid:0x3a0000000009cf"},
{"id":"SAI_FDB_ENTRY_ATTR_TYPE","value":"SAI_FDB_ENTRY_TYPE_DYNAMIC"},
{"id":"SAI_FDB_ENTRY_ATTR_PACKET_ACTION","value":"SAI_PACKET_ACTION_FORWARD"}
]
}]
*/
SWSS_LOG_ERROR("received a flush port fdb event, port_oid = %lu, vlan_id = %hd, unsupported", port_oid, vlan_id);
}
else if(!port_oid && vlan_id)
{
/* we got a flush vlan fdb event here */
/* not supported yet, this is a place holder */
/* example of a flush vlan event */
/*
[{
"fdb_entry":"{
\"bridge_id\":\"oid:0x0\",
\"bridge_type\":\"SAI_FDB_ENTRY_BRIDGE_TYPE_1Q\",
\"mac\":\"00:00:00:00:00:00\",
\"switch_id\":\"oid:0x21000000000000\",
\"vlan\":\"1000\"}",
"fdb_event":"SAI_FDB_EVENT_FLUSHED",
"list":[
{"id":"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID","value":"oid:0x0"},
{"id":"SAI_FDB_ENTRY_ATTR_TYPE","value":"SAI_FDB_ENTRY_TYPE_DYNAMIC"},
{"id":"SAI_FDB_ENTRY_ATTR_PACKET_ACTION","value":"SAI_PACKET_ACTION_FORWARD"}
]
}]
*/
SWSS_LOG_ERROR("received a flush vlan fdb event, port_oid = %lu, vlan_id = %hd, unsupported", port_oid, vlan_id);

}
else
{
SWSS_LOG_ERROR("received a flush fdb event, port_oid = %lu, vlan_id = %hd, unsupported", port_oid, vlan_id);
}

return;
}

for (const auto &e: entry)
{
const std::string &strField = fvField(e);
Expand Down