Skip to content

[code sync] Merge code from sonic-net/sonic-sairedis:202412 to 202503 #78

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
mssonicbld merged 2 commits into from
Aug 8, 2025
Merged

[code sync] Merge code from sonic-net/sonic-sairedis:202412 to 202503 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e9bc50
[trim]: Add Packet Trimming Drop Counters to VS lib (#77)
mssonicbld Aug 7, 2025
a34dac6
Merge branch '202412' of https://github.com/Azure/sonic-sairedis.msft…
mssonicbld Aug 8, 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
13 changes: 13 additions & 0 deletions syncd/FlexCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ static const std::string COUNTER_TYPE_ENI = "DASH ENI Counter";
static const std::string COUNTER_TYPE_METER_BUCKET = "DASH Meter Bucket Counter";
static const std::string COUNTER_TYPE_POLICER = "Policer Counter";
static const std::string COUNTER_TYPE_SRV6 = "SRv6 Counter";
static const std::string COUNTER_TYPE_SWITCH = "Switch Counter";
static const std::string ATTR_TYPE_QUEUE = "Queue Attribute";
static const std::string ATTR_TYPE_PG = "Priority Group Attribute";
static const std::string ATTR_TYPE_MACSEC_SA = "MACSEC SA Attribute";
Expand Down Expand Up @@ -68,6 +69,7 @@ const std::map<std::tuple<sai_object_type_t, std::string>, std::string> FlexCoun
{{(sai_object_type_t)SAI_OBJECT_TYPE_ENI, ENI_COUNTER_ID_LIST}, COUNTER_TYPE_ENI},
{{(sai_object_type_t)SAI_OBJECT_TYPE_ENI, DASH_METER_COUNTER_ID_LIST}, COUNTER_TYPE_METER_BUCKET},
{{SAI_OBJECT_TYPE_COUNTER, SRV6_COUNTER_ID_LIST}, COUNTER_TYPE_SRV6},
{{SAI_OBJECT_TYPE_SWITCH, SWITCH_COUNTER_ID_LIST}, COUNTER_TYPE_SWITCH},
};

BaseCounterContext::BaseCounterContext(const std::string &name, const std::string &instance):
Expand Down Expand Up @@ -2852,6 +2854,13 @@ std::shared_ptr<BaseCounterContext> FlexCounter::createCounterContext(
{
return std::make_shared<CounterContext<sai_counter_stat_t>>(context_name, instance, SAI_OBJECT_TYPE_COUNTER, m_vendorSai.get(), m_statsMode);
}
else if (context_name == COUNTER_TYPE_SWITCH)
{
auto context = std::make_shared<CounterContext<sai_switch_stat_t>>(context_name, instance, SAI_OBJECT_TYPE_SWITCH, m_vendorSai.get(), m_statsMode);
context->always_check_supported_counters = true;
context->use_sai_stats_capa_query = true;
return context;
}

SWSS_LOG_THROW("Invalid counter type %s", context_name.c_str());
// GCC 8.3 requires a return value here
Expand Down Expand Up @@ -3093,6 +3102,10 @@ void FlexCounter::removeCounter(
{
getCounterContext(COUNTER_TYPE_SWITCH_DEBUG)->removeObject(vid);
}
if (hasCounterContext(COUNTER_TYPE_SWITCH))
{
getCounterContext(COUNTER_TYPE_SWITCH)->removeObject(vid);
}
}
else if (objectType == SAI_OBJECT_TYPE_MACSEC_FLOW)
{
Expand Down
97 changes: 94 additions & 3 deletions unittest/syncd/TestFlexCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,68 @@ TEST(FlexCounter, addRemoveCounter)
false,
STATS_MODE_READ,
true);

// Packet Trimming

testAddRemoveCounter(
1,
SAI_OBJECT_TYPE_PORT,
PORT_COUNTER_ID_LIST,
{"SAI_PORT_STAT_TRIM_PACKETS", "SAI_PORT_STAT_DROPPED_TRIM_PACKETS", "SAI_PORT_STAT_TX_TRIM_PACKETS"},
{"100", "200", "300"},
counterVerifyFunc,
false);

testAddRemoveCounter(
1,
SAI_OBJECT_TYPE_PORT,
PORT_COUNTER_ID_LIST,
{"SAI_PORT_STAT_TRIM_PACKETS", "SAI_PORT_STAT_DROPPED_TRIM_PACKETS", "SAI_PORT_STAT_TX_TRIM_PACKETS"},
{"100", "200", "300"},
counterVerifyFunc,
false,
STATS_MODE_READ,
true);

testAddRemoveCounter(
1,
SAI_OBJECT_TYPE_QUEUE,
QUEUE_COUNTER_ID_LIST,
{"SAI_QUEUE_STAT_TRIM_PACKETS", "SAI_QUEUE_STAT_DROPPED_TRIM_PACKETS", "SAI_QUEUE_STAT_TX_TRIM_PACKETS"},
{"100", "200", "300"},
counterVerifyFunc,
false);

testAddRemoveCounter(
1,
SAI_OBJECT_TYPE_QUEUE,
QUEUE_COUNTER_ID_LIST,
{"SAI_QUEUE_STAT_TRIM_PACKETS", "SAI_QUEUE_STAT_DROPPED_TRIM_PACKETS", "SAI_QUEUE_STAT_TX_TRIM_PACKETS"},
{"100", "200", "300"},
counterVerifyFunc,
false,
STATS_MODE_READ,
true);

testAddRemoveCounter(
1,
SAI_OBJECT_TYPE_SWITCH,
SWITCH_COUNTER_ID_LIST,
{"SAI_SWITCH_STAT_DROPPED_TRIM_PACKETS", "SAI_SWITCH_STAT_TX_TRIM_PACKETS"},
{"100", "200"},
counterVerifyFunc,
false);

testAddRemoveCounter(
1,
SAI_OBJECT_TYPE_SWITCH,
SWITCH_COUNTER_ID_LIST,
{"SAI_SWITCH_STAT_DROPPED_TRIM_PACKETS", "SAI_SWITCH_STAT_TX_TRIM_PACKETS"},
{"100", "200"},
counterVerifyFunc,
false,
STATS_MODE_READ,
true);
}

TEST(FlexCounter, UpdateExistingCounterAddBulk)
Expand Down Expand Up @@ -906,15 +968,15 @@ TEST(FlexCounter, bulkCounter)
int counterOffset = 0;
int capabilities = 0;
sai->mock_queryStatsCapability = [&](sai_object_id_t switch_id, sai_object_type_t object_type, sai_stat_capability_list_t *stats_capability) {
// Assume all counters are in range [currentOffset, currentOffset + 100]
// Assume all counters are in range [currentOffset, currentOffset + 250]
if (stats_capability->count == 0)
{
stats_capability->count = 100;
stats_capability->count = 250;
return SAI_STATUS_BUFFER_OVERFLOW;
}
else
{
for (int i = 0; i < 100; i++)
for (int i = 0; i < 250; i++)
{
stats_capability->list[i].stat_enum = i + counterOffset;
if (capabilities == 0)
Expand Down Expand Up @@ -1106,6 +1168,35 @@ TEST(FlexCounter, bulkCounter)
{"100", "200"},
counterVerifyFunc,
false);

// Packet Trimming

testAddRemoveCounter(
2,
SAI_OBJECT_TYPE_PORT,
PORT_COUNTER_ID_LIST,
{"SAI_PORT_STAT_TRIM_PACKETS", "SAI_PORT_STAT_DROPPED_TRIM_PACKETS", "SAI_PORT_STAT_TX_TRIM_PACKETS"},
{"100", "200", "300"},
counterVerifyFunc,
false);

testAddRemoveCounter(
2,
SAI_OBJECT_TYPE_QUEUE,
QUEUE_COUNTER_ID_LIST,
{"SAI_QUEUE_STAT_TRIM_PACKETS", "SAI_QUEUE_STAT_DROPPED_TRIM_PACKETS", "SAI_QUEUE_STAT_TX_TRIM_PACKETS"},
{"100", "200", "300"},
counterVerifyFunc,
false);

testAddRemoveCounter(
2,
SAI_OBJECT_TYPE_SWITCH,
SWITCH_COUNTER_ID_LIST,
{"SAI_SWITCH_STAT_DROPPED_TRIM_PACKETS", "SAI_SWITCH_STAT_TX_TRIM_PACKETS"},
{"100", "200"},
counterVerifyFunc,
false);
}

TEST(FlexCounter, bulkChunksize)
Expand Down
38 changes: 38 additions & 0 deletions unittest/vslib/TestVirtualSwitchSaiInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,25 @@ TEST_F(VirtualSwitchSaiInterfaceTest, queryStatsCapability)
std::vector<sai_stat_capability_t> capability_list;
sai_stat_capability_list_t stats_capability;

/* Switch stats capability get */
stats_capability.count = 0;
stats_capability.list = nullptr;

EXPECT_EQ(SAI_STATUS_BUFFER_OVERFLOW,
m_vssai->queryStatsCapability(
m_swid,
SAI_OBJECT_TYPE_SWITCH,
&stats_capability));

capability_list.resize(stats_capability.count);
stats_capability.list = capability_list.data();

EXPECT_EQ(SAI_STATUS_SUCCESS,
m_vssai->queryStatsCapability(
m_swid,
SAI_OBJECT_TYPE_SWITCH,
&stats_capability));

/* Queue stats capability get */
stats_capability.count = 0;
stats_capability.list = nullptr;
Expand Down Expand Up @@ -209,6 +228,25 @@ TEST_F(VirtualSwitchSaiInterfaceTest, queryStatsStCapability)
sai_stat_st_capability_list_t stats_capability;
stats_capability.list = capability_list;

/* Switch stats capability get */
stats_capability.count = 0;
stats_capability.list = nullptr;

EXPECT_EQ(SAI_STATUS_BUFFER_OVERFLOW,
m_vssai->queryStatsStCapability(
m_swid,
SAI_OBJECT_TYPE_SWITCH,
&stats_capability));

capability_list.resize(stats_capability.count);
stats_capability.list = capability_list.data();

EXPECT_EQ(SAI_STATUS_SUCCESS,
m_vssai->queryStatsStCapability(
m_swid,
SAI_OBJECT_TYPE_SWITCH,
&stats_capability));

/* Queue stats capability get */
stats_capability.count = 1;

Expand Down
43 changes: 40 additions & 3 deletions vslib/SwitchStateBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4109,6 +4109,35 @@ sai_status_t SwitchStateBase::queryAttributeCapability(
return SAI_STATUS_SUCCESS;
}

sai_status_t SwitchStateBase::querySwitchStatsCapability(
_Inout_ sai_stat_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

static std::vector<sai_switch_stat_t> switchStatList = {
SAI_SWITCH_STAT_ECC_DROP,
SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP,
SAI_SWITCH_STAT_DROPPED_TRIM_PACKETS,
SAI_SWITCH_STAT_TX_TRIM_PACKETS
};

if (stats_capability->count < switchStatList.size())
{
stats_capability->count = static_cast<uint32_t>(switchStatList.size());
return SAI_STATUS_BUFFER_OVERFLOW;
}

stats_capability->count = static_cast<uint32_t>(switchStatList.size());

for (std::uint32_t i = 0; i < switchStatList.size(); i++)
{
stats_capability->list[i].stat_modes = SAI_STATS_MODE_READ_AND_CLEAR | SAI_STATS_MODE_READ;
stats_capability->list[i].stat_enum = static_cast<sai_stat_id_t>(switchStatList.at(i));
}

return SAI_STATUS_SUCCESS;
}

sai_status_t SwitchStateBase::queryPortStatsCapability(
_Inout_ sai_stat_capability_list_t *stats_capability)
{
Expand Down Expand Up @@ -4206,7 +4235,9 @@ sai_status_t SwitchStateBase::queryPortStatsCapability(
SAI_PORT_STAT_PFC_5_ON2OFF_RX_PKTS,
SAI_PORT_STAT_PFC_6_ON2OFF_RX_PKTS,
SAI_PORT_STAT_PFC_7_ON2OFF_RX_PKTS,
SAI_PORT_STAT_TRIM_PACKETS
SAI_PORT_STAT_TRIM_PACKETS,
SAI_PORT_STAT_DROPPED_TRIM_PACKETS,
SAI_PORT_STAT_TX_TRIM_PACKETS
};

if (stats_capability->count < portStatList.size())
Expand Down Expand Up @@ -4245,7 +4276,9 @@ sai_status_t SwitchStateBase::queryQueueStatsCapability(
SAI_QUEUE_STAT_CURR_OCCUPANCY_LEVEL,
SAI_QUEUE_STAT_WATERMARK_LEVEL,
SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS,
SAI_QUEUE_STAT_TRIM_PACKETS
SAI_QUEUE_STAT_TRIM_PACKETS,
SAI_QUEUE_STAT_DROPPED_TRIM_PACKETS,
SAI_QUEUE_STAT_TX_TRIM_PACKETS
};

if (stats_capability->count < queueStatList.size())
Expand All @@ -4272,7 +4305,11 @@ sai_status_t SwitchStateBase::queryStatsCapability(
{
SWSS_LOG_ENTER();

if (objectType == SAI_OBJECT_TYPE_QUEUE)
if (objectType == SAI_OBJECT_TYPE_SWITCH)
{
return querySwitchStatsCapability(stats_capability);
}
else if (objectType == SAI_OBJECT_TYPE_QUEUE)
{
return queryQueueStatsCapability(stats_capability);
}
Expand Down
3 changes: 3 additions & 0 deletions vslib/SwitchStateBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,9 @@ namespace saivs

protected:

virtual sai_status_t querySwitchStatsCapability(
_Inout_ sai_stat_capability_list_t *stats_capability);

virtual sai_status_t queryPortStatsCapability(
_Inout_ sai_stat_capability_list_t *stats_capability);

Expand Down
Loading