Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77281/?format=api
{ "id": 77281, "url": "http://patches.dpdk.org/api/patches/77281/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200911015603.88359-20-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "http://patches.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": "<20200911015603.88359-20-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200911015603.88359-20-ajit.khaparde@broadcom.com", "date": "2020-09-11T01:55:57", "name": "[19/25] net/bnxt: enable support for nat action with tagged traffic", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a08b3a7de10c9f0ea16f5d35c7604beb15938b14", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200911015603.88359-20-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 12116, "url": "http://patches.dpdk.org/api/series/12116/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12116", "date": "2020-09-11T01:55:38", "name": "patchset for bnxt", "version": 1, "mbox": "http://patches.dpdk.org/series/12116/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/77281/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/77281/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 4EE09A04B5;\n\tFri, 11 Sep 2020 03:59:38 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 8DD3E1C1BF;\n\tFri, 11 Sep 2020 03:57:33 +0200 (CEST)", "from mail-pj1-f97.google.com (mail-pj1-f97.google.com\n [209.85.216.97]) by dpdk.org (Postfix) with ESMTP id B880A1C1B8\n for <dev@dpdk.org>; Fri, 11 Sep 2020 03:57:31 +0200 (CEST)", "by mail-pj1-f97.google.com with SMTP id t7so940081pjd.3\n for <dev@dpdk.org>; Thu, 10 Sep 2020 18:57:31 -0700 (PDT)", "from localhost.localdomain ([192.19.223.252])\n by smtp-relay.gmail.com with ESMTPS id cl6sm80986pjb.15.2020.09.10.18.57.28\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Thu, 10 Sep 2020 18:57:30 -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 :mime-version:content-transfer-encoding;\n bh=rur2GASrD6ENBpkhU6jI7GMsv9pSBTK9GUvyUoLS1NI=;\n b=aOQTfrpocSPvwN0NT3j0UCIuQlfxbarUXpAMRo3Lza2Hp62rO2Jk1IDHi7pl+ynKK5\n P9fH/K6AUb2nEPVWZjehvlmZH5Ytk7roIOwrUeMm6yUA0OYnjt+zIrgykXtYcYQL25D6\n oU5fph2N5bhHhcz+oB4cKDT9bWp5LwbF/ku/c=", "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:mime-version:content-transfer-encoding;\n bh=rur2GASrD6ENBpkhU6jI7GMsv9pSBTK9GUvyUoLS1NI=;\n b=uUKSYDuOUBM9SJX5+xXyklK9VdruSFzDdCwXTCfk9g8fTcz2L3hE1Av04TmbxvTiOt\n gGpHP6mh4Tis2ccECggx/e2+0R5V+fhjKQPJTtUIoeMxZE2WgL95g+9OA1qUheB/3u4W\n Gbsd1nh3lM3CsJRx2bKVOR22HnB9HburbC5xAoDS92yD2tMsAr9Adp9282cFi0h3QHHe\n coWeFqrok8J5C5S9QG6dO5iZY9IXiZSC5cai8i1Sar2ChYeLBgb6RXaGs2ikhR2hyfx2\n TKYemo01P23Nc8LaziizvsO4+F5VwXDgXHIIrPb6Mr/apXGwlmJj6fUMmNgddfcYKZRn\n lKCg==", "X-Gm-Message-State": "AOAM532N3O95cWw9RXc20hUiQzbMItdl4vXqQgVfo6oZShjnlXTjY1DW\n oDLINT+V102hnM0HFXGNov2UYOphJh49E7kijXpdYUZCKROcFTFalD4fgjMLmW6zsHvphyTRBkF\n VFpOyxsk7LmRrbwhahC4wlja/vSbFPfcU+7alQxbi1OobTiz21UuGpBt4Z7v4Y9SOLNnoEmYRhs\n WnWw==", "X-Google-Smtp-Source": "\n ABdhPJxQZW0gVEKxjzrgXlCWREY4bbyW2X+FEPXzUWYBxXwSeSMkpj9/ilRPSV08nlMpo1R8C0O02Wcx7pSC", "X-Received": "by 2002:a17:90b:100e:: with SMTP id\n gm14mr55000pjb.200.1599789450703;\n Thu, 10 Sep 2020 18:57:30 -0700 (PDT)", "X-Relaying-Domain": "broadcom.com", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "Kishore Padmanabha <kishore.padmanabha@broadcom.com>,\n Mike Baucom <michael.baucom@broadcom.com>", "Date": "Thu, 10 Sep 2020 18:55:57 -0700", "Message-Id": "<20200911015603.88359-20-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)", "In-Reply-To": "<20200911015603.88359-1-ajit.khaparde@broadcom.com>", "References": "<20200911015603.88359-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 19/25] net/bnxt: enable support for nat action\n\twith tagged traffic", "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\nAdded support for performing l3 or l4 rewrite for vlan tagged\nflows. The outer most dmac, smac and vlan are used to overwrite\nwhen nat operations are performed.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nReviewed-by: Mike Baucom <michael.baucom@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 14 ++-----\n drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 6 +++\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 21 ++++++++++\n drivers/net/bnxt/tf_ulp/ulp_template_db_act.c | 40 ++++++++++++++-----\n .../net/bnxt/tf_ulp/ulp_template_db_enum.h | 3 +-\n 5 files changed, 63 insertions(+), 21 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\nindex eae8884bd..364853a6e 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n@@ -721,15 +721,11 @@ bnxt_ulp_deinit(struct bnxt *bp,\n \t/* Disable NAT feature */\n \t(void)bnxt_ulp_global_cfg_update(bp, TF_DIR_RX, TF_TUNNEL_ENCAP,\n \t\t\t\t\t TF_TUNNEL_ENCAP_NAT,\n-\t\t\t\t\t (BNXT_ULP_NAT_INNER_L2_HEADER_SMAC |\n-\t\t\t\t\t BNXT_ULP_NAT_INNER_L2_HEADER_DMAC),\n-\t\t\t\t\t 0);\n+\t\t\t\t\t BNXT_ULP_NAT_OUTER_MOST_FLAGS, 0);\n \n \t(void)bnxt_ulp_global_cfg_update(bp, TF_DIR_TX, TF_TUNNEL_ENCAP,\n \t\t\t\t\t TF_TUNNEL_ENCAP_NAT,\n-\t\t\t\t\t (BNXT_ULP_NAT_INNER_L2_HEADER_SMAC |\n-\t\t\t\t\t BNXT_ULP_NAT_INNER_L2_HEADER_DMAC),\n-\t\t\t\t\t 0);\n+\t\t\t\t\t BNXT_ULP_NAT_OUTER_MOST_FLAGS, 0);\n \n \t/* Delete the ulp context and tf session and free the ulp context */\n \tulp_ctx_deinit(bp, session);\n@@ -808,8 +804,7 @@ bnxt_ulp_init(struct bnxt *bp,\n \t */\n \trc = bnxt_ulp_global_cfg_update(bp, TF_DIR_RX, TF_TUNNEL_ENCAP,\n \t\t\t\t\tTF_TUNNEL_ENCAP_NAT,\n-\t\t\t\t\t(BNXT_ULP_NAT_INNER_L2_HEADER_SMAC |\n-\t\t\t\t\tBNXT_ULP_NAT_INNER_L2_HEADER_DMAC), 1);\n+\t\t\t\t\tBNXT_ULP_NAT_OUTER_MOST_FLAGS, 1);\n \tif (rc) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to set rx global configuration\\n\");\n \t\tgoto jump_to_error;\n@@ -817,8 +812,7 @@ bnxt_ulp_init(struct bnxt *bp,\n \n \trc = bnxt_ulp_global_cfg_update(bp, TF_DIR_TX, TF_TUNNEL_ENCAP,\n \t\t\t\t\tTF_TUNNEL_ENCAP_NAT,\n-\t\t\t\t\t(BNXT_ULP_NAT_INNER_L2_HEADER_SMAC |\n-\t\t\t\t\tBNXT_ULP_NAT_INNER_L2_HEADER_DMAC), 1);\n+\t\t\t\t\tBNXT_ULP_NAT_OUTER_MOST_FLAGS, 1);\n \tif (rc) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to set tx global configuration\\n\");\n \t\tgoto jump_to_error;\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\nindex 5882c545c..ed978734a 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\n@@ -16,7 +16,13 @@\n \n /* NAT defines to reuse existing inner L2 SMAC and DMAC */\n #define BNXT_ULP_NAT_INNER_L2_HEADER_SMAC\t0x2000\n+#define BNXT_ULP_NAT_OUTER_MOST_L2_HDR_SMAC\t0x6000\n+#define BNXT_ULP_NAT_OUTER_MOST_L2_VLAN_TAGS\t0xc00\n #define BNXT_ULP_NAT_INNER_L2_HEADER_DMAC\t0x100\n+#define BNXT_ULP_NAT_OUTER_MOST_L2_HDR_DMAC\t0x300\n+#define BNXT_ULP_NAT_OUTER_MOST_FLAGS (BNXT_ULP_NAT_OUTER_MOST_L2_HDR_SMAC |\\\n+\t\t\t\t\tBNXT_ULP_NAT_OUTER_MOST_L2_VLAN_TAGS |\\\n+\t\t\t\t\tBNXT_ULP_NAT_OUTER_MOST_L2_HDR_DMAC)\n \n /* defines for the ulp_flags */\n #define BNXT_ULP_VF_REP_ENABLED\t\t0x1\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 6ac4b0f83..15682673d 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -783,6 +783,7 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \tuint32_t val_size = 0, field_size = 0;\n \tuint64_t act_bit;\n \tuint8_t act_val;\n+\tuint64_t hdr_bit;\n \n \tswitch (fld->result_opcode) {\n \tcase BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT:\n@@ -1033,6 +1034,26 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n+\tcase BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST:\n+\t\tif (!ulp_operand_read(fld->result_operand,\n+\t\t\t\t (uint8_t *)&hdr_bit, sizeof(uint64_t))) {\n+\t\t\tBNXT_TF_DBG(ERR, \"%s operand read failed\\n\", name);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\thdr_bit = tfp_be_to_cpu_64(hdr_bit);\n+\t\tif (ULP_BITMAP_ISSET(parms->hdr_bitmap->bits, hdr_bit)) {\n+\t\t\t/* Header bit is set so consider operand_true */\n+\t\t\tval = fld->result_operand_true;\n+\t\t} else {\n+\t\t\t/* Header bit is not set, use the operand false */\n+\t\t\tval = fld->result_operand_false;\n+\t\t}\n+\t\tif (!ulp_blob_push(blob, val, fld->field_bit_size)) {\n+\t\t\tBNXT_TF_DBG(ERR, \"%s failed to add field\\n\",\n+\t\t\t\t name);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tbreak;\n \tdefault:\n \t\tBNXT_TF_DBG(ERR, \"invalid result mapper opcode 0x%x\\n\",\n \t\t\t fld->result_opcode);\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\nindex cab3445a2..22142c137 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\n@@ -1434,11 +1434,21 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {\n-\t\tBNXT_ULP_SYM_DECAP_FUNC_THRU_L2,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST,\n+\t.result_operand = {\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.result_operand_true = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.result_operand_false = {0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n@@ -2336,11 +2346,21 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {\n-\t\tBNXT_ULP_SYM_DECAP_FUNC_THRU_L2,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST,\n+\t.result_operand = {\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.result_operand_true = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.result_operand_false = {0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\nindex 4c1161acd..51758868a 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\n@@ -218,7 +218,8 @@ enum bnxt_ulp_mapper_opc {\n \tBNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST = 9,\n \tBNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST = 10,\n \tBNXT_ULP_MAPPER_OPC_IF_COMP_FIELD_THEN_CF_ELSE_CF = 11,\n-\tBNXT_ULP_MAPPER_OPC_LAST = 12\n+\tBNXT_ULP_MAPPER_OPC_IF_HDR_BIT_THEN_CONST_ELSE_CONST = 12,\n+\tBNXT_ULP_MAPPER_OPC_LAST = 13\n };\n \n enum bnxt_ulp_mark_db_opcode {\n", "prefixes": [ "19/25" ] }