Skip to contentSkip to conversation

netlink: specs: rt_addr: fix problems revealed by C codegen

PATCH Applied Jakub Kicinski 3 participants 9 messages Apr 3, 2025 – Apr 4, 2025

Subsystems (4)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

v3 cover netlink: specs: rt_addr: fix problems revealed by C codegen

I put together basic YNL C support for classic netlink. This revealed a few problems in the rt_addr spec.

v3:
- fixes from Donald on patch 2 and 3
- patch 4 is new
v2:
- fix the Fixes tag on patch 1
- add 2 more patches
v1: https://lore.kernel.org/[email protected]

Jakub Kicinski (4):
netlink: specs: rt_addr: fix the spec format / schema failures
netlink: specs: rt_addr: fix get multi command name
netlink: specs: rt_addr: pull the ifa- prefix out of the names
netlink: specs: rt_route: pull the ifa- prefix out of the names

 Documentation/netlink/specs/rt_addr.yaml  |  42 ++---
 Documentation/netlink/specs/rt_route.yaml | 180 +++++++++++-----------
 tools/testing/selftests/net/rtnetlink.py  |   4 +-
 3 files changed, 115 insertions(+), 111 deletions(-)
Signature · 1 line
2.49.0
author maintainer
#1 lore raw

PATCH v3 1/4 netlink: specs: rt_addr: fix the spec format / schema failures

The spec is mis-formatted, schema validation says:

Failed validating 'type' in schema['properties']['operations']['properties']['list']['items']['properties']['dump']['properties']['request']['properties']['value']:

    {'minimum': 0, 'type': 'integer'}

On instance['operations']['list'][3]['dump']['request']['value']:

    '58 - ifa-family'

The ifa-family clearly wants to be part of an attribute list.

Fixes 4f280376e531 ("selftests/net: Add selftest for IPv4 RTM_GETMULTICAST support")

---
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 Documentation/netlink/specs/rt_addr.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/netlink/specs/rt_addr.yaml +1 -0
index 5dd5469044c7..3bc9b6f9087e 100644
@@ -187,6 +187,7 @@ protonum: 0
       dump:
         request:
           value: 58
+          attributes:
             - ifa-family
         reply:
           value: 58
Signature · 1 line
2.49.0
author maintainer
#2 lore raw

PATCH v3 2/4 netlink: specs: rt_addr: fix get multi command name

In reply to Jakub Kicinski

Command names should match C defines, codegens may depend on it.

Fixes 4f280376e531 ("selftests/net: Add selftest for IPv4 RTM_GETMULTICAST support")

---
v3:
- fix the op name in the test
v2: https://lore.kernel.org/[email protected]

---
 Documentation/netlink/specs/rt_addr.yaml | 2 +-
 tools/testing/selftests/net/rtnetlink.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/netlink/specs/rt_addr.yaml +1 -1
index 3bc9b6f9087e..1650dc3f091a 100644
@@ -169,7 +169,7 @@ protonum: 0
           value: 20
           attributes: *ifaddr-all
     -
-      name: getmaddrs
+      name: getmulticast
       doc: Get / dump IPv4/IPv6 multicast addresses.
       attribute-set: addr-attrs
       fixed-header: ifaddrmsg
tools/testing/selftests/net/rtnetlink.py +1 -1
index 80950888800b..69436415d56e 100755
@@ -12,7 +12,7 @@ IPV4_ALL_HOSTS_MULTICAST = b'\xe0\x00\x00\x01'
     At least the loopback interface should have this address.
     """
 
-    addresses = rtnl.getmaddrs({"ifa-family": socket.AF_INET}, dump=True)
+    addresses = rtnl.getmulticast({"ifa-family": socket.AF_INET}, dump=True)
 
     all_host_multicasts = [
         addr for addr in addresses if addr['ifa-multicast'] == IPV4_ALL_HOSTS_MULTICAST
Signature · 1 line
2.49.0
author maintainer
#4 lore raw

PATCH v3 3/4 netlink: specs: rt_addr: pull the ifa- prefix out of the names

In reply to Jakub Kicinski

YAML specs don't normally include the C prefix name in the name of the YAML attr. Remove the ifa- prefix from all attributes in addr-attrs and specify name-prefix instead.

This is a bit risky, hopefully there aren't many users out there.

Fixes dfb0f7d9d979 ("doc/netlink: Add spec for rt addr messages")

---
v3:
- don't remove prefix from the struct name
v2: https://lore.kernel.org/[email protected]

---
 Documentation/netlink/specs/rt_addr.yaml | 39 ++++++++++++------------
 tools/testing/selftests/net/rtnetlink.py |  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)
Documentation/netlink/specs/rt_addr.yaml +20 -19
index 1650dc3f091a..df6b23f06a22 100644
@@ -78,45 +78,46 @@ protonum: 0
 attribute-sets:
   -
     name: addr-attrs
+    name-prefix: ifa-
     attributes:
       -
-        name: ifa-address
+        name: address
         type: binary
         display-hint: ipv4
       -
-        name: ifa-local
+        name: local
         type: binary
         display-hint: ipv4
       -
-        name: ifa-label
+        name: label
         type: string
       -
-        name: ifa-broadcast
+        name: broadcast
         type: binary
         display-hint: ipv4
       -
-        name: ifa-anycast
+        name: anycast
         type: binary
       -
-        name: ifa-cacheinfo
+        name: cacheinfo
         type: binary
         struct: ifa-cacheinfo
       -
-        name: ifa-multicast
+        name: multicast
         type: binary
       -
-        name: ifa-flags
+        name: flags
         type: u32
         enum: ifa-flags
         enum-as-flags: true
       -
-        name: ifa-rt-priority
+        name: rt-priority
         type: u32
       -
-        name: ifa-target-netnsid
+        name: target-netnsid
         type: binary
       -
-        name: ifa-proto
+        name: proto
         type: u8
 
 
@@ -137,10 +138,10 @@ protonum: 0
             - ifa-prefixlen
             - ifa-scope
             - ifa-index
-            - ifa-address
-            - ifa-label
-            - ifa-local
-            - ifa-cacheinfo
+            - address
+            - label
+            - local
+            - cacheinfo
     -
       name: deladdr
       doc: Remove address
@@ -154,8 +155,8 @@ protonum: 0
             - ifa-prefixlen
             - ifa-scope
             - ifa-index
-            - ifa-address
-            - ifa-local
+            - address
+            - local
     -
       name: getaddr
       doc: Dump address information.
@@ -182,8 +183,8 @@ protonum: 0
         reply:
           value: 58
           attributes: &mcaddr-attrs
-            - ifa-multicast
-            - ifa-cacheinfo
+            - multicast
+            - cacheinfo
       dump:
         request:
           value: 58
tools/testing/selftests/net/rtnetlink.py +1 -1
index 69436415d56e..e9ad5e88da97 100755
@@ -15,7 +15,7 @@ IPV4_ALL_HOSTS_MULTICAST = b'\xe0\x00\x00\x01'
     addresses = rtnl.getmulticast({"ifa-family": socket.AF_INET}, dump=True)
 
     all_host_multicasts = [
-        addr for addr in addresses if addr['ifa-multicast'] == IPV4_ALL_HOSTS_MULTICAST
+        addr for addr in addresses if addr['multicast'] == IPV4_ALL_HOSTS_MULTICAST
     ]
 
     ksft_ge(len(all_host_multicasts), 1,
Signature · 1 line
2.49.0
author maintainer
#6 lore raw

PATCH v3 4/4 netlink: specs: rt_route: pull the ifa- prefix out of the names

In reply to Jakub Kicinski

YAML specs don't normally include the C prefix name in the name of the YAML attr. Remove the ifa- prefix from all attributes in route-attrs and metrics and specify name-prefix instead.

This is a bit risky, hopefully there aren't many users out there.

Fixes 023289b4f582 ("doc/netlink: Add spec for rt route messages")

---
v3:
- new

---
 Documentation/netlink/specs/rt_route.yaml | 180 +++++++++++-----------
 1 file changed, 91 insertions(+), 89 deletions(-)
Documentation/netlink/specs/rt_route.yaml +91 -89
index a674103e5bc4..292469c7d4b9 100644
@@ -80,165 +80,167 @@ protonum: 0
 attribute-sets:
   -
     name: route-attrs
+    name-prefix: rta-
     attributes:
       -
-        name: rta-dst
+        name: dst
         type: binary
         display-hint: ipv4
       -
-        name: rta-src
+        name: src
         type: binary
         display-hint: ipv4
       -
-        name: rta-iif
+        name: iif
         type: u32
       -
-        name: rta-oif
+        name: oif
         type: u32
       -
-        name: rta-gateway
+        name: gateway
         type: binary
         display-hint: ipv4
       -
-        name: rta-priority
+        name: priority
         type: u32
       -
-        name: rta-prefsrc
+        name: prefsrc
         type: binary
         display-hint: ipv4
       -
-        name: rta-metrics
+        name: metrics
         type: nest
-        nested-attributes: rta-metrics
+        nested-attributes: metrics
       -
-        name: rta-multipath
+        name: multipath
         type: binary
       -
-        name: rta-protoinfo # not used
+        name: protoinfo # not used
         type: binary
       -
-        name: rta-flow
+        name: flow
         type: u32
       -
-        name: rta-cacheinfo
+        name: cacheinfo
         type: binary
         struct: rta-cacheinfo
       -
-        name: rta-session # not used
+        name: session # not used
         type: binary
       -
-        name: rta-mp-algo # not used
+        name: mp-algo # not used
         type: binary
       -
-        name: rta-table
+        name: table
         type: u32
       -
-        name: rta-mark
+        name: mark
         type: u32
       -
-        name: rta-mfc-stats
+        name: mfc-stats
         type: binary
       -
-        name: rta-via
+        name: via
         type: binary
       -
-        name: rta-newdst
+        name: newdst
         type: binary
       -
-        name: rta-pref
+        name: pref
         type: u8
       -
-        name: rta-encap-type
+        name: encap-type
         type: u16
       -
-        name: rta-encap
+        name: encap
         type: binary # tunnel specific nest
       -
-        name: rta-expires
+        name: expires
         type: u32
       -
-        name: rta-pad
+        name: pad
         type: binary
       -
-        name: rta-uid
+        name: uid
         type: u32
       -
-        name: rta-ttl-propagate
+        name: ttl-propagate
         type: u8
       -
-        name: rta-ip-proto
+        name: ip-proto
         type: u8
       -
-        name: rta-sport
+        name: sport
         type: u16
       -
-        name: rta-dport
+        name: dport
         type: u16
       -
-        name: rta-nh-id
+        name: nh-id
         type: u32
       -
-        name: rta-flowlabel
+        name: flowlabel
         type: u32
         byte-order: big-endian
         display-hint: hex
   -
-    name: rta-metrics
+    name: metrics
+    name-prefix: rtax-
     attributes:
       -
-        name: rtax-unspec
+        name: unspec
         type: unused
         value: 0
       -
-        name: rtax-lock
+        name: lock
         type: u32
       -
-        name: rtax-mtu
+        name: mtu
         type: u32
       -
-        name: rtax-window
+        name: window
         type: u32
       -
-        name: rtax-rtt
+        name: rtt
         type: u32
       -
-        name: rtax-rttvar
+        name: rttvar
         type: u32
       -
-        name: rtax-ssthresh
+        name: ssthresh
         type: u32
       -
-        name: rtax-cwnd
+        name: cwnd
         type: u32
       -
-        name: rtax-advmss
+        name: advmss
         type: u32
       -
-        name: rtax-reordering
+        name: reordering
         type: u32
       -
-        name: rtax-hoplimit
+        name: hoplimit
         type: u32
       -
-        name: rtax-initcwnd
+        name: initcwnd
         type: u32
       -
-        name: rtax-features
+        name: features
         type: u32
       -
-        name: rtax-rto-min
+        name: rto-min
         type: u32
       -
-        name: rtax-initrwnd
+        name: initrwnd
         type: u32
       -
-        name: rtax-quickack
+        name: quickack
         type: u32
       -
-        name: rtax-cc-algo
+        name: cc-algo
         type: string
       -
-        name: rtax-fastopen-no-cookie
+        name: fastopen-no-cookie
         type: u32
 
 operations:
@@ -254,18 +256,18 @@ protonum: 0
           value: 26
           attributes:
             - rtm-family
-            - rta-src
+            - src
             - rtm-src-len
-            - rta-dst
+            - dst
             - rtm-dst-len
-            - rta-iif
-            - rta-oif
-            - rta-ip-proto
-            - rta-sport
-            - rta-dport
-            - rta-mark
-            - rta-uid
-            - rta-flowlabel
+            - iif
+            - oif
+            - ip-proto
+            - sport
+            - dport
+            - mark
+            - uid
+            - flowlabel
         reply:
           value: 24
           attributes: &all-route-attrs
@@ -278,34 +280,34 @@ protonum: 0
             - rtm-scope
             - rtm-type
             - rtm-flags
-            - rta-dst
-            - rta-src
-            - rta-iif
-            - rta-oif
-            - rta-gateway
-            - rta-priority
-            - rta-prefsrc
-            - rta-metrics
-            - rta-multipath
-            - rta-flow
-            - rta-cacheinfo
-            - rta-table
-            - rta-mark
-            - rta-mfc-stats
-            - rta-via
-            - rta-newdst
-            - rta-pref
-            - rta-encap-type
-            - rta-encap
-            - rta-expires
-            - rta-pad
-            - rta-uid
-            - rta-ttl-propagate
-            - rta-ip-proto
-            - rta-sport
-            - rta-dport
-            - rta-nh-id
-            - rta-flowlabel
+            - dst
+            - src
+            - iif
+            - oif
+            - gateway
+            - priority
+            - prefsrc
+            - metrics
+            - multipath
+            - flow
+            - cacheinfo
+            - table
+            - mark
+            - mfc-stats
+            - via
+            - newdst
+            - pref
+            - encap-type
+            - encap
+            - expires
+            - pad
+            - uid
+            - ttl-propagate
+            - ip-proto
+            - sport
+            - dport
+            - nh-id
+            - flowlabel
       dump:
         request:
           value: 26
Signature · 1 line
2.49.0
maintainer Reviewed-by on v3 2/4
#3 lore raw

Re: [PATCH net v3 2/4] netlink: specs: rt_addr: fix get multi command name

In reply to Jakub Kicinski
Quoted 32 lines · Jakub Kicinski

Command names should match C defines, codegens may depend on it.

Fixes 4f280376e531 ("selftests/net: Add selftest for IPv4 RTM_GETMULTICAST support")

---
v3:
- fix the op name in the test
v2: https://lore.kernel.org/[email protected]

---
 Documentation/netlink/specs/rt_addr.yaml | 2 +-
 tools/testing/selftests/net/rtnetlink.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/netlink/specs/rt_addr.yaml +1 -1
index 3bc9b6f9087e..1650dc3f091a 100644
@@ -169,7 +169,7 @@ protonum: 0
           value: 20
           attributes: *ifaddr-all
     -
-      name: getmaddrs
+      name: getmulticast
       doc: Get / dump IPv4/IPv6 multicast addresses.
       attribute-set: addr-attrs
       fixed-header: ifaddrmsg
tools/testing/selftests/net/rtnetlink.py +0 -0
index 80950888800b..69436415d56e 100755

tools/testing/selftests/net/rtnetlink.py IPV4_ALL_HOSTS_MULTICAST = b'\xe0\x00\x00\x01' · line 18

Quoted 8 lines
tools/testing/selftests/net/rtnetlink.py +1 -1
@@ -12,7 +12,7 @@ IPV4_ALL_HOSTS_MULTICAST = b'\xe0\x00\x00\x01'
     At least the loopback interface should have this address.
     """
 
-    addresses = rtnl.getmaddrs({"ifa-family": socket.AF_INET}, dump=True)
+    addresses = rtnl.getmulticast({"ifa-family": socket.AF_INET}, dump=True)
 
     all_host_multicasts = [
         addr for addr in addresses if addr['ifa-multicast'] == IPV4_ALL_HOSTS_MULTICAST
maintainer Reviewed-by on v3 3/4
#5 lore raw

Re: [PATCH net v3 3/4] netlink: specs: rt_addr: pull the ifa- prefix out of the names

In reply to Jakub Kicinski
Quoted 11 lines · Jakub Kicinski

YAML specs don't normally include the C prefix name in the name of the YAML attr. Remove the ifa- prefix from all attributes in addr-attrs and specify name-prefix instead.

This is a bit risky, hopefully there aren't many users out there.

Fixes dfb0f7d9d979 ("doc/netlink: Add spec for rt addr messages")

---
v3:
- don't remove prefix from the struct name

maintainer Reviewed-by on v3 4/4
#7 lore raw

Re: [PATCH net v3 4/4] netlink: specs: rt_route: pull the ifa- prefix out of the names

In reply to Jakub Kicinski
Quoted 8 lines · Jakub Kicinski

YAML specs don't normally include the C prefix name in the name of the YAML attr. Remove the ifa- prefix from all attributes in route-attrs and metrics and specify name-prefix instead.

This is a bit risky, hopefully there aren't many users out there.

Fixes 023289b4f582 ("doc/netlink: Add spec for rt route messages")
#8 lore raw
In reply to Jakub Kicinski
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 11 lines · On Wed, 2 Apr 2025 18:37:02 -0700 you wrote:

I put together basic YNL C support for classic netlink. This revealed a few problems in the rt_addr spec.

v3:
- fixes from Donald on patch 2 and 3
- patch 4 is new
v2:
- fix the Fixes tag on patch 1
- add 2 more patches
v1: https://lore.kernel.org/[email protected]

Quoted 1 line

[...]

Here is the summary with links:
- [net,v3,1/4] netlink: specs: rt_addr: fix the spec format / schema failures

    https://git.kernel.org/netdev/net/c/0802c32d4b03
  - [net,v3,2/4] netlink: specs: rt_addr: fix get multi command name
    https://git.kernel.org/netdev/net/c/524c03585fda
  - [net,v3,3/4] netlink: specs: rt_addr: pull the ifa- prefix out of the names
    https://git.kernel.org/netdev/net/c/0c8e30252d9f
  - [net,v3,4/4] netlink: specs: rt_route: pull the ifa- prefix out of the names
    https://git.kernel.org/netdev/net/c/1a1eba0e9899

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html