X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fodp-execute.c;h=5b77fa9a925714b24132bd81e6a9619897a3ceca;hb=4b0424809b823101c969a0691fc1db0c880ae64a;hp=c91cc4a2eceac78babfcb1ac5393e8fe79452a30;hpb=b09265a6d4deaab2749ed135f0a8a1d45f0b9379;p=sliver-openvswitch.git diff --git a/lib/odp-execute.c b/lib/odp-execute.c index c91cc4a2e..5b77fa9a9 100644 --- a/lib/odp-execute.c +++ b/lib/odp-execute.c @@ -21,14 +21,17 @@ #include #include +#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; @@ -45,9 +48,21 @@ odp_set_tunnel_action(const struct nlattr *a, struct flow_tnl *tun_key) 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 = packet->l3; + + 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; @@ -58,15 +73,15 @@ odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a, 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->pkt_mark = nl_attr_get_u32(a); + md->pkt_mark = nl_attr_get_u32(a); break; case OVS_KEY_ATTR_ETHERNET: @@ -106,6 +121,10 @@ odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a, set_mpls_lse(packet, nl_attr_get_be32(a)); break; + case OVS_KEY_ATTR_ARP: + set_arp(packet, nl_attr_get_unspec(a, sizeof(struct ovs_key_arp))); + break; + case OVS_KEY_ATTR_UNSPEC: case OVS_KEY_ATTR_ENCAP: case OVS_KEY_ATTR_ETHERTYPE: @@ -113,22 +132,23 @@ odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a, 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_TCP_FLAGS: case __OVS_KEY_ATTR_MAX: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } static void -odp_execute_sample(void *dp, struct ofpbuf *packet, struct flow *key, +odp_execute_actions__(void *dp, struct ofpbuf *packet, 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, struct pkt_metadata *md, 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_cb dp_execute_action, bool more_actions) { const struct nlattr *subactions = NULL; const struct nlattr *a; @@ -151,22 +171,19 @@ odp_execute_sample(void *dp, struct ofpbuf *packet, struct flow *key, 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, 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, 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; @@ -175,20 +192,16 @@ odp_execute_actions(void *dp, struct ofpbuf *packet, struct flow *key, 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: - if (output) { - output(dp, packet, nl_attr_get_u32(a)); - } - break; - - case OVS_ACTION_ATTR_USERSPACE: { - if (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: + if (dp_execute_action) { + /* Allow 'dp_execute_action' to steal the packet data if we do + * not need it any more. */ + bool steal = !more_actions && left <= NLA_ALIGN(a->nla_len); + dp_execute_action(dp, packet, md, a, steal); } break; - } case OVS_ACTION_ATTR_PUSH_VLAN: { const struct ovs_action_push_vlan *vlan = nl_attr_get(a); @@ -211,16 +224,26 @@ odp_execute_actions(void *dp, struct ofpbuf *packet, struct flow *key, 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, 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, struct pkt_metadata *md, + const struct nlattr *actions, size_t actions_len, + odp_execute_cb dp_execute_action) +{ + odp_execute_actions__(dp, packet, md, actions, actions_len, + dp_execute_action, false); +}