Skip to content

[Cisco] Fix FBOSS mirror DSCP encoding #1537

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
peterpiao27 wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −8
Open

[Cisco] Fix FBOSS mirror DSCP encoding #1537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions fboss/agent/hw/sai/hw_test/HwTestMirrorUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static void verifyResolvedErspanMirror(
auto tos = SaiApiTable::getInstance()->mirrorApi().getAttribute(
mirrorHandle->adapterKey(),
SaiEnhancedRemoteMirrorTraits::Attributes::Tos());
EXPECT_EQ(tos, mirror->getDscp());
EXPECT_EQ(tos, static_cast<uint8_t>(mirror->getDscp() << 2));

const auto& tunnel = mirror->getMirrorTunnel();

Expand Down Expand Up @@ -146,7 +146,7 @@ static void verifyResolvedSflowMirror(
// TOS
auto tos = SaiApiTable::getInstance()->mirrorApi().getAttribute(
mirrorHandle->adapterKey(), SaiSflowMirrorTraits::Attributes::Tos());
EXPECT_EQ(tos, mirror->getDscp());
EXPECT_EQ(tos, static_cast<uint8_t>(mirror->getDscp() << 2));

const auto& tunnel = mirror->getMirrorTunnel();

Expand Down
6 changes: 4 additions & 2 deletions fboss/agent/hw/sai/hw_test/HwTestMirrorUtilsThriftHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ bool verifyResolvedMirror(
auto tos = SaiApiTable::getInstance()->mirrorApi().getAttribute(
mirrorHandle->adapterKey(),
SaiEnhancedRemoteMirrorTraits::Attributes::Tos());
if (tos != folly::copy(mirror.dscp().value())) {
const auto expectedTos =
static_cast<uint8_t>(folly::copy(mirror.dscp().value()) << 2);
if (tos != expectedTos) {
XLOG(ERR) << "verifyResolvedMirror: TOS mismatch, expected "
<< (int)mirror.dscp().value() << " got " << (int)tos;
<< (int)expectedTos << " got " << (int)tos;
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions fboss/agent/hw/sai/switch/SaiMirrorManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ SaiMirrorHandle::SaiMirror SaiMirrorManager::addNodeErSpan(
SAI_MIRROR_SESSION_TYPE_ENHANCED_REMOTE,
monitorPort,
SAI_ERSPAN_ENCAPSULATION_TYPE_MIRROR_L3_GRE_TUNNEL,
mirror->getDscp(),
static_cast<uint8_t>(mirror->getDscp() << 2),
mirrorTunnel.srcIp,
mirrorTunnel.dstIp,
mirrorTunnel.srcMac,
Expand Down Expand Up @@ -92,7 +92,7 @@ SaiMirrorHandle::SaiMirror SaiMirrorManager::addNodeSflow(
SaiSflowMirrorTraits::CreateAttributes attributes{
SAI_MIRROR_SESSION_TYPE_SFLOW,
monitorPort,
mirror->getDscp(),
static_cast<uint8_t>(mirror->getDscp() << 2),
mirrorTunnel.srcIp,
mirrorTunnel.dstIp,
mirrorTunnel.srcMac,
Expand Down
4 changes: 2 additions & 2 deletions fboss/agent/hw/sai/switch/tests/MirrorManagerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class MirrorManagerTest : public ManagerTestBase {
EXPECT_EQ(gotDstMac, dstMac);
auto gotTos = mirrorApi.getAttribute(
mirrorSaiId, SaiEnhancedRemoteMirrorTraits::Attributes::Tos{});
EXPECT_EQ(gotTos, tos);
EXPECT_EQ(gotTos, static_cast<uint8_t>(tos << 2));
auto gotTtl = mirrorApi.getAttribute(
mirrorSaiId, SaiEnhancedRemoteMirrorTraits::Attributes::Ttl{});
EXPECT_EQ(gotTtl, ttl);
Expand Down Expand Up @@ -164,7 +164,7 @@ class MirrorManagerTest : public ManagerTestBase {
EXPECT_EQ(gotDstMac, dstMac);
auto gotTos = mirrorApi.getAttribute(
mirrorSaiId, SaiSflowMirrorTraits::Attributes::Tos{});
EXPECT_EQ(gotTos, tos);
EXPECT_EQ(gotTos, static_cast<uint8_t>(tos << 2));
auto gotTtl = mirrorApi.getAttribute(
mirrorSaiId, SaiSflowMirrorTraits::Attributes::Ttl{});
EXPECT_EQ(gotTtl, ttl);
Expand Down
Loading