[macsec]: Set MTU for MACsec #2398

Pterosaur · 2022-07-26T08:00:35Z

Signed-off-by: Ze Gan ganze718@gmail.com

What I did
Set extra MTU for MACsec enabled port.

Why I did it
MACsec frame will expend the packet with MACsec SecTAG, Otherwise if a packet length equals the MTU which will be dropped by SAI port.

How I verified it
Assume 9100 is the MTU, Check by the command ping -s 9100 10.0.0.57

Details if related

Signed-off-by: Ze Gan <ganze718@gmail.com>

judyjoseph · 2022-07-27T05:18:47Z

orchagent/portsorch.cpp

@@ -1144,6 +1172,11 @@ bool PortsOrch::setPortMtu(sai_object_id_t id, sai_uint32_t mtu)
    /* mtu + 14 + 4 + 4 = 22 bytes */
    attr.value.u32 = (uint32_t)(mtu + sizeof(struct ether_header) + FCS_LEN + VLAN_TAG_LEN);

+    if (isMACsecPort(id))


This is definitely needed for non-gearbox based devices.
As discussed, do we need this additional 32 bytes to be added for the gbsyncd based devices as well ?

Yes, we also needed it for line_side_port for gearbox. @jimmyzhai will add more on this PR for adapting gearbox mode.

Have updated the fix to update port (w/o gearbox) MTU for MACsec.

Pterosaur

lgtm

orchagent/portsorch.cpp

orchagent/macsecorch.cpp

linux-foundation-easycla · 2022-08-03T02:32:33Z

The committers listed above are authorized under a signed CLA.

✅ login: Pterosaur / name: Ze Gan (16cae21, e3ce7ca, 9ec471a)
✅ login: jimmyzhai / name: Junhua Zhai (b8f618c, e55a065)

Pterosaur · 2022-08-04T10:56:35Z

/azp run

azure-pipelines · 2022-08-04T10:56:45Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Ze Gan <ganze718@gmail.com>

Pterosaur · 2022-08-09T00:12:29Z

/easycla

judyjoseph

LGTM

judyjoseph · 2022-08-09T02:24:28Z

@prsunny could you take a quick look too. thanks.

prsunny · 2022-08-11T18:08:44Z

orchagent/portsorch.cpp

+    return true;
+}
+
+bool PortsOrch::setPortMtu(const Port& port, sai_uint32_t mtu)


Why are we changing this API? Please have it as the original one and have the caller pass the extra value.

Due to the Gearbox architecture support, the original function cannot semantically support the functionality of set MTU. We just follow other existing functions, like set Speed, set Fec and so on, that are needed by Gearbox platform.

sonic-swss/orchagent/portsorch.cpp

Lines 2191 to 2209 in 9ec471a

task_process_status PortsOrch::setPortSpeed(Port &port, sai_uint32_t speed)

{

sai_attribute_t attr;

sai_status_t status;

SWSS_LOG_ENTER();

attr.id = SAI_PORT_ATTR_SPEED;

attr.value.u32 = speed;

status = sai_port_api->set_port_attribute(port.m_port_id, &attr);

if (status != SAI_STATUS_SUCCESS)

{

return handleSaiSetStatus(SAI_API_PORT, status);

}

setGearboxPortsAttr(port, SAI_PORT_ATTR_SPEED, &speed);

return task_success;

}

sonic-swss/orchagent/portsorch.cpp

Lines 1253 to 1277 in 9ec471a

bool PortsOrch::setPortFec(Port &port, sai_port_fec_mode_t mode)

{

SWSS_LOG_ENTER();

sai_attribute_t attr;

attr.id = SAI_PORT_ATTR_FEC_MODE;

attr.value.s32 = mode;

sai_status_t status = sai_port_api->set_port_attribute(port.m_port_id, &attr);

if (status != SAI_STATUS_SUCCESS)

{

SWSS_LOG_ERROR("Failed to set fec mode %d to port pid:%" PRIx64, mode, port.m_port_id);

task_process_status handle_status = handleSaiSetStatus(SAI_API_PORT, status);

if (handle_status != task_success)

{

return parseHandleSaiStatusFailure(handle_status);

}

}

SWSS_LOG_INFO("Set fec mode %d to port pid:%" PRIx64, mode, port.m_port_id);

setGearboxPortsAttr(port, SAI_PORT_ATTR_FEC_MODE, &mode);

return true;

}

ok, from the changes I still think you can reuse the existing function. But I see your point as making it consistent across other set functions. Approving from my side.

prsunny · 2022-08-15T18:45:37Z

orchagent/portsorch.cpp

+    return true;
+}
+
+bool PortsOrch::setPortMtu(const Port& port, sai_uint32_t mtu)


ok, from the changes I still think you can reuse the existing function. But I see your point as making it consistent across other set functions. Approving from my side.

What I did Set extra MTU for MACsec enabled port. Why I did it MACsec frame will expend the packet with MACsec SecTAG, Otherwise if a packet length equals the MTU which will be dropped by SAI port. Signed-off-by: Ze Gan <ganze718@gmail.com> Co-authored-by: Junhua Zhai <junhua.zhai@outlook.com>

yxieca · 2022-08-19T15:26:55Z

This change causes 202205 PR test to fail.

Pterosaur · 2022-08-20T05:20:25Z

This change causes 202205 PR test to fail.

This PR: sonic-net/sonic-sairedis#1107 is for fixing the failure.

Update sonic-swss submodule pointer to include the following: * Dynamic port configuration - add port buffer cfg to the port ref counter ([sonic-net#2194](sonic-net/sonic-swss#2194)) * tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE ([sonic-net#2408](sonic-net/sonic-swss#2408)) * [counters] Improve performance by polling only configured ports buffer queue/pg counters ([sonic-net#2360](sonic-net/sonic-swss#2360)) * added support for Xsight platform ([sonic-net#2426](sonic-net/sonic-swss#2426)) * [ci][asan] add DVS tests run with ASAN ([sonic-net#2363](sonic-net/sonic-swss#2363)) * Handle dual ToR neighbor miss scenario ([sonic-net#2151](sonic-net/sonic-swss#2151)) * Upstream new development on p4orch ([sonic-net#2237](sonic-net/sonic-swss#2237)) * [lgtm] Fix dependency ([sonic-net#2419](sonic-net/sonic-swss#2419)) * [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() ([sonic-net#2415](sonic-net/sonic-swss#2415)) * [macsec]: Set MTU for MACsec ([sonic-net#2398](sonic-net/sonic-swss#2398)) * Delete Invalid if condition in intfsorch.cpp ([sonic-net#2411](sonic-net/sonic-swss#2411)) Signed-off-by: dprital <drorp@nvidia.com>

What I did Set extra MTU for MACsec enabled port. Why I did it MACsec frame will expend the packet with MACsec SecTAG, Otherwise if a packet length equals the MTU which will be dropped by SAI port. Signed-off-by: Ze Gan <ganze718@gmail.com> Co-authored-by: Junhua Zhai <junhua.zhai@outlook.com>

**What I did** Set extra MTU for MACsec enabled port. **Why I did it** MACsec frame will expend the packet with MACsec SecTAG, Otherwise if a packet length equals the MTU which will be dropped by SAI port. **How I verified it** Assume 9100 is the MTU, Check by the command `ping -s 9100 10.0.0.57` **Details if related** Cherry-pick from #2398 Signed-off-by: Ze Gan <ganze718@gmail.com> Co-authored-by: Junhua Zhai <junhua.zhai@outlook.com>

Pterosaur force-pushed the fix_mtu_macsec branch 5 times, most recently from 8edfd13 to dd12a28 Compare July 26, 2022 08:42

Set mtu for MACsec

16cae21

Signed-off-by: Ze Gan <ganze718@gmail.com>

Pterosaur force-pushed the fix_mtu_macsec branch from dd12a28 to 16cae21 Compare July 26, 2022 08:53

Pterosaur requested review from jimmyzhai and judyjoseph July 26, 2022 11:23

Pterosaur marked this pull request as ready for review July 26, 2022 11:23

Pterosaur requested a review from prsunny as a code owner July 26, 2022 11:23

judyjoseph reviewed Jul 27, 2022

View reviewed changes

Support port mtu update w/o gearbox

b8f618c

jimmyzhai requested a review from judyjoseph July 27, 2022 09:21

Update fake_portorch.cpp

e55a065

Pterosaur commented Jul 28, 2022

View reviewed changes

Merge branch 'master' into fix_mtu_macsec

e3ce7ca

judyjoseph reviewed Aug 3, 2022

View reviewed changes

orchagent/portsorch.cpp Show resolved Hide resolved

judyjoseph reviewed Aug 3, 2022

View reviewed changes

orchagent/macsecorch.cpp Show resolved Hide resolved

Pterosaur force-pushed the fix_mtu_macsec branch 5 times, most recently from c88d845 to 28cfb2b Compare August 4, 2022 04:15

Pterosaur added the Request for 202205 Branch label Aug 4, 2022

Fix issue if MTU wasn't set

9ec471a

Signed-off-by: Ze Gan <ganze718@gmail.com>

Pterosaur force-pushed the fix_mtu_macsec branch from 28cfb2b to 9ec471a Compare August 4, 2022 13:40

Pterosaur requested a review from judyjoseph August 4, 2022 14:58

judyjoseph approved these changes Aug 9, 2022

View reviewed changes

prsunny reviewed Aug 11, 2022

View reviewed changes

Pterosaur requested a review from prsunny August 13, 2022 02:01

prsunny approved these changes Aug 15, 2022

View reviewed changes

Pterosaur merged commit cfcf3d8 into sonic-net:master Aug 16, 2022

yxieca added the Included in 202205 Branch label Aug 17, 2022

yxieca removed the Included in 202205 Branch label Aug 19, 2022

yxieca added the Cherry Pick Conflict_202205 label Aug 19, 2022

dprital mentioned this pull request Aug 29, 2022

[submodule] Advance sonic-swss pointer sonic-net/sonic-buildimage#11884

Closed

7 tasks

DavidZagury mentioned this pull request Sep 14, 2022

[sonic-swss] Update submodule sonic-net/sonic-buildimage#12075

Closed

7 tasks

Pterosaur mentioned this pull request Sep 23, 2022

[202205][macsec]: Set MTU for MACsec (#2398) #2466

Merged

yxieca added the Included in 202205 Branch label Sep 26, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[macsec]: Set MTU for MACsec #2398

[macsec]: Set MTU for MACsec #2398

Pterosaur commented Jul 26, 2022 •

edited

Loading

judyjoseph Jul 27, 2022

Pterosaur Jul 27, 2022

jimmyzhai Jul 27, 2022

Pterosaur left a comment

linux-foundation-easycla bot commented Aug 3, 2022 •

edited

Loading

Pterosaur commented Aug 4, 2022

azure-pipelines bot commented Aug 4, 2022

Pterosaur commented Aug 9, 2022

judyjoseph left a comment

judyjoseph commented Aug 9, 2022

prsunny Aug 11, 2022

Pterosaur Aug 13, 2022 •

edited

Loading

prsunny Aug 15, 2022

prsunny Aug 15, 2022

yxieca commented Aug 19, 2022

Pterosaur commented Aug 20, 2022

	task_process_status PortsOrch::setPortSpeed(Port &port, sai_uint32_t speed)
	{
	sai_attribute_t attr;
	sai_status_t status;

	SWSS_LOG_ENTER();

	attr.id = SAI_PORT_ATTR_SPEED;
	attr.value.u32 = speed;

	status = sai_port_api->set_port_attribute(port.m_port_id, &attr);
	if (status != SAI_STATUS_SUCCESS)
	{
	return handleSaiSetStatus(SAI_API_PORT, status);
	}

	setGearboxPortsAttr(port, SAI_PORT_ATTR_SPEED, &speed);
	return task_success;
	}

	bool PortsOrch::setPortFec(Port &port, sai_port_fec_mode_t mode)
	{
	SWSS_LOG_ENTER();

	sai_attribute_t attr;
	attr.id = SAI_PORT_ATTR_FEC_MODE;
	attr.value.s32 = mode;

	sai_status_t status = sai_port_api->set_port_attribute(port.m_port_id, &attr);
	if (status != SAI_STATUS_SUCCESS)
	{
	SWSS_LOG_ERROR("Failed to set fec mode %d to port pid:%" PRIx64, mode, port.m_port_id);
	task_process_status handle_status = handleSaiSetStatus(SAI_API_PORT, status);
	if (handle_status != task_success)
	{
	return parseHandleSaiStatusFailure(handle_status);
	}
	}

	SWSS_LOG_INFO("Set fec mode %d to port pid:%" PRIx64, mode, port.m_port_id);

	setGearboxPortsAttr(port, SAI_PORT_ATTR_FEC_MODE, &mode);

	return true;
	}

[macsec]: Set MTU for MACsec #2398

[macsec]: Set MTU for MACsec #2398

Conversation

Pterosaur commented Jul 26, 2022 • edited Loading

judyjoseph Jul 27, 2022

Choose a reason for hiding this comment

Pterosaur Jul 27, 2022

Choose a reason for hiding this comment

jimmyzhai Jul 27, 2022

Choose a reason for hiding this comment

Pterosaur left a comment

Choose a reason for hiding this comment

linux-foundation-easycla bot commented Aug 3, 2022 • edited Loading

Pterosaur commented Aug 4, 2022

azure-pipelines bot commented Aug 4, 2022

Pterosaur commented Aug 9, 2022

judyjoseph left a comment

Choose a reason for hiding this comment

judyjoseph commented Aug 9, 2022

prsunny Aug 11, 2022

Choose a reason for hiding this comment

Pterosaur Aug 13, 2022 • edited Loading

Choose a reason for hiding this comment

prsunny Aug 15, 2022

Choose a reason for hiding this comment

prsunny Aug 15, 2022

Choose a reason for hiding this comment

yxieca commented Aug 19, 2022

Pterosaur commented Aug 20, 2022

Pterosaur commented Jul 26, 2022 •

edited

Loading

linux-foundation-easycla bot commented Aug 3, 2022 •

edited

Loading

Pterosaur Aug 13, 2022 •

edited

Loading