/*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
* Copyright (c) 2013 Simon Horman
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include <stdlib.h>
#include <string.h>
+#include "dpif.h"
#include "netlink.h"
#include "ofpbuf.h"
#include "odp-util.h"
#include "packets.h"
+#include "unaligned.h"
#include "util.h"
static void
-odp_eth_set_addrs(struct ofpbuf *packet, const struct ovs_key_ethernet *eth_key)
+odp_eth_set_addrs(struct ofpbuf *packet,
+ const struct ovs_key_ethernet *eth_key)
{
- struct eth_header *eh = packet->l2;
+ struct eth_header *eh = ofpbuf_l2(packet);
- memcpy(eh->eth_src, eth_key->eth_src, sizeof eh->eth_src);
- memcpy(eh->eth_dst, eth_key->eth_dst, sizeof eh->eth_dst);
+ if (eh) {
+ memcpy(eh->eth_src, eth_key->eth_src, sizeof eh->eth_src);
+ memcpy(eh->eth_dst, eth_key->eth_dst, sizeof eh->eth_dst);
+ }
}
static void
ovs_assert(fitness != ODP_FIT_ERROR);
}
+static void
+set_arp(struct ofpbuf *packet, const struct ovs_key_arp *arp_key)
+{
+ struct arp_eth_header *arp = ofpbuf_l3(packet);
+
+ arp->ar_op = arp_key->arp_op;
+ memcpy(arp->ar_sha, arp_key->arp_sha, ETH_ADDR_LEN);
+ put_16aligned_be32(&arp->ar_spa, arp_key->arp_sip);
+ memcpy(arp->ar_tha, arp_key->arp_tha, ETH_ADDR_LEN);
+ put_16aligned_be32(&arp->ar_tpa, arp_key->arp_tip);
+}
+
static void
odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a,
- struct flow *flow)
+ struct pkt_metadata *md)
{
enum ovs_key_attr type = nl_attr_type(a);
const struct ovs_key_ipv4 *ipv4_key;
const struct ovs_key_ipv6 *ipv6_key;
const struct ovs_key_tcp *tcp_key;
const struct ovs_key_udp *udp_key;
+ const struct ovs_key_sctp *sctp_key;
switch (type) {
case OVS_KEY_ATTR_PRIORITY:
- flow->skb_priority = nl_attr_get_u32(a);
+ md->skb_priority = nl_attr_get_u32(a);
break;
case OVS_KEY_ATTR_TUNNEL:
- odp_set_tunnel_action(a, &flow->tunnel);
+ odp_set_tunnel_action(a, &md->tunnel);
break;
case OVS_KEY_ATTR_SKB_MARK:
- flow->skb_mark = nl_attr_get_u32(a);
+ md->pkt_mark = nl_attr_get_u32(a);
break;
case OVS_KEY_ATTR_ETHERNET:
packet_set_tcp_port(packet, tcp_key->tcp_src, tcp_key->tcp_dst);
break;
- case OVS_KEY_ATTR_UDP:
+ case OVS_KEY_ATTR_UDP:
udp_key = nl_attr_get_unspec(a, sizeof(struct ovs_key_udp));
packet_set_udp_port(packet, udp_key->udp_src, udp_key->udp_dst);
break;
- case OVS_KEY_ATTR_MPLS:
+ case OVS_KEY_ATTR_SCTP:
+ sctp_key = nl_attr_get_unspec(a, sizeof(struct ovs_key_sctp));
+ packet_set_sctp_port(packet, sctp_key->sctp_src, sctp_key->sctp_dst);
+ break;
+
+ case OVS_KEY_ATTR_MPLS:
set_mpls_lse(packet, nl_attr_get_be32(a));
break;
- case OVS_KEY_ATTR_UNSPEC:
- case OVS_KEY_ATTR_ENCAP:
- case OVS_KEY_ATTR_ETHERTYPE:
- case OVS_KEY_ATTR_IN_PORT:
- case OVS_KEY_ATTR_VLAN:
- case OVS_KEY_ATTR_ICMP:
- case OVS_KEY_ATTR_ICMPV6:
- case OVS_KEY_ATTR_ARP:
- case OVS_KEY_ATTR_ND:
- case __OVS_KEY_ATTR_MAX:
- default:
- NOT_REACHED();
+ case OVS_KEY_ATTR_ARP:
+ set_arp(packet, nl_attr_get_unspec(a, sizeof(struct ovs_key_arp)));
+ break;
+
+ case OVS_KEY_ATTR_DP_HASH:
+ md->dp_hash = nl_attr_get_u32(a);
+ break;
+
+ case OVS_KEY_ATTR_RECIRC_ID:
+ md->recirc_id = nl_attr_get_u32(a);
+ break;
+
+ case OVS_KEY_ATTR_UNSPEC:
+ case OVS_KEY_ATTR_ENCAP:
+ case OVS_KEY_ATTR_ETHERTYPE:
+ case OVS_KEY_ATTR_IN_PORT:
+ case OVS_KEY_ATTR_VLAN:
+ case OVS_KEY_ATTR_ICMP:
+ case OVS_KEY_ATTR_ICMPV6:
+ case OVS_KEY_ATTR_ND:
+ case OVS_KEY_ATTR_TCP_FLAGS:
+ case __OVS_KEY_ATTR_MAX:
+ default:
+ OVS_NOT_REACHED();
}
}
static void
-odp_execute_sample(void *dp, struct ofpbuf *packet, struct flow *key,
- const struct nlattr *action,
- void (*output)(void *dp, struct ofpbuf *packet,
- uint32_t out_port),
- void (*userspace)(void *dp, struct ofpbuf *packet,
- const struct flow *key,
- const struct nlattr *a))
+odp_execute_actions__(void *dp, struct ofpbuf *packet, bool steal,
+ struct pkt_metadata *,
+ const struct nlattr *actions, size_t actions_len,
+ odp_execute_cb dp_execute_action, bool more_actions);
+
+static void
+odp_execute_sample(void *dp, struct ofpbuf *packet, bool steal,
+ struct pkt_metadata *md, const struct nlattr *action,
+ odp_execute_cb dp_execute_action, bool more_actions)
{
const struct nlattr *subactions = NULL;
const struct nlattr *a;
case OVS_SAMPLE_ATTR_UNSPEC:
case __OVS_SAMPLE_ATTR_MAX:
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
- odp_execute_actions(dp, packet, key, nl_attr_get(subactions),
- nl_attr_get_size(subactions), output, userspace);
+ odp_execute_actions__(dp, packet, steal, md, nl_attr_get(subactions),
+ nl_attr_get_size(subactions), dp_execute_action,
+ more_actions);
}
-void
-odp_execute_actions(void *dp, struct ofpbuf *packet, struct flow *key,
- const struct nlattr *actions, size_t actions_len,
- void (*output)(void *dp, struct ofpbuf *packet,
- uint32_t out_port),
- void (*userspace)(void *dp, struct ofpbuf *packet,
- const struct flow *key,
- const struct nlattr *a))
+static void
+odp_execute_actions__(void *dp, struct ofpbuf *packet, bool steal,
+ struct pkt_metadata *md,
+ const struct nlattr *actions, size_t actions_len,
+ odp_execute_cb dp_execute_action, bool more_actions)
{
const struct nlattr *a;
unsigned int left;
int type = nl_attr_type(a);
switch ((enum ovs_action_attr) type) {
+ /* These only make sense in the context of a datapath. */
case OVS_ACTION_ATTR_OUTPUT:
- output(dp, packet, nl_attr_get_u32(a));
- break;
-
- case OVS_ACTION_ATTR_USERSPACE: {
- const struct nlattr *userdata;
-
- userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA);
- userspace(dp, packet, key, userdata);
+ case OVS_ACTION_ATTR_USERSPACE:
+ case OVS_ACTION_ATTR_RECIRC:
+ case OVS_ACTION_ATTR_HASH:
+ if (dp_execute_action) {
+ /* Allow 'dp_execute_action' to steal the packet data if we do
+ * not need it any more. */
+ bool may_steal = steal && (!more_actions
+ && left <= NLA_ALIGN(a->nla_len)
+ && type != OVS_ACTION_ATTR_RECIRC);
+ dp_execute_action(dp, packet, md, a, may_steal);
+ }
break;
- }
case OVS_ACTION_ATTR_PUSH_VLAN: {
const struct ovs_action_push_vlan *vlan = nl_attr_get(a);
- eth_push_vlan(packet, vlan->vlan_tci);
+ eth_push_vlan(packet, htons(ETH_TYPE_VLAN), vlan->vlan_tci);
break;
}
break;
case OVS_ACTION_ATTR_SET:
- odp_execute_set_action(packet, nl_attr_get(a), key);
+ odp_execute_set_action(packet, nl_attr_get(a), md);
break;
case OVS_ACTION_ATTR_SAMPLE:
- odp_execute_sample(dp, packet, key, a, output, userspace);
+ odp_execute_sample(dp, packet, steal, md, a, dp_execute_action,
+ more_actions || left > NLA_ALIGN(a->nla_len));
break;
case OVS_ACTION_ATTR_UNSPEC:
case __OVS_ACTION_ATTR_MAX:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
}
+
+void
+odp_execute_actions(void *dp, struct ofpbuf *packet, bool steal,
+ struct pkt_metadata *md,
+ const struct nlattr *actions, size_t actions_len,
+ odp_execute_cb dp_execute_action)
+{
+ odp_execute_actions__(dp, packet, steal, md, actions, actions_len,
+ dp_execute_action, false);
+
+ if (!actions_len && steal) {
+ /* Drop action. */
+ ofpbuf_delete(packet);
+ }
+}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff