Skip to contentSkip to conversation

netlink: specs: rt-link: decode ip6gre

PATCH Applied Jakub Kicinski 3 participants 6 messages Jun 3, 2025 – Jun 5, 2025

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

cover netlink: specs: rt-link: decode ip6gre

Adding GRE tunnels to the .config for driver tests caused some unhappiness in YNL, as it can't decode all the link attrs on the system. Add ip6gre support to fix the tests. This is similar to commit 6ffdbb93a59c ("netlink: specs:
rt_link: decode ip6tnl, vti and vti6 link attrs").

Jakub Kicinski (2):
netlink: specs: rt-link: add missing byte-order properties
netlink: specs: rt-link: decode ip6gre

 Documentation/netlink/specs/rt-link.yaml | 68 +++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)
Signature · 1 line
2.49.0
author maintainer
#1 lore raw

PATCH 1/2 netlink: specs: rt-link: add missing byte-order properties

A number of fields in the ip tunnels are lacking the big-endian designation. I suspect this is not intentional, as decoding the ports with the right endian seems objectively beneficial.

Fixes 6ffdbb93a59c ("netlink: specs: rt_link: decode ip6tnl, vti and vti6 link attrs")
Fixes 077b6022d24b ("doc/netlink/specs: Add sub-message type to rt_link family")
---
 Documentation/netlink/specs/rt-link.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
Documentation/netlink/specs/rt-link.yaml +15 -0
index 5ec3d35b7a38..6521125162e6 100644
@@ -1685,15 +1685,19 @@ protonum: 0
       -
         name: iflags
         type: u16
+        byte-order: big-endian
       -
         name: oflags
         type: u16
+        byte-order: big-endian
       -
         name: ikey
         type: u32
+        byte-order: big-endian
       -
         name: okey
         type: u32
+        byte-order: big-endian
       -
         name: local
         type: binary
@@ -1717,6 +1721,7 @@ protonum: 0
       -
         name: flowinfo
         type: u32
+        byte-order: big-endian
       -
         name: flags
         type: u32
@@ -1729,9 +1734,11 @@ protonum: 0
       -
         name: encap-sport
         type: u16
+        byte-order: big-endian
       -
         name: encap-dport
         type: u16
+        byte-order: big-endian
       -
         name: collect-metadata
         type: flag
@@ -1764,9 +1771,11 @@ protonum: 0
       -
         name: ikey
         type: u32
+        byte-order: big-endian
       -
         name: okey
         type: u32
+        byte-order: big-endian
       -
         name: local
         type: binary
@@ -1816,6 +1825,7 @@ protonum: 0
       -
         name: port
         type: u16
+        byte-order: big-endian
       -
         name: collect-metadata
         type: flag
@@ -1835,6 +1845,7 @@ protonum: 0
       -
         name: label
         type: u32
+        byte-order: big-endian
       -
         name: ttl-inherit
         type: u8
@@ -1875,9 +1886,11 @@ protonum: 0
       -
         name: flowinfo
         type: u32
+        byte-order: big-endian
       -
         name: flags
         type: u16
+        byte-order: big-endian
       -
         name: proto
         type: u8
@@ -1907,9 +1920,11 @@ protonum: 0
       -
         name: encap-sport
         type: u16
+        byte-order: big-endian
       -
         name: encap-dport
         type: u16
+        byte-order: big-endian
       -
         name: collect-metadata
         type: flag
Signature · 1 line
2.49.0
maintainer Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH net 1/2] netlink: specs: rt-link: add missing byte-order properties

Quoted 7 lines · Jakub Kicinski

A number of fields in the ip tunnels are lacking the big-endian designation. I suspect this is not intentional, as decoding the ports with the right endian seems objectively beneficial.

Fixes 6ffdbb93a59c ("netlink: specs: rt_link: decode ip6tnl, vti and vti6 link attrs")
Fixes 077b6022d24b ("doc/netlink/specs: Add sub-message type to rt_link family")
author maintainer
#3 lore raw

PATCH 2/2 netlink: specs: rt-link: decode ip6gre

In reply to Jakub Kicinski

Driver tests now require GRE tunnels, while we don't configure them with YNL, YNL will complain when it sees link types it doesn't recognize. Teach it decoding ip6gre tunnels. The attrs are largely the same as IPv4 GRE.

Correct the type of encap-limit, but note that this attr is only used in ip6gre, so the mistake didn't matter until now.

Fixes 0d0f4174f6c8 ("selftests: drv-net: add a simple TSO test")
---
 Documentation/netlink/specs/rt-link.yaml | 53 +++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)
Documentation/netlink/specs/rt-link.yaml +52 -1
index 6521125162e6..b41b31eebcae 100644
@@ -1717,7 +1717,7 @@ protonum: 0
         type: u8
       -
         name: encap-limit
-        type: u32
+        type: u8
       -
         name: flowinfo
         type: u32
@@ -1760,6 +1760,54 @@ protonum: 0
       -
         name: erspan-hwid
         type: u16
+  -
+    name: linkinfo-gre6-attrs
+    subset-of: linkinfo-gre-attrs
+    attributes:
+      -
+        name: link
+      -
+        name: iflags
+      -
+        name: oflags
+      -
+        name: ikey
+      -
+        name: okey
+      -
+        name: local
+        display-hint: ipv6
+      -
+        name: remote
+        display-hint: ipv6
+      -
+        name: ttl
+      -
+        name: encap-limit
+      -
+        name: flowinfo
+      -
+        name: flags
+      -
+        name: encap-type
+      -
+        name: encap-flags
+      -
+        name: encap-sport
+      -
+        name: encap-dport
+      -
+        name: collect-metadata
+      -
+        name: fwmark
+      -
+        name: erspan-index
+      -
+        name: erspan-ver
+      -
+        name: erspan-dir
+      -
+        name: erspan-hwid
   -
     name: linkinfo-vti-attrs
     name-prefix: ifla-vti-
@@ -2239,6 +2287,9 @@ protonum: 0
       -
         value: gretap
         attribute-set: linkinfo-gre-attrs
+      -
+        value: ip6gre
+        attribute-set: linkinfo-gre6-attrs
       -
         value: geneve
         attribute-set: linkinfo-geneve-attrs
Signature · 1 line
2.49.0
maintainer Reviewed-by on v1 2/2
#4 lore raw
Quoted 10 lines · Jakub Kicinski

Driver tests now require GRE tunnels, while we don't configure them with YNL, YNL will complain when it sees link types it doesn't recognize. Teach it decoding ip6gre tunnels. The attrs are largely the same as IPv4 GRE.

Correct the type of encap-limit, but note that this attr is only used in ip6gre, so the mistake didn't matter until now.

Fixes 0d0f4174f6c8 ("selftests: drv-net: add a simple TSO test")
#5 lore raw
In reply to Jakub Kicinski
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:

Hello:

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

Quoted 11 lines · On Tue, 3 Jun 2025 06:53:55 -0700 you wrote:

Adding GRE tunnels to the .config for driver tests caused some unhappiness in YNL, as it can't decode all the link attrs on the system. Add ip6gre support to fix the tests. This is similar to commit 6ffdbb93a59c ("netlink: specs:
rt_link: decode ip6tnl, vti and vti6 link attrs").

Jakub Kicinski (2):
netlink: specs: rt-link: add missing byte-order properties
netlink: specs: rt-link: decode ip6gre

[...]

Here is the summary with links:
- [net,1/2] netlink: specs: rt-link: add missing byte-order properties

    https://git.kernel.org/netdev/net/c/de92258e3b22
  - [net,2/2] netlink: specs: rt-link: decode ip6gre
    https://git.kernel.org/netdev/net/c/8af7a919c52f

You are awesome, thank you!

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