Skip to content

Fix counter issues on VS platform #30

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

Closed
stephenxs wants to merge 5 commits into from
Closed

Fix counter issues on VS platform #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5906f1b
Use switch object to detect counter capability
stephenxs Feb 21, 2025
929ee1d
Explicitly initialize switch id
stephenxs Feb 21, 2025
61af7da
Do not continue if no counters are supported in bulk
stephenxs Feb 22, 2025
448477f
Coverage update
stephenxs Feb 22, 2025
cc9f085
Support PFC counters in VS platform
stephenxs Feb 22, 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
18 changes: 16 additions & 2 deletions syncd/FlexCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,9 @@ class CounterContext : public BaseCounterContext
{
std::map<std::string, uint32_t> m_counterChunkSizeMapFromPrefix;

protected:
sai_object_id_t m_switchId = SAI_NULL_OBJECT_ID;

public:
typedef CounterIds<StatType> CounterIdsType;
typedef BulkStatsContext<StatType> BulkContextType;
Expand Down Expand Up @@ -911,6 +914,12 @@ class CounterContext : public BaseCounterContext
}
}

if (supportedIds.empty())
{
SWSS_LOG_NOTICE("%s %s does not have supported counters", m_name.c_str(), m_instanceId.c_str());
return;
}

std::map<std::vector<StatType>, std::tuple<const std::string, uint32_t>> bulkUnsupportedCounters;
auto statsMode = m_groupStatsMode == SAI_STATS_MODE_READ ? SAI_STATS_MODE_BULK_READ : SAI_STATS_MODE_BULK_READ_AND_CLEAR;
auto checkAndUpdateBulkCapability = [&](const std::vector<StatType> &counter_ids, const std::string &prefix, uint32_t bulk_chunk_size)
Expand Down Expand Up @@ -1442,9 +1451,14 @@ class CounterContext : public BaseCounterContext
stats_capability.count = 0;
stats_capability.list = nullptr;

if (m_switchId == SAI_NULL_OBJECT_ID)
{
m_switchId = m_vendorSai->switchIdQuery(rid);
}

/* First call is to check the size needed to allocate */
sai_status_t status = m_vendorSai->queryStatsCapability(
rid,
m_switchId,
m_objectType,
&stats_capability);

Expand All @@ -1454,7 +1468,7 @@ class CounterContext : public BaseCounterContext
std::vector<sai_stat_capability_t> statCapabilityList(stats_capability.count);
stats_capability.list = statCapabilityList.data();
status = m_vendorSai->queryStatsCapability(
rid,
m_switchId,
m_objectType,
&stats_capability);

Expand Down
4 changes: 4 additions & 0 deletions unittest/syncd/TestFlexCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,10 @@ TEST(FlexCounter, noSupportedCounters)
fc.addCounter(sai_object_id_t(0x1000000000000), sai_object_id_t(0x1000000000000), values);
// No supported counter, this object shall not be queried
EXPECT_EQ(fc.isEmpty(), true);

std::vector<sai_object_id_t> oids = {0x1000000000000};
fc.bulkAddCounter(SAI_OBJECT_TYPE_PORT, oids, oids, values);
EXPECT_EQ(fc.isEmpty(), true);
}

void testAddRemovePlugin(const std::string& pluginFieldName)
Expand Down
4 changes: 2 additions & 2 deletions unittest/vslib/TestSwitchMLNX2700.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ TEST(SwitchMLNX2700, test_stats_query_capability)
std::make_shared<RealObjectIdManager>(0, scc),
sc);

sai_stat_capability_t capability_list[51];
sai_stat_capability_t capability_list[83];
sai_stat_capability_list_t stats_capability;
stats_capability.count = 1;
stats_capability.list = capability_list;
Expand All @@ -623,7 +623,7 @@ TEST(SwitchMLNX2700, test_stats_query_capability)
SAI_OBJECT_TYPE_PORT,
&stats_capability),
SAI_STATUS_BUFFER_OVERFLOW);
stats_capability.count = 51;
stats_capability.count = 83;

EXPECT_EQ(sw.queryStatsCapability(0x2100000000,
SAI_OBJECT_TYPE_PORT,
Expand Down
4 changes: 2 additions & 2 deletions unittest/vslib/TestVirtualSwitchSaiInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ TEST_F(VirtualSwitchSaiInterfaceTest, bulkGet)

TEST_F(VirtualSwitchSaiInterfaceTest, queryStatsCapability)
{
sai_stat_capability_t capability_list[51];
sai_stat_capability_t capability_list[83];
sai_stat_capability_list_t stats_capability;
stats_capability.list = capability_list;

Expand Down Expand Up @@ -170,7 +170,7 @@ TEST_F(VirtualSwitchSaiInterfaceTest, queryStatsCapability)
SAI_OBJECT_TYPE_PORT,
&stats_capability));

stats_capability.count = 51;
stats_capability.count = 83;
EXPECT_EQ(SAI_STATUS_SUCCESS,
m_vssai->queryStatsCapability(
m_swid,
Expand Down
38 changes: 35 additions & 3 deletions vslib/SwitchStateBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3920,13 +3920,13 @@ sai_status_t SwitchStateBase::queryStatsCapability(
}
else if (objectType == SAI_OBJECT_TYPE_PORT)
{
if (stats_capability->count < 51)
if (stats_capability->count < 83)
{
stats_capability->count = 51;
stats_capability->count = 83;
return SAI_STATUS_BUFFER_OVERFLOW;
}

stats_capability->count = 51;
stats_capability->count = 83;
stats_capability->list[0].stat_enum = SAI_PORT_STAT_IF_IN_OCTETS;
stats_capability->list[1].stat_enum = SAI_PORT_STAT_IF_IN_UCAST_PKTS;
stats_capability->list[2].stat_enum = SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS;
Expand Down Expand Up @@ -3978,6 +3978,38 @@ sai_status_t SwitchStateBase::queryStatsCapability(
stats_capability->list[48].stat_enum = SAI_PORT_STAT_WRED_DROPPED_PACKETS;
stats_capability->list[49].stat_enum = SAI_PORT_STAT_WRED_DROPPED_BYTES;
stats_capability->list[50].stat_enum = SAI_PORT_STAT_ECN_MARKED_PACKETS;
stats_capability->list[51].stat_enum = SAI_PORT_STAT_PFC_0_RX_PKTS;
stats_capability->list[52].stat_enum = SAI_PORT_STAT_PFC_0_TX_PKTS;
stats_capability->list[53].stat_enum = SAI_PORT_STAT_PFC_1_RX_PKTS;
stats_capability->list[54].stat_enum = SAI_PORT_STAT_PFC_1_TX_PKTS;
stats_capability->list[55].stat_enum = SAI_PORT_STAT_PFC_2_RX_PKTS;
stats_capability->list[56].stat_enum = SAI_PORT_STAT_PFC_2_TX_PKTS;
stats_capability->list[57].stat_enum = SAI_PORT_STAT_PFC_3_RX_PKTS;
stats_capability->list[58].stat_enum = SAI_PORT_STAT_PFC_3_TX_PKTS;
stats_capability->list[59].stat_enum = SAI_PORT_STAT_PFC_4_RX_PKTS;
stats_capability->list[60].stat_enum = SAI_PORT_STAT_PFC_4_TX_PKTS;
stats_capability->list[61].stat_enum = SAI_PORT_STAT_PFC_5_RX_PKTS;
stats_capability->list[62].stat_enum = SAI_PORT_STAT_PFC_5_TX_PKTS;
stats_capability->list[63].stat_enum = SAI_PORT_STAT_PFC_6_RX_PKTS;
stats_capability->list[64].stat_enum = SAI_PORT_STAT_PFC_6_TX_PKTS;
stats_capability->list[65].stat_enum = SAI_PORT_STAT_PFC_7_RX_PKTS;
stats_capability->list[66].stat_enum = SAI_PORT_STAT_PFC_7_TX_PKTS;
stats_capability->list[67].stat_enum = SAI_PORT_STAT_PFC_0_RX_PAUSE_DURATION_US;
stats_capability->list[68].stat_enum = SAI_PORT_STAT_PFC_0_TX_PAUSE_DURATION_US;
stats_capability->list[69].stat_enum = SAI_PORT_STAT_PFC_1_RX_PAUSE_DURATION_US;
stats_capability->list[70].stat_enum = SAI_PORT_STAT_PFC_1_TX_PAUSE_DURATION_US;
stats_capability->list[71].stat_enum = SAI_PORT_STAT_PFC_2_RX_PAUSE_DURATION_US;
stats_capability->list[72].stat_enum = SAI_PORT_STAT_PFC_2_TX_PAUSE_DURATION_US;
stats_capability->list[73].stat_enum = SAI_PORT_STAT_PFC_3_RX_PAUSE_DURATION_US;
stats_capability->list[74].stat_enum = SAI_PORT_STAT_PFC_3_TX_PAUSE_DURATION_US;
stats_capability->list[75].stat_enum = SAI_PORT_STAT_PFC_4_RX_PAUSE_DURATION_US;
stats_capability->list[76].stat_enum = SAI_PORT_STAT_PFC_4_TX_PAUSE_DURATION_US;
stats_capability->list[77].stat_enum = SAI_PORT_STAT_PFC_5_RX_PAUSE_DURATION_US;
stats_capability->list[78].stat_enum = SAI_PORT_STAT_PFC_5_TX_PAUSE_DURATION_US;
stats_capability->list[79].stat_enum = SAI_PORT_STAT_PFC_6_RX_PAUSE_DURATION_US;
stats_capability->list[80].stat_enum = SAI_PORT_STAT_PFC_6_TX_PAUSE_DURATION_US;
stats_capability->list[81].stat_enum = SAI_PORT_STAT_PFC_7_RX_PAUSE_DURATION_US;
stats_capability->list[82].stat_enum = SAI_PORT_STAT_PFC_7_TX_PAUSE_DURATION_US;

for(i = 0; i < stats_capability->count; i++)
{
Expand Down
39 changes: 35 additions & 4 deletions vslib/VirtualSwitchSaiInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,13 +1011,13 @@ sai_status_t VirtualSwitchSaiInterface::queryStatsCapability(
}
else if (objectType == SAI_OBJECT_TYPE_PORT)
{
if (stats_capability->count < 51)
if (stats_capability->count < 83)
{
stats_capability->count = 51;
stats_capability->count = 83;
return SAI_STATUS_BUFFER_OVERFLOW;
}

stats_capability->count = 51;
stats_capability->count = 83;
stats_capability->list[0].stat_enum = SAI_PORT_STAT_IF_IN_OCTETS;
stats_capability->list[1].stat_enum = SAI_PORT_STAT_IF_IN_UCAST_PKTS;
stats_capability->list[2].stat_enum = SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS;
Expand Down Expand Up @@ -1069,7 +1069,38 @@ sai_status_t VirtualSwitchSaiInterface::queryStatsCapability(
stats_capability->list[48].stat_enum = SAI_PORT_STAT_WRED_DROPPED_PACKETS;
stats_capability->list[49].stat_enum = SAI_PORT_STAT_WRED_DROPPED_BYTES;
stats_capability->list[50].stat_enum = SAI_PORT_STAT_ECN_MARKED_PACKETS;

stats_capability->list[51].stat_enum = SAI_PORT_STAT_PFC_0_RX_PKTS;
stats_capability->list[52].stat_enum = SAI_PORT_STAT_PFC_0_TX_PKTS;
stats_capability->list[53].stat_enum = SAI_PORT_STAT_PFC_1_RX_PKTS;
stats_capability->list[54].stat_enum = SAI_PORT_STAT_PFC_1_TX_PKTS;
stats_capability->list[55].stat_enum = SAI_PORT_STAT_PFC_2_RX_PKTS;
stats_capability->list[56].stat_enum = SAI_PORT_STAT_PFC_2_TX_PKTS;
stats_capability->list[57].stat_enum = SAI_PORT_STAT_PFC_3_RX_PKTS;
stats_capability->list[58].stat_enum = SAI_PORT_STAT_PFC_3_TX_PKTS;
stats_capability->list[59].stat_enum = SAI_PORT_STAT_PFC_4_RX_PKTS;
stats_capability->list[60].stat_enum = SAI_PORT_STAT_PFC_4_TX_PKTS;
stats_capability->list[61].stat_enum = SAI_PORT_STAT_PFC_5_RX_PKTS;
stats_capability->list[62].stat_enum = SAI_PORT_STAT_PFC_5_TX_PKTS;
stats_capability->list[63].stat_enum = SAI_PORT_STAT_PFC_6_RX_PKTS;
stats_capability->list[64].stat_enum = SAI_PORT_STAT_PFC_6_TX_PKTS;
stats_capability->list[65].stat_enum = SAI_PORT_STAT_PFC_7_RX_PKTS;
stats_capability->list[66].stat_enum = SAI_PORT_STAT_PFC_7_TX_PKTS;
stats_capability->list[67].stat_enum = SAI_PORT_STAT_PFC_0_RX_PAUSE_DURATION_US;
stats_capability->list[68].stat_enum = SAI_PORT_STAT_PFC_0_TX_PAUSE_DURATION_US;
stats_capability->list[69].stat_enum = SAI_PORT_STAT_PFC_1_RX_PAUSE_DURATION_US;
stats_capability->list[70].stat_enum = SAI_PORT_STAT_PFC_1_TX_PAUSE_DURATION_US;
stats_capability->list[71].stat_enum = SAI_PORT_STAT_PFC_2_RX_PAUSE_DURATION_US;
stats_capability->list[72].stat_enum = SAI_PORT_STAT_PFC_2_TX_PAUSE_DURATION_US;
stats_capability->list[73].stat_enum = SAI_PORT_STAT_PFC_3_RX_PAUSE_DURATION_US;
stats_capability->list[74].stat_enum = SAI_PORT_STAT_PFC_3_TX_PAUSE_DURATION_US;
stats_capability->list[75].stat_enum = SAI_PORT_STAT_PFC_4_RX_PAUSE_DURATION_US;
stats_capability->list[76].stat_enum = SAI_PORT_STAT_PFC_4_TX_PAUSE_DURATION_US;
stats_capability->list[77].stat_enum = SAI_PORT_STAT_PFC_5_RX_PAUSE_DURATION_US;
stats_capability->list[78].stat_enum = SAI_PORT_STAT_PFC_5_TX_PAUSE_DURATION_US;
stats_capability->list[79].stat_enum = SAI_PORT_STAT_PFC_6_RX_PAUSE_DURATION_US;
stats_capability->list[80].stat_enum = SAI_PORT_STAT_PFC_6_TX_PAUSE_DURATION_US;
stats_capability->list[81].stat_enum = SAI_PORT_STAT_PFC_7_RX_PAUSE_DURATION_US;
stats_capability->list[82].stat_enum = SAI_PORT_STAT_PFC_7_TX_PAUSE_DURATION_US;
for(uint32_t i = 0; i < stats_capability->count; i++)
{
stats_capability->list[i].stat_modes = SAI_STATS_MODE_READ_AND_CLEAR | SAI_STATS_MODE_READ ;
Expand Down
Loading