Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17404/?format=api
{ "id": 17404, "url": "http://patches.dpdk.org/api/patches/17404/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1480664691-26561-20-git-send-email-arybchenko@solarflare.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": "<1480664691-26561-20-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1480664691-26561-20-git-send-email-arybchenko@solarflare.com", "date": "2016-12-02T07:44:39", "name": "[dpdk-dev,19/31] net/sfc: support scattered Rx DMA", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "fae777f9567a8188ba77074e744ec8df59930450", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1480664691-26561-20-git-send-email-arybchenko@solarflare.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/17404/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/17404/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 41B86FA5F;\n\tFri, 2 Dec 2016 08:46:02 +0100 (CET)", "from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com\n\t[209.65.160.78]) by dpdk.org (Postfix) with ESMTP id 95B2FFA43\n\tfor <dev@dpdk.org>; Fri, 2 Dec 2016 08:45:16 +0100 (CET)", "from unknown [12.187.104.26]\n\tby nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with SMTP id\n\tc8621485.0.106138.00-2390.245970.nbfkord-smmo02.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tFri, 02 Dec 2016 07:45:16 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1044.25; Thu, 1 Dec 2016 23:45:02 -0800", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1044.25 via Frontend Transport; Thu, 1 Dec 2016 23:45:02 -0800", "from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com\n\t[10.17.10.10])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tuB27j09Q005901 for <dev@dpdk.org>; Fri, 2 Dec 2016 07:45:00 GMT", "from uklogin.uk.solarflarecom.com (localhost.localdomain\n\t[127.0.0.1])\n\tby uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tuB27ixwu026628 for <dev@dpdk.org>; Fri, 2 Dec 2016 07:45:00 GMT" ], "X-MXL-Hash": "5841268c37bb9d3b-638726afe1069e1986211e6c477bd2365cd65eca", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Fri, 2 Dec 2016 07:44:39 +0000", "Message-ID": "<1480664691-26561-20-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.2.3", "In-Reply-To": "<1480664691-26561-1-git-send-email-arybchenko@solarflare.com>", "References": "<1480664691-26561-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-AnalysisOut": [ "[v=2.1 cv=NIXTjhOg c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==]", "[:17 a=n5n_aSjo0skA:10 a=zRKbQ67AAAAA:8 a=5T_ch_uTvokPGJSLu]", "[ScA:9 a=PA03WX8tBzeizutn5_OT:22]" ], "X-Spam": "[F=0.2000000000; CM=0.500; S=0.200(2015072901)]", "X-MAIL-FROM": "<arybchenko@solarflare.com>", "X-SOURCE-IP": "[12.187.104.26]", "Subject": "[dpdk-dev] [PATCH 19/31] net/sfc: support scattered Rx DMA", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Reviewed-by: Andrew Lee <alee@solarflare.com>\nReviewed-by: Robert Stonehouse <rstonehouse@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n doc/guides/nics/features/sfc_efx.ini | 1 +\n doc/guides/nics/sfc_efx.rst | 4 ++--\n drivers/net/sfc/sfc_ethdev.c | 1 +\n drivers/net/sfc/sfc_rx.c | 39 +++++++++++++++++++++++++++---------\n 4 files changed, 34 insertions(+), 11 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/sfc_efx.ini b/doc/guides/nics/features/sfc_efx.ini\nindex b5887d5..74cc942 100644\n--- a/doc/guides/nics/features/sfc_efx.ini\n+++ b/doc/guides/nics/features/sfc_efx.ini\n@@ -9,6 +9,7 @@ Link status = Y\n Link status event = Y\n MTU update = Y\n Jumbo frame = Y\n+Scattered Rx = Y\n Promiscuous mode = Y\n Allmulticast mode = Y\n Multicast MAC filter = Y\ndiff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst\nindex 57e8318..a0f25d3 100644\n--- a/doc/guides/nics/sfc_efx.rst\n+++ b/doc/guides/nics/sfc_efx.rst\n@@ -66,6 +66,8 @@ SFC EFX PMD has support for:\n \n - Received packet type information\n \n+- Scattered Rx DMA for packet that are larger that a single Rx descriptor\n+\n \n Non-supported Features\n ----------------------\n@@ -86,8 +88,6 @@ The features not yet supported include:\n \n - VLAN stripping\n \n-- Scattered receive\n-\n - LRO\n \n \ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 59dcdb4..f1b655b 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -840,6 +840,7 @@ sfc_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t rx_queue_id,\n \tqinfo->mp = rxq->refill_mb_pool;\n \tqinfo->conf.rx_free_thresh = rxq->refill_threshold;\n \tqinfo->conf.rx_drop_en = 1;\n+\tqinfo->scattered_rx = (rxq_info->type == EFX_RXQ_TYPE_SCATTER);\n \tqinfo->nb_desc = rxq_info->entries;\n \n \tsfc_adapter_unlock(sa);\ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 802beb2..2909ec0 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -193,6 +193,7 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \tunsigned int prefix_size = rxq->prefix_size;\n \tunsigned int done_pkts = 0;\n \tboolean_t discard_next = B_FALSE;\n+\tstruct rte_mbuf *scatter_pkt = NULL;\n \n \tif (unlikely((rxq->state & SFC_RXQ_RUNNING) == 0))\n \t\treturn 0;\n@@ -218,9 +219,6 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\tif (desc_flags & (EFX_ADDR_MISMATCH | EFX_DISCARD))\n \t\t\tgoto discard;\n \n-\t\tif (desc_flags & EFX_PKT_CONT)\n-\t\t\tgoto discard;\n-\n \t\tif (desc_flags & EFX_PKT_PREFIX_LEN) {\n \t\t\tuint16_t tmp_size;\n \t\t\tint rc __rte_unused;\n@@ -237,6 +235,29 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\trte_pktmbuf_data_len(m) = seg_len;\n \t\trte_pktmbuf_pkt_len(m) = seg_len;\n \n+\t\tif (scatter_pkt != NULL) {\n+\t\t\tif (rte_pktmbuf_chain(scatter_pkt, m) != 0) {\n+\t\t\t\trte_mempool_put(rxq->refill_mb_pool,\n+\t\t\t\t\t\tscatter_pkt);\n+\t\t\t\tgoto discard;\n+\t\t\t}\n+\t\t\t/* The packet to deliver */\n+\t\t\tm = scatter_pkt;\n+\t\t}\n+\n+\t\tif (desc_flags & EFX_PKT_CONT) {\n+\t\t\t/* The packet is scattered, more fragments to come */\n+\t\t\tscatter_pkt = m;\n+\t\t\t/* Futher fragments have no prefix */\n+\t\t\tprefix_size = 0;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* Scattered packet is done */\n+\t\tscatter_pkt = NULL;\n+\t\t/* The first fragment of the packet has prefix */\n+\t\tprefix_size = rxq->prefix_size;\n+\n \t\tm->ol_flags = sfc_rx_desc_flags_to_offload_flags(desc_flags);\n \t\tm->packet_type = sfc_rx_desc_flags_to_packet_type(desc_flags);\n \n@@ -250,6 +271,9 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\trxd->mbuf = NULL;\n \t}\n \n+\t/* pending is only moved when entire packet is received */\n+\tSFC_ASSERT(scatter_pkt == NULL);\n+\n \trxq->completed = completed;\n \n \tsfc_rx_qrefill(rxq);\n@@ -618,7 +642,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \n \tSFC_ASSERT(nb_rx_desc <= rxq_info->max_entries);\n \trxq_info->entries = nb_rx_desc;\n-\trxq_info->type = EFX_RXQ_TYPE_DEFAULT;\n+\trxq_info->type =\n+\t\tsa->eth_dev->data->dev_conf.rxmode.enable_scatter ?\n+\t\tEFX_RXQ_TYPE_SCATTER : EFX_RXQ_TYPE_DEFAULT;\n \n \tevq_index = sfc_evq_index_by_rxq_sw_index(sa, sw_index);\n \n@@ -806,11 +832,6 @@ sfc_rx_check_mode(struct sfc_adapter *sa, struct rte_eth_rxmode *rxmode)\n \t\trxmode->hw_strip_crc = 1;\n \t}\n \n-\tif (rxmode->enable_scatter) {\n-\t\tsfc_err(sa, \"Scatter on Rx not supported\");\n-\t\trc = EINVAL;\n-\t}\n-\n \tif (rxmode->enable_lro) {\n \t\tsfc_err(sa, \"LRO not supported\");\n \t\trc = EINVAL;\n", "prefixes": [ "dpdk-dev", "19/31" ] }