e.g. Set tunnel id for encapsulated VxLAN packet (out_key=flow):
ovs-vsctl add-port int-br vxlan0 -- set interface vxlan0 \
type=vxlan options:remote_ip=172.168.1.2 options:out_key=flow
ovs-ofctl add-flow int-br in_port=LOCAL, icmp,\
actions=set_tunnel:3, output:1 (1 is the port# of vxlan0)
Output tunnel ID should be modified to 3 with this patch.
=========================================================
Add test case for setting tunnel id in userspace DP
This test case is to test setting tunnel id by flow rule,
in userspace datapath.
e.g. actions=set_tunnel:3,output:[tunnel port]
test case: dnl Check VXLAN tunnel push set tunnel id by flow
@tests/tunnel-push-pop.at
=========================================================
Signed-off-by: Ricky Li <ricky...@intel.com>
---
lib/netdev-provider.h | 2 +-
lib/netdev-vport.c | 10 ++++++----
lib/netdev.c | 5 +++--
lib/netdev.h | 3 ++-
ofproto/tunnel.c | 2 +-
tests/tunnel-push-pop.at | 15 ++++++++++++++-
6 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h
index 915e54a..14072ce 100644
--- a/lib/netdev-provider.h
+++ b/lib/netdev-provider.h
@@ -257,7 +257,7 @@ struct netdev_class {
/* Build Partial Tunnel header. Ethernet and ip header is already built,
* build_header() is suppose build protocol specific part of header. */
- int (*build_header)(const struct netdev *, struct ovs_action_push_tnl
*data);
+ int (*build_header)(const struct netdev *, struct ovs_action_push_tnl
*data, const struct flow *tnl_flow);
/* build_header() can not build entire header for all packets for given
* flow. Push header is called for packet to build header specific to
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 954ab9b..c7f3437 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -1011,7 +1011,8 @@ netdev_gre_push_header(const struct netdev *netdev
OVS_UNUSED,
static int
netdev_gre_build_header(const struct netdev *netdev,
- struct ovs_action_push_tnl *data)
+ struct ovs_action_push_tnl *data,
+ const struct flow *tnl_flow)
{
struct netdev_vport *dev = netdev_vport_cast(netdev);
struct netdev_tunnel_config *tnl_cfg;
@@ -1041,7 +1042,7 @@ netdev_gre_build_header(const struct netdev *netdev,
if (tnl_cfg->out_key_present) {
greh->flags |= htons(GRE_KEY);
put_16aligned_be32(options, (OVS_FORCE ovs_be32)
- ((OVS_FORCE uint64_t) tnl_cfg->out_key >>
32));
+ ((OVS_FORCE uint64_t)
tnl_flow->tunnel.tun_id >> 32));
options++;
}
@@ -1103,7 +1104,8 @@ netdev_vxlan_pop_header(struct netdev *netdev_ OVS_UNUSED,
static int
netdev_vxlan_build_header(const struct netdev *netdev,
- struct ovs_action_push_tnl *data)
+ struct ovs_action_push_tnl *data,
+ const struct flow *tnl_flow)
{
struct netdev_vport *dev = netdev_vport_cast(netdev);
struct netdev_tunnel_config *tnl_cfg;
@@ -1123,7 +1125,7 @@ netdev_vxlan_build_header(const struct netdev *netdev,
vxh = (struct vxlanhdr *) (udp + 1);
put_16aligned_be32(&vxh->vx_flags, htonl(VXLAN_FLAGS));
- put_16aligned_be32(&vxh->vx_vni, htonl(ntohll(tnl_cfg->out_key) << 8));
+ put_16aligned_be32(&vxh->vx_vni, htonl(ntohll(tnl_flow->tunnel.tun_id) <<
8));
ovs_mutex_unlock(&dev->mutex);
data->header_len = VXLAN_HLEN;
diff --git a/lib/netdev.c b/lib/netdev.c
index 149b39a..79b4c4a 100644
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -43,6 +43,7 @@
#include "sset.h"
#include "svec.h"
#include "openvswitch/vlog.h"
+#include "flow.h"
VLOG_DEFINE_THIS_MODULE(netdev);
@@ -740,10 +741,10 @@ netdev_pop_header(struct netdev *netdev, struct dp_packet
**buffers, int cnt)
}
int
-netdev_build_header(const struct netdev *netdev, struct ovs_action_push_tnl
*data)
+netdev_build_header(const struct netdev *netdev, struct ovs_action_push_tnl
*data, const struct flow *tnl_flow)
{
if (netdev->netdev_class->build_header) {
- return netdev->netdev_class->build_header(netdev, data);
+ return netdev->netdev_class->build_header(netdev, data, tnl_flow);
}
return EOPNOTSUPP;
}
diff --git a/lib/netdev.h b/lib/netdev.h
index 9a647f0..05b196d 100644
--- a/lib/netdev.h
+++ b/lib/netdev.h
@@ -22,6 +22,7 @@
#include <stdint.h>
#include "openvswitch/types.h"
#include "packets.h"
+#include "flow.h"
#ifdef __cplusplus
extern "C" {
@@ -184,7 +185,7 @@ int netdev_send(struct netdev *, int qid, struct dp_packet
**, int cnt,
bool may_steal);
void netdev_send_wait(struct netdev *, int qid);
-int netdev_build_header(const struct netdev *, struct ovs_action_push_tnl
*data);
+int netdev_build_header(const struct netdev *, struct ovs_action_push_tnl
*data, const struct flow *tnl_flow);
int netdev_push_header(const struct netdev *netdev,
struct dp_packet **buffers, int cnt,
const struct ovs_action_push_tnl *data);
diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c
index f621efb..3ea0eb4 100644
--- a/ofproto/tunnel.c
+++ b/ofproto/tunnel.c
@@ -709,7 +709,7 @@ tnl_port_build_header(const struct ofport_dpif *ofport,
put_16aligned_be32(&ip->ip_src, ip_src);
put_16aligned_be32(&ip->ip_dst, tnl_flow->tunnel.ip_dst);
- res = netdev_build_header(tnl_port->netdev, data);
+ res = netdev_build_header(tnl_port->netdev, data, tnl_flow);
ip->ip_csum = csum(ip, sizeof *ip);
fat_rwlock_unlock(&rwlock);
diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at
index f1fac7f..6e1c0c1 100644
--- a/tests/tunnel-push-pop.at
+++ b/tests/tunnel-push-pop.at
@@ -7,7 +7,10 @@ AT_CHECK([ovs-vsctl add-br int-br -- set bridge int-br
datapath_type=dummy], [0]
AT_CHECK([ovs-vsctl add-port int-br t2 -- set Interface t2 type=vxlan \
options:remote_ip=1.1.2.92 options:key=123
ofport_request=2\
-- add-port int-br t1 -- set Interface t1 type=gre \
- options:remote_ip=1.1.2.92 options:key=456
ofport_request=3], [0])
+ options:remote_ip=1.1.2.92 options:key=456
ofport_request=3\
+ -- add-port int-br t3 -- set Interface t3 type=vxlan \
+ options:remote_ip=1.1.2.93 options:out_key=flow
ofport_request=4\
+ ], [0])
AT_CHECK([ovs-appctl dpif/show], [0], [dnl
dummy@ovs-dummy: hit:0 missed:0
@@ -18,6 +21,7 @@ dummy@ovs-dummy: hit:0 missed:0
int-br 65534/2: (dummy)
t1 3/3: (gre: key=456, remote_ip=1.1.2.92)
t2 2/4789: (vxlan: key=123, remote_ip=1.1.2.92)
+ t3 4/4789: (vxlan: out_key=flow, remote_ip=1.1.2.93)
])
AT_CHECK([ovs-appctl ovs/route/add 1.1.2.92/24 br0], [0], [OK
@@ -29,11 +33,13 @@ AT_CHECK([ovs-ofctl add-flow br0 action=normal])
dnl Check ARP Snoop
AT_CHECK([ovs-appctl netdev-dummy/receive br0
'recirc_id(0),in_port(100),eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.92,tip=1.1.2.88,op=1,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)'])
+AT_CHECK([ovs-appctl netdev-dummy/receive br0
'recirc_id(0),in_port(100),eth(src=f8:bc:12:44:34:b7,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.93,tip=1.1.2.88,op=1,sha=f8:bc:12:44:34:b7,tha=00:00:00:00:00:00)'])
AT_CHECK([ovs-appctl tnl/arp/show], [0], [dnl
IP MAC Bridge
=============================================
1.1.2.92 f8:bc:12:44:34:b6 br0
+1.1.2.93 f8:bc:12:44:34:b7 br0
])
dnl Check VXLAN tunnel pop
@@ -55,6 +61,13 @@ AT_CHECK([tail -1 stdout], [0],
[Datapath actions:
tnl_push(tnl_port(4789),header(size=50,type=4,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=0x40),udp(src=0,dst=4789),vxlan(flags=0x8000000,vni=0x7b00)),out_port(100))
])
+dnl Check VXLAN tunnel push set tunnel id by flow
+AT_CHECK([ovs-ofctl add-flow int-br "actions=set_tunnel:124,4"])
+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:
tnl_push(tnl_port(4789),header(size=50,type=4,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=0x40),udp(src=0,dst=4789),vxlan(flags=0x8000000,vni=0x7c00)),out_port(100))
+])
+
dnl Check GRE tunnel push
AT_CHECK([ovs-ofctl add-flow int-br action=3])
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])
--
1.9.5.msysgit.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
