#include <config.h>
#include "odp-execute.h"
-#include <linux/openvswitch.h>
#include <stdlib.h>
#include <string.h>
#include "dpif.h"
#include "netlink.h"
#include "ofpbuf.h"
+#include "odp-netlink.h"
#include "odp-util.h"
+#include "packet-dpif.h"
#include "packets.h"
+#include "flow.h"
#include "unaligned.h"
#include "util.h"
}
static void
-odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a,
+odp_execute_set_action(struct dpif_packet *packet, const struct nlattr *a,
struct pkt_metadata *md)
{
enum ovs_key_attr type = nl_attr_type(a);
break;
case OVS_KEY_ATTR_ETHERNET:
- odp_eth_set_addrs(packet,
- nl_attr_get_unspec(a, sizeof(struct ovs_key_ethernet)));
+ odp_eth_set_addrs(&packet->ofpbuf,
+ nl_attr_get_unspec(a, sizeof(struct ovs_key_ethernet)));
break;
case OVS_KEY_ATTR_IPV4:
ipv4_key = nl_attr_get_unspec(a, sizeof(struct ovs_key_ipv4));
- packet_set_ipv4(packet, ipv4_key->ipv4_src, ipv4_key->ipv4_dst,
- ipv4_key->ipv4_tos, ipv4_key->ipv4_ttl);
+ packet_set_ipv4(&packet->ofpbuf, ipv4_key->ipv4_src,
+ ipv4_key->ipv4_dst, ipv4_key->ipv4_tos,
+ ipv4_key->ipv4_ttl);
break;
case OVS_KEY_ATTR_IPV6:
ipv6_key = nl_attr_get_unspec(a, sizeof(struct ovs_key_ipv6));
- packet_set_ipv6(packet, ipv6_key->ipv6_proto, ipv6_key->ipv6_src,
- ipv6_key->ipv6_dst, ipv6_key->ipv6_tclass,
- ipv6_key->ipv6_label, ipv6_key->ipv6_hlimit);
+ packet_set_ipv6(&packet->ofpbuf, ipv6_key->ipv6_proto,
+ ipv6_key->ipv6_src, ipv6_key->ipv6_dst,
+ ipv6_key->ipv6_tclass, ipv6_key->ipv6_label,
+ ipv6_key->ipv6_hlimit);
break;
case OVS_KEY_ATTR_TCP:
tcp_key = nl_attr_get_unspec(a, sizeof(struct ovs_key_tcp));
- packet_set_tcp_port(packet, tcp_key->tcp_src, tcp_key->tcp_dst);
+ packet_set_tcp_port(&packet->ofpbuf, tcp_key->tcp_src,
+ tcp_key->tcp_dst);
break;
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);
+ packet_set_udp_port(&packet->ofpbuf, udp_key->udp_src,
+ udp_key->udp_dst);
break;
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);
+ packet_set_sctp_port(&packet->ofpbuf, sctp_key->sctp_src,
+ sctp_key->sctp_dst);
break;
case OVS_KEY_ATTR_MPLS:
- set_mpls_lse(packet, nl_attr_get_be32(a));
+ set_mpls_lse(&packet->ofpbuf, nl_attr_get_be32(a));
break;
case OVS_KEY_ATTR_ARP:
- set_arp(packet, nl_attr_get_unspec(a, sizeof(struct ovs_key_arp)));
+ set_arp(&packet->ofpbuf,
+ 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);
+ packet->dp_hash = md->dp_hash = nl_attr_get_u32(a);
break;
case OVS_KEY_ATTR_RECIRC_ID:
}
static void
-odp_execute_actions__(void *dp, struct ofpbuf *packet, bool steal,
- struct pkt_metadata *,
+odp_execute_actions__(void *dp, struct dpif_packet **packets, int cnt,
+ 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,
+odp_execute_sample(void *dp, struct dpif_packet *packet, bool steal,
struct pkt_metadata *md, const struct nlattr *action,
odp_execute_cb dp_execute_action, bool more_actions)
{
}
}
- odp_execute_actions__(dp, packet, steal, md, nl_attr_get(subactions),
+ odp_execute_actions__(dp, &packet, 1, steal, md, nl_attr_get(subactions),
nl_attr_get_size(subactions), dp_execute_action,
more_actions);
}
static void
-odp_execute_actions__(void *dp, struct ofpbuf *packet, bool steal,
- struct pkt_metadata *md,
+odp_execute_actions__(void *dp, struct dpif_packet **packets, int cnt,
+ 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 i;
+
NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) {
int type = nl_attr_type(a);
case OVS_ACTION_ATTR_OUTPUT:
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);
+ dp_execute_action(dp, packets, cnt, md, a, may_steal);
}
break;
+ case OVS_ACTION_ATTR_HASH: {
+ const struct ovs_action_hash *hash_act = nl_attr_get(a);
+
+ /* Calculate a hash value directly. This might not match the
+ * value computed by the datapath, but it is much less expensive,
+ * and the current use case (bonding) does not require a strict
+ * match to work properly. */
+ if (hash_act->hash_alg == OVS_HASH_ALG_L4) {
+ struct flow flow;
+ uint32_t hash;
+
+ for (i = 0; i < cnt; i++) {
+ struct ofpbuf *buf = &packets[i]->ofpbuf;
+
+ flow_extract(buf, md, &flow);
+ hash = flow_hash_5tuple(&flow, hash_act->hash_basis);
+
+ /* The hash of the first packet is in shared metadata */
+ if (i == 0) {
+ md->dp_hash = hash ? hash : 1;
+ }
+
+ /* We also store the hash value with each packet */
+ packets[i]->dp_hash = hash ? hash : 1;
+ }
+ } else {
+ /* Assert on unknown hash algorithm. */
+ OVS_NOT_REACHED();
+ }
+ break;
+ }
+
case OVS_ACTION_ATTR_PUSH_VLAN: {
const struct ovs_action_push_vlan *vlan = nl_attr_get(a);
- eth_push_vlan(packet, htons(ETH_TYPE_VLAN), vlan->vlan_tci);
+
+ for (i = 0; i < cnt; i++) {
+ struct ofpbuf *buf = &packets[i]->ofpbuf;
+
+ eth_push_vlan(buf, htons(ETH_TYPE_VLAN), vlan->vlan_tci);
+ }
break;
}
case OVS_ACTION_ATTR_POP_VLAN:
- eth_pop_vlan(packet);
+ for (i = 0; i < cnt; i++) {
+ struct ofpbuf *buf = &packets[i]->ofpbuf;
+
+ eth_pop_vlan(buf);
+ }
break;
case OVS_ACTION_ATTR_PUSH_MPLS: {
const struct ovs_action_push_mpls *mpls = nl_attr_get(a);
- push_mpls(packet, mpls->mpls_ethertype, mpls->mpls_lse);
+
+ for (i = 0; i < cnt; i++) {
+ struct ofpbuf *buf = &packets[i]->ofpbuf;
+
+ push_mpls(buf, mpls->mpls_ethertype, mpls->mpls_lse);
+ }
break;
}
case OVS_ACTION_ATTR_POP_MPLS:
- pop_mpls(packet, nl_attr_get_be16(a));
+ for (i = 0; i < cnt; i++) {
+ struct ofpbuf *buf = &packets[i]->ofpbuf;
+
+ pop_mpls(buf, nl_attr_get_be16(a));
+ }
break;
case OVS_ACTION_ATTR_SET:
- odp_execute_set_action(packet, nl_attr_get(a), md);
+ for (i = 0; i < cnt; i++) {
+ odp_execute_set_action(packets[i], nl_attr_get(a),
+ md);
+ }
break;
case OVS_ACTION_ATTR_SAMPLE:
- odp_execute_sample(dp, packet, steal, md, a, dp_execute_action,
- more_actions || left > NLA_ALIGN(a->nla_len));
+ for (i = 0; i < cnt; i++) {
+ odp_execute_sample(dp, packets[i], steal, md, a,
+ dp_execute_action,
+ more_actions ||
+ left > NLA_ALIGN(a->nla_len));
+ }
break;
case OVS_ACTION_ATTR_UNSPEC:
}
void
-odp_execute_actions(void *dp, struct ofpbuf *packet, bool steal,
- struct pkt_metadata *md,
+odp_execute_actions(void *dp, struct dpif_packet **packets, int cnt,
+ 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,
+ odp_execute_actions__(dp, packets, cnt, steal, md, actions, actions_len,
dp_execute_action, false);
if (!actions_len && steal) {
/* Drop action. */
- ofpbuf_delete(packet);
+ int i;
+
+ for (i = 0; i < cnt; i++) {
+ dpif_packet_delete(packets[i]);
+ }
}
}