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/vnet/flow/flow.h | 49 ++++++++++++++++++++++++++++++++++++- src/vnet/flow/flow_cli.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 110 insertions(+), 2 deletions(-) (limited to 'src/vnet') diff --git a/src/vnet/flow/flow.h b/src/vnet/flow/flow.h index bd62135649b..d6850b282d7 100644 --- a/src/vnet/flow/flow.h +++ b/src/vnet/flow/flow.h @@ -129,7 +129,8 @@ _(2, BUFFER_ADVANCE, "buffer-advance") \ _(3, REDIRECT_TO_NODE, "redirect-to-node") \ _(4, REDIRECT_TO_QUEUE, "redirect-to-queue") \ - _(5, DROP, "drop") + _(5, RSS, "rss") \ + _(6, DROP, "drop") typedef enum { @@ -147,6 +148,39 @@ typedef enum _( -5, NO_SUCH_INTERFACE, "no such interface") \ _( -6, INTERNAL, "internal error") +#define foreach_flow_rss_types \ + _(0, FRAG_IPV4, "ipv4-frag") \ + _(1, IPV4_TCP, "ipv4-tcp") \ + _(2, IPV4_UDP, "ipv4-udp") \ + _(3, IPV4_SCTP, "ipv4-sctp") \ + _(4, IPV4_OTHER, "ipv4-other") \ + _(5, IPV4, "ipv4") \ + _(6, IPV6_TCP_EX, "ipv6-tcp-ex") \ + _(7, IPV6_UDP_EX, "ipv6-udp-ex") \ + _(8, FRAG_IPV6, "ipv6-frag") \ + _(9, IPV6_TCP, "ipv6-tcp") \ + _(10, IPV6_UDP, "ipv6-udp") \ + _(11, IPV6_SCTP, "ipv6-sctp") \ + _(12, IPV6_OTHER, "ipv6-other") \ + _(13, IPV6_EX, "ipv6-ex") \ + _(14, IPV6, "ipv6") \ + _(15, L2_PAYLOAD, "l2-payload") \ + _(16, PORT, "port") \ + _(17, VXLAN, "vxlan") \ + _(18, GENEVE, "geneve") \ + _(19, NVGRE, "nvgre") \ + _(20, GTPU, "gtpu") \ + _(60, L4_DST_ONLY, "l4-dst-only") \ + _(61, L4_SRC_ONLY, "l4-src-only") \ + _(62, L3_DST_ONLY, "l3-dst-only") \ + _(63, L3_SRC_ONLY, "l3-src-only") + +#define foreach_rss_function \ + _(DEFAULT, "default") \ + _(TOEPLITZ, "toeplitz") \ + _(SIMPLE_XOR, "simple_xor") \ + _(SYMMETRIC_TOEPLITZ, "symmetric_toeplitz") + typedef enum { VNET_FLOW_NO_ERROR = 0, @@ -169,6 +203,13 @@ typedef enum VNET_FLOW_N_TYPES, } vnet_flow_type_t; +typedef enum +{ +#define _(a,b) VNET_RSS_FUNC_##a, + foreach_rss_function +#undef _ + VNET_RSS_N_TYPES, +} vnet_rss_function_t; /* * Create typedef struct vnet_flow_XXX_t @@ -208,6 +249,12 @@ typedef struct /* buffer offset for VNET_FLOW_ACTION_BUFFER_ADVANCE */ i32 buffer_advance; + /* RSS types, including IPv4/IPv6/TCP/UDP... */ + u64 rss_types; + + /* RSS functions, including IPv4/IPv6/TCP/UDP... */ + vnet_rss_function_t rss_fun; + union { #define _(a,b,c) vnet_flow_##b##_t b; diff --git a/src/vnet/flow/flow_cli.c b/src/vnet/flow/flow_cli.c index 500f16b883b..772f89a9b24 100644 --- a/src/vnet/flow/flow_cli.c +++ b/src/vnet/flow/flow_cli.c @@ -296,6 +296,8 @@ test_flow (vlib_main_t * vm, unformat_input_t * input, ip_port_and_mask_t dport = { }; u16 eth_type; bool ethernet_set = false; + u8 *rss_type[3] = { }; + u8 *type_str = NULL; clib_memset (&flow, 0, sizeof (vnet_flow_t)); flow.index = ~0; @@ -370,6 +372,65 @@ test_flow (vlib_main_t * vm, unformat_input_t * input, flow.actions |= VNET_FLOW_ACTION_REDIRECT_TO_QUEUE; else if (unformat (line_input, "drop")) flow.actions |= VNET_FLOW_ACTION_DROP; + else if (unformat (line_input, "rss function")) + { + if (0) + ; +#undef _ +#define _(f, s) \ + else if (unformat (line_input, s)) \ + flow.rss_fun = VNET_RSS_FUNC_##f; + + foreach_rss_function +#undef _ + else + { + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, line_input); + } + + flow.actions |= VNET_FLOW_ACTION_RSS; + } + else if (unformat (line_input, "rss types")) + { + rss_type[0] = NULL; + rss_type[1] = NULL; + rss_type[2] = NULL; + type_str = NULL; + + if (unformat (line_input, "%s use %s and %s", + &rss_type[0], &rss_type[1], &rss_type[2])) + ; + else + if (unformat + (line_input, "%s use %s", &rss_type[0], &rss_type[1])) + ; + else if (unformat (line_input, "%s", &rss_type[0])) + ; + +#undef _ +#define _(a,b,c) \ + else if (!clib_strcmp(c, (const char *)type_str)) \ + flow.rss_types |= (1ULL<