#include <vnet/vnet.h>
#include <vppinfra/vec.h>
#include <vppinfra/format.h>
-#include <vlib/unix/cj.h>
#include <assert.h>
#include <vnet/ip/ip.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/ethernet/arp_packet.h>
+#include <vnet/vxlan/vxlan.h>
#include <dpdk/device/dpdk.h>
-
#include <dpdk/device/dpdk_priv.h>
#include <vppinfra/error.h>
+#define FLOW_IS_ETHERNET_CLASS(f) \
+ (f->type == VNET_FLOW_TYPE_ETHERNET)
+
+#define FLOW_IS_IPV4_CLASS(f) \
+ ((f->type == VNET_FLOW_TYPE_IP4) || \
+ (f->type == VNET_FLOW_TYPE_IP4_N_TUPLE) || \
+ (f->type == VNET_FLOW_TYPE_IP4_N_TUPLE_TAGGED) || \
+ (f->type == VNET_FLOW_TYPE_IP4_VXLAN) || \
+ (f->type == VNET_FLOW_TYPE_IP4_GTPC) || \
+ (f->type == VNET_FLOW_TYPE_IP4_GTPU) || \
+ (f->type == VNET_FLOW_TYPE_IP4_L2TPV3OIP) || \
+ (f->type == VNET_FLOW_TYPE_IP4_IPSEC_ESP) || \
+ (f->type == VNET_FLOW_TYPE_IP4_IPSEC_AH))
+
+#define FLOW_IS_IPV6_CLASS(f) \
+ ((f->type == VNET_FLOW_TYPE_IP6) || \
+ (f->type == VNET_FLOW_TYPE_IP6_N_TUPLE) || \
+ (f->type == VNET_FLOW_TYPE_IP6_N_TUPLE_TAGGED) || \
+ (f->type == VNET_FLOW_TYPE_IP6_VXLAN))
+
+/* check if flow is VLAN sensitive */
+#define FLOW_HAS_VLAN_TAG(f) \
+ ((f->type == VNET_FLOW_TYPE_IP4_N_TUPLE_TAGGED) || \
+ (f->type == VNET_FLOW_TYPE_IP6_N_TUPLE_TAGGED))
+
+/* check if flow is L3 type */
+#define FLOW_IS_L3_TYPE(f) \
+ ((f->type == VNET_FLOW_TYPE_IP4) || \
+ (f->type == VNET_FLOW_TYPE_IP6))
+
+/* check if flow is L4 type */
+#define FLOW_IS_L4_TYPE(f) \
+ ((f->type == VNET_FLOW_TYPE_IP4_N_TUPLE) || \
+ (f->type == VNET_FLOW_TYPE_IP6_N_TUPLE) || \
+ (f->type == VNET_FLOW_TYPE_IP4_N_TUPLE_TAGGED) || \
+ (f->type == VNET_FLOW_TYPE_IP6_N_TUPLE_TAGGED))
+
+/* check if flow is L4 tunnel type */
+#define FLOW_IS_L4_TUNNEL_TYPE(f) \
+ ((f->type == VNET_FLOW_TYPE_IP4_VXLAN) || \
+ (f->type == VNET_FLOW_TYPE_IP6_VXLAN) || \
+ (f->type == VNET_FLOW_TYPE_IP4_GTPC) || \
+ (f->type == VNET_FLOW_TYPE_IP4_GTPU))
+
/* constant structs */
static const struct rte_flow_attr ingress = {.ingress = 1 };
-static const struct rte_flow_item_eth any_eth[2] = { };
-static const struct rte_flow_item_vlan any_vlan[2] = { };
+
+static inline bool
+mac_address_is_all_zero (const u8 addr[6])
+{
+ int i = 0;
+
+ for (i = 0; i < 6; i++)
+ if (addr[i] != 0)
+ return false;
+
+ return true;
+}
+
+static inline void
+dpdk_flow_convert_rss_types (u64 type, u64 * dpdk_rss_type)
+{
+#define BIT_IS_SET(v, b) \
+ ((v) & (u64)1<<(b))
+
+ *dpdk_rss_type = 0;
+
+#undef _
+#define _(n, f, s) \
+ if (n != -1 && BIT_IS_SET(type, n)) \
+ *dpdk_rss_type |= f;
+
+ foreach_dpdk_rss_hf
+#undef _
+ return;
+}
+
+static inline enum rte_eth_hash_function
+dpdk_flow_convert_rss_func (vnet_rss_function_t func)
+{
+ enum rte_eth_hash_function rss_func;
+
+ switch (func)
+ {
+ case VNET_RSS_FUNC_DEFAULT:
+ rss_func = RTE_ETH_HASH_FUNCTION_DEFAULT;
+ break;
+ case VNET_RSS_FUNC_TOEPLITZ:
+ rss_func = RTE_ETH_HASH_FUNCTION_TOEPLITZ;
+ break;
+ case VNET_RSS_FUNC_SIMPLE_XOR:
+ rss_func = RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
+ break;
+ case VNET_RSS_FUNC_SYMMETRIC_TOEPLITZ:
+ rss_func = RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
+ break;
+ default:
+ rss_func = RTE_ETH_HASH_FUNCTION_MAX;
+ break;
+ }
+
+ return rss_func;
+}
static int
-dpdk_flow_add_n_touple (dpdk_device_t * xd, vnet_flow_t * f,
- dpdk_flow_entry_t * fe)
+dpdk_flow_add (dpdk_device_t * xd, vnet_flow_t * f, dpdk_flow_entry_t * fe)
{
+ struct rte_flow_item_eth eth[2] = { };
struct rte_flow_item_ipv4 ip4[2] = { };
struct rte_flow_item_ipv6 ip6[2] = { };
struct rte_flow_item_udp udp[2] = { };
struct rte_flow_item_tcp tcp[2] = { };
+ struct rte_flow_item_gtp gtp[2] = { };
+ struct rte_flow_item_l2tpv3oip l2tp[2] = { };
+ struct rte_flow_item_esp esp[2] = { };
+ struct rte_flow_item_ah ah[2] = { };
struct rte_flow_action_mark mark = { 0 };
+ struct rte_flow_action_queue queue = { 0 };
+ struct rte_flow_action_rss rss = { 0 };
struct rte_flow_item *item, *items = 0;
struct rte_flow_action *action, *actions = 0;
- u16 src_port, dst_port, src_port_mask, dst_port_mask;
- u8 protocol;
+ bool fate = false;
+
+ enum
+ {
+ vxlan_hdr_sz = sizeof (vxlan_header_t),
+ raw_sz = sizeof (struct rte_flow_item_raw)
+ };
+
+ union
+ {
+ struct rte_flow_item_raw item;
+ u8 val[raw_sz + vxlan_hdr_sz];
+ } raw[2];
+
+ u16 src_port = 0, dst_port = 0, src_port_mask = 0, dst_port_mask = 0;
+ u8 protocol = IP_PROTOCOL_RESERVED;
int rv = 0;
+ enum
+ {
+ FLOW_UNKNOWN_CLASS,
+ FLOW_ETHERNET_CLASS,
+ FLOW_IPV4_CLASS,
+ FLOW_IPV6_CLASS,
+ } flow_class = FLOW_UNKNOWN_CLASS;
+
+ if (FLOW_IS_ETHERNET_CLASS (f))
+ flow_class = FLOW_ETHERNET_CLASS;
+ else if (FLOW_IS_IPV4_CLASS (f))
+ flow_class = FLOW_IPV4_CLASS;
+ else if (FLOW_IS_IPV6_CLASS (f))
+ flow_class = FLOW_IPV6_CLASS;
+ else
+ return VNET_FLOW_ERROR_NOT_SUPPORTED;
+
if (f->actions & (~xd->supported_flow_actions))
return VNET_FLOW_ERROR_NOT_SUPPORTED;
- /* Ethernet */
+ /* Match items */
+ /* Layer 2, Ethernet */
vec_add2 (items, item, 1);
item->type = RTE_FLOW_ITEM_TYPE_ETH;
- item->spec = any_eth;
- item->mask = any_eth + 1;
-
- /* VLAN */
- vec_add2 (items, item, 1);
- item->type = RTE_FLOW_ITEM_TYPE_VLAN;
- item->spec = any_vlan;
- item->mask = any_vlan + 1;
- /* IP */
- vec_add2 (items, item, 1);
- if (f->type == VNET_FLOW_TYPE_IP6_N_TUPLE)
+ if (flow_class == FLOW_ETHERNET_CLASS)
{
- vnet_flow_ip6_n_tuple_t *t6 = &f->ip6_n_tuple;
- clib_memcpy (ip6[0].hdr.src_addr, &t6->src_addr.addr, 16);
- clib_memcpy (ip6[1].hdr.src_addr, &t6->src_addr.mask, 16);
- clib_memcpy (ip6[0].hdr.dst_addr, &t6->dst_addr.addr, 16);
- clib_memcpy (ip6[1].hdr.dst_addr, &t6->dst_addr.mask, 16);
- item->type = RTE_FLOW_ITEM_TYPE_IPV6;
- item->spec = ip6;
- item->mask = ip6 + 1;
-
- src_port = t6->src_port.port;
- dst_port = t6->dst_port.port;
- src_port_mask = t6->src_port.mask;
- dst_port_mask = t6->dst_port.mask;
- protocol = t6->protocol;
+ vnet_flow_ethernet_t *te = &f->ethernet;
+
+ clib_memset (ð[0], 0, sizeof (eth[0]));
+ clib_memset (ð[1], 0, sizeof (eth[1]));
+
+ /* check if SMAC/DMAC/Ether_type assigned */
+ if (!mac_address_is_all_zero (te->eth_hdr.dst_address))
+ {
+ clib_memcpy_fast (ð[0].dst, &te->eth_hdr.dst_address,
+ sizeof (eth[0].dst));
+ clib_memset (ð[1].dst, 0xFF, sizeof (eth[1].dst));
+ }
+
+ if (!mac_address_is_all_zero (te->eth_hdr.src_address))
+ {
+ clib_memcpy_fast (ð[0].src, &te->eth_hdr.src_address,
+ sizeof (eth[0].src));
+ clib_memset (ð[1].src, 0xFF, sizeof (eth[1].src));
+ }
+
+ if (te->eth_hdr.type)
+ {
+ eth[0].type = clib_host_to_net_u16 (te->eth_hdr.type);
+ eth[1].type = clib_host_to_net_u16 (0xFFFF);
+ }
+
+ item->spec = eth;
+ item->mask = eth + 1;
}
else
{
- vnet_flow_ip4_n_tuple_t *t4 = &f->ip4_n_tuple;
- ASSERT (f->type == VNET_FLOW_TYPE_IP4_N_TUPLE);
- ip4[0].hdr.src_addr = t4->src_addr.mask.as_u32;
- ip4[1].hdr.src_addr = t4->src_addr.mask.as_u32;
- ip4[0].hdr.dst_addr = t4->dst_addr.addr.as_u32;
- ip4[1].hdr.dst_addr = t4->dst_addr.mask.as_u32;
- item->type = RTE_FLOW_ITEM_TYPE_IPV4;
- item->spec = ip4;
- item->mask = ip4 + 1;
-
- src_port = t4->src_port.port;
- dst_port = t4->dst_port.mask;
- src_port_mask = t4->src_port.mask;
- dst_port_mask = t4->dst_port.mask;
- protocol = t4->protocol;
+ item->spec = NULL;
+ item->mask = NULL;
}
- /* Layer 4 */
+ /* currently only single empty vlan tag is supported */
+ if (FLOW_HAS_VLAN_TAG (f))
+ {
+ vec_add2 (items, item, 1);
+ item->type = RTE_FLOW_ITEM_TYPE_VLAN;
+ item->spec = NULL;
+ item->mask = NULL;
+ }
+
+ if (FLOW_IS_ETHERNET_CLASS (f))
+ goto pattern_end;
+
+ /* Layer 3, IP */
vec_add2 (items, item, 1);
- if (protocol == IP_PROTOCOL_UDP)
+ if (flow_class == FLOW_IPV4_CLASS)
{
- udp[0].hdr.src_port = clib_host_to_net_u16 (src_port);
- udp[1].hdr.src_port = clib_host_to_net_u16 (src_port_mask);
- udp[0].hdr.dst_port = clib_host_to_net_u16 (dst_port);
- udp[1].hdr.dst_port = clib_host_to_net_u16 (dst_port_mask);
- item->type = RTE_FLOW_ITEM_TYPE_UDP;
- item->spec = udp;
- item->mask = udp + 1;
+ vnet_flow_ip4_t *ip4_ptr = &f->ip4;
+
+ item->type = RTE_FLOW_ITEM_TYPE_IPV4;
+ if ((!ip4_ptr->src_addr.mask.as_u32) &&
+ (!ip4_ptr->dst_addr.mask.as_u32) && (!ip4_ptr->protocol.mask))
+ {
+ item->spec = NULL;
+ item->mask = NULL;
+ }
+ else
+ {
+ ip4[0].hdr.src_addr = ip4_ptr->src_addr.addr.as_u32;
+ ip4[1].hdr.src_addr = ip4_ptr->src_addr.mask.as_u32;
+ ip4[0].hdr.dst_addr = ip4_ptr->dst_addr.addr.as_u32;
+ ip4[1].hdr.dst_addr = ip4_ptr->dst_addr.mask.as_u32;
+ ip4[0].hdr.next_proto_id = ip4_ptr->protocol.prot;
+ ip4[1].hdr.next_proto_id = ip4_ptr->protocol.mask;
+
+ item->spec = ip4;
+ item->mask = ip4 + 1;
+ }
+
+ if (FLOW_IS_L4_TYPE (f) || FLOW_IS_L4_TUNNEL_TYPE (f))
+ {
+ vnet_flow_ip4_n_tuple_t *ip4_n_ptr = &f->ip4_n_tuple;
+
+ src_port = ip4_n_ptr->src_port.port;
+ dst_port = ip4_n_ptr->dst_port.port;
+ src_port_mask = ip4_n_ptr->src_port.mask;
+ dst_port_mask = ip4_n_ptr->dst_port.mask;
+ }
+
+ protocol = ip4_ptr->protocol.prot;
}
- else if (protocol == IP_PROTOCOL_TCP)
+ else if (flow_class == FLOW_IPV6_CLASS)
{
- tcp[0].hdr.src_port = clib_host_to_net_u16 (src_port);
- tcp[1].hdr.src_port = clib_host_to_net_u16 (src_port_mask);
- tcp[0].hdr.dst_port = clib_host_to_net_u16 (dst_port);
- tcp[1].hdr.dst_port = clib_host_to_net_u16 (dst_port_mask);
- item->type = RTE_FLOW_ITEM_TYPE_TCP;
- item->spec = tcp;
- item->mask = tcp + 1;
+ vnet_flow_ip6_t *ip6_ptr = &f->ip6;
+
+ item->type = RTE_FLOW_ITEM_TYPE_IPV6;
+
+ if ((ip6_ptr->src_addr.mask.as_u64[0] == 0) &&
+ (ip6_ptr->src_addr.mask.as_u64[1] == 0) &&
+ (!ip6_ptr->protocol.mask))
+ {
+ item->spec = NULL;
+ item->mask = NULL;
+ }
+ else
+ {
+ clib_memcpy (ip6[0].hdr.src_addr, &ip6_ptr->src_addr.addr,
+ ARRAY_LEN (ip6_ptr->src_addr.addr.as_u8));
+ clib_memcpy (ip6[1].hdr.src_addr, &ip6_ptr->src_addr.mask,
+ ARRAY_LEN (ip6_ptr->src_addr.mask.as_u8));
+ clib_memcpy (ip6[0].hdr.dst_addr, &ip6_ptr->dst_addr.addr,
+ ARRAY_LEN (ip6_ptr->dst_addr.addr.as_u8));
+ clib_memcpy (ip6[1].hdr.dst_addr, &ip6_ptr->dst_addr.mask,
+ ARRAY_LEN (ip6_ptr->dst_addr.mask.as_u8));
+ ip6[0].hdr.proto = ip6_ptr->protocol.prot;
+ ip6[1].hdr.proto = ip6_ptr->protocol.mask;
+
+ item->spec = ip6;
+ item->mask = ip6 + 1;
+ }
+
+ if (FLOW_IS_L4_TYPE (f) || FLOW_IS_L4_TUNNEL_TYPE (f))
+ {
+ vnet_flow_ip6_n_tuple_t *ip6_n_ptr = &f->ip6_n_tuple;
+
+ src_port = ip6_n_ptr->src_port.port;
+ dst_port = ip6_n_ptr->dst_port.port;
+ src_port_mask = ip6_n_ptr->src_port.mask;
+ dst_port_mask = ip6_n_ptr->dst_port.mask;
+ }
+
+ protocol = ip6_ptr->protocol.prot;
}
- else
+
+ if (FLOW_IS_L3_TYPE (f))
+ goto pattern_end;
+
+ /* Layer 3, IP */
+ vec_add2 (items, item, 1);
+ switch (protocol)
{
+ case IP_PROTOCOL_L2TP:
+ item->type = RTE_FLOW_ITEM_TYPE_L2TPV3OIP;
+ l2tp[0].session_id = clib_host_to_net_u32 (f->ip4_l2tpv3oip.session_id);
+ l2tp[1].session_id = ~0;
+
+ item->spec = l2tp;
+ item->mask = l2tp + 1;
+ break;
+
+ case IP_PROTOCOL_IPSEC_ESP:
+ item->type = RTE_FLOW_ITEM_TYPE_ESP;
+ esp[0].hdr.spi = clib_host_to_net_u32 (f->ip4_ipsec_esp.spi);
+ esp[1].hdr.spi = ~0;
+
+ item->spec = esp;
+ item->mask = esp + 1;
+ break;
+
+ case IP_PROTOCOL_IPSEC_AH:
+ item->type = RTE_FLOW_ITEM_TYPE_AH;
+ ah[0].spi = clib_host_to_net_u32 (f->ip4_ipsec_ah.spi);
+ ah[1].spi = ~0;
+
+ item->spec = ah;
+ item->mask = ah + 1;
+ break;
+ case IP_PROTOCOL_TCP:
+ item->type = RTE_FLOW_ITEM_TYPE_TCP;
+ if ((src_port_mask == 0) && (dst_port_mask == 0))
+ {
+ item->spec = NULL;
+ item->mask = NULL;
+ }
+ else
+ {
+ tcp[0].hdr.src_port = clib_host_to_net_u16 (src_port);
+ tcp[1].hdr.src_port = clib_host_to_net_u16 (src_port_mask);
+ tcp[0].hdr.dst_port = clib_host_to_net_u16 (dst_port);
+ tcp[1].hdr.dst_port = clib_host_to_net_u16 (dst_port_mask);
+ item->spec = tcp;
+ item->mask = tcp + 1;
+ }
+ break;
+
+ case IP_PROTOCOL_UDP:
+ item->type = RTE_FLOW_ITEM_TYPE_UDP;
+ if ((src_port_mask == 0) && (dst_port_mask == 0))
+ {
+ item->spec = NULL;
+ item->mask = NULL;
+ }
+ else
+ {
+ udp[0].hdr.src_port = clib_host_to_net_u16 (src_port);
+ udp[1].hdr.src_port = clib_host_to_net_u16 (src_port_mask);
+ udp[0].hdr.dst_port = clib_host_to_net_u16 (dst_port);
+ udp[1].hdr.dst_port = clib_host_to_net_u16 (dst_port_mask);
+ item->spec = udp;
+ item->mask = udp + 1;
+ }
+
+ /* handle the UDP tunnels */
+ if (f->type == VNET_FLOW_TYPE_IP4_GTPC)
+ {
+ gtp[0].teid = clib_host_to_net_u32 (f->ip4_gtpc.teid);
+ gtp[1].teid = ~0;
+
+ vec_add2 (items, item, 1);
+ item->type = RTE_FLOW_ITEM_TYPE_GTPC;
+ item->spec = gtp;
+ item->mask = gtp + 1;
+ }
+ else if (f->type == VNET_FLOW_TYPE_IP4_GTPU)
+ {
+ gtp[0].teid = clib_host_to_net_u32 (f->ip4_gtpu.teid);
+ gtp[1].teid = ~0;
+
+ vec_add2 (items, item, 1);
+ item->type = RTE_FLOW_ITEM_TYPE_GTPU;
+ item->spec = gtp;
+ item->mask = gtp + 1;
+ }
+ else if (f->type == VNET_FLOW_TYPE_IP4_VXLAN)
+ {
+ u32 vni = f->ip4_vxlan.vni;
+
+ vxlan_header_t spec_hdr = {
+ .flags = VXLAN_FLAGS_I,
+ .vni_reserved = clib_host_to_net_u32 (vni << 8)
+ };
+ vxlan_header_t mask_hdr = {
+ .flags = 0xff,
+ .vni_reserved = clib_host_to_net_u32 (((u32) - 1) << 8)
+ };
+
+ clib_memset (raw, 0, sizeof raw);
+ raw[0].item.relative = 1;
+ raw[0].item.length = vxlan_hdr_sz;
+
+ clib_memcpy_fast (raw[0].val + raw_sz, &spec_hdr, vxlan_hdr_sz);
+ raw[0].item.pattern = raw[0].val + raw_sz;
+ clib_memcpy_fast (raw[1].val + raw_sz, &mask_hdr, vxlan_hdr_sz);
+ raw[1].item.pattern = raw[1].val + raw_sz;
+
+ vec_add2 (items, item, 1);
+ item->type = RTE_FLOW_ITEM_TYPE_RAW;
+ item->spec = raw;
+ item->mask = raw + 1;
+ }
+ break;
+
+ default:
rv = VNET_FLOW_ERROR_NOT_SUPPORTED;
goto done;
}
- /* The End */
+pattern_end:
+ if ((f->actions & VNET_FLOW_ACTION_RSS) &&
+ (f->rss_types & (1ULL << VNET_FLOW_RSS_TYPES_ESP)))
+ {
+
+ vec_add2 (items, item, 1);
+ item->type = RTE_FLOW_ITEM_TYPE_ESP;
+ }
+
vec_add2 (items, item, 1);
item->type = RTE_FLOW_ITEM_TYPE_END;
- vec_add2 (actions, action, 1);
- action->type = RTE_FLOW_ACTION_TYPE_PASSTHRU;
+ /* Actions */
+ /* Only one 'fate' can be assigned */
+ if (f->actions & VNET_FLOW_ACTION_REDIRECT_TO_QUEUE)
+ {
+ vec_add2 (actions, action, 1);
+ queue.index = f->redirect_queue;
+ action->type = RTE_FLOW_ACTION_TYPE_QUEUE;
+ action->conf = &queue;
+ fate = true;
+ }
- vec_add2 (actions, action, 1);
- mark.id = fe->mark;
- action->type = RTE_FLOW_ACTION_TYPE_MARK;
- action->conf = &mark;
+ if (f->actions & VNET_FLOW_ACTION_DROP)
+ {
+ vec_add2 (actions, action, 1);
+ action->type = RTE_FLOW_ACTION_TYPE_DROP;
+ if (fate == true)
+ {
+ rv = VNET_FLOW_ERROR_INTERNAL;
+ goto done;
+ }
+ else
+ fate = true;
+ }
+
+ if (f->actions & VNET_FLOW_ACTION_RSS)
+ {
+ u64 rss_type = 0;
+
+ vec_add2 (actions, action, 1);
+ action->type = RTE_FLOW_ACTION_TYPE_RSS;
+ action->conf = &rss;
+
+ /* convert types to DPDK rss bitmask */
+ dpdk_flow_convert_rss_types (f->rss_types, &rss_type);
+
+ rss.types = rss_type;
+ if ((rss.func = dpdk_flow_convert_rss_func (f->rss_fun)) ==
+ RTE_ETH_HASH_FUNCTION_MAX)
+ {
+ rv = VNET_FLOW_ERROR_NOT_SUPPORTED;
+ goto done;
+ }
+
+ if (fate == true)
+ {
+ rv = VNET_FLOW_ERROR_INTERNAL;
+ goto done;
+ }
+ else
+ fate = true;
+ }
+
+ if (fate == false)
+ {
+ vec_add2 (actions, action, 1);
+ action->type = RTE_FLOW_ACTION_TYPE_PASSTHRU;
+ }
+
+ if (f->actions & VNET_FLOW_ACTION_MARK)
+ {
+ vec_add2 (actions, action, 1);
+ mark.id = fe->mark;
+ action->type = RTE_FLOW_ACTION_TYPE_MARK;
+ action->conf = &mark;
+ }
vec_add2 (actions, action, 1);
action->type = RTE_FLOW_ACTION_TYPE_END;
+ rv = rte_flow_validate (xd->device_index, &ingress, items, actions,
+ &xd->last_flow_error);
+
+ if (rv)
+ {
+ if (rv == -EINVAL)
+ rv = VNET_FLOW_ERROR_NOT_SUPPORTED;
+ else if (rv == -EEXIST)
+ rv = VNET_FLOW_ERROR_ALREADY_EXISTS;
+ else
+ rv = VNET_FLOW_ERROR_INTERNAL;
+
+ goto done;
+ }
+
fe->handle = rte_flow_create (xd->device_index, &ingress, items, actions,
&xd->last_flow_error);
dpdk_flow_lookup_entry_t *fle = 0;
int rv;
- if (op == VNET_FLOW_DEV_OP_DEL_FLOW)
+ /* recycle old flow lookup entries only after the main loop counter
+ increases - i.e. previously DMA'ed packets were handled */
+ if (vec_len (xd->parked_lookup_indexes) > 0 &&
+ xd->parked_loop_count != dm->vlib_main->main_loop_count)
{
- ASSERT (*private_data >= vec_len (xd->flow_entries));
+ u32 *fl_index;
+ vec_foreach (fl_index, xd->parked_lookup_indexes)
+ pool_put_index (xd->flow_lookup_entries, *fl_index);
+ vec_reset_length (xd->parked_lookup_indexes);
+ }
+
+ if (op == VNET_FLOW_DEV_OP_DEL_FLOW)
+ {
fe = vec_elt_at_index (xd->flow_entries, *private_data);
if ((rv = rte_flow_destroy (xd->device_index, fe->handle,
&xd->last_flow_error)))
return VNET_FLOW_ERROR_INTERNAL;
- memset (fe, 0, sizeof (*fe));
+ if (fe->mark)
+ {
+ /* make sure no action is taken for in-flight (marked) packets */
+ fle = pool_elt_at_index (xd->flow_lookup_entries, fe->mark);
+ clib_memset (fle, -1, sizeof (*fle));
+ vec_add1 (xd->parked_lookup_indexes, fe->mark);
+ xd->parked_loop_count = dm->vlib_main->main_loop_count;
+ }
+
+ clib_memset (fe, 0, sizeof (*fe));
pool_put (xd->flow_entries, fe);
goto disable_rx_offload;
CLIB_CACHE_LINE_BYTES);
pool_get_aligned (xd->flow_lookup_entries, fle, CLIB_CACHE_LINE_BYTES);
fe->mark = fle - xd->flow_lookup_entries;
+
+ /* install entry in the lookup table */
+ clib_memset (fle, -1, sizeof (*fle));
+ if (flow->actions & VNET_FLOW_ACTION_MARK)
+ fle->flow_id = flow->mark_flow_id;
+ if (flow->actions & VNET_FLOW_ACTION_REDIRECT_TO_NODE)
+ fle->next_index = flow->redirect_device_input_next_index;
+ if (flow->actions & VNET_FLOW_ACTION_BUFFER_ADVANCE)
+ fle->buffer_advance = flow->buffer_advance;
}
else
fe->mark = 0;
switch (flow->type)
{
+ case VNET_FLOW_TYPE_ETHERNET:
+ case VNET_FLOW_TYPE_IP4:
+ case VNET_FLOW_TYPE_IP6:
case VNET_FLOW_TYPE_IP4_N_TUPLE:
case VNET_FLOW_TYPE_IP6_N_TUPLE:
- if ((rv = dpdk_flow_add_n_touple (xd, flow, fe)))
+ case VNET_FLOW_TYPE_IP4_VXLAN:
+ case VNET_FLOW_TYPE_IP4_GTPC:
+ case VNET_FLOW_TYPE_IP4_GTPU:
+ case VNET_FLOW_TYPE_IP4_L2TPV3OIP:
+ case VNET_FLOW_TYPE_IP4_IPSEC_ESP:
+ case VNET_FLOW_TYPE_IP4_IPSEC_AH:
+ if ((rv = dpdk_flow_add (xd, flow, fe)))
goto done;
break;
default:
*private_data = fe - xd->flow_entries;
- /* install entry in the lookup table */
- memset (fle, -1, sizeof (*fle));
- if (flow->actions & VNET_FLOW_ACTION_MARK)
- fle->flow_id = flow->mark_flow_id;
- if (flow->actions & VNET_FLOW_ACTION_REDIRECT_TO_NODE)
- fle->next_index = flow->redirect_device_input_next_index;
- if (flow->actions & VNET_FLOW_ACTION_BUFFER_ADVANCE)
- fle->buffer_advance = flow->buffer_advance;
-
done:
if (rv)
{
- memset (fe, 0, sizeof (*fe));
+ clib_memset (fe, 0, sizeof (*fe));
pool_put (xd->flow_entries, fe);
if (fle)
{
- memset (fle, 0, sizeof (*fle));
+ clib_memset (fle, -1, sizeof (*fle));
pool_put (xd->flow_lookup_entries, fle);
}
}
return s;
}
- fe = vec_elt_at_index (xd->flow_entries, private_data);
-
- if (!fe)
+ if (private_data >= vec_len (xd->flow_entries))
return format (s, "unknown flow");
+ fe = vec_elt_at_index (xd->flow_entries, private_data);
s = format (s, "mark %u", fe->mark);
return s;
}
Code Review / vpp.git / blobdiff