Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50207/?format=api
{ "id": 50207, "url": "http://patches.dpdk.org/api/patches/50207/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1549556983-10896-11-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-11-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1549556983-10896-11-git-send-email-arybchenko@solarflare.com", "date": "2019-02-07T16:29:15", "name": "[10/38] net/sfc: use NIC Rx descs limits instead of defines", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "08a66a102a98fcba4fa62b5d3bb4bcb850a4883a", "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-11-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/50207/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/50207/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 C28ED1B5C5;\n\tThu, 7 Feb 2019 17:30:51 +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 929E21B578\n\tfor <dev@dpdk.org>; Thu, 7 Feb 2019 17:30:36 +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 535F7B80075; Thu, 7 Feb 2019 16:30:35 +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:31 -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:30 -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\tx17GUTP1015287; Thu, 7 Feb 2019 16:30:29 GMT", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\t8BB9B1613E4; Thu, 7 Feb 2019 16:30:29 +0000 (GMT)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Igor Romanov <igor.romanov@oktetlabs.ru>", "Date": "Thu, 7 Feb 2019 16:29:15 +0000", "Message-ID": "<1549556983-10896-11-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-2.929700-4.000000-10", "X-TMASE-MatchedRID": "Ln/YJtuWXSXBXlkPaxAt1RcqpH7D1rtQSoCG4sefl8Qs/uUAk6xP7NYI\n\tJSW5nrIT2aZ0LBMGZL1N/B1iBfI2oqK176S49UNH4RtSDjG+z7CH7D1bP/FcOky0asjQVFrADhY\n\tjfgV723NtMbP5CeY5H3q/3tVeyVFpr78SC5iivxwURSScn+QSXt0H8LFZNFG7/nnwJ52QYi89zd\n\tFMl2nL2rdItAbbFxRjHRFi1NAwtSRQRAYFyTvYyY7ixVTCN35/r12lyyoo6FjnOA2yEhgIdQNOk\n\tE/FViXrfxExeyut/nuDJXhXmDOQN5N1JFeUKeMEiOOUXfTkScBZSbxIRLLN37zfneGoTKOTVlxr\n\t1FJij9s=", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--2.929700-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-MDID": "1549557036-IyVPwJNTwo2v", "Subject": "[dpdk-dev] [PATCH 10/38] net/sfc: use NIC Rx descs limits instead\n\tof defines", "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": "From: Igor Romanov <igor.romanov@oktetlabs.ru>\n\nDescriptor limits are not common for all NIC families. Use the variables\nfrom NIC configuration instead of deprecated defines.\n\nSigned-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/sfc.c | 6 ++++++\n drivers/net/sfc/sfc.h | 3 +++\n drivers/net/sfc/sfc_dp_rx.h | 7 +++++++\n drivers/net/sfc/sfc_ef10_essb_rx.c | 7 ++++---\n drivers/net/sfc/sfc_ef10_rx.c | 5 +++--\n drivers/net/sfc/sfc_ethdev.c | 6 +++---\n drivers/net/sfc/sfc_rx.c | 18 +++++++++++++-----\n 7 files changed, 39 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c\nindex 2e29bfaf4..26c7c322f 100644\n--- a/drivers/net/sfc/sfc.c\n+++ b/drivers/net/sfc/sfc.c\n@@ -756,6 +756,12 @@ sfc_attach(struct sfc_adapter *sa)\n \tif (rc != 0)\n \t\tgoto fail_estimate_rsrc_limits;\n \n+\tsa->rxq_max_entries = encp->enc_rxq_max_ndescs;\n+\tSFC_ASSERT(rte_is_power_of_2(sa->rxq_max_entries));\n+\n+\tsa->rxq_min_entries = encp->enc_rxq_min_ndescs;\n+\tSFC_ASSERT(rte_is_power_of_2(sa->rxq_min_entries));\n+\n \tsa->txq_max_entries = encp->enc_txq_max_ndescs;\n \tSFC_ASSERT(rte_is_power_of_2(sa->txq_max_entries));\n \ndiff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 3acb3fe48..6c99e9e66 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -244,6 +244,9 @@ struct sfc_adapter {\n \tunsigned int\t\t\trxq_max;\n \tunsigned int\t\t\ttxq_max;\n \n+\tunsigned int\t\t\trxq_max_entries;\n+\tunsigned int\t\t\trxq_min_entries;\n+\n \tunsigned int\t\t\ttxq_max_entries;\n \tunsigned int\t\t\ttxq_min_entries;\n \ndiff --git a/drivers/net/sfc/sfc_dp_rx.h b/drivers/net/sfc/sfc_dp_rx.h\nindex 7e911648e..c3cc4ff5b 100644\n--- a/drivers/net/sfc/sfc_dp_rx.h\n+++ b/drivers/net/sfc/sfc_dp_rx.h\n@@ -28,6 +28,12 @@ struct sfc_dp_rxq {\n \tstruct sfc_dp_queue\tdpq;\n };\n \n+/** Datapath receive queue descriptor number limitations */\n+struct sfc_dp_rx_hw_limits {\n+\tunsigned int rxq_max_entries;\n+\tunsigned int rxq_min_entries;\n+};\n+\n /**\n * Datapath receive queue creation information.\n *\n@@ -114,6 +120,7 @@ typedef int (sfc_dp_rx_pool_ops_supported_t)(const char *pool);\n * @return 0 or positive errno.\n */\n typedef int (sfc_dp_rx_qsize_up_rings_t)(uint16_t nb_rx_desc,\n+\t\t\t\t\t struct sfc_dp_rx_hw_limits *limits,\n \t\t\t\t\t struct rte_mempool *mb_pool,\n \t\t\t\t\t unsigned int *rxq_entries,\n \t\t\t\t\t unsigned int *evq_entries,\ndiff --git a/drivers/net/sfc/sfc_ef10_essb_rx.c b/drivers/net/sfc/sfc_ef10_essb_rx.c\nindex a24f54e7b..fee7a8b27 100644\n--- a/drivers/net/sfc/sfc_ef10_essb_rx.c\n+++ b/drivers/net/sfc/sfc_ef10_essb_rx.c\n@@ -487,6 +487,7 @@ sfc_ef10_essb_rx_pool_ops_supported(const char *pool)\n static sfc_dp_rx_qsize_up_rings_t sfc_ef10_essb_rx_qsize_up_rings;\n static int\n sfc_ef10_essb_rx_qsize_up_rings(uint16_t nb_rx_desc,\n+\t\t\t\tstruct sfc_dp_rx_hw_limits *limits,\n \t\t\t\tstruct rte_mempool *mb_pool,\n \t\t\t\tunsigned int *rxq_entries,\n \t\t\t\tunsigned int *evq_entries,\n@@ -513,11 +514,11 @@ sfc_ef10_essb_rx_qsize_up_rings(uint16_t nb_rx_desc,\n \tnb_hw_rx_desc = RTE_MAX(SFC_DIV_ROUND_UP(nb_rx_desc,\n \t\t\t\t\t\t mp_info.contig_block_size),\n \t\t\t\tSFC_EF10_RX_WPTR_ALIGN + 1);\n-\tif (nb_hw_rx_desc <= EFX_RXQ_MINNDESCS) {\n-\t\t*rxq_entries = EFX_RXQ_MINNDESCS;\n+\tif (nb_hw_rx_desc <= limits->rxq_min_entries) {\n+\t\t*rxq_entries = limits->rxq_min_entries;\n \t} else {\n \t\t*rxq_entries = rte_align32pow2(nb_hw_rx_desc);\n-\t\tif (*rxq_entries > EFX_RXQ_MAXNDESCS)\n+\t\tif (*rxq_entries > limits->rxq_max_entries)\n \t\t\treturn EINVAL;\n \t}\n \ndiff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c\nindex 77ca580b5..49e32faaf 100644\n--- a/drivers/net/sfc/sfc_ef10_rx.c\n+++ b/drivers/net/sfc/sfc_ef10_rx.c\n@@ -566,6 +566,7 @@ sfc_ef10_rx_get_dev_info(struct rte_eth_dev_info *dev_info)\n static sfc_dp_rx_qsize_up_rings_t sfc_ef10_rx_qsize_up_rings;\n static int\n sfc_ef10_rx_qsize_up_rings(uint16_t nb_rx_desc,\n+\t\t\t struct sfc_dp_rx_hw_limits *limits,\n \t\t\t __rte_unused struct rte_mempool *mb_pool,\n \t\t\t unsigned int *rxq_entries,\n \t\t\t unsigned int *evq_entries,\n@@ -575,8 +576,8 @@ sfc_ef10_rx_qsize_up_rings(uint16_t nb_rx_desc,\n \t * rte_ethdev API guarantees that the number meets min, max and\n \t * alignment requirements.\n \t */\n-\tif (nb_rx_desc <= EFX_RXQ_MINNDESCS)\n-\t\t*rxq_entries = EFX_RXQ_MINNDESCS;\n+\tif (nb_rx_desc <= limits->rxq_min_entries)\n+\t\t*rxq_entries = limits->rxq_min_entries;\n \telse\n \t\t*rxq_entries = rte_align32pow2(nb_rx_desc);\n \ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 57b8b7e49..e7bfd8917 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -153,12 +153,12 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t}\n \n \t/* Initialize to hardware limits */\n-\tdev_info->rx_desc_lim.nb_max = EFX_RXQ_MAXNDESCS;\n-\tdev_info->rx_desc_lim.nb_min = EFX_RXQ_MINNDESCS;\n+\tdev_info->rx_desc_lim.nb_max = sa->rxq_max_entries;\n+\tdev_info->rx_desc_lim.nb_min = sa->rxq_min_entries;\n \t/* The RXQ hardware requires that the descriptor count is a power\n \t * of 2, but rx_desc_lim cannot properly describe that constraint.\n \t */\n-\tdev_info->rx_desc_lim.nb_align = EFX_RXQ_MINNDESCS;\n+\tdev_info->rx_desc_lim.nb_align = sa->rxq_min_entries;\n \n \t/* Initialize to hardware limits */\n \tdev_info->tx_desc_lim.nb_max = sa->txq_max_entries;\ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 54d4b5872..c8dec8d6e 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -411,6 +411,7 @@ sfc_rxq_by_dp_rxq(const struct sfc_dp_rxq *dp_rxq)\n static sfc_dp_rx_qsize_up_rings_t sfc_efx_rx_qsize_up_rings;\n static int\n sfc_efx_rx_qsize_up_rings(uint16_t nb_rx_desc,\n+\t\t\t __rte_unused struct sfc_dp_rx_hw_limits *limits,\n \t\t\t __rte_unused struct rte_mempool *mb_pool,\n \t\t\t unsigned int *rxq_entries,\n \t\t\t unsigned int *evq_entries,\n@@ -971,13 +972,19 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \tstruct sfc_evq *evq;\n \tstruct sfc_rxq *rxq;\n \tstruct sfc_dp_rx_qcreate_info info;\n+\tstruct sfc_dp_rx_hw_limits hw_limits;\n \n-\trc = sa->priv.dp_rx->qsize_up_rings(nb_rx_desc, mb_pool, &rxq_entries,\n-\t\t\t\t\t &evq_entries, &rxq_max_fill_level);\n+\tmemset(&hw_limits, 0, sizeof(hw_limits));\n+\thw_limits.rxq_max_entries = sa->rxq_max_entries;\n+\thw_limits.rxq_min_entries = sa->rxq_min_entries;\n+\n+\trc = sa->priv.dp_rx->qsize_up_rings(nb_rx_desc, &hw_limits, mb_pool,\n+\t\t\t\t\t &rxq_entries, &evq_entries,\n+\t\t\t\t\t &rxq_max_fill_level);\n \tif (rc != 0)\n \t\tgoto fail_size_up_rings;\n-\tSFC_ASSERT(rxq_entries >= EFX_RXQ_MINNDESCS);\n-\tSFC_ASSERT(rxq_entries <= EFX_RXQ_MAXNDESCS);\n+\tSFC_ASSERT(rxq_entries >= sa->rxq_min_entries);\n+\tSFC_ASSERT(rxq_entries <= sa->rxq_max_entries);\n \tSFC_ASSERT(rxq_max_fill_level <= nb_rx_desc);\n \n \toffloads = rx_conf->offloads |\n@@ -1403,9 +1410,10 @@ sfc_rx_qinit_info(struct sfc_adapter *sa, unsigned int sw_index)\n {\n \tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n \tstruct sfc_rxq_info *rxq_info = &sas->rxq_info[sw_index];\n+\tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\n \tunsigned int max_entries;\n \n-\tmax_entries = EFX_RXQ_MAXNDESCS;\n+\tmax_entries = encp->enc_rxq_max_ndescs;\n \tSFC_ASSERT(rte_is_power_of_2(max_entries));\n \n \trxq_info->max_entries = max_entries;\n", "prefixes": [ "10/38" ] }