Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+31 -25
+1 -1
Documentation/netlink/specs/conntrack.yaml
··· 4 4 protocol: netlink-raw 5 5 protonum: 12 6 6 7 - doc: 7 + doc: >- 8 8 Netfilter connection tracking subsystem over nfnetlink 9 9 10 10 definitions:
+11 -11
Documentation/netlink/specs/netdev.yaml
··· 2 2 --- 3 3 name: netdev 4 4 5 - doc: 5 + doc: >- 6 6 netdev configuration over generic netlink. 7 7 8 8 definitions: ··· 13 13 entries: 14 14 - 15 15 name: basic 16 - doc: 16 + doc: >- 17 17 XDP features set supported by all drivers 18 18 (XDP_ABORTED, XDP_DROP, XDP_PASS, XDP_TX) 19 19 - 20 20 name: redirect 21 - doc: 21 + doc: >- 22 22 The netdev supports XDP_REDIRECT 23 23 - 24 24 name: ndo-xmit 25 - doc: 25 + doc: >- 26 26 This feature informs if netdev implements ndo_xdp_xmit callback. 27 27 - 28 28 name: xsk-zerocopy 29 - doc: 29 + doc: >- 30 30 This feature informs if netdev supports AF_XDP in zero copy mode. 31 31 - 32 32 name: hw-offload 33 - doc: 33 + doc: >- 34 34 This feature informs if netdev supports XDP hw offloading. 35 35 - 36 36 name: rx-sg 37 - doc: 37 + doc: >- 38 38 This feature informs if netdev implements non-linear XDP buffer 39 39 support in the driver napi callback. 40 40 - 41 41 name: ndo-xmit-sg 42 - doc: 42 + doc: >- 43 43 This feature informs if netdev implements non-linear XDP buffer 44 44 support in ndo_xdp_xmit callback. 45 45 - ··· 67 67 entries: 68 68 - 69 69 name: tx-timestamp 70 - doc: 70 + doc: >- 71 71 HW timestamping egress packets is supported by the driver. 72 72 - 73 73 name: tx-checksum 74 - doc: 74 + doc: >- 75 75 L3 checksum HW offload is supported by the driver. 76 76 - 77 77 name: tx-launch-time-fifo 78 - doc: 78 + doc: >- 79 79 Launch time HW offload is supported by the driver. 80 80 - 81 81 name: queue-type
+1 -1
Documentation/netlink/specs/nftables.yaml
··· 4 4 protocol: netlink-raw 5 5 protonum: 12 6 6 7 - doc: 7 + doc: >- 8 8 Netfilter nftables configuration over netlink. 9 9 10 10 definitions:
+1 -1
Documentation/netlink/specs/nl80211.yaml
··· 3 3 name: nl80211 4 4 protocol: genetlink-legacy 5 5 6 - doc: 6 + doc: >- 7 7 Netlink API for 802.11 wireless devices 8 8 9 9 definitions:
+1 -1
Documentation/netlink/specs/ovs_datapath.yaml
··· 5 5 protocol: genetlink-legacy 6 6 uapi-header: linux/openvswitch.h 7 7 8 - doc: 8 + doc: >- 9 9 OVS datapath configuration over generic netlink. 10 10 11 11 definitions:
+1 -1
Documentation/netlink/specs/ovs_flow.yaml
··· 5 5 protocol: genetlink-legacy 6 6 uapi-header: linux/openvswitch.h 7 7 8 - doc: 8 + doc: >- 9 9 OVS flow configuration over generic netlink. 10 10 11 11 definitions:
+1 -1
Documentation/netlink/specs/ovs_vport.yaml
··· 5 5 protocol: genetlink-legacy 6 6 uapi-header: linux/openvswitch.h 7 7 8 - doc: 8 + doc: >- 9 9 OVS vport configuration over generic netlink. 10 10 11 11 definitions:
+1 -1
Documentation/netlink/specs/rt-addr.yaml
··· 5 5 uapi-header: linux/rtnetlink.h 6 6 protonum: 0 7 7 8 - doc: 8 + doc: >- 9 9 Address configuration over rtnetlink. 10 10 11 11 definitions:
+1 -1
Documentation/netlink/specs/rt-link.yaml
··· 5 5 uapi-header: linux/rtnetlink.h 6 6 protonum: 0 7 7 8 - doc: 8 + doc: >- 9 9 Link configuration over rtnetlink. 10 10 11 11 definitions:
+1 -1
Documentation/netlink/specs/rt-neigh.yaml
··· 5 5 uapi-header: linux/rtnetlink.h 6 6 protonum: 0 7 7 8 - doc: 8 + doc: >- 9 9 IP neighbour management over rtnetlink. 10 10 11 11 definitions:
+1 -1
Documentation/netlink/specs/rt-route.yaml
··· 5 5 uapi-header: linux/rtnetlink.h 6 6 protonum: 0 7 7 8 - doc: 8 + doc: >- 9 9 Route configuration over rtnetlink. 10 10 11 11 definitions:
+1 -1
Documentation/netlink/specs/rt-rule.yaml
··· 5 5 uapi-header: linux/fib_rules.h 6 6 protonum: 0 7 7 8 - doc: 8 + doc: >- 9 9 FIB rule management over rtnetlink. 10 10 11 11 definitions:
+1 -1
Documentation/netlink/specs/tc.yaml
··· 5 5 uapi-header: linux/pkt_cls.h 6 6 protonum: 0 7 7 8 - doc: 8 + doc: >- 9 9 Netlink raw family for tc qdisc, chain, class and filter configuration 10 10 over rtnetlink. 11 11
+4 -2
Documentation/netlink/specs/team.yaml
··· 25 25 attribute-sets: 26 26 - 27 27 name: team 28 - doc: 29 - The team nested layout of get/set msg looks like 28 + doc: | 29 + The team nested layout of get/set msg looks like:: 30 + 30 31 [TEAM_ATTR_LIST_OPTION] 31 32 [TEAM_ATTR_ITEM_OPTION] 32 33 [TEAM_ATTR_OPTION_*], ... ··· 40 39 [TEAM_ATTR_ITEM_PORT] 41 40 [TEAM_ATTR_PORT_*], ... 42 41 ... 42 + 43 43 name-prefix: team-attr- 44 44 attributes: 45 45 -
+4
tools/net/ynl/pyynl/lib/doc_generator.py
··· 289 289 for entry in entries: 290 290 lines.append(self.fmt.rst_section(namespace, 'attribute-set', 291 291 entry["name"])) 292 + 293 + if "doc" in entry: 294 + lines.append(self.fmt.rst_paragraph(entry["doc"], 0) + "\n") 295 + 292 296 for attr in entry["attributes"]: 293 297 if LINE_STR in attr: 294 298 lines.append(self.fmt.rst_lineno(attr[LINE_STR]))