Skip to content

Commit 4977858

Browse files
kuba-mookuba-moo
committed
update to kernel 6.17 (fa582ca7e187 + ethtool fix)
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 0d861ea commit 4977858

27 files changed

Lines changed: 2693 additions & 24 deletions

‎Documentation/netlink/specs/devlink.yaml‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
---
33
name: devlink
44

5-
65
protocol: genetlink-legacy
76

87
doc: Partial family for Devlink.
@@ -225,6 +224,10 @@ definitions:
225224
value: 10
226225
-
227226
name: binary
227+
-
228+
name: rate-tc-index-max
229+
type: const
230+
value: 7
228231

229232
attribute-sets:
230233
-
@@ -845,7 +848,11 @@ attribute-sets:
845848
-
846849
name: region-direct
847850
type: flag
848-
851+
-
852+
name: rate-tc-bws
853+
type: nest
854+
multi-attr: true
855+
nested-attributes: dl-rate-tc-bws
849856
-
850857
name: dl-dev-stats
851858
subset-of: devlink
@@ -1250,6 +1257,22 @@ attribute-sets:
12501257
-
12511258
name: flash
12521259
type: flag
1260+
-
1261+
name: dl-rate-tc-bws
1262+
name-prefix: devlink-rate-tc-attr-
1263+
attributes:
1264+
-
1265+
name: index
1266+
type: u8
1267+
checks:
1268+
max: rate-tc-index-max
1269+
-
1270+
name: bw
1271+
type: u32
1272+
doc: |
1273+
Specifies the bandwidth share assigned to the Traffic Class.
1274+
The bandwidth for the traffic class is determined
1275+
in proportion to the sum of the shares of all configured classes.
12531276
12541277
operations:
12551278
enum-model: directional
@@ -2177,6 +2200,7 @@ operations:
21772200
- rate-tx-priority
21782201
- rate-tx-weight
21792202
- rate-parent-node-name
2203+
- rate-tc-bws
21802204

21812205
-
21822206
name: rate-new
@@ -2197,6 +2221,7 @@ operations:
21972221
- rate-tx-priority
21982222
- rate-tx-weight
21992223
- rate-parent-node-name
2224+
- rate-tc-bws
22002225

22012226
-
22022227
name: rate-del

‎Documentation/netlink/specs/ethtool.yaml‎

Lines changed: 232 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,55 @@ definitions:
158158
-
159159
name: pse-event-sw-pw-control-error
160160
doc: PSE faced an error managing the power control from software
161+
-
162+
name: input-xfrm
163+
doc: RSS hash function transformations.
164+
type: flags
165+
enum-name:
166+
name-prefix: rxh-xfrm-
167+
header: linux/ethtool.h
168+
entries:
169+
-
170+
name: sym-xor
171+
doc: >-
172+
XOR the corresponding source and destination fields of each specified
173+
protocol. Both copies of the XOR'ed fields are fed into the RSS and
174+
RXHASH calculation. Note that this XORing reduces the input set
175+
entropy and could be exploited to reduce the RSS queue spread.
176+
-
177+
name: sym-or-xor
178+
doc: >-
179+
Similar to SYM_XOR, except that one copy of the XOR'ed fields is
180+
replaced by an OR of the same fields.
181+
-
182+
name: rxfh-fields
183+
name-prefix: rxh-
184+
enum-name:
185+
header: linux/ethtool.h
186+
type: flags
187+
entries:
188+
-
189+
name: l2da
190+
value: 1
191+
-
192+
name: vlan
193+
-
194+
name: l3-proto
195+
-
196+
name: ip-src
197+
-
198+
name: ip-dst
199+
-
200+
name: l4-b-0-1
201+
doc: src port in case of TCP/UDP/SCTP
202+
-
203+
name: l4-b-2-3
204+
doc: dst port in case of TCP/UDP/SCTP
205+
-
206+
name: gtp-teid
207+
-
208+
name: discard
209+
value: 31
161210

162211
attribute-sets:
163212
-
@@ -1447,6 +1496,123 @@ attribute-sets:
14471496
name: pse-prio
14481497
type: u32
14491498
name-prefix: ethtool-a-
1499+
-
1500+
name: flow
1501+
attr-cnt-name: --ethtool-a-flow-cnt
1502+
doc: |
1503+
Flow types, corresponding to those defined in the old
1504+
ethtool header for RXFH and RXNFC as ${PROTO}_FLOW.
1505+
The values are not matching the old ones to avoid carrying
1506+
into Netlink the IP_USER_FLOW vs IPV4_FLOW vs IPV4_USER_FLOW confusion.
1507+
attributes:
1508+
-
1509+
name: ether
1510+
type: uint
1511+
enum: rxfh-fields
1512+
-
1513+
name: ip4
1514+
type: uint
1515+
enum: rxfh-fields
1516+
-
1517+
name: ip6
1518+
type: uint
1519+
enum: rxfh-fields
1520+
-
1521+
name: tcp4
1522+
type: uint
1523+
enum: rxfh-fields
1524+
-
1525+
name: tcp6
1526+
type: uint
1527+
enum: rxfh-fields
1528+
-
1529+
name: udp4
1530+
type: uint
1531+
enum: rxfh-fields
1532+
-
1533+
name: udp6
1534+
type: uint
1535+
enum: rxfh-fields
1536+
-
1537+
name: sctp4
1538+
type: uint
1539+
enum: rxfh-fields
1540+
-
1541+
name: sctp6
1542+
type: uint
1543+
enum: rxfh-fields
1544+
-
1545+
name: ah4
1546+
type: uint
1547+
enum: rxfh-fields
1548+
-
1549+
name: ah6
1550+
type: uint
1551+
enum: rxfh-fields
1552+
-
1553+
name: esp4
1554+
type: uint
1555+
enum: rxfh-fields
1556+
-
1557+
name: esp6
1558+
type: uint
1559+
enum: rxfh-fields
1560+
-
1561+
name: ah-esp4
1562+
type: uint
1563+
enum: rxfh-fields
1564+
-
1565+
name: ah-esp6
1566+
type: uint
1567+
enum: rxfh-fields
1568+
-
1569+
name: gtpu4
1570+
type: uint
1571+
enum: rxfh-fields
1572+
-
1573+
name: gtpu6
1574+
type: uint
1575+
enum: rxfh-fields
1576+
-
1577+
name: gtpc4
1578+
type: uint
1579+
enum: rxfh-fields
1580+
-
1581+
name: gtpc6
1582+
type: uint
1583+
enum: rxfh-fields
1584+
-
1585+
name: gtpc-teid4
1586+
type: uint
1587+
enum: rxfh-fields
1588+
-
1589+
name: gtpc-teid6
1590+
type: uint
1591+
enum: rxfh-fields
1592+
-
1593+
name: gtpu-eh4
1594+
type: uint
1595+
enum: rxfh-fields
1596+
-
1597+
name: gtpu-eh6
1598+
type: uint
1599+
enum: rxfh-fields
1600+
-
1601+
name: gtpu-ul4
1602+
type: uint
1603+
enum: rxfh-fields
1604+
-
1605+
name: gtpu-ul6
1606+
type: uint
1607+
enum: rxfh-fields
1608+
-
1609+
name: gtpu-dl4
1610+
type: uint
1611+
enum: rxfh-fields
1612+
-
1613+
name: gtpu-dl6
1614+
type: uint
1615+
enum: rxfh-fields
14501616
-
14511617
name: rss
14521618
attr-cnt-name: __ethtool-a-rss-cnt
@@ -1475,9 +1641,14 @@ attribute-sets:
14751641
-
14761642
name: input-xfrm
14771643
type: u32
1644+
enum: input-xfrm
14781645
-
14791646
name: start-context
14801647
type: u32
1648+
-
1649+
name: flow-hash
1650+
type: nest
1651+
nested-attributes: flow
14811652
-
14821653
name: plca
14831654
attr-cnt-name: __ethtool-a-plca-cnt
@@ -2173,6 +2344,11 @@ operations:
21732344
request:
21742345
attributes:
21752346
- header
2347+
- offset
2348+
- length
2349+
- page
2350+
- bank
2351+
- i2c-address
21762352
reply:
21772353
attributes:
21782354
- header
@@ -2307,6 +2483,7 @@ operations:
23072483
- indir
23082484
- hkey
23092485
- input-xfrm
2486+
- flow-hash
23102487
dump:
23112488
request:
23122489
attributes:
@@ -2492,13 +2669,66 @@ operations:
24922669
attributes:
24932670
- header
24942671
- events
2672+
-
2673+
name: rss-set
2674+
doc: Set RSS params.
2675+
2676+
attribute-set: rss
2677+
2678+
do:
2679+
request:
2680+
attributes:
2681+
- header
2682+
- context
2683+
- hfunc
2684+
- indir
2685+
- hkey
2686+
- input-xfrm
2687+
- flow-hash
24952688
-
24962689
name: rss-ntf
24972690
doc: |
24982691
Notification for change in RSS configuration.
2499-
For additional contexts only modifications are modified, not creation
2500-
or removal of the contexts.
2692+
For additional contexts only modifications use this notification,
2693+
creation and deletion have dedicated messages.
25012694
notify: rss-get
2695+
-
2696+
name: rss-create-act
2697+
doc: Create an RSS context.
2698+
attribute-set: rss
2699+
do:
2700+
request: &rss-create-attrs
2701+
attributes:
2702+
- header
2703+
- context
2704+
- hfunc
2705+
- indir
2706+
- hkey
2707+
- input-xfrm
2708+
reply: *rss-create-attrs
2709+
-
2710+
name: rss-create-ntf
2711+
doc: |
2712+
Notification for creation of an additional RSS context.
2713+
notify: rss-create-act
2714+
-
2715+
name: rss-delete-act
2716+
doc: Delete an RSS context.
2717+
attribute-set: rss
2718+
do:
2719+
request:
2720+
attributes:
2721+
- header
2722+
- context
2723+
-
2724+
name: rss-delete-ntf
2725+
doc: |
2726+
Notification for deletion of an additional RSS context.
2727+
attribute-set: rss
2728+
event:
2729+
attributes:
2730+
- header
2731+
- context
25022732

25032733
mcast-groups:
25042734
list:

‎Documentation/netlink/specs/handshake.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ attribute-sets:
7171
-
7272
name: peername
7373
type: string
74+
-
75+
name: keyring
76+
type: u32
7477
-
7578
name: done
7679
attributes:
@@ -109,6 +112,7 @@ operations:
109112
- peer-identity
110113
- certificate
111114
- peername
115+
- keyring
112116
-
113117
name: done
114118
doc: Handler reports handshake completion

0 commit comments

Comments
 (0)