Today packet mark action is broaken for Tunnel ports with tunnel monitoring. User can write a flow to set pkt-mark for any tunnel packet generated by vswitchd itself, like BFD packets.
Following patch introduces new option in OVSDB tunnel configuration so that user can set skb-mark for given tunnel endpoint. OVS would set the mark according to the skb-mark option for all tunnel traffic including packets generated by vSwitchd like tunnel monitoring BFD packet. Signed-off-by: Pravin B Shelar <pshe...@ovn.org> --- lib/netdev-vport.c | 8 ++++++++ lib/netdev.h | 1 + ofproto/tunnel.c | 5 +++++ tests/tunnel-push-pop.at | 16 ++++++++++++++++ vswitchd/vswitch.xml | 4 ++++ 5 files changed, 34 insertions(+) diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 02a246a..25dd0e8 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -505,6 +505,10 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args) } free(str); + } else if (!strcmp(node->key, "egress_pkt_mark")) { + char *ptr = NULL; + + tnl_cfg.egress_pkt_mark = strtoul(node->value, &ptr, 10); } else { VLOG_WARN("%s: unknown %s argument '%s'", name, type, node->key); } @@ -623,6 +627,10 @@ get_tunnel_config(const struct netdev *dev, struct smap *args) smap_add(args, "df_default", "false"); } + if (tnl_cfg.egress_pkt_mark) { + smap_add_format(args, "egress_pkt_mark", + "%"PRIu32, tnl_cfg.egress_pkt_mark); + } return 0; } diff --git a/lib/netdev.h b/lib/netdev.h index a667fe3..5ec1274 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -89,6 +89,7 @@ struct netdev_tunnel_config { struct in6_addr ipv6_dst; uint32_t exts; + uint32_t egress_pkt_mark; uint8_t ttl; bool ttl_inherit; diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index ce727f4..6205948 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -461,6 +461,11 @@ tnl_port_send(const struct ofport_dpif *ofport, struct flow *flow, | (cfg->csum ? FLOW_TNL_F_CSUM : 0) | (cfg->out_key_present ? FLOW_TNL_F_KEY : 0); + if (cfg->egress_pkt_mark) { + flow->pkt_mark = cfg->egress_pkt_mark; + wc->masks.pkt_mark = UINT32_MAX; + } + if (pre_flow_str) { char *post_flow_str = flow_to_string(flow); char *tnl_str = tnl_port_fmt(tnl_port); diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at index 700ef55..4aaa669 100644 --- a/tests/tunnel-push-pop.at +++ b/tests/tunnel-push-pop.at @@ -12,6 +12,8 @@ AT_CHECK([ovs-vsctl add-port int-br t2 -- set Interface t2 type=vxlan \ options:remote_ip=1.1.2.93 options:out_key=flow options:csum=true ofport_request=4\ -- add-port int-br t4 -- set Interface t4 type=geneve \ options:remote_ip=flow options:key=123 ofport_request=5\ + -- add-port int-br t5 -- set Interface t5 type=geneve \ + options:remote_ip=1.1.2.93 options:out_key=flow options:egress_pkt_mark=1234 ofport_request=6\ ], [0]) AT_CHECK([ovs-appctl dpif/show], [0], [dnl @@ -25,6 +27,7 @@ dummy@ovs-dummy: hit:0 missed:0 t2 2/4789: (vxlan: key=123, remote_ip=1.1.2.92) t3 4/4789: (vxlan: csum=true, out_key=flow, remote_ip=1.1.2.93) t4 5/6081: (geneve: key=123, remote_ip=flow) + t5 6/6081: (geneve: egress_pkt_mark=1234, out_key=flow, remote_ip=1.1.2.93) ]) dnl First setup dummy interface IP address, then add the route @@ -91,6 +94,12 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: tnl_pop(6081) ]) +dnl Check Geneve tunnel (t6) pop +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x0800),ipv4(src=1.1.2.96,dst=1.1.2.88,proto=17,tos=0,ttl=64,frag=no),udp(src=51283,dst=6081)'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: tnl_pop(6081) +]) + dnl Check VXLAN tunnel push AT_CHECK([ovs-ofctl add-flow int-br action=2]) AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout]) @@ -119,6 +128,13 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: tnl_push(tnl_port(6081),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.92,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=6081,csum=0x0),geneve(vni=0x7b)),out_port(100)) ]) +dnl Check Geneve tunnel push with pkt-mark +AT_CHECK([ovs-ofctl add-flow int-br "actions=set_tunnel:234,6"]) +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.112,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout]) +AT_CHECK([tail -1 stdout], [0], + [Datapath actions: set(skb_mark(0x4d2)),tnl_push(tnl_port(6081),header(size=50,type=5,eth(dst=f8:bc:12:44:34:b7,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.2.88,dst=1.1.2.93,proto=17,tos=0,ttl=64,frag=0x4000),udp(src=0,dst=6081,csum=0x0),geneve(vni=0xea)),out_port(100)) +]) + dnl Check Geneve tunnel push with options AT_CHECK([ovs-ofctl add-tlv-map int-br "{class=0xffff,type=0x80,len=4}->tun_metadata0"]) AT_CHECK([ovs-ofctl add-flow int-br "actions=set_field:1.1.2.92->tun_dst,set_field:0xa->tun_metadata0,5"]) diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index b4af5a5..3ec8193 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -2226,6 +2226,10 @@ to <code>false</code> to disable. </column> + <column name="options" key="egress_pkt_mark"> + Optional. The pkt_mark to be set on the encapsulating packet. + </column> + <group title="Tunnel Options: vxlan only"> <column name="options" key="exts"> -- 2.9.3 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev