[bfdorch] add default TOS value for BFD session #2689

baorliu · 2023-03-04T02:05:56Z

What I did
Add default TOS value when create BFD session, default DSCP value is 48, default ECN is 0. The BFD session configuration will override this default value.

Why I did it
Higher DSCP value is preferred for BFD packet.

How I verified it
Set different TOS value in BFD session configuration, and create BFD session in DUT.
Load the test image with the design change, connect a traffic generator (with BFD protocol support), capture the packet sent out by DUT, check the DSCP and ECN field in the captured packet.

cisco@sonic:/var/tmp$ cat bfd.cfg
[
  {
      "BFD_SESSION_TABLE:default:default:192.168.88.2": {
      "tos": "186",
      "multihop": "true",
      "rx_interval": "1000",
      "tx_interval": "1000",
      "local_addr": "192.168.88.1"
  },
  "OP": "SET"
}
]

APP_DB dump:

 cisco@sonic:/var/tmp$ head -n 50 redis0.log 
{
  "BFD_SESSION_TABLE:default:default:192.168.88.2": {
    "expireat": 1677887525.8233933,
    "ttl": -0.001,
    "type": "hash",
    "value": {
      "local_addr": "192.168.88.1",
      "multihop": "true",
      "rx_interval": "1000",
      "tos": "186",
      "tx_interval": "1000"
    }
  },

ASIC DB dump:

  "ASIC_STATE:SAI_OBJECT_TYPE_BFD_SESSION:oid:0x45000000000989": {
  "expireat": 1677887399.4435563,
  "ttl": -0.001,
  "type": "hash",
  "value": {
    "SAI_BFD_SESSION_ATTR_BFD_ENCAPSULATION_TYPE": "SAI_BFD_ENCAPSULATION_TYPE_NONE",
    "SAI_BFD_SESSION_ATTR_DST_IP_ADDRESS": "192.168.88.2",
    "SAI_BFD_SESSION_ATTR_IPHDR_VERSION": "4",
    "SAI_BFD_SESSION_ATTR_LOCAL_DISCRIMINATOR": "6",
    "SAI_BFD_SESSION_ATTR_MIN_RX": "1000000",
    "SAI_BFD_SESSION_ATTR_MIN_TX": "1000000",
    "SAI_BFD_SESSION_ATTR_MULTIHOP": "true",
    "SAI_BFD_SESSION_ATTR_MULTIPLIER": "10",
    "SAI_BFD_SESSION_ATTR_REMOTE_DISCRIMINATOR": "0",
    "SAI_BFD_SESSION_ATTR_SRC_IP_ADDRESS": "192.168.88.1",
    "SAI_BFD_SESSION_ATTR_TOS": "186",
    "SAI_BFD_SESSION_ATTR_TYPE": "SAI_BFD_SESSION_TYPE_ASYNC_ACTIVE",
    "SAI_BFD_SESSION_ATTR_UDP_SRC_PORT": "49157",
    "SAI_BFD_SESSION_ATTR_VIRTUAL_ROUTER": "oid:0x3000000000042"
  }
},

Details if related

Add default TOS value when create BFD session, default DSCP value is 46, default ECN is 0. The BFD session configuration will override this default value.

baorliu · 2023-03-04T20:05:55Z

BFD related UT passed. the vstest failure caused by other UT.

2023-03-04T03:26:50.4079122Z test_addRemoveBfdSession passed 1 out of the required 1 times. Success!
2023-03-04T03:26:50.4079402Z test_addRemoveBfdSession_ipv6 passed 1 out of the required 1 times. Success!
2023-03-04T03:26:50.4079694Z test_addRemoveBfdSession_interface passed 1 out of the required 1 times. Success!
2023-03-04T03:26:50.4079980Z test_addRemoveBfdSession_txrx_interval passed 1 out of the required 1 times. Success!
2023-03-04T03:26:50.4080285Z test_addRemoveBfdSession_multiplier passed 1 out of the required 1 times. Success!
2023-03-04T03:26:50.4080582Z test_addRemoveBfdSession_multihop passed 1 out of the required 1 times. Success!
2023-03-04T03:26:50.4080893Z test_addRemoveBfdSession_type passed 1 out of the required 1 times. Success!
2023-03-04T03:26:50.4081203Z test_multipleBfdSessions passed 1 out of the required 1 times. Success!
2023-03-04T03:26:50.4081478Z test_bfd_state_db_clear passed 1 out of the required 1 times. Success!

lguohan · 2023-03-05T02:04:26Z

@prsunny , can yu review this?

prsunny · 2023-03-06T22:38:38Z

orchagent/bfdorch.cpp

@@ -243,6 +243,7 @@ bool BfdOrch::create_bfd_session(const string& key, const vector<FieldValueTuple
    uint32_t tx_interval = BFD_SESSION_DEFAULT_TX_INTERVAL;
    uint32_t rx_interval = BFD_SESSION_DEFAULT_RX_INTERVAL;
    uint8_t multiplier = BFD_SESSION_DEFAULT_DETECT_MULTIPLIER;
+    uint8_t tos = 184;  // default value 46<<2. higher 6-bit tos 46, lower 2-bit ecn 0


please use a # define to declare this

fixed. thanks.

siqbal1986 · 2023-03-07T00:06:36Z

can you please update it to reflect the use of #defile and change the value to 48 as done in #2690

prsunny · 2023-03-07T01:03:20Z

can you please raise a PR to 202012?

siqbal1986

looks good

siqbal1986 · 2023-03-07T17:14:21Z

can you please create a PR for 202012 as well.

Cherry-picking #2689

Update sonic-swss submodule pointer to include the following: * a2c9a61 [EVPN]Handling error scenarios during route programming and IMR add ([sonic-net#2670](sonic-net/sonic-swss#2670)) * 115efe8 [bfdorch] add default TOS value for BFD session ([sonic-net#2689](sonic-net/sonic-swss#2689)) * a198289 [orchagent, SRv6]: create seglist support to set sid list type ([sonic-net#2406](sonic-net/sonic-swss#2406)) Signed-off-by: AntonHryshchuk <antonh@nvidia.com>

What I did Add default TOS value when create BFD session, default DSCP value is 46, default ECN is 0. The BFD session configuration will override this default value. Why I did it Higher DSCP value is preferred for BFD packet. How I verified it Set different TOS value in BFD session configuration, and create BFD session in DUT. Load the test image with the design change, connect a traffic generator (with BFD protocol support), capture the packet sent out by DUT, check the DSCP and ECN field in the captured packet.

Update sonic-swss submodule pointer to include the following: * 98a16cf [ACL] Write ACL table/rule creation status into STATE_DB ([sonic-net#2662](sonic-net/sonic-swss#2662)) * a2c9a61 [EVPN]Handling error scenarios during route programming and IMR add ([sonic-net#2670](sonic-net/sonic-swss#2670)) * 115efe8 [bfdorch] add default TOS value for BFD session ([sonic-net#2689](sonic-net/sonic-swss#2689)) * a198289 [orchagent, SRv6]: create seglist support to set sid list type ([sonic-net#2406](sonic-net/sonic-swss#2406)) Signed-off-by: dgsudharsan <sudharsand@nvidia.com>

Update sonic-swss submodule pointer to include the following: * 98a16cf [ACL] Write ACL table/rule creation status into STATE_DB ([#2662](sonic-net/sonic-swss#2662)) * a2c9a61 [EVPN]Handling error scenarios during route programming and IMR add ([#2670](sonic-net/sonic-swss#2670)) * 115efe8 [bfdorch] add default TOS value for BFD session ([#2689](sonic-net/sonic-swss#2689)) * a198289 [orchagent, SRv6]: create seglist support to set sid list type ([#2406](sonic-net/sonic-swss#2406))

What I did Add default TOS value when create BFD session, default DSCP value is 46, default ECN is 0. The BFD session configuration will override this default value. Why I did it Higher DSCP value is preferred for BFD packet. How I verified it Set different TOS value in BFD session configuration, and create BFD session in DUT. Load the test image with the design change, connect a traffic generator (with BFD protocol support), capture the packet sent out by DUT, check the DSCP and ECN field in the captured packet.

[bfdorch] add default TOS value for BFD session

c2f0038

Add default TOS value when create BFD session, default DSCP value is 46, default ECN is 0. The BFD session configuration will override this default value.

baorliu marked this pull request as ready for review March 4, 2023 20:06

baorliu requested a review from prsunny as a code owner March 4, 2023 20:06

prsunny reviewed Mar 6, 2023

View reviewed changes

prsunny requested a review from siqbal1986 March 6, 2023 22:42

[bfdorch] use define for default TOS

98e7528

[bfdorch] change BFD packet DSCP default value to 48

332488e

prsunny added Request for 202205 Branch Request for 202211 Branch labels Mar 7, 2023

baorliu mentioned this pull request Mar 7, 2023

[202012][bfdorch] add default TOS value for BFD packet #2692

Merged

[bfdorch] fix ut after change default tos value

c5fd742

baorliu force-pushed the cisco-baorliu-bfd-tos_t branch from ec5cedc to c5fd742 Compare March 7, 2023 05:54

siqbal1986 approved these changes Mar 7, 2023

View reviewed changes

siqbal1986 merged commit 115efe8 into sonic-net:master Mar 7, 2023

siqbal1986 pushed a commit that referenced this pull request Mar 7, 2023

[bfdorch] add default TOS value for BFD packet (#2692)

1540161

Cherry-picking #2689

yxieca added the Included in 202205 Branch label Mar 8, 2023

dgsudharsan mentioned this pull request Mar 9, 2023

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

Merged

8 tasks

StormLiangMS added the Included in 202211 Branch label Mar 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[bfdorch] add default TOS value for BFD session #2689

[bfdorch] add default TOS value for BFD session #2689

baorliu commented Mar 4, 2023 •

edited by prsunny

Loading

baorliu commented Mar 4, 2023

lguohan commented Mar 5, 2023

prsunny Mar 6, 2023

baorliu Mar 6, 2023

siqbal1986 commented Mar 7, 2023

prsunny commented Mar 7, 2023

siqbal1986 left a comment

siqbal1986 commented Mar 7, 2023

[bfdorch] add default TOS value for BFD session #2689

[bfdorch] add default TOS value for BFD session #2689

Conversation

baorliu commented Mar 4, 2023 • edited by prsunny Loading

baorliu commented Mar 4, 2023

lguohan commented Mar 5, 2023

prsunny Mar 6, 2023

Choose a reason for hiding this comment

baorliu Mar 6, 2023

Choose a reason for hiding this comment

siqbal1986 commented Mar 7, 2023

prsunny commented Mar 7, 2023

siqbal1986 left a comment

Choose a reason for hiding this comment

siqbal1986 commented Mar 7, 2023

baorliu commented Mar 4, 2023 •

edited by prsunny

Loading