mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-23 14:57:06 +00:00
Code Issues Releases Wiki Activity

odp-execute: Add set skb_mark, set_priority, tunnel support.

Browse Source 
The motivation for this is to allow such actions to be honoured
if they are encountered; by the user-space datapath before recirculation;
or by internal processing of actions by ovs-vswitchd before recirculation.
Recirculation will be added by a subsequent patch.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Simon Horman
2013-06-05 14:28:49 +09:00
committed by Ben Pfaff
parent 617e10e71c
commit 6c13071b37
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dpif-netdev.c
View File

@@ -159,6 +159,10 @@ static void dp_netdev_execute_actions(struct dp_netdev *,
struct ofpbuf *, struct flow *, struct ofpbuf *, struct flow *,
const struct nlattr *actions, const struct nlattr *actions,
size_t actions_len); size_t actions_len);
static void dp_netdev_port_input(struct dp_netdev *dp,
struct dp_netdev_port *port,
struct ofpbuf *packet, uint32_t skb_priority,
uint32_t skb_mark, const struct flow_tnl *tnl);
static struct dpif_netdev * static struct dpif_netdev *
dpif_netdev_cast(const struct dpif *dpif) dpif_netdev_cast(const struct dpif *dpif)
@@ -1032,7 +1036,8 @@ dp_netdev_flow_used(struct dp_netdev_flow *flow, const struct ofpbuf *packet)
static void static void
dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port,
struct ofpbuf *packet) struct ofpbuf *packet, uint32_t skb_priority,
uint32_t skb_mark, const struct flow_tnl *tnl)
{ {
struct dp_netdev_flow *flow; struct dp_netdev_flow *flow;
struct flow key; struct flow key;
@@ -1040,7 +1045,7 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port,
if (packet->size < ETH_HEADER_LEN) { if (packet->size < ETH_HEADER_LEN) {
return; return;
} }
flow_extract(packet, 0, 0, NULL, port->port_no, &key); flow_extract(packet, skb_priority, skb_mark, tnl, port->port_no, &key);
flow = dp_netdev_lookup_flow(dp, &key); flow = dp_netdev_lookup_flow(dp, &key);
if (flow) { if (flow) {
dp_netdev_flow_used(flow, packet); dp_netdev_flow_used(flow, packet);
@@ -1071,7 +1076,7 @@ dpif_netdev_run(struct dpif *dpif)
error = port->rx ? netdev_rx_recv(port->rx, &packet) : EOPNOTSUPP; error = port->rx ? netdev_rx_recv(port->rx, &packet) : EOPNOTSUPP;
if (!error) { if (!error) {
dp_netdev_port_input(dp, port, &packet); dp_netdev_port_input(dp, port, &packet, 0, 0, NULL);
} else if (error != EAGAIN && error != EOPNOTSUPP) { } else if (error != EAGAIN && error != EOPNOTSUPP) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
VLOG_ERR_RL(&rl, "error receiving data from %s: %s", VLOG_ERR_RL(&rl, "error receiving data from %s: %s",

23
lib/odp-execute.c
View File

@@ -23,6 +23,7 @@
#include "netlink.h" #include "netlink.h"
#include "ofpbuf.h" #include "ofpbuf.h"
#include "odp-util.h"
#include "packets.h" #include "packets.h"
#include "util.h" #include "util.h"
@@ -36,7 +37,17 @@ odp_eth_set_addrs(struct ofpbuf *packet, const struct ovs_key_ethernet *eth_key)
} }
static void static void
odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a) odp_set_tunnel_action(const struct nlattr *a, struct flow_tnl *tun_key)
{
enum odp_key_fitness fitness;
fitness = odp_tun_key_from_attr(a, tun_key);
ovs_assert(fitness != ODP_FIT_ERROR);
}
static void
odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a,
struct flow *flow)
{ {
enum ovs_key_attr type = nl_attr_type(a); enum ovs_key_attr type = nl_attr_type(a);
const struct ovs_key_ipv4 *ipv4_key; const struct ovs_key_ipv4 *ipv4_key;
@@ -46,9 +57,15 @@ odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a)
switch (type) { switch (type) {
case OVS_KEY_ATTR_PRIORITY: case OVS_KEY_ATTR_PRIORITY:
flow->skb_priority = nl_attr_get_u32(a);
break;
case OVS_KEY_ATTR_TUNNEL: case OVS_KEY_ATTR_TUNNEL:
odp_set_tunnel_action(a, &flow->tunnel);
break;
case OVS_KEY_ATTR_SKB_MARK: case OVS_KEY_ATTR_SKB_MARK:
/* not implemented */ flow->skb_mark = nl_attr_get_u32(a);
break; break;
case OVS_KEY_ATTR_ETHERNET: case OVS_KEY_ATTR_ETHERNET:
@@ -185,7 +202,7 @@ odp_execute_actions(void *dp, struct ofpbuf *packet, struct flow *key,
break; break;
case OVS_ACTION_ATTR_SET: case OVS_ACTION_ATTR_SET:
odp_execute_set_action(packet, nl_attr_get(a)); odp_execute_set_action(packet, nl_attr_get(a), key);
break; break;
case OVS_ACTION_ATTR_SAMPLE: case OVS_ACTION_ATTR_SAMPLE: