Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138209/?format=api
{ "id": 138209, "url": "http://patchwork.dpdk.org/api/patches/138209/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240312093611.359025-1-weh@linux.microsoft.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": "<20240312093611.359025-1-weh@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240312093611.359025-1-weh@linux.microsoft.com", "date": "2024-03-12T09:36:11", "name": "[v2,1/1] net/mana: add vlan tagging support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "205658beeedc972d51f7a56a1913f1a89791f3e7", "submitter": { "id": 3286, "url": "http://patchwork.dpdk.org/api/people/3286/?format=api", "name": "Wei Hu", "email": "weh@linux.microsoft.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20240312093611.359025-1-weh@linux.microsoft.com/mbox/", "series": [ { "id": 31475, "url": "http://patchwork.dpdk.org/api/series/31475/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31475", "date": "2024-03-12T09:36:11", "name": "[v2,1/1] net/mana: add vlan tagging support", "version": 2, "mbox": "http://patchwork.dpdk.org/series/31475/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/138209/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/138209/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 03D8D43C90;\n\tTue, 12 Mar 2024 10:41:40 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id DA785402D8;\n\tTue, 12 Mar 2024 10:41:39 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id B8C9840282\n for <dev@dpdk.org>; Tue, 12 Mar 2024 10:36:34 +0100 (CET)", "from weh-ub2204-202-s0.corp.microsoft.com (unknown [131.107.8.26])\n by linux.microsoft.com (Postfix) with ESMTPSA id C79FD20B74C0;\n Tue, 12 Mar 2024 02:36:33 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com C79FD20B74C0", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1710236193;\n bh=EwhyOJ91LUuUc9+cWwZGpYxKLqDSqeSyPrWVsCaIQwE=;\n h=From:To:Cc:Subject:Date:From;\n b=rADxIhwekER50anj2FtIka3+jAiTwEXvNhz1BxCAJY1lCql8JdJ+KMMqfyXsvoXFg\n CTlsB8ZGdy1Vczw5zCDjdGPpD7PkNxfrSxMBeVpClXvIrmukvjq1C9zCCZ0GZK5p1d\n hwil5DgV9LC46ixjwJQQmSlPKiUCATDDkXw7NB8A=", "From": "Wei Hu <weh@linux.microsoft.com>", "To": "ferruh.yigit@amd.com, andrew.rybchenko@oktetlabs.ru, thomas@monjalon.net,\n Long Li <longli@microsoft.com>", "Cc": "dev@dpdk.org, Wei Hu <weh@linux.microsoft.com>, Wei Hu <weh@microsoft.com>", "Subject": "[PATCH v2 1/1] net/mana: add vlan tagging support", "Date": "Tue, 12 Mar 2024 09:36:11 +0000", "Message-Id": "<20240312093611.359025-1-weh@linux.microsoft.com>", "X-Mailer": "git-send-email 2.34.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Approved-At": "Tue, 12 Mar 2024 10:41:38 +0100", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "For tx path, use LONG_PACKET_FORMAT if vlan tag is present. For rx,\nextract vlan id from oob, put into mbuf and set the vlan flags in\nmbuf.\n\nSigned-off-by: Wei Hu <weh@microsoft.com>\n---\n\nv2:\n- Use existing vlan tag processing macros.\n- Add vlan header back if vlan_strip flag is not set on the receiving path.\n\n drivers/net/mana/mana.c | 3 +++\n drivers/net/mana/mana.h | 4 ++++\n drivers/net/mana/rx.c | 15 +++++++++++++++\n drivers/net/mana/tx.c | 21 ++++++++++++++++++---\n 4 files changed, 40 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c\nindex 2df2461d2f..68c625258e 100644\n--- a/drivers/net/mana/mana.c\n+++ b/drivers/net/mana/mana.c\n@@ -94,6 +94,9 @@ mana_dev_configure(struct rte_eth_dev *dev)\n \t\treturn -EINVAL;\n \t}\n \n+\tpriv->vlan_strip = !!(dev_conf->rxmode.offloads &\n+\t\t\t RTE_ETH_RX_OFFLOAD_VLAN_STRIP);\n+\n \tpriv->num_queues = dev->data->nb_rx_queues;\n \n \tmanadv_set_context_attr(priv->ib_ctx, MANADV_CTX_ATTR_BUF_ALLOCATORS,\ndiff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h\nindex 3626925871..37f654f0e6 100644\n--- a/drivers/net/mana/mana.h\n+++ b/drivers/net/mana/mana.h\n@@ -21,10 +21,12 @@ struct mana_shared_data {\n #define MANA_MAX_MAC_ADDR 1\n \n #define MANA_DEV_RX_OFFLOAD_SUPPORT ( \\\n+\t\tRTE_ETH_RX_OFFLOAD_VLAN_STRIP | \\\n \t\tRTE_ETH_RX_OFFLOAD_CHECKSUM | \\\n \t\tRTE_ETH_RX_OFFLOAD_RSS_HASH)\n \n #define MANA_DEV_TX_OFFLOAD_SUPPORT ( \\\n+\t\tRTE_ETH_TX_OFFLOAD_VLAN_INSERT | \\\n \t\tRTE_ETH_TX_OFFLOAD_MULTI_SEGS | \\\n \t\tRTE_ETH_TX_OFFLOAD_IPV4_CKSUM | \\\n \t\tRTE_ETH_TX_OFFLOAD_TCP_CKSUM | \\\n@@ -345,6 +347,8 @@ struct mana_priv {\n \t/* IB device port */\n \tuint8_t dev_port;\n \n+\tuint8_t vlan_strip;\n+\n \tstruct ibv_context *ib_ctx;\n \tstruct ibv_pd *ib_pd;\n \tstruct ibv_pd *ib_parent_pd;\ndiff --git a/drivers/net/mana/rx.c b/drivers/net/mana/rx.c\nindex 16e647baf5..7f646fcee4 100644\n--- a/drivers/net/mana/rx.c\n+++ b/drivers/net/mana/rx.c\n@@ -532,6 +532,21 @@ mana_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t\tmbuf->hash.rss = oob->packet_info[pkt_idx].packet_hash;\n \t\t}\n \n+\t\tif (oob->rx_vlan_tag_present) {\n+\t\t\tmbuf->ol_flags |=\n+\t\t\t\tRTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;\n+\t\t\tmbuf->vlan_tci = oob->rx_vlan_id;\n+\n+\t\t\tif (!priv->vlan_strip && rte_vlan_insert(&mbuf)) {\n+\t\t\t\tDRV_LOG(ERR, \"vlan insert failed\");\n+\t\t\t\trxq->stats.errors++;\n+\t\t\t\trte_pktmbuf_free(mbuf);\n+\n+\t\t\t\ti++;\n+\t\t\t\tgoto drop;\n+\t\t\t}\n+\t\t}\n+\n \t\tpkts[pkt_received++] = mbuf;\n \t\trxq->stats.packets++;\n \t\trxq->stats.bytes += mbuf->data_len;\ndiff --git a/drivers/net/mana/tx.c b/drivers/net/mana/tx.c\nindex 58c4a1d976..272a28bcba 100644\n--- a/drivers/net/mana/tx.c\n+++ b/drivers/net/mana/tx.c\n@@ -254,7 +254,18 @@ mana_tx_burst(void *dpdk_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t}\n \n \t\t/* Fill in the oob */\n-\t\ttx_oob.short_oob.packet_format = SHORT_PACKET_FORMAT;\n+\t\tif (m_pkt->ol_flags & RTE_MBUF_F_TX_VLAN) {\n+\t\t\ttx_oob.short_oob.packet_format = LONG_PACKET_FORMAT;\n+\t\t\ttx_oob.long_oob.inject_vlan_prior_tag = 1;\n+\t\t\ttx_oob.long_oob.priority_code_point =\n+\t\t\t\tRTE_VLAN_TCI_PRI(m_pkt->vlan_tci);\n+\t\t\ttx_oob.long_oob.drop_eligible_indicator =\n+\t\t\t\tRTE_VLAN_TCI_DEI(m_pkt->vlan_tci);\n+\t\t\ttx_oob.long_oob.vlan_identifier =\n+\t\t\t\tRTE_VLAN_TCI_ID(m_pkt->vlan_tci);\n+\t\t} else {\n+\t\t\ttx_oob.short_oob.packet_format = SHORT_PACKET_FORMAT;\n+\t\t}\n \t\ttx_oob.short_oob.tx_is_outer_ipv4 =\n \t\t\tm_pkt->ol_flags & RTE_MBUF_F_TX_IPV4 ? 1 : 0;\n \t\ttx_oob.short_oob.tx_is_outer_ipv6 =\n@@ -409,8 +420,12 @@ mana_tx_burst(void *dpdk_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \n \t\twork_req.sgl = sgl.gdma_sgl;\n \t\twork_req.num_sgl_elements = m_pkt->nb_segs;\n-\t\twork_req.inline_oob_size_in_bytes =\n-\t\t\tsizeof(struct transmit_short_oob_v2);\n+\t\tif (tx_oob.short_oob.packet_format == SHORT_PACKET_FORMAT)\n+\t\t\twork_req.inline_oob_size_in_bytes =\n+\t\t\t\tsizeof(struct transmit_short_oob_v2);\n+\t\telse\n+\t\t\twork_req.inline_oob_size_in_bytes =\n+\t\t\t\tsizeof(struct transmit_oob_v2);\n \t\twork_req.inline_oob_data = &tx_oob;\n \t\twork_req.flags = 0;\n \t\twork_req.client_data_unit = NOT_USING_CLIENT_DATA_UNIT;\n", "prefixes": [ "v2", "1/1" ] }