Adding frequency grid validation for ZR optics #466

balram-csco · 2024-04-12T19:55:42Z

Description

Configuring frequency for ZR optics , which is not a multiple of 75Ghz was throwing exception causing xcvrd to crash.
Added validation check for 75GHz Grid without throwing exception and returning false/true value based on the input.
This change currently supports only 75GHz grid value and not any other frequency.

root@sonic:/home/cisco# sudo config interface -n asic2 transceiver frequency Ethernet200 196000
Setting laser frequency to 196000 GHz on port Ethernet200
root@sonic:/home/cisco#
Cause xcvrd to crash

Motivation and Context

How Has This Been Tested?

Configured frequency which was within the min and max supported limits with 2 sample size

Multiple of Grid frequency (75Ghz). Expectation is laser frequency configuration should be successful.
Not a multiple of Grid Frequency. Xcvrd should not crash

CONFIGURED 191450 WHICH IS 75GHZ GRID

Apr 12 09:37:09.140467 sonic WARNING kernel: [ 1165.878981] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:09.152458 sonic WARNING kernel: [ 1165.891307] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:09.164457 sonic WARNING kernel: [ 1165.903618] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:09.176454 sonic WARNING kernel: [ 1165.916303] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:09.188453 sonic WARNING kernel: [ 1165.928616] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:09.200450 sonic WARNING kernel: [ 1165.939432] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:09.389668 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: 400G, lanemask=0xff, state=AP_CONFIGURED, appl 1 host_lane_count 8 retries=0
Apr 12 09:37:15.478194 sonic NOTICE pmon#xcvrd[28]: message repeated 6 times: [ CMIS: Ethernet248: 400G, lanemask=0xff, state=AP_CONFIGURED, appl 1 host_lane_count 8 retries=0]
Apr 12 09:37:15.478194 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248 configured laser frequency 191450 GHz
Apr 12 09:37:16.506193 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: 400G, lanemask=0xff, state=DP_INIT, appl 1 host_lane_count 8 retries=0
Apr 12 09:37:16.519890 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: DpInit duration 60.0 secs
Apr 12 09:37:17.527446 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: 400G, lanemask=0xff, state=DP_TXON, appl 1 host_lane_count 8 retries=0
Apr 12 09:37:21.204489 sonic WARNING kernel: [ 1177.944702] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:21.216482 sonic WARNING kernel: [ 1177.955787] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious

Apr 12 09:37:21.508478 sonic WARNING kernel: [ 1178.247422] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:21.520471 sonic WARNING kernel: [ 1178.259330] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious

CONFIGURED 191500 WHICH IS NOT IN 75GHZ GRID

Apr 12 09:37:35.906393 sonic NOTICE pmon#xcvrd[28]: message repeated 18 times: [ CMIS: Ethernet248: 400G, lanemask=0xff, state=DP_TXON, appl 1 host_lane_count 8 retries=0]
Apr 12 09:37:35.906393 sonic WARNING pmon#xcvrd[28]: $$$ Ethernet248 handle_port_update_event() : op=SET DB:CONFIG_DB Table:PORT fvp {'admin_status': 'up', 'alias': 'Eth0/0/0/31', 'asic_port_name': 'Eth56-ASIC2', 'index': '31', 'lanes': '512,513,514,515,516,517,518,519', 'mtu': '9100', 'role': 'Ext', 'speed': '400000', 'laser_freq': '191500'}
Apr 12 09:37:35.906393 sonic WARNING pmon#xcvrd[28]: *** Ethernet248CONFIG_DBPORT handle_port_update_event() fvp {'admin_status': 'up', 'alias': 'Eth0/0/0/31', 'asic_port_name': 'Eth56-ASIC2', 'index': '31', 'lanes': '512,513,514,515,516,517,518,519', 'mtu': '9100', 'role': 'Ext', 'speed': '400000', 'laser_freq': '191500', 'key': 'Ethernet248', 'asic_id': 2, 'op': 'SET'}
Apr 12 09:37:35.906969 sonic WARNING swss2#orchagent: :- parsePortConfig: Unknown field(laser_freq): skipping ...
Apr 12 09:37:35.906969 sonic WARNING swss2#orchagent: :- parsePortConfig: Unknown field(asic_port_name): skipping ...
Apr 12 09:37:35.907197 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Set Ethernet248 lane system_speed 400000
Apr 12 09:37:35.907756 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:350: GBCRUD-REQ:SET-PORT: port_oid=100000000003e request: #0 PORT:SPEED=400000 #12
Apr 12 09:37:35.907929 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:465: GBCRUD-RES:SET-PORT:port_oid:100000000003e, pd_port=31, is_lineside=0 speed(400000) is the same#012
Apr 12 09:37:35.907945 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:516: GBCRUD-RES:SET-PORT:port_oid=100000000003e, pd_port=31, is_lineside=0, status:0 #12
Apr 12 09:37:35.908533 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Updated APPL_DB key:phy:15:ports:31 system_speed 400000
Apr 12 09:37:35.908533 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Set Ethernet248 lane line_speed 400000
Apr 12 09:37:35.909037 sonic NOTICE swss2#portmgrd: :- doTask: Configure Ethernet248 MTU to 9100
Apr 12 09:37:35.909087 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:350: GBCRUD-REQ:SET-PORT: port_oid=100000000003f request: #0 PORT:SPEED=400000 #12
Apr 12 09:37:35.909087 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:465: GBCRUD-RES:SET-PORT:port_oid:100000000003f, pd_port=31, is_lineside=1 speed(400000) is the same#012
Apr 12 09:37:35.909097 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:516: GBCRUD-RES:SET-PORT:port_oid=100000000003f, pd_port=31, is_lineside=1, status:0 #12
Apr 12 09:37:35.909683 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Updated APPL_DB key:phy:15:ports:31 line_speed 400000
Apr 12 09:37:35.910288 sonic WARNING swss2#orchagent: :- parsePortConfig: Unknown field(laser_freq): skipping ...
Apr 12 09:37:35.910288 sonic WARNING swss2#orchagent: :- parsePortConfig: Unknown field(asic_port_name): skipping ...
Apr 12 09:37:35.910507 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Set Ethernet248 lane system_speed 400000
Apr 12 09:37:35.911316 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:350: GBCRUD-REQ:SET-PORT: port_oid=100000000003e request: #0 PORT:SPEED=400000 #12
Apr 12 09:37:35.911481 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:465: GBCRUD-RES:SET-PORT:port_oid:100000000003e, pd_port=31, is_lineside=0 speed(400000) is the same#012
Apr 12 09:37:35.911481 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:516: GBCRUD-RES:SET-PORT:port_oid=100000000003e, pd_port=31, is_lineside=0, status:0 #12
Apr 12 09:37:35.911765 sonic NOTICE swss2#portmgrd: :- doTask: Configure Ethernet248 admin status to up
Apr 12 09:37:35.912125 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Updated APPL_DB key:phy:15:ports:31 system_speed 400000
Apr 12 09:37:35.912125 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Set Ethernet248 lane line_speed 400000
Apr 12 09:37:35.912527 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:350: GBCRUD-REQ:SET-PORT: port_oid=100000000003f request: #0 PORT:SPEED=400000 #12
Apr 12 09:37:35.912736 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:465: GBCRUD-RES:SET-PORT:port_oid:100000000003f, pd_port=31, is_lineside=1 speed(400000) is the same#012
Apr 12 09:37:35.912756 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:516: GBCRUD-RES:SET-PORT:port_oid=100000000003f, pd_port=31, is_lineside=1, status:0 #12
Apr 12 09:37:35.913168 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Updated APPL_DB key:phy:15:ports:31 line_speed 400000
Apr 12 09:37:35.913594 sonic WARNING swss2#orchagent: :- parsePortConfig: Unknown field(laser_freq): skipping ...
Apr 12 09:37:35.913594 sonic WARNING swss2#orchagent: :- parsePortConfig: Unknown field(asic_port_name): skipping ...
Apr 12 09:37:35.913724 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Set Ethernet248 lane system_speed 400000
Apr 12 09:37:35.914097 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:350: GBCRUD-REQ:SET-PORT: port_oid=100000000003e request: #0 PORT:SPEED=400000 #12
Apr 12 09:37:35.914265 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:465: GBCRUD-RES:SET-PORT:port_oid:100000000003e, pd_port=31, is_lineside=0 speed(400000) is the same#012
Apr 12 09:37:35.914283 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:516: GBCRUD-RES:SET-PORT:port_oid=100000000003e, pd_port=31, is_lineside=0, status:0 #12
Apr 12 09:37:35.914760 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Updated APPL_DB key:phy:15:ports:31 system_speed 400000
Apr 12 09:37:35.914760 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Set Ethernet248 lane line_speed 400000
Apr 12 09:37:35.915055 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:350: GBCRUD-REQ:SET-PORT: port_oid=100000000003f request: #0 PORT:SPEED=400000 #12
Apr 12 09:37:35.915262 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:465: GBCRUD-RES:SET-PORT:port_oid:100000000003f, pd_port=31, is_lineside=1 speed(400000) is the same#012
Apr 12 09:37:35.915278 sonic NOTICE gbsyncd2#GBSAI[18]: GBSAI: phy_set_port_attribute:516: GBCRUD-RES:SET-PORT:port_oid=100000000003f, pd_port=31, is_lineside=1, status:0 #12
Apr 12 09:37:35.915788 sonic NOTICE swss2#orchagent: :- setGearboxPortAttr: BOX: Updated APPL_DB key:phy:15:ports:31 line_speed 400000
Apr 12 09:37:35.922339 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: 400G, lanemask=0xff, state=INSERTED, appl 1 host_lane_count 8 retries=0
Apr 12 09:37:36.004299 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: Setting appl=1
Apr 12 09:37:36.086602 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: Setting host_lanemask=0xff
Apr 12 09:37:36.208476 sonic WARNING kernel: [ 1192.945057] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:36.220468 sonic WARNING kernel: [ 1192.957295] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:36.257574 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: Setting media_lanemask=0x1
Apr 12 09:37:36.425168 sonic ERR pmon#xcvrd[28]: CMIS: Ethernet248 configured freq:191500 GHz is NOT in 75GHz grid
Apr 12 09:37:36.425168 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: force Datapath reinit
Apr 12 09:37:36.524475 sonic WARNING kernel: [ 1193.263374] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:36.536467 sonic WARNING kernel: [ 1193.275654] imc_smbus 0000:ff:13.0: CLTT with interval of 0 looks suspicious
Apr 12 09:37:37.439684 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: 400G, lanemask=0xff, state=DP_DEINIT, appl 1 host_lane_count 8 retries=0
Apr 12 09:37:38.503378 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: DpDeinit duration 5.0 secs, modulePwrUp duration 60.0 secs
Apr 12 09:37:39.521233 sonic NOTICE pmon#xcvrd[28]: CMIS: Ethernet248: 400G, lanemask=0xff, state=AP_CONFIGURED, appl 1 host_lane_count 8 retries=0
Apr 12 09:37:46.717133 sonic NOTICE pmon#xcvrd[28]: message repeated 6 times: [ CMIS: Ethernet248: 400G, lanemask=0xff, state=AP_CONFIGURED, appl 1 host_lane_count 8 retries=0]
LISHED: {"sonic-host:device-test-event":{"batch-id":"555a75aa-f8b0-11ee-846c-bc4a56c228ff","index":"3","reason":"monit periodic test","sender":"events_monit_test.py","timestamp":"2024-04-12T09:37:53.110130Z"}}
Apr 12 09:37:53.110295 sonic NOTICE python3: :- publish: EVENT_PUBLISHED: {"sonic-host:device-test-event":{"batch-id":"555a75aa-f8b0-11ee-846c-bc4a56c228ff","index":"4","reason":"monit periodic test","sender":"events_monit_test.py","timestamp":"2024-04-12T09:37:53.110212Z"}}
^C
root@sonic:/home/cisco#

Additional Information (Optional)

Added test case for frequency config validation for ZR optics

Added change to call validation routine for laser frequency grid check.

linux-foundation-easycla · 2024-04-12T19:55:45Z

The committers listed above are authorized under a signed CLA.

✅ login: balram-csco (653c38a, 0f4643d, 6172c5e, 37aeb72, afa88e5, 92b6736, 1ebfe1d, d746755, 2b7a35b, f7a1672)

balram-csco · 2024-04-12T19:58:28Z

@prgeor @mihirpat1 . FYR...

prgeor · 2024-04-14T07:07:59Z

❌ - login: @balram-csco . The commit (afa88e5, d746755) is not authorized under a signed CLA. Please click here to be authorized. For further assistance with EasyCLA, please submit a support request ticket.

@balram-csco please sign the easy CLA

sonic-xcvrd/xcvrd/xcvrd.py

balram-csco · 2024-04-14T15:21:06Z

❌ - login: @balram-csco . The commit (afa88e5, d746755) is not authorized under a signed CLA. Please click here to be authorized. For further assistance with EasyCLA, please submit a support request ticket.

@balram-csco please sign the easy CLA

I have raised a request will followup with the admin.

balram-csco · 2024-04-17T18:12:54Z

@prgeor
Could you please review the code changes . I have attached the UT trace and crash trace as well for reference.

prgeor · 2024-04-21T19:59:58Z

@balram-csco please resolve the branch conflict or rebase with latest master

prgeor · 2024-04-21T20:06:44Z

sonic-xcvrd/xcvrd/xcvrd.py

@@ -1189,15 +1189,32 @@ def configure_tx_output_power(self, api, lport, tx_power):
           self.log_error("{} configured tx power {} > maximum power {} supported".format(lport, tx_power, max_p))
        return api.set_tx_power(tx_power)

-    def configure_laser_frequency(self, api, lport, freq, grid=75):
-        _, _,  _, lowf, highf = api.get_supported_freq_config()
+    def config_laser_frequency_validate(self, api, lport, freq, grid=75):


@balram-csco please rename it to -> validate_frequency_and_grid()

renamed function to validate_frequency_and_grid()

prgeor · 2024-04-21T20:07:22Z

sonic-xcvrd/xcvrd/xcvrd.py

+                return False
+        elif grid == 100:
+            if (supported_grid >> 5) & 0x1 != 1:
+                self.log_error("{} 100GHz is not supported".format(lport))


@balram-csco also log the freq

Added frequency

prgeor · 2024-04-21T20:07:38Z

sonic-xcvrd/xcvrd/xcvrd.py

+                self.log_error("{} 100GHz is not supported".format(lport))
+                return False
+        else:
+            self.log_error("{} {}GHz is not supported".format(lport, grid))


@balram-csco please log the freq

Added frequency log

prgeor · 2024-04-21T20:08:09Z

sonic-xcvrd/xcvrd/xcvrd.py

+            return False
+        if grid == 75:
+            if (supported_grid >> 7) & 0x1 != 1:
+                self.log_error("{} 75GHz is not supported".format(lport))


@balram-csco log the freq and grid

Added freq and grid logging

balram-csco added 2 commits April 13, 2024 00:52

Update test_xcvrd.py

afa88e5

Added test case for frequency config validation for ZR optics

Update xcvrd.py

d746755

Added change to call validation routine for laser frequency grid check.

prgeor reviewed Apr 14, 2024

View reviewed changes

sonic-xcvrd/xcvrd/xcvrd.py Outdated Show resolved Hide resolved

balram-csco added 5 commits April 15, 2024 13:36

Added 100Ghz grid check

6172c5e

Addresses indentation xcvrd.py

1ebfe1d

Updated xcvrd.py with proper return enum values

2b7a35b

Updated test cases for coverage

92b6736

Update for code optimisation

37aeb72

prgeor reviewed Apr 21, 2024

View reviewed changes

balram-csco added 3 commits April 23, 2024 10:24

Merge branch 'master' into master

653c38a

Added frequency and grid information is failure cases

f7a1672

renamed the function to validate_frequency_and_grid

0f4643d

prgeor requested a review from mihirpat1 April 29, 2024 17:51

prgeor approved these changes Apr 29, 2024

View reviewed changes

mihirpat1 approved these changes Apr 29, 2024

View reviewed changes

prgeor merged commit 6655396 into sonic-net:master Apr 29, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding frequency grid validation for ZR optics #466

Adding frequency grid validation for ZR optics #466

balram-csco commented Apr 12, 2024

linux-foundation-easycla bot commented Apr 12, 2024 •

edited

Loading

balram-csco commented Apr 12, 2024

prgeor commented Apr 14, 2024

balram-csco commented Apr 14, 2024

balram-csco commented Apr 17, 2024

prgeor commented Apr 21, 2024

prgeor Apr 21, 2024

balram-csco Apr 23, 2024

prgeor Apr 21, 2024

balram-csco Apr 23, 2024

prgeor Apr 21, 2024

balram-csco Apr 23, 2024

prgeor Apr 21, 2024 •

edited

Loading

balram-csco Apr 23, 2024

Adding frequency grid validation for ZR optics #466

Adding frequency grid validation for ZR optics #466

Conversation

balram-csco commented Apr 12, 2024

Description

Motivation and Context

How Has This Been Tested?

CONFIGURED 191450 WHICH IS 75GHZ GRID

CONFIGURED 191500 WHICH IS NOT IN 75GHZ GRID

Additional Information (Optional)

linux-foundation-easycla bot commented Apr 12, 2024 • edited Loading

balram-csco commented Apr 12, 2024

prgeor commented Apr 14, 2024

balram-csco commented Apr 14, 2024

balram-csco commented Apr 17, 2024

prgeor commented Apr 21, 2024

prgeor Apr 21, 2024

Choose a reason for hiding this comment

balram-csco Apr 23, 2024

Choose a reason for hiding this comment

prgeor Apr 21, 2024

Choose a reason for hiding this comment

balram-csco Apr 23, 2024

Choose a reason for hiding this comment

prgeor Apr 21, 2024

Choose a reason for hiding this comment

balram-csco Apr 23, 2024

Choose a reason for hiding this comment

prgeor Apr 21, 2024 • edited Loading

Choose a reason for hiding this comment

balram-csco Apr 23, 2024

Choose a reason for hiding this comment

linux-foundation-easycla bot commented Apr 12, 2024 •

edited

Loading

prgeor Apr 21, 2024 •

edited

Loading