Skip to content

Commit 334f39c

Browse files
donaldhkuba-moo
authored andcommitted
netlink: specs: add display hints to ovs_flow
Add display hints for mac, ipv4, ipv6, hex and uuid to the ovs_flow schema. Signed-off-by: Donald Hunter <donald.hunter@gmail.com> Link: https://lore.kernel.org/r/20230623201928.14275-4-donald.hunter@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent d8eea68 commit 334f39c

1 file changed

Lines changed: 107 additions & 0 deletions

File tree

Documentation/netlink/specs/ovs_flow.yaml

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,20 @@ definitions:
3333
name: n-bytes
3434
type: u64
3535
doc: Number of matched bytes.
36+
-
37+
name: ovs-key-ethernet
38+
type: struct
39+
members:
40+
-
41+
name: eth-src
42+
type: binary
43+
len: 6
44+
display-hint: mac
45+
-
46+
name: eth-dst
47+
type: binary
48+
len: 6
49+
display-hint: mac
3650
-
3751
name: ovs-key-mpls
3852
type: struct
@@ -49,10 +63,12 @@ definitions:
4963
name: ipv4-src
5064
type: u32
5165
byte-order: big-endian
66+
display-hint: ipv4
5267
-
5368
name: ipv4-dst
5469
type: u32
5570
byte-order: big-endian
71+
display-hint: ipv4
5672
-
5773
name: ipv4-proto
5874
type: u8
@@ -66,6 +82,45 @@ definitions:
6682
name: ipv4-frag
6783
type: u8
6884
enum: ovs-frag-type
85+
-
86+
name: ovs-key-ipv6
87+
type: struct
88+
members:
89+
-
90+
name: ipv6-src
91+
type: binary
92+
len: 16
93+
byte-order: big-endian
94+
display-hint: ipv6
95+
-
96+
name: ipv6-dst
97+
type: binary
98+
len: 16
99+
byte-order: big-endian
100+
display-hint: ipv6
101+
-
102+
name: ipv6-label
103+
type: u32
104+
byte-order: big-endian
105+
-
106+
name: ipv6-proto
107+
type: u8
108+
-
109+
name: ipv6-tclass
110+
type: u8
111+
-
112+
name: ipv6-hlimit
113+
type: u8
114+
-
115+
name: ipv6-frag
116+
type: u8
117+
-
118+
name: ovs-key-ipv6-exthdrs
119+
type: struct
120+
members:
121+
-
122+
name: hdrs
123+
type: u16
69124
-
70125
name: ovs-frag-type
71126
name-prefix: ovs-frag-type-
@@ -129,6 +184,51 @@ definitions:
129184
-
130185
name: icmp-code
131186
type: u8
187+
-
188+
name: ovs-key-arp
189+
type: struct
190+
members:
191+
-
192+
name: arp-sip
193+
type: u32
194+
byte-order: big-endian
195+
-
196+
name: arp-tip
197+
type: u32
198+
byte-order: big-endian
199+
-
200+
name: arp-op
201+
type: u16
202+
byte-order: big-endian
203+
-
204+
name: arp-sha
205+
type: binary
206+
len: 6
207+
display-hint: mac
208+
-
209+
name: arp-tha
210+
type: binary
211+
len: 6
212+
display-hint: mac
213+
-
214+
name: ovs-key-nd
215+
type: struct
216+
members:
217+
-
218+
name: nd_target
219+
type: binary
220+
len: 16
221+
byte-order: big-endian
222+
-
223+
name: nd-sll
224+
type: binary
225+
len: 6
226+
display-hint: mac
227+
-
228+
name: nd-tll
229+
type: binary
230+
len: 6
231+
display-hint: mac
132232
-
133233
name: ovs-key-ct-tuple-ipv4
134234
type: struct
@@ -345,6 +445,7 @@ attribute-sets:
345445
value of the OVS_FLOW_ATTR_KEY attribute. Optional for all
346446
requests. Present in notifications if the flow was created with this
347447
attribute.
448+
display-hint: uuid
348449
-
349450
name: ufid-flags
350451
type: u32
@@ -374,6 +475,7 @@ attribute-sets:
374475
-
375476
name: ethernet
376477
type: binary
478+
struct: ovs-key-ethernet
377479
doc: struct ovs_key_ethernet
378480
-
379481
name: vlan
@@ -390,6 +492,7 @@ attribute-sets:
390492
-
391493
name: ipv6
392494
type: binary
495+
struct: ovs-key-ipv6
393496
doc: struct ovs_key_ipv6
394497
-
395498
name: tcp
@@ -410,10 +513,12 @@ attribute-sets:
410513
-
411514
name: arp
412515
type: binary
516+
struct: ovs-key-arp
413517
doc: struct ovs_key_arp
414518
-
415519
name: nd
416520
type: binary
521+
struct: ovs-key-nd
417522
doc: struct ovs_key_nd
418523
-
419524
name: skb-mark
@@ -457,6 +562,7 @@ attribute-sets:
457562
-
458563
name: ct-labels
459564
type: binary
565+
display-hint: hex
460566
doc: 16-octet connection tracking label
461567
-
462568
name: ct-orig-tuple-ipv4
@@ -486,6 +592,7 @@ attribute-sets:
486592
-
487593
name: ipv6-exthdrs
488594
type: binary
595+
struct: ovs-key-ipv6-exthdrs
489596
doc: struct ovs_key_ipv6_exthdr
490597
-
491598
name: action-attrs

0 commit comments

Comments
 (0)