setting flow label support
Subsystems (2)
cover setting flow label support
On top of Jesse's csum patches for vxlan, geneve:
- http://patchwork.ozlabs.org/patch/599746/
- http://patchwork.ozlabs.org/patch/599747/
Thanks!
Daniel Borkmann (2):
vxlan: add support to set flow label
geneve: add support to set flow label
ip/ip_common.h | 4 ++++ ip/iplink_geneve.c | 29 ++++++++++++++++++++++++----- ip/iplink_vxlan.c | 29 ++++++++++++++++++++++++----- man/man8/ip-link.8.in | 12 ++++++++++++ 4 files changed, 64 insertions(+), 10 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/2 vxlan: add support to set flow label
Follow-up for kernel commit e7f70af111f0 ("vxlan: support setting IPv6 flow label") to allow setting the label for the device config.
Signed-off-by Daniel Borkmann <[email protected]>
--- ip/ip_common.h | 4 ++++ ip/iplink_vxlan.c | 29 ++++++++++++++++++++++++----- man/man8/ip-link.8.in | 6 ++++++ 3 files changed, 34 insertions(+), 5 deletions(-)
ip/ip_common.h +4 -0
@@ -92,3 +92,7 @@ void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf, size_t len);#ifndef INFINITY_LIFE_TIME #define INFINITY_LIFE_TIME 0xFFFFFFFFU#endif + +#ifndef LABEL_MAX_MASK +#define LABEL_MAX_MASK 0xFFFFFU +#endif
ip/iplink_vxlan.c +24 -5
@@ -24,7 +24,7 @@static void print_explain (FILE *f) {fprintf (f,"Usage: ... vxlan id VNI [ { group | remote } IP_ADDRESS ] [ local ADDR ]\n" ); -fprintf (f," [ ttl TTL ] [ tos TOS ] [ dev PHYS_DEV ]\n" ); +fprintf (f," [ ttl TTL ] [ tos TOS ] [ flowlabel LABEL ] [ dev PHYS_DEV ]\n" );fprintf (f," [ dstport PORT ] [ srcport MIN MAX ]\n" );fprintf (f," [ [no]learning ] [ [no]proxy ] [ [no]rsc ]\n" );fprintf (f," [ [no]l2miss ] [ [no]l3miss ]\n" );
@@ -33,10 +33,11 @@ static void print_explain(FILE *f)fprintf (f," [ [no]remcsumtx ] [ [no]remcsumrx ]\n" );fprintf (f," [ [no]external ] [ gbp ]\n" );fprintf (f,"\n" ); -fprintf (f,"Where: VNI := 0-16777215\n" ); -fprintf (f," ADDR := { IP_ADDRESS | any }\n" ); -fprintf (f," TOS := { NUMBER | inherit }\n" ); -fprintf (f," TTL := { 1..255 | inherit }\n" ); +fprintf (f,"Where: VNI := 0-16777215\n" ); +fprintf (f," ADDR := { IP_ADDRESS | any }\n" ); +fprintf (f," TOS := { NUMBER | inherit }\n" ); +fprintf (f," TTL := { 1..255 | inherit }\n" ); +fprintf (f," LABEL := 0-1048575\n" ); }static void explain (void )
@@ -58,6 +59,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,unsigned int link =0 ;__u8 tos =0 ;__u8 ttl =0 ; +__u32 label =0 ;__u8 learning =1 ;__u8 proxy =0 ;__u8 rsc =0 ;
@@ -146,6 +148,15 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv, tos = uval; }else tos =1 ; + }else if (!matches (*argv,"label" ) || + !matches (*argv,"flowlabel" )) { +__u32 uval; + +NEXT_ARG (); +if (get_u32 (&uval, *argv,0 ) || + (uval & ~LABEL_MAX_MASK )) +invarg ("invalid flowlabel" , *argv); + label =htonl (uval); }else if (!matches (*argv,"ageing" )) {NEXT_ARG ();if (strcmp (*argv,"none" ) ==0 )
@@ -280,6 +291,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,if (link)addattr32 (n,1024 ,IFLA_VXLAN_LINK , link); +addattr32 (n,1024 ,IFLA_VXLAN_LABEL , label);addattr8 (n,1024 ,IFLA_VXLAN_TTL , ttl);addattr8 (n,1024 ,IFLA_VXLAN_TOS , tos);addattr8 (n,1024 ,IFLA_VXLAN_LEARNING , learning);
@@ -426,6 +438,13 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])fprintf (f,"ttl %d " , ttl); } +if (tb[IFLA_VXLAN_LABEL ]) { +__u32 label =rta_getattr_u32 (tb[IFLA_VXLAN_LABEL ]); + +if (label) +fprintf (f,"flowlabel %#x " ,ntohl (label)); + } +if (tb[IFLA_VXLAN_AGEING ]) {__u32 age =rta_getattr_u32 (tb[IFLA_VXLAN_AGEING ]);
man/man8/ip-link.8.in +6 -0
@@ -396,6 +396,8 @@ the following additional arguments are supported: ] [ .BI tos " TOS " ] [ +.BI flowlabel " FLOWLABEL " +] [ .BI dstport " PORT " ] [ .BI srcport " MIN MAX "
@@ -460,6 +462,10 @@ parameter. - specifies the TOS value to use in outgoing packets. .sp +.BI flowlabel " FLOWLABEL" +- specifies the flow label to use in outgoing packets. + +.sp .BI dstport " PORT" - specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.
Signature · 1 line
1.9.3
PATCH 2/2 geneve: add support to set flow label
In reply to Daniel BorkmannFollow-up for kernel commit 8eb3b99554b8 ("geneve: support setting IPv6 flow label") to allow setting the label for the device config.
Signed-off-by Daniel Borkmann <[email protected]>
--- ip/iplink_geneve.c | 29 ++++++++++++++++++++++++----- man/man8/ip-link.8.in | 6 ++++++ 2 files changed, 30 insertions(+), 5 deletions(-)
ip/iplink_geneve.c +24 -5
@@ -18,14 +18,15 @@static void print_explain (FILE *f) {fprintf (f,"Usage: ... geneve id VNI remote ADDR\n" ); -fprintf (f," [ ttl TTL ] [ tos TOS ]\n" ); +fprintf (f," [ ttl TTL ] [ tos TOS ] [ flowlabel LABEL ]\n" );fprintf (f," [ dstport PORT ] [ [no]external ]\n" );fprintf (f," [ [no]udpcsum ] [ [no]udp6zerocsumtx ] [ [no]udp6zerocsumrx ]\n" );fprintf (f,"\n" ); -fprintf (f,"Where: VNI := 0-16777215\n" ); -fprintf (f," ADDR := IP_ADDRESS\n" ); -fprintf (f," TOS := { NUMBER | inherit }\n" ); -fprintf (f," TTL := { 1..255 | inherit }\n" ); +fprintf (f,"Where: VNI := 0-16777215\n" ); +fprintf (f," ADDR := IP_ADDRESS\n" ); +fprintf (f," TOS := { NUMBER | inherit }\n" ); +fprintf (f," TTL := { 1..255 | inherit }\n" ); +fprintf (f," LABEL := 0-1048575\n" ); }static void explain (void )
@@ -40,6 +41,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,int vni_set =0 ;__u32 daddr =0 ;struct in6_addr daddr6 =IN6ADDR_ANY_INIT ; +__u32 label =0 ;__u8 ttl =0 ;__u8 tos =0 ;__u16 dstport =0 ;
@@ -90,6 +92,15 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, tos = uval; }else tos =1 ; + }else if (!matches (*argv,"label" ) || + !matches (*argv,"flowlabel" )) { +__u32 uval; + +NEXT_ARG (); +if (get_u32 (&uval, *argv,0 ) || + (uval & ~LABEL_MAX_MASK )) +invarg ("invalid flowlabel" , *argv); + label =htonl (uval); }else if (!matches (*argv,"dstport" )) {NEXT_ARG ();if (get_u16 (&dstport, *argv,0 ))
@@ -150,6 +161,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,addattr_l (n,1024 ,IFLA_GENEVE_REMOTE , &daddr,4 );if (memcmp (&daddr6, &in6addr_any,sizeof (daddr6)) !=0 )addattr_l (n,1024 ,IFLA_GENEVE_REMOTE6 , &daddr6,sizeof (struct in6_addr )); +addattr32 (n,1024 ,IFLA_GENEVE_LABEL , label);addattr8 (n,1024 ,IFLA_GENEVE_TTL , ttl);addattr8 (n,1024 ,IFLA_GENEVE_TOS , tos);if (dstport)
@@ -214,6 +226,13 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])fprintf (f,"tos %#x " , tos); } +if (tb[IFLA_GENEVE_LABEL ]) { +__u32 label =rta_getattr_u32 (tb[IFLA_GENEVE_LABEL ]); + +if (label) +fprintf (f,"flowlabel %#x " ,ntohl (label)); + } +if (tb[IFLA_GENEVE_PORT ])fprintf (f,"dstport %u " ,ntohs (rta_getattr_u16 (tb[IFLA_GENEVE_PORT ])));
man/man8/ip-link.8.in +6 -0
@@ -752,6 +752,8 @@ the following additional arguments are supported: .BI ttl " TTL " ] [ .BI tos " TOS " +] [ +.BI flowlabel " FLOWLABEL " ] .in +8
@@ -771,6 +773,10 @@ the following additional arguments are supported: .BI tos " TOS" - specifies the TOS value to use in outgoing packets. +.sp +.BI flowlabel " FLOWLABEL" +- specifies the flow label to use in outgoing packets. + .in -8 .TP
Signature · 1 line
1.9.3
Quoted 11 lines · On Thu, 24 Mar 2016 16:49:54 +0100 Daniel Borkmann <[email protected]> wrote:
On top of Jesse's csum patches for vxlan, geneve:
- http://patchwork.ozlabs.org/patch/599746/
- http://patchwork.ozlabs.org/patch/599747/Thanks!
Daniel Borkmann (2):
vxlan: add support to set flow label
geneve: add support to set flow label
Quoted 6 lines
ip/ip_common.h | 4 ++++ ip/iplink_geneve.c | 29 ++++++++++++++++++++++++----- ip/iplink_vxlan.c | 29 ++++++++++++++++++++++++----- man/man8/ip-link.8.in | 12 ++++++++++++ 4 files changed, 64 insertions(+), 10 deletions(-)
Applied thanks