net/sfc: support TCP in flow API filters

Exact match of source and destination ports is supported by parser.
IP protocol match is enforced to TCP.

Signed-off-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andrew Lee <alee@solarflare.com>

diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst
index a4ea162..7e00fdc 100644 (file)
--- a/doc/guides/nics/sfc_efx.rst
+++ b/doc/guides/nics/sfc_efx.rst
@@ -137,6 +137,8 @@ Supported pattern items:
 - IPV6 (exact match of source/destination addresses,
   IP transport protocol)
 
+- TCP (exact match of source/destination ports)
+
 Supported actions:
 
 - VOID

diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index 1079ca4..38e6b73 100644 (file)
--- a/drivers/net/sfc/sfc_flow.c
+++ b/drivers/net/sfc/sfc_flow.c
@@ -56,6 +56,7 @@ enum sfc_flow_item_layers {
        SFC_FLOW_ITEM_START_LAYER,
        SFC_FLOW_ITEM_L2,
        SFC_FLOW_ITEM_L3,
+       SFC_FLOW_ITEM_L4,
 };
 
 typedef int (sfc_flow_item_parse)(const struct rte_flow_item *item,
@@ -74,6 +75,7 @@ static sfc_flow_item_parse sfc_flow_parse_eth;
 static sfc_flow_item_parse sfc_flow_parse_vlan;
 static sfc_flow_item_parse sfc_flow_parse_ipv4;
 static sfc_flow_item_parse sfc_flow_parse_ipv6;
+static sfc_flow_item_parse sfc_flow_parse_tcp;
 
 static boolean_t
 sfc_flow_is_zero(const uint8_t *buf, unsigned int size)
@@ -538,6 +540,87 @@ fail_bad_mask:
        return -rte_errno;
 }
 
+/**
+ * Convert TCP item to EFX filter specification.
+ *
+ * @param item[in]
+ *   Item specification. Only source and destination ports fields
+ *   are supported. If the mask is NULL, default mask will be used.
+ *   Ranging is not supported.
+ * @param efx_spec[in, out]
+ *   EFX filter specification to update.
+ * @param[out] error
+ *   Perform verbose error reporting if not NULL.
+ */
+static int
+sfc_flow_parse_tcp(const struct rte_flow_item *item,
+                  efx_filter_spec_t *efx_spec,
+                  struct rte_flow_error *error)
+{
+       int rc;
+       const struct rte_flow_item_tcp *spec = NULL;
+       const struct rte_flow_item_tcp *mask = NULL;
+       const struct rte_flow_item_tcp supp_mask = {
+               .hdr = {
+                       .src_port = 0xffff,
+                       .dst_port = 0xffff,
+               }
+       };
+
+       rc = sfc_flow_parse_init(item,
+                                (const void **)&spec,
+                                (const void **)&mask,
+                                &supp_mask,
+                                &rte_flow_item_tcp_mask,
+                                sizeof(struct rte_flow_item_tcp),
+                                error);
+       if (rc != 0)
+               return rc;
+
+       /*
+        * Filtering by TCP source and destination ports requires
+        * the appropriate IP_PROTO in hardware filters
+        */
+       if (!(efx_spec->efs_match_flags & EFX_FILTER_MATCH_IP_PROTO)) {
+               efx_spec->efs_match_flags |= EFX_FILTER_MATCH_IP_PROTO;
+               efx_spec->efs_ip_proto = EFX_IPPROTO_TCP;
+       } else if (efx_spec->efs_ip_proto != EFX_IPPROTO_TCP) {
+               rte_flow_error_set(error, EINVAL,
+                       RTE_FLOW_ERROR_TYPE_ITEM, item,
+                       "IP proto in pattern with TCP item should be appropriate");
+               return -rte_errno;
+       }
+
+       if (spec == NULL)
+               return 0;
+
+       /*
+        * Source and destination ports are in big-endian byte order in item and
+        * in little-endian in efx_spec, so byte swap is used
+        */
+       if (mask->hdr.src_port == supp_mask.hdr.src_port) {
+               efx_spec->efs_match_flags |= EFX_FILTER_MATCH_REM_PORT;
+               efx_spec->efs_rem_port = rte_bswap16(spec->hdr.src_port);
+       } else if (mask->hdr.src_port != 0) {
+               goto fail_bad_mask;
+       }
+
+       if (mask->hdr.dst_port == supp_mask.hdr.dst_port) {
+               efx_spec->efs_match_flags |= EFX_FILTER_MATCH_LOC_PORT;
+               efx_spec->efs_loc_port = rte_bswap16(spec->hdr.dst_port);
+       } else if (mask->hdr.dst_port != 0) {
+               goto fail_bad_mask;
+       }
+
+       return 0;
+
+fail_bad_mask:
+       rte_flow_error_set(error, EINVAL,
+                          RTE_FLOW_ERROR_TYPE_ITEM, item,
+                          "Bad mask in the TCP pattern item");
+       return -rte_errno;
+}
+
 static const struct sfc_flow_item sfc_flow_items[] = {
        {
                .type = RTE_FLOW_ITEM_TYPE_VOID,
@@ -569,6 +652,12 @@ static const struct sfc_flow_item sfc_flow_items[] = {
                .layer = SFC_FLOW_ITEM_L3,
                .parse = sfc_flow_parse_ipv6,
        },
+       {
+               .type = RTE_FLOW_ITEM_TYPE_TCP,
+               .prev_layer = SFC_FLOW_ITEM_L3,
+               .layer = SFC_FLOW_ITEM_L4,
+               .parse = sfc_flow_parse_tcp,
+       },
 };
 
 /*