Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17321/?format=api
https://patches.dpdk.org/api/patches/17321/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1480436367-20749-51-git-send-email-arybchenko@solarflare.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": "<1480436367-20749-51-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1480436367-20749-51-git-send-email-arybchenko@solarflare.com", "date": "2016-11-29T16:19:22", "name": "[dpdk-dev,v2,50/55] net/sfc: discard scattered packet on Rx correctly", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "dfd567c2460978ca1b35d74a9d1269e0eb5401d7", "submitter": { "id": 607, "url": "https://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.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/1480436367-20749-51-git-send-email-arybchenko@solarflare.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/17321/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/17321/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 38C18FAFD;\n\tTue, 29 Nov 2016 17:22:59 +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 D3D935585\n\tfor <dev@dpdk.org>; Tue, 29 Nov 2016 17:20:57 +0100 (CET)", "from unknown [12.187.104.26] (EHLO nbfkord-smmo02.seg.att.com)\n\tby nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id\n\t9eaad385.2b92d8eba940.1895569.00-2490.4144471.nbfkord-smmo02.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tTue, 29 Nov 2016 16:20:57 +0000 (UTC)", "from unknown [12.187.104.26]\n\tby nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with SMTP id\n\t6eaad385.0.1895549.00-2379.4144440.nbfkord-smmo02.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tTue, 29 Nov 2016 16:20:55 +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; Tue, 29 Nov 2016 08:20:26 -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; Tue, 29 Nov 2016 08:20:26 -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\tuATGKOJb030050; Tue, 29 Nov 2016 16:20:24 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\tuATGKM1w021233; Tue, 29 Nov 2016 16:20:24 GMT" ], "X-MXL-Hash": [ "583daae92428b97c-6fa5697e3ac4b30a08adaaefe75e0771dfd60276", "583daae75a92011b-bb2d1118a36d10a96662010fec701ac4fbbe8b53" ], "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "<ferruh.yigit@intel.com>", "Date": "Tue, 29 Nov 2016 16:19:22 +0000", "Message-ID": "<1480436367-20749-51-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.2.3", "In-Reply-To": "<1480436367-20749-1-git-send-email-arybchenko@solarflare.com>", "References": "<1479740470-6723-1-git-send-email-arybchenko@solarflare.com>\n\t<1480436367-20749-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-AnalysisOut": [ "[v=2.1 cv=UI/baXry c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==]", "[:17 a=L24OOQBejmoA:10 a=zRKbQ67AAAAA:8 a=i8CBxiAHqKtx8WWop]", "[jEA: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 v2 50/55] net/sfc: discard scattered packet on Rx\n\tcorrectly", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <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": "Since Rx scatter is not supported, all scattered packets are discarded.\nIt is not always possible to disable scatter on Huntington, so we\nshould handle scattered packets correctly in any case.\n\nReviewed-by: Andy Moreton <amoreton@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/sfc_ev.c | 22 +++++++++++++++++++++-\n drivers/net/sfc/sfc_rx.c | 8 ++++++++\n 2 files changed, 29 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c\nindex d9e8459..eed1b52 100644\n--- a/drivers/net/sfc/sfc_ev.c\n+++ b/drivers/net/sfc/sfc_ev.c\n@@ -91,7 +91,27 @@ sfc_ev_rx(void *arg, __rte_unused uint32_t label, uint32_t id,\n \tdelta = (stop >= pending_id) ? (stop - pending_id) :\n \t\t(rxq->ptr_mask + 1 - pending_id + stop);\n \n-\tif (unlikely(delta > rxq->batch_max)) {\n+\tif (delta == 0) {\n+\t\t/*\n+\t\t * Rx event with no new descriptors done and zero length\n+\t\t * is used to abort scattered packet when there is no room\n+\t\t * for the tail.\n+\t\t */\n+\t\tif (unlikely(size != 0)) {\n+\t\t\tevq->exception = B_TRUE;\n+\t\t\tsfc_err(evq->sa,\n+\t\t\t\t\"EVQ %u RxQ %u invalid RX abort \"\n+\t\t\t\t\"(id=%#x size=%u flags=%#x); needs restart\\n\",\n+\t\t\t\tevq->evq_index, sfc_rxq_sw_index(rxq),\n+\t\t\t\tid, size, flags);\n+\t\t\tgoto done;\n+\t\t}\n+\n+\t\t/* Add discard flag to the first fragment */\n+\t\trxq->sw_desc[pending_id].flags |= EFX_DISCARD;\n+\t\t/* Remove continue flag from the last fragment */\n+\t\trxq->sw_desc[id].flags &= ~EFX_PKT_CONT;\n+\t} else if (unlikely(delta > rxq->batch_max)) {\n \t\tevq->exception = B_TRUE;\n \n \t\tsfc_err(evq->sa,\ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 5587620..bd41131 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -137,6 +137,7 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \tunsigned int completed;\n \tunsigned int prefix_size = rxq->prefix_size;\n \tunsigned int done_pkts = 0;\n+\tboolean_t discard_next = B_FALSE;\n \n \tif (unlikely((rxq->state & SFC_RXQ_RUNNING) == 0))\n \t\treturn 0;\n@@ -156,9 +157,15 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\tm = rxd->mbuf;\n \t\tdesc_flags = rxd->flags;\n \n+\t\tif (discard_next)\n+\t\t\tgoto discard;\n+\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@@ -182,6 +189,7 @@ sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\tcontinue;\n \n discard:\n+\t\tdiscard_next = ((desc_flags & EFX_PKT_CONT) != 0);\n \t\trte_mempool_put(rxq->refill_mb_pool, m);\n \t\trxd->mbuf = NULL;\n \t}\n", "prefixes": [ "dpdk-dev", "v2", "50/55" ] }{ "id": 17321, "url": "