Merge branch 'tools-ynl-rst-display-attribute-set-doc'

Matthieu Baerts says:

====================
tools: ynl: rst: display attribute-set doc

Some attribute-set have a documentation (doc:), but they are not
displayed in the RST / HTML version. This series adds the missing
parsing of these 'doc' fields.

While at it, it also fixes how the 'doc' fields are declared on multiple
lines.
====================

Link: https://patch.msgid.link/20250913-net-next-ynl-attr-doc-rst-v3-0-4f06420d87db@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-09-15 18:27:22 -07:00
15 changed files with 31 additions and 25 deletions

View File

@@ -4,7 +4,7 @@ name: conntrack
protocol: netlink-raw
protonum: 12
doc:
doc: >-
Netfilter connection tracking subsystem over nfnetlink
definitions:

View File

@@ -2,7 +2,7 @@
---
name: netdev
doc:
doc: >-
netdev configuration over generic netlink.
definitions:
@@ -13,33 +13,33 @@ definitions:
entries:
-
name: basic
doc:
doc: >-
XDP features set supported by all drivers
(XDP_ABORTED, XDP_DROP, XDP_PASS, XDP_TX)
-
name: redirect
doc:
doc: >-
The netdev supports XDP_REDIRECT
-
name: ndo-xmit
doc:
doc: >-
This feature informs if netdev implements ndo_xdp_xmit callback.
-
name: xsk-zerocopy
doc:
doc: >-
This feature informs if netdev supports AF_XDP in zero copy mode.
-
name: hw-offload
doc:
doc: >-
This feature informs if netdev supports XDP hw offloading.
-
name: rx-sg
doc:
doc: >-
This feature informs if netdev implements non-linear XDP buffer
support in the driver napi callback.
-
name: ndo-xmit-sg
doc:
doc: >-
This feature informs if netdev implements non-linear XDP buffer
support in ndo_xdp_xmit callback.
-
@@ -67,15 +67,15 @@ definitions:
entries:
-
name: tx-timestamp
doc:
doc: >-
HW timestamping egress packets is supported by the driver.
-
name: tx-checksum
doc:
doc: >-
L3 checksum HW offload is supported by the driver.
-
name: tx-launch-time-fifo
doc:
doc: >-
Launch time HW offload is supported by the driver.
-
name: queue-type

View File

@@ -4,7 +4,7 @@ name: nftables
protocol: netlink-raw
protonum: 12
doc:
doc: >-
Netfilter nftables configuration over netlink.
definitions:

View File

@@ -3,7 +3,7 @@
name: nl80211
protocol: genetlink-legacy
doc:
doc: >-
Netlink API for 802.11 wireless devices
definitions:

View File

@@ -5,7 +5,7 @@ version: 2
protocol: genetlink-legacy
uapi-header: linux/openvswitch.h
doc:
doc: >-
OVS datapath configuration over generic netlink.
definitions:

View File

@@ -5,7 +5,7 @@ version: 1
protocol: genetlink-legacy
uapi-header: linux/openvswitch.h
doc:
doc: >-
OVS flow configuration over generic netlink.
definitions:

View File

@@ -5,7 +5,7 @@ version: 2
protocol: genetlink-legacy
uapi-header: linux/openvswitch.h
doc:
doc: >-
OVS vport configuration over generic netlink.
definitions:

View File

@@ -5,7 +5,7 @@ protocol: netlink-raw
uapi-header: linux/rtnetlink.h
protonum: 0
doc:
doc: >-
Address configuration over rtnetlink.
definitions:

View File

@@ -5,7 +5,7 @@ protocol: netlink-raw
uapi-header: linux/rtnetlink.h
protonum: 0
doc:
doc: >-
Link configuration over rtnetlink.
definitions:

View File

@@ -5,7 +5,7 @@ protocol: netlink-raw
uapi-header: linux/rtnetlink.h
protonum: 0
doc:
doc: >-
IP neighbour management over rtnetlink.
definitions:

View File

@@ -5,7 +5,7 @@ protocol: netlink-raw
uapi-header: linux/rtnetlink.h
protonum: 0
doc:
doc: >-
Route configuration over rtnetlink.
definitions:

View File

@@ -5,7 +5,7 @@ protocol: netlink-raw
uapi-header: linux/fib_rules.h
protonum: 0
doc:
doc: >-
FIB rule management over rtnetlink.
definitions:

View File

@@ -5,7 +5,7 @@ protocol: netlink-raw
uapi-header: linux/pkt_cls.h
protonum: 0
doc:
doc: >-
Netlink raw family for tc qdisc, chain, class and filter configuration
over rtnetlink.

View File

@@ -25,8 +25,9 @@ definitions:
attribute-sets:
-
name: team
doc:
The team nested layout of get/set msg looks like
doc: |
The team nested layout of get/set msg looks like::
[TEAM_ATTR_LIST_OPTION]
[TEAM_ATTR_ITEM_OPTION]
[TEAM_ATTR_OPTION_*], ...
@@ -39,6 +40,7 @@ attribute-sets:
[TEAM_ATTR_ITEM_PORT]
[TEAM_ATTR_PORT_*], ...
...
name-prefix: team-attr-
attributes:
-

View File

@@ -289,6 +289,10 @@ class YnlDocGenerator:
for entry in entries:
lines.append(self.fmt.rst_section(namespace, 'attribute-set',
entry["name"]))
if "doc" in entry:
lines.append(self.fmt.rst_paragraph(entry["doc"], 0) + "\n")
for attr in entry["attributes"]:
if LINE_STR in attr:
lines.append(self.fmt.rst_lineno(attr[LINE_STR]))