Skip to content

Commit 2b44942

Browse files
vharish02lguohan
vharish02
authored and
lguohan
committed
[device/dell] Code supports New Buffer mgmt infra (#1449)
This commit adds new code which supports the new buffer mgmt infra. - Added new code to support buffers for T0 and T1 configs of S6100. - Added new qos.json file to support qos on S6100. - Changed the pg_profile_lookup.ini file to support xon_offset. - Changed buffer.json.j2 file according to new buffer mgmt infra. Unit tested by verifying the above changes by loading S6100 with the configuration, checked the hardware for broadcom recommended settings by running bcmcmd. Sent the unit test logs to Ying. Checked the PG_RESET_OFFSET value which reflects the new xon_offset value of 2288 from the pg_profile_lookup.ini. Signed-off-by: Harish Venkatraman <Harish_Venkatraman@dell.com>
1 parent 09f2385 commit 2b44942

File tree

5 files changed

+279
-162
lines changed

5 files changed

+279
-162
lines changed

‎device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers.json.j2

+2-146
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,2 @@
1-
{# Default values which will be used if no actual configura available #}
2-
{% set default_cable = '300m' %}
3-
{% set default_speed = '100G' %}
4-
{% set default_ports_num = 64 -%}
5-
6-
{# Port configuration to cable length look-up table #}
7-
{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
8-
{# Roles described in the minigraph #}
9-
{% set ports2cable = {
10-
'torrouter_server' : '5m',
11-
'leafrouter_torrouter' : '40m',
12-
'spinerouter_leafrouter' : '300m'
13-
}
14-
%}
15-
16-
{%- macro cable_length(port_name) -%}
17-
{%- set cable_len = [] -%}
18-
{%- for local_port in DEVICE_NEIGHBOR -%}
19-
{%- if local_port == port_name -%}
20-
{%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
21-
{%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
22-
{%- set neighbor_role = neighbor.type -%}
23-
{%- set roles1 = switch_role + '_' + neighbor_role %}
24-
{%- set roles2 = neighbor_role + '_' + switch_role -%}
25-
{%- set roles1 = roles1 | lower -%}
26-
{%- set roles2 = roles2 | lower -%}
27-
{%- if roles1 in ports2cable -%}
28-
{%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
29-
{%- elif roles2 in ports2cable -%}
30-
{%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
31-
{%- endif -%}
32-
{%- endif -%}
33-
{%- endif -%}
34-
{%- endfor -%}
35-
{%- if cable_len -%}
36-
{{ cable_len.0 }}
37-
{%- else -%}
38-
{%- if switch_role == 'ToRRouter' -%}
39-
{%- for local_port in VLAN_MEMBER -%}
40-
{%- set vlan_port = local_port.split("|") -%}
41-
{%- if vlan_port[1] == port_name -%}
42-
{%- set roles3 = switch_role + '_' + 'server' -%}
43-
{%- set roles3 = roles3 | lower -%}
44-
{%- if roles3 in ports2cable -%}
45-
{%- if cable_len.append(ports2cable[roles3]) -%}{%- endif -%}
46-
{%- endif -%}
47-
{%- endif -%}
48-
{%- endfor -%}
49-
{%- if cable_len -%}
50-
{{cable_len.0}}
51-
{%- else -%}
52-
{{ default_cable }}
53-
{%- endif -%}
54-
{%- else -%}
55-
{{ default_cable }}
56-
{%- endif -%}
57-
{%- endif -%}
58-
{% endmacro %}
59-
60-
{%- if DEVICE_METADATA is defined %}
61-
{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
62-
{%- endif -%}
63-
64-
{# Generate list of ports if not defined #}
65-
{% if PORT is not defined %}
66-
{% set PORT = [] %}
67-
{% for port_idx in range(0,default_ports_num) %}
68-
{% if PORT.append("Ethernet%d" % port_idx) %}{% endif %}
69-
{% endfor %}
70-
{% endif -%}
71-
72-
{% set port_names_list = [] %}
73-
{% for port in PORT %}
74-
{%- if port_names_list.append(port) %}{% endif %}
75-
{% endfor %}
76-
{% set port_names = port_names_list | join(',') -%}
77-
78-
{
79-
"CABLE_LENGTH": {
80-
"AZURE": {
81-
{% for port in PORT %}
82-
{% set cable = cable_length(port) -%}
83-
"{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
84-
85-
{% endfor %}
86-
}
87-
},
88-
"BUFFER_POOL": {
89-
"ingress_lossless_pool": {
90-
"size": "10443264",
91-
"type": "ingress",
92-
"mode": "dynamic",
93-
"xoff": "4625920"
94-
},
95-
"egress_lossy_pool": {
96-
"size": "8877440",
97-
"type": "egress",
98-
"mode": "dynamic"
99-
},
100-
"egress_lossless_pool": {
101-
"size": "15982592",
102-
"type": "egress",
103-
"mode": "static"
104-
}
105-
},
106-
"BUFFER_PROFILE": {
107-
"ingress_lossless_profile": {
108-
"pool": "[BUFFER_POOL|ingress_lossless_pool]",
109-
"xon": "4096",
110-
"xoff": "58448",
111-
"size": "1248",
112-
"dynamic_th": "-4"
113-
},
114-
"ingress_lossy_profile": {
115-
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
116-
"size":"0",
117-
"dynamic_th":"3"
118-
},
119-
"egress_lossless_profile": {
120-
"pool":"[BUFFER_POOL|egress_lossless_pool]",
121-
"size":"1518",
122-
"static_th":"3995648"
123-
},
124-
"egress_lossy_profile": {
125-
"pool":"[BUFFER_POOL|egress_lossy_pool]",
126-
"size":"1518",
127-
"dynamic_th":"3"
128-
}
129-
},
130-
"BUFFER_PG": {
131-
"{{ port_names }}|3-4": {
132-
"profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
133-
},
134-
"{{ port_names }}|0-1": {
135-
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
136-
}
137-
},
138-
"BUFFER_QUEUE": {
139-
"{{ port_names }}|3-4": {
140-
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
141-
},
142-
"{{ port_names }}|0-1": {
143-
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
144-
}
145-
}
146-
}
1+
{%- set default_topo = 't0' %}
2+
{%- include 'buffers_config.j2' %}

‎device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
2+
{%- set default_cable = '5m' %}
3+
4+
{%- macro generate_port_lists(PORT_ALL) %}
5+
{# Generate list of ports #}
6+
{%- for port_idx in range(0,63) %}
7+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
8+
{%- endfor %}
9+
{%- endmacro %}
10+
11+
{%- macro generate_buffer_pool_and_profiles() %}
12+
"BUFFER_POOL": {
13+
"ingress_lossless_pool": {
14+
"size": "11213696",
15+
"type": "ingress",
16+
"mode": "dynamic",
17+
"xoff": "3855488"
18+
},
19+
"egress_lossy_pool": {
20+
"size": "9532224",
21+
"type": "egress",
22+
"mode": "dynamic"
23+
},
24+
"egress_lossless_pool": {
25+
"size": "15982720",
26+
"type": "egress",
27+
"mode": "static"
28+
}
29+
},
30+
"BUFFER_PROFILE": {
31+
"ingress_lossy_profile": {
32+
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
33+
"size":"0",
34+
"dynamic_th":"3"
35+
},
36+
"egress_lossless_profile": {
37+
"pool":"[BUFFER_POOL|egress_lossless_pool]",
38+
"size":"1518",
39+
"static_th":"3995680"
40+
},
41+
"egress_lossy_profile": {
42+
"pool":"[BUFFER_POOL|egress_lossy_pool]",
43+
"size":"1518",
44+
"dynamic_th":"3"
45+
}
46+
},
47+
{%- endmacro %}

‎device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
2+
{%- set default_cable = '40m' %}
3+
4+
{%- macro generate_port_lists(PORT_ALL) %}
5+
{# Generate list of ports #}
6+
{%- for port_idx in range(0,63) %}
7+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
8+
{%- endfor %}
9+
{%- endmacro %}
10+
11+
{%- macro generate_buffer_pool_and_profiles() %}
12+
"BUFFER_POOL": {
13+
"ingress_lossless_pool": {
14+
"size": "10443264",
15+
"type": "ingress",
16+
"mode": "dynamic",
17+
"xoff": "4625920"
18+
},
19+
"egress_lossy_pool": {
20+
"size": "8877440",
21+
"type": "egress",
22+
"mode": "dynamic"
23+
},
24+
"egress_lossless_pool": {
25+
"size": "15982720",
26+
"type": "egress",
27+
"mode": "static"
28+
}
29+
},
30+
"BUFFER_PROFILE": {
31+
"ingress_lossy_profile": {
32+
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
33+
"size":"0",
34+
"dynamic_th":"3"
35+
},
36+
"egress_lossless_profile": {
37+
"pool":"[BUFFER_POOL|egress_lossless_pool]",
38+
"size":"1518",
39+
"static_th":"3995680"
40+
},
41+
"egress_lossy_profile": {
42+
"pool":"[BUFFER_POOL|egress_lossy_pool]",
43+
"size":"1518",
44+
"dynamic_th":"3"
45+
}
46+
},
47+
{%- endmacro %}

‎device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# PG lossless profiles.
2-
# speed cable size xon xoff threshold
3-
10000 5m 1248 2288 35776 -4
4-
25000 5m 1248 2288 53248 -4
5-
40000 5m 1248 2288 66560 -4
6-
50000 5m 1248 2288 90272 -4
7-
100000 5m 1248 2288 165568 -4
8-
10000 40m 1248 2288 37024 -4
9-
25000 40m 1248 2288 53248 -4
10-
40000 40m 1248 2288 71552 -4
11-
50000 40m 1248 2288 96096 -4
12-
100000 40m 1248 2288 177632 -4
13-
10000 300m 1248 2288 46176 -4
14-
25000 300m 1248 2288 79040 -4
15-
40000 300m 1248 2288 108160 -4
16-
50000 300m 1248 2288 141856 -4
17-
100000 300m 1248 2288 268736 -4
2+
# speed cable size xon xoff threshold xon_offset
3+
10000 5m 1248 2288 35776 -4 2288
4+
25000 5m 1248 2288 53248 -4 2288
5+
40000 5m 1248 2288 66560 -4 2288
6+
50000 5m 1248 2288 90272 -4 2288
7+
100000 5m 1248 2288 165568 -4 2288
8+
10000 40m 1248 2288 37024 -4 2288
9+
25000 40m 1248 2288 53248 -4 2288
10+
40000 40m 1248 2288 71552 -4 2288
11+
50000 40m 1248 2288 96096 -4 2288
12+
100000 40m 1248 2288 177632 -4 2288
13+
10000 300m 1248 2288 46176 -4 2288
14+
25000 300m 1248 2288 79040 -4 2288
15+
40000 300m 1248 2288 108160 -4 2288
16+
50000 300m 1248 2288 141856 -4 2288
17+
100000 300m 1248 2288 268736 -4 2288

0 commit comments

Comments
 (0)