Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/128910/?format=api
{ "id": 128910, "url": "http://patchwork.dpdk.org/api/patches/128910/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230622113104.261556-5-artemii.morozov@arknetworks.am/", "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": "<20230622113104.261556-5-artemii.morozov@arknetworks.am>", "list_archive_url": "https://inbox.dpdk.org/dev/20230622113104.261556-5-artemii.morozov@arknetworks.am", "date": "2023-06-22T11:31:04", "name": "[v6,4/4] net/sfc: support VLAN stripping offload", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "bb29a9c287891bcc65cab1ba8d1879b6229acdfd", "submitter": { "id": 3083, "url": "http://patchwork.dpdk.org/api/people/3083/?format=api", "name": "Artemii Morozov", "email": "Artemii.Morozov@arknetworks.am" }, "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/20230622113104.261556-5-artemii.morozov@arknetworks.am/mbox/", "series": [ { "id": 28613, "url": "http://patchwork.dpdk.org/api/series/28613/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=28613", "date": "2023-06-22T11:31:00", "name": "net/sfc: support VLAN stripping offload", "version": 6, "mbox": "http://patchwork.dpdk.org/series/28613/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/128910/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/128910/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 9FCF842D23;\n\tThu, 22 Jun 2023 13:33:18 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 179C342D20;\n\tThu, 22 Jun 2023 13:33:00 +0200 (CEST)", "from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80])\n by mails.dpdk.org (Postfix) with ESMTP id C29DA427F5\n for <dev@dpdk.org>; Thu, 22 Jun 2023 13:32:54 +0200 (CEST)", "from angrod.. (unknown [141.136.90.242])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by agw.arknetworks.am (Postfix) with ESMTPSA id 496DCE1274;\n Thu, 22 Jun 2023 15:32:54 +0400 (+04)" ], "From": "Artemii Morozov <artemii.morozov@arknetworks.am>", "To": "dev@dpdk.org", "Cc": "Ivan Malov <ivan.malov@arknetworks.am>,\n Viacheslav Galaktionov <viacheslav.galaktionov@arknetworks.am>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Andy Moreton <amoreton@xilinx.com>", "Subject": "[PATCH v6 4/4] net/sfc: support VLAN stripping offload", "Date": "Thu, 22 Jun 2023 15:31:04 +0400", "Message-Id": "<20230622113104.261556-5-artemii.morozov@arknetworks.am>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230622113104.261556-1-artemii.morozov@arknetworks.am>", "References": "<20230531134122.119508-1-artemii.morozov@arknetworks.am>\n <20230622113104.261556-1-artemii.morozov@arknetworks.am>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "Extract VLAN TCI provided by the HW in the prefix and put it to mbuf.\nVLAN stripping is supported for ef100 datapath only. This is device\nlevel offload.\n\nSigned-off-by: Artemii Morozov <artemii.morozov@arknetworks.am>\nReviewed-by: Viacheslav Galaktionov <viacheslav.galaktionov@arknetworks.am>\nReviewed-by: Ivan Malov <ivan.malov@arknetworks.am>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n doc/guides/nics/sfc_efx.rst | 4 ++--\n doc/guides/rel_notes/release_23_07.rst | 6 ++++++\n drivers/net/sfc/sfc.h | 1 +\n drivers/net/sfc/sfc_dp_rx.h | 1 +\n drivers/net/sfc/sfc_ef100_rx.c | 24 +++++++++++++++++++++++-\n drivers/net/sfc/sfc_port.c | 12 ++++++++++++\n drivers/net/sfc/sfc_rx.c | 10 ++++++++++\n 7 files changed, 55 insertions(+), 3 deletions(-)", "diff": "diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst\nindex de0656876b..44fa24e1ba 100644\n--- a/doc/guides/nics/sfc_efx.rst\n+++ b/doc/guides/nics/sfc_efx.rst\n@@ -118,6 +118,8 @@ SFC EFX PMD has support for:\n \n - Port representors (see :ref: switch_representation)\n \n+- VLAN stripping (if running firmware variant supports it)\n+\n \n Non-supported Features\n ----------------------\n@@ -132,8 +134,6 @@ The features not yet supported include:\n \n - VLAN filtering\n \n-- VLAN stripping\n-\n - LRO\n \n \ndiff --git a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst\nindex dc0d250e16..b961ef139f 100644\n--- a/doc/guides/rel_notes/release_23_07.rst\n+++ b/doc/guides/rel_notes/release_23_07.rst\n@@ -177,6 +177,12 @@ New Features\n \n See :doc:`../prog_guide/pdcp_lib` for more information.\n \n+* **Updated Solarflare network PMD.**\n+\n+ Updated the Solarflare ``sfc_efx`` driver with changes including:\n+\n+ * Added VLAN stripping support on SN1000 SmartNICs\n+\n \n Removed Items\n -------------\ndiff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex e42abe42cb..b68bcc7d4f 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -73,6 +73,7 @@ struct sfc_port {\n \n \tunsigned int\t\t\tflow_ctrl;\n \tboolean_t\t\t\tflow_ctrl_autoneg;\n+\tboolean_t\t\t\tvlan_strip;\n \tsize_t\t\t\t\tpdu;\n \n \t/*\ndiff --git a/drivers/net/sfc/sfc_dp_rx.h b/drivers/net/sfc/sfc_dp_rx.h\nindex 8a504bdcf1..9f9bf28988 100644\n--- a/drivers/net/sfc/sfc_dp_rx.h\n+++ b/drivers/net/sfc/sfc_dp_rx.h\n@@ -70,6 +70,7 @@ struct sfc_dp_rx_qcreate_info {\n \tunsigned int\t\tflags;\n #define SFC_RXQ_FLAG_RSS_HASH\t0x1\n #define SFC_RXQ_FLAG_INGRESS_MPORT\t0x2\n+#define SFC_RXQ_FLAG_VLAN_STRIPPED_TCI\t0x4\n \n \t/** Rx queue size */\n \tunsigned int\t\trxq_entries;\ndiff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c\nindex 37b754fa33..07381df5cf 100644\n--- a/drivers/net/sfc/sfc_ef100_rx.c\n+++ b/drivers/net/sfc/sfc_ef100_rx.c\n@@ -68,6 +68,7 @@ struct sfc_ef100_rxq {\n #define SFC_EF100_RXQ_INGRESS_MPORT\t0x80\n #define SFC_EF100_RXQ_USER_FLAG\t\t0x100\n #define SFC_EF100_RXQ_NIC_DMA_MAP\t0x200\n+#define SFC_EF100_RXQ_VLAN_STRIPPED_TCI\t0x400\n \tunsigned int\t\t\tptr_mask;\n \tunsigned int\t\t\tevq_phase_bit_shift;\n \tunsigned int\t\t\tready_pkts;\n@@ -392,6 +393,7 @@ static const efx_rx_prefix_layout_t sfc_ef100_rx_prefix_layout = {\n \t\tSFC_EF100_RX_PREFIX_FIELD(RSS_HASH, B_FALSE),\n \t\tSFC_EF100_RX_PREFIX_FIELD(USER_FLAG, B_FALSE),\n \t\tSFC_EF100_RX_PREFIX_FIELD(USER_MARK, B_FALSE),\n+\t\tSFC_EF100_RX_PREFIX_FIELD(VLAN_STRIP_TCI, B_FALSE),\n \n #undef\tSFC_EF100_RX_PREFIX_FIELD\n \t}\n@@ -472,6 +474,14 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,\n \t\t\t\t\t\tESF_GZ_RX_PREFIX_INGRESS_MPORT);\n \t}\n \n+\tif (rxq->flags & SFC_EF100_RXQ_VLAN_STRIPPED_TCI &&\n+\t EFX_TEST_XWORD_BIT(rx_prefix[0],\n+\t\t\t\t ESF_GZ_RX_PREFIX_VLAN_STRIPPED_LBN)) {\n+\t\tol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;\n+\t\tm->vlan_tci = EFX_XWORD_FIELD(rx_prefix[0],\n+\t\t\t\t\t\tESF_GZ_RX_PREFIX_VLAN_STRIP_TCI);\n+\t}\n+\n \tm->ol_flags = ol_flags;\n \treturn true;\n }\n@@ -813,6 +823,9 @@ sfc_ef100_rx_qcreate(uint16_t port_id, uint16_t queue_id,\n \tif (info->flags & SFC_RXQ_FLAG_INGRESS_MPORT)\n \t\trxq->flags |= SFC_EF100_RXQ_INGRESS_MPORT;\n \n+\tif (info->flags & SFC_RXQ_FLAG_VLAN_STRIPPED_TCI)\n+\t\trxq->flags |= SFC_EF100_RXQ_VLAN_STRIPPED_TCI;\n+\n \tsfc_ef100_rx_debug(rxq, \"RxQ doorbell is %p\", rxq->doorbell);\n \n \t*dp_rxqp = &rxq->dp;\n@@ -892,6 +905,15 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr,\n \t (rxq->flags & SFC_EF100_RXQ_INGRESS_MPORT))\n \t\treturn ENOTSUP;\n \n+\t/*\n+\t * Exclude the SFC_EF100_RXQ_VLAN_STRIPPED_TCI if offload was not requested\n+\t * or the prefix does not contain the corresponding field.\n+\t */\n+\tif (!((rxq->flags & SFC_EF100_RXQ_VLAN_STRIPPED_TCI) &&\n+\t\t((unsup_rx_prefix_fields &\n+\t\t(1U << EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI)) == 0)))\n+\t\trxq->flags &= ~SFC_EF100_RXQ_VLAN_STRIPPED_TCI;\n+\n \trxq->prefix_size = pinfo->erpl_length;\n \trxq->rearm_data = sfc_ef100_mk_mbuf_rearm_data(rxq->dp.dpq.port_id,\n \t\t\t\t\t\t rxq->prefix_size);\n@@ -1004,7 +1026,7 @@ struct sfc_dp_rx sfc_ef100_rx = {\n \t\t\t\t SFC_DP_RX_FEAT_FLOW_MARK |\n \t\t\t\t SFC_DP_RX_FEAT_INTR |\n \t\t\t\t SFC_DP_RX_FEAT_STATS,\n-\t.dev_offload_capa\t= 0,\n+\t.dev_offload_capa\t= RTE_ETH_RX_OFFLOAD_VLAN_STRIP,\n \t.queue_offload_capa\t= RTE_ETH_RX_OFFLOAD_CHECKSUM |\n \t\t\t\t RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |\n \t\t\t\t RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM |\ndiff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c\nindex 0c887ddedb..f1354f5432 100644\n--- a/drivers/net/sfc/sfc_port.c\n+++ b/drivers/net/sfc/sfc_port.c\n@@ -225,6 +225,11 @@ sfc_port_start(struct sfc_adapter *sa)\n \tif (rc != 0)\n \t\tgoto fail_mac_fcntl_set;\n \n+\tsfc_log_init(sa, \"set vlan strip to %u\", port->vlan_strip);\n+\trc = efx_port_vlan_strip_set(sa->nic, port->vlan_strip);\n+\tif (rc != 0)\n+\t\tgoto fail_mac_vlan_strip_set;\n+\n \t/* Preserve pause capabilities set by above efx_mac_fcntl_set() */\n \tefx_phy_adv_cap_get(sa->nic, EFX_PHY_CAP_CURRENT, &phy_adv_cap);\n \tSFC_ASSERT((port->phy_adv_cap & phy_pause_caps) == 0);\n@@ -339,6 +344,7 @@ sfc_port_start(struct sfc_adapter *sa)\n fail_mac_pdu_set:\n fail_phy_adv_cap_set:\n fail_mac_fcntl_set:\n+fail_mac_vlan_strip_set:\n #if EFSYS_OPT_LOOPBACK\n fail_loopback_set:\n #endif\n@@ -375,11 +381,17 @@ sfc_port_configure(struct sfc_adapter *sa)\n {\n \tconst struct rte_eth_dev_data *dev_data = sa->eth_dev->data;\n \tstruct sfc_port *port = &sa->port;\n+\tconst struct rte_eth_rxmode *rxmode = &dev_data->dev_conf.rxmode;\n \n \tsfc_log_init(sa, \"entry\");\n \n \tport->pdu = EFX_MAC_PDU(dev_data->mtu);\n \n+\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)\n+\t\tport->vlan_strip = true;\n+\telse\n+\t\tport->vlan_strip = false;\n+\n \treturn 0;\n }\n \ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex edd0f0c038..505d95a9aa 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -938,6 +938,9 @@ sfc_rx_get_offload_mask(struct sfc_adapter *sa)\n \tif (encp->enc_tunnel_encapsulations_supported == 0)\n \t\tno_caps |= RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM;\n \n+\tif (encp->enc_rx_vlan_stripping_supported == 0)\n+\t\tno_caps |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;\n+\n \treturn ~no_caps;\n }\n \n@@ -1109,6 +1112,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,\n \tstruct sfc_rxq *rxq;\n \tstruct sfc_dp_rx_qcreate_info info;\n \tstruct sfc_dp_rx_hw_limits hw_limits;\n+\tstruct sfc_port *port = &sa->port;\n \tuint16_t rx_free_thresh;\n \tconst char *error;\n \n@@ -1193,6 +1197,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,\n \t sfc_ft_is_active(sa))\n \t\trxq_info->type_flags |= EFX_RXQ_FLAG_USER_MARK;\n \n+\tif (port->vlan_strip)\n+\t\trxq_info->type_flags |= EFX_RXQ_FLAG_VLAN_STRIPPED_TCI;\n+\n \trc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_RX, sw_index,\n \t\t\t evq_entries, socket_id, &evq);\n \tif (rc != 0)\n@@ -1228,6 +1235,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,\n \tif (rxq_info->type_flags & EFX_RXQ_FLAG_INGRESS_MPORT)\n \t\trxq_info->rxq_flags |= SFC_RXQ_FLAG_INGRESS_MPORT;\n \n+\tif (rxq_info->type_flags & EFX_RXQ_FLAG_VLAN_STRIPPED_TCI)\n+\t\trxq_info->rxq_flags |= SFC_RXQ_FLAG_VLAN_STRIPPED_TCI;\n+\n \trxq->buf_size = buf_size;\n \n \trc = sfc_dma_alloc(sa, \"rxq\", sw_index, EFX_NIC_DMA_ADDR_RX_RING,\n", "prefixes": [ "v6", "4/4" ] }