From patchwork Thu Sep 6 16:27:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pattan, Reshma" X-Patchwork-Id: 44346 X-Patchwork-Delegate: cristian.dumitrescu@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AF8425F36; Thu, 6 Sep 2018 18:27:32 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id DA86D5B3A for ; Thu, 6 Sep 2018 18:27:24 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Sep 2018 09:27:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,338,1531810800"; d="scan'208";a="68064532" Received: from sivswdev02.ir.intel.com (HELO localhost.localdomain) ([10.237.217.46]) by fmsmga007.fm.intel.com with ESMTP; 06 Sep 2018 09:27:23 -0700 From: Reshma Pattan To: dev@dpdk.org Cc: Cristian Dumitrescu , Reshma Pattan Date: Thu, 6 Sep 2018 17:27:02 +0100 Message-Id: <1536251222-17275-16-git-send-email-reshma.pattan@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1536251222-17275-1-git-send-email-reshma.pattan@intel.com> References: <1536251222-17275-1-git-send-email-reshma.pattan@intel.com> Subject: [dpdk-dev] [PATCH 15/15] net/softnic: add parsing for raw flow item X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Added support for parsing raw flow item. flow_item_raw_preprocess() is added for the same. Signed-off-by: Cristian Dumitrescu Signed-off-by: Reshma Pattan --- drivers/net/softnic/rte_eth_softnic_flow.c | 108 +++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c b/drivers/net/softnic/rte_eth_softnic_flow.c index da235ff7f..656200445 100644 --- a/drivers/net/softnic/rte_eth_softnic_flow.c +++ b/drivers/net/softnic/rte_eth_softnic_flow.c @@ -297,6 +297,106 @@ flow_item_is_proto(enum rte_flow_item_type type, } } +static int +flow_item_raw_preprocess(const struct rte_flow_item *item, + union flow_item *item_spec, + union flow_item *item_mask, + size_t *item_size, + int *item_disabled, + struct rte_flow_error *error) +{ + const struct rte_flow_item_raw *item_raw_spec = item->spec; + const struct rte_flow_item_raw *item_raw_mask = item->mask; + const uint8_t *pattern; + const uint8_t *pattern_mask; + uint8_t *spec = (uint8_t *)item_spec; + uint8_t *mask = (uint8_t *)item_mask; + size_t pattern_length, pattern_offset, i; + int disabled; + + if (!item->spec) + return rte_flow_error_set(error, + ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "RAW: Null specification"); + + if (item->last) + return rte_flow_error_set(error, + ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "RAW: Range not allowed (last must be NULL)"); + + if (item_raw_spec->relative == 0) + return rte_flow_error_set(error, + ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "RAW: Absolute offset not supported"); + + if (item_raw_spec->search) + return rte_flow_error_set(error, + ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "RAW: Search not supported"); + + if (item_raw_spec->offset < 0) + return rte_flow_error_set(error, + ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, + item, + "RAW: Negative offset not supported"); + + if (item_raw_spec->length == 0) + return rte_flow_error_set(error, + ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "RAW: Zero pattern length"); + + if (item_raw_spec->offset + item_raw_spec->length > + TABLE_RULE_MATCH_SIZE_MAX) + return rte_flow_error_set(error, + ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "RAW: Item too big"); + + if (!item_raw_spec->pattern && item_raw_mask && item_raw_mask->pattern) + return rte_flow_error_set(error, + ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "RAW: Non-NULL pattern mask not allowed with NULL pattern"); + + pattern = item_raw_spec->pattern; + pattern_mask = (item_raw_mask) ? item_raw_mask->pattern : NULL; + pattern_length = (size_t)item_raw_spec->length; + pattern_offset = (size_t)item_raw_spec->offset; + + disabled = 0; + if (pattern_mask == NULL) + disabled = 1; + else + for (i = 0; i < pattern_length; i++) + if ((pattern)[i]) + disabled = 1; + + memset(spec, 0, TABLE_RULE_MATCH_SIZE_MAX); + if (pattern) + memcpy(&spec[pattern_offset], pattern, pattern_length); + + memset(mask, 0, TABLE_RULE_MATCH_SIZE_MAX); + if (pattern_mask) + memcpy(&mask[pattern_offset], pattern_mask, pattern_length); + + *item_size = pattern_offset + pattern_length; + *item_disabled = disabled; + + return 0; +} + static int flow_item_proto_preprocess(const struct rte_flow_item *item, union flow_item *item_spec, @@ -317,6 +417,14 @@ flow_item_proto_preprocess(const struct rte_flow_item *item, item, "Item type not supported"); + if (item->type == RTE_FLOW_ITEM_TYPE_RAW) + return flow_item_raw_preprocess(item, + item_spec, + item_mask, + item_size, + item_disabled, + error); + /* spec */ if (!item->spec) { /* If spec is NULL, then last and mask also have to be NULL. */