From 24e2c50bf34af37b688df83cd8d39a58345349c5 Mon Sep 17 00:00:00 2001 From: Chenmin Sun Date: Fri, 28 Feb 2020 22:49:37 +0800 Subject: flow: add RSS support This patch enables the RSS configuration through vnet/flow interface With this RSS feature, users can config the RSS functions for specific flows Currently, it supports: default, toeplitz and symmetric_toeplitz rss function, and ipv4-tcp/ipv4-udp/ipv6-tcp/ipv6-ucp flow types Users can use the following options to combine with above flow types for more specific hash input set selection: l3-src-only, l3-dst-only, l4-src-only, l4-dst-only Command line: test flow add dst-ip any proto udp rss function default rss types ipv4-tcp use l3-dst-only test flow add dst-ip any proto udp rss function toeplitz rss types ipv4-udp use l4-src-only test flow add dst-ip any proto udp rss function symmetric_toeplitz rss types ipv6-udp use l3-src-only and l3-dst-only Type: feature Signed-off-by: Chenmin Sun Change-Id: I213efc76dc8af37f2f63605884f353e05b0f5d2a --- src/plugins/dpdk/device/dpdk.h | 27 +++++++++++++++++++ src/plugins/dpdk/device/flow.c | 56 +++++++++++++++++++++++++++++++++++----- src/plugins/dpdk/device/format.c | 26 ++----------------- src/plugins/dpdk/device/init.c | 3 ++- 4 files changed, 80 insertions(+), 32 deletions(-) (limited to 'src/plugins/dpdk') diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index a0441818899..46d36a2b5aa 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -410,6 +410,33 @@ typedef enum void dpdk_update_link_state (dpdk_device_t * xd, f64 now); +#define foreach_dpdk_rss_hf \ + _(0, ETH_RSS_FRAG_IPV4, "ipv4-frag") \ + _(1, ETH_RSS_NONFRAG_IPV4_TCP, "ipv4-tcp") \ + _(2, ETH_RSS_NONFRAG_IPV4_UDP, "ipv4-udp") \ + _(3, ETH_RSS_NONFRAG_IPV4_SCTP, "ipv4-sctp") \ + _(4, ETH_RSS_NONFRAG_IPV4_OTHER, "ipv4-other") \ + _(5, ETH_RSS_IPV4, "ipv4") \ + _(6, ETH_RSS_IPV6_TCP_EX, "ipv6-tcp-ex") \ + _(7, ETH_RSS_IPV6_UDP_EX, "ipv6-udp-ex") \ + _(8, ETH_RSS_FRAG_IPV6, "ipv6-frag") \ + _(9, ETH_RSS_NONFRAG_IPV6_TCP, "ipv6-tcp") \ + _(10, ETH_RSS_NONFRAG_IPV6_UDP, "ipv6-udp") \ + _(11, ETH_RSS_NONFRAG_IPV6_SCTP, "ipv6-sctp") \ + _(12, ETH_RSS_NONFRAG_IPV6_OTHER, "ipv6-other") \ + _(13, ETH_RSS_IPV6_EX, "ipv6-ex") \ + _(14, ETH_RSS_IPV6, "ipv6") \ + _(15, ETH_RSS_L2_PAYLOAD, "l2-payload") \ + _(16, ETH_RSS_PORT, "port") \ + _(17, ETH_RSS_VXLAN, "vxlan") \ + _(18, ETH_RSS_GENEVE, "geneve") \ + _(19, ETH_RSS_NVGRE, "nvgre") \ + _(20, ETH_RSS_GTPU, "gtpu") \ + _(60, ETH_RSS_L4_DST_ONLY, "l4-dst-only") \ + _(61, ETH_RSS_L4_SRC_ONLY, "l4-src-only") \ + _(62, ETH_RSS_L3_DST_ONLY, "l3-dst-only") \ + _(63, ETH_RSS_L3_SRC_ONLY, "l3-src-only") + format_function_t format_dpdk_device_name; format_function_t format_dpdk_device; format_function_t format_dpdk_device_errors; diff --git a/src/plugins/dpdk/device/flow.c b/src/plugins/dpdk/device/flow.c index 279468f10f8..444a76e307e 100644 --- a/src/plugins/dpdk/device/flow.c +++ b/src/plugins/dpdk/device/flow.c @@ -61,6 +61,24 @@ mac_address_is_all_zero (const u8 addr[6]) 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 int dpdk_flow_add (dpdk_device_t * xd, vnet_flow_t * f, dpdk_flow_entry_t * fe) { @@ -74,6 +92,7 @@ dpdk_flow_add (dpdk_device_t * xd, vnet_flow_t * f, dpdk_flow_entry_t * fe) struct rte_flow_item_gtp gtp[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; bool fate = false; @@ -265,13 +284,15 @@ dpdk_flow_add (dpdk_device_t * xd, vnet_flow_t * f, dpdk_flow_entry_t * fe) item->spec = NULL; item->mask = NULL; } - - 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; + 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; + } } else { @@ -504,6 +525,27 @@ pattern_end: { 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; + rss.func = f->rss_fun; + if (fate == true) { rv = VNET_FLOW_ERROR_INTERNAL; diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c index 3d6e80ff2fb..dad15052b45 100644 --- a/src/plugins/dpdk/device/format.c +++ b/src/plugins/dpdk/device/format.c @@ -44,28 +44,6 @@ _ (tx_bytes_ok, q_obytes) \ _ (rx_errors, q_errors) -#define foreach_dpdk_rss_hf \ - _(ETH_RSS_FRAG_IPV4, "ipv4-frag") \ - _(ETH_RSS_NONFRAG_IPV4_TCP, "ipv4-tcp") \ - _(ETH_RSS_NONFRAG_IPV4_UDP, "ipv4-udp") \ - _(ETH_RSS_NONFRAG_IPV4_SCTP, "ipv4-sctp") \ - _(ETH_RSS_NONFRAG_IPV4_OTHER, "ipv4-other") \ - _(ETH_RSS_IPV4, "ipv4") \ - _(ETH_RSS_IPV6_TCP_EX, "ipv6-tcp-ex") \ - _(ETH_RSS_IPV6_UDP_EX, "ipv6-udp-ex") \ - _(ETH_RSS_FRAG_IPV6, "ipv6-frag") \ - _(ETH_RSS_NONFRAG_IPV6_TCP, "ipv6-tcp") \ - _(ETH_RSS_NONFRAG_IPV6_UDP, "ipv6-udp") \ - _(ETH_RSS_NONFRAG_IPV6_SCTP, "ipv6-sctp") \ - _(ETH_RSS_NONFRAG_IPV6_OTHER, "ipv6-other") \ - _(ETH_RSS_IPV6_EX, "ipv6-ex") \ - _(ETH_RSS_IPV6, "ipv6") \ - _(ETH_RSS_L2_PAYLOAD, "l2-payload") \ - _(ETH_RSS_PORT, "port") \ - _(ETH_RSS_VXLAN, "vxlan") \ - _(ETH_RSS_GENEVE, "geneve") \ - _(ETH_RSS_NVGRE, "nvgre") - #define foreach_dpdk_pkt_rx_offload_flag \ _ (PKT_RX_VLAN, "RX packet is a 802.1q VLAN packet") \ _ (PKT_RX_RSS_HASH, "RX packet with RSS hash result") \ @@ -402,7 +380,7 @@ format_dpdk_link_status (u8 * s, va_list * args) return s; } -#define _(v, str) \ +#define _(n, v, str) \ if (bitmap & v) { \ if (format_get_indent (s) > 72) \ s = format(s,"\n%U", format_white_space, indent); \ @@ -947,7 +925,7 @@ unformat_rss_fn (unformat_input_t * input, uword * rss_fn) if (0) ; #undef _ -#define _(f, s) \ +#define _(n, f, s) \ else if (unformat (input, s)) \ *rss_fn |= f; diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 2922ed3b141..a9e73935a7d 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -440,7 +440,8 @@ dpdk_lib_init (dpdk_main_t * dm) VNET_FLOW_ACTION_REDIRECT_TO_NODE | VNET_FLOW_ACTION_REDIRECT_TO_QUEUE | VNET_FLOW_ACTION_BUFFER_ADVANCE | - VNET_FLOW_ACTION_COUNT | VNET_FLOW_ACTION_DROP; + VNET_FLOW_ACTION_COUNT | VNET_FLOW_ACTION_DROP | + VNET_FLOW_ACTION_RSS; if (dm->conf->no_tx_checksum_offload == 0) { -- cgit 1.2.3-korg