Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 68562,
    "url": "http://patchwork.dpdk.org/api/patches/68562/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1586962156-11179-6-git-send-email-venkatkumar.duvvuru@broadcom.com/",
    "project": {
        "id": 1,
        "url": "http://patchwork.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<1586962156-11179-6-git-send-email-venkatkumar.duvvuru@broadcom.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1586962156-11179-6-git-send-email-venkatkumar.duvvuru@broadcom.com",
    "date": "2020-04-15T14:49:10",
    "name": "[05/11] net/bnxt: aggregated ulp rte parser arguments to single structure",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "fa993556178a4446e0f6f3618eda57723ae9c11d",
    "submitter": {
        "id": 1635,
        "url": "http://patchwork.dpdk.org/api/people/1635/?format=api",
        "name": "Venkat Duvvuru",
        "email": "venkatkumar.duvvuru@broadcom.com"
    },
    "delegate": {
        "id": 1766,
        "url": "http://patchwork.dpdk.org/api/users/1766/?format=api",
        "username": "ajitkhaparde",
        "first_name": "Ajit",
        "last_name": "Khaparde",
        "email": "ajit.khaparde@broadcom.com"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1586962156-11179-6-git-send-email-venkatkumar.duvvuru@broadcom.com/mbox/",
    "series": [
        {
            "id": 9397,
            "url": "http://patchwork.dpdk.org/api/series/9397/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=9397",
            "date": "2020-04-15T14:49:05",
            "name": "enhancements to host based flow table management",
            "version": 1,
            "mbox": "http://patchwork.dpdk.org/series/9397/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/68562/comments/",
    "check": "fail",
    "checks": "http://patchwork.dpdk.org/api/patches/68562/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8D352A0563;\n\tWed, 15 Apr 2020 16:51:17 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id C88681D910;\n\tWed, 15 Apr 2020 16:50:39 +0200 (CEST)",
            "from mail-pg1-f179.google.com (mail-pg1-f179.google.com\n [209.85.215.179]) by dpdk.org (Postfix) with ESMTP id 57AD51D90F\n for <dev@dpdk.org>; Wed, 15 Apr 2020 16:50:38 +0200 (CEST)",
            "by mail-pg1-f179.google.com with SMTP id h69so7060pgc.8\n for <dev@dpdk.org>; Wed, 15 Apr 2020 07:50:38 -0700 (PDT)",
            "from S60.dhcp.broadcom.net ([192.19.234.250])\n by smtp.gmail.com with ESMTPSA id 11sm13767969pfz.91.2020.04.15.07.50.32\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Wed, 15 Apr 2020 07:50:34 -0700 (PDT)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com;\n s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references;\n bh=7XGcaXDn0oV5aHdpk0Ir3r4CMdqnxZ/mrjlOSa97f5o=;\n b=YqnElJfzZy5whQxG5Vv8AmLeZ19bH9madp5W4pHsGj9dELQJwG6CnmCUYJbtxAbOis\n eebSNVxgJmA13eAZKKoS06O/nvJERMpfMhRnhMLIBehvbuogY0CaBOf6cfNYQLqpYskr\n QGEfNrTc4lrOgJ5C2wr45XRxYHyG52m3zbqII=",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references;\n bh=7XGcaXDn0oV5aHdpk0Ir3r4CMdqnxZ/mrjlOSa97f5o=;\n b=NhPRGfNY0JgMpuuh1tQ6izuvwVL+h6/y3gkyHLJY8/br1gnZjCWr2nEbFJvfX6MgEp\n j7UorVYysayNBDz/7Zq8a85jSUcAhycnlYLsCeMKtB1NeLT8VyJxf9iJ6GK/pi7TSuoQ\n ZBVisvZv/qF3pHE3docc5POo66WYxZUsoDCfEui+WGCG+Lywxf0bg77aWFArIN+jXRLz\n 15PR1YU+s0Bojuyr0BE3HurKu5jhhfhY9hxqxARlNQ/fnYejex1r/4eBu26+0S/ErrIu\n oo3eJC7RQTE8+gRMC570xu6SJ6co3t3Ru/QSOcMhW7eXCYCLRDYL7sgHwNeknxyEUmsG\n Xvvw==",
        "X-Gm-Message-State": "AGi0PuZ+3BCPlPfst1VqsSTeRQr1vi+OK28WrCk74DcqDpYkCHgyAW46\n 1nMjDpz2ly6pp617BJiUaUCm70foN4BoI5VPpk3+wgl+bjRKATZV4OEO6UVfGyxROhouWTXuxde\n O9xypgswi9+vB9d90wvCVkfTsfEzRFx8kzLoUEZhAx6QV4lYlvx5qzbQk0006bhal6CXs",
        "X-Google-Smtp-Source": "\n APiQypK3vj0iMbbo/BUDnBNd9+e0FU1exrD72/uRH1KrR8YLJcQgOg9VGlJ55ireeDL7bS3hjkE9yQ==",
        "X-Received": "by 2002:a63:d00e:: with SMTP id z14mr901364pgf.125.1586962235459;\n Wed, 15 Apr 2020 07:50:35 -0700 (PDT)",
        "From": "Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>",
        "To": "dev@dpdk.org",
        "Cc": "Kishore Padmanabha <kishore.padmanabha@broadcom.com>,\n Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>",
        "Date": "Wed, 15 Apr 2020 20:19:10 +0530",
        "Message-Id": "\n <1586962156-11179-6-git-send-email-venkatkumar.duvvuru@broadcom.com>",
        "X-Mailer": "git-send-email 2.7.4",
        "In-Reply-To": "\n <1586962156-11179-1-git-send-email-venkatkumar.duvvuru@broadcom.com>",
        "References": "\n <1586962156-11179-1-git-send-email-venkatkumar.duvvuru@broadcom.com>",
        "Subject": "[dpdk-dev] [PATCH 05/11] net/bnxt: aggregated ulp rte parser\n\targuments to single structure",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\n\nThe changes are to the ulp rte parser, the API are changed\nto take the parser param structure instead of individual\nfields.\n\nReviewed-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nSigned-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c       |  75 +--\n drivers/net/bnxt/tf_ulp/ulp_matcher.c         |  20 +-\n drivers/net/bnxt/tf_ulp/ulp_matcher.h         |  12 +-\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.c      | 882 +++++++++++++-------------\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.h      | 150 ++---\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h |  42 +-\n 6 files changed, 560 insertions(+), 621 deletions(-)",
    "diff": "diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\nindex 6203a49..026f33f 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\n@@ -67,11 +67,7 @@ bnxt_ulp_flow_create(struct rte_eth_dev\t\t\t*dev,\n \t\t     const struct rte_flow_action\tactions[],\n \t\t     struct rte_flow_error\t\t*error)\n {\n-\tstruct ulp_rte_hdr_bitmap hdr_bitmap;\n-\tstruct ulp_rte_hdr_field hdr_field[BNXT_ULP_PROTO_HDR_MAX];\n-\tstruct ulp_rte_act_bitmap act_bitmap;\n-\tstruct ulp_rte_act_prop act_prop;\n-\tenum ulp_direction_type dir = ULP_DIR_INGRESS;\n+\tstruct ulp_rte_parser_params params;\n \tstruct bnxt_ulp_context *ulp_ctx = NULL;\n \tuint32_t class_id, act_tmpl;\n \tstruct rte_flow *flow_id;\n@@ -94,47 +90,38 @@ bnxt_ulp_flow_create(struct rte_eth_dev\t\t\t*dev,\n \t\treturn NULL;\n \t}\n \n-\t/* clear the header bitmap and field structure */\n-\tmemset(&hdr_bitmap, 0, sizeof(struct ulp_rte_hdr_bitmap));\n-\tmemset(hdr_field, 0, sizeof(hdr_field));\n-\tmemset(&act_bitmap, 0, sizeof(act_bitmap));\n-\tmemset(&act_prop, 0, sizeof(act_prop));\n+\t/* Initialize the parser params */\n+\tmemset(&params, 0, sizeof(struct ulp_rte_parser_params));\n \n \tif (attr->egress)\n-\t\tdir = ULP_DIR_EGRESS;\n+\t\tparams.dir = ULP_DIR_EGRESS;\n \n-\t/* copy the device port id and direction in svif for further process */\n-\tbuffer = hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec;\n+\t/* copy the device port id and direction for further processing */\n+\tbuffer = params.hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec;\n \trte_memcpy(buffer, &dev->data->port_id, sizeof(uint16_t));\n-\trte_memcpy(buffer + sizeof(uint16_t), &dir, sizeof(uint32_t));\n \n \t/* Set the implicit vnic in the action property */\n \tvnic = (uint32_t)bnxt_get_vnic_id(dev->data->port_id);\n \tvnic = htonl(vnic);\n-\trte_memcpy(&act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VNIC],\n+\trte_memcpy(&params.act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VNIC],\n \t\t   &vnic, BNXT_ULP_ACT_PROP_SZ_VNIC);\n \n \t/* Parse the rte flow pattern */\n-\tret = bnxt_ulp_rte_parser_hdr_parse(pattern,\n-\t\t\t\t\t    &hdr_bitmap,\n-\t\t\t\t\t    hdr_field);\n+\tret = bnxt_ulp_rte_parser_hdr_parse(pattern, &params);\n \tif (ret != BNXT_TF_RC_SUCCESS)\n \t\tgoto parse_error;\n \n \t/* Parse the rte flow action */\n-\tret = bnxt_ulp_rte_parser_act_parse(actions,\n-\t\t\t\t\t    &act_bitmap,\n-\t\t\t\t\t    &act_prop);\n+\tret = bnxt_ulp_rte_parser_act_parse(actions, &params);\n \tif (ret != BNXT_TF_RC_SUCCESS)\n \t\tgoto parse_error;\n \n-\tret = ulp_matcher_pattern_match(dir, &hdr_bitmap, hdr_field,\n-\t\t\t\t\t&act_bitmap, &class_id);\n+\tret = ulp_matcher_pattern_match(&params, &class_id);\n \n \tif (ret != BNXT_TF_RC_SUCCESS)\n \t\tgoto parse_error;\n \n-\tret = ulp_matcher_action_match(dir, &act_bitmap, &act_tmpl);\n+\tret = ulp_matcher_action_match(&params, &act_tmpl);\n \tif (ret != BNXT_TF_RC_SUCCESS)\n \t\tgoto parse_error;\n \n@@ -142,10 +129,10 @@ bnxt_ulp_flow_create(struct rte_eth_dev\t\t\t*dev,\n \t/* call the ulp mapper to create the flow in the hardware */\n \tret = ulp_mapper_flow_create(ulp_ctx,\n \t\t\t\t     app_priority,\n-\t\t\t\t     &hdr_bitmap,\n-\t\t\t\t     hdr_field,\n-\t\t\t\t     &act_bitmap,\n-\t\t\t\t     &act_prop,\n+\t\t\t\t     &params.hdr_bitmap,\n+\t\t\t\t     params.hdr_field,\n+\t\t\t\t     &params.act_bitmap,\n+\t\t\t\t     &params.act_prop,\n \t\t\t\t     class_id,\n \t\t\t\t     act_tmpl,\n \t\t\t\t     &fid);\n@@ -168,11 +155,7 @@ bnxt_ulp_flow_validate(struct rte_eth_dev *dev __rte_unused,\n \t\t       const struct rte_flow_action actions[],\n \t\t       struct rte_flow_error *error)\n {\n-\tstruct ulp_rte_hdr_bitmap hdr_bitmap;\n-\tstruct ulp_rte_hdr_field hdr_field[BNXT_ULP_PROTO_HDR_MAX];\n-\tstruct ulp_rte_act_bitmap act_bitmap;\n-\tstruct ulp_rte_act_prop act_prop;\n-\tenum ulp_direction_type dir = ULP_DIR_INGRESS;\n+\tstruct ulp_rte_parser_params\t\tparams;\n \tuint32_t class_id, act_tmpl;\n \tint ret;\n \n@@ -183,36 +166,28 @@ bnxt_ulp_flow_validate(struct rte_eth_dev *dev __rte_unused,\n \t\treturn -EINVAL;\n \t}\n \n-\t/* clear the header bitmap and field structure */\n-\tmemset(&hdr_bitmap, 0, sizeof(struct ulp_rte_hdr_bitmap));\n-\tmemset(hdr_field, 0, sizeof(hdr_field));\n-\tmemset(&act_bitmap, 0, sizeof(act_bitmap));\n-\tmemset(&act_prop, 0, sizeof(act_prop));\n+\t/* Initialize the parser params */\n+\tmemset(&params, 0, sizeof(struct ulp_rte_parser_params));\n+\n+\tif (attr->egress)\n+\t\tparams.dir = ULP_DIR_EGRESS;\n \n \t/* Parse the rte flow pattern */\n-\tret = bnxt_ulp_rte_parser_hdr_parse(pattern,\n-\t\t\t\t\t    &hdr_bitmap,\n-\t\t\t\t\t    hdr_field);\n+\tret = bnxt_ulp_rte_parser_hdr_parse(pattern, &params);\n \tif (ret != BNXT_TF_RC_SUCCESS)\n \t\tgoto parse_error;\n \n \t/* Parse the rte flow action */\n-\tret = bnxt_ulp_rte_parser_act_parse(actions,\n-\t\t\t\t\t    &act_bitmap,\n-\t\t\t\t\t    &act_prop);\n+\tret = bnxt_ulp_rte_parser_act_parse(actions, &params);\n \tif (ret != BNXT_TF_RC_SUCCESS)\n \t\tgoto parse_error;\n \n-\tif (attr->egress)\n-\t\tdir = ULP_DIR_EGRESS;\n-\n-\tret = ulp_matcher_pattern_match(dir, &hdr_bitmap, hdr_field,\n-\t\t\t\t\t&act_bitmap, &class_id);\n+\tret = ulp_matcher_pattern_match(&params, &class_id);\n \n \tif (ret != BNXT_TF_RC_SUCCESS)\n \t\tgoto parse_error;\n \n-\tret = ulp_matcher_action_match(dir, &act_bitmap, &act_tmpl);\n+\tret = ulp_matcher_action_match(&params, &act_tmpl);\n \tif (ret != BNXT_TF_RC_SUCCESS)\n \t\tgoto parse_error;\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_matcher.c b/drivers/net/bnxt/tf_ulp/ulp_matcher.c\nindex ec4121d..e04bfa0 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_matcher.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_matcher.c\n@@ -67,11 +67,8 @@ ulp_matcher_hdr_fields_normalize(struct ulp_rte_hdr_bitmap *hdr1,\n  * the pattern masks against the flow templates.\n  */\n int32_t\n-ulp_matcher_pattern_match(enum ulp_direction_type   dir,\n-\t\t\t  struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\t  struct ulp_rte_hdr_field  *hdr_field,\n-\t\t\t  struct ulp_rte_act_bitmap *act_bitmap,\n-\t\t\t  uint32_t\t\t    *class_id)\n+ulp_matcher_pattern_match(struct ulp_rte_parser_params *params,\n+\t\t\t  uint32_t *class_id)\n {\n \tstruct bnxt_ulp_header_match_info\t*sel_hdr_match;\n \tuint32_t\t\t\t\thdr_num, idx, jdx;\n@@ -80,9 +77,12 @@ ulp_matcher_pattern_match(enum ulp_direction_type   dir,\n \tuint32_t\t\t\t\tstart_idx;\n \tstruct ulp_rte_hdr_field\t\t*m_field;\n \tstruct bnxt_ulp_matcher_field_info\t*sf;\n+\tstruct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;\n+\tstruct ulp_rte_act_bitmap *act_bitmap = &params->act_bitmap;\n+\tstruct ulp_rte_hdr_field *hdr_field = params->hdr_field;\n \n \t/* Select the ingress or egress template to match against */\n-\tif (dir == ULP_DIR_INGRESS) {\n+\tif (params->dir == ULP_DIR_INGRESS) {\n \t\tsel_hdr_match = ulp_ingress_hdr_match_list;\n \t\thdr_num = BNXT_ULP_INGRESS_HDR_MATCH_SZ;\n \t} else {\n@@ -156,15 +156,15 @@ ulp_matcher_pattern_match(enum ulp_direction_type   dir,\n  * the action against the flow templates.\n  */\n int32_t\n-ulp_matcher_action_match(enum ulp_direction_type\t\tdir,\n-\t\t\t struct ulp_rte_act_bitmap\t\t*act_bitmap,\n-\t\t\t uint32_t\t\t\t\t*act_id)\n+ulp_matcher_action_match(struct ulp_rte_parser_params *params,\n+\t\t\t uint32_t *act_id)\n {\n \tstruct bnxt_ulp_action_match_info\t*sel_act_match;\n \tuint32_t\t\t\t\tact_num, idx;\n+\tstruct ulp_rte_act_bitmap *act_bitmap = &params->act_bitmap;\n \n \t/* Select the ingress or egress template to match against */\n-\tif (dir == ULP_DIR_INGRESS) {\n+\tif (params->dir == ULP_DIR_INGRESS) {\n \t\tsel_act_match = ulp_ingress_act_match_list;\n \t\tact_num = BNXT_ULP_INGRESS_ACT_MATCH_SZ;\n \t} else {\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_matcher.h b/drivers/net/bnxt/tf_ulp/ulp_matcher.h\nindex c818bbe..fc19783 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_matcher.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_matcher.h\n@@ -17,19 +17,15 @@\n  * the pattern masks against the flow templates.\n  */\n int32_t\n-ulp_matcher_pattern_match(enum ulp_direction_type\t    dir,\n-\t\t\t  struct ulp_rte_hdr_bitmap\t   *hdr_bitmap,\n-\t\t\t  struct ulp_rte_hdr_field\t   *hdr_field,\n-\t\t\t  struct ulp_rte_act_bitmap\t   *act_bitmap,\n-\t\t\t  uint32_t\t\t\t   *class_id);\n+ulp_matcher_pattern_match(struct ulp_rte_parser_params *params,\n+\t\t\t  uint32_t *class_id);\n \n /*\n  * Function to handle the matching of RTE Flows and validating\n  * the action against the flow templates.\n  */\n int32_t\n-ulp_matcher_action_match(enum ulp_direction_type\tdir,\n-\t\t\t struct ulp_rte_act_bitmap\t*act_bitmap,\n-\t\t\t uint32_t\t\t\t*act_id);\n+ulp_matcher_action_match(struct ulp_rte_parser_params *params,\n+\t\t\t uint32_t *act_id);\n \n #endif /* ULP_MATCHER_H_ */\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\nindex 4339032..2980e03 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n@@ -45,39 +45,56 @@ ulp_rte_item_skip_void(const struct rte_flow_item **item, uint32_t increment)\n \treturn 0;\n }\n \n+/* Utility function to copy field spec items */\n+static struct ulp_rte_hdr_field *\n+ulp_rte_parser_fld_copy(struct ulp_rte_hdr_field *field,\n+\t\t\tconst void *buffer,\n+\t\t\tuint32_t size)\n+{\n+\tfield->size = size;\n+\tmemcpy(field->spec, buffer, field->size);\n+\tfield++;\n+\treturn field;\n+}\n+\n+/* Utility function to copy field masks items */\n+static void\n+ulp_rte_prsr_mask_copy(struct ulp_rte_parser_params *params,\n+\t\t       uint32_t *idx,\n+\t\t       const void *buffer,\n+\t\t       uint32_t size)\n+{\n+\tstruct ulp_rte_hdr_field\t*field = &params->hdr_field[*idx];\n+\n+\tmemcpy(field->mask, buffer, size);\n+\t*idx = *idx + 1;\n+}\n+\n /*\n  * Function to handle the parsing of RTE Flows and placing\n  * the RTE flow items into the ulp structures.\n  */\n int32_t\n bnxt_ulp_rte_parser_hdr_parse(const struct rte_flow_item pattern[],\n-\t\t\t      struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\t      struct ulp_rte_hdr_field *hdr_field)\n+\t\t\t      struct ulp_rte_parser_params *params)\n {\n \tconst struct rte_flow_item *item = pattern;\n-\tuint32_t field_idx = BNXT_ULP_HDR_FIELD_LAST;\n-\tuint32_t vlan_idx = 0;\n \tstruct bnxt_ulp_rte_hdr_info *hdr_info;\n \n+\tparams->field_idx = BNXT_ULP_HDR_FIELD_LAST;\n \t/* Parse all the items in the pattern */\n \twhile (item && item->type != RTE_FLOW_ITEM_TYPE_END) {\n \t\t/* get the header information from the flow_hdr_info table */\n \t\thdr_info = &ulp_hdr_info[item->type];\n-\t\tif (hdr_info->hdr_type ==\n-\t\t    BNXT_ULP_HDR_TYPE_NOT_SUPPORTED) {\n+\t\tif (hdr_info->hdr_type == BNXT_ULP_HDR_TYPE_NOT_SUPPORTED) {\n \t\t\tBNXT_TF_DBG(ERR,\n \t\t\t\t    \"Truflow parser does not support type %d\\n\",\n \t\t\t\t    item->type);\n \t\t\treturn BNXT_TF_RC_PARSE_ERR;\n-\t\t} else if (hdr_info->hdr_type ==\n-\t\t\t   BNXT_ULP_HDR_TYPE_SUPPORTED) {\n+\t\t} else if (hdr_info->hdr_type == BNXT_ULP_HDR_TYPE_SUPPORTED) {\n \t\t\t/* call the registered callback handler */\n \t\t\tif (hdr_info->proto_hdr_func) {\n-\t\t\t\tif (hdr_info->proto_hdr_func(item,\n-\t\t\t\t\t\t\t     hdr_bitmap,\n-\t\t\t\t\t\t\t     hdr_field,\n-\t\t\t\t\t\t\t     &field_idx,\n-\t\t\t\t\t\t\t     &vlan_idx) !=\n+\t\t\t\tif (hdr_info->proto_hdr_func(item, params) !=\n \t\t\t\t    BNXT_TF_RC_SUCCESS) {\n \t\t\t\t\treturn BNXT_TF_RC_ERROR;\n \t\t\t\t}\n@@ -86,7 +103,7 @@ bnxt_ulp_rte_parser_hdr_parse(const struct rte_flow_item pattern[],\n \t\titem++;\n \t}\n \t/* update the implied SVIF */\n-\t(void)ulp_rte_parser_svif_process(hdr_bitmap, hdr_field);\n+\t(void)ulp_rte_parser_svif_process(params);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n@@ -96,8 +113,7 @@ bnxt_ulp_rte_parser_hdr_parse(const struct rte_flow_item pattern[],\n  */\n int32_t\n bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action actions[],\n-\t\t\t      struct ulp_rte_act_bitmap *act_bitmap,\n-\t\t\t      struct ulp_rte_act_prop *act_prop)\n+\t\t\t      struct ulp_rte_parser_params *params)\n {\n \tconst struct rte_flow_action *action_item = actions;\n \tstruct bnxt_ulp_rte_act_info *hdr_info;\n@@ -117,8 +133,7 @@ bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action actions[],\n \t\t\t/* call the registered callback handler */\n \t\t\tif (hdr_info->proto_act_func) {\n \t\t\t\tif (hdr_info->proto_act_func(action_item,\n-\t\t\t\t\t\t\t     act_bitmap,\n-\t\t\t\t\t\t\t     act_prop) !=\n+\t\t\t\t\t\t\t     params) !=\n \t\t\t\t    BNXT_TF_RC_SUCCESS) {\n \t\t\t\t\treturn BNXT_TF_RC_ERROR;\n \t\t\t\t}\n@@ -131,16 +146,15 @@ bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action actions[],\n \n /* Function to handle the parsing of RTE Flow item PF Header. */\n static int32_t\n-ulp_rte_parser_svif_set(struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\tstruct ulp_rte_hdr_field *hdr_field,\n+ulp_rte_parser_svif_set(struct ulp_rte_parser_params *params,\n \t\t\tenum rte_flow_item_type proto,\n-\t\t\tuint32_t dir,\n \t\t\tuint16_t svif,\n \t\t\tuint16_t mask)\n {\n \tuint16_t port_id = svif;\n+\tuint32_t dir = 0;\n \n-\tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_SVIF)) {\n+\tif (ULP_BITMAP_ISSET(params->hdr_bitmap.bits, BNXT_ULP_HDR_BIT_SVIF)) {\n \t\tBNXT_TF_DBG(ERR,\n \t\t\t    \"SVIF already set,\"\n \t\t\t    \" multiple sources not supported\\n\");\n@@ -148,116 +162,91 @@ ulp_rte_parser_svif_set(struct ulp_rte_hdr_bitmap *hdr_bitmap,\n \t}\n \n \t/* Update the hdr_bitmap with BNXT_ULP_HDR_PROTO_SVIF. */\n-\tULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_SVIF);\n+\tULP_BITMAP_SET(params->hdr_bitmap.bits, BNXT_ULP_HDR_BIT_SVIF);\n \n \tif (proto == RTE_FLOW_ITEM_TYPE_PORT_ID) {\n \t\t/* perform the conversion from dpdk port to svif */\n+\t\tdir = params->dir;\n \t\tif (dir == ULP_DIR_EGRESS)\n \t\t\tsvif = bnxt_get_svif(port_id, true);\n \t\telse\n \t\t\tsvif = bnxt_get_svif(port_id, false);\n \t}\n \n-\tmemcpy(hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec,\n+\tmemcpy(params->hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec,\n \t       &svif, sizeof(svif));\n-\tmemcpy(hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].mask,\n+\tmemcpy(params->hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].mask,\n \t       &mask, sizeof(mask));\n-\thdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].size = sizeof(svif);\n+\tparams->hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].size = sizeof(svif);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n /* Function to handle the parsing of the RTE port id\n  */\n int32_t\n-ulp_rte_parser_svif_process(struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\t    struct ulp_rte_hdr_field\t*hdr_field)\n+ulp_rte_parser_svif_process(struct ulp_rte_parser_params *params)\n {\n \tuint16_t port_id = 0;\n-\tuint32_t dir = 0;\n \tuint8_t\t*buffer;\n \tuint16_t svif_mask = 0xFFFF;\n \n-\tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_SVIF))\n+\tif (ULP_BITMAP_ISSET(params->hdr_bitmap.bits, BNXT_ULP_HDR_BIT_SVIF))\n \t\treturn BNXT_TF_RC_SUCCESS;\n \n \t/* SVIF not set. So get the port id and direction */\n-\tbuffer = hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec;\n+\tbuffer = params->hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec;\n \tmemcpy(&port_id, buffer, sizeof(port_id));\n-\tmemcpy(&dir, buffer + sizeof(port_id), sizeof(dir));\n-\tmemset(hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec, 0,\n-\t       RTE_PARSER_FLOW_HDR_FIELD_SIZE);\n+\tmemset(buffer, 0, RTE_PARSER_FLOW_HDR_FIELD_SIZE);\n \n-\treturn ulp_rte_parser_svif_set(hdr_bitmap, hdr_field,\n+\treturn ulp_rte_parser_svif_set(params,\n \t\t\t\t       RTE_FLOW_ITEM_TYPE_PORT_ID,\n-\t\t\t\t       dir, port_id, svif_mask);\n+\t\t\t\t       port_id, svif_mask);\n }\n \n /* Function to handle the parsing of RTE Flow item PF Header. */\n int32_t\n ulp_rte_pf_hdr_handler(const struct rte_flow_item *item,\n-\t\t       struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t       struct ulp_rte_hdr_field *hdr_field,\n-\t\t       uint32_t *field_idx __rte_unused,\n-\t\t       uint32_t *vlan_idx __rte_unused)\n+\t\t       struct ulp_rte_parser_params *params)\n {\n \tuint16_t port_id = 0;\n-\tuint32_t dir = 0;\n \tuint8_t\t*buffer;\n \tuint16_t svif_mask = 0xFFFF;\n \n-\tbuffer = hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec;\n+\tbuffer = params->hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec;\n \tmemcpy(&port_id, buffer, sizeof(port_id));\n-\tmemcpy(&dir, buffer + sizeof(port_id), sizeof(dir));\n-\tmemset(hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec, 0,\n-\t       RTE_PARSER_FLOW_HDR_FIELD_SIZE);\n+\tmemset(buffer, 0, RTE_PARSER_FLOW_HDR_FIELD_SIZE);\n \n-\treturn ulp_rte_parser_svif_set(hdr_bitmap, hdr_field,\n+\treturn ulp_rte_parser_svif_set(params,\n \t\t\t\t       item->type,\n-\t\t\t\t       dir, port_id, svif_mask);\n+\t\t\t\t       port_id, svif_mask);\n }\n \n /* Function to handle the parsing of RTE Flow item VF Header. */\n int32_t\n ulp_rte_vf_hdr_handler(const struct rte_flow_item *item,\n-\t\t       struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t       struct ulp_rte_hdr_field\t *hdr_field,\n-\t\t       uint32_t *field_idx __rte_unused,\n-\t\t       uint32_t *vlan_idx __rte_unused)\n+\t\t       struct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_vf *vf_spec, *vf_mask;\n+\tconst struct rte_flow_item_vf *vf_spec = item->spec;\n+\tconst struct rte_flow_item_vf *vf_mask = item->mask;\n \tuint16_t svif = 0, mask = 0;\n \n-\tvf_spec = item->spec;\n-\tvf_mask = item->mask;\n-\n-\t/*\n-\t * Copy the rte_flow_item for eth into hdr_field using ethernet\n-\t * header fields.\n-\t */\n+\t/* Get VF rte_flow_item for Port details */\n \tif (vf_spec)\n \t\tsvif = (uint16_t)vf_spec->id;\n \tif (vf_mask)\n \t\tmask = (uint16_t)vf_mask->id;\n \n-\treturn ulp_rte_parser_svif_set(hdr_bitmap, hdr_field,\n-\t\t\t\t       item->type, 0, svif, mask);\n+\treturn ulp_rte_parser_svif_set(params, item->type, svif, mask);\n }\n \n /* Function to handle the parsing of RTE Flow item port id  Header. */\n int32_t\n ulp_rte_port_id_hdr_handler(const struct rte_flow_item *item,\n-\t\t\t    struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\t    struct ulp_rte_hdr_field *hdr_field,\n-\t\t\t    uint32_t *field_idx __rte_unused,\n-\t\t\t    uint32_t *vlan_idx __rte_unused)\n+\t\t\t    struct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_port_id *port_spec, *port_mask;\n+\tconst struct rte_flow_item_port_id *port_spec = item->spec;\n+\tconst struct rte_flow_item_port_id *port_mask = item->mask;\n \tuint16_t svif = 0, mask = 0;\n-\tuint32_t dir;\n-\tuint8_t\t*buffer;\n-\n-\tport_spec = item->spec;\n-\tport_mask = item->mask;\n \n \t/*\n \t * Copy the rte_flow_item for Port into hdr_field using port id\n@@ -268,92 +257,82 @@ ulp_rte_port_id_hdr_handler(const struct rte_flow_item *item,\n \tif (port_mask)\n \t\tmask = (uint16_t)port_mask->id;\n \n-\tbuffer = hdr_field[BNXT_ULP_HDR_FIELD_SVIF_INDEX].spec;\n-\tmemcpy(&dir, buffer + sizeof(uint16_t), sizeof(uint16_t));\n-\n-\treturn ulp_rte_parser_svif_set(hdr_bitmap, hdr_field,\n-\t\t\t\t       item->type, dir, svif, mask);\n+\t/* Update the SVIF details */\n+\treturn ulp_rte_parser_svif_set(params, item->type, svif, mask);\n }\n \n /* Function to handle the parsing of RTE Flow item phy port Header. */\n int32_t\n ulp_rte_phy_port_hdr_handler(const struct rte_flow_item *item,\n-\t\t\t     struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\t     struct ulp_rte_hdr_field *hdr_field,\n-\t\t\t     uint32_t *field_idx __rte_unused,\n-\t\t\t     uint32_t *vlan_idx __rte_unused)\n+\t\t\t     struct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_phy_port *port_spec, *port_mask;\n+\tconst struct rte_flow_item_phy_port *port_spec = item->spec;\n+\tconst struct rte_flow_item_phy_port *port_mask = item->mask;\n \tuint32_t svif = 0, mask = 0;\n \n-\tport_spec = item->spec;\n-\tport_mask = item->mask;\n-\n \t/* Copy the rte_flow_item for phy port into hdr_field */\n \tif (port_spec)\n \t\tsvif = port_spec->index;\n \tif (port_mask)\n \t\tmask = port_mask->index;\n \n-\treturn ulp_rte_parser_svif_set(hdr_bitmap, hdr_field,\n-\t\t\t\t       item->type, 0, svif, mask);\n+\t/* Update the SVIF details */\n+\treturn ulp_rte_parser_svif_set(params, item->type, svif, mask);\n }\n \n /* Function to handle the parsing of RTE Flow item Ethernet Header. */\n int32_t\n ulp_rte_eth_hdr_handler(const struct rte_flow_item *item,\n-\t\t\tstruct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\tstruct ulp_rte_hdr_field *hdr_field,\n-\t\t\tuint32_t *field_idx,\n-\t\t\tuint32_t *vlan_idx)\n+\t\t\tstruct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_eth *eth_spec, *eth_mask;\n-\tuint32_t idx = *field_idx;\n-\tuint32_t mdx = *field_idx;\n+\tconst struct rte_flow_item_eth *eth_spec = item->spec;\n+\tconst struct rte_flow_item_eth *eth_mask = item->mask;\n+\tstruct ulp_rte_hdr_field *field;\n+\tuint32_t idx = params->field_idx;\n \tuint64_t set_flag = 0;\n-\n-\teth_spec = item->spec;\n-\teth_mask = item->mask;\n+\tuint32_t size;\n \n \t/*\n \t * Copy the rte_flow_item for eth into hdr_field using ethernet\n \t * header fields\n \t */\n \tif (eth_spec) {\n-\t\thdr_field[idx].size = sizeof(eth_spec->dst.addr_bytes);\n-\t\tmemcpy(hdr_field[idx++].spec, eth_spec->dst.addr_bytes,\n-\t\t       sizeof(eth_spec->dst.addr_bytes));\n-\t\thdr_field[idx].size = sizeof(eth_spec->src.addr_bytes);\n-\t\tmemcpy(hdr_field[idx++].spec, eth_spec->src.addr_bytes,\n-\t\t       sizeof(eth_spec->src.addr_bytes));\n-\t\thdr_field[idx].size = sizeof(eth_spec->type);\n-\t\tmemcpy(hdr_field[idx++].spec, &eth_spec->type,\n-\t\t       sizeof(eth_spec->type));\n-\t} else {\n-\t\tidx += BNXT_ULP_PROTO_HDR_ETH_NUM;\n+\t\tsize = sizeof(eth_spec->dst.addr_bytes);\n+\t\tfield = ulp_rte_parser_fld_copy(&params->hdr_field[idx],\n+\t\t\t\t\t\teth_spec->dst.addr_bytes,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(eth_spec->src.addr_bytes);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\teth_spec->src.addr_bytes,\n+\t\t\t\t\t\tsize);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&eth_spec->type,\n+\t\t\t\t\t\tsizeof(eth_spec->type));\n \t}\n-\n \tif (eth_mask) {\n-\t\tmemcpy(hdr_field[mdx++].mask, eth_mask->dst.addr_bytes,\n-\t\t       sizeof(eth_mask->dst.addr_bytes));\n-\t\tmemcpy(hdr_field[mdx++].mask, eth_mask->src.addr_bytes,\n-\t\t       sizeof(eth_mask->src.addr_bytes));\n-\t\tmemcpy(hdr_field[mdx++].mask, &eth_mask->type,\n-\t\t       sizeof(eth_mask->type));\n+\t\tulp_rte_prsr_mask_copy(params, &idx, eth_mask->dst.addr_bytes,\n+\t\t\t\t       sizeof(eth_mask->dst.addr_bytes));\n+\t\tulp_rte_prsr_mask_copy(params, &idx, eth_mask->src.addr_bytes,\n+\t\t\t\t       sizeof(eth_mask->src.addr_bytes));\n+\t\tulp_rte_prsr_mask_copy(params, &idx, &eth_mask->type,\n+\t\t\t\t       sizeof(eth_mask->type));\n \t}\n \t/* Add number of vlan header elements */\n-\t*field_idx = idx + BNXT_ULP_PROTO_HDR_VLAN_NUM;\n-\t*vlan_idx = idx;\n+\tparams->field_idx += BNXT_ULP_PROTO_HDR_ETH_NUM;\n+\tparams->vlan_idx = params->field_idx;\n+\tparams->field_idx += BNXT_ULP_PROTO_HDR_VLAN_NUM;\n \n \t/* Update the hdr_bitmap with BNXT_ULP_HDR_PROTO_I_ETH */\n-\tset_flag = ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_ETH);\n+\tset_flag = ULP_BITMAP_ISSET(params->hdr_bitmap.bits,\n+\t\t\t\t    BNXT_ULP_HDR_BIT_O_ETH);\n \tif (set_flag)\n-\t\tULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_ETH);\n+\t\tULP_BITMAP_SET(params->hdr_bitmap.bits, BNXT_ULP_HDR_BIT_I_ETH);\n \telse\n-\t\tULP_BITMAP_RESET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_ETH);\n+\t\tULP_BITMAP_RESET(params->hdr_bitmap.bits,\n+\t\t\t\t BNXT_ULP_HDR_BIT_I_ETH);\n \n \t/* update the hdr_bitmap with BNXT_ULP_HDR_PROTO_O_ETH */\n-\tULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_ETH);\n+\tULP_BITMAP_SET(params->hdr_bitmap.bits, BNXT_ULP_HDR_BIT_O_ETH);\n \n \treturn BNXT_TF_RC_SUCCESS;\n }\n@@ -361,23 +340,20 @@ ulp_rte_eth_hdr_handler(const struct rte_flow_item *item,\n /* Function to handle the parsing of RTE Flow item Vlan Header. */\n int32_t\n ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,\n-\t\t\t struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\t struct ulp_rte_hdr_field *hdr_field,\n-\t\t\t uint32_t *field_idx __rte_unused,\n-\t\t\t uint32_t *vlan_idx)\n+\t\t\t struct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_vlan *vlan_spec, *vlan_mask;\n-\tuint32_t idx = *vlan_idx;\n-\tuint32_t mdx = *vlan_idx;\n+\tconst struct rte_flow_item_vlan *vlan_spec = item->spec;\n+\tconst struct rte_flow_item_vlan *vlan_mask = item->mask;\n+\tstruct ulp_rte_hdr_field *field;\n+\tstruct ulp_rte_hdr_bitmap *hdr_bitmap;\n+\tuint32_t idx = params->vlan_idx;\n \tuint16_t vlan_tag, priority;\n \tuint32_t outer_vtag_num = 0, inner_vtag_num = 0;\n-\tuint8_t *outer_tag_buffer;\n-\tuint8_t *inner_tag_buffer;\n+\tuint8_t *outer_tag_buff;\n+\tuint8_t *inner_tag_buff;\n \n-\tvlan_spec = item->spec;\n-\tvlan_mask = item->mask;\n-\touter_tag_buffer = hdr_field[BNXT_ULP_HDR_FIELD_O_VTAG_NUM].spec;\n-\tinner_tag_buffer = hdr_field[BNXT_ULP_HDR_FIELD_I_VTAG_NUM].spec;\n+\touter_tag_buff = params->hdr_field[BNXT_ULP_HDR_FIELD_O_VTAG_NUM].spec;\n+\tinner_tag_buff = params->hdr_field[BNXT_ULP_HDR_FIELD_I_VTAG_NUM].spec;\n \n \t/*\n \t * Copy the rte_flow_item for vlan into hdr_field using Vlan\n@@ -389,15 +365,15 @@ ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,\n \t\tvlan_tag &= 0xfff;\n \t\tvlan_tag = htons(vlan_tag);\n \n-\t\thdr_field[idx].size = sizeof(priority);\n-\t\tmemcpy(hdr_field[idx++].spec, &priority, sizeof(priority));\n-\t\thdr_field[idx].size = sizeof(vlan_tag);\n-\t\tmemcpy(hdr_field[idx++].spec, &vlan_tag, sizeof(vlan_tag));\n-\t\thdr_field[idx].size = sizeof(vlan_spec->inner_type);\n-\t\tmemcpy(hdr_field[idx++].spec, &vlan_spec->inner_type,\n-\t\t       sizeof(vlan_spec->inner_type));\n-\t} else {\n-\t\tidx += BNXT_ULP_PROTO_HDR_S_VLAN_NUM;\n+\t\tfield = ulp_rte_parser_fld_copy(&params->hdr_field[idx],\n+\t\t\t\t\t\t&priority,\n+\t\t\t\t\t\tsizeof(priority));\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&vlan_tag,\n+\t\t\t\t\t\tsizeof(vlan_tag));\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&vlan_spec->inner_type,\n+\t\t\t\t\t\tsizeof(vlan_spec->inner_type));\n \t}\n \n \tif (vlan_mask) {\n@@ -406,26 +382,29 @@ ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,\n \t\tvlan_tag &= 0xfff;\n \t\tvlan_tag = htons(vlan_tag);\n \n-\t\tmemcpy(hdr_field[mdx++].mask, &priority, sizeof(priority));\n-\t\tmemcpy(hdr_field[mdx++].mask, &vlan_tag, sizeof(vlan_tag));\n-\t\tmemcpy(hdr_field[mdx++].mask, &vlan_mask->inner_type,\n-\t\t       sizeof(vlan_mask->inner_type));\n+\t\tfield = &params->hdr_field[idx];\n+\t\tmemcpy(field->mask, &priority, field->size);\n+\t\tfield++;\n+\t\tmemcpy(field->mask, &vlan_tag, field->size);\n+\t\tfield++;\n+\t\tmemcpy(field->mask, &vlan_mask->inner_type, field->size);\n \t}\n \t/* Set the vlan index to new incremented value */\n-\t*vlan_idx = idx;\n+\tparams->vlan_idx += BNXT_ULP_PROTO_HDR_S_VLAN_NUM;\n \n \t/* Get the outer tag and inner tag counts */\n-\tulp_util_field_int_read(outer_tag_buffer, &outer_vtag_num);\n-\tulp_util_field_int_read(inner_tag_buffer, &inner_vtag_num);\n+\tulp_util_field_int_read(outer_tag_buff, &outer_vtag_num);\n+\tulp_util_field_int_read(inner_tag_buff, &inner_vtag_num);\n \n \t/* Update the hdr_bitmap of the vlans */\n+\thdr_bitmap  = &params->hdr_bitmap;\n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_ETH) &&\n \t    !ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_OO_VLAN)) {\n \t\t/* Set the outer vlan bit and update the vlan tag num */\n \t\tULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_OO_VLAN);\n \t\touter_vtag_num++;\n-\t\tulp_util_field_int_write(outer_tag_buffer, outer_vtag_num);\n-\t\thdr_field[BNXT_ULP_HDR_FIELD_O_VTAG_NUM].size =\n+\t\tulp_util_field_int_write(outer_tag_buff, outer_vtag_num);\n+\t\tparams->hdr_field[BNXT_ULP_HDR_FIELD_O_VTAG_NUM].size =\n \t\t\t\t\t\t\tsizeof(uint32_t);\n \t} else if (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_ETH) &&\n \t\t   ULP_BITMAP_ISSET(hdr_bitmap->bits,\n@@ -435,8 +414,8 @@ ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,\n \t\t/* Set the outer vlan bit and update the vlan tag num */\n \t\tULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_OI_VLAN);\n \t\touter_vtag_num++;\n-\t\tulp_util_field_int_write(outer_tag_buffer, outer_vtag_num);\n-\t\thdr_field[BNXT_ULP_HDR_FIELD_O_VTAG_NUM].size =\n+\t\tulp_util_field_int_write(outer_tag_buff, outer_vtag_num);\n+\t\tparams->hdr_field[BNXT_ULP_HDR_FIELD_O_VTAG_NUM].size =\n \t\t\t\t\t\t\t    sizeof(uint32_t);\n \t} else if (ULP_BITMAP_ISSET(hdr_bitmap->bits,\n \t\t\t\t    BNXT_ULP_HDR_BIT_O_ETH) &&\n@@ -451,8 +430,8 @@ ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,\n \t\t/* Set the inner vlan bit and update the vlan tag num */\n \t\tULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_IO_VLAN);\n \t\tinner_vtag_num++;\n-\t\tulp_util_field_int_write(inner_tag_buffer, inner_vtag_num);\n-\t\thdr_field[BNXT_ULP_HDR_FIELD_I_VTAG_NUM].size =\n+\t\tulp_util_field_int_write(inner_tag_buff, inner_vtag_num);\n+\t\tparams->hdr_field[BNXT_ULP_HDR_FIELD_I_VTAG_NUM].size =\n \t\t\t\t\t\t\t    sizeof(uint32_t);\n \t} else if (ULP_BITMAP_ISSET(hdr_bitmap->bits,\n \t\t\t\t    BNXT_ULP_HDR_BIT_O_ETH) &&\n@@ -469,8 +448,8 @@ ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,\n \t\t/* Set the inner vlan bit and update the vlan tag num */\n \t\tULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_II_VLAN);\n \t\tinner_vtag_num++;\n-\t\tulp_util_field_int_write(inner_tag_buffer, inner_vtag_num);\n-\t\thdr_field[BNXT_ULP_HDR_FIELD_I_VTAG_NUM].size =\n+\t\tulp_util_field_int_write(inner_tag_buff, inner_vtag_num);\n+\t\tparams->hdr_field[BNXT_ULP_HDR_FIELD_I_VTAG_NUM].size =\n \t\t\t\t\t\t\t    sizeof(uint32_t);\n \t} else {\n \t\tBNXT_TF_DBG(ERR, \"Error Parsing:Vlan hdr found withtout eth\\n\");\n@@ -482,17 +461,14 @@ ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,\n /* Function to handle the parsing of RTE Flow item IPV4 Header. */\n int32_t\n ulp_rte_ipv4_hdr_handler(const struct rte_flow_item *item,\n-\t\t\t struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\t struct ulp_rte_hdr_field *hdr_field,\n-\t\t\t uint32_t *field_idx,\n-\t\t\t uint32_t *vlan_idx __rte_unused)\n+\t\t\t struct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_mask;\n-\tuint32_t idx = *field_idx;\n-\tuint32_t mdx = *field_idx;\n-\n-\tipv4_spec = item->spec;\n-\tipv4_mask = item->mask;\n+\tconst struct rte_flow_item_ipv4 *ipv4_spec = item->spec;\n+\tconst struct rte_flow_item_ipv4 *ipv4_mask = item->mask;\n+\tstruct ulp_rte_hdr_field *field;\n+\tstruct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;\n+\tuint32_t idx = params->field_idx;\n+\tuint32_t size;\n \n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_L3)) {\n \t\tBNXT_TF_DBG(ERR, \"Parse Error:Third L3 header not supported\\n\");\n@@ -504,63 +480,81 @@ ulp_rte_ipv4_hdr_handler(const struct rte_flow_item *item,\n \t * header fields\n \t */\n \tif (ipv4_spec) {\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.version_ihl);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.version_ihl,\n-\t\t       sizeof(ipv4_spec->hdr.version_ihl));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.type_of_service);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.type_of_service,\n-\t\t       sizeof(ipv4_spec->hdr.type_of_service));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.total_length);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.total_length,\n-\t\t       sizeof(ipv4_spec->hdr.total_length));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.packet_id);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.packet_id,\n-\t\t       sizeof(ipv4_spec->hdr.packet_id));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.fragment_offset);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.fragment_offset,\n-\t\t       sizeof(ipv4_spec->hdr.fragment_offset));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.time_to_live);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.time_to_live,\n-\t\t       sizeof(ipv4_spec->hdr.time_to_live));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.next_proto_id);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.next_proto_id,\n-\t\t       sizeof(ipv4_spec->hdr.next_proto_id));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.hdr_checksum);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.hdr_checksum,\n-\t\t       sizeof(ipv4_spec->hdr.hdr_checksum));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.src_addr);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.src_addr,\n-\t\t       sizeof(ipv4_spec->hdr.src_addr));\n-\t\thdr_field[idx].size = sizeof(ipv4_spec->hdr.dst_addr);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv4_spec->hdr.dst_addr,\n-\t\t       sizeof(ipv4_spec->hdr.dst_addr));\n-\t} else {\n-\t\tidx += BNXT_ULP_PROTO_HDR_IPV4_NUM;\n+\t\tsize = sizeof(ipv4_spec->hdr.version_ihl);\n+\t\tfield = ulp_rte_parser_fld_copy(&params->hdr_field[idx],\n+\t\t\t\t\t\t&ipv4_spec->hdr.version_ihl,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.type_of_service);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.type_of_service,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.total_length);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.total_length,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.packet_id);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.packet_id,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.fragment_offset);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.fragment_offset,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.time_to_live);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.time_to_live,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.next_proto_id);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.next_proto_id,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.hdr_checksum);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.hdr_checksum,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.src_addr);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.src_addr,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv4_spec->hdr.dst_addr);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv4_spec->hdr.dst_addr,\n+\t\t\t\t\t\tsize);\n \t}\n-\n \tif (ipv4_mask) {\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.version_ihl,\n-\t\t       sizeof(ipv4_mask->hdr.version_ihl));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.type_of_service,\n-\t\t       sizeof(ipv4_mask->hdr.type_of_service));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.total_length,\n-\t\t       sizeof(ipv4_mask->hdr.total_length));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.packet_id,\n-\t\t       sizeof(ipv4_mask->hdr.packet_id));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.fragment_offset,\n-\t\t       sizeof(ipv4_mask->hdr.fragment_offset));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.time_to_live,\n-\t\t       sizeof(ipv4_mask->hdr.time_to_live));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.next_proto_id,\n-\t\t       sizeof(ipv4_mask->hdr.next_proto_id));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.hdr_checksum,\n-\t\t       sizeof(ipv4_mask->hdr.hdr_checksum));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.src_addr,\n-\t\t       sizeof(ipv4_mask->hdr.src_addr));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv4_mask->hdr.dst_addr,\n-\t\t       sizeof(ipv4_mask->hdr.dst_addr));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.version_ihl,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.version_ihl));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.type_of_service,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.type_of_service));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.total_length,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.total_length));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.packet_id,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.packet_id));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.fragment_offset,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.fragment_offset));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.time_to_live,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.time_to_live));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.next_proto_id,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.next_proto_id));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.hdr_checksum,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.hdr_checksum));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.src_addr,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.src_addr));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv4_mask->hdr.dst_addr,\n+\t\t\t\t       sizeof(ipv4_mask->hdr.dst_addr));\n \t}\n-\t*field_idx = idx; /* Number of ipv4 header elements */\n+\t/* Add the number of ipv4 header elements */\n+\tparams->field_idx += BNXT_ULP_PROTO_HDR_IPV4_NUM;\n \n \t/* Set the ipv4 header bitmap and computed l3 header bitmaps */\n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_L3) ||\n@@ -578,17 +572,14 @@ ulp_rte_ipv4_hdr_handler(const struct rte_flow_item *item,\n /* Function to handle the parsing of RTE Flow item IPV6 Header */\n int32_t\n ulp_rte_ipv6_hdr_handler(const struct rte_flow_item *item,\n-\t\t\t struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\t struct ulp_rte_hdr_field *hdr_field,\n-\t\t\t uint32_t *field_idx,\n-\t\t\t uint32_t *vlan_idx __rte_unused)\n+\t\t\t struct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask;\n-\tuint32_t idx = *field_idx;\n-\tuint32_t mdx = *field_idx;\n-\n-\tipv6_spec = item->spec;\n-\tipv6_mask = item->mask;\n+\tconst struct rte_flow_item_ipv6\t*ipv6_spec = item->spec;\n+\tconst struct rte_flow_item_ipv6\t*ipv6_mask = item->mask;\n+\tstruct ulp_rte_hdr_field *field;\n+\tstruct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;\n+\tuint32_t idx = params->field_idx;\n+\tuint32_t size;\n \n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_L3)) {\n \t\tBNXT_TF_DBG(ERR, \"Parse Error: 3'rd L3 header not supported\\n\");\n@@ -600,43 +591,53 @@ ulp_rte_ipv6_hdr_handler(const struct rte_flow_item *item,\n \t * header fields\n \t */\n \tif (ipv6_spec) {\n-\t\thdr_field[idx].size = sizeof(ipv6_spec->hdr.vtc_flow);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv6_spec->hdr.vtc_flow,\n-\t\t       sizeof(ipv6_spec->hdr.vtc_flow));\n-\t\thdr_field[idx].size = sizeof(ipv6_spec->hdr.payload_len);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv6_spec->hdr.payload_len,\n-\t\t       sizeof(ipv6_spec->hdr.payload_len));\n-\t\thdr_field[idx].size = sizeof(ipv6_spec->hdr.proto);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv6_spec->hdr.proto,\n-\t\t       sizeof(ipv6_spec->hdr.proto));\n-\t\thdr_field[idx].size = sizeof(ipv6_spec->hdr.hop_limits);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv6_spec->hdr.hop_limits,\n-\t\t       sizeof(ipv6_spec->hdr.hop_limits));\n-\t\thdr_field[idx].size = sizeof(ipv6_spec->hdr.src_addr);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv6_spec->hdr.src_addr,\n-\t\t       sizeof(ipv6_spec->hdr.src_addr));\n-\t\thdr_field[idx].size = sizeof(ipv6_spec->hdr.dst_addr);\n-\t\tmemcpy(hdr_field[idx++].spec, &ipv6_spec->hdr.dst_addr,\n-\t\t       sizeof(ipv6_spec->hdr.dst_addr));\n-\t} else {\n-\t\tidx += BNXT_ULP_PROTO_HDR_IPV6_NUM;\n+\t\tsize = sizeof(ipv6_spec->hdr.vtc_flow);\n+\t\tfield = ulp_rte_parser_fld_copy(&params->hdr_field[idx],\n+\t\t\t\t\t\t&ipv6_spec->hdr.vtc_flow,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv6_spec->hdr.payload_len);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv6_spec->hdr.payload_len,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv6_spec->hdr.proto);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv6_spec->hdr.proto,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv6_spec->hdr.hop_limits);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv6_spec->hdr.hop_limits,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv6_spec->hdr.src_addr);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv6_spec->hdr.src_addr,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(ipv6_spec->hdr.dst_addr);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&ipv6_spec->hdr.dst_addr,\n+\t\t\t\t\t\tsize);\n \t}\n-\n \tif (ipv6_mask) {\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv6_mask->hdr.vtc_flow,\n-\t\t       sizeof(ipv6_mask->hdr.vtc_flow));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv6_mask->hdr.payload_len,\n-\t\t       sizeof(ipv6_mask->hdr.payload_len));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv6_mask->hdr.proto,\n-\t\t       sizeof(ipv6_mask->hdr.proto));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv6_mask->hdr.hop_limits,\n-\t\t       sizeof(ipv6_mask->hdr.hop_limits));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv6_mask->hdr.src_addr,\n-\t\t       sizeof(ipv6_mask->hdr.src_addr));\n-\t\tmemcpy(hdr_field[mdx++].mask, &ipv6_mask->hdr.dst_addr,\n-\t\t       sizeof(ipv6_mask->hdr.dst_addr));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv6_mask->hdr.vtc_flow,\n+\t\t\t\t       sizeof(ipv6_mask->hdr.vtc_flow));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv6_mask->hdr.payload_len,\n+\t\t\t\t       sizeof(ipv6_mask->hdr.payload_len));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv6_mask->hdr.proto,\n+\t\t\t\t       sizeof(ipv6_mask->hdr.proto));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv6_mask->hdr.hop_limits,\n+\t\t\t\t       sizeof(ipv6_mask->hdr.hop_limits));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv6_mask->hdr.src_addr,\n+\t\t\t\t       sizeof(ipv6_mask->hdr.src_addr));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &ipv6_mask->hdr.dst_addr,\n+\t\t\t\t       sizeof(ipv6_mask->hdr.dst_addr));\n \t}\n-\t*field_idx = idx; /* add number of ipv6 header elements */\n+\t/* add number of ipv6 header elements */\n+\tparams->field_idx += BNXT_ULP_PROTO_HDR_IPV6_NUM;\n \n \t/* Set the ipv6 header bitmap and computed l3 header bitmaps */\n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_L3) ||\n@@ -654,17 +655,14 @@ ulp_rte_ipv6_hdr_handler(const struct rte_flow_item *item,\n /* Function to handle the parsing of RTE Flow item UDP Header. */\n int32_t\n ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,\n-\t\t\tstruct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\tstruct ulp_rte_hdr_field *hdr_field,\n-\t\t\tuint32_t *field_idx,\n-\t\t\tuint32_t *vlan_idx __rte_unused)\n+\t\t\tstruct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_udp *udp_spec, *udp_mask;\n-\tuint32_t idx = *field_idx;\n-\tuint32_t mdx = *field_idx;\n-\n-\tudp_spec = item->spec;\n-\tudp_mask = item->mask;\n+\tconst struct rte_flow_item_udp *udp_spec = item->spec;\n+\tconst struct rte_flow_item_udp *udp_mask = item->mask;\n+\tstruct ulp_rte_hdr_field *field;\n+\tstruct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;\n+\tuint32_t idx = params->field_idx;\n+\tuint32_t size;\n \n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_L4)) {\n \t\tBNXT_TF_DBG(ERR, \"Parse Err:Third L4 header not supported\\n\");\n@@ -676,33 +674,40 @@ ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,\n \t * header fields\n \t */\n \tif (udp_spec) {\n-\t\thdr_field[idx].size = sizeof(udp_spec->hdr.src_port);\n-\t\tmemcpy(hdr_field[idx++].spec, &udp_spec->hdr.src_port,\n-\t\t       sizeof(udp_spec->hdr.src_port));\n-\t\thdr_field[idx].size = sizeof(udp_spec->hdr.dst_port);\n-\t\tmemcpy(hdr_field[idx++].spec, &udp_spec->hdr.dst_port,\n-\t\t       sizeof(udp_spec->hdr.dst_port));\n-\t\thdr_field[idx].size = sizeof(udp_spec->hdr.dgram_len);\n-\t\tmemcpy(hdr_field[idx++].spec, &udp_spec->hdr.dgram_len,\n-\t\t       sizeof(udp_spec->hdr.dgram_len));\n-\t\thdr_field[idx].size = sizeof(udp_spec->hdr.dgram_cksum);\n-\t\tmemcpy(hdr_field[idx++].spec, &udp_spec->hdr.dgram_cksum,\n-\t\t       sizeof(udp_spec->hdr.dgram_cksum));\n-\t} else {\n-\t\tidx += BNXT_ULP_PROTO_HDR_UDP_NUM;\n+\t\tsize = sizeof(udp_spec->hdr.src_port);\n+\t\tfield = ulp_rte_parser_fld_copy(&params->hdr_field[idx],\n+\t\t\t\t\t\t&udp_spec->hdr.src_port,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(udp_spec->hdr.dst_port);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&udp_spec->hdr.dst_port,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(udp_spec->hdr.dgram_len);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&udp_spec->hdr.dgram_len,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(udp_spec->hdr.dgram_cksum);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&udp_spec->hdr.dgram_cksum,\n+\t\t\t\t\t\tsize);\n \t}\n-\n \tif (udp_mask) {\n-\t\tmemcpy(hdr_field[mdx++].mask, &udp_mask->hdr.src_port,\n-\t\t       sizeof(udp_mask->hdr.src_port));\n-\t\tmemcpy(hdr_field[mdx++].mask, &udp_mask->hdr.dst_port,\n-\t\t       sizeof(udp_mask->hdr.dst_port));\n-\t\tmemcpy(hdr_field[mdx++].mask, &udp_mask->hdr.dgram_len,\n-\t\t       sizeof(udp_mask->hdr.dgram_len));\n-\t\tmemcpy(hdr_field[mdx++].mask, &udp_mask->hdr.dgram_cksum,\n-\t\t       sizeof(udp_mask->hdr.dgram_cksum));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &udp_mask->hdr.src_port,\n+\t\t\t\t       sizeof(udp_mask->hdr.src_port));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &udp_mask->hdr.dst_port,\n+\t\t\t\t       sizeof(udp_mask->hdr.dst_port));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &udp_mask->hdr.dgram_len,\n+\t\t\t\t       sizeof(udp_mask->hdr.dgram_len));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &udp_mask->hdr.dgram_cksum,\n+\t\t\t\t       sizeof(udp_mask->hdr.dgram_cksum));\n \t}\n-\t*field_idx = idx; /* Add number of UDP header elements */\n+\n+\t/* Add number of UDP header elements */\n+\tparams->field_idx += BNXT_ULP_PROTO_HDR_UDP_NUM;\n \n \t/* Set the udp header bitmap and computed l4 header bitmaps */\n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_L4) ||\n@@ -720,17 +725,14 @@ ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,\n /* Function to handle the parsing of RTE Flow item TCP Header. */\n int32_t\n ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,\n-\t\t\tstruct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\tstruct ulp_rte_hdr_field *hdr_field,\n-\t\t\tuint32_t *field_idx,\n-\t\t\tuint32_t *vlan_idx __rte_unused)\n+\t\t\tstruct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_tcp *tcp_spec, *tcp_mask;\n-\tuint32_t idx = *field_idx;\n-\tuint32_t mdx = *field_idx;\n-\n-\ttcp_spec = item->spec;\n-\ttcp_mask = item->mask;\n+\tconst struct rte_flow_item_tcp *tcp_spec = item->spec;\n+\tconst struct rte_flow_item_tcp *tcp_mask = item->mask;\n+\tstruct ulp_rte_hdr_field *field;\n+\tstruct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;\n+\tuint32_t idx = params->field_idx;\n+\tuint32_t size;\n \n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_L4)) {\n \t\tBNXT_TF_DBG(ERR, \"Parse Error:Third L4 header not supported\\n\");\n@@ -742,58 +744,77 @@ ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,\n \t * header fields\n \t */\n \tif (tcp_spec) {\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.src_port);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.src_port,\n-\t\t       sizeof(tcp_spec->hdr.src_port));\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.dst_port);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.dst_port,\n-\t\t       sizeof(tcp_spec->hdr.dst_port));\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.sent_seq);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.sent_seq,\n-\t\t       sizeof(tcp_spec->hdr.sent_seq));\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.recv_ack);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.recv_ack,\n-\t\t       sizeof(tcp_spec->hdr.recv_ack));\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.data_off);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.data_off,\n-\t\t       sizeof(tcp_spec->hdr.data_off));\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.tcp_flags);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.tcp_flags,\n-\t\t       sizeof(tcp_spec->hdr.tcp_flags));\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.rx_win);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.rx_win,\n-\t\t       sizeof(tcp_spec->hdr.rx_win));\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.cksum);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.cksum,\n-\t\t       sizeof(tcp_spec->hdr.cksum));\n-\t\thdr_field[idx].size = sizeof(tcp_spec->hdr.tcp_urp);\n-\t\tmemcpy(hdr_field[idx++].spec, &tcp_spec->hdr.tcp_urp,\n-\t\t       sizeof(tcp_spec->hdr.tcp_urp));\n+\t\tsize = sizeof(tcp_spec->hdr.src_port);\n+\t\tfield = ulp_rte_parser_fld_copy(&params->hdr_field[idx],\n+\t\t\t\t\t\t&tcp_spec->hdr.src_port,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(tcp_spec->hdr.dst_port);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&tcp_spec->hdr.dst_port,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(tcp_spec->hdr.sent_seq);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&tcp_spec->hdr.sent_seq,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(tcp_spec->hdr.recv_ack);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&tcp_spec->hdr.recv_ack,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(tcp_spec->hdr.data_off);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&tcp_spec->hdr.data_off,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(tcp_spec->hdr.tcp_flags);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&tcp_spec->hdr.tcp_flags,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(tcp_spec->hdr.rx_win);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&tcp_spec->hdr.rx_win,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(tcp_spec->hdr.cksum);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&tcp_spec->hdr.cksum,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(tcp_spec->hdr.tcp_urp);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&tcp_spec->hdr.tcp_urp,\n+\t\t\t\t\t\tsize);\n \t} else {\n \t\tidx += BNXT_ULP_PROTO_HDR_TCP_NUM;\n \t}\n \n \tif (tcp_mask) {\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.src_port,\n-\t\t       sizeof(tcp_mask->hdr.src_port));\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.dst_port,\n-\t\t       sizeof(tcp_mask->hdr.dst_port));\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.sent_seq,\n-\t\t       sizeof(tcp_mask->hdr.sent_seq));\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.recv_ack,\n-\t\t       sizeof(tcp_mask->hdr.recv_ack));\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.data_off,\n-\t\t       sizeof(tcp_mask->hdr.data_off));\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.tcp_flags,\n-\t\t       sizeof(tcp_mask->hdr.tcp_flags));\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.rx_win,\n-\t\t       sizeof(tcp_mask->hdr.rx_win));\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.cksum,\n-\t\t       sizeof(tcp_mask->hdr.cksum));\n-\t\tmemcpy(hdr_field[mdx++].mask, &tcp_mask->hdr.tcp_urp,\n-\t\t       sizeof(tcp_mask->hdr.tcp_urp));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.src_port,\n+\t\t\t\t       sizeof(tcp_mask->hdr.src_port));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.dst_port,\n+\t\t\t\t       sizeof(tcp_mask->hdr.dst_port));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.sent_seq,\n+\t\t\t\t       sizeof(tcp_mask->hdr.sent_seq));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.recv_ack,\n+\t\t\t\t       sizeof(tcp_mask->hdr.recv_ack));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.data_off,\n+\t\t\t\t       sizeof(tcp_mask->hdr.data_off));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.tcp_flags,\n+\t\t\t\t       sizeof(tcp_mask->hdr.tcp_flags));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.rx_win,\n+\t\t\t\t       sizeof(tcp_mask->hdr.rx_win));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.cksum,\n+\t\t\t\t       sizeof(tcp_mask->hdr.cksum));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &tcp_mask->hdr.tcp_urp,\n+\t\t\t\t       sizeof(tcp_mask->hdr.tcp_urp));\n \t}\n-\t*field_idx = idx; /* add number of TCP header elements */\n+\t/* add number of TCP header elements */\n+\tparams->field_idx += BNXT_ULP_PROTO_HDR_TCP_NUM;\n \n \t/* Set the udp header bitmap and computed l4 header bitmaps */\n \tif (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_L4) ||\n@@ -811,63 +832,63 @@ ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,\n /* Function to handle the parsing of RTE Flow item Vxlan Header. */\n int32_t\n ulp_rte_vxlan_hdr_handler(const struct rte_flow_item *item,\n-\t\t\t  struct ulp_rte_hdr_bitmap *hdrbitmap,\n-\t\t\t  struct ulp_rte_hdr_field *hdr_field,\n-\t\t\t  uint32_t *field_idx,\n-\t\t\t  uint32_t *vlan_idx __rte_unused)\n+\t\t\t  struct ulp_rte_parser_params *params)\n {\n-\tconst struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask;\n-\tuint32_t idx = *field_idx;\n-\tuint32_t mdx = *field_idx;\n-\n-\tvxlan_spec = item->spec;\n-\tvxlan_mask = item->mask;\n+\tconst struct rte_flow_item_vxlan *vxlan_spec = item->spec;\n+\tconst struct rte_flow_item_vxlan *vxlan_mask = item->mask;\n+\tstruct ulp_rte_hdr_field *field;\n+\tstruct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;\n+\tuint32_t idx = params->field_idx;\n+\tuint32_t size;\n \n \t/*\n \t * Copy the rte_flow_item for vxlan into hdr_field using vxlan\n \t * header fields\n \t */\n \tif (vxlan_spec) {\n-\t\thdr_field[idx].size = sizeof(vxlan_spec->flags);\n-\t\tmemcpy(hdr_field[idx++].spec, &vxlan_spec->flags,\n-\t\t       sizeof(vxlan_spec->flags));\n-\t\thdr_field[idx].size = sizeof(vxlan_spec->rsvd0);\n-\t\tmemcpy(hdr_field[idx++].spec, &vxlan_spec->rsvd0,\n-\t\t       sizeof(vxlan_spec->rsvd0));\n-\t\thdr_field[idx].size = sizeof(vxlan_spec->vni);\n-\t\tmemcpy(hdr_field[idx++].spec, &vxlan_spec->vni,\n-\t\t       sizeof(vxlan_spec->vni));\n-\t\thdr_field[idx].size = sizeof(vxlan_spec->rsvd1);\n-\t\tmemcpy(hdr_field[idx++].spec, &vxlan_spec->rsvd1,\n-\t\t       sizeof(vxlan_spec->rsvd1));\n-\t} else {\n-\t\tidx += BNXT_ULP_PROTO_HDR_VXLAN_NUM;\n+\t\tsize = sizeof(vxlan_spec->flags);\n+\t\tfield = ulp_rte_parser_fld_copy(&params->hdr_field[idx],\n+\t\t\t\t\t\t&vxlan_spec->flags,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(vxlan_spec->rsvd0);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&vxlan_spec->rsvd0,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(vxlan_spec->vni);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&vxlan_spec->vni,\n+\t\t\t\t\t\tsize);\n+\t\tsize = sizeof(vxlan_spec->rsvd1);\n+\t\tfield = ulp_rte_parser_fld_copy(field,\n+\t\t\t\t\t\t&vxlan_spec->rsvd1,\n+\t\t\t\t\t\tsize);\n \t}\n-\n \tif (vxlan_mask) {\n-\t\tmemcpy(hdr_field[mdx++].mask, &vxlan_mask->flags,\n-\t\t       sizeof(vxlan_mask->flags));\n-\t\tmemcpy(hdr_field[mdx++].mask, &vxlan_mask->rsvd0,\n-\t\t       sizeof(vxlan_mask->rsvd0));\n-\t\tmemcpy(hdr_field[mdx++].mask, &vxlan_mask->vni,\n-\t\t       sizeof(vxlan_mask->vni));\n-\t\tmemcpy(hdr_field[mdx++].mask, &vxlan_mask->rsvd1,\n-\t\t       sizeof(vxlan_mask->rsvd1));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &vxlan_mask->flags,\n+\t\t\t\t       sizeof(vxlan_mask->flags));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &vxlan_mask->rsvd0,\n+\t\t\t\t       sizeof(vxlan_mask->rsvd0));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &vxlan_mask->vni,\n+\t\t\t\t       sizeof(vxlan_mask->vni));\n+\t\tulp_rte_prsr_mask_copy(params, &idx,\n+\t\t\t\t       &vxlan_mask->rsvd1,\n+\t\t\t\t       sizeof(vxlan_mask->rsvd1));\n \t}\n-\t*field_idx = idx; /* Add number of vxlan header elements */\n+\t/* Add number of vxlan header elements */\n+\tparams->field_idx += BNXT_ULP_PROTO_HDR_VXLAN_NUM;\n \n \t/* Update the hdr_bitmap with vxlan */\n-\tULP_BITMAP_SET(hdrbitmap->bits, BNXT_ULP_HDR_BIT_T_VXLAN);\n+\tULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_T_VXLAN);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n /* Function to handle the parsing of RTE Flow item void Header */\n int32_t\n ulp_rte_void_hdr_handler(const struct rte_flow_item *item __rte_unused,\n-\t\t\t struct ulp_rte_hdr_bitmap *hdr_bit __rte_unused,\n-\t\t\t struct ulp_rte_hdr_field *hdr_field __rte_unused,\n-\t\t\t uint32_t *field_idx __rte_unused,\n-\t\t\t uint32_t *vlan_idx __rte_unused)\n+\t\t\t struct ulp_rte_parser_params *params __rte_unused)\n {\n \treturn BNXT_TF_RC_SUCCESS;\n }\n@@ -875,8 +896,7 @@ ulp_rte_void_hdr_handler(const struct rte_flow_item *item __rte_unused,\n /* Function to handle the parsing of RTE Flow action void Header. */\n int32_t\n ulp_rte_void_act_handler(const struct rte_flow_action *action_item __rte_unused,\n-\t\t\t struct ulp_rte_act_bitmap *act __rte_unused,\n-\t\t\t struct ulp_rte_act_prop *act_prop __rte_unused)\n+\t\t\t struct ulp_rte_parser_params *params __rte_unused)\n {\n \treturn BNXT_TF_RC_SUCCESS;\n }\n@@ -884,16 +904,16 @@ ulp_rte_void_act_handler(const struct rte_flow_action *action_item __rte_unused,\n /* Function to handle the parsing of RTE Flow action Mark Header. */\n int32_t\n ulp_rte_mark_act_handler(const struct rte_flow_action *action_item,\n-\t\t\t struct ulp_rte_act_bitmap *act,\n-\t\t\t struct ulp_rte_act_prop *act_prop)\n+\t\t\t struct ulp_rte_parser_params *param)\n {\n \tconst struct rte_flow_action_mark *mark;\n-\tuint32_t mark_id = 0;\n+\tstruct ulp_rte_act_bitmap *act = &param->act_bitmap;\n+\tuint32_t mark_id;\n \n \tmark = action_item->conf;\n \tif (mark) {\n \t\tmark_id = tfp_cpu_to_be_32(mark->id);\n-\t\tmemcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_MARK],\n+\t\tmemcpy(&param->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_MARK],\n \t\t       &mark_id, BNXT_ULP_ACT_PROP_SZ_MARK);\n \n \t\t/* Update the hdr_bitmap with vxlan */\n@@ -907,15 +927,13 @@ ulp_rte_mark_act_handler(const struct rte_flow_action *action_item,\n /* Function to handle the parsing of RTE Flow action RSS Header. */\n int32_t\n ulp_rte_rss_act_handler(const struct rte_flow_action *action_item,\n-\t\t\tstruct ulp_rte_act_bitmap *act,\n-\t\t\tstruct ulp_rte_act_prop *act_prop __rte_unused)\n+\t\t\tstruct ulp_rte_parser_params *param)\n {\n-\tconst struct rte_flow_action_rss *rss;\n+\tconst struct rte_flow_action_rss *rss = action_item->conf;\n \n-\trss = action_item->conf;\n \tif (rss) {\n \t\t/* Update the hdr_bitmap with vxlan */\n-\t\tULP_BITMAP_SET(act->bits, BNXT_ULP_ACTION_BIT_RSS);\n+\t\tULP_BITMAP_SET(param->act_bitmap.bits, BNXT_ULP_ACTION_BIT_RSS);\n \t\treturn BNXT_TF_RC_SUCCESS;\n \t}\n \tBNXT_TF_DBG(ERR, \"Parse Error: RSS arg is invalid\\n\");\n@@ -925,8 +943,7 @@ ulp_rte_rss_act_handler(const struct rte_flow_action *action_item,\n /* Function to handle the parsing of RTE Flow action vxlan_encap Header. */\n int32_t\n ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item,\n-\t\t\t\tstruct ulp_rte_act_bitmap *act,\n-\t\t\t\tstruct ulp_rte_act_prop *ap)\n+\t\t\t\tstruct ulp_rte_parser_params *params)\n {\n \tconst struct rte_flow_action_vxlan_encap *vxlan_encap;\n \tconst struct rte_flow_item *item;\n@@ -939,8 +956,10 @@ ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item,\n \tuint32_t vxlan_size = 0;\n \tuint8_t *buff;\n \t/* IP header per byte - ver/hlen, TOS, ID, ID, FRAG, FRAG, TTL, PROTO */\n-\tconst uint8_t\tdef_ipv4_hdr[] = {0x45, 0x00, 0x00, 0x01, 0x00,\n+\tconst uint8_t def_ipv4_hdr[] = {0x45, 0x00, 0x00, 0x01, 0x00,\n \t\t\t\t    0x00, 0x40, 0x11};\n+\tstruct ulp_rte_act_bitmap *act = &params->act_bitmap;\n+\tstruct ulp_rte_act_prop *ap = &params->act_prop;\n \n \tvxlan_encap = action_item->conf;\n \tif (!vxlan_encap) {\n@@ -1115,33 +1134,32 @@ ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item,\n int32_t\n ulp_rte_vxlan_decap_act_handler(const struct rte_flow_action *action_item\n \t\t\t\t__rte_unused,\n-\t\t\t\tstruct ulp_rte_act_bitmap *act,\n-\t\t\t\tstruct ulp_rte_act_prop *act_prop __rte_unused)\n+\t\t\t\tstruct ulp_rte_parser_params *params)\n {\n \t/* update the hdr_bitmap with vxlan */\n-\tULP_BITMAP_SET(act->bits, BNXT_ULP_ACTION_BIT_VXLAN_DECAP);\n+\tULP_BITMAP_SET(params->act_bitmap.bits,\n+\t\t       BNXT_ULP_ACTION_BIT_VXLAN_DECAP);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n /* Function to handle the parsing of RTE Flow action drop Header. */\n int32_t\n ulp_rte_drop_act_handler(const struct rte_flow_action *action_item __rte_unused,\n-\t\t\t struct ulp_rte_act_bitmap *act,\n-\t\t\t struct ulp_rte_act_prop *act_prop __rte_unused)\n+\t\t\t struct ulp_rte_parser_params *params)\n {\n \t/* Update the hdr_bitmap with drop */\n-\tULP_BITMAP_SET(act->bits, BNXT_ULP_ACTION_BIT_DROP);\n+\tULP_BITMAP_SET(params->act_bitmap.bits, BNXT_ULP_ACTION_BIT_DROP);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n /* Function to handle the parsing of RTE Flow action count. */\n int32_t\n ulp_rte_count_act_handler(const struct rte_flow_action *action_item,\n-\t\t\t  struct ulp_rte_act_bitmap *act,\n-\t\t\t  struct ulp_rte_act_prop *act_prop __rte_unused)\n+\t\t\t  struct ulp_rte_parser_params *params)\n \n {\n \tconst struct rte_flow_action_count *act_count;\n+\tstruct ulp_rte_act_prop *act_prop = &params->act_prop;\n \n \tact_count = action_item->conf;\n \tif (act_count) {\n@@ -1156,29 +1174,28 @@ ulp_rte_count_act_handler(const struct rte_flow_action *action_item,\n \t}\n \n \t/* Update the hdr_bitmap with count */\n-\tULP_BITMAP_SET(act->bits, BNXT_ULP_ACTION_BIT_COUNT);\n+\tULP_BITMAP_SET(params->act_bitmap.bits, BNXT_ULP_ACTION_BIT_COUNT);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n /* Function to handle the parsing of RTE Flow action PF. */\n int32_t\n ulp_rte_pf_act_handler(const struct rte_flow_action *action_item __rte_unused,\n-\t\t       struct ulp_rte_act_bitmap *act,\n-\t\t       struct ulp_rte_act_prop *act_prop)\n+\t\t       struct ulp_rte_parser_params *param)\n {\n \tuint8_t *svif_buf;\n \tuint8_t *vnic_buffer;\n \tuint32_t svif;\n \n \t/* Update the hdr_bitmap with vnic bit */\n-\tULP_BITMAP_SET(act->bits, BNXT_ULP_ACTION_BIT_VNIC);\n+\tULP_BITMAP_SET(param->act_bitmap.bits, BNXT_ULP_ACTION_BIT_VNIC);\n \n \t/* copy the PF of the current device into VNIC Property */\n-\tsvif_buf = &act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_VNIC];\n+\tsvif_buf = &param->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VNIC];\n \tulp_util_field_int_read(svif_buf, &svif);\n \tsvif = (uint32_t)bnxt_get_vnic_id(svif);\n \tsvif = htonl(svif);\n-\tvnic_buffer = &act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_VNIC];\n+\tvnic_buffer = &param->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VNIC];\n \tulp_util_field_int_write(vnic_buffer, svif);\n \n \treturn BNXT_TF_RC_SUCCESS;\n@@ -1187,8 +1204,7 @@ ulp_rte_pf_act_handler(const struct rte_flow_action *action_item __rte_unused,\n /* Function to handle the parsing of RTE Flow action VF. */\n int32_t\n ulp_rte_vf_act_handler(const struct rte_flow_action *action_item,\n-\t\t       struct ulp_rte_act_bitmap *act,\n-\t\t       struct ulp_rte_act_prop *act_prop)\n+\t\t       struct ulp_rte_parser_params *param)\n {\n \tconst struct rte_flow_action_vf *vf_action;\n \n@@ -1200,21 +1216,20 @@ ulp_rte_vf_act_handler(const struct rte_flow_action *action_item,\n \t\t\treturn BNXT_TF_RC_PARSE_ERR;\n \t\t}\n \t\t/* TBD: Update the computed VNIC using VF conversion */\n-\t\tmemcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_VNIC],\n+\t\tmemcpy(&param->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VNIC],\n \t\t       &vf_action->id,\n \t\t       BNXT_ULP_ACT_PROP_SZ_VNIC);\n \t}\n \n \t/* Update the hdr_bitmap with count */\n-\tULP_BITMAP_SET(act->bits, BNXT_ULP_ACTION_BIT_VNIC);\n+\tULP_BITMAP_SET(param->act_bitmap.bits, BNXT_ULP_ACTION_BIT_VNIC);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n /* Function to handle the parsing of RTE Flow action port_id. */\n int32_t\n ulp_rte_port_id_act_handler(const struct rte_flow_action *act_item,\n-\t\t\t    struct ulp_rte_act_bitmap *act,\n-\t\t\t    struct ulp_rte_act_prop *act_prop)\n+\t\t\t    struct ulp_rte_parser_params *param)\n {\n \tconst struct rte_flow_action_port_id *port_id;\n \n@@ -1226,21 +1241,20 @@ ulp_rte_port_id_act_handler(const struct rte_flow_action *act_item,\n \t\t\treturn BNXT_TF_RC_PARSE_ERR;\n \t\t}\n \t\t/* TBD: Update the computed VNIC using port conversion */\n-\t\tmemcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_VNIC],\n+\t\tmemcpy(&param->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VNIC],\n \t\t       &port_id->id,\n \t\t       BNXT_ULP_ACT_PROP_SZ_VNIC);\n \t}\n \n \t/* Update the hdr_bitmap with count */\n-\tULP_BITMAP_SET(act->bits, BNXT_ULP_ACTION_BIT_VNIC);\n+\tULP_BITMAP_SET(param->act_bitmap.bits, BNXT_ULP_ACTION_BIT_VNIC);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n /* Function to handle the parsing of RTE Flow action phy_port. */\n int32_t\n ulp_rte_phy_port_act_handler(const struct rte_flow_action *action_item,\n-\t\t\t     struct ulp_rte_act_bitmap *act,\n-\t\t\t     struct ulp_rte_act_prop *act_prop)\n+\t\t\t     struct ulp_rte_parser_params *prm)\n {\n \tconst struct rte_flow_action_phy_port *phy_port;\n \n@@ -1251,12 +1265,12 @@ ulp_rte_phy_port_act_handler(const struct rte_flow_action *action_item,\n \t\t\t\t    \"Parse Err:Port Original not supported\\n\");\n \t\t\treturn BNXT_TF_RC_PARSE_ERR;\n \t\t}\n-\t\tmemcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_VPORT],\n+\t\tmemcpy(&prm->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VPORT],\n \t\t       &phy_port->index,\n \t\t       BNXT_ULP_ACT_PROP_SZ_VPORT);\n \t}\n \n \t/* Update the hdr_bitmap with count */\n-\tULP_BITMAP_SET(act->bits, BNXT_ULP_ACTION_BIT_VPORT);\n+\tULP_BITMAP_SET(prm->act_bitmap.bits, BNXT_ULP_ACTION_BIT_VPORT);\n \treturn BNXT_TF_RC_SUCCESS;\n }\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\nindex 0d571bb..4cc9dcc 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\n@@ -22,8 +22,7 @@\n \n /* Function to handle the parsing of the RTE port id. */\n int32_t\n-ulp_rte_parser_svif_process(struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\t    struct ulp_rte_hdr_field\t*hdr_field);\n+ulp_rte_parser_svif_process(struct ulp_rte_parser_params *params);\n \n /*\n  * Function to handle the parsing of RTE Flows and placing\n@@ -31,178 +30,129 @@ ulp_rte_parser_svif_process(struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n  */\n int32_t\n bnxt_ulp_rte_parser_hdr_parse(const struct rte_flow_item pattern[],\n-\t\t\t      struct ulp_rte_hdr_bitmap *hdr_bitmap,\n-\t\t\t      struct ulp_rte_hdr_field  *hdr_field);\n+\t\t\t      struct ulp_rte_parser_params *params);\n \n /*\n  * Function to handle the parsing of RTE Flows and placing\n  * the RTE flow actions into the ulp structures.\n  */\n int32_t\n-bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action\tactions[],\n-\t\t\t      struct ulp_rte_act_bitmap\t\t*act_bitmap,\n-\t\t\t      struct ulp_rte_act_prop\t\t*act_prop);\n+bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action actions[],\n+\t\t\t      struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item PF Header. */\n int32_t\n-ulp_rte_pf_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t       struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t       struct ulp_rte_hdr_field\t\t*hdr_field,\n-\t\t       uint32_t\t\t\t\t*field_idx,\n-\t\t       uint32_t\t\t\t\t*vlan_idx);\n+ulp_rte_pf_hdr_handler(const struct rte_flow_item *item,\n+\t\t       struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item VF Header. */\n int32_t\n-ulp_rte_vf_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t       struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t       struct ulp_rte_hdr_field\t\t*hdr_field,\n-\t\t       uint32_t\t\t\t\t*field_idx,\n-\t\t       uint32_t\t\t\t\t*vlan_idx);\n+ulp_rte_vf_hdr_handler(const struct rte_flow_item *item,\n+\t\t       struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item port id Header. */\n int32_t\n-ulp_rte_port_id_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\t    struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\t    struct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\t    uint32_t\t\t\t*field_idx,\n-\t\t\t    uint32_t\t\t\t*vlan_idx);\n+ulp_rte_port_id_hdr_handler(const struct rte_flow_item *item,\n+\t\t\t    struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item port Header. */\n int32_t\n-ulp_rte_phy_port_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\t     struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\t     struct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\t     uint32_t\t\t\t*field_idx,\n-\t\t\t     uint32_t\t\t\t*vlan_idx);\n+ulp_rte_phy_port_hdr_handler(const struct rte_flow_item *item,\n+\t\t\t     struct ulp_rte_parser_params *params);\n \n /* Function to handle the RTE item Ethernet Header. */\n int32_t\n-ulp_rte_eth_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\tstruct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\tstruct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\tuint32_t\t\t\t*field_idx,\n-\t\t\tuint32_t\t\t\t*vlan_idx);\n+ulp_rte_eth_hdr_handler(const struct rte_flow_item *item,\n+\t\t\tstruct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item Vlan Header. */\n int32_t\n-ulp_rte_vlan_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\t struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\t struct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\t uint32_t\t\t\t*field_idx,\n-\t\t\t uint32_t\t\t\t*vlan_idx);\n+ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item,\n+\t\t\t struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item IPV4 Header. */\n int32_t\n-ulp_rte_ipv4_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\t struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\t struct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\t uint32_t\t\t\t*field_idx,\n-\t\t\t uint32_t\t\t\t*vlan_idx);\n+ulp_rte_ipv4_hdr_handler(const struct rte_flow_item *item,\n+\t\t\t struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item IPV6 Header. */\n int32_t\n-ulp_rte_ipv6_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\t struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\t struct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\t uint32_t\t\t\t*field_idx,\n-\t\t\t uint32_t\t\t\t*vlan_idx);\n+ulp_rte_ipv6_hdr_handler(const struct rte_flow_item *item,\n+\t\t\t struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item UDP Header. */\n int32_t\n-ulp_rte_udp_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\tstruct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\tstruct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\tuint32_t\t\t\t*field_idx,\n-\t\t\tuint32_t\t\t\t*vlan_idx);\n+ulp_rte_udp_hdr_handler(const struct rte_flow_item *item,\n+\t\t\tstruct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item TCP Header. */\n int32_t\n-ulp_rte_tcp_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\tstruct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\tstruct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\tuint32_t\t\t\t*field_idx,\n-\t\t\tuint32_t\t\t\t*vlan_idx);\n+ulp_rte_tcp_hdr_handler(const struct rte_flow_item *item,\n+\t\t\tstruct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item Vxlan Header. */\n int32_t\n-ulp_rte_vxlan_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\t  struct ulp_rte_hdr_bitmap\t*hdrbitmap,\n-\t\t\t  struct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\t  uint32_t\t\t\t*field_idx,\n-\t\t\t  uint32_t\t\t\t*vlan_idx);\n+ulp_rte_vxlan_hdr_handler(const struct rte_flow_item *item,\n+\t\t\t  struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow item void Header. */\n int32_t\n-ulp_rte_void_hdr_handler(const struct rte_flow_item\t*item,\n-\t\t\t struct ulp_rte_hdr_bitmap\t*hdr_bitmap,\n-\t\t\t struct ulp_rte_hdr_field\t*hdr_field,\n-\t\t\t uint32_t\t\t\t*field_idx,\n-\t\t\t uint32_t\t\t\t*vlan_idx);\n+ulp_rte_void_hdr_handler(const struct rte_flow_item *item,\n+\t\t\t struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action void Header. */\n int32_t\n-ulp_rte_void_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t\t struct ulp_rte_act_bitmap\t*act,\n-\t\t\t struct ulp_rte_act_prop\t*act_prop);\n+ulp_rte_void_act_handler(const struct rte_flow_action *action_item,\n+\t\t\t struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action RSS Header. */\n int32_t\n-ulp_rte_rss_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t\tstruct ulp_rte_act_bitmap\t*act,\n-\t\t\tstruct ulp_rte_act_prop\t*act_prop);\n+ulp_rte_rss_act_handler(const struct rte_flow_action *action_item,\n+\t\t\tstruct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action Mark Header. */\n int32_t\n-ulp_rte_mark_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t\t struct ulp_rte_act_bitmap\t*act,\n-\t\t\t struct ulp_rte_act_prop\t*act_prop);\n+ulp_rte_mark_act_handler(const struct rte_flow_action *action_item,\n+\t\t\t struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action vxlan_encap Header. */\n int32_t\n-ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t\t\tstruct ulp_rte_act_bitmap\t*act,\n-\t\t\t\tstruct ulp_rte_act_prop\t\t*act_prop);\n+ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item,\n+\t\t\t\tstruct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action vxlan_encap Header. */\n int32_t\n-ulp_rte_vxlan_decap_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t\t\tstruct ulp_rte_act_bitmap\t*act,\n-\t\t\t\tstruct ulp_rte_act_prop\t\t*act_prop);\n+ulp_rte_vxlan_decap_act_handler(const struct rte_flow_action *action_item,\n+\t\t\t\tstruct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action drop Header. */\n int32_t\n-ulp_rte_drop_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t\t struct ulp_rte_act_bitmap\t*act,\n-\t\t\t struct ulp_rte_act_prop\t*act_prop);\n+ulp_rte_drop_act_handler(const struct rte_flow_action *action_item,\n+\t\t\t struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action count. */\n int32_t\n-ulp_rte_count_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t\t  struct ulp_rte_act_bitmap\t*act,\n-\t\t\t  struct ulp_rte_act_prop\t*act_prop);\n+ulp_rte_count_act_handler(const struct rte_flow_action *action_item,\n+\t\t\t  struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action PF. */\n int32_t\n-ulp_rte_pf_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t       struct ulp_rte_act_bitmap\t*act,\n-\t\t       struct ulp_rte_act_prop\t\t*act_prop);\n+ulp_rte_pf_act_handler(const struct rte_flow_action *action_item,\n+\t\t       struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action VF. */\n int32_t\n-ulp_rte_vf_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t       struct ulp_rte_act_bitmap\t*act,\n-\t\t       struct ulp_rte_act_prop\t\t*act_prop);\n+ulp_rte_vf_act_handler(const struct rte_flow_action *action_item,\n+\t\t       struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action port_id. */\n int32_t\n-ulp_rte_port_id_act_handler(const struct rte_flow_action\t*act_item,\n-\t\t\t    struct ulp_rte_act_bitmap\t\t*act,\n-\t\t\t    struct ulp_rte_act_prop\t\t*act_p);\n+ulp_rte_port_id_act_handler(const struct rte_flow_action *act_item,\n+\t\t\t    struct ulp_rte_parser_params *params);\n \n /* Function to handle the parsing of RTE Flow action phy_port. */\n int32_t\n-ulp_rte_phy_port_act_handler(const struct rte_flow_action\t*action_item,\n-\t\t\t     struct ulp_rte_act_bitmap\t\t*act,\n-\t\t\t     struct ulp_rte_act_prop\t\t*act_prop);\n+ulp_rte_phy_port_act_handler(const struct rte_flow_action *action_item,\n+\t\t\t     struct ulp_rte_parser_params *params);\n \n #endif /* _ULP_RTE_PARSER_H_ */\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 47c0dd8..8adbf7a 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -41,15 +41,32 @@ struct ulp_rte_hdr_field {\n \tuint32_t\tsize;\n };\n \n+struct ulp_rte_act_bitmap {\n+\tuint64_t\tbits;\n+};\n+\n+/* Structure to hold the action property details. */\n+struct ulp_rte_act_prop {\n+\tuint8_t\tact_details[BNXT_ULP_ACT_PROP_IDX_LAST];\n+};\n+\n+/* Structure to be used for passing all the parser functions */\n+struct ulp_rte_parser_params {\n+\tstruct ulp_rte_hdr_bitmap\thdr_bitmap;\n+\tstruct ulp_rte_hdr_field\thdr_field[BNXT_ULP_PROTO_HDR_MAX];\n+\tuint32_t\t\t\tfield_idx;\n+\tuint32_t\t\t\tvlan_idx;\n+\tstruct ulp_rte_act_bitmap\tact_bitmap;\n+\tstruct ulp_rte_act_prop\t\tact_prop;\n+\tuint32_t\t\t\tdir;\n+};\n+\n /* Flow Parser Header Information Structure */\n struct bnxt_ulp_rte_hdr_info {\n \tenum bnxt_ulp_hdr_type\t\t\t\t\thdr_type;\n \t/* Flow Parser Protocol Header Function Prototype */\n \tint (*proto_hdr_func)(const struct rte_flow_item\t*item_list,\n-\t\t\t      struct ulp_rte_hdr_bitmap\t\t*hdr_bitmap,\n-\t\t\t      struct ulp_rte_hdr_field\t\t*hdr_field,\n-\t\t\t      uint32_t\t\t\t\t*field_idx,\n-\t\t\t      uint32_t\t\t\t\t*vlan_idx);\n+\t\t\t      struct ulp_rte_parser_params\t*params);\n };\n \n /* Flow Parser Header Information Structure Array defined in template source*/\n@@ -60,26 +77,13 @@ struct bnxt_ulp_matcher_field_info {\n \tenum bnxt_ulp_fmf_spec\tspec_opcode;\n };\n \n-struct ulp_rte_act_bitmap {\n-\tuint64_t\tbits;\n-};\n-\n-/*\n- * Structure to hold the action property details.\n- * It is a array of 128 bytes.\n- */\n-struct ulp_rte_act_prop {\n-\tuint8_t\tact_details[BNXT_ULP_ACT_PROP_IDX_LAST];\n-};\n-\n /* Flow Parser Action Information Structure */\n struct bnxt_ulp_rte_act_info {\n \tenum bnxt_ulp_act_type\t\t\t\t\tact_type;\n \t/* Flow Parser Protocol Action Function Prototype */\n \tint32_t (*proto_act_func)\n-\t\t(const struct rte_flow_action\t\t\t*action_item,\n-\t\tstruct ulp_rte_act_bitmap\t\t\t*act_bitmap,\n-\t\tstruct ulp_rte_act_prop\t\t\t\t*act_prop);\n+\t\t(const struct rte_flow_action\t*action_item,\n+\t\t struct ulp_rte_parser_params\t*params);\n };\n \n /* Flow Parser Action Information Structure Array defined in template source*/\n",
    "prefixes": [
        "05/11"
    ]
}