Skip to content

Commit f96c56f

Browse files
kuba-mookuba-moo
committed
sync to upstream net-next as of v6.18-rc4
net-next: commit 255d75ef029f ("Merge branch 'xsk-minor-optimizations-around-locks'") Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 2b4b874 commit f96c56f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1418
-405
lines changed

‎Documentation/netlink/genetlink-legacy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ properties:
154154
Optional format indicator that is intended only for choosing
155155
the right formatting mechanism when displaying values of this
156156
type.
157-
enum: [ hex, mac, fddi, ipv4, ipv6, uuid ]
157+
enum: [ hex, mac, fddi, ipv4, ipv6, ipv4-or-v6, uuid ]
158158
struct:
159159
description: Name of the nested struct type.
160160
type: string

‎Documentation/netlink/specs/binder.yaml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
2+
#
3+
# Copyright 2025 Google LLC
4+
#
5+
---
6+
name: binder
7+
protocol: genetlink
8+
uapi-header: linux/android/binder_netlink.h
9+
doc: Binder interface over generic netlink
10+
11+
attribute-sets:
12+
-
13+
name: report
14+
doc: |
15+
Attributes included within a transaction failure report. The elements
16+
correspond directly with the specific transaction that failed, along
17+
with the error returned to the sender e.g. BR_DEAD_REPLY.
18+
19+
attributes:
20+
-
21+
name: error
22+
type: u32
23+
doc: The enum binder_driver_return_protocol returned to the sender.
24+
-
25+
name: context
26+
type: string
27+
doc: The binder context where the transaction occurred.
28+
-
29+
name: from-pid
30+
type: u32
31+
doc: The PID of the sender process.
32+
-
33+
name: from-tid
34+
type: u32
35+
doc: The TID of the sender thread.
36+
-
37+
name: to-pid
38+
type: u32
39+
doc: |
40+
The PID of the recipient process. This attribute may not be present
41+
if the target could not be determined.
42+
-
43+
name: to-tid
44+
type: u32
45+
doc: |
46+
The TID of the recipient thread. This attribute may not be present
47+
if the target could not be determined.
48+
-
49+
name: is-reply
50+
type: flag
51+
doc: When present, indicates the failed transaction is a reply.
52+
-
53+
name: flags
54+
type: u32
55+
doc: The bitmask of enum transaction_flags from the transaction.
56+
-
57+
name: code
58+
type: u32
59+
doc: The application-defined code from the transaction.
60+
-
61+
name: data-size
62+
type: u32
63+
doc: The transaction payload size in bytes.
64+
65+
operations:
66+
list:
67+
-
68+
name: report
69+
doc: |
70+
A multicast event sent to userspace subscribers to notify them about
71+
binder transaction failures. The generated report provides the full
72+
details of the specific transaction that failed. The intention is for
73+
programs to monitor these events and react to the failures as needed.
74+
75+
attribute-set: report
76+
mcgrp: report
77+
event:
78+
attributes:
79+
- error
80+
- context
81+
- from-pid
82+
- from-tid
83+
- to-pid
84+
- to-tid
85+
- is-reply
86+
- flags
87+
- code
88+
- data-size
89+
90+
mcast-groups:
91+
list:
92+
-
93+
name: report

‎Documentation/netlink/specs/conntrack.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: conntrack
44
protocol: netlink-raw
55
protonum: 12
66

7-
doc:
7+
doc: >-
88
Netfilter connection tracking subsystem over nfnetlink
99
1010
definitions:
@@ -575,8 +575,8 @@ operations:
575575
- nat-dst
576576
- timeout
577577
- mark
578-
- counter-orig
579-
- counter-reply
578+
- counters-orig
579+
- counters-reply
580580
- use
581581
- id
582582
- nat-dst
@@ -591,7 +591,6 @@ operations:
591591
request:
592592
value: 0x101
593593
attributes:
594-
- nfgen-family
595594
- mark
596595
- filter
597596
- status
@@ -608,8 +607,8 @@ operations:
608607
- nat-dst
609608
- timeout
610609
- mark
611-
- counter-orig
612-
- counter-reply
610+
- counters-orig
611+
- counters-reply
613612
- use
614613
- id
615614
- nat-dst

‎Documentation/netlink/specs/devlink.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,10 @@ attribute-sets:
853853
type: nest
854854
multi-attr: true
855855
nested-attributes: dl-rate-tc-bws
856+
-
857+
name: health-reporter-burst-period
858+
type: u64
859+
doc: Time (in msec) for recoveries before starting the grace period.
856860
-
857861
name: dl-dev-stats
858862
subset-of: devlink
@@ -1216,6 +1220,8 @@ attribute-sets:
12161220
name: health-reporter-dump-ts-ns
12171221
-
12181222
name: health-reporter-auto-dump
1223+
-
1224+
name: health-reporter-burst-period
12191225

12201226
-
12211227
name: dl-attr-stats
@@ -1961,6 +1967,7 @@ operations:
19611967
- health-reporter-graceful-period
19621968
- health-reporter-auto-recover
19631969
- health-reporter-auto-dump
1970+
- health-reporter-burst-period
19641971

19651972
-
19661973
name: health-reporter-recover

‎Documentation/netlink/specs/dpll.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,10 @@ attribute-sets:
315315
If enabled, dpll device shall monitor and notify all currently
316316
available inputs for changes of their phase offset against the
317317
dpll device.
318+
-
319+
name: phase-offset-avg-factor
320+
type: u32
321+
doc: Averaging factor applied to calculation of reported phase offset.
318322
-
319323
name: pin
320324
enum-name: dpll_a_pin
@@ -436,6 +440,12 @@ attribute-sets:
436440
doc: |
437441
Capable pin provides list of pins that can be bound to create a
438442
reference-sync pin pair.
443+
-
444+
name: phase-adjust-gran
445+
type: u32
446+
doc: |
447+
Granularity of phase adjustment, in picoseconds. The value of
448+
phase adjustment must be a multiple of this granularity.
439449
440450
-
441451
name: pin-parent-device
@@ -523,6 +533,7 @@ operations:
523533
- clock-id
524534
- type
525535
- phase-offset-monitor
536+
- phase-offset-avg-factor
526537

527538
dump:
528539
reply: *dev-attrs
@@ -540,6 +551,7 @@ operations:
540551
attributes:
541552
- id
542553
- phase-offset-monitor
554+
- phase-offset-avg-factor
543555
-
544556
name: device-create-ntf
545557
doc: Notification about device appearing
@@ -599,6 +611,8 @@ operations:
599611
reply: &pin-attrs
600612
attributes:
601613
- id
614+
- module-name
615+
- clock-id
602616
- board-label
603617
- panel-label
604618
- package-label
@@ -608,6 +622,7 @@ operations:
608622
- capabilities
609623
- parent-device
610624
- parent-pin
625+
- phase-adjust-gran
611626
- phase-adjust-min
612627
- phase-adjust-max
613628
- phase-adjust

‎Documentation/netlink/specs/ethtool.yaml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ definitions:
204204
doc: dst port in case of TCP/UDP/SCTP
205205
-
206206
name: gtp-teid
207+
-
208+
name: ip6-fl
209+
doc: IPv6 Flow Label
207210
-
208211
name: discard
209212
value: 31
@@ -1216,6 +1219,30 @@ attribute-sets:
12161219
name: udp-ports
12171220
type: nest
12181221
nested-attributes: tunnel-udp
1222+
-
1223+
name: fec-hist
1224+
attr-cnt-name: --ethtool-a-fec-hist-cnt
1225+
attributes:
1226+
-
1227+
name: pad
1228+
type: pad
1229+
-
1230+
name: bin-low
1231+
type: u32
1232+
doc: Low bound of FEC bin (inclusive)
1233+
-
1234+
name: bin-high
1235+
type: u32
1236+
doc: High bound of FEC bin (inclusive)
1237+
-
1238+
name: bin-val
1239+
type: uint
1240+
doc: Error count in the bin (optional if per-lane values exist)
1241+
-
1242+
name: bin-val-per-lane
1243+
type: binary
1244+
sub-type: u64
1245+
doc: An array of per-lane error counters in the bin (optional)
12191246
-
12201247
name: fec-stat
12211248
attr-cnt-name: __ethtool-a-fec-stat-cnt
@@ -1239,6 +1266,11 @@ attribute-sets:
12391266
name: corr-bits
12401267
type: binary
12411268
sub-type: u64
1269+
-
1270+
name: hist
1271+
type: nest
1272+
multi-attr: True
1273+
nested-attributes: fec-hist
12421274
-
12431275
name: fec
12441276
attr-cnt-name: __ethtool-a-fec-cnt
@@ -1791,6 +1823,73 @@ attribute-sets:
17911823
type: uint
17921824
enum: pse-event
17931825
doc: List of events reported by the PSE controller
1826+
-
1827+
name: mse-capabilities
1828+
doc: MSE capabilities attribute set
1829+
attr-cnt-name: --ethtool-a-mse-capabilities-cnt
1830+
attributes:
1831+
-
1832+
name: max-average-mse
1833+
type: uint
1834+
-
1835+
name: max-peak-mse
1836+
type: uint
1837+
-
1838+
name: refresh-rate-ps
1839+
type: uint
1840+
-
1841+
name: num-symbols
1842+
type: uint
1843+
-
1844+
name: mse-snapshot
1845+
doc: MSE snapshot attribute set
1846+
attr-cnt-name: --ethtool-a-mse-snapshot-cnt
1847+
attributes:
1848+
-
1849+
name: average-mse
1850+
type: uint
1851+
-
1852+
name: peak-mse
1853+
type: uint
1854+
-
1855+
name: worst-peak-mse
1856+
type: uint
1857+
-
1858+
name: mse
1859+
attr-cnt-name: --ethtool-a-mse-cnt
1860+
attributes:
1861+
-
1862+
name: header
1863+
type: nest
1864+
nested-attributes: header
1865+
-
1866+
name: capabilities
1867+
type: nest
1868+
nested-attributes: mse-capabilities
1869+
-
1870+
name: channel-a
1871+
type: nest
1872+
nested-attributes: mse-snapshot
1873+
-
1874+
name: channel-b
1875+
type: nest
1876+
nested-attributes: mse-snapshot
1877+
-
1878+
name: channel-c
1879+
type: nest
1880+
nested-attributes: mse-snapshot
1881+
-
1882+
name: channel-d
1883+
type: nest
1884+
nested-attributes: mse-snapshot
1885+
-
1886+
name: worst-channel
1887+
type: nest
1888+
nested-attributes: mse-snapshot
1889+
-
1890+
name: link
1891+
type: nest
1892+
nested-attributes: mse-snapshot
17941893

17951894
operations:
17961895
enum-model: directional
@@ -2724,6 +2823,25 @@ operations:
27242823
attributes:
27252824
- header
27262825
- context
2826+
-
2827+
name: mse-get
2828+
doc: Get PHY MSE measurement data and capabilities.
2829+
attribute-set: mse
2830+
do: &mse-get-op
2831+
request:
2832+
attributes:
2833+
- header
2834+
reply:
2835+
attributes:
2836+
- header
2837+
- capabilities
2838+
- channel-a
2839+
- channel-b
2840+
- channel-c
2841+
- channel-d
2842+
- worst-channel
2843+
- link
2844+
dump: *mse-get-op
27272845

27282846
mcast-groups:
27292847
list:

‎Documentation/netlink/specs/fou.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ attribute-sets:
5252
name: local-v6
5353
type: binary
5454
checks:
55-
min-len: 16
55+
exact-len: 16
5656
-
5757
name: peer-v4
5858
type: u32
5959
-
6060
name: peer-v6
6161
type: binary
6262
checks:
63-
min-len: 16
63+
exact-len: 16
6464
-
6565
name: peer-port
6666
type: u16

0 commit comments

Comments
 (0)