1
diff --git a/Documentation/networking/devlink-trap.rst b/Documentation/networking/devlink-trap.rst
2
0
deleted file mode 100644
0
deleted file mode 100644
3
index 8e90a85..0000000
4
--- a/Documentation/networking/devlink-trap.rst
5
+++ /dev/null
6
@@ -1,209 +0,0 @@
7
1
.. SPDX-License-Identifier: GPL-2.0
8
2
9
3
============
10
4
Devlink Trap
11
5
============
12
6
13
7
Background
14
8
==========
15
9
16
10
Devices capable of offloading the kernel's datapath and perform functions such
17
11
as bridging and routing must also be able to send specific packets to the
18
12
kernel (i.e., the CPU) for processing.
19
13
20
14
For example, a device acting as a multicast-aware bridge must be able to send
21
15
IGMP membership reports to the kernel for processing by the bridge module.
22
16
Without processing such packets, the bridge module could never populate its
23
17
MDB.
24
18
25
19
As another example, consider a device acting as router which has received an IP
26
20
packet with a TTL of 1. Upon routing the packet the device must send it to the
27
21
kernel so that it will route it as well and generate an ICMP Time Exceeded
28
22
error datagram. Without letting the kernel route such packets itself, utilities
29
23
such as ``traceroute`` could never work.
30
24
31
25
The fundamental ability of sending certain packets to the kernel for processing
32
26
is called "packet trapping".
33
27
34
28
Overview
35
29
========
36
30
37
31
The ``devlink-trap`` mechanism allows capable device drivers to register their
38
32
supported packet traps with ``devlink`` and report trapped packets to
39
33
``devlink`` for further analysis.
40
34
41
35
Upon receiving trapped packets, ``devlink`` will perform a per-trap packets and
42
36
bytes accounting and potentially report the packet to user space via a netlink
43
37
event along with all the provided metadata (e.g., trap reason, timestamp, input
44
38
port). This is especially useful for drop traps (see :ref:`Trap-Types`)
45
39
as it allows users to obtain further visibility into packet drops that would
46
40
otherwise be invisible.
47
41
48
42
The following diagram provides a general overview of ``devlink-trap``::
49
43
50
44
                                    Netlink event: Packet w/ metadata
51
45
                                                   Or a summary of recent drops
52
46
                                  ^
53
47
                                  |
54
48
         Userspace                |
55
49
        +---------------------------------------------------+
56
50
         Kernel                   |
57
51
                                  |
58
52
                          +-------+--------+
59
53
                          |                |
60
54
                          |  drop_monitor  |
61
55
                          |                |
62
56
                          +-------^--------+
63
57
                                  |
64
58
                                  |
65
59
                                  |
66
60
                             +----+----+
67
61
                             |         |      Kernel's Rx path
68
62
                             | devlink |      (non-drop traps)
69
63
                             |         |
70
64
                             +----^----+      ^
71
65
                                  |           |
72
66
                                  +-----------+
73
67
                                  |
74
68
                          +-------+-------+
75
69
                          |               |
76
70
                          | Device driver |
77
71
                          |               |
78
72
                          +-------^-------+
79
73
         Kernel                   |
80
74
        +---------------------------------------------------+
81
75
         Hardware                 |
82
76
                                  | Trapped packet
83
77
                                  |
84
78
                               +--+---+
85
79
                               |      |
86
80
                               | ASIC |
87
81
                               |      |
88
82
                               +------+
89
83
90
84
.. _Trap-Types:
91
85
92
86
Trap Types
93
87
==========
94
88
95
89
The ``devlink-trap`` mechanism supports the following packet trap types:
96
90
97
91
  * ``drop``: Trapped packets were dropped by the underlying device. Packets
98
92
    are only processed by ``devlink`` and not injected to the kernel's Rx path.
99
93
    The trap action (see :ref:`Trap-Actions`) can be changed.
100
94
  * ``exception``: Trapped packets were not forwarded as intended by the
101
95
    underlying device due to an exception (e.g., TTL error, missing neighbour
102
96
    entry) and trapped to the control plane for resolution. Packets are
103
97
    processed by ``devlink`` and injected to the kernel's Rx path. Changing the
104
98
    action of such traps is not allowed, as it can easily break the control
105
99
    plane.
106
100
107
101
.. _Trap-Actions:
108
102
109
103
Trap Actions
110
104
============
111
105
112
106
The ``devlink-trap`` mechanism supports the following packet trap actions:
113
107
114
108
  * ``trap``: The sole copy of the packet is sent to the CPU.
115
109
  * ``drop``: The packet is dropped by the underlying device and a copy is not
116
110
    sent to the CPU.
117
111
118
112
Generic Packet Traps
119
113
====================
120
114
121
115
Generic packet traps are used to describe traps that trap well-defined packets
122
116
or packets that are trapped due to well-defined conditions (e.g., TTL error).
123
117
Such traps can be shared by multiple device drivers and their description must
124
118
be added to the following table:
125
119
126
120
.. list-table:: List of Generic Packet Traps
127
121
   :widths: 5 5 90
128
122
129
123
   * - Name
130
124
     - Type
131
125
     - Description
132
126
   * - ``source_mac_is_multicast``
133
127
     - ``drop``
134
128
     - Traps incoming packets that the device decided to drop because of a
135
129
       multicast source MAC
136
130
   * - ``vlan_tag_mismatch``
137
131
     - ``drop``
138
132
     - Traps incoming packets that the device decided to drop in case of VLAN
139
133
       tag mismatch: The ingress bridge port is not configured with a PVID and
140
134
       the packet is untagged or prio-tagged
141
135
   * - ``ingress_vlan_filter``
142
136
     - ``drop``
143
137
     - Traps incoming packets that the device decided to drop in case they are
144
138
       tagged with a VLAN that is not configured on the ingress bridge port
145
139
   * - ``ingress_spanning_tree_filter``
146
140
     - ``drop``
147
141
     - Traps incoming packets that the device decided to drop in case the STP
148
142
       state of the ingress bridge port is not "forwarding"
149
143
   * - ``port_list_is_empty``
150
144
     - ``drop``
151
145
     - Traps packets that the device decided to drop in case they need to be
152
146
       flooded (e.g., unknown unicast, unregistered multicast) and there are
153
147
       no ports the packets should be flooded to
154
148
   * - ``port_loopback_filter``
155
149
     - ``drop``
156
150
     - Traps packets that the device decided to drop in case after layer 2
157
151
       forwarding the only port from which they should be transmitted through
158
152
       is the port from which they were received
159
153
   * - ``blackhole_route``
160
154
     - ``drop``
161
155
     - Traps packets that the device decided to drop in case they hit a
162
156
       blackhole route
163
157
   * - ``ttl_value_is_too_small``
164
158
     - ``exception``
165
159
     - Traps unicast packets that should be forwarded by the device whose TTL
166
160
       was decremented to 0 or less
167
161
   * - ``tail_drop``
168
162
     - ``drop``
169
163
     - Traps packets that the device decided to drop because they could not be
170
164
       enqueued to a transmission queue which is full
171
165
172
166
Driver-specific Packet Traps
173
167
============================
174
168
175
169
Device drivers can register driver-specific packet traps, but these must be
176
170
clearly documented. Such traps can correspond to device-specific exceptions and
177
171
help debug packet drops caused by these exceptions. The following list includes
178
172
links to the description of driver-specific traps registered by various device
179
173
drivers:
180
174
181
175
  * :doc:`/devlink-trap-netdevsim`
182
176
183
177
Generic Packet Trap Groups
184
178
==========================
185
179
186
180
Generic packet trap groups are used to aggregate logically related packet
187
181
traps. These groups allow the user to batch operations such as setting the trap
188
182
action of all member traps. In addition, ``devlink-trap`` can report aggregated
189
183
per-group packets and bytes statistics, in case per-trap statistics are too
190
184
narrow. The description of these groups must be added to the following table:
191
185
192
186
.. list-table:: List of Generic Packet Trap Groups
193
187
   :widths: 10 90
194
188
195
189
   * - Name
196
190
     - Description
197
191
   * - ``l2_drops``
198
192
     - Contains packet traps for packets that were dropped by the device during
199
193
       layer 2 forwarding (i.e., bridge)
200
194
   * - ``l3_drops``
201
195
     - Contains packet traps for packets that were dropped by the device or hit
202
196
       an exception (e.g., TTL error) during layer 3 forwarding
203
197
   * - ``buffer_drops``
204
198
     - Contains packet traps for packets that were dropped by the device due to
205
199
       an enqueue decision
206
200
207
201
Testing
208
202
=======
209
203
210
204
See ``tools/testing/selftests/drivers/net/netdevsim/devlink_trap.sh`` for a
211
205
test covering the core infrastructure. Test cases should be added for any new
212
206
functionality.
213
207
214
208
Device drivers should focus their tests on device-specific functionality, such
215
209
as the triggering of supported packet traps.
216
diff --git a/Documentation/networking/devlink-health.txt b/Documentation/networking/devlink/devlink-health.txt
217
210
similarity index 100%
0
similarity index 100%
218
211
rename from Documentation/networking/devlink-health.txt
1
rename from Documentation/networking/devlink-health.txt
219
212
rename to Documentation/networking/devlink/devlink-health.txt
2
rename to Documentation/networking/devlink/devlink-health.txt
220
diff --git a/Documentation/networking/devlink-info-versions.rst b/Documentation/networking/devlink/devlink-info-versions.rst
221
213
similarity index 100%
3
similarity index 100%
222
214
rename from Documentation/networking/devlink-info-versions.rst
4
rename from Documentation/networking/devlink-info-versions.rst
223
215
rename to Documentation/networking/devlink/devlink-info-versions.rst
5
rename to Documentation/networking/devlink/devlink-info-versions.rst
224
diff --git a/Documentation/networking/devlink-params-bnxt.txt b/Documentation/networking/devlink/devlink-params-bnxt.txt
225
216
similarity index 100%
6
similarity index 100%
226
217
rename from Documentation/networking/devlink-params-bnxt.txt
7
rename from Documentation/networking/devlink-params-bnxt.txt
227
218
rename to Documentation/networking/devlink/devlink-params-bnxt.txt
8
rename to Documentation/networking/devlink/devlink-params-bnxt.txt
228
diff --git a/Documentation/networking/devlink-params-mlx5.txt b/Documentation/networking/devlink/devlink-params-mlx5.txt
229
219
similarity index 100%
9
similarity index 100%
230
220
rename from Documentation/networking/devlink-params-mlx5.txt
10
rename from Documentation/networking/devlink-params-mlx5.txt
231
221
rename to Documentation/networking/devlink/devlink-params-mlx5.txt
11
rename to Documentation/networking/devlink/devlink-params-mlx5.txt
232
diff --git a/Documentation/networking/devlink-params-mlxsw.txt b/Documentation/networking/devlink/devlink-params-mlxsw.txt
233
222
similarity index 100%
12
similarity index 100%
234
223
rename from Documentation/networking/devlink-params-mlxsw.txt
13
rename from Documentation/networking/devlink-params-mlxsw.txt
235
224
rename to Documentation/networking/devlink/devlink-params-mlxsw.txt
14
rename to Documentation/networking/devlink/devlink-params-mlxsw.txt
236
diff --git a/Documentation/networking/devlink-params-nfp.txt b/Documentation/networking/devlink/devlink-params-nfp.txt
237
225
similarity index 100%
15
similarity index 100%
238
226
rename from Documentation/networking/devlink-params-nfp.txt
16
rename from Documentation/networking/devlink-params-nfp.txt
239
227
rename to Documentation/networking/devlink/devlink-params-nfp.txt
17
rename to Documentation/networking/devlink/devlink-params-nfp.txt
240
diff --git a/Documentation/networking/devlink-params.txt b/Documentation/networking/devlink/devlink-params.txt
241
228
similarity index 100%
18
similarity index 100%
242
229
rename from Documentation/networking/devlink-params.txt
19
rename from Documentation/networking/devlink-params.txt
243
230
rename to Documentation/networking/devlink/devlink-params.txt
20
rename to Documentation/networking/devlink/devlink-params.txt
244
diff --git a/Documentation/networking/devlink-trap-netdevsim.rst b/Documentation/networking/devlink/devlink-trap-netdevsim.rst
245
231
similarity index 100%
21
similarity index 100%
246
232
rename from Documentation/networking/devlink-trap-netdevsim.rst
22
rename from Documentation/networking/devlink-trap-netdevsim.rst
247
233
rename to Documentation/networking/devlink/devlink-trap-netdevsim.rst
23
rename to Documentation/networking/devlink/devlink-trap-netdevsim.rst
248
diff --git a/Documentation/networking/devlink/devlink-trap.rst b/Documentation/networking/devlink/devlink-trap.rst
249
234
new file mode 100644
24
new file mode 100644
250
index 0000000..3ccdbbe
251
--- /dev/null
252
+++ b/Documentation/networking/devlink/devlink-trap.rst
253
@@ -0,0 +1,595 @@
254
1
.. SPDX-License-Identifier: GPL-2.0
255
2
256
3
============
257
4
Devlink Trap
258
5
============
259
6
260
7
Background
261
8
==========
262
9
263
10
Devices capable of offloading the kernel's datapath and perform functions such
264
11
as bridging and routing must also be able to send specific packets to the
265
12
kernel (i.e., the CPU) for processing.
266
13
267
14
For example, a device acting as a multicast-aware bridge must be able to send
268
15
IGMP membership reports to the kernel for processing by the bridge module.
269
16
Without processing such packets, the bridge module could never populate its
270
17
MDB.
271
18
272
19
As another example, consider a device acting as router which has received an IP
273
20
packet with a TTL of 1. Upon routing the packet the device must send it to the
274
21
kernel so that it will route it as well and generate an ICMP Time Exceeded
275
22
error datagram. Without letting the kernel route such packets itself, utilities
276
23
such as ``traceroute`` could never work.
277
24
278
25
The fundamental ability of sending certain packets to the kernel for processing
279
26
is called "packet trapping".
280
27
281
28
Overview
282
29
========
283
30
284
31
The ``devlink-trap`` mechanism allows capable device drivers to register their
285
32
supported packet traps with ``devlink`` and report trapped packets to
286
33
``devlink`` for further analysis.
287
34
288
35
Upon receiving trapped packets, ``devlink`` will perform a per-trap packets and
289
36
bytes accounting and potentially report the packet to user space via a netlink
290
37
event along with all the provided metadata (e.g., trap reason, timestamp, input
291
38
port). This is especially useful for drop traps (see :ref:`Trap-Types`)
292
39
as it allows users to obtain further visibility into packet drops that would
293
40
otherwise be invisible.
294
41
295
42
The following diagram provides a general overview of ``devlink-trap``::
296
43
297
44
                                    Netlink event: Packet w/ metadata
298
45
                                                   Or a summary of recent drops
299
46
                                  ^
300
47
                                  |
301
48
         Userspace                |
302
49
        +---------------------------------------------------+
303
50
         Kernel                   |
304
51
                                  |
305
52
                          +-------+--------+
306
53
                          |                |
307
54
                          |  drop_monitor  |
308
55
                          |                |
309
56
                          +-------^--------+
310
57
                                  |
311
58
                                  | Non-control traps
312
59
                                  |
313
60
                             +----+----+
314
61
                             |         |      Kernel's Rx path
315
62
                             | devlink |      (non-drop traps)
316
63
                             |         |
317
64
                             +----^----+      ^
318
65
                                  |           |
319
66
                                  +-----------+
320
67
                                  |
321
68
                          +-------+-------+
322
69
                          |               |
323
70
                          | Device driver |
324
71
                          |               |
325
72
                          +-------^-------+
326
73
         Kernel                   |
327
74
        +---------------------------------------------------+
328
75
         Hardware                 |
329
76
                                  | Trapped packet
330
77
                                  |
331
78
                               +--+---+
332
79
                               |      |
333
80
                               | ASIC |
334
81
                               |      |
335
82
                               +------+
336
83
337
84
.. _Trap-Types:
338
85
339
86
Trap Types
340
87
==========
341
88
342
89
The ``devlink-trap`` mechanism supports the following packet trap types:
343
90
344
91
  * ``drop``: Trapped packets were dropped by the underlying device. Packets
345
92
    are only processed by ``devlink`` and not injected to the kernel's Rx path.
346
93
    The trap action (see :ref:`Trap-Actions`) can be changed.
347
94
  * ``exception``: Trapped packets were not forwarded as intended by the
348
95
    underlying device due to an exception (e.g., TTL error, missing neighbour
349
96
    entry) and trapped to the control plane for resolution. Packets are
350
97
    processed by ``devlink`` and injected to the kernel's Rx path. Changing the
351
98
    action of such traps is not allowed, as it can easily break the control
352
99
    plane.
353
100
  * ``control``: Trapped packets were trapped by the device because these are
354
101
    control packets required for the correct functioning of the control plane.
355
102
    For example, ARP request and IGMP query packets. Packets are injected to
356
103
    the kernel's Rx path, but not reported to the kernel's drop monitor.
357
104
    Changing the action of such traps is not allowed, as it can easily break
358
105
    the control plane.
359
106
360
107
.. _Trap-Actions:
361
108
362
109
Trap Actions
363
110
============
364
111
365
112
The ``devlink-trap`` mechanism supports the following packet trap actions:
366
113
367
114
  * ``trap``: The sole copy of the packet is sent to the CPU.
368
115
  * ``drop``: The packet is dropped by the underlying device and a copy is not
369
116
    sent to the CPU.
370
117
371
118
Generic Packet Traps
372
119
====================
373
120
374
121
Generic packet traps are used to describe traps that trap well-defined packets
375
122
or packets that are trapped due to well-defined conditions (e.g., TTL error).
376
123
Such traps can be shared by multiple device drivers and their description must
377
124
be added to the following table:
378
125
379
126
.. list-table:: List of Generic Packet Traps
380
127
   :widths: 5 5 90
381
128
382
129
   * - Name
383
130
     - Type
384
131
     - Description
385
132
   * - ``source_mac_is_multicast``
386
133
     - ``drop``
387
134
     - Traps incoming packets that the device decided to drop because of a
388
135
       multicast source MAC
389
136
   * - ``vlan_tag_mismatch``
390
137
     - ``drop``
391
138
     - Traps incoming packets that the device decided to drop in case of VLAN
392
139
       tag mismatch: The ingress bridge port is not configured with a PVID and
393
140
       the packet is untagged or prio-tagged
394
141
   * - ``ingress_vlan_filter``
395
142
     - ``drop``
396
143
     - Traps incoming packets that the device decided to drop in case they are
397
144
       tagged with a VLAN that is not configured on the ingress bridge port
398
145
   * - ``ingress_spanning_tree_filter``
399
146
     - ``drop``
400
147
     - Traps incoming packets that the device decided to drop in case the STP
401
148
       state of the ingress bridge port is not "forwarding"
402
149
   * - ``port_list_is_empty``
403
150
     - ``drop``
404
151
     - Traps packets that the device decided to drop in case they need to be
405
152
       flooded (e.g., unknown unicast, unregistered multicast) and there are
406
153
       no ports the packets should be flooded to
407
154
   * - ``port_loopback_filter``
408
155
     - ``drop``
409
156
     - Traps packets that the device decided to drop in case after layer 2
410
157
       forwarding the only port from which they should be transmitted through
411
158
       is the port from which they were received
412
159
   * - ``blackhole_route``
413
160
     - ``drop``
414
161
     - Traps packets that the device decided to drop in case they hit a
415
162
       blackhole route
416
163
   * - ``ttl_value_is_too_small``
417
164
     - ``exception``
418
165
     - Traps unicast packets that should be forwarded by the device whose TTL
419
166
       was decremented to 0 or less
420
167
   * - ``tail_drop``
421
168
     - ``drop``
422
169
     - Traps packets that the device decided to drop because they could not be
423
170
       enqueued to a transmission queue which is full
424
171
   * - ``non_ip``
425
172
     - ``drop``
426
173
     - Traps packets that the device decided to drop because they need to
427
174
       undergo a layer 3 lookup, but are not IP or MPLS packets
428
175
   * - ``uc_dip_over_mc_dmac``
429
176
     - ``drop``
430
177
     - Traps packets that the device decided to drop because they need to be
431
178
       routed and they have a unicast destination IP and a multicast destination
432
179
       MAC
433
180
   * - ``dip_is_loopback_address``
434
181
     - ``drop``
435
182
     - Traps packets that the device decided to drop because they need to be
436
183
       routed and their destination IP is the loopback address (i.e., 127.0.0.0/8
437
184
       and ::1/128)
438
185
   * - ``sip_is_mc``
439
186
     - ``drop``
440
187
     - Traps packets that the device decided to drop because they need to be
441
188
       routed and their source IP is multicast (i.e., 224.0.0.0/8 and ff::/8)
442
189
   * - ``sip_is_loopback_address``
443
190
     - ``drop``
444
191
     - Traps packets that the device decided to drop because they need to be
445
192
       routed and their source IP is the loopback address (i.e., 127.0.0.0/8 and ::1/128)
446
193
   * - ``ip_header_corrupted``
447
194
     - ``drop``
448
195
     - Traps packets that the device decided to drop because they need to be
449
196
       routed and their IP header is corrupted: wrong checksum, wrong IP version
450
197
       or too short Internet Header Length (IHL)
451
198
   * - ``ipv4_sip_is_limited_bc``
452
199
     - ``drop``
453
200
     - Traps packets that the device decided to drop because they need to be
454
201
       routed and their source IP is limited broadcast (i.e., 255.255.255.255/32)
455
202
   * - ``ipv6_mc_dip_reserved_scope``
456
203
     - ``drop``
457
204
     - Traps IPv6 packets that the device decided to drop because they need to
458
205
       be routed and their IPv6 multicast destination IP has a reserved scope
459
206
       (i.e., ffx0::/16)
460
207
   * - ``ipv6_mc_dip_interface_local_scope``
461
208
     - ``drop``
462
209
     - Traps IPv6 packets that the device decided to drop because they need to
463
210
       be routed and their IPv6 multicast destination IP has an interface-local scope
464
211
       (i.e., ffx1::/16)
465
212
   * - ``mtu_value_is_too_small``
466
213
     - ``exception``
467
214
     - Traps packets that should have been routed by the device, but were bigger
468
215
       than the MTU of the egress interface
469
216
   * - ``unresolved_neigh``
470
217
     - ``exception``
471
218
     - Traps packets that did not have a matching IP neighbour after routing
472
219
   * - ``mc_reverse_path_forwarding``
473
220
     - ``exception``
474
221
     - Traps multicast IP packets that failed reverse-path forwarding (RPF)
475
222
       check during multicast routing
476
223
   * - ``reject_route``
477
224
     - ``exception``
478
225
     - Traps packets that hit reject routes (i.e., "unreachable", "prohibit")
479
226
   * - ``ipv4_lpm_miss``
480
227
     - ``exception``
481
228
     - Traps unicast IPv4 packets that did not match any route
482
229
   * - ``ipv6_lpm_miss``
483
230
     - ``exception``
484
231
     - Traps unicast IPv6 packets that did not match any route
485
232
   * - ``non_routable_packet``
486
233
     - ``drop``
487
234
     - Traps packets that the device decided to drop because they are not
488
235
       supposed to be routed. For example, IGMP queries can be flooded by the
489
236
       device in layer 2 and reach the router. Such packets should not be
490
237
       routed and instead dropped
491
238
   * - ``decap_error``
492
239
     - ``exception``
493
240
     - Traps NVE and IPinIP packets that the device decided to drop because of
494
241
       failure during decapsulation (e.g., packet being too short, reserved
495
242
       bits set in VXLAN header)
496
243
   * - ``overlay_smac_is_mc``
497
244
     - ``drop``
498
245
     - Traps NVE packets that the device decided to drop because their overlay
499
246
       source MAC is multicast
500
247
   * - ``ingress_flow_action_drop``
501
248
     - ``drop``
502
249
     - Traps packets dropped during processing of ingress flow action drop
503
250
   * - ``egress_flow_action_drop``
504
251
     - ``drop``
505
252
     - Traps packets dropped during processing of egress flow action drop
506
253
   * - ``stp``
507
254
     - ``control``
508
255
     - Traps STP packets
509
256
   * - ``lacp``
510
257
     - ``control``
511
258
     - Traps LACP packets
512
259
   * - ``lldp``
513
260
     - ``control``
514
261
     - Traps LLDP packets
515
262
   * - ``igmp_query``
516
263
     - ``control``
517
264
     - Traps IGMP Membership Query packets
518
265
   * - ``igmp_v1_report``
519
266
     - ``control``
520
267
     - Traps IGMP Version 1 Membership Report packets
521
268
   * - ``igmp_v2_report``
522
269
     - ``control``
523
270
     - Traps IGMP Version 2 Membership Report packets
524
271
   * - ``igmp_v3_report``
525
272
     - ``control``
526
273
     - Traps IGMP Version 3 Membership Report packets
527
274
   * - ``igmp_v2_leave``
528
275
     - ``control``
529
276
     - Traps IGMP Version 2 Leave Group packets
530
277
   * - ``mld_query``
531
278
     - ``control``
532
279
     - Traps MLD Multicast Listener Query packets
533
280
   * - ``mld_v1_report``
534
281
     - ``control``
535
282
     - Traps MLD Version 1 Multicast Listener Report packets
536
283
   * - ``mld_v2_report``
537
284
     - ``control``
538
285
     - Traps MLD Version 2 Multicast Listener Report packets
539
286
   * - ``mld_v1_done``
540
287
     - ``control``
541
288
     - Traps MLD Version 1 Multicast Listener Done packets
542
289
   * - ``ipv4_dhcp``
543
290
     - ``control``
544
291
     - Traps IPv4 DHCP packets
545
292
   * - ``ipv6_dhcp``
546
293
     - ``control``
547
294
     - Traps IPv6 DHCP packets
548
295
   * - ``arp_request``
549
296
     - ``control``
550
297
     - Traps ARP request packets
551
298
   * - ``arp_response``
552
299
     - ``control``
553
300
     - Traps ARP response packets
554
301
   * - ``arp_overlay``
555
302
     - ``control``
556
303
     - Traps NVE-decapsulated ARP packets that reached the overlay network.
557
304
       This is required, for example, when the address that needs to be
558
305
       resolved is a local address
559
306
   * - ``ipv6_neigh_solicit``
560
307
     - ``control``
561
308
     - Traps IPv6 Neighbour Solicitation packets
562
309
   * - ``ipv6_neigh_advert``
563
310
     - ``control``
564
311
     - Traps IPv6 Neighbour Advertisement packets
565
312
   * - ``ipv4_bfd``
566
313
     - ``control``
567
314
     - Traps IPv4 BFD packets
568
315
   * - ``ipv6_bfd``
569
316
     - ``control``
570
317
     - Traps IPv6 BFD packets
571
318
   * - ``ipv4_ospf``
572
319
     - ``control``
573
320
     - Traps IPv4 OSPF packets
574
321
   * - ``ipv6_ospf``
575
322
     - ``control``
576
323
     - Traps IPv6 OSPF packets
577
324
   * - ``ipv4_bgp``
578
325
     - ``control``
579
326
     - Traps IPv4 BGP packets
580
327
   * - ``ipv6_bgp``
581
328
     - ``control``
582
329
     - Traps IPv6 BGP packets
583
330
   * - ``ipv4_vrrp``
584
331
     - ``control``
585
332
     - Traps IPv4 VRRP packets
586
333
   * - ``ipv6_vrrp``
587
334
     - ``control``
588
335
     - Traps IPv6 VRRP packets
589
336
   * - ``ipv4_pim``
590
337
     - ``control``
591
338
     - Traps IPv4 PIM packets
592
339
   * - ``ipv6_pim``
593
340
     - ``control``
594
341
     - Traps IPv6 PIM packets
595
342
   * - ``uc_loopback``
596
343
     - ``control``
597
344
     - Traps unicast packets that need to be routed through the same layer 3
598
345
       interface from which they were received. Such packets are routed by the
599
346
       kernel, but also cause it to potentially generate ICMP redirect packets
600
347
   * - ``local_route``
601
348
     - ``control``
602
349
     - Traps unicast packets that hit a local route and need to be locally
603
350
       delivered
604
351
   * - ``external_route``
605
352
     - ``control``
606
353
     - Traps packets that should be routed through an external interface (e.g.,
607
354
       management interface) that does not belong to the same device (e.g.,
608
355
       switch ASIC) as the ingress interface
609
356
   * - ``ipv6_uc_dip_link_local_scope``
610
357
     - ``control``
611
358
     - Traps unicast IPv6 packets that need to be routed and have a destination
612
359
       IP address with a link-local scope (i.e., fe80::/10). The trap allows
613
360
       device drivers to avoid programming link-local routes, but still receive
614
361
       packets for local delivery
615
362
   * - ``ipv6_dip_all_nodes``
616
363
     - ``control``
617
364
     - Traps IPv6 packets that their destination IP address is the "All Nodes
618
365
       Address" (i.e., ff02::1)
619
366
   * - ``ipv6_dip_all_routers``
620
367
     - ``control``
621
368
     - Traps IPv6 packets that their destination IP address is the "All Routers
622
369
       Address" (i.e., ff02::2)
623
370
   * - ``ipv6_router_solicit``
624
371
     - ``control``
625
372
     - Traps IPv6 Router Solicitation packets
626
373
   * - ``ipv6_router_advert``
627
374
     - ``control``
628
375
     - Traps IPv6 Router Advertisement packets
629
376
   * - ``ipv6_redirect``
630
377
     - ``control``
631
378
     - Traps IPv6 Redirect Message packets
632
379
   * - ``ipv4_router_alert``
633
380
     - ``control``
634
381
     - Traps IPv4 packets that need to be routed and include the Router Alert
635
382
       option. Such packets need to be locally delivered to raw sockets that
636
383
       have the IP_ROUTER_ALERT socket option set
637
384
   * - ``ipv6_router_alert``
638
385
     - ``control``
639
386
     - Traps IPv6 packets that need to be routed and include the Router Alert
640
387
       option in their Hop-by-Hop extension header. Such packets need to be
641
388
       locally delivered to raw sockets that have the IPV6_ROUTER_ALERT socket
642
389
       option set
643
390
   * - ``ptp_event``
644
391
     - ``control``
645
392
     - Traps PTP time-critical event messages (Sync, Delay_req, Pdelay_Req and
646
393
       Pdelay_Resp)
647
394
   * - ``ptp_general``
648
395
     - ``control``
649
396
     - Traps PTP general messages (Announce, Follow_Up, Delay_Resp,
650
397
       Pdelay_Resp_Follow_Up, management and signaling)
651
398
   * - ``flow_action_sample``
652
399
     - ``control``
653
400
     - Traps packets sampled during processing of flow action sample (e.g., via
654
401
       tc's sample action)
655
402
   * - ``flow_action_trap``
656
403
     - ``control``
657
404
     - Traps packets logged during processing of flow action trap (e.g., via
658
405
       tc's trap action)
659
406
   * - ``early_drop``
660
407
     - ``drop``
661
408
     - Traps packets dropped due to the RED (Random Early Detection) algorithm
662
409
       (i.e., early drops)
663
410
   * - ``vxlan_parsing``
664
411
     - ``drop``
665
412
     - Traps packets dropped due to an error in the VXLAN header parsing which
666
413
       might be because of packet truncation or the I flag is not set.
667
414
   * - ``llc_snap_parsing``
668
415
     - ``drop``
669
416
     - Traps packets dropped due to an error in the LLC+SNAP header parsing
670
417
   * - ``vlan_parsing``
671
418
     - ``drop``
672
419
     - Traps packets dropped due to an error in the VLAN header parsing. Could
673
420
       include unexpected packet truncation.
674
421
   * - ``pppoe_ppp_parsing``
675
422
     - ``drop``
676
423
     - Traps packets dropped due to an error in the PPPoE+PPP header parsing.
677
424
       This could include finding a session ID of 0xFFFF (which is reserved and
678
425
       not for use), a PPPoE length which is larger than the frame received or
679
426
       any common error on this type of header
680
427
   * - ``mpls_parsing``
681
428
     - ``drop``
682
429
     - Traps packets dropped due to an error in the MPLS header parsing which
683
430
       could include unexpected header truncation
684
431
   * - ``arp_parsing``
685
432
     - ``drop``
686
433
     - Traps packets dropped due to an error in the ARP header parsing
687
434
   * - ``ip_1_parsing``
688
435
     - ``drop``
689
436
     - Traps packets dropped due to an error in the first IP header parsing.
690
437
       This packet trap could include packets which do not pass an IP checksum
691
438
       check, a header length check (a minimum of 20 bytes), which might suffer
692
439
       from packet truncation thus the total length field exceeds the received
693
440
       packet length etc
694
441
   * - ``ip_n_parsing``
695
442
     - ``drop``
696
443
     - Traps packets dropped due to an error in the parsing of the last IP
697
444
       header (the inner one in case of an IP over IP tunnel). The same common
698
445
       error checking is performed here as for the ip_1_parsing trap
699
446
   * - ``gre_parsing``
700
447
     - ``drop``
701
448
     - Traps packets dropped due to an error in the GRE header parsing
702
449
   * - ``udp_parsing``
703
450
     - ``drop``
704
451
     - Traps packets dropped due to an error in the UDP header parsing.
705
452
       This packet trap could include checksum errorrs, an improper UDP
706
453
       length detected (smaller than 8 bytes) or detection of header
707
454
       truncation.
708
455
   * - ``tcp_parsing``
709
456
     - ``drop``
710
457
     - Traps packets dropped due to an error in the TCP header parsing.
711
458
       This could include TCP checksum errors, improper combination of SYN, FIN
712
459
       and/or RESET etc.
713
460
   * - ``ipsec_parsing``
714
461
     - ``drop``
715
462
     - Traps packets dropped due to an error in the IPSEC header parsing
716
463
   * - ``sctp_parsing``
717
464
     - ``drop``
718
465
     - Traps packets dropped due to an error in the SCTP header parsing.
719
466
       This would mean that port number 0 was used or that the header is
720
467
       truncated.
721
468
   * - ``dccp_parsing``
722
469
     - ``drop``
723
470
     - Traps packets dropped due to an error in the DCCP header parsing
724
471
   * - ``gtp_parsing``
725
472
     - ``drop``
726
473
     - Traps packets dropped due to an error in the GTP header parsing
727
474
   * - ``esp_parsing``
728
475
     - ``drop``
729
476
     - Traps packets dropped due to an error in the ESP header parsing
730
477
   * - ``blackhole_nexthop``
731
478
     - ``drop``
732
479
     - Traps packets that the device decided to drop in case they hit a
733
480
       blackhole nexthop
734
481
   * - ``dmac_filter``
735
482
     - ``drop``
736
483
     - Traps incoming packets that the device decided to drop because
737
484
       the destination MAC is not configured in the MAC table and
738
485
       the interface is not in promiscuous mode
739
486
740
487
Driver-specific Packet Traps
741
488
============================
742
489
743
490
Device drivers can register driver-specific packet traps, but these must be
744
491
clearly documented. Such traps can correspond to device-specific exceptions and
745
492
help debug packet drops caused by these exceptions. The following list includes
746
493
links to the description of driver-specific traps registered by various device
747
494
drivers:
748
495
749
496
  * :doc:`/devlink-trap-netdevsim`
750
497
751
498
Generic Packet Trap Groups
752
499
==========================
753
500
754
501
Generic packet trap groups are used to aggregate logically related packet
755
502
traps. These groups allow the user to batch operations such as setting the trap
756
503
action of all member traps. In addition, ``devlink-trap`` can report aggregated
757
504
per-group packets and bytes statistics, in case per-trap statistics are too
758
505
narrow. The description of these groups must be added to the following table:
759
506
760
507
.. list-table:: List of Generic Packet Trap Groups
761
508
   :widths: 10 90
762
509
763
510
   * - Name
764
511
     - Description
765
512
   * - ``l2_drops``
766
513
     - Contains packet traps for packets that were dropped by the device during
767
514
       layer 2 forwarding (i.e., bridge)
768
515
   * - ``l3_drops``
769
516
     - Contains packet traps for packets that were dropped by the device during
770
517
       layer 3 forwarding
771
518
   * - ``l3_exceptions``
772
519
     - Contains packet traps for packets that hit an exception (e.g., TTL
773
520
       error) during layer 3 forwarding
774
521
   * - ``buffer_drops``
775
522
     - Contains packet traps for packets that were dropped by the device due to
776
523
       an enqueue decision
777
524
   * - ``tunnel_drops``
778
525
     - Contains packet traps for packets that were dropped by the device during
779
526
       tunnel encapsulation / decapsulation
780
527
   * - ``acl_drops``
781
528
     - Contains packet traps for packets that were dropped by the device during
782
529
       ACL processing
783
530
   * - ``stp``
784
531
     - Contains packet traps for STP packets
785
532
   * - ``lacp``
786
533
     - Contains packet traps for LACP packets
787
534
   * - ``lldp``
788
535
     - Contains packet traps for LLDP packets
789
536
   * - ``mc_snooping``
790
537
     - Contains packet traps for IGMP and MLD packets required for multicast
791
538
       snooping
792
539
   * - ``dhcp``
793
540
     - Contains packet traps for DHCP packets
794
541
   * - ``neigh_discovery``
795
542
     - Contains packet traps for neighbour discovery packets (e.g., ARP, IPv6
796
543
       ND)
797
544
   * - ``bfd``
798
545
     - Contains packet traps for BFD packets
799
546
   * - ``ospf``
800
547
     - Contains packet traps for OSPF packets
801
548
   * - ``bgp``
802
549
     - Contains packet traps for BGP packets
803
550
   * - ``vrrp``
804
551
     - Contains packet traps for VRRP packets
805
552
   * - ``pim``
806
553
     - Contains packet traps for PIM packets
807
554
   * - ``uc_loopback``
808
555
     - Contains a packet trap for unicast loopback packets (i.e.,
809
556
       ``uc_loopback``). This trap is singled-out because in cases such as
810
557
       one-armed router it will be constantly triggered. To limit the impact on
811
558
       the CPU usage, a packet trap policer with a low rate can be bound to the
812
559
       group without affecting other traps
813
560
   * - ``local_delivery``
814
561
     - Contains packet traps for packets that should be locally delivered after
815
562
       routing, but do not match more specific packet traps (e.g.,
816
563
       ``ipv4_bgp``)
817
564
   * - ``external_delivery``
818
565
     - Contains packet traps for packets that should be routed through an
819
566
       external interface (e.g., management interface) that does not belong to
820
567
       the same device (e.g., switch ASIC) as the ingress interface
821
568
   * - ``ipv6``
822
569
     - Contains packet traps for various IPv6 control packets (e.g., Router
823
570
       Advertisements)
824
571
   * - ``ptp_event``
825
572
     - Contains packet traps for PTP time-critical event messages (Sync,
826
573
       Delay_req, Pdelay_Req and Pdelay_Resp)
827
574
   * - ``ptp_general``
828
575
     - Contains packet traps for PTP general messages (Announce, Follow_Up,
829
576
       Delay_Resp, Pdelay_Resp_Follow_Up, management and signaling)
830
577
   * - ``acl_sample``
831
578
     - Contains packet traps for packets that were sampled by the device during
832
579
       ACL processing
833
580
   * - ``acl_trap``
834
581
     - Contains packet traps for packets that were trapped (logged) by the
835
582
       device during ACL processing
836
583
   * - ``parser_error_drops``
837
584
     - Contains packet traps for packets that were marked by the device during
838
585
       parsing as erroneous
839
586
840
587
Testing
841
588
=======
842
589
843
590
See ``tools/testing/selftests/drivers/net/netdevsim/devlink_trap.sh`` for a
844
591
test covering the core infrastructure. Test cases should be added for any new
845
592
functionality.
846
593
847
594
Device drivers should focus their tests on device-specific functionality, such
848
595
as the triggering of supported packet traps.
849
diff --git a/Documentation/networking/devlink/index.rst b/Documentation/networking/devlink/index.rst
850
0
new file mode 100644
596
new file mode 100644
851
index 0000000..1252c2a
852
--- /dev/null
853
+++ b/Documentation/networking/devlink/index.rst
854
@@ -0,0 +1,14 @@
855
1
Linux Devlink Documentation
856
2
===========================
857
3
858
4
devlink is an API to expose device information and resources not directly
859
5
related to any device class, such as chip-wide/switch-ASIC-wide configuration.
860
6
861
7
Contents:
862
8
863
9
.. toctree::
864
10
   :maxdepth: 1
865
11
866
12
   devlink-info-versions
867
13
   devlink-trap
868
14
   devlink-trap-netdevsim
869
diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst
870
index d4dca42..ad58761 100644
871
--- a/Documentation/networking/index.rst
872
+++ b/Documentation/networking/index.rst
873
@@ -13,9 +13,8 @@ Contents:
874
13
   can_ucan_protocol
13
   can_ucan_protocol
875
14
   device_drivers/index
14
   device_drivers/index
876
15
   dsa/index
15
   dsa/index
880
16
   devlink-info-versions
16
   devlink/index
881
17
   devlink-trap
17
   ethtool-netlink
879
18
   devlink-trap-netdevsim
882
19
   ieee802154
18
   ieee802154
883
20
   j1939
19
   j1939
884
21
   kapi
20
   kapi
885
diff --git a/MAINTAINERS b/MAINTAINERS
886
index 349639d..d8fd753 100644
887
--- a/MAINTAINERS
888
+++ b/MAINTAINERS
889
@@ -4836,6 +4836,7 @@ S:	Supported
890
4836
F:	net/core/devlink.c
4836
F:	net/core/devlink.c
891
4837
F:	include/net/devlink.h
4837
F:	include/net/devlink.h
892
4838
F:	include/uapi/linux/devlink.h
4838
F:	include/uapi/linux/devlink.h
893
4839
F:	Documentation/networking/devlink
894
4839
4840
895
4840
DIALOG SEMICONDUCTOR DRIVERS
4841
DIALOG SEMICONDUCTOR DRIVERS
896
4841
M:	Support Opensource <support.opensource@diasemi.com>
4842
M:	Support Opensource <support.opensource@diasemi.com>
897
diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu
898
index f1fcfae..86c5a87 100644
899
--- a/debian.bluefield/config/config.common.ubuntu
900
+++ b/debian.bluefield/config/config.common.ubuntu
901
@@ -2419,26 +2419,7 @@ CONFIG_MISC_FILESYSTEMS=y
902
2419
# CONFIG_MISC_RTSX_USB is not set
2419
# CONFIG_MISC_RTSX_USB is not set
903
2420
# CONFIG_MLX4_EN is not set
2420
# CONFIG_MLX4_EN is not set
904
2421
# CONFIG_MLX4_INFINIBAND is not set
2421
# CONFIG_MLX4_INFINIBAND is not set
925
2422
CONFIG_MLX5_ACCEL=y
2422
# CONFIG_MLX5_CORE is not set
906
2423
CONFIG_MLX5_CORE=m
907
2424
CONFIG_MLX5_CORE_EN=y
908
2425
CONFIG_MLX5_CORE_EN_DCB=y
909
2426
CONFIG_MLX5_CORE_IPOIB=y
910
2427
CONFIG_MLX5_EN_ARFS=y
911
2428
CONFIG_MLX5_EN_IPSEC=y
912
2429
CONFIG_MLX5_EN_RXNFC=y
913
2430
CONFIG_MLX5_EN_TLS=y
914
2431
CONFIG_MLX5_ESWITCH=y
915
2432
CONFIG_MLX5_FPGA=y
916
2433
CONFIG_MLX5_FPGA_IPSEC=y
917
2434
CONFIG_MLX5_FPGA_TLS=y
918
2435
CONFIG_MLX5_INFINIBAND=m
919
2436
CONFIG_MLX5_IPSEC=y
920
2437
CONFIG_MLX5_MDEV=y
921
2438
CONFIG_MLX5_MPFS=y
922
2439
CONFIG_MLX5_SW_STEERING=y
923
2440
CONFIG_MLX5_TC_CT=y
924
2441
CONFIG_MLX5_TLS=y
926
2442
# CONFIG_MLX90614 is not set
2423
# CONFIG_MLX90614 is not set
927
2443
# CONFIG_MLX90632 is not set
2424
# CONFIG_MLX90632 is not set
928
2444
CONFIG_MLXBF_BOOTCTL=m
2425
CONFIG_MLXBF_BOOTCTL=m
929
@@ -2448,7 +2429,7 @@ CONFIG_MLXBF_PKA=m
930
2448
CONFIG_MLXBF_PMC=m
2429
CONFIG_MLXBF_PMC=m
931
2449
CONFIG_MLXBF_TMFIFO=y
2430
CONFIG_MLXBF_TMFIFO=y
932
2450
CONFIG_MLXBF_TRIO=m
2431
CONFIG_MLXBF_TRIO=m
934
2451
CONFIG_MLXFW=m
2432
# CONFIG_MLXFW is not set
935
2452
CONFIG_MLXREG_HOTPLUG=m
2433
CONFIG_MLXREG_HOTPLUG=m
936
2453
CONFIG_MLXREG_IO=m
2434
CONFIG_MLXREG_IO=m
937
2454
# CONFIG_MLXSW_CORE is not set
2435
# CONFIG_MLXSW_CORE is not set
938
@@ -2776,7 +2757,7 @@ CONFIG_NET_CLS_TCINDEX=m
939
2776
CONFIG_NET_CLS_U32=m
2757
CONFIG_NET_CLS_U32=m
940
2777
CONFIG_NET_CORE=y
2758
CONFIG_NET_CORE=y
941
2778
CONFIG_NET_DEVLINK=y
2759
CONFIG_NET_DEVLINK=y
943
2779
CONFIG_NET_DROP_MONITOR=y
2760
# CONFIG_NET_DROP_MONITOR is not set
944
2780
# CONFIG_NET_DSA is not set
2761
# CONFIG_NET_DSA is not set
945
2781
CONFIG_NET_EGRESS=y
2762
CONFIG_NET_EGRESS=y
946
2782
CONFIG_NET_EMATCH=y
2763
CONFIG_NET_EMATCH=y
947
@@ -2867,7 +2848,11 @@ CONFIG_NET_UDP_TUNNEL=m
948
2867
# CONFIG_NET_VENDOR_ARC is not set
2848
# CONFIG_NET_VENDOR_ARC is not set
949
2868
# CONFIG_NET_VENDOR_ATHEROS is not set
2849
# CONFIG_NET_VENDOR_ATHEROS is not set
950
2869
# CONFIG_NET_VENDOR_AURORA is not set
2850
# CONFIG_NET_VENDOR_AURORA is not set
952
2870
# CONFIG_NET_VENDOR_BROADCOM is not set
2851
CONFIG_BNXT=m
953
2852
# CONFIG_BNXT_SRIOV is not set
954
2853
# CONFIG_BNXT_FLOWER_OFFLOAD is not set
955
2854
# CONFIG_BNXT_DCB is not set
956
2855
# CONFIG_BNXT_HWMON is not set
957
2871
# CONFIG_NET_VENDOR_BROCADE is not set
2856
# CONFIG_NET_VENDOR_BROCADE is not set
958
2872
# CONFIG_NET_VENDOR_CADENCE is not set
2857
# CONFIG_NET_VENDOR_CADENCE is not set
959
2873
# CONFIG_NET_VENDOR_CAVIUM is not set
2858
# CONFIG_NET_VENDOR_CAVIUM is not set
960
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
961
index 2d817ba..58b69b4 100644
962
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
963
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
964
@@ -16,7 +16,8 @@
965
16
#include "bnxt_devlink.h"
16
#include "bnxt_devlink.h"
966
17
17
967
18
static int bnxt_fw_reporter_diagnose(struct devlink_health_reporter *reporter,
18
static int bnxt_fw_reporter_diagnose(struct devlink_health_reporter *reporter,
969
19
				     struct devlink_fmsg *fmsg)
19
				     struct devlink_fmsg *fmsg,
970
20
				     struct netlink_ext_ack *extack)
971
20
{
21
{
972
21
	struct bnxt *bp = devlink_health_reporter_priv(reporter);
22
	struct bnxt *bp = devlink_health_reporter_priv(reporter);
973
22
	u32 val, health_status;
23
	u32 val, health_status;
974
@@ -60,7 +61,8 @@ static const struct devlink_health_reporter_ops bnxt_dl_fw_reporter_ops = {
975
60
};
61
};
976
61
62
977
62
static int bnxt_fw_reset_recover(struct devlink_health_reporter *reporter,
63
static int bnxt_fw_reset_recover(struct devlink_health_reporter *reporter,
979
63
				 void *priv_ctx)
64
				 void *priv_ctx,
980
65
				 struct netlink_ext_ack *extack)
981
64
{
66
{
982
65
	struct bnxt *bp = devlink_health_reporter_priv(reporter);
67
	struct bnxt *bp = devlink_health_reporter_priv(reporter);
983
66
68
984
@@ -78,7 +80,8 @@ struct devlink_health_reporter_ops bnxt_dl_fw_reset_reporter_ops = {
985
78
};
80
};
986
79
81
987
80
static int bnxt_fw_fatal_recover(struct devlink_health_reporter *reporter,
82
static int bnxt_fw_fatal_recover(struct devlink_health_reporter *reporter,
989
81
				 void *priv_ctx)
83
				 void *priv_ctx,
990
84
				 struct netlink_ext_ack *extack)
991
82
{
85
{
992
83
	struct bnxt *bp = devlink_health_reporter_priv(reporter);
86
	struct bnxt *bp = devlink_health_reporter_priv(reporter);
993
84
	struct bnxt_fw_reporter_ctx *fw_reporter_ctx = priv_ctx;
87
	struct bnxt_fw_reporter_ctx *fw_reporter_ctx = priv_ctx;
994
@@ -115,7 +118,7 @@ void bnxt_dl_fw_reporters_create(struct bnxt *bp)
995
115
	health->fw_reset_reporter =
118
	health->fw_reset_reporter =
996
116
		devlink_health_reporter_create(bp->dl,
119
		devlink_health_reporter_create(bp->dl,
997
117
					       &bnxt_dl_fw_reset_reporter_ops,
120
					       &bnxt_dl_fw_reset_reporter_ops,
999
118
					       0, true, bp);
121
					       0, bp);
1000
119
	if (IS_ERR(health->fw_reset_reporter)) {
122
	if (IS_ERR(health->fw_reset_reporter)) {
1001
120
		netdev_warn(bp->dev, "Failed to create FW fatal health reporter, rc = %ld\n",
123
		netdev_warn(bp->dev, "Failed to create FW fatal health reporter, rc = %ld\n",
1002
121
			    PTR_ERR(health->fw_reset_reporter));
124
			    PTR_ERR(health->fw_reset_reporter));
1003
@@ -131,7 +134,7 @@ err_recovery:
1004
131
		health->fw_reporter =
134
		health->fw_reporter =
1005
132
			devlink_health_reporter_create(bp->dl,
135
			devlink_health_reporter_create(bp->dl,
1006
133
						       &bnxt_dl_fw_reporter_ops,
136
						       &bnxt_dl_fw_reporter_ops,
1008
134
						       0, false, bp);
137
						       0, bp);
1009
135
		if (IS_ERR(health->fw_reporter)) {
138
		if (IS_ERR(health->fw_reporter)) {
1010
136
			netdev_warn(bp->dev, "Failed to create FW health reporter, rc = %ld\n",
139
			netdev_warn(bp->dev, "Failed to create FW health reporter, rc = %ld\n",
1011
137
				    PTR_ERR(health->fw_reporter));
140
				    PTR_ERR(health->fw_reporter));
1012
@@ -147,7 +150,7 @@ err_recovery:
1013
147
	health->fw_fatal_reporter =
150
	health->fw_fatal_reporter =
1014
148
		devlink_health_reporter_create(bp->dl,
151
		devlink_health_reporter_create(bp->dl,
1015
149
					       &bnxt_dl_fw_fatal_reporter_ops,
152
					       &bnxt_dl_fw_fatal_reporter_ops,
1017
150
					       0, true, bp);
153
					       0, bp);
1018
151
	if (IS_ERR(health->fw_fatal_reporter)) {
154
	if (IS_ERR(health->fw_fatal_reporter)) {
1019
152
		netdev_warn(bp->dev, "Failed to create FW fatal health reporter, rc = %ld\n",
155
		netdev_warn(bp->dev, "Failed to create FW fatal health reporter, rc = %ld\n",
1020
153
			    PTR_ERR(health->fw_fatal_reporter));
156
			    PTR_ERR(health->fw_fatal_reporter));
1021
@@ -433,6 +436,7 @@ static const struct devlink_param bnxt_dl_port_params[] = {
1022
433
436
1023
434
int bnxt_dl_register(struct bnxt *bp)
437
int bnxt_dl_register(struct bnxt *bp)
1024
435
{
438
{
1025
439
	struct devlink_port_attrs attrs = {};
1026
436
	struct devlink *dl;
440
	struct devlink *dl;
1027
437
	int rc;
441
	int rc;
1028
438
442
1029
@@ -466,17 +470,11 @@ int bnxt_dl_register(struct bnxt *bp)
1030
466
	if (!BNXT_PF(bp))
470
	if (!BNXT_PF(bp))
1031
467
		return 0;
471
		return 0;
1032
468
472
1044
469
	rc = devlink_params_register(dl, bnxt_dl_params,
473
	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
1045
470
				     ARRAY_SIZE(bnxt_dl_params));
474
	attrs.phys.port_number = bp->pf.port_id;
1046
471
	if (rc) {
475
	memcpy(attrs.switch_id.id, bp->switch_id, sizeof(bp->switch_id));
1047
472
		netdev_warn(bp->dev, "devlink_params_register failed. rc=%d",
476
	attrs.switch_id.id_len = sizeof(bp->switch_id);
1048
473
			    rc);
477
	devlink_port_attrs_set(&bp->dl_port, &attrs);
1038
474
		goto err_dl_unreg;
1039
475
	}
1040
476
1041
477
	devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
1042
478
			       bp->pf.port_id, false, 0,
1043
479
			       bp->switch_id, sizeof(bp->switch_id));
1049
480
	rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
478
	rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
1050
481
	if (rc) {
479
	if (rc) {
1051
482
		netdev_err(bp->dev, "devlink_port_register failed");
480
		netdev_err(bp->dev, "devlink_port_register failed");
1052
diff --git a/drivers/net/ethernet/mellanox/mlx4/crdump.c b/drivers/net/ethernet/mellanox/mlx4/crdump.c
1053
index eaf08f7..2700628 100644
1054
--- a/drivers/net/ethernet/mellanox/mlx4/crdump.c
1055
+++ b/drivers/net/ethernet/mellanox/mlx4/crdump.c
1056
@@ -38,8 +38,18 @@
1057
38
#define CR_ENABLE_BIT_OFFSET		0xF3F04
38
#define CR_ENABLE_BIT_OFFSET		0xF3F04
1058
39
#define MAX_NUM_OF_DUMPS_TO_STORE	(8)
39
#define MAX_NUM_OF_DUMPS_TO_STORE	(8)
1059
40
40
1062
41
static const char *region_cr_space_str = "cr-space";
41
static const char * const region_cr_space_str = "cr-space";
1063
42
static const char *region_fw_health_str = "fw-health";
42
static const char * const region_fw_health_str = "fw-health";
1064
43
1065
44
static const struct devlink_region_ops region_cr_space_ops = {
1066
45
	.name = region_cr_space_str,
1067
46
	.destructor = &kvfree,
1068
47
};
1069
48
1070
49
static const struct devlink_region_ops region_fw_health_ops = {
1071
50
	.name = region_fw_health_str,
1072
51
	.destructor = &kvfree,
1073
52
};
1074
43
53
1075
44
/* Set to true in case cr enable bit was set to true before crdump */
54
/* Set to true in case cr enable bit was set to true before crdump */
1076
45
static bool crdump_enbale_bit_set;
55
static bool crdump_enbale_bit_set;
1077
@@ -99,7 +109,7 @@ static void mlx4_crdump_collect_crspace(struct mlx4_dev *dev,
1078
99
					readl(cr_space + offset);
109
					readl(cr_space + offset);
1079
100
110
1080
101
		err = devlink_region_snapshot_create(crdump->region_crspace,
111
		err = devlink_region_snapshot_create(crdump->region_crspace,
1082
102
						     crspace_data, id, &kvfree);
112
						     crspace_data, id);
1083
103
		if (err) {
113
		if (err) {
1084
104
			kvfree(crspace_data);
114
			kvfree(crspace_data);
1085
105
			mlx4_warn(dev, "crdump: devlink create %s snapshot id %d err %d\n",
115
			mlx4_warn(dev, "crdump: devlink create %s snapshot id %d err %d\n",
1086
@@ -138,7 +148,7 @@ static void mlx4_crdump_collect_fw_health(struct mlx4_dev *dev,
1087
138
					readl(health_buf_start + offset);
148
					readl(health_buf_start + offset);
1088
139
149
1089
140
		err = devlink_region_snapshot_create(crdump->region_fw_health,
150
		err = devlink_region_snapshot_create(crdump->region_fw_health,
1091
141
						     health_data, id, &kvfree);
151
						     health_data, id);
1092
142
		if (err) {
152
		if (err) {
1093
143
			kvfree(health_data);
153
			kvfree(health_data);
1094
144
			mlx4_warn(dev, "crdump: devlink create %s snapshot id %d err %d\n",
154
			mlx4_warn(dev, "crdump: devlink create %s snapshot id %d err %d\n",
1095
@@ -159,6 +169,7 @@ int mlx4_crdump_collect(struct mlx4_dev *dev)
1096
159
	struct pci_dev *pdev = dev->persist->pdev;
169
	struct pci_dev *pdev = dev->persist->pdev;
1097
160
	unsigned long cr_res_size;
170
	unsigned long cr_res_size;
1098
161
	u8 __iomem *cr_space;
171
	u8 __iomem *cr_space;
1099
172
	int err;
1100
162
	u32 id;
173
	u32 id;
1101
163
174
1102
164
	if (!dev->caps.health_buffer_addrs) {
175
	if (!dev->caps.health_buffer_addrs) {
1103
@@ -179,15 +190,22 @@ int mlx4_crdump_collect(struct mlx4_dev *dev)
1104
179
		return -ENODEV;
190
		return -ENODEV;
1105
180
	}
191
	}
1106
181
192
1107
182
	crdump_enable_crspace_access(dev, cr_space);
1108
183
1109
184
	/* Get the available snapshot ID for the dumps */
193
	/* Get the available snapshot ID for the dumps */
1111
185
	id = devlink_region_shapshot_id_get(devlink);
194
	err = devlink_region_snapshot_id_get(devlink, &id);
1112
195
	if (err) {
1113
196
		mlx4_err(dev, "crdump: devlink get snapshot id err %d\n", err);
1114
197
		return err;
1115
198
	}
1116
199
1117
200
	crdump_enable_crspace_access(dev, cr_space);
1118
186
201
1119
187
	/* Try to capture dumps */
202
	/* Try to capture dumps */
1120
188
	mlx4_crdump_collect_crspace(dev, cr_space, id);
203
	mlx4_crdump_collect_crspace(dev, cr_space, id);
1121
189
	mlx4_crdump_collect_fw_health(dev, cr_space, id);
204
	mlx4_crdump_collect_fw_health(dev, cr_space, id);
1122
190
205
1123
206
	/* Release reference on the snapshot id */
1124
207
	devlink_region_snapshot_id_put(devlink, id);
1125
208
1126
191
	crdump_disable_crspace_access(dev, cr_space);
209
	crdump_disable_crspace_access(dev, cr_space);
1127
192
210
1128
193
	iounmap(cr_space);
211
	iounmap(cr_space);
1129
@@ -205,7 +223,7 @@ int mlx4_crdump_init(struct mlx4_dev *dev)
1130
205
	/* Create cr-space region */
223
	/* Create cr-space region */
1131
206
	crdump->region_crspace =
224
	crdump->region_crspace =
1132
207
		devlink_region_create(devlink,
225
		devlink_region_create(devlink,
1134
208
				      region_cr_space_str,
226
				      &region_cr_space_ops,
1135
209
				      MAX_NUM_OF_DUMPS_TO_STORE,
227
				      MAX_NUM_OF_DUMPS_TO_STORE,
1136
210
				      pci_resource_len(pdev, 0));
228
				      pci_resource_len(pdev, 0));
1137
211
	if (IS_ERR(crdump->region_crspace))
229
	if (IS_ERR(crdump->region_crspace))
1138
@@ -216,7 +234,7 @@ int mlx4_crdump_init(struct mlx4_dev *dev)
1139
216
	/* Create fw-health region */
234
	/* Create fw-health region */
1140
217
	crdump->region_fw_health =
235
	crdump->region_fw_health =
1141
218
		devlink_region_create(devlink,
236
		devlink_region_create(devlink,
1143
219
				      region_fw_health_str,
237
				      &region_fw_health_ops,
1144
220
				      MAX_NUM_OF_DUMPS_TO_STORE,
238
				      MAX_NUM_OF_DUMPS_TO_STORE,
1145
221
				      HEALTH_BUFFER_SIZE);
239
				      HEALTH_BUFFER_SIZE);
1146
222
	if (IS_ERR(crdump->region_fw_health))
240
	if (IS_ERR(crdump->region_fw_health))
1147
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
1148
index 35882d6..c079910 100644
1149
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
1150
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
1151
@@ -3943,20 +3943,27 @@ static void mlx4_restart_one_down(struct pci_dev *pdev);
1152
3943
static int mlx4_restart_one_up(struct pci_dev *pdev, bool reload,
3943
static int mlx4_restart_one_up(struct pci_dev *pdev, bool reload,
1153
3944
			       struct devlink *devlink);
3944
			       struct devlink *devlink);
1154
3945
3945
1156
3946
static int mlx4_devlink_reload_down(struct devlink *devlink,
3946
static int mlx4_devlink_reload_down(struct devlink *devlink, bool netns_change,
1157
3947
				    enum devlink_reload_action action,
1158
3948
				    enum devlink_reload_limit limit,
1159
3947
				    struct netlink_ext_ack *extack)
3949
				    struct netlink_ext_ack *extack)
1160
3948
{
3950
{
1161
3949
	struct mlx4_priv *priv = devlink_priv(devlink);
3951
	struct mlx4_priv *priv = devlink_priv(devlink);
1162
3950
	struct mlx4_dev *dev = &priv->dev;
3952
	struct mlx4_dev *dev = &priv->dev;
1163
3951
	struct mlx4_dev_persistent *persist = dev->persist;
3953
	struct mlx4_dev_persistent *persist = dev->persist;
1164
3952
3954
1165
3955
	if (netns_change) {
1166
3956
		NL_SET_ERR_MSG_MOD(extack, "Namespace change is not supported");
1167
3957
		return -EOPNOTSUPP;
1168
3958
	}
1169
3953
	if (persist->num_vfs)
3959
	if (persist->num_vfs)
1170
3954
		mlx4_warn(persist->dev, "Reload performed on PF, will cause reset on operating Virtual Functions\n");
3960
		mlx4_warn(persist->dev, "Reload performed on PF, will cause reset on operating Virtual Functions\n");
1171
3955
	mlx4_restart_one_down(persist->pdev);
3961
	mlx4_restart_one_down(persist->pdev);
1172
3956
	return 0;
3962
	return 0;
1173
3957
}
3963
}
1174
3958
3964
1176
3959
static int mlx4_devlink_reload_up(struct devlink *devlink,
3965
static int mlx4_devlink_reload_up(struct devlink *devlink, enum devlink_reload_action action,
1177
3966
				  enum devlink_reload_limit limit, u32 *actions_performed,
1178
3960
				  struct netlink_ext_ack *extack)
3967
				  struct netlink_ext_ack *extack)
1179
3961
{
3968
{
1180
3962
	struct mlx4_priv *priv = devlink_priv(devlink);
3969
	struct mlx4_priv *priv = devlink_priv(devlink);
1181
@@ -3964,6 +3971,7 @@ static int mlx4_devlink_reload_up(struct devlink *devlink,
1182
3964
	struct mlx4_dev_persistent *persist = dev->persist;
3971
	struct mlx4_dev_persistent *persist = dev->persist;
1183
3965
	int err;
3972
	int err;
1184
3966
3973
1185
3974
	*actions_performed = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT);
1186
3967
	err = mlx4_restart_one_up(persist->pdev, true, devlink);
3975
	err = mlx4_restart_one_up(persist->pdev, true, devlink);
1187
3968
	if (err)
3976
	if (err)
1188
3969
		mlx4_err(persist->dev, "mlx4_restart_one_up failed, ret=%d\n",
3977
		mlx4_err(persist->dev, "mlx4_restart_one_up failed, ret=%d\n",
1189
@@ -3974,6 +3982,7 @@ static int mlx4_devlink_reload_up(struct devlink *devlink,
1190
3974
3982
1191
3975
static const struct devlink_ops mlx4_devlink_ops = {
3983
static const struct devlink_ops mlx4_devlink_ops = {
1192
3976
	.port_type_set	= mlx4_devlink_port_type_set,
3984
	.port_type_set	= mlx4_devlink_port_type_set,
1193
3985
	.reload_actions = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT),
1194
3977
	.reload_down	= mlx4_devlink_reload_down,
3986
	.reload_down	= mlx4_devlink_reload_down,
1195
3978
	.reload_up	= mlx4_devlink_reload_up,
3987
	.reload_up	= mlx4_devlink_reload_up,
1196
3979
};
3988
};
1197
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
1198
index 9fa4b98..75afcab 100644
1199
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
1200
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
1201
@@ -222,7 +222,8 @@ static int mlx5e_rx_reporter_recover_from_ctx(struct mlx5e_err_ctx *err_ctx)
1202
222
}
222
}
1203
223
223
1204
224
static int mlx5e_rx_reporter_recover(struct devlink_health_reporter *reporter,
224
static int mlx5e_rx_reporter_recover(struct devlink_health_reporter *reporter,
1206
225
				     void *context)
225
				     void *context,
1207
226
				     struct netlink_ext_ack *extack)
1208
226
{
227
{
1209
227
	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
228
	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
1210
228
	struct mlx5e_err_ctx *err_ctx = context;
229
	struct mlx5e_err_ctx *err_ctx = context;
1211
@@ -301,7 +302,8 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,
1212
301
}
302
}
1213
302
303
1214
303
static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,
304
static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,
1216
304
				      struct devlink_fmsg *fmsg)
305
				      struct devlink_fmsg *fmsg,
1217
306
				      struct netlink_ext_ack *extack)
1218
305
{
307
{
1219
306
	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
308
	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
1220
307
	struct mlx5e_params *params = &priv->channels.params;
309
	struct mlx5e_params *params = &priv->channels.params;
1221
@@ -385,7 +387,7 @@ int mlx5e_reporter_rx_create(struct mlx5e_priv *priv)
1222
385
	reporter = devlink_health_reporter_create(devlink,
387
	reporter = devlink_health_reporter_create(devlink,
1223
386
						  &mlx5_rx_reporter_ops,
388
						  &mlx5_rx_reporter_ops,
1224
387
						  MLX5E_REPORTER_RX_GRACEFUL_PERIOD,
389
						  MLX5E_REPORTER_RX_GRACEFUL_PERIOD,
1226
388
						  true, priv);
390
						  priv);
1227
389
	if (IS_ERR(reporter)) {
391
	if (IS_ERR(reporter)) {
1228
390
		netdev_warn(priv->netdev, "Failed to create rx reporter, err = %ld\n",
392
		netdev_warn(priv->netdev, "Failed to create rx reporter, err = %ld\n",
1229
391
			    PTR_ERR(reporter));
393
			    PTR_ERR(reporter));
1230
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
1231
index bfed558..8b1089f 100644
1232
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
1233
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
1234
@@ -135,7 +135,8 @@ static int mlx5e_tx_reporter_recover_from_ctx(struct mlx5e_err_ctx *err_ctx)
1235
135
}
135
}
1236
136
136
1237
137
static int mlx5e_tx_reporter_recover(struct devlink_health_reporter *reporter,
137
static int mlx5e_tx_reporter_recover(struct devlink_health_reporter *reporter,
1239
138
				     void *context)
138
				     void *context,
1240
139
				     struct netlink_ext_ack *extack)
1241
139
{
140
{
1242
140
	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
141
	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
1243
141
	struct mlx5e_err_ctx *err_ctx = context;
142
	struct mlx5e_err_ctx *err_ctx = context;
1244
@@ -205,7 +206,8 @@ mlx5e_tx_reporter_build_diagnose_output(struct devlink_fmsg *fmsg,
1245
205
}
206
}
1246
206
207
1247
207
static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter,
208
static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter,
1249
208
				      struct devlink_fmsg *fmsg)
209
				      struct devlink_fmsg *fmsg,
1250
210
				      struct netlink_ext_ack *extack)
1251
209
{
211
{
1252
210
	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
212
	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
1253
211
	struct mlx5e_txqsq *generic_sq = priv->txq2sq[0];
213
	struct mlx5e_txqsq *generic_sq = priv->txq2sq[0];
1254
@@ -291,7 +293,7 @@ int mlx5e_reporter_tx_create(struct mlx5e_priv *priv)
1255
291
	reporter =
293
	reporter =
1256
292
		devlink_health_reporter_create(devlink, &mlx5_tx_reporter_ops,
294
		devlink_health_reporter_create(devlink, &mlx5_tx_reporter_ops,
1257
293
					       MLX5_REPORTER_TX_GRACEFUL_PERIOD,
295
					       MLX5_REPORTER_TX_GRACEFUL_PERIOD,
1259
294
					       true, priv);
296
					       priv);
1260
295
	if (IS_ERR(reporter)) {
297
	if (IS_ERR(reporter)) {
1261
296
		netdev_warn(priv->netdev,
298
		netdev_warn(priv->netdev,
1262
297
			    "Failed to create tx reporter, err = %ld\n",
299
			    "Failed to create tx reporter, err = %ld\n",
1263
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
1264
index f628887..780ae27 100644
1265
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
1266
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
1267
@@ -398,7 +398,8 @@ static void print_health_info(struct mlx5_core_dev *dev)
1268
398
398
1269
399
static int
399
static int
1270
400
mlx5_fw_reporter_diagnose(struct devlink_health_reporter *reporter,
400
mlx5_fw_reporter_diagnose(struct devlink_health_reporter *reporter,
1272
401
			  struct devlink_fmsg *fmsg)
401
			  struct devlink_fmsg *fmsg,
1273
402
			  struct netlink_ext_ack *extack)
1274
402
{
403
{
1275
403
	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
404
	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
1276
404
	struct mlx5_core_health *health = &dev->priv.health;
405
	struct mlx5_core_health *health = &dev->priv.health;
1277
@@ -499,7 +500,8 @@ mlx5_fw_reporter_heath_buffer_data_put(struct mlx5_core_dev *dev,
1278
499
500
1279
500
static int
501
static int
1280
501
mlx5_fw_reporter_dump(struct devlink_health_reporter *reporter,
502
mlx5_fw_reporter_dump(struct devlink_health_reporter *reporter,
1282
502
		      struct devlink_fmsg *fmsg, void *priv_ctx)
503
		      struct devlink_fmsg *fmsg, void *priv_ctx,
1283
504
		      struct netlink_ext_ack *extack)
1284
503
{
505
{
1285
504
	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
506
	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
1286
505
	int err;
507
	int err;
1287
@@ -553,7 +555,8 @@ static const struct devlink_health_reporter_ops mlx5_fw_reporter_ops = {
1288
553
555
1289
554
static int
556
static int
1290
555
mlx5_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter,
557
mlx5_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter,
1292
556
			       void *priv_ctx)
558
			       void *priv_ctx,
1293
559
			       struct netlink_ext_ack *extack)
1294
557
{
560
{
1295
558
	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
561
	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
1296
559
562
1297
@@ -563,7 +566,8 @@ mlx5_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter,
1298
563
#define MLX5_CR_DUMP_CHUNK_SIZE 256
566
#define MLX5_CR_DUMP_CHUNK_SIZE 256
1299
564
static int
567
static int
1300
565
mlx5_fw_fatal_reporter_dump(struct devlink_health_reporter *reporter,
568
mlx5_fw_fatal_reporter_dump(struct devlink_health_reporter *reporter,
1302
566
			    struct devlink_fmsg *fmsg, void *priv_ctx)
569
			    struct devlink_fmsg *fmsg, void *priv_ctx,
1303
570
			    struct netlink_ext_ack *extack)
1304
567
{
571
{
1305
568
	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
572
	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
1306
569
	u32 crdump_size = dev->priv.health.crdump_size;
573
	u32 crdump_size = dev->priv.health.crdump_size;
1307
@@ -647,7 +651,7 @@ static void mlx5_fw_reporters_create(struct mlx5_core_dev *dev)
1308
647
651
1309
648
	health->fw_reporter =
652
	health->fw_reporter =
1310
649
		devlink_health_reporter_create(devlink, &mlx5_fw_reporter_ops,
653
		devlink_health_reporter_create(devlink, &mlx5_fw_reporter_ops,
1312
650
					       0, false, dev);
654
					       0, dev);
1313
651
	if (IS_ERR(health->fw_reporter))
655
	if (IS_ERR(health->fw_reporter))
1314
652
		mlx5_core_warn(dev, "Failed to create fw reporter, err = %ld\n",
656
		mlx5_core_warn(dev, "Failed to create fw reporter, err = %ld\n",
1315
653
			       PTR_ERR(health->fw_reporter));
657
			       PTR_ERR(health->fw_reporter));
1316
@@ -656,7 +660,7 @@ static void mlx5_fw_reporters_create(struct mlx5_core_dev *dev)
1317
656
		devlink_health_reporter_create(devlink,
660
		devlink_health_reporter_create(devlink,
1318
657
					       &mlx5_fw_fatal_reporter_ops,
661
					       &mlx5_fw_fatal_reporter_ops,
1319
658
					       MLX5_REPORTER_FW_GRACEFUL_PERIOD,
662
					       MLX5_REPORTER_FW_GRACEFUL_PERIOD,
1321
659
					       true, dev);
663
					       dev);
1322
660
	if (IS_ERR(health->fw_fatal_reporter))
664
	if (IS_ERR(health->fw_fatal_reporter))
1323
661
		mlx5_core_warn(dev, "Failed to create fw fatal reporter, err = %ld\n",
665
		mlx5_core_warn(dev, "Failed to create fw fatal reporter, err = %ld\n",
1324
662
			       PTR_ERR(health->fw_fatal_reporter));
666
			       PTR_ERR(health->fw_fatal_reporter));
1325
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
1326
index 2d39bad..dff8d24 100644
1327
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
1328
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
1329
@@ -990,6 +990,8 @@ mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,
1330
990
990
1331
991
static int
991
static int
1332
992
mlxsw_devlink_core_bus_device_reload_down(struct devlink *devlink,
992
mlxsw_devlink_core_bus_device_reload_down(struct devlink *devlink,
1333
993
					  bool netns_change, enum devlink_reload_action action,
1334
994
					  enum devlink_reload_limit limit,
1335
993
					  struct netlink_ext_ack *extack)
995
					  struct netlink_ext_ack *extack)
1336
994
{
996
{
1337
995
	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
997
	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
1338
@@ -1002,11 +1004,14 @@ mlxsw_devlink_core_bus_device_reload_down(struct devlink *devlink,
1339
1002
}
1004
}
1340
1003
1005
1341
1004
static int
1006
static int
1343
1005
mlxsw_devlink_core_bus_device_reload_up(struct devlink *devlink,
1007
mlxsw_devlink_core_bus_device_reload_up(struct devlink *devlink, enum devlink_reload_action action,
1344
1008
					enum devlink_reload_limit limit, u32 *actions_performed,
1345
1006
					struct netlink_ext_ack *extack)
1009
					struct netlink_ext_ack *extack)
1346
1007
{
1010
{
1347
1008
	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
1011
	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
1348
1009
1012
1349
1013
	*actions_performed = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) |
1350
1014
			     BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE);
1351
1010
	return mlxsw_core_bus_device_register(mlxsw_core->bus_info,
1015
	return mlxsw_core_bus_device_register(mlxsw_core->bus_info,
1352
1011
					      mlxsw_core->bus,
1016
					      mlxsw_core->bus,
1353
1012
					      mlxsw_core->bus_priv, true,
1017
					      mlxsw_core->bus_priv, true,
1354
@@ -1076,6 +1081,8 @@ mlxsw_devlink_trap_group_init(struct devlink *devlink,
1355
1076
}
1081
}
1356
1077
1082
1357
1078
static const struct devlink_ops mlxsw_devlink_ops = {
1083
static const struct devlink_ops mlxsw_devlink_ops = {
1358
1084
	.reload_actions		= BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) |
1359
1085
				  BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE),
1360
1079
	.reload_down		= mlxsw_devlink_core_bus_device_reload_down,
1086
	.reload_down		= mlxsw_devlink_core_bus_device_reload_down,
1361
1080
	.reload_up		= mlxsw_devlink_core_bus_device_reload_up,
1087
	.reload_up		= mlxsw_devlink_core_bus_device_reload_up,
1362
1081
	.port_type_set			= mlxsw_devlink_port_type_set,
1088
	.port_type_set			= mlxsw_devlink_port_type_set,
1363
@@ -1889,12 +1896,19 @@ static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,
1364
1889
	struct mlxsw_core_port *mlxsw_core_port =
1896
	struct mlxsw_core_port *mlxsw_core_port =
1365
1890
					&mlxsw_core->ports[local_port];
1897
					&mlxsw_core->ports[local_port];
1366
1891
	struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;
1898
	struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;
1367
1899
	struct devlink_port_attrs attrs = {};
1368
1892
	int err;
1900
	int err;
1369
1893
1901
1370
1902
	attrs.split = split;
1371
1903
	attrs.lanes = lanes;
1372
1904
	attrs.splittable = splittable;
1373
1905
	attrs.flavour = flavour;
1374
1906
	attrs.phys.port_number = port_number;
1375
1907
	attrs.phys.split_subport_number = split_port_subnumber;
1376
1908
	memcpy(attrs.switch_id.id, switch_id, switch_id_len);
1377
1909
	attrs.switch_id.id_len = switch_id_len;
1378
1894
	mlxsw_core_port->local_port = local_port;
1910
	mlxsw_core_port->local_port = local_port;
1382
1895
	devlink_port_attrs_set(devlink_port, flavour, port_number,
1911
	devlink_port_attrs_set(devlink_port, &attrs);
1380
1896
			       split, split_port_subnumber,
1381
1897
			       switch_id, switch_id_len);
1383
1898
	err = devlink_port_register(devlink, devlink_port, local_port);
1912
	err = devlink_port_register(devlink, devlink_port, local_port);
1384
1899
	if (err)
1913
	if (err)
1385
1900
		memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));
1914
		memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));
1386
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
1387
index 5d7d2ab..30a718a 100644
1388
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
1389
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
1390
@@ -18,6 +18,11 @@
1391
18
#include "cmd.h"
18
#include "cmd.h"
1392
19
#include "resources.h"
19
#include "resources.h"
1393
20
20
1394
21
enum mlxsw_core_resource_id {
1395
22
	MLXSW_CORE_RESOURCE_PORTS = 1,
1396
23
	MLXSW_CORE_RESOURCE_MAX,
1397
24
};
1398
25
1399
21
struct mlxsw_core;
26
struct mlxsw_core;
1400
22
struct mlxsw_core_port;
27
struct mlxsw_core_port;
1401
23
struct mlxsw_driver;
28
struct mlxsw_driver;
1402
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
1403
index b2a0028..9f7107e 100644
1404
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
1405
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
1406
@@ -48,7 +48,7 @@
1407
48
#define MLXSW_SP_RESOURCE_NAME_KVD_LINEAR_LARGE_CHUNKS "large_chunks"
48
#define MLXSW_SP_RESOURCE_NAME_KVD_LINEAR_LARGE_CHUNKS "large_chunks"
1408
49
49
1409
50
enum mlxsw_sp_resource_id {
50
enum mlxsw_sp_resource_id {
1411
51
	MLXSW_SP_RESOURCE_KVD = 1,
51
	MLXSW_SP_RESOURCE_KVD = MLXSW_CORE_RESOURCE_MAX,
1412
52
	MLXSW_SP_RESOURCE_KVD_LINEAR,
52
	MLXSW_SP_RESOURCE_KVD_LINEAR,
1413
53
	MLXSW_SP_RESOURCE_KVD_HASH_SINGLE,
53
	MLXSW_SP_RESOURCE_KVD_HASH_SINGLE,
1414
54
	MLXSW_SP_RESOURCE_KVD_HASH_DOUBLE,
54
	MLXSW_SP_RESOURCE_KVD_HASH_DOUBLE,
1415
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
1416
index c50fce4..b6a1056 100644
1417
--- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
1418
+++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
1419
@@ -211,7 +211,7 @@ static const struct nfp_devlink_versions {
1420
211
	enum nfp_nsp_versions id;
211
	enum nfp_nsp_versions id;
1421
212
	const char *key;
212
	const char *key;
1422
213
} nfp_devlink_versions_nsp[] = {
213
} nfp_devlink_versions_nsp[] = {
1424
214
	{ NFP_VERSIONS_BUNDLE,	"fw.bundle_id", },
214
	{ NFP_VERSIONS_BUNDLE,	DEVLINK_INFO_VERSION_GENERIC_FW_BUNDLE_ID, },
1425
215
	{ NFP_VERSIONS_BSP,	DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, },
215
	{ NFP_VERSIONS_BSP,	DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, },
1426
216
	{ NFP_VERSIONS_CPLD,	"fw.cpld", },
216
	{ NFP_VERSIONS_CPLD,	"fw.cpld", },
1427
217
	{ NFP_VERSIONS_APP,	DEVLINK_INFO_VERSION_GENERIC_FW_APP, },
217
	{ NFP_VERSIONS_APP,	DEVLINK_INFO_VERSION_GENERIC_FW_APP, },
1428
@@ -353,6 +353,7 @@ const struct devlink_ops nfp_devlink_ops = {
1429
353
353
1430
354
int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port)
354
int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port)
1431
355
{
355
{
1432
356
	struct devlink_port_attrs attrs = {};
1433
356
	struct nfp_eth_table_port eth_port;
357
	struct nfp_eth_table_port eth_port;
1434
357
	struct devlink *devlink;
358
	struct devlink *devlink;
1435
358
	const u8 *serial;
359
	const u8 *serial;
1436
@@ -365,10 +366,15 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port)
1437
365
	if (ret)
366
	if (ret)
1438
366
		return ret;
367
		return ret;
1439
367
368
1440
369
	attrs.split = eth_port.is_split;
1441
370
	attrs.splittable = !attrs.split;
1442
371
	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
1443
372
	attrs.phys.port_number = eth_port.label_port;
1444
373
	attrs.phys.split_subport_number = eth_port.label_subport;
1445
368
	serial_len = nfp_cpp_serial(port->app->cpp, &serial);
374
	serial_len = nfp_cpp_serial(port->app->cpp, &serial);
1449
369
	devlink_port_attrs_set(&port->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
375
	memcpy(attrs.switch_id.id, serial, serial_len);
1450
370
			       eth_port.label_port, eth_port.is_split,
376
	attrs.switch_id.id_len = serial_len;
1451
371
			       eth_port.label_subport, serial, serial_len);
377
	devlink_port_attrs_set(&port->dl_port, &attrs);
1452
372
378
1453
373
	devlink = priv_to_devlink(app->pf);
379
	devlink = priv_to_devlink(app->pf);
1454
374
380
1455
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_devlink.c b/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
1456
index af1647a..6a6feb0 100644
1457
--- a/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
1458
+++ b/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
1459
@@ -70,6 +70,7 @@ void ionic_devlink_free(struct ionic *ionic)
1460
70
int ionic_devlink_register(struct ionic *ionic)
70
int ionic_devlink_register(struct ionic *ionic)
1461
71
{
71
{
1462
72
	struct devlink *dl = priv_to_devlink(ionic);
72
	struct devlink *dl = priv_to_devlink(ionic);
1463
73
	struct devlink_port_attrs attrs = {};
1464
73
	int err;
74
	int err;
1465
74
75
1466
75
	err = devlink_register(dl, ionic->dev);
76
	err = devlink_register(dl, ionic->dev);
1467
@@ -78,8 +79,8 @@ int ionic_devlink_register(struct ionic *ionic)
1468
78
		return err;
79
		return err;
1469
79
	}
80
	}
1470
80
81
1473
81
	devlink_port_attrs_set(&ionic->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
82
	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
1474
82
			       0, false, 0, NULL, 0);
83
	devlink_port_attrs_set(&ionic->dl_port, &attrs);
1475
83
	err = devlink_port_register(dl, &ionic->dl_port, 0);
84
	err = devlink_port_register(dl, &ionic->dl_port, 0);
1476
84
	if (err)
85
	if (err)
1477
85
		dev_err(ionic->dev, "devlink_port_register failed: %d\n", err);
86
		dev_err(ionic->dev, "devlink_port_register failed: %d\n", err);
1478
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
1479
index 91b302f..218b4bc 100644
1480
--- a/drivers/net/netdevsim/dev.c
1481
+++ b/drivers/net/netdevsim/dev.c
1482
@@ -43,19 +43,27 @@ static ssize_t nsim_dev_take_snapshot_write(struct file *file,
1483
43
					    size_t count, loff_t *ppos)
43
					    size_t count, loff_t *ppos)
1484
44
{
44
{
1485
45
	struct nsim_dev *nsim_dev = file->private_data;
45
	struct nsim_dev *nsim_dev = file->private_data;
1486
46
	struct devlink *devlink;
1487
46
	void *dummy_data;
47
	void *dummy_data;
1488
47
	int err;
48
	int err;
1489
48
	u32 id;
49
	u32 id;
1490
49
50
1491
51
	devlink = priv_to_devlink(nsim_dev);
1492
52
1493
50
	dummy_data = kmalloc(NSIM_DEV_DUMMY_REGION_SIZE, GFP_KERNEL);
53
	dummy_data = kmalloc(NSIM_DEV_DUMMY_REGION_SIZE, GFP_KERNEL);
1494
51
	if (!dummy_data)
54
	if (!dummy_data)
1495
52
		return -ENOMEM;
55
		return -ENOMEM;
1496
53
56
1497
54
	get_random_bytes(dummy_data, NSIM_DEV_DUMMY_REGION_SIZE);
57
	get_random_bytes(dummy_data, NSIM_DEV_DUMMY_REGION_SIZE);
1498
55
58
1500
56
	id = devlink_region_shapshot_id_get(priv_to_devlink(nsim_dev));
59
	err = devlink_region_snapshot_id_get(devlink, &id);
1501
60
	if (err) {
1502
61
		pr_err("Failed to get snapshot id\n");
1503
62
		return err;
1504
63
	}
1505
57
	err = devlink_region_snapshot_create(nsim_dev->dummy_region,
64
	err = devlink_region_snapshot_create(nsim_dev->dummy_region,
1507
58
					     dummy_data, id, kfree);
65
					     dummy_data, id);
1508
66
	devlink_region_snapshot_id_put(devlink, id);
1509
59
	if (err) {
67
	if (err) {
1510
60
		pr_err("Failed to create region snapshot\n");
68
		pr_err("Failed to create region snapshot\n");
1511
61
		kfree(dummy_data);
69
		kfree(dummy_data);
1512
@@ -293,11 +301,16 @@ static void nsim_devlink_param_load_driverinit_values(struct devlink *devlink)
1513
293
301
1514
294
#define NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX 16
302
#define NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX 16
1515
295
303
1516
304
static const struct devlink_region_ops dummy_region_ops = {
1517
305
	.name = "dummy",
1518
306
	.destructor = &kfree,
1519
307
};
1520
308
1521
296
static int nsim_dev_dummy_region_init(struct nsim_dev *nsim_dev,
309
static int nsim_dev_dummy_region_init(struct nsim_dev *nsim_dev,
1522
297
				      struct devlink *devlink)
310
				      struct devlink *devlink)
1523
298
{
311
{
1524
299
	nsim_dev->dummy_region =
312
	nsim_dev->dummy_region =
1526
300
		devlink_region_create(devlink, "dummy",
313
		devlink_region_create(devlink, &dummy_region_ops,
1527
301
				      NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX,
314
				      NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX,
1528
302
				      NSIM_DEV_DUMMY_REGION_SIZE);
315
				      NSIM_DEV_DUMMY_REGION_SIZE);
1529
303
	return PTR_ERR_OR_ZERO(nsim_dev->dummy_region);
316
	return PTR_ERR_OR_ZERO(nsim_dev->dummy_region);
1530
@@ -321,7 +334,7 @@ struct nsim_trap_data {
1531
321
};
334
};
1532
322
335
1533
323
/* All driver-specific traps must be documented in
336
/* All driver-specific traps must be documented in
1535
324
 * Documentation/networking/devlink-trap-netdevsim.rst
337
 * Documentation/networking/devlink/devlink-trap-netdevsim.rst
1536
325
 */
338
 */
1537
326
enum {
339
enum {
1538
327
	NSIM_TRAP_ID_BASE = DEVLINK_TRAP_GENERIC_ID_MAX,
340
	NSIM_TRAP_ID_BASE = DEVLINK_TRAP_GENERIC_ID_MAX,
1539
@@ -433,7 +446,7 @@ static void nsim_dev_trap_report(struct nsim_dev_port *nsim_dev_port)
1540
433
		 */
446
		 */
1541
434
		local_bh_disable();
447
		local_bh_disable();
1542
435
		devlink_trap_report(devlink, skb, nsim_trap_item->trap_ctx,
448
		devlink_trap_report(devlink, skb, nsim_trap_item->trap_ctx,
1544
436
				    &nsim_dev_port->devlink_port);
449
				    &nsim_dev_port->devlink_port, NULL);
1545
437
		local_bh_enable();
450
		local_bh_enable();
1546
438
		consume_skb(skb);
451
		consume_skb(skb);
1547
439
	}
452
	}
1548
@@ -749,6 +762,7 @@ static void nsim_dev_destroy(struct nsim_dev *nsim_dev)
1549
749
static int __nsim_dev_port_add(struct nsim_dev *nsim_dev,
762
static int __nsim_dev_port_add(struct nsim_dev *nsim_dev,
1550
750
			       unsigned int port_index)
763
			       unsigned int port_index)
1551
751
{
764
{
1552
765
	struct devlink_port_attrs attrs = {};
1553
752
	struct nsim_dev_port *nsim_dev_port;
766
	struct nsim_dev_port *nsim_dev_port;
1554
753
	struct devlink_port *devlink_port;
767
	struct devlink_port *devlink_port;
1555
754
	int err;
768
	int err;
1556
@@ -759,10 +773,11 @@ static int __nsim_dev_port_add(struct nsim_dev *nsim_dev,
1557
759
	nsim_dev_port->port_index = port_index;
773
	nsim_dev_port->port_index = port_index;
1558
760
774
1559
761
	devlink_port = &nsim_dev_port->devlink_port;
775
	devlink_port = &nsim_dev_port->devlink_port;
1564
762
	devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
776
	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
1565
763
			       port_index + 1, 0, 0,
777
	attrs.phys.port_number = port_index + 1;
1566
764
			       nsim_dev->switch_id.id,
778
	memcpy(attrs.switch_id.id, nsim_dev->switch_id.id, nsim_dev->switch_id.id_len);
1567
765
			       nsim_dev->switch_id.id_len);
779
	attrs.switch_id.id_len = nsim_dev->switch_id.id_len;
1568
780
	devlink_port_attrs_set(devlink_port, &attrs);
1569
766
	err = devlink_port_register(priv_to_devlink(nsim_dev), devlink_port,
781
	err = devlink_port_register(priv_to_devlink(nsim_dev), devlink_port,
1570
767
				    port_index);
782
				    port_index);
1571
768
	if (err)
783
	if (err)
1572
diff --git a/include/net/devlink.h b/include/net/devlink.h
1573
index ac3ad16..08f4c61 100644
1574
--- a/include/net/devlink.h
1575
+++ b/include/net/devlink.h
1576
@@ -16,28 +16,44 @@
1577
16
#include <linux/workqueue.h>
16
#include <linux/workqueue.h>
1578
17
#include <linux/refcount.h>
17
#include <linux/refcount.h>
1579
18
#include <net/net_namespace.h>
18
#include <net/net_namespace.h>
1580
19
#include <net/flow_offload.h>
1581
19
#include <uapi/linux/devlink.h>
20
#include <uapi/linux/devlink.h>
1582
21
#include <linux/xarray.h>
1583
22
#include <linux/firmware.h>
1584
23
1585
24
#define DEVLINK_RELOAD_STATS_ARRAY_SIZE \
1586
25
	(__DEVLINK_RELOAD_LIMIT_MAX * __DEVLINK_RELOAD_ACTION_MAX)
1587
26
1588
27
struct devlink_dev_stats {
1589
28
	u32 reload_stats[DEVLINK_RELOAD_STATS_ARRAY_SIZE];
1590
29
	u32 remote_reload_stats[DEVLINK_RELOAD_STATS_ARRAY_SIZE];
1591
30
};
1592
20
31
1593
21
struct devlink_ops;
32
struct devlink_ops;
1594
22
33
1595
23
struct devlink {
34
struct devlink {
1596
24
	struct list_head list;
35
	struct list_head list;
1597
25
	struct list_head port_list;
36
	struct list_head port_list;
1598
37
	struct list_head rate_list;
1599
26
	struct list_head sb_list;
38
	struct list_head sb_list;
1600
27
	struct list_head dpipe_table_list;
39
	struct list_head dpipe_table_list;
1601
28
	struct list_head resource_list;
40
	struct list_head resource_list;
1602
29
	struct list_head param_list;
41
	struct list_head param_list;
1603
30
	struct list_head region_list;
42
	struct list_head region_list;
1604
31
	u32 snapshot_id;
1605
32
	struct list_head reporter_list;
43
	struct list_head reporter_list;
1606
33
	struct mutex reporters_lock; /* protects reporter_list */
44
	struct mutex reporters_lock; /* protects reporter_list */
1607
34
	struct devlink_dpipe_headers *dpipe_headers;
45
	struct devlink_dpipe_headers *dpipe_headers;
1608
35
	struct list_head trap_list;
46
	struct list_head trap_list;
1609
36
	struct list_head trap_group_list;
47
	struct list_head trap_group_list;
1610
48
	struct list_head trap_policer_list;
1611
37
	const struct devlink_ops *ops;
49
	const struct devlink_ops *ops;
1612
50
	struct xarray snapshot_ids;
1613
51
	struct devlink_dev_stats stats;
1614
38
	struct device *dev;
52
	struct device *dev;
1615
39
	possible_net_t _net;
53
	possible_net_t _net;
1617
40
	struct mutex lock;
54
	struct mutex lock; /* Serializes access to devlink instance specific objects such as
1618
55
			    * port, sb, dpipe, resource, params, region, traps and more.
1619
56
			    */
1620
41
	u8 reload_failed:1,
57
	u8 reload_failed:1,
1621
42
	   reload_enabled:1;
58
	   reload_enabled:1;
1622
43
	char priv[0] __aligned(NETDEV_ALIGN);
59
	char priv[0] __aligned(NETDEV_ALIGN);
1623
@@ -48,37 +64,99 @@ struct devlink_port_phys_attrs {
1624
48
			  * A physical port which is visible to the user
64
			  * A physical port which is visible to the user
1625
49
			  * for a given port flavour.
65
			  * for a given port flavour.
1626
50
			  */
66
			  */
1628
51
	u32 split_subport_number;
67
	u32 split_subport_number; /* If the port is split, this is the number of subport. */
1629
52
};
68
};
1630
53
69
1631
70
/**
1632
71
 * struct devlink_port_pci_pf_attrs - devlink port's PCI PF attributes
1633
72
 * @controller: Associated controller number
1634
73
 * @pf: Associated PCI PF number for this port.
1635
74
 * @external: when set, indicates if a port is for an external controller
1636
75
 */
1637
54
struct devlink_port_pci_pf_attrs {
76
struct devlink_port_pci_pf_attrs {
1639
55
	u16 pf;	/* Associated PCI PF for this port. */
77
	u32 controller;
1640
78
	u16 pf;
1641
79
	u8 external:1;
1642
56
};
80
};
1643
57
81
1644
82
/**
1645
83
 * struct devlink_port_pci_vf_attrs - devlink port's PCI VF attributes
1646
84
 * @controller: Associated controller number
1647
85
 * @pf: Associated PCI PF number for this port.
1648
86
 * @vf: Associated PCI VF for of the PCI PF for this port.
1649
87
 * @external: when set, indicates if a port is for an external controller
1650
88
 */
1651
58
struct devlink_port_pci_vf_attrs {
89
struct devlink_port_pci_vf_attrs {
1654
59
	u16 pf;	/* Associated PCI PF for this port. */
90
	u32 controller;
1655
60
	u16 vf;	/* Associated PCI VF for of the PCI PF for this port. */
91
	u16 pf;
1656
92
	u16 vf;
1657
93
	u8 external:1;
1658
94
};
1659
95
1660
96
/**
1661
97
 * struct devlink_port_pci_sf_attrs - devlink port's PCI SF attributes
1662
98
 * @controller: Associated controller number
1663
99
 * @sf: Associated PCI SF for of the PCI PF for this port.
1664
100
 * @pf: Associated PCI PF number for this port.
1665
101
 * @external: when set, indicates if a port is for an external controller
1666
102
 */
1667
103
struct devlink_port_pci_sf_attrs {
1668
104
	u32 controller;
1669
105
	u32 sf;
1670
106
	u16 pf;
1671
107
	u8 external:1;
1672
61
};
108
};
1673
62
109
1674
110
/**
1675
111
 * struct devlink_port_attrs - devlink port object
1676
112
 * @flavour: flavour of the port
1677
113
 * @split: indicates if this is split port
1678
114
 * @splittable: indicates if the port can be split.
1679
115
 * @lanes: maximum number of lanes the port supports. 0 value is not passed to netlink.
1680
116
 * @switch_id: if the port is part of switch, this is buffer with ID, otherwise this is NULL
1681
117
 * @phys: physical port attributes
1682
118
 * @pci_pf: PCI PF port attributes
1683
119
 * @pci_vf: PCI VF port attributes
1684
120
 * @pci_sf: PCI SF port attributes
1685
121
 */
1686
63
struct devlink_port_attrs {
122
struct devlink_port_attrs {
1690
64
	u8 set:1,
123
	u8 split:1,
1691
65
	   split:1,
124
	   splittable:1;
1692
66
	   switch_port:1;
125
	u32 lanes;
1693
67
	enum devlink_port_flavour flavour;
126
	enum devlink_port_flavour flavour;
1694
68
	struct netdev_phys_item_id switch_id;
127
	struct netdev_phys_item_id switch_id;
1695
69
	union {
128
	union {
1696
70
		struct devlink_port_phys_attrs phys;
129
		struct devlink_port_phys_attrs phys;
1697
71
		struct devlink_port_pci_pf_attrs pci_pf;
130
		struct devlink_port_pci_pf_attrs pci_pf;
1698
72
		struct devlink_port_pci_vf_attrs pci_vf;
131
		struct devlink_port_pci_vf_attrs pci_vf;
1699
132
		struct devlink_port_pci_sf_attrs pci_sf;
1700
133
	};
1701
134
};
1702
135
1703
136
struct devlink_rate {
1704
137
	struct list_head list;
1705
138
	enum devlink_rate_type type;
1706
139
	struct devlink *devlink;
1707
140
	void *priv;
1708
141
	u64 tx_share;
1709
142
	u64 tx_max;
1710
143
1711
144
	struct devlink_rate *parent;
1712
145
	union {
1713
146
		struct devlink_port *devlink_port;
1714
147
		struct {
1715
148
			char *name;
1716
149
			refcount_t refcnt;
1717
150
		};
1718
73
	};
151
	};
1719
74
};
152
};
1720
75
153
1721
76
struct devlink_port {
154
struct devlink_port {
1722
77
	struct list_head list;
155
	struct list_head list;
1723
78
	struct list_head param_list;
156
	struct list_head param_list;
1724
157
	struct list_head region_list;
1725
79
	struct devlink *devlink;
158
	struct devlink *devlink;
1726
80
	unsigned int index;
159
	unsigned int index;
1727
81
	bool registered;
1728
82
	spinlock_t type_lock; /* Protects type and type_dev
160
	spinlock_t type_lock; /* Protects type and type_dev
1729
83
			       * pointer consistency.
161
			       * pointer consistency.
1730
84
			       */
162
			       */
1731
@@ -86,7 +164,24 @@ struct devlink_port {
1732
86
	enum devlink_port_type desired_type;
164
	enum devlink_port_type desired_type;
1733
87
	void *type_dev;
165
	void *type_dev;
1734
88
	struct devlink_port_attrs attrs;
166
	struct devlink_port_attrs attrs;
1735
167
	u8 attrs_set:1,
1736
168
	   switch_port:1;
1737
89
	struct delayed_work type_warn_dw;
169
	struct delayed_work type_warn_dw;
1738
170
	struct list_head reporter_list;
1739
171
	struct mutex reporters_lock; /* Protects reporter_list */
1740
172
1741
173
	struct devlink_rate *devlink_rate;
1742
174
};
1743
175
1744
176
struct devlink_port_new_attrs {
1745
177
	enum devlink_port_flavour flavour;
1746
178
	unsigned int port_index;
1747
179
	u32 controller;
1748
180
	u32 sfnum;
1749
181
	u16 pfnum;
1750
182
	u8 port_index_valid:1,
1751
183
	   controller_valid:1,
1752
184
	   sfnum_valid:1;
1753
90
};
185
};
1754
91
186
1755
92
struct devlink_sb_pool_info {
187
struct devlink_sb_pool_info {
1756
@@ -331,6 +426,8 @@ struct devlink_resource {
1757
331
426
1758
332
#define DEVLINK_RESOURCE_ID_PARENT_TOP 0
427
#define DEVLINK_RESOURCE_ID_PARENT_TOP 0
1759
333
428
1760
429
#define DEVLINK_RESOURCE_GENERIC_NAME_PORTS "physical_ports"
1761
430
1762
334
#define __DEVLINK_PARAM_MAX_STRING_VALUE 32
431
#define __DEVLINK_PARAM_MAX_STRING_VALUE 32
1763
335
enum devlink_param_type {
432
enum devlink_param_type {
1764
336
	DEVLINK_PARAM_TYPE_U8,
433
	DEVLINK_PARAM_TYPE_U8,
1765
@@ -354,6 +451,25 @@ struct devlink_param_gset_ctx {
1766
354
};
451
};
1767
355
452
1768
356
/**
453
/**
1769
454
 * struct devlink_flash_notify - devlink dev flash notify data
1770
455
 * @status_msg: current status string
1771
456
 * @component: firmware component being updated
1772
457
 * @done: amount of work completed of total amount
1773
458
 * @total: amount of work expected to be done
1774
459
 * @timeout: expected max timeout in seconds
1775
460
 *
1776
461
 * These are values to be given to userland to be displayed in order
1777
462
 * to show current activity in a firmware update process.
1778
463
 */
1779
464
struct devlink_flash_notify {
1780
465
	const char *status_msg;
1781
466
	const char *component;
1782
467
	unsigned long done;
1783
468
	unsigned long total;
1784
469
	unsigned long timeout;
1785
470
};
1786
471
1787
472
/**
1788
357
 * struct devlink_param - devlink configuration parameter data
473
 * struct devlink_param - devlink configuration parameter data
1789
358
 * @name: name of the parameter
474
 * @name: name of the parameter
1790
359
 * @generic: indicates if the parameter is generic or driver specific
475
 * @generic: indicates if the parameter is generic or driver specific
1791
@@ -402,6 +518,7 @@ enum devlink_param_generic_id {
1792
402
	DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY,
518
	DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY,
1793
403
	DEVLINK_PARAM_GENERIC_ID_RESET_DEV_ON_DRV_PROBE,
519
	DEVLINK_PARAM_GENERIC_ID_RESET_DEV_ON_DRV_PROBE,
1794
404
	DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE,
520
	DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE,
1795
521
	DEVLINK_PARAM_GENERIC_ID_ENABLE_REMOTE_DEV_RESET,
1796
405
522
1797
406
	/* add new param generic ids above here*/
523
	/* add new param generic ids above here*/
1798
407
	__DEVLINK_PARAM_GENERIC_ID_MAX,
524
	__DEVLINK_PARAM_GENERIC_ID_MAX,
1799
@@ -439,6 +556,9 @@ enum devlink_param_generic_id {
1800
439
#define DEVLINK_PARAM_GENERIC_ENABLE_ROCE_NAME "enable_roce"
556
#define DEVLINK_PARAM_GENERIC_ENABLE_ROCE_NAME "enable_roce"
1801
440
#define DEVLINK_PARAM_GENERIC_ENABLE_ROCE_TYPE DEVLINK_PARAM_TYPE_BOOL
557
#define DEVLINK_PARAM_GENERIC_ENABLE_ROCE_TYPE DEVLINK_PARAM_TYPE_BOOL
1802
441
558
1803
559
#define DEVLINK_PARAM_GENERIC_ENABLE_REMOTE_DEV_RESET_NAME "enable_remote_dev_reset"
1804
560
#define DEVLINK_PARAM_GENERIC_ENABLE_REMOTE_DEV_RESET_TYPE DEVLINK_PARAM_TYPE_BOOL
1805
561
1806
442
#define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate)	\
562
#define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate)	\
1807
443
{									\
563
{									\
1808
444
	.id = DEVLINK_PARAM_GENERIC_ID_##_id,				\
564
	.id = DEVLINK_PARAM_GENERIC_ID_##_id,				\
1809
@@ -478,17 +598,81 @@ enum devlink_param_generic_id {
1810
478
#define DEVLINK_INFO_VERSION_GENERIC_FW		"fw"
598
#define DEVLINK_INFO_VERSION_GENERIC_FW		"fw"
1811
479
/* Control processor FW version */
599
/* Control processor FW version */
1812
480
#define DEVLINK_INFO_VERSION_GENERIC_FW_MGMT	"fw.mgmt"
600
#define DEVLINK_INFO_VERSION_GENERIC_FW_MGMT	"fw.mgmt"
1813
601
/* FW interface specification version */
1814
602
#define DEVLINK_INFO_VERSION_GENERIC_FW_MGMT_API	"fw.mgmt.api"
1815
481
/* Data path microcode controlling high-speed packet processing */
603
/* Data path microcode controlling high-speed packet processing */
1816
482
#define DEVLINK_INFO_VERSION_GENERIC_FW_APP	"fw.app"
604
#define DEVLINK_INFO_VERSION_GENERIC_FW_APP	"fw.app"
1817
483
/* UNDI software version */
605
/* UNDI software version */
1818
484
#define DEVLINK_INFO_VERSION_GENERIC_FW_UNDI	"fw.undi"
606
#define DEVLINK_INFO_VERSION_GENERIC_FW_UNDI	"fw.undi"
1819
485
/* NCSI support/handler version */
607
/* NCSI support/handler version */
1820
486
#define DEVLINK_INFO_VERSION_GENERIC_FW_NCSI	"fw.ncsi"
608
#define DEVLINK_INFO_VERSION_GENERIC_FW_NCSI	"fw.ncsi"
1821
609
/* FW parameter set id */
1822
610
#define DEVLINK_INFO_VERSION_GENERIC_FW_PSID	"fw.psid"
1823
611
/* RoCE FW version */
1824
612
#define DEVLINK_INFO_VERSION_GENERIC_FW_ROCE	"fw.roce"
1825
613
/* Firmware bundle identifier */
1826
614
#define DEVLINK_INFO_VERSION_GENERIC_FW_BUNDLE_ID	"fw.bundle_id"
1827
615
1828
616
/**
1829
617
 * struct devlink_flash_update_params - Flash Update parameters
1830
618
 * @fw: pointer to the firmware data to update from
1831
619
 * @component: the flash component to update
1832
620
 *
1833
621
 * With the exception of fw, drivers must opt-in to parameters by
1834
622
 * setting the appropriate bit in the supported_flash_update_params field in
1835
623
 * their devlink_ops structure.
1836
624
 */
1837
625
struct devlink_flash_update_params {
1838
626
	const struct firmware *fw;
1839
627
	const char *component;
1840
628
	u32 overwrite_mask;
1841
629
};
1842
630
1843
631
#define DEVLINK_SUPPORT_FLASH_UPDATE_COMPONENT		BIT(0)
1844
632
#define DEVLINK_SUPPORT_FLASH_UPDATE_OVERWRITE_MASK	BIT(1)
1845
487
633
1846
488
struct devlink_region;
634
struct devlink_region;
1847
489
struct devlink_info_req;
635
struct devlink_info_req;
1848
490
636
1850
491
typedef void devlink_snapshot_data_dest_t(const void *data);
637
/**
1851
638
 * struct devlink_region_ops - Region operations
1852
639
 * @name: region name
1853
640
 * @destructor: callback used to free snapshot memory when deleting
1854
641
 * @snapshot: callback to request an immediate snapshot. On success,
1855
642
 *            the data variable must be updated to point to the snapshot data.
1856
643
 *            The function will be called while the devlink instance lock is
1857
644
 *            held.
1858
645
 * @priv: Pointer to driver private data for the region operation
1859
646
 */
1860
647
struct devlink_region_ops {
1861
648
	const char *name;
1862
649
	void (*destructor)(const void *data);
1863
650
	int (*snapshot)(struct devlink *devlink,
1864
651
			const struct devlink_region_ops *ops,
1865
652
			struct netlink_ext_ack *extack,
1866
653
			u8 **data);
1867
654
	void *priv;
1868
655
};
1869
656
1870
657
/**
1871
658
 * struct devlink_port_region_ops - Region operations for a port
1872
659
 * @name: region name
1873
660
 * @destructor: callback used to free snapshot memory when deleting
1874
661
 * @snapshot: callback to request an immediate snapshot. On success,
1875
662
 *            the data variable must be updated to point to the snapshot data.
1876
663
 *            The function will be called while the devlink instance lock is
1877
664
 *            held.
1878
665
 * @priv: Pointer to driver private data for the region operation
1879
666
 */
1880
667
struct devlink_port_region_ops {
1881
668
	const char *name;
1882
669
	void (*destructor)(const void *data);
1883
670
	int (*snapshot)(struct devlink_port *port,
1884
671
			const struct devlink_port_region_ops *ops,
1885
672
			struct netlink_ext_ack *extack,
1886
673
			u8 **data);
1887
674
	void *priv;
1888
675
};
1889
492
676
1890
493
struct devlink_fmsg;
677
struct devlink_fmsg;
1891
494
struct devlink_health_reporter;
678
struct devlink_health_reporter;
1892
@@ -506,16 +690,60 @@ enum devlink_health_reporter_state {
1893
506
 * @dump: callback to dump an object
690
 * @dump: callback to dump an object
1894
507
 *        if priv_ctx is NULL, run a full dump
691
 *        if priv_ctx is NULL, run a full dump
1895
508
 * @diagnose: callback to diagnose the current status
692
 * @diagnose: callback to diagnose the current status
1896
693
 * @test: callback to trigger a test event
1897
509
 */
694
 */
1898
510
695
1899
511
struct devlink_health_reporter_ops {
696
struct devlink_health_reporter_ops {
1900
512
	char *name;
697
	char *name;
1901
513
	int (*recover)(struct devlink_health_reporter *reporter,
698
	int (*recover)(struct devlink_health_reporter *reporter,
1903
514
		       void *priv_ctx);
699
		       void *priv_ctx, struct netlink_ext_ack *extack);
1904
515
	int (*dump)(struct devlink_health_reporter *reporter,
700
	int (*dump)(struct devlink_health_reporter *reporter,
1906
516
		    struct devlink_fmsg *fmsg, void *priv_ctx);
701
		    struct devlink_fmsg *fmsg, void *priv_ctx,
1907
702
		    struct netlink_ext_ack *extack);
1908
517
	int (*diagnose)(struct devlink_health_reporter *reporter,
703
	int (*diagnose)(struct devlink_health_reporter *reporter,
1910
518
			struct devlink_fmsg *fmsg);
704
			struct devlink_fmsg *fmsg,
1911
705
			struct netlink_ext_ack *extack);
1912
706
	int (*test)(struct devlink_health_reporter *reporter,
1913
707
		    struct netlink_ext_ack *extack);
1914
708
};
1915
709
1916
710
/**
1917
711
 * struct devlink_trap_metadata - Packet trap metadata.
1918
712
 * @trap_name: Trap name.
1919
713
 * @trap_group_name: Trap group name.
1920
714
 * @input_dev: Input netdevice.
1921
715
 * @fa_cookie: Flow action user cookie.
1922
716
 * @trap_type: Trap type.
1923
717
 */
1924
718
struct devlink_trap_metadata {
1925
719
	const char *trap_name;
1926
720
	const char *trap_group_name;
1927
721
	struct net_device *input_dev;
1928
722
	const struct flow_action_cookie *fa_cookie;
1929
723
	enum devlink_trap_type trap_type;
1930
724
};
1931
725
1932
726
/**
1933
727
 * struct devlink_trap_policer - Immutable packet trap policer attributes.
1934
728
 * @id: Policer identifier.
1935
729
 * @init_rate: Initial rate in packets / sec.
1936
730
 * @init_burst: Initial burst size in packets.
1937
731
 * @max_rate: Maximum rate.
1938
732
 * @min_rate: Minimum rate.
1939
733
 * @max_burst: Maximum burst size.
1940
734
 * @min_burst: Minimum burst size.
1941
735
 *
1942
736
 * Describes immutable attributes of packet trap policers that drivers register
1943
737
 * with devlink.
1944
738
 */
1945
739
struct devlink_trap_policer {
1946
740
	u32 id;
1947
741
	u64 init_rate;
1948
742
	u64 init_burst;
1949
743
	u64 max_rate;
1950
744
	u64 min_rate;
1951
745
	u64 max_burst;
1952
746
	u64 min_burst;
1953
519
};
747
};
1954
520
748
1955
521
/**
749
/**
1956
@@ -523,6 +751,7 @@ struct devlink_health_reporter_ops {
1957
523
 * @name: Trap group name.
751
 * @name: Trap group name.
1958
524
 * @id: Trap group identifier.
752
 * @id: Trap group identifier.
1959
525
 * @generic: Whether the trap group is generic or not.
753
 * @generic: Whether the trap group is generic or not.
1960
754
 * @init_policer_id: Initial policer identifier.
1961
526
 *
755
 *
1962
527
 * Describes immutable attributes of packet trap groups that drivers register
756
 * Describes immutable attributes of packet trap groups that drivers register
1963
528
 * with devlink.
757
 * with devlink.
1964
@@ -531,9 +760,11 @@ struct devlink_trap_group {
1965
531
	const char *name;
760
	const char *name;
1966
532
	u16 id;
761
	u16 id;
1967
533
	bool generic;
762
	bool generic;
1968
763
	u32 init_policer_id;
1969
534
};
764
};
1970
535
765
1971
536
#define DEVLINK_TRAP_METADATA_TYPE_F_IN_PORT	BIT(0)
766
#define DEVLINK_TRAP_METADATA_TYPE_F_IN_PORT	BIT(0)
1972
767
#define DEVLINK_TRAP_METADATA_TYPE_F_FA_COOKIE	BIT(1)
1973
537
768
1974
538
/**
769
/**
1975
539
 * struct devlink_trap - Immutable packet trap attributes.
770
 * struct devlink_trap - Immutable packet trap attributes.
1976
@@ -542,7 +773,7 @@ struct devlink_trap_group {
1977
542
 * @generic: Whether the trap is generic or not.
773
 * @generic: Whether the trap is generic or not.
1978
543
 * @id: Trap identifier.
774
 * @id: Trap identifier.
1979
544
 * @name: Trap name.
775
 * @name: Trap name.
1981
545
 * @group: Immutable packet trap group attributes.
776
 * @init_group_id: Initial group identifier.
1982
546
 * @metadata_cap: Metadata types that can be provided by the trap.
777
 * @metadata_cap: Metadata types that can be provided by the trap.
1983
547
 *
778
 *
1984
548
 * Describes immutable attributes of packet traps that drivers register with
779
 * Describes immutable attributes of packet traps that drivers register with
1985
@@ -554,12 +785,12 @@ struct devlink_trap {
1986
554
	bool generic;
785
	bool generic;
1987
555
	u16 id;
786
	u16 id;
1988
556
	const char *name;
787
	const char *name;
1990
557
	struct devlink_trap_group group;
788
	u16 init_group_id;
1991
558
	u32 metadata_cap;
789
	u32 metadata_cap;
1992
559
};
790
};
1993
560
791
1994
561
/* All traps must be documented in
792
/* All traps must be documented in
1996
562
 * Documentation/networking/devlink-trap.rst
793
 * Documentation/networking/devlink/devlink-trap.rst
1997
563
 */
794
 */
1998
564
enum devlink_trap_generic_id {
795
enum devlink_trap_generic_id {
1999
565
	DEVLINK_TRAP_GENERIC_ID_SMAC_MC,
796
	DEVLINK_TRAP_GENERIC_ID_SMAC_MC,
2000
@@ -571,6 +802,89 @@ enum devlink_trap_generic_id {
2001
571
	DEVLINK_TRAP_GENERIC_ID_BLACKHOLE_ROUTE,
802
	DEVLINK_TRAP_GENERIC_ID_BLACKHOLE_ROUTE,
2002
572
	DEVLINK_TRAP_GENERIC_ID_TTL_ERROR,
803
	DEVLINK_TRAP_GENERIC_ID_TTL_ERROR,
2003
573
	DEVLINK_TRAP_GENERIC_ID_TAIL_DROP,
804
	DEVLINK_TRAP_GENERIC_ID_TAIL_DROP,
2004
805
	DEVLINK_TRAP_GENERIC_ID_NON_IP_PACKET,
2005
806
	DEVLINK_TRAP_GENERIC_ID_UC_DIP_MC_DMAC,
2006
807
	DEVLINK_TRAP_GENERIC_ID_DIP_LB,
2007
808
	DEVLINK_TRAP_GENERIC_ID_SIP_MC,
2008
809
	DEVLINK_TRAP_GENERIC_ID_SIP_LB,
2009
810
	DEVLINK_TRAP_GENERIC_ID_CORRUPTED_IP_HDR,
2010
811
	DEVLINK_TRAP_GENERIC_ID_IPV4_SIP_BC,
2011
812
	DEVLINK_TRAP_GENERIC_ID_IPV6_MC_DIP_RESERVED_SCOPE,
2012
813
	DEVLINK_TRAP_GENERIC_ID_IPV6_MC_DIP_INTERFACE_LOCAL_SCOPE,
2013
814
	DEVLINK_TRAP_GENERIC_ID_MTU_ERROR,
2014
815
	DEVLINK_TRAP_GENERIC_ID_UNRESOLVED_NEIGH,
2015
816
	DEVLINK_TRAP_GENERIC_ID_RPF,
2016
817
	DEVLINK_TRAP_GENERIC_ID_REJECT_ROUTE,
2017
818
	DEVLINK_TRAP_GENERIC_ID_IPV4_LPM_UNICAST_MISS,
2018
819
	DEVLINK_TRAP_GENERIC_ID_IPV6_LPM_UNICAST_MISS,
2019
820
	DEVLINK_TRAP_GENERIC_ID_NON_ROUTABLE,
2020
821
	DEVLINK_TRAP_GENERIC_ID_DECAP_ERROR,
2021
822
	DEVLINK_TRAP_GENERIC_ID_OVERLAY_SMAC_MC,
2022
823
	DEVLINK_TRAP_GENERIC_ID_INGRESS_FLOW_ACTION_DROP,
2023
824
	DEVLINK_TRAP_GENERIC_ID_EGRESS_FLOW_ACTION_DROP,
2024
825
	DEVLINK_TRAP_GENERIC_ID_STP,
2025
826
	DEVLINK_TRAP_GENERIC_ID_LACP,
2026
827
	DEVLINK_TRAP_GENERIC_ID_LLDP,
2027
828
	DEVLINK_TRAP_GENERIC_ID_IGMP_QUERY,
2028
829
	DEVLINK_TRAP_GENERIC_ID_IGMP_V1_REPORT,
2029
830
	DEVLINK_TRAP_GENERIC_ID_IGMP_V2_REPORT,
2030
831
	DEVLINK_TRAP_GENERIC_ID_IGMP_V3_REPORT,
2031
832
	DEVLINK_TRAP_GENERIC_ID_IGMP_V2_LEAVE,
2032
833
	DEVLINK_TRAP_GENERIC_ID_MLD_QUERY,
2033
834
	DEVLINK_TRAP_GENERIC_ID_MLD_V1_REPORT,
2034
835
	DEVLINK_TRAP_GENERIC_ID_MLD_V2_REPORT,
2035
836
	DEVLINK_TRAP_GENERIC_ID_MLD_V1_DONE,
2036
837
	DEVLINK_TRAP_GENERIC_ID_IPV4_DHCP,
2037
838
	DEVLINK_TRAP_GENERIC_ID_IPV6_DHCP,
2038
839
	DEVLINK_TRAP_GENERIC_ID_ARP_REQUEST,
2039
840
	DEVLINK_TRAP_GENERIC_ID_ARP_RESPONSE,
2040
841
	DEVLINK_TRAP_GENERIC_ID_ARP_OVERLAY,
2041
842
	DEVLINK_TRAP_GENERIC_ID_IPV6_NEIGH_SOLICIT,
2042
843
	DEVLINK_TRAP_GENERIC_ID_IPV6_NEIGH_ADVERT,
2043
844
	DEVLINK_TRAP_GENERIC_ID_IPV4_BFD,
2044
845
	DEVLINK_TRAP_GENERIC_ID_IPV6_BFD,
2045
846
	DEVLINK_TRAP_GENERIC_ID_IPV4_OSPF,
2046
847
	DEVLINK_TRAP_GENERIC_ID_IPV6_OSPF,
2047
848
	DEVLINK_TRAP_GENERIC_ID_IPV4_BGP,
2048
849
	DEVLINK_TRAP_GENERIC_ID_IPV6_BGP,
2049
850
	DEVLINK_TRAP_GENERIC_ID_IPV4_VRRP,
2050
851
	DEVLINK_TRAP_GENERIC_ID_IPV6_VRRP,
2051
852
	DEVLINK_TRAP_GENERIC_ID_IPV4_PIM,
2052
853
	DEVLINK_TRAP_GENERIC_ID_IPV6_PIM,
2053
854
	DEVLINK_TRAP_GENERIC_ID_UC_LB,
2054
855
	DEVLINK_TRAP_GENERIC_ID_LOCAL_ROUTE,
2055
856
	DEVLINK_TRAP_GENERIC_ID_EXTERNAL_ROUTE,
2056
857
	DEVLINK_TRAP_GENERIC_ID_IPV6_UC_DIP_LINK_LOCAL_SCOPE,
2057
858
	DEVLINK_TRAP_GENERIC_ID_IPV6_DIP_ALL_NODES,
2058
859
	DEVLINK_TRAP_GENERIC_ID_IPV6_DIP_ALL_ROUTERS,
2059
860
	DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_SOLICIT,
2060
861
	DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_ADVERT,
2061
862
	DEVLINK_TRAP_GENERIC_ID_IPV6_REDIRECT,
2062
863
	DEVLINK_TRAP_GENERIC_ID_IPV4_ROUTER_ALERT,
2063
864
	DEVLINK_TRAP_GENERIC_ID_IPV6_ROUTER_ALERT,
2064
865
	DEVLINK_TRAP_GENERIC_ID_PTP_EVENT,
2065
866
	DEVLINK_TRAP_GENERIC_ID_PTP_GENERAL,
2066
867
	DEVLINK_TRAP_GENERIC_ID_FLOW_ACTION_SAMPLE,
2067
868
	DEVLINK_TRAP_GENERIC_ID_FLOW_ACTION_TRAP,
2068
869
	DEVLINK_TRAP_GENERIC_ID_EARLY_DROP,
2069
870
	DEVLINK_TRAP_GENERIC_ID_VXLAN_PARSING,
2070
871
	DEVLINK_TRAP_GENERIC_ID_LLC_SNAP_PARSING,
2071
872
	DEVLINK_TRAP_GENERIC_ID_VLAN_PARSING,
2072
873
	DEVLINK_TRAP_GENERIC_ID_PPPOE_PPP_PARSING,
2073
874
	DEVLINK_TRAP_GENERIC_ID_MPLS_PARSING,
2074
875
	DEVLINK_TRAP_GENERIC_ID_ARP_PARSING,
2075
876
	DEVLINK_TRAP_GENERIC_ID_IP_1_PARSING,
2076
877
	DEVLINK_TRAP_GENERIC_ID_IP_N_PARSING,
2077
878
	DEVLINK_TRAP_GENERIC_ID_GRE_PARSING,
2078
879
	DEVLINK_TRAP_GENERIC_ID_UDP_PARSING,
2079
880
	DEVLINK_TRAP_GENERIC_ID_TCP_PARSING,
2080
881
	DEVLINK_TRAP_GENERIC_ID_IPSEC_PARSING,
2081
882
	DEVLINK_TRAP_GENERIC_ID_SCTP_PARSING,
2082
883
	DEVLINK_TRAP_GENERIC_ID_DCCP_PARSING,
2083
884
	DEVLINK_TRAP_GENERIC_ID_GTP_PARSING,
2084
885
	DEVLINK_TRAP_GENERIC_ID_ESP_PARSING,
2085
886
	DEVLINK_TRAP_GENERIC_ID_BLACKHOLE_NEXTHOP,
2086
887
	DEVLINK_TRAP_GENERIC_ID_DMAC_FILTER,
2087
574
888
2088
575
	/* Add new generic trap IDs above */
889
	/* Add new generic trap IDs above */
2089
576
	__DEVLINK_TRAP_GENERIC_ID_MAX,
890
	__DEVLINK_TRAP_GENERIC_ID_MAX,
2090
@@ -578,12 +892,35 @@ enum devlink_trap_generic_id {
2091
578
};
892
};
2092
579
893
2093
580
/* All trap groups must be documented in
894
/* All trap groups must be documented in
2095
581
 * Documentation/networking/devlink-trap.rst
895
 * Documentation/networking/devlink/devlink-trap.rst
2096
582
 */
896
 */
2097
583
enum devlink_trap_group_generic_id {
897
enum devlink_trap_group_generic_id {
2098
584
	DEVLINK_TRAP_GROUP_GENERIC_ID_L2_DROPS,
898
	DEVLINK_TRAP_GROUP_GENERIC_ID_L2_DROPS,
2099
585
	DEVLINK_TRAP_GROUP_GENERIC_ID_L3_DROPS,
899
	DEVLINK_TRAP_GROUP_GENERIC_ID_L3_DROPS,
2100
900
	DEVLINK_TRAP_GROUP_GENERIC_ID_L3_EXCEPTIONS,
2101
586
	DEVLINK_TRAP_GROUP_GENERIC_ID_BUFFER_DROPS,
901
	DEVLINK_TRAP_GROUP_GENERIC_ID_BUFFER_DROPS,
2102
902
	DEVLINK_TRAP_GROUP_GENERIC_ID_TUNNEL_DROPS,
2103
903
	DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_DROPS,
2104
904
	DEVLINK_TRAP_GROUP_GENERIC_ID_STP,
2105
905
	DEVLINK_TRAP_GROUP_GENERIC_ID_LACP,
2106
906
	DEVLINK_TRAP_GROUP_GENERIC_ID_LLDP,
2107
907
	DEVLINK_TRAP_GROUP_GENERIC_ID_MC_SNOOPING,
2108
908
	DEVLINK_TRAP_GROUP_GENERIC_ID_DHCP,
2109
909
	DEVLINK_TRAP_GROUP_GENERIC_ID_NEIGH_DISCOVERY,
2110
910
	DEVLINK_TRAP_GROUP_GENERIC_ID_BFD,
2111
911
	DEVLINK_TRAP_GROUP_GENERIC_ID_OSPF,
2112
912
	DEVLINK_TRAP_GROUP_GENERIC_ID_BGP,
2113
913
	DEVLINK_TRAP_GROUP_GENERIC_ID_VRRP,
2114
914
	DEVLINK_TRAP_GROUP_GENERIC_ID_PIM,
2115
915
	DEVLINK_TRAP_GROUP_GENERIC_ID_UC_LB,
2116
916
	DEVLINK_TRAP_GROUP_GENERIC_ID_LOCAL_DELIVERY,
2117
917
	DEVLINK_TRAP_GROUP_GENERIC_ID_EXTERNAL_DELIVERY,
2118
918
	DEVLINK_TRAP_GROUP_GENERIC_ID_IPV6,
2119
919
	DEVLINK_TRAP_GROUP_GENERIC_ID_PTP_EVENT,
2120
920
	DEVLINK_TRAP_GROUP_GENERIC_ID_PTP_GENERAL,
2121
921
	DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_SAMPLE,
2122
922
	DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_TRAP,
2123
923
	DEVLINK_TRAP_GROUP_GENERIC_ID_PARSER_ERROR_DROPS,
2124
587
924
2125
588
	/* Add new generic trap group IDs above */
925
	/* Add new generic trap group IDs above */
2126
589
	__DEVLINK_TRAP_GROUP_GENERIC_ID_MAX,
926
	__DEVLINK_TRAP_GROUP_GENERIC_ID_MAX,
2127
@@ -609,26 +946,239 @@ enum devlink_trap_group_generic_id {
2128
609
	"ttl_value_is_too_small"
946
	"ttl_value_is_too_small"
2129
610
#define DEVLINK_TRAP_GENERIC_NAME_TAIL_DROP \
947
#define DEVLINK_TRAP_GENERIC_NAME_TAIL_DROP \
2130
611
	"tail_drop"
948
	"tail_drop"
2131
949
#define DEVLINK_TRAP_GENERIC_NAME_NON_IP_PACKET \
2132
950
	"non_ip"
2133
951
#define DEVLINK_TRAP_GENERIC_NAME_UC_DIP_MC_DMAC \
2134
952
	"uc_dip_over_mc_dmac"
2135
953
#define DEVLINK_TRAP_GENERIC_NAME_DIP_LB \
2136
954
	"dip_is_loopback_address"
2137
955
#define DEVLINK_TRAP_GENERIC_NAME_SIP_MC \
2138
956
	"sip_is_mc"
2139
957
#define DEVLINK_TRAP_GENERIC_NAME_SIP_LB \
2140
958
	"sip_is_loopback_address"
2141
959
#define DEVLINK_TRAP_GENERIC_NAME_CORRUPTED_IP_HDR \
2142
960
	"ip_header_corrupted"
2143
961
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_SIP_BC \
2144
962
	"ipv4_sip_is_limited_bc"
2145
963
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_MC_DIP_RESERVED_SCOPE \
2146
964
	"ipv6_mc_dip_reserved_scope"
2147
965
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_MC_DIP_INTERFACE_LOCAL_SCOPE \
2148
966
	"ipv6_mc_dip_interface_local_scope"
2149
967
#define DEVLINK_TRAP_GENERIC_NAME_MTU_ERROR \
2150
968
	"mtu_value_is_too_small"
2151
969
#define DEVLINK_TRAP_GENERIC_NAME_UNRESOLVED_NEIGH \
2152
970
	"unresolved_neigh"
2153
971
#define DEVLINK_TRAP_GENERIC_NAME_RPF \
2154
972
	"mc_reverse_path_forwarding"
2155
973
#define DEVLINK_TRAP_GENERIC_NAME_REJECT_ROUTE \
2156
974
	"reject_route"
2157
975
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_LPM_UNICAST_MISS \
2158
976
	"ipv4_lpm_miss"
2159
977
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_LPM_UNICAST_MISS \
2160
978
	"ipv6_lpm_miss"
2161
979
#define DEVLINK_TRAP_GENERIC_NAME_NON_ROUTABLE \
2162
980
	"non_routable_packet"
2163
981
#define DEVLINK_TRAP_GENERIC_NAME_DECAP_ERROR \
2164
982
	"decap_error"
2165
983
#define DEVLINK_TRAP_GENERIC_NAME_OVERLAY_SMAC_MC \
2166
984
	"overlay_smac_is_mc"
2167
985
#define DEVLINK_TRAP_GENERIC_NAME_INGRESS_FLOW_ACTION_DROP \
2168
986
	"ingress_flow_action_drop"
2169
987
#define DEVLINK_TRAP_GENERIC_NAME_EGRESS_FLOW_ACTION_DROP \
2170
988
	"egress_flow_action_drop"
2171
989
#define DEVLINK_TRAP_GENERIC_NAME_STP \
2172
990
	"stp"
2173
991
#define DEVLINK_TRAP_GENERIC_NAME_LACP \
2174
992
	"lacp"
2175
993
#define DEVLINK_TRAP_GENERIC_NAME_LLDP \
2176
994
	"lldp"
2177
995
#define DEVLINK_TRAP_GENERIC_NAME_IGMP_QUERY \
2178
996
	"igmp_query"
2179
997
#define DEVLINK_TRAP_GENERIC_NAME_IGMP_V1_REPORT \
2180
998
	"igmp_v1_report"
2181
999
#define DEVLINK_TRAP_GENERIC_NAME_IGMP_V2_REPORT \
2182
1000
	"igmp_v2_report"
2183
1001
#define DEVLINK_TRAP_GENERIC_NAME_IGMP_V3_REPORT \
2184
1002
	"igmp_v3_report"
2185
1003
#define DEVLINK_TRAP_GENERIC_NAME_IGMP_V2_LEAVE \
2186
1004
	"igmp_v2_leave"
2187
1005
#define DEVLINK_TRAP_GENERIC_NAME_MLD_QUERY \
2188
1006
	"mld_query"
2189
1007
#define DEVLINK_TRAP_GENERIC_NAME_MLD_V1_REPORT \
2190
1008
	"mld_v1_report"
2191
1009
#define DEVLINK_TRAP_GENERIC_NAME_MLD_V2_REPORT \
2192
1010
	"mld_v2_report"
2193
1011
#define DEVLINK_TRAP_GENERIC_NAME_MLD_V1_DONE \
2194
1012
	"mld_v1_done"
2195
1013
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_DHCP \
2196
1014
	"ipv4_dhcp"
2197
1015
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_DHCP \
2198
1016
	"ipv6_dhcp"
2199
1017
#define DEVLINK_TRAP_GENERIC_NAME_ARP_REQUEST \
2200
1018
	"arp_request"
2201
1019
#define DEVLINK_TRAP_GENERIC_NAME_ARP_RESPONSE \
2202
1020
	"arp_response"
2203
1021
#define DEVLINK_TRAP_GENERIC_NAME_ARP_OVERLAY \
2204
1022
	"arp_overlay"
2205
1023
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_NEIGH_SOLICIT \
2206
1024
	"ipv6_neigh_solicit"
2207
1025
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_NEIGH_ADVERT \
2208
1026
	"ipv6_neigh_advert"
2209
1027
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_BFD \
2210
1028
	"ipv4_bfd"
2211
1029
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_BFD \
2212
1030
	"ipv6_bfd"
2213
1031
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_OSPF \
2214
1032
	"ipv4_ospf"
2215
1033
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_OSPF \
2216
1034
	"ipv6_ospf"
2217
1035
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_BGP \
2218
1036
	"ipv4_bgp"
2219
1037
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_BGP \
2220
1038
	"ipv6_bgp"
2221
1039
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_VRRP \
2222
1040
	"ipv4_vrrp"
2223
1041
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_VRRP \
2224
1042
	"ipv6_vrrp"
2225
1043
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_PIM \
2226
1044
	"ipv4_pim"
2227
1045
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_PIM \
2228
1046
	"ipv6_pim"
2229
1047
#define DEVLINK_TRAP_GENERIC_NAME_UC_LB \
2230
1048
	"uc_loopback"
2231
1049
#define DEVLINK_TRAP_GENERIC_NAME_LOCAL_ROUTE \
2232
1050
	"local_route"
2233
1051
#define DEVLINK_TRAP_GENERIC_NAME_EXTERNAL_ROUTE \
2234
1052
	"external_route"
2235
1053
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_UC_DIP_LINK_LOCAL_SCOPE \
2236
1054
	"ipv6_uc_dip_link_local_scope"
2237
1055
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_DIP_ALL_NODES \
2238
1056
	"ipv6_dip_all_nodes"
2239
1057
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_DIP_ALL_ROUTERS \
2240
1058
	"ipv6_dip_all_routers"
2241
1059
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_ROUTER_SOLICIT \
2242
1060
	"ipv6_router_solicit"
2243
1061
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_ROUTER_ADVERT \
2244
1062
	"ipv6_router_advert"
2245
1063
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_REDIRECT \
2246
1064
	"ipv6_redirect"
2247
1065
#define DEVLINK_TRAP_GENERIC_NAME_IPV4_ROUTER_ALERT \
2248
1066
	"ipv4_router_alert"
2249
1067
#define DEVLINK_TRAP_GENERIC_NAME_IPV6_ROUTER_ALERT \
2250
1068
	"ipv6_router_alert"
2251
1069
#define DEVLINK_TRAP_GENERIC_NAME_PTP_EVENT \
2252
1070
	"ptp_event"
2253
1071
#define DEVLINK_TRAP_GENERIC_NAME_PTP_GENERAL \
2254
1072
	"ptp_general"
2255
1073
#define DEVLINK_TRAP_GENERIC_NAME_FLOW_ACTION_SAMPLE \
2256
1074
	"flow_action_sample"
2257
1075
#define DEVLINK_TRAP_GENERIC_NAME_FLOW_ACTION_TRAP \
2258
1076
	"flow_action_trap"
2259
1077
#define DEVLINK_TRAP_GENERIC_NAME_EARLY_DROP \
2260
1078
	"early_drop"
2261
1079
#define DEVLINK_TRAP_GENERIC_NAME_VXLAN_PARSING \
2262
1080
	"vxlan_parsing"
2263
1081
#define DEVLINK_TRAP_GENERIC_NAME_LLC_SNAP_PARSING \
2264
1082
	"llc_snap_parsing"
2265
1083
#define DEVLINK_TRAP_GENERIC_NAME_VLAN_PARSING \
2266
1084
	"vlan_parsing"
2267
1085
#define DEVLINK_TRAP_GENERIC_NAME_PPPOE_PPP_PARSING \
2268
1086
	"pppoe_ppp_parsing"
2269
1087
#define DEVLINK_TRAP_GENERIC_NAME_MPLS_PARSING \
2270
1088
	"mpls_parsing"
2271
1089
#define DEVLINK_TRAP_GENERIC_NAME_ARP_PARSING \
2272
1090
	"arp_parsing"
2273
1091
#define DEVLINK_TRAP_GENERIC_NAME_IP_1_PARSING \
2274
1092
	"ip_1_parsing"
2275
1093
#define DEVLINK_TRAP_GENERIC_NAME_IP_N_PARSING \
2276
1094
	"ip_n_parsing"
2277
1095
#define DEVLINK_TRAP_GENERIC_NAME_GRE_PARSING \
2278
1096
	"gre_parsing"
2279
1097
#define DEVLINK_TRAP_GENERIC_NAME_UDP_PARSING \
2280
1098
	"udp_parsing"
2281
1099
#define DEVLINK_TRAP_GENERIC_NAME_TCP_PARSING \
2282
1100
	"tcp_parsing"
2283
1101
#define DEVLINK_TRAP_GENERIC_NAME_IPSEC_PARSING \
2284
1102
	"ipsec_parsing"
2285
1103
#define DEVLINK_TRAP_GENERIC_NAME_SCTP_PARSING \
2286
1104
	"sctp_parsing"
2287
1105
#define DEVLINK_TRAP_GENERIC_NAME_DCCP_PARSING \
2288
1106
	"dccp_parsing"
2289
1107
#define DEVLINK_TRAP_GENERIC_NAME_GTP_PARSING \
2290
1108
	"gtp_parsing"
2291
1109
#define DEVLINK_TRAP_GENERIC_NAME_ESP_PARSING \
2292
1110
	"esp_parsing"
2293
1111
#define DEVLINK_TRAP_GENERIC_NAME_BLACKHOLE_NEXTHOP \
2294
1112
	"blackhole_nexthop"
2295
1113
#define DEVLINK_TRAP_GENERIC_NAME_DMAC_FILTER \
2296
1114
	"dmac_filter"
2297
612
1115
2298
613
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_L2_DROPS \
1116
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_L2_DROPS \
2299
614
	"l2_drops"
1117
	"l2_drops"
2300
615
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_L3_DROPS \
1118
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_L3_DROPS \
2301
616
	"l3_drops"
1119
	"l3_drops"
2302
1120
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_L3_EXCEPTIONS \
2303
1121
	"l3_exceptions"
2304
617
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_BUFFER_DROPS \
1122
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_BUFFER_DROPS \
2305
618
	"buffer_drops"
1123
	"buffer_drops"
2308
619
1124
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_TUNNEL_DROPS \
2309
620
#define DEVLINK_TRAP_GENERIC(_type, _init_action, _id, _group, _metadata_cap) \
1125
	"tunnel_drops"
2310
1126
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_ACL_DROPS \
2311
1127
	"acl_drops"
2312
1128
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_STP \
2313
1129
	"stp"
2314
1130
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_LACP \
2315
1131
	"lacp"
2316
1132
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_LLDP \
2317
1133
	"lldp"
2318
1134
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_MC_SNOOPING  \
2319
1135
	"mc_snooping"
2320
1136
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_DHCP \
2321
1137
	"dhcp"
2322
1138
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_NEIGH_DISCOVERY \
2323
1139
	"neigh_discovery"
2324
1140
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_BFD \
2325
1141
	"bfd"
2326
1142
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_OSPF \
2327
1143
	"ospf"
2328
1144
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_BGP \
2329
1145
	"bgp"
2330
1146
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_VRRP \
2331
1147
	"vrrp"
2332
1148
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_PIM \
2333
1149
	"pim"
2334
1150
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_UC_LB \
2335
1151
	"uc_loopback"
2336
1152
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_LOCAL_DELIVERY \
2337
1153
	"local_delivery"
2338
1154
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_EXTERNAL_DELIVERY \
2339
1155
	"external_delivery"
2340
1156
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_IPV6 \
2341
1157
	"ipv6"
2342
1158
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_PTP_EVENT \
2343
1159
	"ptp_event"
2344
1160
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_PTP_GENERAL \
2345
1161
	"ptp_general"
2346
1162
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_ACL_SAMPLE \
2347
1163
	"acl_sample"
2348
1164
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_ACL_TRAP \
2349
1165
	"acl_trap"
2350
1166
#define DEVLINK_TRAP_GROUP_GENERIC_NAME_PARSER_ERROR_DROPS \
2351
1167
	"parser_error_drops"
2352
1168
2353
1169
#define DEVLINK_TRAP_GENERIC(_type, _init_action, _id, _group_id,	      \
2354
1170
			     _metadata_cap)				      \
2355
621
	{								      \
1171
	{								      \
2356
622
		.type = DEVLINK_TRAP_TYPE_##_type,			      \
1172
		.type = DEVLINK_TRAP_TYPE_##_type,			      \
2357
623
		.init_action = DEVLINK_TRAP_ACTION_##_init_action,	      \
1173
		.init_action = DEVLINK_TRAP_ACTION_##_init_action,	      \
2358
624
		.generic = true,					      \
1174
		.generic = true,					      \
2359
625
		.id = DEVLINK_TRAP_GENERIC_ID_##_id,			      \
1175
		.id = DEVLINK_TRAP_GENERIC_ID_##_id,			      \
2360
626
		.name = DEVLINK_TRAP_GENERIC_NAME_##_id,		      \
1176
		.name = DEVLINK_TRAP_GENERIC_NAME_##_id,		      \
2362
627
		.group = _group,					      \
1177
		.init_group_id = _group_id,				      \
2363
628
		.metadata_cap = _metadata_cap,				      \
1178
		.metadata_cap = _metadata_cap,				      \
2364
629
	}
1179
	}
2365
630
1180
2367
631
#define DEVLINK_TRAP_DRIVER(_type, _init_action, _id, _name, _group,	      \
1181
#define DEVLINK_TRAP_DRIVER(_type, _init_action, _id, _name, _group_id,	      \
2368
632
			    _metadata_cap)				      \
1182
			    _metadata_cap)				      \
2369
633
	{								      \
1183
	{								      \
2370
634
		.type = DEVLINK_TRAP_TYPE_##_type,			      \
1184
		.type = DEVLINK_TRAP_TYPE_##_type,			      \
2371
@@ -636,21 +1186,45 @@ enum devlink_trap_group_generic_id {
2372
636
		.generic = false,					      \
1186
		.generic = false,					      \
2373
637
		.id = _id,						      \
1187
		.id = _id,						      \
2374
638
		.name = _name,						      \
1188
		.name = _name,						      \
2376
639
		.group = _group,					      \
1189
		.init_group_id = _group_id,				      \
2377
640
		.metadata_cap = _metadata_cap,				      \
1190
		.metadata_cap = _metadata_cap,				      \
2378
641
	}
1191
	}
2379
642
1192
2381
643
#define DEVLINK_TRAP_GROUP_GENERIC(_id)					      \
1193
#define DEVLINK_TRAP_GROUP_GENERIC(_id, _policer_id)			      \
2382
644
	{								      \
1194
	{								      \
2383
645
		.name = DEVLINK_TRAP_GROUP_GENERIC_NAME_##_id,		      \
1195
		.name = DEVLINK_TRAP_GROUP_GENERIC_NAME_##_id,		      \
2384
646
		.id = DEVLINK_TRAP_GROUP_GENERIC_ID_##_id,		      \
1196
		.id = DEVLINK_TRAP_GROUP_GENERIC_ID_##_id,		      \
2385
647
		.generic = true,					      \
1197
		.generic = true,					      \
2386
1198
		.init_policer_id = _policer_id,				      \
2387
1199
	}
2388
1200
2389
1201
#define DEVLINK_TRAP_POLICER(_id, _rate, _burst, _max_rate, _min_rate,	      \
2390
1202
			     _max_burst, _min_burst)			      \
2391
1203
	{								      \
2392
1204
		.id = _id,						      \
2393
1205
		.init_rate = _rate,					      \
2394
1206
		.init_burst = _burst,					      \
2395
1207
		.max_rate = _max_rate,					      \
2396
1208
		.min_rate = _min_rate,					      \
2397
1209
		.max_burst = _max_burst,				      \
2398
1210
		.min_burst = _min_burst,				      \
2399
648
	}
1211
	}
2400
649
1212
2401
650
struct devlink_ops {
1213
struct devlink_ops {
2403
651
	int (*reload_down)(struct devlink *devlink,
1214
	/**
2404
1215
	 * @supported_flash_update_params:
2405
1216
	 * mask of parameters supported by the driver's .flash_update
2406
1217
	 * implemementation.
2407
1218
	 */
2408
1219
	u32 supported_flash_update_params;
2409
1220
	unsigned long reload_actions;
2410
1221
	unsigned long reload_limits;
2411
1222
	int (*reload_down)(struct devlink *devlink, bool netns_change,
2412
1223
			   enum devlink_reload_action action,
2413
1224
			   enum devlink_reload_limit limit,
2414
652
			   struct netlink_ext_ack *extack);
1225
			   struct netlink_ext_ack *extack);
2416
653
	int (*reload_up)(struct devlink *devlink,
1226
	int (*reload_up)(struct devlink *devlink, enum devlink_reload_action action,
2417
1227
			 enum devlink_reload_limit limit, u32 *actions_performed,
2418
654
			 struct netlink_ext_ack *extack);
1228
			 struct netlink_ext_ack *extack);
2419
655
	int (*port_type_set)(struct devlink_port *devlink_port,
1229
	int (*port_type_set)(struct devlink_port *devlink_port,
2420
656
			     enum devlink_port_type port_type);
1230
			     enum devlink_port_type port_type);
2421
@@ -708,8 +1282,15 @@ struct devlink_ops {
2422
708
				      struct netlink_ext_ack *extack);
1282
				      struct netlink_ext_ack *extack);
2423
709
	int (*info_get)(struct devlink *devlink, struct devlink_info_req *req,
1283
	int (*info_get)(struct devlink *devlink, struct devlink_info_req *req,
2424
710
			struct netlink_ext_ack *extack);
1284
			struct netlink_ext_ack *extack);
2427
711
	int (*flash_update)(struct devlink *devlink, const char *file_name,
1285
	/**
2428
712
			    const char *component,
1286
	 * @flash_update: Device flash update function
2429
1287
	 *
2430
1288
	 * Used to perform a flash update for the device. The set of
2431
1289
	 * parameters supported by the driver should be set in
2432
1290
	 * supported_flash_update_params.
2433
1291
	 */
2434
1292
	int (*flash_update)(struct devlink *devlink,
2435
1293
			    struct devlink_flash_update_params *params,
2436
713
			    struct netlink_ext_ack *extack);
1294
			    struct netlink_ext_ack *extack);
2437
714
	/**
1295
	/**
2438
715
	 * @trap_init: Trap initialization function.
1296
	 * @trap_init: Trap initialization function.
2439
@@ -734,7 +1315,8 @@ struct devlink_ops {
2440
734
	 */
1315
	 */
2441
735
	int (*trap_action_set)(struct devlink *devlink,
1316
	int (*trap_action_set)(struct devlink *devlink,
2442
736
			       const struct devlink_trap *trap,
1317
			       const struct devlink_trap *trap,
2444
737
			       enum devlink_trap_action action);
1318
			       enum devlink_trap_action action,
2445
1319
			       struct netlink_ext_ack *extack);
2446
738
	/**
1320
	/**
2447
739
	 * @trap_group_init: Trap group initialization function.
1321
	 * @trap_group_init: Trap group initialization function.
2448
740
	 *
1322
	 *
2449
@@ -743,6 +1325,187 @@ struct devlink_ops {
2450
743
	 */
1325
	 */
2451
744
	int (*trap_group_init)(struct devlink *devlink,
1326
	int (*trap_group_init)(struct devlink *devlink,
2452
745
			       const struct devlink_trap_group *group);
1327
			       const struct devlink_trap_group *group);
2453
1328
	/**
2454
1329
	 * @trap_group_set: Trap group parameters set function.
2455
1330
	 *
2456
1331
	 * Note: @policer can be NULL when a policer is being unbound from
2457
1332
	 * @group.
2458
1333
	 */
2459
1334
	int (*trap_group_set)(struct devlink *devlink,
2460
1335
			      const struct devlink_trap_group *group,
2461
1336
			      const struct devlink_trap_policer *policer,
2462
1337
			      struct netlink_ext_ack *extack);
2463
1338
	/**
2464
1339
	 * @trap_group_action_set: Trap group action set function.
2465
1340
	 *
2466
1341
	 * If this callback is populated, it will take precedence over looping
2467
1342
	 * over all traps in a group and calling .trap_action_set().
2468
1343
	 */
2469
1344
	int (*trap_group_action_set)(struct devlink *devlink,
2470
1345
				     const struct devlink_trap_group *group,
2471
1346
				     enum devlink_trap_action action,
2472
1347
				     struct netlink_ext_ack *extack);
2473
1348
	/**
2474
1349
	 * @trap_drop_counter_get: Trap drop counter get function.
2475
1350
	 *
2476
1351
	 * Should be used by device drivers to report number of packets
2477
1352
	 * that have been dropped, and cannot be passed to the devlink
2478
1353
	 * subsystem by the underlying device.
2479
1354
	 */
2480
1355
	int (*trap_drop_counter_get)(struct devlink *devlink,
2481
1356
				     const struct devlink_trap *trap,
2482
1357
				     u64 *p_drops);
2483
1358
	/**
2484
1359
	 * @trap_policer_init: Trap policer initialization function.
2485
1360
	 *
2486
1361
	 * Should be used by device drivers to initialize the trap policer in
2487
1362
	 * the underlying device.
2488
1363
	 */
2489
1364
	int (*trap_policer_init)(struct devlink *devlink,
2490
1365
				 const struct devlink_trap_policer *policer);
2491
1366
	/**
2492
1367
	 * @trap_policer_fini: Trap policer de-initialization function.
2493
1368
	 *
2494
1369
	 * Should be used by device drivers to de-initialize the trap policer
2495
1370
	 * in the underlying device.
2496
1371
	 */
2497
1372
	void (*trap_policer_fini)(struct devlink *devlink,
2498
1373
				  const struct devlink_trap_policer *policer);
2499
1374
	/**
2500
1375
	 * @trap_policer_set: Trap policer parameters set function.
2501
1376
	 */
2502
1377
	int (*trap_policer_set)(struct devlink *devlink,
2503
1378
				const struct devlink_trap_policer *policer,
2504
1379
				u64 rate, u64 burst,
2505
1380
				struct netlink_ext_ack *extack);
2506
1381
	/**
2507
1382
	 * @trap_policer_counter_get: Trap policer counter get function.
2508
1383
	 *
2509
1384
	 * Should be used by device drivers to report number of packets dropped
2510
1385
	 * by the policer.
2511
1386
	 */
2512
1387
	int (*trap_policer_counter_get)(struct devlink *devlink,
2513
1388
					const struct devlink_trap_policer *policer,
2514
1389
					u64 *p_drops);
2515
1390
	/**
2516
1391
	 * @port_function_hw_addr_get: Port function's hardware address get function.
2517
1392
	 *
2518
1393
	 * Should be used by device drivers to report the hardware address of a function managed
2519
1394
	 * by the devlink port. Driver should return -EOPNOTSUPP if it doesn't support port
2520
1395
	 * function handling for a particular port.
2521
1396
	 *
2522
1397
	 * Note: @extack can be NULL when port notifier queries the port function.
2523
1398
	 */
2524
1399
	int (*port_function_hw_addr_get)(struct devlink *devlink, struct devlink_port *port,
2525
1400
					 u8 *hw_addr, int *hw_addr_len,
2526
1401
					 struct netlink_ext_ack *extack);
2527
1402
	/**
2528
1403
	 * @port_function_hw_addr_set: Port function's hardware address set function.
2529
1404
	 *
2530
1405
	 * Should be used by device drivers to set the hardware address of a function managed
2531
1406
	 * by the devlink port. Driver should return -EOPNOTSUPP if it doesn't support port
2532
1407
	 * function handling for a particular port.
2533
1408
	 */
2534
1409
	int (*port_function_hw_addr_set)(struct devlink *devlink, struct devlink_port *port,
2535
1410
					 const u8 *hw_addr, int hw_addr_len,
2536
1411
					 struct netlink_ext_ack *extack);
2537
1412
	/**
2538
1413
	 * port_new() - Add a new port function of a specified flavor
2539
1414
	 * @devlink: Devlink instance
2540
1415
	 * @attrs: attributes of the new port
2541
1416
	 * @extack: extack for reporting error messages
2542
1417
	 * @new_port_index: index of the new port
2543
1418
	 *
2544
1419
	 * Devlink core will call this device driver function upon user request
2545
1420
	 * to create a new port function of a specified flavor and optional
2546
1421
	 * attributes
2547
1422
	 *
2548
1423
	 * Notes:
2549
1424
	 *	- Called without devlink instance lock being held. Drivers must
2550
1425
	 *	  implement own means of synchronization
2551
1426
	 *	- On success, drivers must register a port with devlink core
2552
1427
	 *
2553
1428
	 * Return: 0 on success, negative value otherwise.
2554
1429
	 */
2555
1430
	int (*port_new)(struct devlink *devlink,
2556
1431
			const struct devlink_port_new_attrs *attrs,
2557
1432
			struct netlink_ext_ack *extack,
2558
1433
			unsigned int *new_port_index);
2559
1434
	/**
2560
1435
	 * port_del() - Delete a port function
2561
1436
	 * @devlink: Devlink instance
2562
1437
	 * @port_index: port function index to delete
2563
1438
	 * @extack: extack for reporting error messages
2564
1439
	 *
2565
1440
	 * Devlink core will call this device driver function upon user request
2566
1441
	 * to delete a previously created port function
2567
1442
	 *
2568
1443
	 * Notes:
2569
1444
	 *	- Called without devlink instance lock being held. Drivers must
2570
1445
	 *	  implement own means of synchronization
2571
1446
	 *	- On success, drivers must unregister the corresponding devlink
2572
1447
	 *	  port
2573
1448
	 *
2574
1449
	 * Return: 0 on success, negative value otherwise.
2575
1450
	 */
2576
1451
	int (*port_del)(struct devlink *devlink, unsigned int port_index,
2577
1452
			struct netlink_ext_ack *extack);
2578
1453
	/**
2579
1454
	 * port_fn_state_get() - Get the state of a port function
2580
1455
	 * @devlink: Devlink instance
2581
1456
	 * @port: The devlink port
2582
1457
	 * @state: Admin configured state
2583
1458
	 * @opstate: Current operational state
2584
1459
	 * @extack: extack for reporting error messages
2585
1460
	 *
2586
1461
	 * Reports the admin and operational state of a devlink port function
2587
1462
	 *
2588
1463
	 * Return: 0 on success, negative value otherwise.
2589
1464
	 */
2590
1465
	int (*port_fn_state_get)(struct devlink *devlink,
2591
1466
				 struct devlink_port *port,
2592
1467
				 enum devlink_port_fn_state *state,
2593
1468
				 enum devlink_port_fn_opstate *opstate,
2594
1469
				 struct netlink_ext_ack *extack);
2595
1470
	/**
2596
1471
	 * port_fn_state_set() - Set the admin state of a port function
2597
1472
	 * @devlink: Devlink instance
2598
1473
	 * @port: The devlink port
2599
1474
	 * @state: Admin state
2600
1475
	 * @extack: extack for reporting error messages
2601
1476
	 *
2602
1477
	 * Set the admin state of a devlink port function
2603
1478
	 *
2604
1479
	 * Return: 0 on success, negative value otherwise.
2605
1480
	 */
2606
1481
	int (*port_fn_state_set)(struct devlink *devlink,
2607
1482
				 struct devlink_port *port,
2608
1483
				 enum devlink_port_fn_state state,
2609
1484
				 struct netlink_ext_ack *extack);
2610
1485
2611
1486
	/**
2612
1487
	 * Rate control callbacks.
2613
1488
	 */
2614
1489
	int (*rate_leaf_tx_share_set)(struct devlink_rate *devlink_rate, void *priv,
2615
1490
				      u64 tx_share, struct netlink_ext_ack *extack);
2616
1491
	int (*rate_leaf_tx_max_set)(struct devlink_rate *devlink_rate, void *priv,
2617
1492
				    u64 tx_max, struct netlink_ext_ack *extack);
2618
1493
	int (*rate_node_tx_share_set)(struct devlink_rate *devlink_rate, void *priv,
2619
1494
				      u64 tx_share, struct netlink_ext_ack *extack);
2620
1495
	int (*rate_node_tx_max_set)(struct devlink_rate *devlink_rate, void *priv,
2621
1496
				    u64 tx_max, struct netlink_ext_ack *extack);
2622
1497
	int (*rate_node_new)(struct devlink_rate *rate_node, void **priv,
2623
1498
			     struct netlink_ext_ack *extack);
2624
1499
	int (*rate_node_del)(struct devlink_rate *rate_node, void *priv,
2625
1500
			     struct netlink_ext_ack *extack);
2626
1501
	int (*rate_leaf_parent_set)(struct devlink_rate *child,
2627
1502
				    struct devlink_rate *parent,
2628
1503
				    void *priv_child, void *priv_parent,
2629
1504
				    struct netlink_ext_ack *extack);
2630
1505
	int (*rate_node_parent_set)(struct devlink_rate *child,
2631
1506
				    struct devlink_rate *parent,
2632
1507
				    void *priv_child, void *priv_parent,
2633
1508
				    struct netlink_ext_ack *extack);
2634
746
};
1509
};
2635
747
1510
2636
748
static inline void *devlink_priv(struct devlink *devlink)
1511
static inline void *devlink_priv(struct devlink *devlink)
2637
@@ -776,7 +1539,19 @@ static inline struct devlink *netdev_to_devlink(struct net_device *dev)
2638
776
1539
2639
777
struct ib_device;
1540
struct ib_device;
2640
778
1541
2642
779
struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size);
1542
struct net *devlink_net(const struct devlink *devlink);
2643
1543
/* This call is intended for software devices that can create
2644
1544
 * devlink instances in other namespaces than init_net.
2645
1545
 *
2646
1546
 * Drivers that operate on real HW must use devlink_alloc() instead.
2647
1547
 */
2648
1548
struct devlink *devlink_alloc_ns(const struct devlink_ops *ops,
2649
1549
				 size_t priv_size, struct net *net);
2650
1550
static inline struct devlink *devlink_alloc(const struct devlink_ops *ops,
2651
1551
					    size_t priv_size)
2652
1552
{
2653
1553
	return devlink_alloc_ns(ops, priv_size, &init_net);
2654
1554
}
2655
780
int devlink_register(struct devlink *devlink, struct device *dev);
1555
int devlink_register(struct devlink *devlink, struct device *dev);
2656
781
void devlink_unregister(struct devlink *devlink);
1556
void devlink_unregister(struct devlink *devlink);
2657
782
void devlink_reload_enable(struct devlink *devlink);
1557
void devlink_reload_enable(struct devlink *devlink);
2658
@@ -792,18 +1567,17 @@ void devlink_port_type_ib_set(struct devlink_port *devlink_port,
2659
792
			      struct ib_device *ibdev);
1567
			      struct ib_device *ibdev);
2660
793
void devlink_port_type_clear(struct devlink_port *devlink_port);
1568
void devlink_port_type_clear(struct devlink_port *devlink_port);
2661
794
void devlink_port_attrs_set(struct devlink_port *devlink_port,
1569
void devlink_port_attrs_set(struct devlink_port *devlink_port,
2674
795
			    enum devlink_port_flavour flavour,
1570
			    struct devlink_port_attrs *devlink_port_attrs);
2675
796
			    u32 port_number, bool split,
1571
void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u32 controller,
2676
797
			    u32 split_subport_number,
1572
				   u16 pf, bool external);
2677
798
			    const unsigned char *switch_id,
1573
void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 controller,
2678
799
			    unsigned char switch_id_len);
1574
				   u16 pf, u16 vf, bool external);
2679
800
void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port,
1575
void devlink_port_attrs_pci_sf_set(struct devlink_port *devlink_port,
2680
801
				   const unsigned char *switch_id,
1576
				   u32 controller, u16 pf, u32 sf,
2681
802
				   unsigned char switch_id_len, u16 pf);
1577
				   bool external);
2682
803
void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port,
1578
int devlink_rate_leaf_create(struct devlink_port *port, void *priv);
2683
804
				   const unsigned char *switch_id,
1579
void devlink_rate_leaf_destroy(struct devlink_port *devlink_port);
2684
805
				   unsigned char switch_id_len,
1580
void devlink_rate_nodes_destroy(struct devlink *devlink);
2673
806
				   u16 pf, u16 vf);
2685
807
int devlink_sb_register(struct devlink *devlink, unsigned int sb_index,
1581
int devlink_sb_register(struct devlink *devlink, unsigned int sb_index,
2686
808
			u32 size, u16 ingress_pools_count,
1582
			u32 size, u16 ingress_pools_count,
2687
809
			u16 egress_pools_count, u16 ingress_tc_count,
1583
			u16 egress_pools_count, u16 ingress_tc_count,
2688
@@ -883,19 +1657,27 @@ void devlink_port_param_value_changed(struct devlink_port *devlink_port,
2689
883
				      u32 param_id);
1657
				      u32 param_id);
2690
884
void devlink_param_value_str_fill(union devlink_param_value *dst_val,
1658
void devlink_param_value_str_fill(union devlink_param_value *dst_val,
2691
885
				  const char *src);
1659
				  const char *src);
2696
886
struct devlink_region *devlink_region_create(struct devlink *devlink,
1660
struct devlink_region *
2697
887
					     const char *region_name,
1661
devlink_region_create(struct devlink *devlink,
2698
888
					     u32 region_max_snapshots,
1662
		      const struct devlink_region_ops *ops,
2699
889
					     u64 region_size);
1663
		      u32 region_max_snapshots, u64 region_size);
2700
1664
struct devlink_region *
2701
1665
devlink_port_region_create(struct devlink_port *port,
2702
1666
			   const struct devlink_port_region_ops *ops,
2703
1667
			   u32 region_max_snapshots, u64 region_size);
2704
890
void devlink_region_destroy(struct devlink_region *region);
1668
void devlink_region_destroy(struct devlink_region *region);
2706
891
u32 devlink_region_shapshot_id_get(struct devlink *devlink);
1669
void devlink_port_region_destroy(struct devlink_region *region);
2707
1670
2708
1671
int devlink_region_snapshot_id_get(struct devlink *devlink, u32 *id);
2709
1672
void devlink_region_snapshot_id_put(struct devlink *devlink, u32 id);
2710
892
int devlink_region_snapshot_create(struct devlink_region *region,
1673
int devlink_region_snapshot_create(struct devlink_region *region,
2713
893
				   u8 *data, u32 snapshot_id,
1674
				   u8 *data, u32 snapshot_id);
2712
894
				   devlink_snapshot_data_dest_t *data_destructor);
2714
895
int devlink_info_serial_number_put(struct devlink_info_req *req,
1675
int devlink_info_serial_number_put(struct devlink_info_req *req,
2715
896
				   const char *sn);
1676
				   const char *sn);
2716
897
int devlink_info_driver_name_put(struct devlink_info_req *req,
1677
int devlink_info_driver_name_put(struct devlink_info_req *req,
2717
898
				 const char *name);
1678
				 const char *name);
2718
1679
int devlink_info_board_serial_number_put(struct devlink_info_req *req,
2719
1680
					 const char *bsn);
2720
899
int devlink_info_version_fixed_put(struct devlink_info_req *req,
1681
int devlink_info_version_fixed_put(struct devlink_info_req *req,
2721
900
				   const char *version_name,
1682
				   const char *version_name,
2722
901
				   const char *version_value);
1683
				   const char *version_value);
2723
@@ -915,6 +1697,9 @@ int devlink_fmsg_pair_nest_end(struct devlink_fmsg *fmsg);
2724
915
int devlink_fmsg_arr_pair_nest_start(struct devlink_fmsg *fmsg,
1697
int devlink_fmsg_arr_pair_nest_start(struct devlink_fmsg *fmsg,
2725
916
				     const char *name);
1698
				     const char *name);
2726
917
int devlink_fmsg_arr_pair_nest_end(struct devlink_fmsg *fmsg);
1699
int devlink_fmsg_arr_pair_nest_end(struct devlink_fmsg *fmsg);
2727
1700
int devlink_fmsg_binary_pair_nest_start(struct devlink_fmsg *fmsg,
2728
1701
					const char *name);
2729
1702
int devlink_fmsg_binary_pair_nest_end(struct devlink_fmsg *fmsg);
2730
918
1703
2731
919
int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value);
1704
int devlink_fmsg_bool_put(struct devlink_fmsg *fmsg, bool value);
2732
920
int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value);
1705
int devlink_fmsg_u8_put(struct devlink_fmsg *fmsg, u8 value);
2733
@@ -935,16 +1720,24 @@ int devlink_fmsg_u64_pair_put(struct devlink_fmsg *fmsg, const char *name,
2734
935
int devlink_fmsg_string_pair_put(struct devlink_fmsg *fmsg, const char *name,
1720
int devlink_fmsg_string_pair_put(struct devlink_fmsg *fmsg, const char *name,
2735
936
				 const char *value);
1721
				 const char *value);
2736
937
int devlink_fmsg_binary_pair_put(struct devlink_fmsg *fmsg, const char *name,
1722
int devlink_fmsg_binary_pair_put(struct devlink_fmsg *fmsg, const char *name,
2738
938
				 const void *value, u16 value_len);
1723
				 const void *value, u32 value_len);
2739
939
1724
2740
940
struct devlink_health_reporter *
1725
struct devlink_health_reporter *
2741
941
devlink_health_reporter_create(struct devlink *devlink,
1726
devlink_health_reporter_create(struct devlink *devlink,
2742
942
			       const struct devlink_health_reporter_ops *ops,
1727
			       const struct devlink_health_reporter_ops *ops,
2745
943
			       u64 graceful_period, bool auto_recover,
1728
			       u64 graceful_period, void *priv);
2746
944
			       void *priv);
1729
2747
1730
struct devlink_health_reporter *
2748
1731
devlink_port_health_reporter_create(struct devlink_port *port,
2749
1732
				    const struct devlink_health_reporter_ops *ops,
2750
1733
				    u64 graceful_period, void *priv);
2751
1734
2752
945
void
1735
void
2753
946
devlink_health_reporter_destroy(struct devlink_health_reporter *reporter);
1736
devlink_health_reporter_destroy(struct devlink_health_reporter *reporter);
2754
947
1737
2755
1738
void
2756
1739
devlink_port_health_reporter_destroy(struct devlink_health_reporter *reporter);
2757
1740
2758
948
void *
1741
void *
2759
949
devlink_health_reporter_priv(struct devlink_health_reporter *reporter);
1742
devlink_health_reporter_priv(struct devlink_health_reporter *reporter);
2760
950
int devlink_health_report(struct devlink_health_reporter *reporter,
1743
int devlink_health_report(struct devlink_health_reporter *reporter,
2761
@@ -952,16 +1745,23 @@ int devlink_health_report(struct devlink_health_reporter *reporter,
2762
952
void
1745
void
2763
953
devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,
1746
devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,
2764
954
				     enum devlink_health_reporter_state state);
1747
				     enum devlink_health_reporter_state state);
2765
1748
void
2766
1749
devlink_health_reporter_recovery_done(struct devlink_health_reporter *reporter);
2767
955
1750
2768
956
bool devlink_is_reload_failed(const struct devlink *devlink);
1751
bool devlink_is_reload_failed(const struct devlink *devlink);
2769
1752
void devlink_remote_reload_actions_performed(struct devlink *devlink,
2770
1753
					     enum devlink_reload_limit limit,
2771
1754
					     u32 actions_performed);
2772
957
1755
2773
958
void devlink_flash_update_begin_notify(struct devlink *devlink);
2774
959
void devlink_flash_update_end_notify(struct devlink *devlink);
2775
960
void devlink_flash_update_status_notify(struct devlink *devlink,
1756
void devlink_flash_update_status_notify(struct devlink *devlink,
2776
961
					const char *status_msg,
1757
					const char *status_msg,
2777
962
					const char *component,
1758
					const char *component,
2778
963
					unsigned long done,
1759
					unsigned long done,
2779
964
					unsigned long total);
1760
					unsigned long total);
2780
1761
void devlink_flash_update_timeout_notify(struct devlink *devlink,
2781
1762
					 const char *status_msg,
2782
1763
					 const char *component,
2783
1764
					 unsigned long timeout);
2784
965
1765
2785
966
int devlink_traps_register(struct devlink *devlink,
1766
int devlink_traps_register(struct devlink *devlink,
2786
967
			   const struct devlink_trap *traps,
1767
			   const struct devlink_trap *traps,
2787
@@ -969,10 +1769,24 @@ int devlink_traps_register(struct devlink *devlink,
2788
969
void devlink_traps_unregister(struct devlink *devlink,
1769
void devlink_traps_unregister(struct devlink *devlink,
2789
970
			      const struct devlink_trap *traps,
1770
			      const struct devlink_trap *traps,
2790
971
			      size_t traps_count);
1771
			      size_t traps_count);
2794
972
void devlink_trap_report(struct devlink *devlink,
1772
void devlink_trap_report(struct devlink *devlink, struct sk_buff *skb,
2795
973
			 struct sk_buff *skb, void *trap_ctx,
1773
			 void *trap_ctx, struct devlink_port *in_devlink_port,
2796
974
			 struct devlink_port *in_devlink_port);
1774
			 const struct flow_action_cookie *fa_cookie);
2797
975
void *devlink_trap_ctx_priv(void *trap_ctx);
1775
void *devlink_trap_ctx_priv(void *trap_ctx);
2798
1776
int devlink_trap_groups_register(struct devlink *devlink,
2799
1777
				 const struct devlink_trap_group *groups,
2800
1778
				 size_t groups_count);
2801
1779
void devlink_trap_groups_unregister(struct devlink *devlink,
2802
1780
				    const struct devlink_trap_group *groups,
2803
1781
				    size_t groups_count);
2804
1782
int
2805
1783
devlink_trap_policers_register(struct devlink *devlink,
2806
1784
			       const struct devlink_trap_policer *policers,
2807
1785
			       size_t policers_count);
2808
1786
void
2809
1787
devlink_trap_policers_unregister(struct devlink *devlink,
2810
1788
				 const struct devlink_trap_policer *policers,
2811
1789
				 size_t policers_count);
2812
976
1790
2813
977
#if IS_ENABLED(CONFIG_NET_DEVLINK)
1791
#if IS_ENABLED(CONFIG_NET_DEVLINK)
2814
978
1792
2815
diff --git a/include/net/drop_monitor.h b/include/net/drop_monitor.h
2816
979
deleted file mode 100644
1793
deleted file mode 100644
2817
index f68bc37..0000000
2818
--- a/include/net/drop_monitor.h
2819
+++ /dev/null
2820
@@ -1,33 +0,0 @@
2821
1
/* SPDX-License-Identifier: GPL-2.0-only */
2822
2
2823
3
#ifndef _NET_DROP_MONITOR_H_
2824
4
#define _NET_DROP_MONITOR_H_
2825
5
2826
6
#include <linux/ktime.h>
2827
7
#include <linux/netdevice.h>
2828
8
#include <linux/skbuff.h>
2829
9
2830
10
/**
2831
11
 * struct net_dm_hw_metadata - Hardware-supplied packet metadata.
2832
12
 * @trap_group_name: Hardware trap group name.
2833
13
 * @trap_name: Hardware trap name.
2834
14
 * @input_dev: Input netdevice.
2835
15
 */
2836
16
struct net_dm_hw_metadata {
2837
17
	const char *trap_group_name;
2838
18
	const char *trap_name;
2839
19
	struct net_device *input_dev;
2840
20
};
2841
21
2842
22
#if IS_REACHABLE(CONFIG_NET_DROP_MONITOR)
2843
23
void net_dm_hw_report(struct sk_buff *skb,
2844
24
		      const struct net_dm_hw_metadata *hw_metadata);
2845
25
#else
2846
26
static inline void
2847
27
net_dm_hw_report(struct sk_buff *skb,
2848
28
		 const struct net_dm_hw_metadata *hw_metadata)
2849
29
{
2850
30
}
2851
31
#endif
2852
32
2853
33
#endif /* _NET_DROP_MONITOR_H_ */
2854
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
2855
index 2d9e67a..1f0f363 100644
2856
--- a/include/net/genetlink.h
2857
+++ b/include/net/genetlink.h
2858
@@ -49,8 +49,11 @@ struct genl_family {
2859
49
	char			name[GENL_NAMSIZ];
49
	char			name[GENL_NAMSIZ];
2860
50
	unsigned int		version;
50
	unsigned int		version;
2861
51
	unsigned int		maxattr;
51
	unsigned int		maxattr;
2864
52
	bool			netnsok;
52
	unsigned int		mcgrp_offset;	/* private */
2865
53
	bool			parallel_ops;
53
	u8			netnsok:1;
2866
54
	u8			parallel_ops:1;
2867
55
	u8			n_ops;
2868
56
	u8			n_mcgrps;
2869
54
	const struct nla_policy *policy;
57
	const struct nla_policy *policy;
2870
55
	int			(*pre_doit)(const struct genl_ops *ops,
58
	int			(*pre_doit)(const struct genl_ops *ops,
2871
56
					    struct sk_buff *skb,
59
					    struct sk_buff *skb,
2872
@@ -61,14 +64,9 @@ struct genl_family {
2873
61
	struct nlattr **	attrbuf;	/* private */
64
	struct nlattr **	attrbuf;	/* private */
2874
62
	const struct genl_ops *	ops;
65
	const struct genl_ops *	ops;
2875
63
	const struct genl_multicast_group *mcgrps;
66
	const struct genl_multicast_group *mcgrps;
2876
64
	unsigned int		n_ops;
2877
65
	unsigned int		n_mcgrps;
2878
66
	unsigned int		mcgrp_offset;	/* private */
2879
67
	struct module		*module;
67
	struct module		*module;
2880
68
};
68
};
2881
69
69
2882
70
struct nlattr **genl_family_attrbuf(const struct genl_family *family);
2883
71
2884
72
/**
70
/**
2885
73
 * struct genl_info - receiving information
71
 * struct genl_info - receiving information
2886
74
 * @snd_seq: sending sequence number
72
 * @snd_seq: sending sequence number
2887
@@ -120,6 +118,24 @@ enum genl_validate_flags {
2888
120
};
118
};
2889
121
119
2890
122
/**
120
/**
2891
121
 * struct genl_info - info that is available during dumpit op call
2892
122
 * @family: generic netlink family - for internal genl code usage
2893
123
 * @ops: generic netlink ops - for internal genl code usage
2894
124
 * @attrs: netlink attributes
2895
125
 */
2896
126
struct genl_dumpit_info {
2897
127
	const struct genl_family *family;
2898
128
	const struct genl_ops *ops;
2899
129
	struct nlattr **attrs;
2900
130
};
2901
131
2902
132
static inline const struct genl_dumpit_info *
2903
133
genl_dumpit_info(struct netlink_callback *cb)
2904
134
{
2905
135
	return cb->data;
2906
136
}
2907
137
2908
138
/**
2909
123
 * struct genl_ops - generic netlink operations
139
 * struct genl_ops - generic netlink operations
2910
124
 * @cmd: command identifier
140
 * @cmd: command identifier
2911
125
 * @internal_flags: flags used by the family
141
 * @internal_flags: flags used by the family
2912
diff --git a/include/net/netlink.h b/include/net/netlink.h
2913
index 22dd99b..f91d2e3 100644
2914
--- a/include/net/netlink.h
2915
+++ b/include/net/netlink.h
2916
@@ -219,7 +219,7 @@ enum nla_policy_validation {
2917
219
 *    NLA_NESTED,
219
 *    NLA_NESTED,
2918
220
 *    NLA_NESTED_ARRAY     Length verification is done by checking len of
220
 *    NLA_NESTED_ARRAY     Length verification is done by checking len of
2919
221
 *                         nested header (or empty); len field is used if
221
 *                         nested header (or empty); len field is used if
2921
222
 *                         validation_data is also used, for the max attr
222
 *                         nested_policy is also used, for the max attr
2922
223
 *                         number in the nested policy.
223
 *                         number in the nested policy.
2923
224
 *    NLA_U8, NLA_U16,
224
 *    NLA_U8, NLA_U16,
2924
225
 *    NLA_U32, NLA_U64,
225
 *    NLA_U32, NLA_U64,
2925
@@ -237,27 +237,25 @@ enum nla_policy_validation {
2926
237
 *    NLA_MIN_LEN          Minimum length of attribute payload
237
 *    NLA_MIN_LEN          Minimum length of attribute payload
2927
238
 *    All other            Minimum length of attribute payload
238
 *    All other            Minimum length of attribute payload
2928
239
 *
239
 *
2930
240
 * Meaning of `validation_data' field:
240
 * Meaning of validation union:
2931
241
 *    NLA_BITFIELD32       This is a 32-bit bitmap/bitselector attribute and
241
 *    NLA_BITFIELD32       This is a 32-bit bitmap/bitselector attribute and
2935
242
 *                         validation data must point to a u32 value of valid
242
 *                         `bitfield32_valid' is the u32 value of valid flags
2936
243
 *                         flags
243
 *    NLA_REJECT           This attribute is always rejected and `reject_message'
2934
244
 *    NLA_REJECT           This attribute is always rejected and validation data
2937
245
 *                         may point to a string to report as the error instead
244
 *                         may point to a string to report as the error instead
2938
246
 *                         of the generic one in extended ACK.
245
 *                         of the generic one in extended ACK.
2941
247
 *    NLA_NESTED           Points to a nested policy to validate, must also set
246
 *    NLA_NESTED           `nested_policy' to a nested policy to validate, must
2942
248
 *                         `len' to the max attribute number.
247
 *                         also set `len' to the max attribute number. Use the
2943
248
 *                         provided NLA_POLICY_NESTED() macro.
2944
249
 *                         Note that nla_parse() will validate, but of course not
249
 *                         Note that nla_parse() will validate, but of course not
2945
250
 *                         parse, the nested sub-policies.
250
 *                         parse, the nested sub-policies.
2956
251
 *    NLA_NESTED_ARRAY     Points to a nested policy to validate, must also set
251
 *    NLA_NESTED_ARRAY     `nested_policy' points to a nested policy to validate,
2957
252
 *                         `len' to the max attribute number. The difference to
252
 *                         must also set `len' to the max attribute number. Use
2958
253
 *                         NLA_NESTED is the structure - NLA_NESTED has the
253
 *                         the provided NLA_POLICY_NESTED_ARRAY() macro.
2959
254
 *                         nested attributes directly inside, while an array has
254
 *                         The difference to NLA_NESTED is the structure:
2960
255
 *                         the nested attributes at another level down and the
255
 *                         NLA_NESTED has the nested attributes directly inside
2961
256
 *                         attributes directly in the nesting don't matter.
256
 *                         while an array has the nested attributes at another
2962
257
 *    All other            Unused - but note that it's a union
257
 *                         level down and the attribute types directly in the
2963
258
 *
258
 *                         nesting don't matter.
2954
259
 * Meaning of `min' and `max' fields, use via NLA_POLICY_MIN, NLA_POLICY_MAX
2955
260
 * and NLA_POLICY_RANGE:
2964
261
 *    NLA_U8,
259
 *    NLA_U8,
2965
262
 *    NLA_U16,
260
 *    NLA_U16,
2966
263
 *    NLA_U32,
261
 *    NLA_U32,
2967
@@ -265,29 +263,31 @@ enum nla_policy_validation {
2968
265
 *    NLA_S8,
263
 *    NLA_S8,
2969
266
 *    NLA_S16,
264
 *    NLA_S16,
2970
267
 *    NLA_S32,
265
 *    NLA_S32,
2974
268
 *    NLA_S64              These are used depending on the validation_type
266
 *    NLA_S64              The `min' and `max' fields are used depending on the
2975
269
 *                         field, if that is min/max/range then the minimum,
267
 *                         validation_type field, if that is min/max/range then
2976
270
 *                         maximum and both are used (respectively) to check
268
 *                         the min, max or both are used (respectively) to check
2977
271
 *                         the value of the integer attribute.
269
 *                         the value of the integer attribute.
2978
272
 *                         Note that in the interest of code simplicity and
270
 *                         Note that in the interest of code simplicity and
2979
273
 *                         struct size both limits are s16, so you cannot
271
 *                         struct size both limits are s16, so you cannot
2980
274
 *                         enforce a range that doesn't fall within the range
272
 *                         enforce a range that doesn't fall within the range
2981
275
 *                         of s16 - do that as usual in the code instead.
273
 *                         of s16 - do that as usual in the code instead.
2982
274
 *                         Use the NLA_POLICY_MIN(), NLA_POLICY_MAX() and
2983
275
 *                         NLA_POLICY_RANGE() macros.
2984
276
 *    All other            Unused - but note that it's a union
276
 *    All other            Unused - but note that it's a union
2985
277
 *
277
 *
2986
278
 * Meaning of `validate' field, use via NLA_POLICY_VALIDATE_FN:
278
 * Meaning of `validate' field, use via NLA_POLICY_VALIDATE_FN:
2991
279
 *    NLA_BINARY           Validation function called for the attribute,
279
 *    NLA_BINARY           Validation function called for the attribute.
2988
280
 *                         not compatible with use of the validation_data
2989
281
 *                         as in NLA_BITFIELD32, NLA_REJECT, NLA_NESTED and
2990
282
 *                         NLA_NESTED_ARRAY.
2992
283
 *    All other            Unused - but note that it's a union
280
 *    All other            Unused - but note that it's a union
2993
284
 *
281
 *
2994
285
 * Example:
282
 * Example:
2995
283
 *
2996
284
 * static const u32 myvalidflags = 0xff231023;
2997
285
 *
2998
286
 * static const struct nla_policy my_policy[ATTR_MAX+1] = {
286
 * static const struct nla_policy my_policy[ATTR_MAX+1] = {
2999
287
 * 	[ATTR_FOO] = { .type = NLA_U16 },
287
 * 	[ATTR_FOO] = { .type = NLA_U16 },
3000
288
 *	[ATTR_BAR] = { .type = NLA_STRING, .len = BARSIZ },
288
 *	[ATTR_BAR] = { .type = NLA_STRING, .len = BARSIZ },
3001
289
 *	[ATTR_BAZ] = { .type = NLA_EXACT_LEN, .len = sizeof(struct mystruct) },
289
 *	[ATTR_BAZ] = { .type = NLA_EXACT_LEN, .len = sizeof(struct mystruct) },
3003
290
 *	[ATTR_GOO] = { .type = NLA_BITFIELD32, .validation_data = &myvalidflags },
290
 *	[ATTR_GOO] = NLA_POLICY_BITFIELD32(myvalidflags),
3004
291
 * };
291
 * };
3005
292
 */
292
 */
3006
293
struct nla_policy {
293
struct nla_policy {
3007
@@ -295,8 +295,10 @@ struct nla_policy {
3008
295
	u8		validation_type;
295
	u8		validation_type;
3009
296
	u16		len;
296
	u16		len;
3010
297
	union {
297
	union {
3011
298
		const void *validation_data;
3012
299
		const u32 mask;
298
		const u32 mask;
3013
299
		const u32 bitfield32_valid;
3014
300
		const char *reject_message;
3015
301
		const struct nla_policy *nested_policy;
3016
300
		struct {
302
		struct {
3017
301
			s16 min, max;
303
			s16 min, max;
3018
302
		};
304
		};
3019
@@ -332,13 +334,15 @@ struct nla_policy {
3020
332
#define NLA_POLICY_ETH_ADDR_COMPAT	NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN)
334
#define NLA_POLICY_ETH_ADDR_COMPAT	NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN)
3021
333
335
3022
334
#define _NLA_POLICY_NESTED(maxattr, policy) \
336
#define _NLA_POLICY_NESTED(maxattr, policy) \
3024
335
	{ .type = NLA_NESTED, .validation_data = policy, .len = maxattr }
337
	{ .type = NLA_NESTED, .nested_policy = policy, .len = maxattr }
3025
336
#define _NLA_POLICY_NESTED_ARRAY(maxattr, policy) \
338
#define _NLA_POLICY_NESTED_ARRAY(maxattr, policy) \
3027
337
	{ .type = NLA_NESTED_ARRAY, .validation_data = policy, .len = maxattr }
339
	{ .type = NLA_NESTED_ARRAY, .nested_policy = policy, .len = maxattr }
3028
338
#define NLA_POLICY_NESTED(policy) \
340
#define NLA_POLICY_NESTED(policy) \
3029
339
	_NLA_POLICY_NESTED(ARRAY_SIZE(policy) - 1, policy)
341
	_NLA_POLICY_NESTED(ARRAY_SIZE(policy) - 1, policy)
3030
340
#define NLA_POLICY_NESTED_ARRAY(policy) \
342
#define NLA_POLICY_NESTED_ARRAY(policy) \
3031
341
	_NLA_POLICY_NESTED_ARRAY(ARRAY_SIZE(policy) - 1, policy)
343
	_NLA_POLICY_NESTED_ARRAY(ARRAY_SIZE(policy) - 1, policy)
3032
344
#define NLA_POLICY_BITFIELD32(valid) \
3033
345
	{ .type = NLA_BITFIELD32, .bitfield32_valid = valid }
3034
342
346
3035
343
#define __NLA_IS_UINT_TYPE(tp)						\
347
#define __NLA_IS_UINT_TYPE(tp)						\
3036
344
	(tp == NLA_U8 || tp == NLA_U16 || tp == NLA_U32 || tp == NLA_U64)
348
	(tp == NLA_U8 || tp == NLA_U16 || tp == NLA_U32 || tp == NLA_U64)
3037
@@ -1482,6 +1486,21 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype,
3038
1482
}
1486
}
3039
1483
1487
3040
1484
/**
1488
/**
3041
1489
 * nla_put_bitfield32 - Add a bitfield32 netlink attribute to a socket buffer
3042
1490
 * @skb: socket buffer to add attribute to
3043
1491
 * @attrtype: attribute type
3044
1492
 * @value: value carrying bits
3045
1493
 * @selector: selector of valid bits
3046
1494
 */
3047
1495
static inline int nla_put_bitfield32(struct sk_buff *skb, int attrtype,
3048
1496
				     __u32 value, __u32 selector)
3049
1497
{
3050
1498
	struct nla_bitfield32 tmp = { value, selector, };
3051
1499
3052
1500
	return nla_put(skb, attrtype, sizeof(tmp), &tmp);
3053
1501
}
3054
1502
3055
1503
/**
3056
1485
 * nla_get_u32 - return payload of u32 attribute
1504
 * nla_get_u32 - return payload of u32 attribute
3057
1486
 * @nla: u32 netlink attribute
1505
 * @nla: u32 netlink attribute
3058
1487
 */
1506
 */
3059
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
3060
index 0aac605..d23d7fe 100644
3061
--- a/include/net/pkt_cls.h
3062
+++ b/include/net/pkt_cls.h
3063
@@ -751,6 +751,7 @@ struct tc_red_qopt_offload_params {
3064
751
	u32 limit;
751
	u32 limit;
3065
752
	bool is_ecn;
752
	bool is_ecn;
3066
753
	bool is_harddrop;
753
	bool is_harddrop;
3067
754
	bool is_nodrop;
3068
754
	struct gnet_stats_queue *qstats;
755
	struct gnet_stats_queue *qstats;
3069
755
};
756
};
3070
756
757
3071
diff --git a/include/net/red.h b/include/net/red.h
3072
index ff07a7c..cc9f6b0 100644
3073
--- a/include/net/red.h
3074
+++ b/include/net/red.h
3075
@@ -189,6 +189,44 @@ static inline bool red_check_params(u32 qth_min, u32 qth_max, u8 Wlog,
3076
189
	return true;
189
	return true;
3077
190
}
190
}
3078
191
191
3079
192
static inline int red_get_flags(unsigned char qopt_flags,
3080
193
				unsigned char historic_mask,
3081
194
				struct nlattr *flags_attr,
3082
195
				unsigned char supported_mask,
3083
196
				struct nla_bitfield32 *p_flags,
3084
197
				unsigned char *p_userbits,
3085
198
				struct netlink_ext_ack *extack)
3086
199
{
3087
200
	struct nla_bitfield32 flags;
3088
201
3089
202
	if (qopt_flags && flags_attr) {
3090
203
		NL_SET_ERR_MSG_MOD(extack, "flags should be passed either through qopt, or through a dedicated attribute");
3091
204
		return -EINVAL;
3092
205
	}
3093
206
3094
207
	if (flags_attr) {
3095
208
		flags = nla_get_bitfield32(flags_attr);
3096
209
	} else {
3097
210
		flags.selector = historic_mask;
3098
211
		flags.value = qopt_flags & historic_mask;
3099
212
	}
3100
213
3101
214
	*p_flags = flags;
3102
215
	*p_userbits = qopt_flags & ~historic_mask;
3103
216
	return 0;
3104
217
}
3105
218
3106
219
static inline int red_validate_flags(unsigned char flags,
3107
220
				     struct netlink_ext_ack *extack)
3108
221
{
3109
222
	if ((flags & TC_RED_NODROP) && !(flags & TC_RED_ECN)) {
3110
223
		NL_SET_ERR_MSG_MOD(extack, "nodrop mode is only meaningful with ECN");
3111
224
		return -EINVAL;
3112
225
	}
3113
226
3114
227
	return 0;
3115
228
}
3116
229
3117
192
static inline void red_set_parms(struct red_parms *p,
230
static inline void red_set_parms(struct red_parms *p,
3118
193
				 u32 qth_min, u32 qth_max, u8 Wlog, u8 Plog,
231
				 u32 qth_min, u32 qth_max, u8 Wlog, u8 Plog,
3119
194
				 u8 Scell_log, u8 *stab, u32 max_P)
232
				 u8 Scell_log, u8 *stab, u32 max_P)
3120
diff --git a/include/trace/events/devlink.h b/include/trace/events/devlink.h
3121
index 6f60a78..44d8e29 100644
3122
--- a/include/trace/events/devlink.h
3123
+++ b/include/trace/events/devlink.h
3124
@@ -171,6 +171,43 @@ TRACE_EVENT(devlink_health_reporter_state_update,
3125
171
		  __entry->new_state)
171
		  __entry->new_state)
3126
172
);
172
);
3127
173
173
3128
174
/*
3129
175
 * Tracepoint for devlink packet trap:
3130
176
 */
3131
177
TRACE_EVENT(devlink_trap_report,
3132
178
	TP_PROTO(const struct devlink *devlink, struct sk_buff *skb,
3133
179
		 const struct devlink_trap_metadata *metadata),
3134
180
3135
181
	TP_ARGS(devlink, skb, metadata),
3136
182
3137
183
	TP_STRUCT__entry(
3138
184
		__string(bus_name, devlink->dev->bus->name)
3139
185
		__string(dev_name, dev_name(devlink->dev))
3140
186
		__string(driver_name, devlink->dev->driver->name)
3141
187
		__string(trap_name, metadata->trap_name)
3142
188
		__string(trap_group_name, metadata->trap_group_name)
3143
189
		__dynamic_array(char, input_dev_name, IFNAMSIZ)
3144
190
	),
3145
191
3146
192
	TP_fast_assign(
3147
193
		struct net_device *input_dev = metadata->input_dev;
3148
194
3149
195
		__assign_str(bus_name, devlink->dev->bus->name);
3150
196
		__assign_str(dev_name, dev_name(devlink->dev));
3151
197
		__assign_str(driver_name, devlink->dev->driver->name);
3152
198
		__assign_str(trap_name, metadata->trap_name);
3153
199
		__assign_str(trap_group_name, metadata->trap_group_name);
3154
200
		__assign_str(input_dev_name,
3155
201
			     (input_dev ? input_dev->name : "NULL"));
3156
202
	),
3157
203
3158
204
	TP_printk("bus_name=%s dev_name=%s driver_name=%s trap_name=%s "
3159
205
		  "trap_group_name=%s input_dev_name=%s", __get_str(bus_name),
3160
206
		  __get_str(dev_name), __get_str(driver_name),
3161
207
		  __get_str(trap_name), __get_str(trap_group_name),
3162
208
		  __get_str(input_dev_name))
3163
209
);
3164
210
3165
174
#endif /* _TRACE_DEVLINK_H */
211
#endif /* _TRACE_DEVLINK_H */
3166
175
212
3167
176
/* This part must be outside protection */
213
/* This part must be outside protection */
3168
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
3169
index a8a2174..7896b44 100644
3170
--- a/include/uapi/linux/devlink.h
3171
+++ b/include/uapi/linux/devlink.h
3172
@@ -117,6 +117,18 @@ enum devlink_command {
3173
117
	DEVLINK_CMD_TRAP_GROUP_NEW,
117
	DEVLINK_CMD_TRAP_GROUP_NEW,
3174
118
	DEVLINK_CMD_TRAP_GROUP_DEL,
118
	DEVLINK_CMD_TRAP_GROUP_DEL,
3175
119
119
3176
120
	DEVLINK_CMD_TRAP_POLICER_GET,	/* can dump */
3177
121
	DEVLINK_CMD_TRAP_POLICER_SET,
3178
122
	DEVLINK_CMD_TRAP_POLICER_NEW,
3179
123
	DEVLINK_CMD_TRAP_POLICER_DEL,
3180
124
3181
125
	DEVLINK_CMD_HEALTH_REPORTER_TEST,
3182
126
3183
127
	DEVLINK_CMD_RATE_GET,		/* can dump */
3184
128
	DEVLINK_CMD_RATE_SET,
3185
129
	DEVLINK_CMD_RATE_NEW,
3186
130
	DEVLINK_CMD_RATE_DEL,
3187
131
3188
120
	/* add new commands above here */
132
	/* add new commands above here */
3189
121
	__DEVLINK_CMD_MAX,
133
	__DEVLINK_CMD_MAX,
3190
122
	DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
134
	DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
3191
@@ -187,6 +199,19 @@ enum devlink_port_flavour {
3192
187
				      * for the PCI VF. It is an internal
199
				      * for the PCI VF. It is an internal
3193
188
				      * port that faces the PCI VF.
200
				      * port that faces the PCI VF.
3194
189
				      */
201
				      */
3195
202
	DEVLINK_PORT_FLAVOUR_VIRTUAL, /* Any virtual port facing the user. */
3196
203
	DEVLINK_PORT_FLAVOUR_UNUSED, /* Port which exists in the switch, but
3197
204
				      * is not used in any way.
3198
205
				      */
3199
206
	DEVLINK_PORT_FLAVOUR_PCI_SF, /* Represents eswitch port
3200
207
				      * for the PCI SF. It is an internal
3201
208
				      * port that faces the PCI SF.
3202
209
				      */
3203
210
};
3204
211
3205
212
enum devlink_rate_type {
3206
213
	DEVLINK_RATE_TYPE_LEAF,
3207
214
	DEVLINK_RATE_TYPE_NODE,
3208
190
};
215
};
3209
191
216
3210
192
enum devlink_param_cmode {
217
enum devlink_param_cmode {
3211
@@ -216,11 +241,34 @@ enum devlink_param_reset_dev_on_drv_probe_value {
3212
216
enum {
241
enum {
3213
217
	DEVLINK_ATTR_STATS_RX_PACKETS,		/* u64 */
242
	DEVLINK_ATTR_STATS_RX_PACKETS,		/* u64 */
3214
218
	DEVLINK_ATTR_STATS_RX_BYTES,		/* u64 */
243
	DEVLINK_ATTR_STATS_RX_BYTES,		/* u64 */
3215
244
	DEVLINK_ATTR_STATS_RX_DROPPED,		/* u64 */
3216
219
245
3217
220
	__DEVLINK_ATTR_STATS_MAX,
246
	__DEVLINK_ATTR_STATS_MAX,
3218
221
	DEVLINK_ATTR_STATS_MAX = __DEVLINK_ATTR_STATS_MAX - 1
247
	DEVLINK_ATTR_STATS_MAX = __DEVLINK_ATTR_STATS_MAX - 1
3219
222
};
248
};
3220
223
249
3221
250
/* Specify what sections of a flash component can be overwritten when
3222
251
 * performing an update. Overwriting of firmware binary sections is always
3223
252
 * implicitly assumed to be allowed.
3224
253
 *
3225
254
 * Each section must be documented in
3226
255
 * Documentation/networking/devlink/devlink-flash.rst
3227
256
 *
3228
257
 */
3229
258
enum {
3230
259
	DEVLINK_FLASH_OVERWRITE_SETTINGS_BIT,
3231
260
	DEVLINK_FLASH_OVERWRITE_IDENTIFIERS_BIT,
3232
261
3233
262
	__DEVLINK_FLASH_OVERWRITE_MAX_BIT,
3234
263
	DEVLINK_FLASH_OVERWRITE_MAX_BIT = __DEVLINK_FLASH_OVERWRITE_MAX_BIT - 1
3235
264
};
3236
265
3237
266
#define DEVLINK_FLASH_OVERWRITE_SETTINGS _BITUL(DEVLINK_FLASH_OVERWRITE_SETTINGS_BIT)
3238
267
#define DEVLINK_FLASH_OVERWRITE_IDENTIFIERS _BITUL(DEVLINK_FLASH_OVERWRITE_IDENTIFIERS_BIT)
3239
268
3240
269
#define DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS \
3241
270
	(_BITUL(__DEVLINK_FLASH_OVERWRITE_MAX_BIT) - 1)
3242
271
3243
224
/**
272
/**
3244
225
 * enum devlink_trap_action - Packet trap action.
273
 * enum devlink_trap_action - Packet trap action.
3245
226
 * @DEVLINK_TRAP_ACTION_DROP: Packet is dropped by the device and a copy is not
274
 * @DEVLINK_TRAP_ACTION_DROP: Packet is dropped by the device and a copy is not
3246
@@ -243,17 +291,48 @@ enum devlink_trap_action {
3247
243
 *                               control plane for resolution. Trapped packets
291
 *                               control plane for resolution. Trapped packets
3248
244
 *                               are processed by devlink and injected to
292
 *                               are processed by devlink and injected to
3249
245
 *                               the kernel's Rx path.
293
 *                               the kernel's Rx path.
3250
294
 * @DEVLINK_TRAP_TYPE_CONTROL: Packet was trapped because it is required for
3251
295
 *                             the correct functioning of the control plane.
3252
296
 *                             For example, an ARP request packet. Trapped
3253
297
 *                             packets are injected to the kernel's Rx path,
3254
298
 *                             but not reported to drop monitor.
3255
246
 */
299
 */
3256
247
enum devlink_trap_type {
300
enum devlink_trap_type {
3257
248
	DEVLINK_TRAP_TYPE_DROP,
301
	DEVLINK_TRAP_TYPE_DROP,
3258
249
	DEVLINK_TRAP_TYPE_EXCEPTION,
302
	DEVLINK_TRAP_TYPE_EXCEPTION,
3259
303
	DEVLINK_TRAP_TYPE_CONTROL,
3260
250
};
304
};
3261
251
305
3262
252
enum {
306
enum {
3263
253
	/* Trap can report input port as metadata */
307
	/* Trap can report input port as metadata */
3264
254
	DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT,
308
	DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT,
3265
309
	/* Trap can report flow action cookie as metadata */
3266
310
	DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE,
3267
255
};
311
};
3268
256
312
3269
313
enum devlink_reload_action {
3270
314
	DEVLINK_RELOAD_ACTION_UNSPEC,
3271
315
	DEVLINK_RELOAD_ACTION_DRIVER_REINIT,	/* Driver entities re-instantiation */
3272
316
	DEVLINK_RELOAD_ACTION_FW_ACTIVATE,	/* FW activate */
3273
317
3274
318
	/* Add new reload actions above */
3275
319
	__DEVLINK_RELOAD_ACTION_MAX,
3276
320
	DEVLINK_RELOAD_ACTION_MAX = __DEVLINK_RELOAD_ACTION_MAX - 1
3277
321
};
3278
322
3279
323
enum devlink_reload_limit {
3280
324
	DEVLINK_RELOAD_LIMIT_UNSPEC,	/* unspecified, no constraints */
3281
325
	DEVLINK_RELOAD_LIMIT_NO_RESET,	/* No reset allowed, no down time allowed,
3282
326
					 * no link flap and no configuration is lost.
3283
327
					 */
3284
328
3285
329
	/* Add new reload limit above */
3286
330
	__DEVLINK_RELOAD_LIMIT_MAX,
3287
331
	DEVLINK_RELOAD_LIMIT_MAX = __DEVLINK_RELOAD_LIMIT_MAX - 1
3288
332
};
3289
333
3290
334
#define DEVLINK_RELOAD_LIMITS_VALID_MASK (BIT(__DEVLINK_RELOAD_LIMIT_MAX) - 1)
3291
335
3292
257
enum devlink_attr {
336
enum devlink_attr {
3293
258
	/* don't change the order or add anything between, this is ABI! */
337
	/* don't change the order or add anything between, this is ABI! */
3294
259
	DEVLINK_ATTR_UNSPEC,
338
	DEVLINK_ATTR_UNSPEC,
3295
@@ -422,6 +501,51 @@ enum devlink_attr {
3296
422
	DEVLINK_ATTR_RELOAD_FAILED,			/* u8 0 or 1 */
501
	DEVLINK_ATTR_RELOAD_FAILED,			/* u8 0 or 1 */
3297
423
502
3298
424
	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,	/* u64 */
503
	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,	/* u64 */
3299
504
3300
505
	DEVLINK_ATTR_NETNS_FD,			/* u32 */
3301
506
	DEVLINK_ATTR_NETNS_PID,			/* u32 */
3302
507
	DEVLINK_ATTR_NETNS_ID,			/* u32 */
3303
508
3304
509
	DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP,	/* u8 */
3305
510
3306
511
	DEVLINK_ATTR_TRAP_POLICER_ID,			/* u32 */
3307
512
	DEVLINK_ATTR_TRAP_POLICER_RATE,			/* u64 */
3308
513
	DEVLINK_ATTR_TRAP_POLICER_BURST,		/* u64 */
3309
514
3310
515
	DEVLINK_ATTR_PORT_FUNCTION,			/* nested */
3311
516
3312
517
	DEVLINK_ATTR_INFO_BOARD_SERIAL_NUMBER,	/* string */
3313
518
3314
519
	DEVLINK_ATTR_PORT_LANES,			/* u32 */
3315
520
	DEVLINK_ATTR_PORT_SPLITTABLE,			/* u8 */
3316
521
3317
522
	DEVLINK_ATTR_PORT_EXTERNAL,		/* u8 */
3318
523
	DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,	/* u32 */
3319
524
3320
525
	DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT,	/* u64 */
3321
526
	DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK,	/* bitfield32 */
3322
527
3323
528
	DEVLINK_ATTR_RELOAD_ACTION,		/* u8 */
3324
529
	DEVLINK_ATTR_RELOAD_ACTIONS_PERFORMED,	/* bitfield32 */
3325
530
	DEVLINK_ATTR_RELOAD_LIMITS,		/* bitfield32 */
3326
531
3327
532
	DEVLINK_ATTR_DEV_STATS,			/* nested */
3328
533
	DEVLINK_ATTR_RELOAD_STATS,		/* nested */
3329
534
	DEVLINK_ATTR_RELOAD_STATS_ENTRY,	/* nested */
3330
535
	DEVLINK_ATTR_RELOAD_STATS_LIMIT,	/* u8 */
3331
536
	DEVLINK_ATTR_RELOAD_STATS_VALUE,	/* u32 */
3332
537
	DEVLINK_ATTR_REMOTE_RELOAD_STATS,	/* nested */
3333
538
	DEVLINK_ATTR_RELOAD_ACTION_INFO,        /* nested */
3334
539
	DEVLINK_ATTR_RELOAD_ACTION_STATS,       /* nested */
3335
540
3336
541
	DEVLINK_ATTR_PORT_PCI_SF_NUMBER,	/* u32 */
3337
542
3338
543
	DEVLINK_ATTR_RATE_TYPE,			/* u16 */
3339
544
	DEVLINK_ATTR_RATE_TX_SHARE,		/* u64 */
3340
545
	DEVLINK_ATTR_RATE_TX_MAX,		/* u64 */
3341
546
	DEVLINK_ATTR_RATE_NODE_NAME,		/* string */
3342
547
	DEVLINK_ATTR_RATE_PARENT_NODE_NAME,	/* string */
3343
548
3344
425
	/* add new attributes above here, update the policy in devlink.c */
549
	/* add new attributes above here, update the policy in devlink.c */
3345
426
550
3346
427
	__DEVLINK_ATTR_MAX,
551
	__DEVLINK_ATTR_MAX,
3347
@@ -468,4 +592,32 @@ enum devlink_resource_unit {
3348
468
	DEVLINK_RESOURCE_UNIT_ENTRY,
592
	DEVLINK_RESOURCE_UNIT_ENTRY,
3349
469
};
593
};
3350
470
594
3351
595
enum devlink_port_function_attr {
3352
596
	DEVLINK_PORT_FUNCTION_ATTR_UNSPEC,
3353
597
	DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR,	/* binary */
3354
598
	DEVLINK_PORT_FN_ATTR_STATE,	/* u8 */
3355
599
	DEVLINK_PORT_FN_ATTR_OPSTATE,	/* u8 */
3356
600
3357
601
	__DEVLINK_PORT_FUNCTION_ATTR_MAX,
3358
602
	DEVLINK_PORT_FUNCTION_ATTR_MAX = __DEVLINK_PORT_FUNCTION_ATTR_MAX - 1
3359
603
};
3360
604
3361
605
enum devlink_port_fn_state {
3362
606
	DEVLINK_PORT_FN_STATE_INACTIVE,
3363
607
	DEVLINK_PORT_FN_STATE_ACTIVE,
3364
608
};
3365
609
3366
610
/**
3367
611
 * enum devlink_port_fn_opstate - indicates operational state of the function
3368
612
 * @DEVLINK_PORT_FN_OPSTATE_ATTACHED: Driver is attached to the function.
3369
613
 * For graceful tear down of the function, after inactivation of the
3370
614
 * function, user should wait for operational state to turn DETACHED.
3371
615
 * @DEVLINK_PORT_FN_OPSTATE_DETACHED: Driver is detached from the function.
3372
616
 * It is safe to delete the port.
3373
617
 */
3374
618
enum devlink_port_fn_opstate {
3375
619
	DEVLINK_PORT_FN_OPSTATE_DETACHED,
3376
620
	DEVLINK_PORT_FN_OPSTATE_ATTACHED,
3377
621
};
3378
622
3379
471
#endif /* _UAPI_LINUX_DEVLINK_H_ */
623
#endif /* _UAPI_LINUX_DEVLINK_H_ */
3380
diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
3381
index 4a245d7..0070ef1 100644
3382
--- a/include/uapi/linux/pkt_sched.h
3383
+++ b/include/uapi/linux/pkt_sched.h
3384
@@ -256,6 +256,7 @@ enum {
3385
256
	TCA_RED_PARMS,
256
	TCA_RED_PARMS,
3386
257
	TCA_RED_STAB,
257
	TCA_RED_STAB,
3387
258
	TCA_RED_MAX_P,
258
	TCA_RED_MAX_P,
3388
259
	TCA_RED_FLAGS,		/* bitfield32 */
3389
259
	__TCA_RED_MAX,
260
	__TCA_RED_MAX,
3390
260
};
261
};
3391
261
262
3392
@@ -268,12 +269,28 @@ struct tc_red_qopt {
3393
268
	unsigned char   Wlog;		/* log(W)		*/
269
	unsigned char   Wlog;		/* log(W)		*/
3394
269
	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
270
	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
3395
270
	unsigned char   Scell_log;	/* cell size for idle damping */
271
	unsigned char   Scell_log;	/* cell size for idle damping */
3396
272
3397
273
	/* This field can be used for flags that a RED-like qdisc has
3398
274
	 * historically supported. E.g. when configuring RED, it can be used for
3399
275
	 * ECN, HARDDROP and ADAPTATIVE. For SFQ it can be used for ECN,
3400
276
	 * HARDDROP. Etc. Because this field has not been validated, and is
3401
277
	 * copied back on dump, any bits besides those to which a given qdisc
3402
278
	 * has assigned a historical meaning need to be considered for free use
3403
279
	 * by userspace tools.
3404
280
	 *
3405
281
	 * Any further flags need to be passed differently, e.g. through an
3406
282
	 * attribute (such as TCA_RED_FLAGS above). Such attribute should allow
3407
283
	 * passing both recent and historic flags in one value.
3408
284
	 */
3409
271
	unsigned char	flags;
285
	unsigned char	flags;
3410
272
#define TC_RED_ECN		1
286
#define TC_RED_ECN		1
3411
273
#define TC_RED_HARDDROP		2
287
#define TC_RED_HARDDROP		2
3412
274
#define TC_RED_ADAPTATIVE	4
288
#define TC_RED_ADAPTATIVE	4
3413
289
#define TC_RED_NODROP		8
3414
275
};
290
};
3415
276
291
3416
292
#define TC_RED_HISTORIC_FLAGS (TC_RED_ECN | TC_RED_HARDDROP | TC_RED_ADAPTATIVE)
3417
293
3418
277
struct tc_red_xstats {
294
struct tc_red_xstats {
3419
278
	__u32           early;          /* Early drops */
295
	__u32           early;          /* Early drops */
3420
279
	__u32           pdrop;          /* Drops due to queue limits */
296
	__u32           pdrop;          /* Drops due to queue limits */
3421
diff --git a/lib/nlattr.c b/lib/nlattr.c
3422
index c94b014..b61f3a5 100644
3423
--- a/lib/nlattr.c
3424
+++ b/lib/nlattr.c
3425
@@ -45,7 +45,7 @@ static const u8 nla_attr_minlen[NLA_TYPE_MAX+1] = {
3426
45
};
45
};
3427
46
46
3428
47
static int validate_nla_bitfield32(const struct nlattr *nla,
47
static int validate_nla_bitfield32(const struct nlattr *nla,
3430
48
				   const u32 *valid_flags_mask)
48
				   const u32 valid_flags_mask)
3431
49
{
49
{
3432
50
	const struct nla_bitfield32 *bf = nla_data(nla);
50
	const struct nla_bitfield32 *bf = nla_data(nla);
3433
51
51
3434
@@ -53,11 +53,11 @@ static int validate_nla_bitfield32(const struct nlattr *nla,
3435
53
		return -EINVAL;
53
		return -EINVAL;
3436
54
54
3437
55
	/*disallow invalid bit selector */
55
	/*disallow invalid bit selector */
3439
56
	if (bf->selector & ~*valid_flags_mask)
56
	if (bf->selector & ~valid_flags_mask)
3440
57
		return -EINVAL;
57
		return -EINVAL;
3441
58
58
3442
59
	/*disallow invalid bit values */
59
	/*disallow invalid bit values */
3444
60
	if (bf->value & ~*valid_flags_mask)
60
	if (bf->value & ~valid_flags_mask)
3445
61
		return -EINVAL;
61
		return -EINVAL;
3446
62
62
3447
63
	/*disallow valid bit values that are not selected*/
63
	/*disallow valid bit values that are not selected*/
3448
@@ -237,9 +237,9 @@ static int validate_nla(const struct nlattr *nla, int maxtype,
3449
237
		break;
237
		break;
3450
238
238
3451
239
	case NLA_REJECT:
239
	case NLA_REJECT:
3453
240
		if (extack && pt->validation_data) {
240
		if (extack && pt->reject_message) {
3454
241
			NL_SET_BAD_ATTR(extack, nla);
241
			NL_SET_BAD_ATTR(extack, nla);
3456
242
			extack->_msg = pt->validation_data;
242
			extack->_msg = pt->reject_message;
3457
243
			return -EINVAL;
243
			return -EINVAL;
3458
244
		}
244
		}
3459
245
		err = -EINVAL;
245
		err = -EINVAL;
3460
@@ -254,7 +254,7 @@ static int validate_nla(const struct nlattr *nla, int maxtype,
3461
254
		if (attrlen != sizeof(struct nla_bitfield32))
254
		if (attrlen != sizeof(struct nla_bitfield32))
3462
255
			goto out_err;
255
			goto out_err;
3463
256
256
3465
257
		err = validate_nla_bitfield32(nla, pt->validation_data);
257
		err = validate_nla_bitfield32(nla, pt->bitfield32_valid);
3466
258
		if (err)
258
		if (err)
3467
259
			goto out_err;
259
			goto out_err;
3468
260
		break;
260
		break;
3469
@@ -299,9 +299,9 @@ static int validate_nla(const struct nlattr *nla, int maxtype,
3470
299
			break;
299
			break;
3471
300
		if (attrlen < NLA_HDRLEN)
300
		if (attrlen < NLA_HDRLEN)
3472
301
			goto out_err;
301
			goto out_err;
3474
302
		if (pt->validation_data) {
302
		if (pt->nested_policy) {
3475
303
			err = __nla_validate(nla_data(nla), nla_len(nla), pt->len,
303
			err = __nla_validate(nla_data(nla), nla_len(nla), pt->len,
3477
304
					     pt->validation_data, validate,
304
					     pt->nested_policy, validate,
3478
305
					     extack);
305
					     extack);
3479
306
			if (err < 0) {
306
			if (err < 0) {
3480
307
				/*
307
				/*
3481
@@ -320,11 +320,11 @@ static int validate_nla(const struct nlattr *nla, int maxtype,
3482
320
			break;
320
			break;
3483
321
		if (attrlen < NLA_HDRLEN)
321
		if (attrlen < NLA_HDRLEN)
3484
322
			goto out_err;
322
			goto out_err;
3486
323
		if (pt->validation_data) {
323
		if (pt->nested_policy) {
3487
324
			int err;
324
			int err;
3488
325
325
3489
326
			err = nla_validate_array(nla_data(nla), nla_len(nla),
326
			err = nla_validate_array(nla_data(nla), nla_len(nla),
3491
327
						 pt->len, pt->validation_data,
327
						 pt->len, pt->nested_policy,
3492
328
						 extack, validate);
328
						 extack, validate);
3493
329
			if (err < 0) {
329
			if (err < 0) {
3494
330
				/*
330
				/*
3495
diff --git a/net/Kconfig b/net/Kconfig
3496
index 0b2fecc..5aa30bc 100644
3497
--- a/net/Kconfig
3498
+++ b/net/Kconfig
3499
@@ -433,7 +433,6 @@ config NET_SOCK_MSG
3500
433
config NET_DEVLINK
433
config NET_DEVLINK
3501
434
	bool
434
	bool
3502
435
	default n
435
	default n
3503
436
	imply NET_DROP_MONITOR
3504
437
436
3505
438
config PAGE_POOL
437
config PAGE_POOL
3506
439
       bool
438
       bool
3507
diff --git a/net/core/devlink.c b/net/core/devlink.c
3508
index 09eb3e6..0ee0fb6 100644
3509
--- a/net/core/devlink.c
3510
+++ b/net/core/devlink.c
3511
@@ -27,7 +27,6 @@
3512
27
#include <net/net_namespace.h>
27
#include <net/net_namespace.h>
3513
28
#include <net/sock.h>
28
#include <net/sock.h>
3514
29
#include <net/devlink.h>
29
#include <net/devlink.h>
3515
30
#include <net/drop_monitor.h>
3516
31
#define CREATE_TRACE_POINTS
30
#define CREATE_TRACE_POINTS
3517
32
#include <trace/events/devlink.h>
31
#include <trace/events/devlink.h>
3518
33
32
3519
@@ -84,6 +83,14 @@ EXPORT_SYMBOL(devlink_dpipe_header_ipv6);
3520
84
83
3521
85
EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwmsg);
84
EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwmsg);
3522
86
EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwerr);
85
EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwerr);
3523
86
EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_trap_report);
3524
87
3525
88
static const struct nla_policy devlink_function_nl_policy[DEVLINK_PORT_FUNCTION_ATTR_MAX + 1] = {
3526
89
	[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR] = { .type = NLA_BINARY },
3527
90
	[DEVLINK_PORT_FN_ATTR_STATE] =
3528
91
		NLA_POLICY_RANGE(NLA_U8, DEVLINK_PORT_FN_STATE_INACTIVE,
3529
92
				 DEVLINK_PORT_FN_STATE_ACTIVE),
3530
93
};
3531
87
94
3532
88
static LIST_HEAD(devlink_list);
95
static LIST_HEAD(devlink_list);
3533
89
96
3534
@@ -95,15 +102,11 @@ static LIST_HEAD(devlink_list);
3535
95
 */
102
 */
3536
96
static DEFINE_MUTEX(devlink_mutex);
103
static DEFINE_MUTEX(devlink_mutex);
3537
97
104
3539
98
static struct net *devlink_net(const struct devlink *devlink)
105
struct net *devlink_net(const struct devlink *devlink)
3540
99
{
106
{
3541
100
	return read_pnet(&devlink->_net);
107
	return read_pnet(&devlink->_net);
3542
101
}
108
}
3548
102
109
EXPORT_SYMBOL_GPL(devlink_net);
3544
103
static void devlink_net_set(struct devlink *devlink, struct net *net)
3545
104
{
3546
105
	write_pnet(&devlink->_net, net);
3547
106
}
3549
107
110
3550
108
static struct devlink *devlink_get_from_attrs(struct net *net,
111
static struct devlink *devlink_get_from_attrs(struct net *net,
3551
109
					      struct nlattr **attrs)
112
					      struct nlattr **attrs)
3552
@@ -174,6 +177,80 @@ static struct devlink_port *devlink_port_get_from_info(struct devlink *devlink,
3553
174
	return devlink_port_get_from_attrs(devlink, info->attrs);
177
	return devlink_port_get_from_attrs(devlink, info->attrs);
3554
175
}
178
}
3555
176
179
3556
180
static inline bool
3557
181
devlink_rate_is_leaf(struct devlink_rate *devlink_rate)
3558
182
{
3559
183
	return devlink_rate->type == DEVLINK_RATE_TYPE_LEAF;
3560
184
}
3561
185
3562
186
static inline bool
3563
187
devlink_rate_is_node(struct devlink_rate *devlink_rate)
3564
188
{
3565
189
	return devlink_rate->type == DEVLINK_RATE_TYPE_NODE;
3566
190
}
3567
191
3568
192
static struct devlink_rate *
3569
193
devlink_rate_leaf_get_from_info(struct devlink *devlink, struct genl_info *info)
3570
194
{
3571
195
	struct devlink_rate *devlink_rate;
3572
196
	struct devlink_port *devlink_port;
3573
197
3574
198
	devlink_port = devlink_port_get_from_attrs(devlink, info->attrs);
3575
199
	if (IS_ERR(devlink_port))
3576
200
		return ERR_CAST(devlink_port);
3577
201
	devlink_rate = devlink_port->devlink_rate;
3578
202
	return devlink_rate ?: ERR_PTR(-ENODEV);
3579
203
}
3580
204
3581
205
static struct devlink_rate *
3582
206
devlink_rate_node_get_by_name(struct devlink *devlink, const char *node_name)
3583
207
{
3584
208
	static struct devlink_rate *devlink_rate;
3585
209
3586
210
	list_for_each_entry(devlink_rate, &devlink->rate_list, list) {
3587
211
		if (devlink_rate_is_node(devlink_rate) &&
3588
212
		    !strcmp(node_name, devlink_rate->name))
3589
213
			return devlink_rate;
3590
214
	}
3591
215
	return ERR_PTR(-ENODEV);
3592
216
}
3593
217
3594
218
static struct devlink_rate *
3595
219
devlink_rate_node_get_from_attrs(struct devlink *devlink, struct nlattr **attrs)
3596
220
{
3597
221
	const char *rate_node_name;
3598
222
	size_t len;
3599
223
3600
224
	if (!attrs[DEVLINK_ATTR_RATE_NODE_NAME])
3601
225
		return ERR_PTR(-EINVAL);
3602
226
	rate_node_name = nla_data(attrs[DEVLINK_ATTR_RATE_NODE_NAME]);
3603
227
	len = strlen(rate_node_name);
3604
228
	/* Name cannot be empty or decimal number */
3605
229
	if (!len || strspn(rate_node_name, "0123456789") == len)
3606
230
		return ERR_PTR(-EINVAL);
3607
231
3608
232
	return devlink_rate_node_get_by_name(devlink, rate_node_name);
3609
233
}
3610
234
3611
235
static struct devlink_rate *
3612
236
devlink_rate_node_get_from_info(struct devlink *devlink, struct genl_info *info)
3613
237
{
3614
238
	return devlink_rate_node_get_from_attrs(devlink, info->attrs);
3615
239
}
3616
240
3617
241
static struct devlink_rate *
3618
242
devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info)
3619
243
{
3620
244
	struct nlattr **attrs = info->attrs;
3621
245
3622
246
	if (attrs[DEVLINK_ATTR_PORT_INDEX])
3623
247
		return devlink_rate_leaf_get_from_info(devlink, info);
3624
248
	else if (attrs[DEVLINK_ATTR_RATE_NODE_NAME])
3625
249
		return devlink_rate_node_get_from_info(devlink, info);
3626
250
	else
3627
251
		return ERR_PTR(-EINVAL);
3628
252
}
3629
253
3630
177
struct devlink_sb {
254
struct devlink_sb {
3631
178
	struct list_head list;
255
	struct list_head list;
3632
179
	unsigned int index;
256
	unsigned int index;
3633
@@ -334,8 +411,12 @@ devlink_sb_tc_index_get_from_info(struct devlink_sb *devlink_sb,
3634
334
411
3635
335
struct devlink_region {
412
struct devlink_region {
3636
336
	struct devlink *devlink;
413
	struct devlink *devlink;
3637
414
	struct devlink_port *port;
3638
337
	struct list_head list;
415
	struct list_head list;
3640
338
	const char *name;
416
	union {
3641
417
		const struct devlink_region_ops *ops;
3642
418
		const struct devlink_port_region_ops *port_ops;
3643
419
	};
3644
339
	struct list_head snapshot_list;
420
	struct list_head snapshot_list;
3645
340
	u32 max_snapshots;
421
	u32 max_snapshots;
3646
341
	u32 cur_snapshots;
422
	u32 cur_snapshots;
3647
@@ -345,7 +426,6 @@ struct devlink_region {
3648
345
struct devlink_snapshot {
426
struct devlink_snapshot {
3649
346
	struct list_head list;
427
	struct list_head list;
3650
347
	struct devlink_region *region;
428
	struct devlink_region *region;
3651
348
	devlink_snapshot_data_dest_t *data_destructor;
3652
349
	u8 *data;
429
	u8 *data;
3653
350
	u32 id;
430
	u32 id;
3654
351
};
431
};
3655
@@ -356,7 +436,20 @@ devlink_region_get_by_name(struct devlink *devlink, const char *region_name)
3656
356
	struct devlink_region *region;
436
	struct devlink_region *region;
3657
357
437
3658
358
	list_for_each_entry(region, &devlink->region_list, list)
438
	list_for_each_entry(region, &devlink->region_list, list)
3660
359
		if (!strcmp(region->name, region_name))
439
		if (!strcmp(region->ops->name, region_name))
3661
440
			return region;
3662
441
3663
442
	return NULL;
3664
443
}
3665
444
3666
445
static struct devlink_region *
3667
446
devlink_port_region_get_by_name(struct devlink_port *port,
3668
447
				const char *region_name)
3669
448
{
3670
449
	struct devlink_region *region;
3671
450
3672
451
	list_for_each_entry(region, &port->region_list, list)
3673
452
		if (!strcmp(region->ops->name, region_name))
3674
360
			return region;
453
			return region;
3675
361
454
3676
362
	return NULL;
455
	return NULL;
3677
@@ -374,19 +467,21 @@ devlink_region_snapshot_get_by_id(struct devlink_region *region, u32 id)
3678
374
	return NULL;
467
	return NULL;
3679
375
}
468
}
3680
376
469
3684
377
#define DEVLINK_NL_FLAG_NEED_DEVLINK	BIT(0)
470
#define DEVLINK_NL_FLAG_NEED_PORT		BIT(0)
3685
378
#define DEVLINK_NL_FLAG_NEED_PORT	BIT(1)
471
#define DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT	BIT(1)
3686
379
#define DEVLINK_NL_FLAG_NEED_SB		BIT(2)
472
#define DEVLINK_NL_FLAG_NEED_RATE		BIT(2)
3687
473
#define DEVLINK_NL_FLAG_NEED_RATE_NODE		BIT(3)
3688
380
474
3689
381
/* The per devlink instance lock is taken by default in the pre-doit
475
/* The per devlink instance lock is taken by default in the pre-doit
3690
382
 * operation, yet several commands do not require this. The global
476
 * operation, yet several commands do not require this. The global
3691
383
 * devlink lock is taken and protects from disruption by user-calls.
477
 * devlink lock is taken and protects from disruption by user-calls.
3692
384
 */
478
 */
3694
385
#define DEVLINK_NL_FLAG_NO_LOCK		BIT(3)
479
#define DEVLINK_NL_FLAG_NO_LOCK			BIT(4)
3695
386
480
3696
387
static int devlink_nl_pre_doit(const struct genl_ops *ops,
481
static int devlink_nl_pre_doit(const struct genl_ops *ops,
3697
388
			       struct sk_buff *skb, struct genl_info *info)
482
			       struct sk_buff *skb, struct genl_info *info)
3698
389
{
483
{
3699
484
	struct devlink_port *devlink_port;
3700
390
	struct devlink *devlink;
485
	struct devlink *devlink;
3701
391
	int err;
486
	int err;
3702
392
487
3703
@@ -398,27 +493,36 @@ static int devlink_nl_pre_doit(const struct genl_ops *ops,
3704
398
	}
493
	}
3705
399
	if (~ops->internal_flags & DEVLINK_NL_FLAG_NO_LOCK)
494
	if (~ops->internal_flags & DEVLINK_NL_FLAG_NO_LOCK)
3706
400
		mutex_lock(&devlink->lock);
495
		mutex_lock(&devlink->lock);
3712
401
	if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_DEVLINK) {
496
	info->user_ptr[0] = devlink;
3713
402
		info->user_ptr[0] = devlink;
497
	if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_PORT) {
3709
403
	} else if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_PORT) {
3710
404
		struct devlink_port *devlink_port;
3711
405
3714
406
		devlink_port = devlink_port_get_from_info(devlink, info);
498
		devlink_port = devlink_port_get_from_info(devlink, info);
3715
407
		if (IS_ERR(devlink_port)) {
499
		if (IS_ERR(devlink_port)) {
3716
408
			err = PTR_ERR(devlink_port);
500
			err = PTR_ERR(devlink_port);
3717
409
			goto unlock;
501
			goto unlock;
3718
410
		}
502
		}
3723
411
		info->user_ptr[0] = devlink_port;
503
		info->user_ptr[1] = devlink_port;
3724
412
	}
504
	} else if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT) {
3725
413
	if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_SB) {
505
		devlink_port = devlink_port_get_from_info(devlink, info);
3726
414
		struct devlink_sb *devlink_sb;
506
		if (!IS_ERR(devlink_port))
3727
507
			info->user_ptr[1] = devlink_port;
3728
508
	} else if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_RATE) {
3729
509
		struct devlink_rate *devlink_rate;
3730
510
3731
511
		devlink_rate = devlink_rate_get_from_info(devlink, info);
3732
512
		if (IS_ERR(devlink_rate)) {
3733
513
			err = PTR_ERR(devlink_rate);
3734
514
			goto unlock;
3735
515
		}
3736
516
		info->user_ptr[1] = devlink_rate;
3737
517
	} else if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_RATE_NODE) {
3738
518
		struct devlink_rate *rate_node;
3739
415
519
3743
416
		devlink_sb = devlink_sb_get_from_info(devlink, info);
520
		rate_node = devlink_rate_node_get_from_info(devlink, info);
3744
417
		if (IS_ERR(devlink_sb)) {
521
		if (IS_ERR(rate_node)) {
3745
418
			err = PTR_ERR(devlink_sb);
522
			err = PTR_ERR(rate_node);
3746
419
			goto unlock;
523
			goto unlock;
3747
420
		}
524
		}
3749
421
		info->user_ptr[1] = devlink_sb;
525
		info->user_ptr[1] = rate_node;
3750
422
	}
526
	}
3751
423
	return 0;
527
	return 0;
3752
424
528
3753
@@ -434,7 +538,7 @@ static void devlink_nl_post_doit(const struct genl_ops *ops,
3754
434
{
538
{
3755
435
	struct devlink *devlink;
539
	struct devlink *devlink;
3756
436
540
3758
437
	devlink = devlink_get_from_info(info);
541
	devlink = info->user_ptr[0];
3759
438
	if (~ops->internal_flags & DEVLINK_NL_FLAG_NO_LOCK)
542
	if (~ops->internal_flags & DEVLINK_NL_FLAG_NO_LOCK)
3760
439
		mutex_unlock(&devlink->lock);
543
		mutex_unlock(&devlink->lock);
3761
440
	mutex_unlock(&devlink_mutex);
544
	mutex_unlock(&devlink_mutex);
3762
@@ -459,10 +563,132 @@ static int devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)
3763
459
	return 0;
563
	return 0;
3764
460
}
564
}
3765
461
565
3766
566
struct devlink_reload_combination {
3767
567
	enum devlink_reload_action action;
3768
568
	enum devlink_reload_limit limit;
3769
569
};
3770
570
3771
571
static const struct devlink_reload_combination devlink_reload_invalid_combinations[] = {
3772
572
	{
3773
573
		/* can't reinitialize driver with no down time */
3774
574
		.action = DEVLINK_RELOAD_ACTION_DRIVER_REINIT,
3775
575
		.limit = DEVLINK_RELOAD_LIMIT_NO_RESET,
3776
576
	},
3777
577
};
3778
578
3779
579
static bool
3780
580
devlink_reload_combination_is_invalid(enum devlink_reload_action action,
3781
581
				      enum devlink_reload_limit limit)
3782
582
{
3783
583
	int i;
3784
584
3785
585
	for (i = 0; i < ARRAY_SIZE(devlink_reload_invalid_combinations); i++)
3786
586
		if (devlink_reload_invalid_combinations[i].action == action &&
3787
587
		    devlink_reload_invalid_combinations[i].limit == limit)
3788
588
			return true;
3789
589
	return false;
3790
590
}
3791
591
3792
592
static bool
3793
593
devlink_reload_action_is_supported(struct devlink *devlink, enum devlink_reload_action action)
3794
594
{
3795
595
	return test_bit(action, &devlink->ops->reload_actions);
3796
596
}
3797
597
3798
598
static bool
3799
599
devlink_reload_limit_is_supported(struct devlink *devlink, enum devlink_reload_limit limit)
3800
600
{
3801
601
	return test_bit(limit, &devlink->ops->reload_limits);
3802
602
}
3803
603
3804
604
static int devlink_reload_stat_put(struct sk_buff *msg,
3805
605
				   enum devlink_reload_limit limit, u32 value)
3806
606
{
3807
607
	struct nlattr *reload_stats_entry;
3808
608
3809
609
	reload_stats_entry = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_STATS_ENTRY);
3810
610
	if (!reload_stats_entry)
3811
611
		return -EMSGSIZE;
3812
612
3813
613
	if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_STATS_LIMIT, limit) ||
3814
614
	    nla_put_u32(msg, DEVLINK_ATTR_RELOAD_STATS_VALUE, value))
3815
615
		goto nla_put_failure;
3816
616
	nla_nest_end(msg, reload_stats_entry);
3817
617
	return 0;
3818
618
3819
619
nla_put_failure:
3820
620
	nla_nest_cancel(msg, reload_stats_entry);
3821
621
	return -EMSGSIZE;
3822
622
}
3823
623
3824
624
static int devlink_reload_stats_put(struct sk_buff *msg, struct devlink *devlink, bool is_remote)
3825
625
{
3826
626
	struct nlattr *reload_stats_attr, *act_info, *act_stats;
3827
627
	int i, j, stat_idx;
3828
628
	u32 value;
3829
629
3830
630
	if (!is_remote)
3831
631
		reload_stats_attr = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_STATS);
3832
632
	else
3833
633
		reload_stats_attr = nla_nest_start(msg, DEVLINK_ATTR_REMOTE_RELOAD_STATS);
3834
634
3835
635
	if (!reload_stats_attr)
3836
636
		return -EMSGSIZE;
3837
637
3838
638
	for (i = 0; i <= DEVLINK_RELOAD_ACTION_MAX; i++) {
3839
639
		if ((!is_remote &&
3840
640
		     !devlink_reload_action_is_supported(devlink, i)) ||
3841
641
		    i == DEVLINK_RELOAD_ACTION_UNSPEC)
3842
642
			continue;
3843
643
		act_info = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_ACTION_INFO);
3844
644
		if (!act_info)
3845
645
			goto nla_put_failure;
3846
646
3847
647
		if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_ACTION, i))
3848
648
			goto action_info_nest_cancel;
3849
649
		act_stats = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_ACTION_STATS);
3850
650
		if (!act_stats)
3851
651
			goto action_info_nest_cancel;
3852
652
3853
653
		for (j = 0; j <= DEVLINK_RELOAD_LIMIT_MAX; j++) {
3854
654
			/* Remote stats are shown even if not locally supported.
3855
655
			 * Stats of actions with unspecified limit are shown
3856
656
			 * though drivers don't need to register unspecified
3857
657
			 * limit.
3858
658
			 */
3859
659
			if ((!is_remote && j != DEVLINK_RELOAD_LIMIT_UNSPEC &&
3860
660
			     !devlink_reload_limit_is_supported(devlink, j)) ||
3861
661
			    devlink_reload_combination_is_invalid(i, j))
3862
662
				continue;
3863
663
3864
664
			stat_idx = j * __DEVLINK_RELOAD_ACTION_MAX + i;
3865
665
			if (!is_remote)
3866
666
				value = devlink->stats.reload_stats[stat_idx];
3867
667
			else
3868
668
				value = devlink->stats.remote_reload_stats[stat_idx];
3869
669
			if (devlink_reload_stat_put(msg, j, value))
3870
670
				goto action_stats_nest_cancel;
3871
671
		}
3872
672
		nla_nest_end(msg, act_stats);
3873
673
		nla_nest_end(msg, act_info);
3874
674
	}
3875
675
	nla_nest_end(msg, reload_stats_attr);
3876
676
	return 0;
3877
677
3878
678
action_stats_nest_cancel:
3879
679
	nla_nest_cancel(msg, act_stats);
3880
680
action_info_nest_cancel:
3881
681
	nla_nest_cancel(msg, act_info);
3882
682
nla_put_failure:
3883
683
	nla_nest_cancel(msg, reload_stats_attr);
3884
684
	return -EMSGSIZE;
3885
685
}
3886
686
3887
462
static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
687
static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
3888
463
			   enum devlink_command cmd, u32 portid,
688
			   enum devlink_command cmd, u32 portid,
3889
464
			   u32 seq, int flags)
689
			   u32 seq, int flags)
3890
465
{
690
{
3891
691
	struct nlattr *dev_stats;
3892
466
	void *hdr;
692
	void *hdr;
3893
467
693
3894
468
	hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);
694
	hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);
3895
@@ -474,9 +700,21 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
3896
474
	if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_FAILED, devlink->reload_failed))
700
	if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_FAILED, devlink->reload_failed))
3897
475
		goto nla_put_failure;
701
		goto nla_put_failure;
3898
476
702
3899
703
	dev_stats = nla_nest_start(msg, DEVLINK_ATTR_DEV_STATS);
3900
704
	if (!dev_stats)
3901
705
		goto nla_put_failure;
3902
706
3903
707
	if (devlink_reload_stats_put(msg, devlink, false))
3904
708
		goto dev_stats_nest_cancel;
3905
709
	if (devlink_reload_stats_put(msg, devlink, true))
3906
710
		goto dev_stats_nest_cancel;
3907
711
3908
712
	nla_nest_end(msg, dev_stats);
3909
477
	genlmsg_end(msg, hdr);
713
	genlmsg_end(msg, hdr);
3910
478
	return 0;
714
	return 0;
3911
479
715
3912
716
dev_stats_nest_cancel:
3913
717
	nla_nest_cancel(msg, dev_stats);
3914
480
nla_put_failure:
718
nla_put_failure:
3915
481
	genlmsg_cancel(msg, hdr);
719
	genlmsg_cancel(msg, hdr);
3916
482
	return -EMSGSIZE;
720
	return -EMSGSIZE;
3917
@@ -508,26 +746,47 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg,
3918
508
{
746
{
3919
509
	struct devlink_port_attrs *attrs = &devlink_port->attrs;
747
	struct devlink_port_attrs *attrs = &devlink_port->attrs;
3920
510
748
3922
511
	if (!attrs->set)
749
	if (!devlink_port->attrs_set)
3923
512
		return 0;
750
		return 0;
3924
751
	if (attrs->lanes) {
3925
752
		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_LANES, attrs->lanes))
3926
753
			return -EMSGSIZE;
3927
754
	}
3928
755
	if (nla_put_u8(msg, DEVLINK_ATTR_PORT_SPLITTABLE, attrs->splittable))
3929
756
		return -EMSGSIZE;
3930
513
	if (nla_put_u16(msg, DEVLINK_ATTR_PORT_FLAVOUR, attrs->flavour))
757
	if (nla_put_u16(msg, DEVLINK_ATTR_PORT_FLAVOUR, attrs->flavour))
3931
514
		return -EMSGSIZE;
758
		return -EMSGSIZE;
3932
515
	switch (devlink_port->attrs.flavour) {
759
	switch (devlink_port->attrs.flavour) {
3933
516
	case DEVLINK_PORT_FLAVOUR_PCI_PF:
760
	case DEVLINK_PORT_FLAVOUR_PCI_PF:
3936
517
		if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER,
761
		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,
3937
518
				attrs->pci_pf.pf))
762
				attrs->pci_pf.controller) ||
3938
763
		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, attrs->pci_pf.pf))
3939
764
			return -EMSGSIZE;
3940
765
		if (nla_put_u8(msg, DEVLINK_ATTR_PORT_EXTERNAL, attrs->pci_pf.external))
3941
519
			return -EMSGSIZE;
766
			return -EMSGSIZE;
3942
520
		break;
767
		break;
3943
521
	case DEVLINK_PORT_FLAVOUR_PCI_VF:
768
	case DEVLINK_PORT_FLAVOUR_PCI_VF:
3948
522
		if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER,
769
		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,
3949
523
				attrs->pci_vf.pf) ||
770
				attrs->pci_vf.controller) ||
3950
524
		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_VF_NUMBER,
771
		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, attrs->pci_vf.pf) ||
3951
525
				attrs->pci_vf.vf))
772
		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_VF_NUMBER, attrs->pci_vf.vf))
3952
773
			return -EMSGSIZE;
3953
774
		if (nla_put_u8(msg, DEVLINK_ATTR_PORT_EXTERNAL, attrs->pci_vf.external))
3954
775
			return -EMSGSIZE;
3955
776
		break;
3956
777
	case DEVLINK_PORT_FLAVOUR_PCI_SF:
3957
778
		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,
3958
779
				attrs->pci_sf.controller) ||
3959
780
		    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER,
3960
781
				attrs->pci_sf.pf) ||
3961
782
		    nla_put_u32(msg, DEVLINK_ATTR_PORT_PCI_SF_NUMBER,
3962
783
				attrs->pci_sf.sf))
3963
526
			return -EMSGSIZE;
784
			return -EMSGSIZE;
3964
527
		break;
785
		break;
3965
528
	case DEVLINK_PORT_FLAVOUR_PHYSICAL:
786
	case DEVLINK_PORT_FLAVOUR_PHYSICAL:
3966
529
	case DEVLINK_PORT_FLAVOUR_CPU:
787
	case DEVLINK_PORT_FLAVOUR_CPU:
3967
530
	case DEVLINK_PORT_FLAVOUR_DSA:
788
	case DEVLINK_PORT_FLAVOUR_DSA:
3968
789
	case DEVLINK_PORT_FLAVOUR_VIRTUAL:
3969
531
		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_NUMBER,
790
		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_NUMBER,
3970
532
				attrs->phys.port_number))
791
				attrs->phys.port_number))
3971
533
			return -EMSGSIZE;
792
			return -EMSGSIZE;
3972
@@ -546,11 +805,167 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg,
3973
546
	return 0;
805
	return 0;
3974
547
}
806
}
3975
548
807
3977
549
static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,
808
static int
3978
809
devlink_port_fn_hw_addr_fill(struct devlink *devlink, const struct devlink_ops *ops,
3979
810
			     struct devlink_port *port, struct sk_buff *msg,
3980
811
			     struct netlink_ext_ack *extack, bool *msg_updated)
3981
812
{
3982
813
	u8 hw_addr[MAX_ADDR_LEN];
3983
814
	int hw_addr_len;
3984
815
	int err;
3985
816
3986
817
	if (!ops->port_function_hw_addr_get)
3987
818
		return 0;
3988
819
3989
820
	err = ops->port_function_hw_addr_get(devlink, port, hw_addr, &hw_addr_len, extack);
3990
821
	if (err) {
3991
822
		if (err == -EOPNOTSUPP)
3992
823
			return 0;
3993
824
		return err;
3994
825
	}
3995
826
	err = nla_put(msg, DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR, hw_addr_len, hw_addr);
3996
827
	if (err)
3997
828
		return err;
3998
829
	*msg_updated = true;
3999
830
	return 0;
4000
831
}
4001
832
4002
833
static int devlink_nl_rate_fill(struct sk_buff *msg,
4003
834
				struct devlink_rate *devlink_rate,
4004
835
				enum devlink_command cmd, u32 portid, u32 seq,
4005
836
				int flags, struct netlink_ext_ack *extack)
4006
837
{
4007
838
	struct devlink *devlink = devlink_rate->devlink;
4008
839
	void *hdr;
4009
840
4010
841
	hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);
4011
842
	if (!hdr)
4012
843
		return -EMSGSIZE;
4013
844
4014
845
	if (devlink_nl_put_handle(msg, devlink))
4015
846
		goto nla_put_failure;
4016
847
4017
848
	if (nla_put_u16(msg, DEVLINK_ATTR_RATE_TYPE, devlink_rate->type))
4018
849
		goto nla_put_failure;
4019
850
4020
851
	if (devlink_rate_is_leaf(devlink_rate)) {
4021
852
		if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,
4022
853
				devlink_rate->devlink_port->index))
4023
854
			goto nla_put_failure;
4024
855
	} else if (devlink_rate_is_node(devlink_rate)) {
4025
856
		if (nla_put_string(msg, DEVLINK_ATTR_RATE_NODE_NAME,
4026
857
				   devlink_rate->name))
4027
858
			goto nla_put_failure;
4028
859
	}
4029
860
4030
861
	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_RATE_TX_SHARE,
4031
862
			      devlink_rate->tx_share, DEVLINK_ATTR_PAD))
4032
863
		goto nla_put_failure;
4033
864
4034
865
	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_RATE_TX_MAX,
4035
866
			      devlink_rate->tx_max, DEVLINK_ATTR_PAD))
4036
867
		goto nla_put_failure;
4037
868
4038
869
	if (devlink_rate->parent)
4039
870
		if (nla_put_string(msg, DEVLINK_ATTR_RATE_PARENT_NODE_NAME,
4040
871
				   devlink_rate->parent->name))
4041
872
			goto nla_put_failure;
4042
873
4043
874
	genlmsg_end(msg, hdr);
4044
875
	return 0;
4045
876
4046
877
nla_put_failure:
4047
878
	genlmsg_cancel(msg, hdr);
4048
879
	return -EMSGSIZE;
4049
880
}
4050
881
4051
882
static bool
4052
883
devlink_port_fn_state_valid(enum devlink_port_fn_state state)
4053
884
{
4054
885
	return state == DEVLINK_PORT_FN_STATE_INACTIVE ||
4055
886
	       state == DEVLINK_PORT_FN_STATE_ACTIVE;
4056
887
}
4057
888
4058
889
static bool
4059
890
devlink_port_fn_opstate_valid(enum devlink_port_fn_opstate opstate)
4060
891
{
4061
892
	return opstate == DEVLINK_PORT_FN_OPSTATE_DETACHED ||
4062
893
	       opstate == DEVLINK_PORT_FN_OPSTATE_ATTACHED;
4063
894
}
4064
895
4065
896
static int
4066
897
devlink_port_fn_state_fill(struct devlink *devlink,
4067
898
			   const struct devlink_ops *ops,
4068
899
			   struct devlink_port *port, struct sk_buff *msg,
4069
900
			   struct netlink_ext_ack *extack,
4070
901
			   bool *msg_updated)
4071
902
{
4072
903
	enum devlink_port_fn_opstate opstate;
4073
904
	enum devlink_port_fn_state state;
4074
905
	int err;
4075
906
4076
907
	if (!ops->port_fn_state_get)
4077
908
		return 0;
4078
909
4079
910
	err = ops->port_fn_state_get(devlink, port, &state, &opstate, extack);
4080
911
	if (err) {
4081
912
		if (err == -EOPNOTSUPP)
4082
913
			return 0;
4083
914
		return err;
4084
915
	}
4085
916
	if (!devlink_port_fn_state_valid(state)) {
4086
917
		WARN_ON_ONCE(1);
4087
918
		NL_SET_ERR_MSG_MOD(extack, "Invalid state read from driver");
4088
919
		return -EINVAL;
4089
920
	}
4090
921
	if (!devlink_port_fn_opstate_valid(opstate)) {
4091
922
		WARN_ON_ONCE(1);
4092
923
		NL_SET_ERR_MSG_MOD(extack,
4093
924
				   "Invalid operational state read from driver");
4094
925
		return -EINVAL;
4095
926
	}
4096
927
	if (nla_put_u8(msg, DEVLINK_PORT_FN_ATTR_STATE, state) ||
4097
928
	    nla_put_u8(msg, DEVLINK_PORT_FN_ATTR_OPSTATE, opstate))
4098
929
		return -EMSGSIZE;
4099
930
	*msg_updated = true;
4100
931
	return 0;
4101
932
}
4102
933
4103
934
static int
4104
935
devlink_nl_port_function_attrs_put(struct sk_buff *msg, struct devlink_port *port,
4105
936
				   struct netlink_ext_ack *extack)
4106
937
{
4107
938
	struct devlink *devlink = port->devlink;
4108
939
	const struct devlink_ops *ops;
4109
940
	struct nlattr *function_attr;
4110
941
	bool msg_updated = false;
4111
942
	int err;
4112
943
4113
944
	function_attr = nla_nest_start_noflag(msg, DEVLINK_ATTR_PORT_FUNCTION);
4114
945
	if (!function_attr)
4115
946
		return -EMSGSIZE;
4116
947
4117
948
	ops = devlink->ops;
4118
949
	err = devlink_port_fn_hw_addr_fill(devlink, ops, port, msg,
4119
950
					   extack, &msg_updated);
4120
951
	if (err)
4121
952
		goto out;
4122
953
	err = devlink_port_fn_state_fill(devlink, ops, port, msg, extack,
4123
954
					 &msg_updated);
4124
955
out:
4125
956
	if (err || !msg_updated)
4126
957
		nla_nest_cancel(msg, function_attr);
4127
958
	else
4128
959
		nla_nest_end(msg, function_attr);
4129
960
	return err;
4130
961
}
4131
962
4132
963
static int devlink_nl_port_fill(struct sk_buff *msg,
4133
550
				struct devlink_port *devlink_port,
964
				struct devlink_port *devlink_port,
4136
551
				enum devlink_command cmd, u32 portid,
965
				enum devlink_command cmd, u32 portid, u32 seq,
4137
552
				u32 seq, int flags)
966
				int flags, struct netlink_ext_ack *extack)
4138
553
{
967
{
4139
968
	struct devlink *devlink = devlink_port->devlink;
4140
554
	void *hdr;
969
	void *hdr;
4141
555
970
4142
556
	hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);
971
	hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);
4143
@@ -593,6 +1008,8 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,
4144
593
	rtnl_unlock();
1008
	rtnl_unlock();
4145
594
	if (devlink_nl_port_attrs_put(msg, devlink_port))
1009
	if (devlink_nl_port_attrs_put(msg, devlink_port))
4146
595
		goto nla_put_failure;
1010
		goto nla_put_failure;
4147
1011
	if (devlink_nl_port_function_attrs_put(msg, devlink_port, extack))
4148
1012
		goto nla_put_failure;
4149
596
1013
4150
597
	genlmsg_end(msg, hdr);
1014
	genlmsg_end(msg, hdr);
4151
598
	return 0;
1015
	return 0;
4152
@@ -608,84 +1025,95 @@ nla_put_failure:
4153
608
static void devlink_port_notify(struct devlink_port *devlink_port,
1025
static void devlink_port_notify(struct devlink_port *devlink_port,
4154
609
				enum devlink_command cmd)
1026
				enum devlink_command cmd)
4155
610
{
1027
{
4156
611
	struct devlink *devlink = devlink_port->devlink;
4157
612
	struct sk_buff *msg;
1028
	struct sk_buff *msg;
4158
613
	int err;
1029
	int err;
4159
614
1030
4160
615
	if (!devlink_port->registered)
4161
616
		return;
4162
617
4163
618
	WARN_ON(cmd != DEVLINK_CMD_PORT_NEW && cmd != DEVLINK_CMD_PORT_DEL);
1031
	WARN_ON(cmd != DEVLINK_CMD_PORT_NEW && cmd != DEVLINK_CMD_PORT_DEL);
4164
619
1032
4165
620
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
1033
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
4166
621
	if (!msg)
1034
	if (!msg)
4167
622
		return;
1035
		return;
4168
623
1036
4170
624
	err = devlink_nl_port_fill(msg, devlink, devlink_port, cmd, 0, 0, 0);
1037
	err = devlink_nl_port_fill(msg, devlink_port, cmd, 0, 0, 0, NULL);
4171
625
	if (err) {
1038
	if (err) {
4172
626
		nlmsg_free(msg);
1039
		nlmsg_free(msg);
4173
627
		return;
1040
		return;
4174
628
	}
1041
	}
4175
629
1042
4178
630
	genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
1043
	genlmsg_multicast_netns(&devlink_nl_family,
4179
631
				msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
1044
				devlink_net(devlink_port->devlink), msg, 0,
4180
1045
				DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
4181
632
}
1046
}
4182
633
1047
4184
634
static int devlink_nl_cmd_get_doit(struct sk_buff *skb, struct genl_info *info)
1048
static void devlink_rate_notify(struct devlink_rate *devlink_rate,
4185
1049
				enum devlink_command cmd)
4186
635
{
1050
{
4187
636
	struct devlink *devlink = info->user_ptr[0];
4188
637
	struct sk_buff *msg;
1051
	struct sk_buff *msg;
4189
638
	int err;
1052
	int err;
4190
639
1053
4191
1054
	WARN_ON(cmd != DEVLINK_CMD_RATE_NEW && cmd != DEVLINK_CMD_RATE_DEL);
4192
1055
4193
640
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
1056
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
4194
641
	if (!msg)
1057
	if (!msg)
4196
642
		return -ENOMEM;
1058
		return;
4197
643
1059
4200
644
	err = devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW,
1060
	err = devlink_nl_rate_fill(msg, devlink_rate, cmd, 0, 0, 0, NULL);
4199
645
			      info->snd_portid, info->snd_seq, 0);
4201
646
	if (err) {
1061
	if (err) {
4202
647
		nlmsg_free(msg);
1062
		nlmsg_free(msg);
4204
648
		return err;
1063
		return;
4205
649
	}
1064
	}
4206
650
1065
4208
651
	return genlmsg_reply(msg, info);
1066
	genlmsg_multicast_netns(&devlink_nl_family,
4209
1067
				devlink_net(devlink_rate->devlink), msg, 0,
4210
1068
				DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
4211
652
}
1069
}
4212
653
1070
4215
654
static int devlink_nl_cmd_get_dumpit(struct sk_buff *msg,
1071
static int devlink_nl_cmd_rate_get_dumpit(struct sk_buff *msg,
4216
655
				     struct netlink_callback *cb)
1072
					  struct netlink_callback *cb)
4217
656
{
1073
{
4218
1074
	struct devlink_rate *devlink_rate;
4219
657
	struct devlink *devlink;
1075
	struct devlink *devlink;
4220
658
	int start = cb->args[0];
1076
	int start = cb->args[0];
4221
659
	int idx = 0;
1077
	int idx = 0;
4223
660
	int err;
1078
	int err = 0;
4224
661
1079
4225
662
	mutex_lock(&devlink_mutex);
1080
	mutex_lock(&devlink_mutex);
4226
663
	list_for_each_entry(devlink, &devlink_list, list) {
1081
	list_for_each_entry(devlink, &devlink_list, list) {
4227
664
		if (!net_eq(devlink_net(devlink), sock_net(msg->sk)))
1082
		if (!net_eq(devlink_net(devlink), sock_net(msg->sk)))
4228
665
			continue;
1083
			continue;
4230
666
		if (idx < start) {
1084
		mutex_lock(&devlink->lock);
4231
1085
		list_for_each_entry(devlink_rate, &devlink->rate_list, list) {
4232
1086
			enum devlink_command cmd = DEVLINK_CMD_RATE_NEW;
4233
1087
			u32 id = NETLINK_CB(cb->skb).portid;
4234
1088
4235
1089
			if (idx < start) {
4236
1090
				idx++;
4237
1091
				continue;
4238
1092
			}
4239
1093
			err = devlink_nl_rate_fill(msg, devlink_rate, cmd, id,
4240
1094
						   cb->nlh->nlmsg_seq,
4241
1095
						   NLM_F_MULTI, NULL);
4242
1096
			if (err) {
4243
1097
				mutex_unlock(&devlink->lock);
4244
1098
				goto out;
4245
1099
			}
4246
667
			idx++;
1100
			idx++;
4247
668
			continue;
4248
669
		}
1101
		}
4255
670
		err = devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW,
1102
		mutex_unlock(&devlink->lock);
4250
671
				      NETLINK_CB(cb->skb).portid,
4251
672
				      cb->nlh->nlmsg_seq, NLM_F_MULTI);
4252
673
		if (err)
4253
674
			goto out;
4254
675
		idx++;
4256
676
	}
1103
	}
4257
677
out:
1104
out:
4258
678
	mutex_unlock(&devlink_mutex);
1105
	mutex_unlock(&devlink_mutex);
4259
1106
	if (err != -EMSGSIZE)
4260
1107
		return err;
4261
679
1108
4262
680
	cb->args[0] = idx;
1109
	cb->args[0] = idx;
4263
681
	return msg->len;
1110
	return msg->len;
4264
682
}
1111
}
4265
683
1112
4267
684
static int devlink_nl_cmd_port_get_doit(struct sk_buff *skb,
1113
static int devlink_nl_cmd_rate_get_doit(struct sk_buff *skb,
4268
685
					struct genl_info *info)
1114
					struct genl_info *info)
4269
686
{
1115
{
4272
687
	struct devlink_port *devlink_port = info->user_ptr[0];
1116
	struct devlink_rate *devlink_rate = info->user_ptr[1];
4271
688
	struct devlink *devlink = devlink_port->devlink;
4273
689
	struct sk_buff *msg;
1117
	struct sk_buff *msg;
4274
690
	int err;
1118
	int err;
4275
691
1119
4276
@@ -693,9 +1121,9 @@ static int devlink_nl_cmd_port_get_doit(struct sk_buff *skb,
4277
693
	if (!msg)
1121
	if (!msg)
4278
694
		return -ENOMEM;
1122
		return -ENOMEM;
4279
695
1123
4283
696
	err = devlink_nl_port_fill(msg, devlink, devlink_port,
1124
	err = devlink_nl_rate_fill(msg, devlink_rate, DEVLINK_CMD_RATE_NEW,
4284
697
				   DEVLINK_CMD_PORT_NEW,
1125
				   info->snd_portid, info->snd_seq, 0,
4285
698
				   info->snd_portid, info->snd_seq, 0);
1126
				   info->extack);
4286
699
	if (err) {
1127
	if (err) {
4287
700
		nlmsg_free(msg);
1128
		nlmsg_free(msg);
4288
701
		return err;
1129
		return err;
4289
@@ -704,8 +1132,92 @@ static int devlink_nl_cmd_port_get_doit(struct sk_buff *skb,
4290
704
	return genlmsg_reply(msg, info);
1132
	return genlmsg_reply(msg, info);
4291
705
}
1133
}
4292
706
1134
4295
707
static int devlink_nl_cmd_port_get_dumpit(struct sk_buff *msg,
1135
static bool
4296
708
					  struct netlink_callback *cb)
1136
devlink_rate_is_parent_node(struct devlink_rate *devlink_rate,
4297
1137
			    struct devlink_rate *parent)
4298
1138
{
4299
1139
	while (parent) {
4300
1140
		if (parent == devlink_rate)
4301
1141
			return true;
4302
1142
		parent = parent->parent;
4303
1143
	}
4304
1144
	return false;
4305
1145
}
4306
1146
4307
1147
static int devlink_nl_cmd_get_doit(struct sk_buff *skb, struct genl_info *info)
4308
1148
{
4309
1149
	struct devlink *devlink = info->user_ptr[0];
4310
1150
	struct sk_buff *msg;
4311
1151
	int err;
4312
1152
4313
1153
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
4314
1154
	if (!msg)
4315
1155
		return -ENOMEM;
4316
1156
4317
1157
	err = devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW,
4318
1158
			      info->snd_portid, info->snd_seq, 0);
4319
1159
	if (err) {
4320
1160
		nlmsg_free(msg);
4321
1161
		return err;
4322
1162
	}
4323
1163
4324
1164
	return genlmsg_reply(msg, info);
4325
1165
}
4326
1166
4327
1167
static int devlink_nl_cmd_get_dumpit(struct sk_buff *msg,
4328
1168
				     struct netlink_callback *cb)
4329
1169
{
4330
1170
	struct devlink *devlink;
4331
1171
	int start = cb->args[0];
4332
1172
	int idx = 0;
4333
1173
	int err;
4334
1174
4335
1175
	mutex_lock(&devlink_mutex);
4336
1176
	list_for_each_entry(devlink, &devlink_list, list) {
4337
1177
		if (!net_eq(devlink_net(devlink), sock_net(msg->sk)))
4338
1178
			continue;
4339
1179
		if (idx < start) {
4340
1180
			idx++;
4341
1181
			continue;
4342
1182
		}
4343
1183
		err = devlink_nl_fill(msg, devlink, DEVLINK_CMD_NEW,
4344
1184
				      NETLINK_CB(cb->skb).portid,
4345
1185
				      cb->nlh->nlmsg_seq, NLM_F_MULTI);
4346
1186
		if (err)
4347
1187
			goto out;
4348
1188
		idx++;
4349
1189
	}
4350
1190
out:
4351
1191
	mutex_unlock(&devlink_mutex);
4352
1192
4353
1193
	cb->args[0] = idx;
4354
1194
	return msg->len;
4355
1195
}
4356
1196
4357
1197
static int devlink_nl_cmd_port_get_doit(struct sk_buff *skb,
4358
1198
					struct genl_info *info)
4359
1199
{
4360
1200
	struct devlink_port *devlink_port = info->user_ptr[1];
4361
1201
	struct sk_buff *msg;
4362
1202
	int err;
4363
1203
4364
1204
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
4365
1205
	if (!msg)
4366
1206
		return -ENOMEM;
4367
1207
4368
1208
	err = devlink_nl_port_fill(msg, devlink_port, DEVLINK_CMD_PORT_NEW,
4369
1209
				   info->snd_portid, info->snd_seq, 0,
4370
1210
				   info->extack);
4371
1211
	if (err) {
4372
1212
		nlmsg_free(msg);
4373
1213
		return err;
4374
1214
	}
4375
1215
4376
1216
	return genlmsg_reply(msg, info);
4377
1217
}
4378
1218
4379
1219
static int devlink_nl_cmd_port_get_dumpit(struct sk_buff *msg,
4380
1220
					  struct netlink_callback *cb)
4381
709
{
1221
{
4382
710
	struct devlink *devlink;
1222
	struct devlink *devlink;
4383
711
	struct devlink_port *devlink_port;
1223
	struct devlink_port *devlink_port;
4384
@@ -723,11 +1235,11 @@ static int devlink_nl_cmd_port_get_dumpit(struct sk_buff *msg,
4385
723
				idx++;
1235
				idx++;
4386
724
				continue;
1236
				continue;
4387
725
			}
1237
			}
4389
726
			err = devlink_nl_port_fill(msg, devlink, devlink_port,
1238
			err = devlink_nl_port_fill(msg, devlink_port,
4390
727
						   DEVLINK_CMD_NEW,
1239
						   DEVLINK_CMD_NEW,
4391
728
						   NETLINK_CB(cb->skb).portid,
1240
						   NETLINK_CB(cb->skb).portid,
4392
729
						   cb->nlh->nlmsg_seq,
1241
						   cb->nlh->nlmsg_seq,
4394
730
						   NLM_F_MULTI);
1242
						   NLM_F_MULTI, cb->extack);
4395
731
			if (err) {
1243
			if (err) {
4396
732
				mutex_unlock(&devlink->lock);
1244
				mutex_unlock(&devlink->lock);
4397
733
				goto out;
1245
				goto out;
4398
@@ -765,10 +1277,95 @@ static int devlink_port_type_set(struct devlink *devlink,
4399
765
	return -EOPNOTSUPP;
1277
	return -EOPNOTSUPP;
4400
766
}
1278
}
4401
767
1279
4402
1280
static int
4403
1281
devlink_port_function_hw_addr_set(struct devlink *devlink, struct devlink_port *port,
4404
1282
				  const struct nlattr *attr, struct netlink_ext_ack *extack)
4405
1283
{
4406
1284
	const struct devlink_ops *ops;
4407
1285
	const u8 *hw_addr;
4408
1286
	int hw_addr_len;
4409
1287
4410
1288
	hw_addr = nla_data(attr);
4411
1289
	hw_addr_len = nla_len(attr);
4412
1290
	if (hw_addr_len > MAX_ADDR_LEN) {
4413
1291
		NL_SET_ERR_MSG_MOD(extack, "Port function hardware address too long");
4414
1292
		return -EINVAL;
4415
1293
	}
4416
1294
	if (port->type == DEVLINK_PORT_TYPE_ETH) {
4417
1295
		if (hw_addr_len != ETH_ALEN) {
4418
1296
			NL_SET_ERR_MSG_MOD(extack, "Address must be 6 bytes for Ethernet device");
4419
1297
			return -EINVAL;
4420
1298
		}
4421
1299
		if (!is_unicast_ether_addr(hw_addr)) {
4422
1300
			NL_SET_ERR_MSG_MOD(extack, "Non-unicast hardware address unsupported");
4423
1301
			return -EINVAL;
4424
1302
		}
4425
1303
	}
4426
1304
4427
1305
	ops = devlink->ops;
4428
1306
	if (!ops->port_function_hw_addr_set) {
4429
1307
		NL_SET_ERR_MSG_MOD(extack, "Port doesn't support function attributes");
4430
1308
		return -EOPNOTSUPP;
4431
1309
	}
4432
1310
4433
1311
	return ops->port_function_hw_addr_set(devlink, port, hw_addr, hw_addr_len, extack);
4434
1312
}
4435
1313
4436
1314
static int devlink_port_fn_state_set(struct devlink *devlink,
4437
1315
				     struct devlink_port *port,
4438
1316
				     const struct nlattr *attr,
4439
1317
				     struct netlink_ext_ack *extack)
4440
1318
{
4441
1319
	enum devlink_port_fn_state state;
4442
1320
	const struct devlink_ops *ops;
4443
1321
4444
1322
	state = nla_get_u8(attr);
4445
1323
	ops = devlink->ops;
4446
1324
	if (!ops->port_fn_state_set) {
4447
1325
		NL_SET_ERR_MSG_MOD(extack,
4448
1326
				   "Function does not support state setting");
4449
1327
		return -EOPNOTSUPP;
4450
1328
	}
4451
1329
	return ops->port_fn_state_set(devlink, port, state, extack);
4452
1330
}
4453
1331
4454
1332
static int
4455
1333
devlink_port_function_set(struct devlink *devlink, struct devlink_port *port,
4456
1334
			  const struct nlattr *attr, struct netlink_ext_ack *extack)
4457
1335
{
4458
1336
	struct nlattr *tb[DEVLINK_PORT_FUNCTION_ATTR_MAX + 1];
4459
1337
	int err;
4460
1338
4461
1339
	err = nla_parse_nested(tb, DEVLINK_PORT_FUNCTION_ATTR_MAX, attr,
4462
1340
			       devlink_function_nl_policy, extack);
4463
1341
	if (err < 0) {
4464
1342
		NL_SET_ERR_MSG_MOD(extack, "Fail to parse port function attributes");
4465
1343
		return err;
4466
1344
	}
4467
1345
4468
1346
	attr = tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR];
4469
1347
	if (attr) {
4470
1348
		err = devlink_port_function_hw_addr_set(devlink, port, attr, extack);
4471
1349
		if (err)
4472
1350
			return err;
4473
1351
	}
4474
1352
	/* Keep this as the last function attribute set, so that when
4475
1353
	 * multiple port function attributes are set along with state,
4476
1354
	 * Those can be applied first before activating the state.
4477
1355
	 */
4478
1356
	attr = tb[DEVLINK_PORT_FN_ATTR_STATE];
4479
1357
	if (attr)
4480
1358
		err = devlink_port_fn_state_set(devlink, port, attr, extack);
4481
1359
4482
1360
	if (!err)
4483
1361
		devlink_port_notify(port, DEVLINK_CMD_PORT_NEW);
4484
1362
	return err;
4485
1363
}
4486
1364
4487
768
static int devlink_nl_cmd_port_set_doit(struct sk_buff *skb,
1365
static int devlink_nl_cmd_port_set_doit(struct sk_buff *skb,
4488
769
					struct genl_info *info)
1366
					struct genl_info *info)
4489
770
{
1367
{
4491
771
	struct devlink_port *devlink_port = info->user_ptr[0];
1368
	struct devlink_port *devlink_port = info->user_ptr[1];
4492
772
	struct devlink *devlink = devlink_port->devlink;
1369
	struct devlink *devlink = devlink_port->devlink;
4493
773
	int err;
1370
	int err;
4494
774
1371
4495
@@ -780,6 +1377,16 @@ static int devlink_nl_cmd_port_set_doit(struct sk_buff *skb,
4496
780
		if (err)
1377
		if (err)
4497
781
			return err;
1378
			return err;
4498
782
	}
1379
	}
4499
1380
4500
1381
	if (info->attrs[DEVLINK_ATTR_PORT_FUNCTION]) {
4501
1382
		struct nlattr *attr = info->attrs[DEVLINK_ATTR_PORT_FUNCTION];
4502
1383
		struct netlink_ext_ack *extack = info->extack;
4503
1384
4504
1385
		err = devlink_port_function_set(devlink, devlink_port, attr, extack);
4505
1386
		if (err)
4506
1387
			return err;
4507
1388
	}
4508
1389
4509
783
	return 0;
1390
	return 0;
4510
784
}
1391
}
4511
785
1392
4512
@@ -831,6 +1438,359 @@ static int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb,
4513
831
	return devlink_port_unsplit(devlink, port_index, info->extack);
1438
	return devlink_port_unsplit(devlink, port_index, info->extack);
4514
832
}
1439
}
4515
833
1440
4516
1441
static int devlink_port_new_notifiy(struct devlink *devlink,
4517
1442
				    unsigned int port_index,
4518
1443
				    struct genl_info *info)
4519
1444
{
4520
1445
	struct devlink_port *devlink_port;
4521
1446
	struct sk_buff *msg;
4522
1447
	int err;
4523
1448
4524
1449
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
4525
1450
	if (!msg)
4526
1451
		return -ENOMEM;
4527
1452
4528
1453
	mutex_lock(&devlink->lock);
4529
1454
	devlink_port = devlink_port_get_by_index(devlink, port_index);
4530
1455
	if (!devlink_port) {
4531
1456
		err = -ENODEV;
4532
1457
		goto out;
4533
1458
	}
4534
1459
4535
1460
	err = devlink_nl_port_fill(msg, devlink_port, DEVLINK_CMD_NEW,
4536
1461
				   info->snd_portid, info->snd_seq, 0, NULL);
4537
1462
	if (err)
4538
1463
		goto out;
4539
1464
4540
1465
	err = genlmsg_reply(msg, info);
4541
1466
	mutex_unlock(&devlink->lock);
4542
1467
	return err;
4543
1468
4544
1469
out:
4545
1470
	mutex_unlock(&devlink->lock);
4546
1471
	nlmsg_free(msg);
4547
1472
	return err;
4548
1473
}
4549
1474
4550
1475
static int devlink_nl_cmd_port_new_doit(struct sk_buff *skb,
4551
1476
					struct genl_info *info)
4552
1477
{
4553
1478
	struct netlink_ext_ack *extack = info->extack;
4554
1479
	struct devlink_port_new_attrs new_attrs = {};
4555
1480
	struct devlink *devlink = info->user_ptr[0];
4556
1481
	unsigned int new_port_index;
4557
1482
	int err;
4558
1483
4559
1484
	if (!devlink->ops->port_new || !devlink->ops->port_del)
4560
1485
		return -EOPNOTSUPP;
4561
1486
4562
1487
	if (!info->attrs[DEVLINK_ATTR_PORT_FLAVOUR] ||
4563
1488
	    !info->attrs[DEVLINK_ATTR_PORT_PCI_PF_NUMBER]) {
4564
1489
		NL_SET_ERR_MSG_MOD(extack, "Port flavour or PCI PF are not specified");
4565
1490
		return -EINVAL;
4566
1491
	}
4567
1492
	new_attrs.flavour = nla_get_u16(info->attrs[DEVLINK_ATTR_PORT_FLAVOUR]);
4568
1493
	new_attrs.pfnum =
4569
1494
		nla_get_u16(info->attrs[DEVLINK_ATTR_PORT_PCI_PF_NUMBER]);
4570
1495
4571
1496
	if (info->attrs[DEVLINK_ATTR_PORT_INDEX]) {
4572
1497
		/* Port index of the new port being created by driver. */
4573
1498
		new_attrs.port_index =
4574
1499
			nla_get_u32(info->attrs[DEVLINK_ATTR_PORT_INDEX]);
4575
1500
		new_attrs.port_index_valid = true;
4576
1501
	}
4577
1502
	if (info->attrs[DEVLINK_ATTR_PORT_CONTROLLER_NUMBER]) {
4578
1503
		new_attrs.controller =
4579
1504
			nla_get_u16(info->attrs[DEVLINK_ATTR_PORT_CONTROLLER_NUMBER]);
4580
1505
		new_attrs.controller_valid = true;
4581
1506
	}
4582
1507
	if (new_attrs.flavour == DEVLINK_PORT_FLAVOUR_PCI_SF &&
4583
1508
	    info->attrs[DEVLINK_ATTR_PORT_PCI_SF_NUMBER]) {
4584
1509
		new_attrs.sfnum = nla_get_u32(info->attrs[DEVLINK_ATTR_PORT_PCI_SF_NUMBER]);
4585
1510
		new_attrs.sfnum_valid = true;
4586
1511
	}
4587
1512
4588
1513
	err = devlink->ops->port_new(devlink, &new_attrs, extack,
4589
1514
				     &new_port_index);
4590
1515
	if (err)
4591
1516
		return err;
4592
1517
4593
1518
	err = devlink_port_new_notifiy(devlink, new_port_index, info);
4594
1519
	if (err && err != -ENODEV) {
4595
1520
		/* Fail to send the response; destroy newly created port. */
4596
1521
		devlink->ops->port_del(devlink, new_port_index, extack);
4597
1522
	}
4598
1523
	return err;
4599
1524
}
4600
1525
4601
1526
static int devlink_nl_cmd_port_del_doit(struct sk_buff *skb,
4602
1527
					struct genl_info *info)
4603
1528
{
4604
1529
	struct netlink_ext_ack *extack = info->extack;
4605
1530
	struct devlink *devlink = info->user_ptr[0];
4606
1531
	unsigned int port_index;
4607
1532
4608
1533
	if (!devlink->ops->port_del)
4609
1534
		return -EOPNOTSUPP;
4610
1535
4611
1536
	if (!info->attrs[DEVLINK_ATTR_PORT_INDEX]) {
4612
1537
		NL_SET_ERR_MSG_MOD(extack, "Port index is not specified");
4613
1538
		return -EINVAL;
4614
1539
	}
4615
1540
	port_index = nla_get_u32(info->attrs[DEVLINK_ATTR_PORT_INDEX]);
4616
1541
4617
1542
	return devlink->ops->port_del(devlink, port_index, extack);
4618
1543
}
4619
1544
4620
1545
static int
4621
1546
devlink_nl_rate_parent_node_set(struct devlink_rate *devlink_rate,
4622
1547
				struct genl_info *info,
4623
1548
				struct nlattr *nla_parent)
4624
1549
{
4625
1550
	struct devlink *devlink = devlink_rate->devlink;
4626
1551
	const char *parent_name = nla_data(nla_parent);
4627
1552
	const struct devlink_ops *ops = devlink->ops;
4628
1553
	size_t len = strlen(parent_name);
4629
1554
	struct devlink_rate *parent;
4630
1555
	int err = -EOPNOTSUPP;
4631
1556
4632
1557
	parent = devlink_rate->parent;
4633
1558
	if (parent && len) {
4634
1559
		NL_SET_ERR_MSG_MOD(info->extack, "Rate object already has parent.");
4635
1560
		return -EBUSY;
4636
1561
	} else if (parent && !len) {
4637
1562
		if (devlink_rate_is_leaf(devlink_rate))
4638
1563
			err = ops->rate_leaf_parent_set(devlink_rate, NULL,
4639
1564
							devlink_rate->priv, NULL,
4640
1565
							info->extack);
4641
1566
		else if (devlink_rate_is_node(devlink_rate))
4642
1567
			err = ops->rate_node_parent_set(devlink_rate, NULL,
4643
1568
							devlink_rate->priv, NULL,
4644
1569
							info->extack);
4645
1570
		if (err)
4646
1571
			return err;
4647
1572
4648
1573
		refcount_dec(&parent->refcnt);
4649
1574
		devlink_rate->parent = NULL;
4650
1575
	} else if (!parent && len) {
4651
1576
		parent = devlink_rate_node_get_by_name(devlink, parent_name);
4652
1577
		if (IS_ERR(parent))
4653
1578
			return -ENODEV;
4654
1579
4655
1580
		if (parent == devlink_rate) {
4656
1581
			NL_SET_ERR_MSG_MOD(info->extack, "Parent to self is not allowed");
4657
1582
			return -EINVAL;
4658
1583
		}
4659
1584
4660
1585
		if (devlink_rate_is_node(devlink_rate) &&
4661
1586
		    devlink_rate_is_parent_node(devlink_rate, parent->parent)) {
4662
1587
			NL_SET_ERR_MSG_MOD(info->extack, "Node is already a parent of parent node.");
4663
1588
			return -EEXIST;
4664
1589
		}
4665
1590
4666
1591
		if (devlink_rate_is_leaf(devlink_rate))
4667
1592
			err = ops->rate_leaf_parent_set(devlink_rate, parent,
4668
1593
							devlink_rate->priv, parent->priv,
4669
1594
							info->extack);
4670
1595
		else if (devlink_rate_is_node(devlink_rate))
4671
1596
			err = ops->rate_node_parent_set(devlink_rate, parent,
4672
1597
							devlink_rate->priv, parent->priv,
4673
1598
							info->extack);
4674
1599
		if (err)
4675
1600
			return err;
4676
1601
4677
1602
		refcount_inc(&parent->refcnt);
4678
1603
		devlink_rate->parent = parent;
4679
1604
	}
4680
1605
4681
1606
	return 0;
4682
1607
}
4683
1608
4684
1609
static int devlink_nl_rate_set(struct devlink_rate *devlink_rate,
4685
1610
			       const struct devlink_ops *ops,
4686
1611
			       struct genl_info *info)
4687
1612
{
4688
1613
	struct nlattr *nla_parent, **attrs = info->attrs;
4689
1614
	int err = -EOPNOTSUPP;
4690
1615
	u64 rate;
4691
1616
4692
1617
	if (attrs[DEVLINK_ATTR_RATE_TX_SHARE]) {
4693
1618
		rate = nla_get_u64(attrs[DEVLINK_ATTR_RATE_TX_SHARE]);
4694
1619
		if (devlink_rate_is_leaf(devlink_rate))
4695
1620
			err = ops->rate_leaf_tx_share_set(devlink_rate, devlink_rate->priv,
4696
1621
							  rate, info->extack);
4697
1622
		else if (devlink_rate_is_node(devlink_rate))
4698
1623
			err = ops->rate_node_tx_share_set(devlink_rate, devlink_rate->priv,
4699
1624
							  rate, info->extack);
4700
1625
		if (err)
4701
1626
			return err;
4702
1627
		devlink_rate->tx_share = rate;
4703
1628
	}
4704
1629
4705
1630
	if (attrs[DEVLINK_ATTR_RATE_TX_MAX]) {
4706
1631
		rate = nla_get_u64(attrs[DEVLINK_ATTR_RATE_TX_MAX]);
4707
1632
		if (devlink_rate_is_leaf(devlink_rate))
4708
1633
			err = ops->rate_leaf_tx_max_set(devlink_rate, devlink_rate->priv,
4709
1634
							rate, info->extack);
4710
1635
		else if (devlink_rate_is_node(devlink_rate))
4711
1636
			err = ops->rate_node_tx_max_set(devlink_rate, devlink_rate->priv,
4712
1637
							rate, info->extack);
4713
1638
		if (err)
4714
1639
			return err;
4715
1640
		devlink_rate->tx_max = rate;
4716
1641
	}
4717
1642
4718
1643
	nla_parent = attrs[DEVLINK_ATTR_RATE_PARENT_NODE_NAME];
4719
1644
	if (nla_parent) {
4720
1645
		err = devlink_nl_rate_parent_node_set(devlink_rate, info,
4721
1646
						      nla_parent);
4722
1647
		if (err)
4723
1648
			return err;
4724
1649
	}
4725
1650
4726
1651
	return 0;
4727
1652
}
4728
1653
4729
1654
static bool devlink_rate_set_ops_supported(const struct devlink_ops *ops,
4730
1655
					   struct genl_info *info,
4731
1656
					   enum devlink_rate_type type)
4732
1657
{
4733
1658
	struct nlattr **attrs = info->attrs;
4734
1659
4735
1660
	if (type == DEVLINK_RATE_TYPE_LEAF) {
4736
1661
		if (attrs[DEVLINK_ATTR_RATE_TX_SHARE] && !ops->rate_leaf_tx_share_set) {
4737
1662
			NL_SET_ERR_MSG_MOD(info->extack, "TX share set isn't supported for the leafs");
4738
1663
			return false;
4739
1664
		}
4740
1665
		if (attrs[DEVLINK_ATTR_RATE_TX_MAX] && !ops->rate_leaf_tx_max_set) {
4741
1666
			NL_SET_ERR_MSG_MOD(info->extack, "TX max set isn't supported for the leafs");
4742
1667
			return false;
4743
1668
		}
4744
1669
		if (attrs[DEVLINK_ATTR_RATE_PARENT_NODE_NAME] &&
4745
1670
		    !ops->rate_leaf_parent_set) {
4746
1671
			NL_SET_ERR_MSG_MOD(info->extack, "Parent set isn't supported for the leafs");
4747
1672
			return false;
4748
1673
		}
4749
1674
	} else if (type == DEVLINK_RATE_TYPE_NODE) {
4750
1675
		if (attrs[DEVLINK_ATTR_RATE_TX_SHARE] && !ops->rate_node_tx_share_set) {
4751
1676
			NL_SET_ERR_MSG_MOD(info->extack, "TX share set isn't supported for the nodes");
4752
1677
			return false;
4753
1678
		}
4754
1679
		if (attrs[DEVLINK_ATTR_RATE_TX_MAX] && !ops->rate_node_tx_max_set) {
4755
1680
			NL_SET_ERR_MSG_MOD(info->extack, "TX max set isn't supported for the nodes");
4756
1681
			return false;
4757
1682
		}
4758
1683
		if (attrs[DEVLINK_ATTR_RATE_PARENT_NODE_NAME] &&
4759
1684
		    !ops->rate_node_parent_set) {
4760
1685
			NL_SET_ERR_MSG_MOD(info->extack, "Parent set isn't supported for the nodes");
4761
1686
			return false;
4762
1687
		}
4763
1688
	} else {
4764
1689
		WARN_ON("Unknown type of rate object");
4765
1690
		return false;
4766
1691
	}
4767
1692
4768
1693
	return true;
4769
1694
}
4770
1695
4771
1696
static int devlink_nl_cmd_rate_set_doit(struct sk_buff *skb,
4772
1697
					struct genl_info *info)
4773
1698
{
4774
1699
	struct devlink_rate *devlink_rate = info->user_ptr[1];
4775
1700
	struct devlink *devlink = devlink_rate->devlink;
4776
1701
	const struct devlink_ops *ops = devlink->ops;
4777
1702
	int err;
4778
1703
4779
1704
	if (!ops || !devlink_rate_set_ops_supported(ops, info, devlink_rate->type))
4780
1705
		return -EOPNOTSUPP;
4781
1706
4782
1707
	err = devlink_nl_rate_set(devlink_rate, ops, info);
4783
1708
4784
1709
	if (!err)
4785
1710
		devlink_rate_notify(devlink_rate, DEVLINK_CMD_RATE_NEW);
4786
1711
	return err;
4787
1712
}
4788
1713
4789
1714
static int devlink_nl_cmd_rate_new_doit(struct sk_buff *skb,
4790
1715
					struct genl_info *info)
4791
1716
{
4792
1717
	struct devlink *devlink = info->user_ptr[0];
4793
1718
	struct devlink_rate *rate_node;
4794
1719
	const struct devlink_ops *ops;
4795
1720
	int err;
4796
1721
4797
1722
	ops = devlink->ops;
4798
1723
	if (!ops || !ops->rate_node_new || !ops->rate_node_del) {
4799
1724
		NL_SET_ERR_MSG_MOD(info->extack, "Rate nodes aren't supported");
4800
1725
		return -EOPNOTSUPP;
4801
1726
	}
4802
1727
4803
1728
	if (!devlink_rate_set_ops_supported(ops, info, DEVLINK_RATE_TYPE_NODE))
4804
1729
		return -EOPNOTSUPP;
4805
1730
4806
1731
	rate_node = devlink_rate_node_get_from_attrs(devlink, info->attrs);
4807
1732
	if (!IS_ERR(rate_node))
4808
1733
		return -EEXIST;
4809
1734
	else if (rate_node == ERR_PTR(-EINVAL))
4810
1735
		return -EINVAL;
4811
1736
4812
1737
	rate_node = kzalloc(sizeof(*rate_node), GFP_KERNEL);
4813
1738
	if (!rate_node)
4814
1739
		return -ENOMEM;
4815
1740
4816
1741
	rate_node->devlink = devlink;
4817
1742
	rate_node->type = DEVLINK_RATE_TYPE_NODE;
4818
1743
	rate_node->name = nla_strdup(info->attrs[DEVLINK_ATTR_RATE_NODE_NAME], GFP_KERNEL);
4819
1744
	if (!rate_node->name) {
4820
1745
		err = -ENOMEM;
4821
1746
		goto err_strdup;
4822
1747
	}
4823
1748
4824
1749
	err = ops->rate_node_new(rate_node, &rate_node->priv, info->extack);
4825
1750
	if (err)
4826
1751
		goto err_node_new;
4827
1752
4828
1753
	err = devlink_nl_rate_set(rate_node, ops, info);
4829
1754
	if (err)
4830
1755
		goto err_rate_set;
4831
1756
4832
1757
	refcount_set(&rate_node->refcnt, 1);
4833
1758
	list_add(&rate_node->list, &devlink->rate_list);
4834
1759
	devlink_rate_notify(rate_node, DEVLINK_CMD_RATE_NEW);
4835
1760
	return 0;
4836
1761
4837
1762
err_rate_set:
4838
1763
	ops->rate_node_del(rate_node, rate_node->priv, info->extack);
4839
1764
err_node_new:
4840
1765
	kfree(rate_node->name);
4841
1766
err_strdup:
4842
1767
	kfree(rate_node);
4843
1768
	return err;
4844
1769
}
4845
1770
4846
1771
static int devlink_nl_cmd_rate_del_doit(struct sk_buff *skb,
4847
1772
					struct genl_info *info)
4848
1773
{
4849
1774
	struct devlink_rate *rate_node = info->user_ptr[1];
4850
1775
	struct devlink *devlink = rate_node->devlink;
4851
1776
	const struct devlink_ops *ops = devlink->ops;
4852
1777
	int err;
4853
1778
4854
1779
	if (refcount_read(&rate_node->refcnt) > 1) {
4855
1780
		NL_SET_ERR_MSG_MOD(info->extack, "Node has children. Cannot delete node.");
4856
1781
		return -EBUSY;
4857
1782
	}
4858
1783
4859
1784
	devlink_rate_notify(rate_node, DEVLINK_CMD_RATE_DEL);
4860
1785
	err = ops->rate_node_del(rate_node, rate_node->priv, info->extack);
4861
1786
	if (rate_node->parent)
4862
1787
		refcount_dec(&rate_node->parent->refcnt);
4863
1788
	list_del(&rate_node->list);
4864
1789
	kfree(rate_node->name);
4865
1790
	kfree(rate_node);
4866
1791
	return err;
4867
1792
}
4868
1793
4869
834
static int devlink_nl_sb_fill(struct sk_buff *msg, struct devlink *devlink,
1794
static int devlink_nl_sb_fill(struct sk_buff *msg, struct devlink *devlink,
4870
835
			      struct devlink_sb *devlink_sb,
1795
			      struct devlink_sb *devlink_sb,
4871
836
			      enum devlink_command cmd, u32 portid,
1796
			      enum devlink_command cmd, u32 portid,
4872
@@ -873,10 +1833,14 @@ static int devlink_nl_cmd_sb_get_doit(struct sk_buff *skb,
4873
873
				      struct genl_info *info)
1833
				      struct genl_info *info)
4874
874
{
1834
{
4875
875
	struct devlink *devlink = info->user_ptr[0];
1835
	struct devlink *devlink = info->user_ptr[0];
4877
876
	struct devlink_sb *devlink_sb = info->user_ptr[1];
1836
	struct devlink_sb *devlink_sb;
4878
877
	struct sk_buff *msg;
1837
	struct sk_buff *msg;
4879
878
	int err;
1838
	int err;
4880
879
1839
4881
1840
	devlink_sb = devlink_sb_get_from_info(devlink, info);
4882
1841
	if (IS_ERR(devlink_sb))
4883
1842
		return PTR_ERR(devlink_sb);
4884
1843
4885
880
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
1844
	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
4886
881
	if (!msg)
1845
	if (!msg)
4887
882
		return -ENOMEM;
1846
		return -ENOMEM;
4888
@@ -978,11 +1942,15 @@ static int devlink_nl_cmd_sb_pool_get_doit(struct sk_buff *skb,
4889
978
					   struct genl_info *info)
1942
					   struct genl_info *info)
4890
979
{
1943
{
4891
980
	struct devlink *devlink = info->user_ptr[0];
1944
	struct devlink *devlink = info->user_ptr[0];
4893
981
	struct devlink_sb *devlink_sb = info->user_ptr[1];
1945
	struct devlink_sb *devlink_sb;
4894
982
	struct sk_buff *msg;
1946
	struct sk_buff *msg;
4895
983
	u16 pool_index;
1947
	u16 pool_index;
4896
984
	int err;
1948
	int err;
4897
985
1949
4898
1950
	devlink_sb = devlink_sb_get_from_info(devlink, info);
4899
1951
	if (IS_ERR(devlink_sb))
4900
1952
		return PTR_ERR(devlink_sb);
4901
1953
4902
986
	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,
1954
	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,
4903
987
						  &pool_index);
1955
						  &pool_index);
4904
988
	if (err)
1956
	if (err)
4905
@@ -1052,7 +2020,9 @@ static int devlink_nl_cmd_sb_pool_get_dumpit(struct sk_buff *msg,
4906
1052
						   devlink_sb,
2020
						   devlink_sb,
4907
1053
						   NETLINK_CB(cb->skb).portid,
2021
						   NETLINK_CB(cb->skb).portid,
4908
1054
						   cb->nlh->nlmsg_seq);
2022
						   cb->nlh->nlmsg_seq);
4910
1055
			if (err && err != -EOPNOTSUPP) {
2023
			if (err == -EOPNOTSUPP) {
4911
2024
				err = 0;
4912
2025
			} else if (err) {
4913
1056
				mutex_unlock(&devlink->lock);
2026
				mutex_unlock(&devlink->lock);
4914
1057
				goto out;
2027
				goto out;
4915
1058
			}
2028
			}
4916
@@ -1084,12 +2054,16 @@ static int devlink_nl_cmd_sb_pool_set_doit(struct sk_buff *skb,
4917
1084
					   struct genl_info *info)
2054
					   struct genl_info *info)
4918
1085
{
2055
{
4919
1086
	struct devlink *devlink = info->user_ptr[0];
2056
	struct devlink *devlink = info->user_ptr[0];
4920
1087
	struct devlink_sb *devlink_sb = info->user_ptr[1];
4921
1088
	enum devlink_sb_threshold_type threshold_type;
2057
	enum devlink_sb_threshold_type threshold_type;
4922
2058
	struct devlink_sb *devlink_sb;
4923
1089
	u16 pool_index;
2059
	u16 pool_index;
4924
1090
	u32 size;
2060
	u32 size;
4925
1091
	int err;
2061
	int err;
4926
1092
2062
4927
2063
	devlink_sb = devlink_sb_get_from_info(devlink, info);
4928
2064
	if (IS_ERR(devlink_sb))
4929
2065
		return PTR_ERR(devlink_sb);
4930
2066
4931
1093
	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,
2067
	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,
4932
1094
						  &pool_index);
2068
						  &pool_index);
4933
1095
	if (err)
2069
	if (err)
4934
@@ -1170,13 +2144,17 @@ sb_occ_get_failure:
4935
1170
static int devlink_nl_cmd_sb_port_pool_get_doit(struct sk_buff *skb,
2144
static int devlink_nl_cmd_sb_port_pool_get_doit(struct sk_buff *skb,
4936
1171
						struct genl_info *info)
2145
						struct genl_info *info)
4937
1172
{
2146
{
4939
1173
	struct devlink_port *devlink_port = info->user_ptr[0];
2147
	struct devlink_port *devlink_port = info->user_ptr[1];
4940
1174
	struct devlink *devlink = devlink_port->devlink;
2148
	struct devlink *devlink = devlink_port->devlink;
4942
1175
	struct devlink_sb *devlink_sb = info->user_ptr[1];
2149
	struct devlink_sb *devlink_sb;
4943
1176
	struct sk_buff *msg;
2150
	struct sk_buff *msg;
4944
1177
	u16 pool_index;
2151
	u16 pool_index;
4945
1178
	int err;
2152
	int err;
4946
1179
2153
4947
2154
	devlink_sb = devlink_sb_get_from_info(devlink, info);
4948
2155
	if (IS_ERR(devlink_sb))
4949
2156
		return PTR_ERR(devlink_sb);
4950
2157
4951
1180
	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,
2158
	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,
4952
1181
						  &pool_index);
2159
						  &pool_index);
4953
1182
	if (err)
2160
	if (err)
4954
@@ -1252,7 +2230,9 @@ static int devlink_nl_cmd_sb_port_pool_get_dumpit(struct sk_buff *msg,
4955
1252
							devlink, devlink_sb,
2230
							devlink, devlink_sb,
4956
1253
							NETLINK_CB(cb->skb).portid,
2231
							NETLINK_CB(cb->skb).portid,
4957
1254
							cb->nlh->nlmsg_seq);
2232
							cb->nlh->nlmsg_seq);
4959
1255
			if (err && err != -EOPNOTSUPP) {
2233
			if (err == -EOPNOTSUPP) {
4960
2234
				err = 0;
4961
2235
			} else if (err) {
4962
1256
				mutex_unlock(&devlink->lock);
2236
				mutex_unlock(&devlink->lock);
4963
1257
				goto out;
2237
				goto out;
4964
1258
			}
2238
			}
4965
@@ -1283,12 +2263,17 @@ static int devlink_sb_port_pool_set(struct devlink_port *devlink_port,
4966
1283
static int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb,
2263
static int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb,
4967
1284
						struct genl_info *info)
2264
						struct genl_info *info)
4968
1285
{
2265
{
4971
1286
	struct devlink_port *devlink_port = info->user_ptr[0];
2266
	struct devlink_port *devlink_port = info->user_ptr[1];
4972
1287
	struct devlink_sb *devlink_sb = info->user_ptr[1];
2267
	struct devlink *devlink = info->user_ptr[0];
4973
2268
	struct devlink_sb *devlink_sb;
4974
1288
	u16 pool_index;
2269
	u16 pool_index;
4975
1289
	u32 threshold;
2270
	u32 threshold;
4976
1290
	int err;
2271
	int err;
4977
1291
2272
4978
2273
	devlink_sb = devlink_sb_get_from_info(devlink, info);
4979
2274
	if (IS_ERR(devlink_sb))
4980
2275
		return PTR_ERR(devlink_sb);
4981
2276
4982
1292
	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,
2277
	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,
4983
1293
						  &pool_index);
2278
						  &pool_index);
4984
1294
	if (err)
2279
	if (err)
4985
@@ -1370,14 +2355,18 @@ nla_put_failure:
4986
1370
static int devlink_nl_cmd_sb_tc_pool_bind_get_doit(struct sk_buff *skb,
2355
static int devlink_nl_cmd_sb_tc_pool_bind_get_doit(struct sk_buff *skb,
4987
1371
						   struct genl_info *info)
2356
						   struct genl_info *info)
4988
1372
{
2357
{
4990
1373
	struct devlink_port *devlink_port = info->user_ptr[0];
2358
	struct devlink_port *devlink_port = info->user_ptr[1];
4991
1374
	struct devlink *devlink = devlink_port->devlink;
2359
	struct devlink *devlink = devlink_port->devlink;
4993
1375
	struct devlink_sb *devlink_sb = info->user_ptr[1];
2360
	struct devlink_sb *devlink_sb;
4994
1376
	struct sk_buff *msg;
2361
	struct sk_buff *msg;
4995
1377
	enum devlink_sb_pool_type pool_type;
2362
	enum devlink_sb_pool_type pool_type;
4996
1378
	u16 tc_index;
2363
	u16 tc_index;
4997
1379
	int err;
2364
	int err;
4998
1380
2365
4999
2366
	devlink_sb = devlink_sb_get_from_info(devlink, info);
5000
2367
	if (IS_ERR(devlink_sb))
Status:	Superseded
Proposed branch:	~bodong-wang/ubuntu/+source/linux-bluefield:nvidia-devlink
Merge into:	~canonical-kernel/ubuntu/+source/linux-bluefield/+git/focal:master-next
Diff against target:	10740 lines (+6115/-1162) 35 files modified Documentation/networking/devlink/devlink-trap.rst (+595/-0) Documentation/networking/devlink/index.rst (+14/-0) Documentation/networking/index.rst (+2/-3) MAINTAINERS (+1/-0) debian.bluefield/config/config.common.ubuntu (+8/-23) dev/null (+0/-33) drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c (+15/-17) drivers/net/ethernet/mellanox/mlx4/crdump.c (+27/-9) drivers/net/ethernet/mellanox/mlx4/main.c (+11/-2) drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c (+5/-3) drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c (+5/-3) drivers/net/ethernet/mellanox/mlx5/core/health.c (+10/-6) drivers/net/ethernet/mellanox/mlxsw/core.c (+18/-4) drivers/net/ethernet/mellanox/mlxsw/core.h (+5/-0) drivers/net/ethernet/mellanox/mlxsw/spectrum.h (+1/-1) drivers/net/ethernet/netronome/nfp/nfp_devlink.c (+10/-4) drivers/net/ethernet/pensando/ionic/ionic_devlink.c (+3/-2) drivers/net/netdevsim/dev.c (+24/-9) include/net/devlink.h (+871/-57) include/net/genetlink.h (+23/-7) include/net/netlink.h (+47/-28) include/net/pkt_cls.h (+1/-0) include/net/red.h (+38/-0) include/trace/events/devlink.h (+37/-0) include/uapi/linux/devlink.h (+152/-0) include/uapi/linux/pkt_sched.h (+17/-0) lib/nlattr.c (+10/-10) net/Kconfig (+0/-1) net/core/devlink.c (+3855/-777) net/core/drop_monitor.c (+46/-16) net/dsa/dsa2.c (+11/-6) net/netlink/genetlink.c (+183/-121) net/sched/act_api.c (+7/-12) net/sched/sch_red.c (+60/-8) tools/testing/selftests/drivers/net/netdevsim/devlink.sh (+3/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Canonical Kernel		2022-02-28	Pending
Review via email: mp+416171@code.launchpad.net