Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60436/?format=api
{ "id": 60436, "url": "https://patches.dpdk.org/api/patches/60436/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20191002171745.4504-16-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "https://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": "<20191002171745.4504-16-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191002171745.4504-16-ajit.khaparde@broadcom.com", "date": "2019-10-02T17:17:44", "name": "[v3,15/16] net/bnxt: support for QinQ insertion and stripping", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "8297161956796eb8326e7dba5d87b7d33872b9ad", "submitter": { "id": 501, "url": "https://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20191002171745.4504-16-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 6669, "url": "https://patches.dpdk.org/api/series/6669/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6669", "date": "2019-10-02T17:17:29", "name": "bnxt patchset", "version": 3, "mbox": "https://patches.dpdk.org/series/6669/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/60436/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/60436/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E543F1BF95;\n\tWed, 2 Oct 2019 19:18:25 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (unknown [192.19.229.170])\n\tby dpdk.org (Postfix) with ESMTP id 3E34C1BF31\n\tfor <dev@dpdk.org>; Wed, 2 Oct 2019 19:17:55 +0200 (CEST)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n\t[10.75.242.48])\n\tby rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id E372330D380;\n\tWed, 2 Oct 2019 10:16:37 -0700 (PDT)", "from C02VPB22HTD6.wifi.broadcom.net (c02vpb22htd6.wifi.broadcom.net\n\t[10.69.74.102])\n\tby mail-irv-17.broadcom.com (Postfix) with ESMTP id 7511114008C;\n\tWed, 2 Oct 2019 10:17:49 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com E372330D380", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1570036597;\n\tbh=hv1hGh4vQvE1ipV/ND1tDlwaj58kF8qnU96OqHjPG0M=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=TH4XLpt0scR1BGtQyw9x0eskDd2X6BFauJTeyD6wIXOpXZXK/FaopGvhqcRkjPwKr\n\tjmAcl8PCMsK2laGouHfp8osGaBem1FZk7cag0qR3Zao9PVEpH2L5/4FFrrlZO5T4g8\n\tEiTCMVxz6tbaXLJOIqGpVhTdrxb0mxQGE0wfG3Hk=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com,\n\tSomnath Kotur <somnath.kotur@broadcom.com>", "Date": "Wed, 2 Oct 2019 10:17:44 -0700", "Message-Id": "<20191002171745.4504-16-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.20.1 (Apple Git-117)", "In-Reply-To": "<20191002171745.4504-1-ajit.khaparde@broadcom.com>", "References": "<20191002055423.99659-1-ajit.khaparde@broadcom.com>\n\t<20191002171745.4504-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 15/16] net/bnxt: support for QinQ insertion\n\tand stripping", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Somnath Kotur <somnath.kotur@broadcom.com>\n\nDriver will accelerate only outer/S-VLAN insertion by turning on\nthe appropriate bits in the Tx Buffer Descriptor when the packet\narrives for transmission.\nThe TPID to be used for this S-VLAN is conveyed by the vlan_tpid_set\ndev_op which will terminate in the driver.\nIn the Rx path, driver will continue providing the stripped vlan tag\nin the mbuf's vlan tci field. This would be the outermost vlan tag\nin a double-tagged packet or the vlan tag for a single vlan tagged pkt.\n\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt.h | 4 ++\n drivers/net/bnxt/bnxt_ethdev.c | 71 ++++++++++++++++++++++++++++++++--\n drivers/net/bnxt/bnxt_txr.c | 13 ++++++-\n 3 files changed, 83 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex 089f86fec7..f8a550ba54 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -521,6 +521,10 @@ struct bnxt {\n \tuint16_t\t\tmax_stat_ctx;\n \tuint16_t\t\tfirst_vf_id;\n \tuint16_t\t\tvlan;\n+#define BNXT_OUTER_TPID_MASK\t0x0000ffff\n+#define BNXT_OUTER_TPID_BD_MASK\t0xffff0000\n+#define BNXT_OUTER_TPID_BD_SHFT\t16\n+\tuint32_t\t\touter_tpid_bd;\n \tstruct bnxt_pf_info\tpf;\n \tuint8_t\t\t\tport_partition_type;\n \tuint8_t\t\t\tdev_stopped;\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 5985963bf7..b3a37e1554 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -151,6 +151,7 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {\n \t\t\t\t DEV_TX_OFFLOAD_GRE_TNL_TSO | \\\n \t\t\t\t DEV_TX_OFFLOAD_IPIP_TNL_TSO | \\\n \t\t\t\t DEV_TX_OFFLOAD_GENEVE_TNL_TSO | \\\n+\t\t\t\t DEV_TX_OFFLOAD_QINQ_INSERT | \\\n \t\t\t\t DEV_TX_OFFLOAD_MULTI_SEGS)\n \n #define BNXT_DEV_RX_OFFLOAD_SUPPORT (DEV_RX_OFFLOAD_VLAN_FILTER | \\\n@@ -161,6 +162,7 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {\n \t\t\t\t DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | \\\n \t\t\t\t DEV_RX_OFFLOAD_JUMBO_FRAME | \\\n \t\t\t\t DEV_RX_OFFLOAD_KEEP_CRC | \\\n+\t\t\t\t DEV_RX_OFFLOAD_VLAN_EXTEND | \\\n \t\t\t\t DEV_RX_OFFLOAD_TCP_LRO)\n \n static int bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask);\n@@ -1831,15 +1833,77 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)\n \t\t\t!!(rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP));\n \t}\n \n-\tif (mask & ETH_VLAN_EXTEND_MASK)\n-\t\tPMD_DRV_LOG(ERR, \"Extend VLAN Not supported\\n\");\n+\tif (mask & ETH_VLAN_EXTEND_MASK) {\n+\t\tif (rx_offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)\n+\t\t\tPMD_DRV_LOG(DEBUG, \"Extend VLAN supported\\n\");\n+\t\telse\n+\t\t\tPMD_DRV_LOG(INFO, \"Extend VLAN unsupported\\n\");\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+bnxt_vlan_tpid_set_op(struct rte_eth_dev *dev, enum rte_vlan_type vlan_type,\n+\t\t uint16_t tpid)\n+{\n+\tstruct bnxt *bp = dev->data->dev_private;\n+\tint qinq = dev->data->dev_conf.rxmode.offloads &\n+\t\t DEV_RX_OFFLOAD_VLAN_EXTEND;\n+\n+\tif (vlan_type != ETH_VLAN_TYPE_INNER &&\n+\t vlan_type != ETH_VLAN_TYPE_OUTER) {\n+\t\tPMD_DRV_LOG(ERR,\n+\t\t\t \"Unsupported vlan type.\");\n+\t\treturn -EINVAL;\n+\t}\n+\tif (!qinq) {\n+\t\tPMD_DRV_LOG(ERR,\n+\t\t\t \"QinQ not enabled. Needs to be ON as we can \"\n+\t\t\t \"accelerate only outer vlan\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (vlan_type == ETH_VLAN_TYPE_OUTER) {\n+\t\tswitch (tpid) {\n+\t\tcase RTE_ETHER_TYPE_QINQ:\n+\t\t\tbp->outer_tpid_bd =\n+\t\t\t\tTX_BD_LONG_CFA_META_VLAN_TPID_TPID88A8;\n+\t\t\t\tbreak;\n+\t\tcase RTE_ETHER_TYPE_VLAN:\n+\t\t\tbp->outer_tpid_bd =\n+\t\t\t\tTX_BD_LONG_CFA_META_VLAN_TPID_TPID8100;\n+\t\t\t\tbreak;\n+\t\tcase 0x9100:\n+\t\t\tbp->outer_tpid_bd =\n+\t\t\t\tTX_BD_LONG_CFA_META_VLAN_TPID_TPID9100;\n+\t\t\t\tbreak;\n+\t\tcase 0x9200:\n+\t\t\tbp->outer_tpid_bd =\n+\t\t\t\tTX_BD_LONG_CFA_META_VLAN_TPID_TPID9200;\n+\t\t\t\tbreak;\n+\t\tcase 0x9300:\n+\t\t\tbp->outer_tpid_bd =\n+\t\t\t\t TX_BD_LONG_CFA_META_VLAN_TPID_TPID9300;\n+\t\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tPMD_DRV_LOG(ERR, \"Invalid TPID: %x\\n\", tpid);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tbp->outer_tpid_bd |= tpid;\n+\t\tPMD_DRV_LOG(INFO, \"outer_tpid_bd = %x\\n\", bp->outer_tpid_bd);\n+\t} else if (vlan_type == ETH_VLAN_TYPE_INNER) {\n+\t\tPMD_DRV_LOG(ERR,\n+\t\t\t \"Can accelerate only outer vlan in QinQ\\n\");\n+\t\treturn -EINVAL;\n+\t}\n \n \treturn 0;\n }\n \n static int\n bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,\n-\t\t\tstruct rte_ether_addr *addr)\n+\t\t\t struct rte_ether_addr *addr)\n {\n \tstruct bnxt *bp = dev->data->dev_private;\n \t/* Default Filter is tied to VNIC 0 */\n@@ -3534,6 +3598,7 @@ static const struct eth_dev_ops bnxt_dev_ops = {\n \t.udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op,\n \t.vlan_filter_set = bnxt_vlan_filter_set_op,\n \t.vlan_offload_set = bnxt_vlan_offload_set_op,\n+\t.vlan_tpid_set = bnxt_vlan_tpid_set_op,\n \t.vlan_pvid_set = bnxt_vlan_pvid_set_op,\n \t.mtu_set = bnxt_mtu_set_op,\n \t.mac_addr_set = bnxt_set_default_mac_addr_op,\ndiff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c\nindex 99d2009055..0ed6581bed 100644\n--- a/drivers/net/bnxt/bnxt_txr.c\n+++ b/drivers/net/bnxt/bnxt_txr.c\n@@ -134,6 +134,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,\n \t\t\t\tstruct tx_bd_long **last_txbd)\n {\n \tstruct bnxt_tx_ring_info *txr = txq->tx_ring;\n+\tuint32_t outer_tpid_bd = 0;\n \tstruct tx_bd_long *txbd;\n \tstruct tx_bd_long_hi *txbd1 = NULL;\n \tuint32_t vlan_tag_flags, cfa_action;\n@@ -155,7 +156,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,\n \t\t\t\tPKT_TX_UDP_CKSUM | PKT_TX_IP_CKSUM |\n \t\t\t\tPKT_TX_VLAN_PKT | PKT_TX_OUTER_IP_CKSUM |\n \t\t\t\tPKT_TX_TUNNEL_GRE | PKT_TX_TUNNEL_VXLAN |\n-\t\t\t\tPKT_TX_TUNNEL_GENEVE | PKT_TX_IEEE1588_TMST))\n+\t\t\t\tPKT_TX_TUNNEL_GENEVE | PKT_TX_IEEE1588_TMST |\n+\t\t\t\tPKT_TX_QINQ_PKT))\n \t\tlong_bd = true;\n \n \tnr_bds = long_bd + tx_pkt->nb_segs;\n@@ -209,7 +211,14 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,\n \t\ttxbd->flags_type |= TX_BD_LONG_TYPE_TX_BD_LONG;\n \t\tvlan_tag_flags = 0;\n \t\tcfa_action = 0;\n-\t\tif (tx_buf->mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\t/* HW can accelerate only outer vlan in QinQ mode */\n+\t\tif (tx_buf->mbuf->ol_flags & PKT_TX_QINQ_PKT) {\n+\t\t\tvlan_tag_flags = TX_BD_LONG_CFA_META_KEY_VLAN_TAG |\n+\t\t\t\ttx_buf->mbuf->vlan_tci_outer;\n+\t\t\touter_tpid_bd = txq->bp->outer_tpid_bd &\n+\t\t\t\tBNXT_OUTER_TPID_BD_MASK;\n+\t\t\tvlan_tag_flags |= outer_tpid_bd;\n+\t\t} else if (tx_buf->mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n \t\t\t/* shurd: Should this mask at\n \t\t\t * TX_BD_LONG_CFA_META_VLAN_VID_MASK?\n \t\t\t */\n", "prefixes": [ "v3", "15/16" ] }