Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netlink: specs: support ipv4-or-v6 for dual-stack fields 

Since commit 1b255e1bea ("tools: ynl: add ipv4-or-v6 display hint"), we
can display either IPv4 or IPv6 addresses for a single field based on the
address family. However, most dual-stack fields still use the ipv4 display
hint. This update changes them to use the new ipv4-or-v6 display hint and
converts IPv4-only fields to use the u32 type.

Field changes:
  - v4-or-v6
    - IFA_ADDRESS, IFA_LOCAL
    - IFLA_GRE_LOCAL, IFLA_GRE_REMOTE
    - IFLA_VTI_LOCAL, IFLA_VTI_REMOTE
    - IFLA_IPTUN_LOCAL, IFLA_IPTUN_REMOTE
    - NDA_DST
    - RTA_DST, RTA_SRC, RTA_GATEWAY, RTA_PREFSRC
    - FRA_SRC, FRA_DST
  - ipv4
    - IFA_BROADCAST
    - IFLA_GENEVE_REMOTE
    - IFLA_IPTUN_6RD_RELAY_PREFIX

Reviewed-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: Donald Hunter <donald.hunter@gmail.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Link: https://patch.msgid.link/20251117024457.3034-3-liuhangbin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Hangbin Liu 2025-11-17 02:44:56 +00:00 committed by Jakub Kicinski
parent 4abe51dba6
commit 1064d521d1
8 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/netlink/genetlink-c.yaml
View File

@ -227,7 +227,7 @@ properties:
Optional format indicator that is intended only for choosing
the right formatting mechanism when displaying values of this
type.
enum: [ hex, mac, fddi, ipv4, ipv6, uuid ]
enum: [ hex, mac, fddi, ipv4, ipv6, ipv4-or-v6, uuid ]
# Start genetlink-c
name-prefix:
type: string

2
Documentation/netlink/genetlink.yaml
View File

@ -185,7 +185,7 @@ properties:
Optional format indicator that is intended only for choosing
the right formatting mechanism when displaying values of this
type.
enum: [ hex, mac, fddi, ipv4, ipv6, uuid ]
enum: [ hex, mac, fddi, ipv4, ipv6, ipv4-or-v6, uuid ]
# Make sure name-prefix does not appear in subsets (subsets inherit naming)
dependencies:

2
Documentation/netlink/netlink-raw.yaml
View File

@ -157,7 +157,7 @@ properties:
Optional format indicator that is intended only for choosing
the right formatting mechanism when displaying values of this
type.
enum: [ hex, mac, fddi, ipv4, ipv6, uuid ]
enum: [ hex, mac, fddi, ipv4, ipv6, ipv4-or-v6, uuid ]
struct:
description: Name of the nested struct type.
type: string

6
Documentation/netlink/specs/rt-addr.yaml
View File

@ -86,17 +86,17 @@ attribute-sets:
-
name: address
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: local
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: label
type: string
-
name: broadcast
type: binary
type: u32
display-hint: ipv4
-
name: anycast

16
Documentation/netlink/specs/rt-link.yaml
View File

@ -1707,11 +1707,11 @@ attribute-sets:
-
name: local
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: remote
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: ttl
type: u8
@ -1833,11 +1833,11 @@ attribute-sets:
-
name: local
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: remote
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: fwmark
type: u32
@ -1868,7 +1868,7 @@ attribute-sets:
type: u32
-
name: remote
type: binary
type: u32
display-hint: ipv4
-
name: ttl
@ -1952,11 +1952,11 @@ attribute-sets:
-
name: local
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: remote
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: ttl
type: u8
@ -1986,7 +1986,7 @@ attribute-sets:
display-hint: ipv6
-
name: 6rd-relay-prefix
type: binary
type: u32
display-hint: ipv4
-
name: 6rd-prefixlen

2
Documentation/netlink/specs/rt-neigh.yaml
View File

@ -194,7 +194,7 @@ attribute-sets:
-
name: dst
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: lladdr
type: binary

8
Documentation/netlink/specs/rt-route.yaml
View File

@ -87,11 +87,11 @@ attribute-sets:
-
name: dst
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: src
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: iif
type: u32
@ -101,14 +101,14 @@ attribute-sets:
-
name: gateway
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: priority
type: u32
-
name: prefsrc
type: binary
display-hint: ipv4
display-hint: ipv4-or-v6
-
name: metrics
type: nest

6
Documentation/netlink/specs/rt-rule.yaml
View File

@ -96,10 +96,12 @@ attribute-sets:
attributes:
-
name: dst
type: u32
type: binary
display-hint: ipv4-or-v6
-
name: src
type: u32
type: binary
display-hint: ipv4-or-v6
-
name: iifname
type: string