Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17151/?format=api
{ "id": 17151, "url": "http://patchwork.dpdk.org/api/patches/17151/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1479740470-6723-51-git-send-email-arybchenko@solarflare.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": "<1479740470-6723-51-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1479740470-6723-51-git-send-email-arybchenko@solarflare.com", "date": "2016-11-21T15:01:04", "name": "[dpdk-dev,50/56] net/sfc: implement device callback to Rx burst of packets", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "0e1e0cb947f1203b306440eb569159f07de57136", "submitter": { "id": 607, "url": "http://patchwork.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.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/1479740470-6723-51-git-send-email-arybchenko@solarflare.com/mbox/", "series": [], "comments": "http://patchwork.dpdk.org/api/patches/17151/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/17151/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 AEC1DD60E;\n\tMon, 21 Nov 2016 16:03:42 +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 8F390376D\n\tfor <dev@dpdk.org>; Mon, 21 Nov 2016 16:01:49 +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\td5c03385.0.1541303.00-2347.3424283.nbfkord-smmo02.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tMon, 21 Nov 2016 15:01:49 +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; Mon, 21 Nov 2016 07:01:22 -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; Mon, 21 Nov 2016 07:01:22 -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\tuALF1LmC007248 for <dev@dpdk.org>; Mon, 21 Nov 2016 15:01:21 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\tuALF1J3f006765 for <dev@dpdk.org>; Mon, 21 Nov 2016 15:01:21 GMT" ], "X-MXL-Hash": "58330c5d1be8ac0d-bc6b218059a734e45c549eb25806516cccea3944", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Mon, 21 Nov 2016 15:01:04 +0000", "Message-ID": "<1479740470-6723-51-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.2.3", "In-Reply-To": "<1479740470-6723-1-git-send-email-arybchenko@solarflare.com>", "References": "<1479740470-6723-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=WF4fpBksyN55-4w9B]", "[egA:9 a=PA03WX8tBzeizutn5_OT:22]" ], "X-Spam": "[F=0.4443433973; CM=0.500; S=0.444(2015072901)]", "X-MAIL-FROM": "<arybchenko@solarflare.com>", "X-SOURCE-IP": "[12.187.104.26]", "Subject": "[dpdk-dev] [PATCH 50/56] net/sfc: implement device callback to Rx\n\tburst of packets", "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": "Reviewed-by: Andy Moreton <amoreton@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/efx/sfc_ethdev.c | 2 ++\n drivers/net/sfc/efx/sfc_ev.c | 47 ++++++++++++++++++++++++--\n drivers/net/sfc/efx/sfc_rx.c | 72 +++++++++++++++++++++++++++++++++++++++-\n drivers/net/sfc/efx/sfc_rx.h | 7 ++++\n 4 files changed, 125 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/sfc/efx/sfc_ethdev.c b/drivers/net/sfc/efx/sfc_ethdev.c\nindex c889325..61ae1bd 100644\n--- a/drivers/net/sfc/efx/sfc_ethdev.c\n+++ b/drivers/net/sfc/efx/sfc_ethdev.c\n@@ -310,6 +310,7 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)\n \tether_addr_copy(from, &dev->data->mac_addrs[0]);\n \n \tdev->dev_ops = &sfc_eth_dev_ops;\n+\tdev->rx_pkt_burst = &sfc_recv_pkts;\n \n \tsfc_adapter_unlock(sa);\n \n@@ -347,6 +348,7 @@ sfc_eth_dev_uninit(struct rte_eth_dev *dev)\n \tdev->data->mac_addrs = NULL;\n \n \tdev->dev_ops = NULL;\n+\tdev->rx_pkt_burst = NULL;\n \n \tsfc_kvargs_cleanup(sa);\n \ndiff --git a/drivers/net/sfc/efx/sfc_ev.c b/drivers/net/sfc/efx/sfc_ev.c\nindex 6750bfb..ae966fc 100644\n--- a/drivers/net/sfc/efx/sfc_ev.c\n+++ b/drivers/net/sfc/efx/sfc_ev.c\n@@ -69,9 +69,52 @@ static boolean_t\n sfc_ev_rx(void *arg, uint32_t label, uint32_t id, uint32_t size, uint16_t flags)\n {\n \tstruct sfc_evq *evq = arg;\n+\tstruct sfc_rxq *rxq;\n+\tunsigned int stop;\n+\tunsigned int pending_id;\n+\tunsigned int delta;\n+\tunsigned int i;\n+\tstruct sfc_rx_sw_desc *rxd;\n \n-\tsfc_err(evq->sa, \"EVQ %u unexpected Rx event\", evq->evq_index);\n-\treturn B_TRUE;\n+\tif (unlikely(evq->exception))\n+\t\tgoto done;\n+\n+\trxq = evq->rxq;\n+\n+\tSFC_ASSERT(rxq != NULL);\n+\tSFC_ASSERT(rxq->evq == evq);\n+\tSFC_ASSERT(rxq->state & SFC_RXQ_STARTED);\n+\n+\tstop = (id + 1) & rxq->ptr_mask;\n+\tpending_id = rxq->pending & rxq->ptr_mask;\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+\t\tevq->exception = B_TRUE;\n+\n+\t\tsfc_err(evq->sa,\n+\t\t\t\"EVQ %u RxQ %u completion out of order \"\n+\t\t\t\"(id=%#x delta=%u flags=%#x); needs restart\\n\",\n+\t\t\tevq->evq_index, sfc_rxq_sw_index(rxq), id, delta,\n+\t\t\tflags);\n+\n+\t\tgoto done;\n+\t}\n+\n+\tfor (i = pending_id; i != stop; i = (i + 1) & rxq->ptr_mask) {\n+\t\trxd = &rxq->sw_desc[i];\n+\n+\t\trxd->flags = flags;\n+\n+\t\tSFC_ASSERT(size < (1 << 16));\n+\t\trxd->size = (uint16_t)size;\n+\t}\n+\n+\trxq->pending += delta;\n+\n+done:\n+\treturn B_FALSE;\n }\n \n static boolean_t\ndiff --git a/drivers/net/sfc/efx/sfc_rx.c b/drivers/net/sfc/efx/sfc_rx.c\nindex 8e82ee0..307734e 100644\n--- a/drivers/net/sfc/efx/sfc_rx.c\n+++ b/drivers/net/sfc/efx/sfc_rx.c\n@@ -32,6 +32,7 @@\n #include \"efx.h\"\n \n #include \"sfc.h\"\n+#include \"sfc_debug.h\"\n #include \"sfc_log.h\"\n #include \"sfc_ev.h\"\n #include \"sfc_rx.h\"\n@@ -129,6 +130,69 @@ sfc_rx_qrefill(struct sfc_rxq *rxq)\n \t}\n }\n \n+uint16_t\n+sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n+{\n+\tstruct sfc_rxq *rxq = rx_queue;\n+\tunsigned int completed;\n+\tunsigned int prefix_size = rxq->prefix_size;\n+\tunsigned int done_pkts = 0;\n+\n+\tif (unlikely((rxq->state & SFC_RXQ_RUNNING) == 0))\n+\t\treturn 0;\n+\n+\tsfc_ev_qpoll(rxq->evq);\n+\n+\tcompleted = rxq->completed;\n+\twhile (completed != rxq->pending && done_pkts < nb_pkts) {\n+\t\tunsigned int id;\n+\t\tstruct sfc_rx_sw_desc *rxd;\n+\t\tstruct rte_mbuf *m;\n+\t\tunsigned int seg_len;\n+\t\tunsigned int desc_flags;\n+\n+\t\tid = completed++ & rxq->ptr_mask;\n+\t\trxd = &rxq->sw_desc[id];\n+\t\tm = rxd->mbuf;\n+\t\tdesc_flags = rxd->flags;\n+\n+\t\tif (desc_flags & (EFX_ADDR_MISMATCH | EFX_DISCARD))\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;\n+\n+\t\t\trc = efx_psuedo_hdr_pkt_length_get(rxq->common,\n+\t\t\t\trte_pktmbuf_mtod(m, uint8_t *), &tmp_size);\n+\t\t\tSFC_ASSERT(rc == 0);\n+\t\t\tseg_len = tmp_size;\n+\t\t} else {\n+\t\t\tseg_len = rxd->size - prefix_size;\n+\t\t}\n+\n+\t\tm->data_off += prefix_size;\n+\t\trte_pktmbuf_data_len(m) = seg_len;\n+\t\trte_pktmbuf_pkt_len(m) = seg_len;\n+\n+\t\tm->packet_type = RTE_PTYPE_L2_ETHER;\n+\n+\t\t*rx_pkts++ = m;\n+\t\tdone_pkts++;\n+\t\tcontinue;\n+\n+discard:\n+\t\trte_mempool_put(rxq->refill_mb_pool, m);\n+\t\trxd->mbuf = NULL;\n+\t}\n+\n+\trxq->completed = completed;\n+\n+\tsfc_rx_qrefill(rxq);\n+\n+\treturn done_pkts;\n+}\n+\n static void\n sfc_rx_qpurge(struct sfc_rxq *rxq)\n {\n@@ -226,7 +290,7 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n \n \trxq->pending = rxq->completed = rxq->added = rxq->pushed = 0;\n \n-\trxq->state |= SFC_RXQ_STARTED;\n+\trxq->state |= (SFC_RXQ_STARTED | SFC_RXQ_RUNNING);\n \n \tsfc_rx_qrefill(rxq);\n \n@@ -271,6 +335,8 @@ sfc_rx_qstop(struct sfc_adapter *sa, unsigned int sw_index)\n \tsa->eth_dev->data->rx_queue_state[sw_index] =\n \t\tRTE_ETH_QUEUE_STATE_STOPPED;\n \n+\trxq->state &= ~SFC_RXQ_RUNNING;\n+\n \tif (sw_index == 0)\n \t\tefx_mac_filter_default_rxq_clear(sa->nic);\n \n@@ -494,6 +560,10 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \trxq->hw_index = sw_index;\n \trxq->port_id = sa->eth_dev->data->port_id;\n \n+\t/* Cache limits required on datapath in RxQ structure */\n+\trxq->batch_max = encp->enc_rx_batch_max;\n+\trxq->prefix_size = encp->enc_rx_prefix_size;\n+\n \trxq->state = SFC_RXQ_INITIALIZED;\n \n \trxq_info->rxq = rxq;\ndiff --git a/drivers/net/sfc/efx/sfc_rx.h b/drivers/net/sfc/efx/sfc_rx.h\nindex 1004a84..028b8e0 100644\n--- a/drivers/net/sfc/efx/sfc_rx.h\n+++ b/drivers/net/sfc/efx/sfc_rx.h\n@@ -59,6 +59,8 @@ enum sfc_rxq_state_bit {\n #define\tSFC_RXQ_INITIALIZED\t(1 << SFC_RXQ_INITIALIZED_BIT)\n \tSFC_RXQ_STARTED_BIT,\n #define\tSFC_RXQ_STARTED\t\t(1 << SFC_RXQ_STARTED_BIT)\n+\tSFC_RXQ_RUNNING_BIT,\n+#define\tSFC_RXQ_RUNNING\t\t(1 << SFC_RXQ_RUNNING_BIT)\n \tSFC_RXQ_FLUSHING_BIT,\n #define\tSFC_RXQ_FLUSHING\t(1 << SFC_RXQ_FLUSHING_BIT)\n \tSFC_RXQ_FLUSHED_BIT,\n@@ -79,6 +81,8 @@ struct sfc_rxq {\n \tunsigned int\t\tptr_mask;\n \tunsigned int\t\tpending;\n \tunsigned int\t\tcompleted;\n+\tuint16_t\t\tbatch_max;\n+\tuint16_t\t\tprefix_size;\n \n \t/* Used on refill */\n \tunsigned int\t\tadded;\n@@ -132,6 +136,9 @@ void sfc_rx_qstop(struct sfc_adapter *sa, unsigned int sw_index);\n void sfc_rx_qflush_done(struct sfc_rxq *rxq);\n void sfc_rx_qflush_failed(struct sfc_rxq *rxq);\n \n+uint16_t sfc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n+\t\t uint16_t nb_pkts);\n+\n #ifdef __cplusplus\n }\n #endif\n", "prefixes": [ "dpdk-dev", "50/56" ] }