Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50234/?format=api
{ "id": 50234, "url": "http://patches.dpdk.org/api/patches/50234/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1549556983-10896-33-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": "<1549556983-10896-33-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1549556983-10896-33-git-send-email-arybchenko@solarflare.com", "date": "2019-02-07T16:29:37", "name": "[32/38] net/sfc/base: allow to specify Rx buffer size on queue setup", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "dc7bd41a485cd75f8016b26783da32db243d5ad2", "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/1549556983-10896-33-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 3411, "url": "http://patches.dpdk.org/api/series/3411/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=3411", "date": "2019-02-07T16:29:05", "name": "net/sfc: update base driver", "version": 1, "mbox": "http://patches.dpdk.org/series/3411/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/50234/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/50234/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0B89B1B7F2;\n\tThu, 7 Feb 2019 17:31:21 +0100 (CET)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 36A7A1B58C\n\tfor <dev@dpdk.org>; Thu, 7 Feb 2019 17:30:39 +0100 (CET)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id\n\tD0EC6B8006C for <dev@dpdk.org>; Thu, 7 Feb 2019 16:30:37 +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.1395.4; Thu, 7 Feb 2019 08:30:32 -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.1395.4 via Frontend Transport; Thu, 7 Feb 2019 08:30:31 -0800", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx17GUUdd015380 for <dev@dpdk.org>; Thu, 7 Feb 2019 16:30:30 GMT", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\tAEA221613E4\n\tfor <dev@dpdk.org>; Thu, 7 Feb 2019 16:30:30 +0000 (GMT)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Thu, 7 Feb 2019 16:29:37 +0000", "Message-ID": "<1549556983-10896-33-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1549556983-10896-1-git-send-email-arybchenko@solarflare.com>", "References": "<1549556983-10896-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-TM-AS-Result": "No-1.300700-4.000000-10", "X-TMASE-MatchedRID": "GhdZ4a7VZuM2jeY+Udg/IgwfhKwa9GwDN/BTU5ZfZRKNTnqOMBIJ4dGX\n\tgQphHQmx09NQNrxIpFYBtjkcfRMmqZvrNI7WoC7k0Xw0ILvo/uUpWss5kPUFdPHFoBcOsKezHYF\n\t/YOVwBjSJEOK6xautYQuZPTveySLjAxYKB0LOn5ruykw7cfAoIDatsM27MbfLu3Ry99yHPvKalh\n\thVUOxDMDjvSRfAt/XIrsKGPVE8DfVn/2sJnwgGLlZ4U3MrW+XSZ+8pliwlpwfHeIFnKQ51HDzpr\n\tL002Ijx4vM1YF6AJbbCCfuIMF6xLSrJhLSjJRVmMizVTpnerxda36kv2FZAZm78+YfCvxsb+iMv\n\tGZk8JhrzvNvrIgC/x0x2RAhGls3Zfxw3+OgkLLfQhhn8gauIUk1iUOHJIRXjqha7fcVIKfrqvk9\n\tCHHb0NQbT7eVkE2ZC2rhEGiFuOiuGIp1rjCG/op6oP1a0mRIj", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10-1.300700-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-MDID": "1549557038-unpgbohPVZEB", "Subject": "[dpdk-dev] [PATCH 32/38] net/sfc/base: allow to specify Rx buffer\n\tsize on queue setup", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Rx buffer size must be specified on Rx queue creation on\nRiverhead.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_rx.c | 46 +++++++++++++++++++--------------\n drivers/net/sfc/base/efx.h | 1 +\n drivers/net/sfc/base/efx_impl.h | 6 +++--\n drivers/net/sfc/base/efx_rx.c | 12 +++++++--\n drivers/net/sfc/sfc_rx.c | 1 +\n 5 files changed, 43 insertions(+), 23 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c\nindex 3b296e488..5cb7da99b 100644\n--- a/drivers/net/sfc/base/ef10_rx.c\n+++ b/drivers/net/sfc/base/ef10_rx.c\n@@ -1018,7 +1018,7 @@ ef10_rx_qcreate(\n \tuint32_t es_buf_stride = 0;\n \tuint32_t hol_block_timeout = 0;\n \n-\t_NOTE(ARGUNUSED(id, erp, type_data))\n+\t_NOTE(ARGUNUSED(id, erp))\n \n \tEFX_STATIC_ASSERT(EFX_EV_RX_NLABELS == (1 << ESF_DZ_RX_QLABEL_WIDTH));\n \tEFSYS_ASSERT3U(label, <, EFX_EV_RX_NLABELS);\n@@ -1031,13 +1031,18 @@ ef10_rx_qcreate(\n \n \tswitch (type) {\n \tcase EFX_RXQ_TYPE_DEFAULT:\n+\t\tif (type_data == NULL) {\n+\t\t\trc = EINVAL;\n+\t\t\tgoto fail2;\n+\t\t}\n+\t\terp->er_buf_size = type_data->ertd_default.ed_buf_size;\n \t\tps_buf_size = 0;\n \t\tbreak;\n #if EFSYS_OPT_RX_PACKED_STREAM\n \tcase EFX_RXQ_TYPE_PACKED_STREAM:\n \t\tif (type_data == NULL) {\n \t\t\trc = EINVAL;\n-\t\t\tgoto fail2;\n+\t\t\tgoto fail3;\n \t\t}\n \t\tswitch (type_data->ertd_packed_stream.eps_buf_size) {\n \t\tcase EFX_RXQ_PACKED_STREAM_BUF_SIZE_1M:\n@@ -1057,15 +1062,16 @@ ef10_rx_qcreate(\n \t\t\tbreak;\n \t\tdefault:\n \t\t\trc = ENOTSUP;\n-\t\t\tgoto fail3;\n+\t\t\tgoto fail4;\n \t\t}\n+\t\terp->er_buf_size = type_data->ertd_packed_stream.eps_buf_size;\n \t\tbreak;\n #endif /* EFSYS_OPT_RX_PACKED_STREAM */\n #if EFSYS_OPT_RX_ES_SUPER_BUFFER\n \tcase EFX_RXQ_TYPE_ES_SUPER_BUFFER:\n \t\tif (type_data == NULL) {\n \t\t\trc = EINVAL;\n-\t\t\tgoto fail4;\n+\t\t\tgoto fail5;\n \t\t}\n \t\tps_buf_size = 0;\n \t\tes_bufs_per_desc =\n@@ -1080,7 +1086,7 @@ ef10_rx_qcreate(\n #endif /* EFSYS_OPT_RX_ES_SUPER_BUFFER */\n \tdefault:\n \t\trc = ENOTSUP;\n-\t\tgoto fail5;\n+\t\tgoto fail6;\n \t}\n \n #if EFSYS_OPT_RX_PACKED_STREAM\n@@ -1088,13 +1094,13 @@ ef10_rx_qcreate(\n \t\t/* Check if datapath firmware supports packed stream mode */\n \t\tif (encp->enc_rx_packed_stream_supported == B_FALSE) {\n \t\t\trc = ENOTSUP;\n-\t\t\tgoto fail6;\n+\t\t\tgoto fail7;\n \t\t}\n \t\t/* Check if packed stream allows configurable buffer sizes */\n \t\tif ((ps_buf_size != MC_CMD_INIT_RXQ_EXT_IN_PS_BUFF_1M) &&\n \t\t (encp->enc_rx_var_packed_stream_supported == B_FALSE)) {\n \t\t\trc = ENOTSUP;\n-\t\t\tgoto fail7;\n+\t\t\tgoto fail8;\n \t\t}\n \t}\n #else /* EFSYS_OPT_RX_PACKED_STREAM */\n@@ -1105,17 +1111,17 @@ ef10_rx_qcreate(\n \tif (es_bufs_per_desc > 0) {\n \t\tif (encp->enc_rx_es_super_buffer_supported == B_FALSE) {\n \t\t\trc = ENOTSUP;\n-\t\t\tgoto fail8;\n+\t\t\tgoto fail9;\n \t\t}\n \t\tif (!IS_P2ALIGNED(es_max_dma_len,\n \t\t\t EFX_RX_ES_SUPER_BUFFER_BUF_ALIGNMENT)) {\n \t\t\trc = EINVAL;\n-\t\t\tgoto fail9;\n+\t\t\tgoto fail10;\n \t\t}\n \t\tif (!IS_P2ALIGNED(es_buf_stride,\n \t\t\t EFX_RX_ES_SUPER_BUFFER_BUF_ALIGNMENT)) {\n \t\t\trc = EINVAL;\n-\t\t\tgoto fail10;\n+\t\t\tgoto fail11;\n \t\t}\n \t}\n #else /* EFSYS_OPT_RX_ES_SUPER_BUFFER */\n@@ -1137,7 +1143,7 @@ ef10_rx_qcreate(\n \t\t esmp, disable_scatter, want_inner_classes,\n \t\t ps_buf_size, es_bufs_per_desc, es_max_dma_len,\n \t\t es_buf_stride, hol_block_timeout)) != 0)\n-\t\tgoto fail11;\n+\t\tgoto fail12;\n \n \terp->er_eep = eep;\n \terp->er_label = label;\n@@ -1148,34 +1154,36 @@ ef10_rx_qcreate(\n \n \treturn (0);\n \n+fail12:\n+\tEFSYS_PROBE(fail12);\n+#if EFSYS_OPT_RX_ES_SUPER_BUFFER\n fail11:\n \tEFSYS_PROBE(fail11);\n-#if EFSYS_OPT_RX_ES_SUPER_BUFFER\n fail10:\n \tEFSYS_PROBE(fail10);\n fail9:\n \tEFSYS_PROBE(fail9);\n-fail8:\n-\tEFSYS_PROBE(fail8);\n #endif /* EFSYS_OPT_RX_ES_SUPER_BUFFER */\n #if EFSYS_OPT_RX_PACKED_STREAM\n+fail8:\n+\tEFSYS_PROBE(fail8);\n fail7:\n \tEFSYS_PROBE(fail7);\n+#endif /* EFSYS_OPT_RX_PACKED_STREAM */\n fail6:\n \tEFSYS_PROBE(fail6);\n-#endif /* EFSYS_OPT_RX_PACKED_STREAM */\n+#if EFSYS_OPT_RX_ES_SUPER_BUFFER\n fail5:\n \tEFSYS_PROBE(fail5);\n-#if EFSYS_OPT_RX_ES_SUPER_BUFFER\n-fail4:\n-\tEFSYS_PROBE(fail4);\n #endif /* EFSYS_OPT_RX_ES_SUPER_BUFFER */\n #if EFSYS_OPT_RX_PACKED_STREAM\n+fail4:\n+\tEFSYS_PROBE(fail4);\n fail3:\n \tEFSYS_PROBE(fail3);\n+#endif /* EFSYS_OPT_RX_PACKED_STREAM */\n fail2:\n \tEFSYS_PROBE(fail2);\n-#endif /* EFSYS_OPT_RX_PACKED_STREAM */\n fail1:\n \tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n \ndiff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h\nindex 71c335279..35f896750 100644\n--- a/drivers/net/sfc/base/efx.h\n+++ b/drivers/net/sfc/base/efx.h\n@@ -2527,6 +2527,7 @@ efx_rx_qcreate(\n \t__in\t\tunsigned int index,\n \t__in\t\tunsigned int label,\n \t__in\t\tefx_rxq_type_t type,\n+\t__in\t\tsize_t buf_size,\n \t__in\t\tefsys_mem_t *esmp,\n \t__in\t\tsize_t ndescs,\n \t__in\t\tuint32_t id,\ndiff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h\nindex e2cdba692..70e05232c 100644\n--- a/drivers/net/sfc/base/efx_impl.h\n+++ b/drivers/net/sfc/base/efx_impl.h\n@@ -131,8 +131,9 @@ typedef struct efx_tx_ops_s {\n } efx_tx_ops_t;\n \n typedef union efx_rxq_type_data_u {\n-\t/* Dummy member to have non-empty union if no options are enabled */\n-\tuint32_t\tertd_dummy;\n+\tstruct {\n+\t\tsize_t\t\ted_buf_size;\n+\t} ertd_default;\n #if EFSYS_OPT_RX_PACKED_STREAM\n \tstruct {\n \t\tuint32_t\teps_buf_size;\n@@ -792,6 +793,7 @@ struct efx_rxq_s {\n \tunsigned int\t\t\ter_index;\n \tunsigned int\t\t\ter_label;\n \tunsigned int\t\t\ter_mask;\n+\tsize_t\t\t\t\ter_buf_size;\n \tefsys_mem_t\t\t\t*er_esmp;\n \tefx_evq_rxq_state_t\t\t*er_ev_qstate;\n };\ndiff --git a/drivers/net/sfc/base/efx_rx.c b/drivers/net/sfc/base/efx_rx.c\nindex 8a12ef705..49c304c0b 100644\n--- a/drivers/net/sfc/base/efx_rx.c\n+++ b/drivers/net/sfc/base/efx_rx.c\n@@ -693,6 +693,7 @@ efx_rx_qpost(\n \tconst efx_rx_ops_t *erxop = enp->en_erxop;\n \n \tEFSYS_ASSERT3U(erp->er_magic, ==, EFX_RXQ_MAGIC);\n+\tEFSYS_ASSERT(erp->er_buf_size == 0 || size == erp->er_buf_size);\n \n \terxop->erxo_qpost(erp, addrp, size, ndescs, completed, added);\n }\n@@ -869,6 +870,7 @@ efx_rx_qcreate(\n \t__in\t\tunsigned int index,\n \t__in\t\tunsigned int label,\n \t__in\t\tefx_rxq_type_t type,\n+\t__in\t\tsize_t buf_size,\n \t__in\t\tefsys_mem_t *esmp,\n \t__in\t\tsize_t ndescs,\n \t__in\t\tuint32_t id,\n@@ -876,7 +878,13 @@ efx_rx_qcreate(\n \t__in\t\tefx_evq_t *eep,\n \t__deref_out\tefx_rxq_t **erpp)\n {\n-\treturn efx_rx_qcreate_internal(enp, index, label, type, NULL,\n+\tefx_rxq_type_data_t type_data;\n+\n+\tmemset(&type_data, 0, sizeof (type_data));\n+\n+\ttype_data.ertd_default.ed_buf_size = buf_size;\n+\n+\treturn efx_rx_qcreate_internal(enp, index, label, type, &type_data,\n \t esmp, ndescs, id, flags, eep, erpp);\n }\n \n@@ -1614,7 +1622,6 @@ siena_rx_qcreate(\n \tefx_rc_t rc;\n \n \t_NOTE(ARGUNUSED(esmp))\n-\t_NOTE(ARGUNUSED(type_data))\n \n \tEFX_STATIC_ASSERT(EFX_EV_RX_NLABELS ==\n \t (1 << FRF_AZ_RX_DESCQ_LABEL_WIDTH));\n@@ -1637,6 +1644,7 @@ siena_rx_qcreate(\n \n \tswitch (type) {\n \tcase EFX_RXQ_TYPE_DEFAULT:\n+\t\terp->er_buf_size = type_data->ertd_default.ed_buf_size;\n \t\tbreak;\n \n \tdefault:\ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 20910d212..4b1d01e66 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -692,6 +692,7 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n \tswitch (rxq_info->type) {\n \tcase EFX_RXQ_TYPE_DEFAULT:\n \t\trc = efx_rx_qcreate(sa->nic, rxq->hw_index, 0, rxq_info->type,\n+\t\t\trxq->buf_size,\n \t\t\t&rxq->mem, rxq_info->entries, 0 /* not used on EF10 */,\n \t\t\trxq_info->type_flags, evq->common, &rxq->common);\n \t\tbreak;\n", "prefixes": [ "32/38" ] }