Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50214/?format=api
{ "id": 50214, "url": "https://patches.dpdk.org/api/patches/50214/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1549556983-10896-15-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": "<1549556983-10896-15-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1549556983-10896-15-git-send-email-arybchenko@solarflare.com", "date": "2019-02-07T16:29:19", "name": "[14/38] net/sfc/base: move EVQ descs number check to generic place", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4dc0aa575a342cc71b51e484963b7631c63bc5da", "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/1549556983-10896-15-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 3411, "url": "https://patches.dpdk.org/api/series/3411/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=3411", "date": "2019-02-07T16:29:05", "name": "net/sfc: update base driver", "version": 1, "mbox": "https://patches.dpdk.org/series/3411/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/50214/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/50214/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 6F1811B5F2;\n\tThu, 7 Feb 2019 17:31:00 +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 0E77B1B583\n\tfor <dev@dpdk.org>; Thu, 7 Feb 2019 17:30:37 +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 BD392B800D0; 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: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\tx17GUTbB015302; 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\tBE0011613E4; 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:19 +0000", "Message-ID": "<1549556983-10896-15-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.640700-4.000000-10", "X-TMASE-MatchedRID": "xwCqL1bJw76XC3sMAGu+nyZm6wdY+F8K+Gz435tISEFBDVeC8J7uwfU7\n\t2nYVxvYNJdM7MS2/RDLijpjet3oGSEb3S8jQ+0Q0syNb+yeIRArXLq4lttlH/1Hy5abV66gJ3lr\n\tUhsHZbAnLxRBGlN4sNHPtAg7MfdN9Tei0PFxIQJMMH4SsGvRsA30tCKdnhB589yM15V5aWpj6C0\n\tePs7A07YVH0dq7wY7u/H1dadJVZy/1gMdngNMMUNa7T08dGzOfDTtKtx/mFQv8Sa422ZrZ8Nt3f\n\tZ5KJlKjGTv6/g14O6vVlyfiqLK3Zzhzz9JT3GzK1pPGvuXkFGs4oGQUCbwY5Q+g7mdwjo656FtD\n\tZCmYBJ1ty4Dch3o7okMMprcbiest", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--1.640700-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-MDID": "1549557036-KBmbMXE2enLM", "Subject": "[dpdk-dev] [PATCH 14/38] net/sfc/base: move EVQ descs number check\n\tto generic place", "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\nNow we have min/max limits in NIC config, so we can do check against\nmin/max in a generic place instead of NIC family specific functions.\nCheck that the descriptors number is a power of 2 is also can be\nmade common. It removes code duplication and makes NIC family\nspecific functions a bit shorter.\n\nSigned-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_ev.c | 19 ++++-----------\n drivers/net/sfc/base/efx_ev.c | 42 ++++++++++++++++++----------------\n 2 files changed, 26 insertions(+), 35 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_ev.c b/drivers/net/sfc/base/ef10_ev.c\nindex 12125c6db..4f711992e 100644\n--- a/drivers/net/sfc/base/ef10_ev.c\n+++ b/drivers/net/sfc/base/ef10_ev.c\n@@ -446,24 +446,15 @@ ef10_ev_qcreate(\n \tefx_rc_t rc;\n \n \t_NOTE(ARGUNUSED(id))\t/* buftbl id managed by MC */\n-\tEFSYS_ASSERT(ISP2(encp->enc_evq_max_nevs));\n-\tEFSYS_ASSERT(ISP2(encp->enc_evq_min_nevs));\n-\n-\tif (!ISP2(ndescs) ||\n-\t (ndescs < encp->enc_evq_min_nevs) ||\n-\t (ndescs > encp->enc_evq_max_nevs)) {\n-\t\trc = EINVAL;\n-\t\tgoto fail1;\n-\t}\n \n \tif (index >= encp->enc_evq_limit) {\n \t\trc = EINVAL;\n-\t\tgoto fail2;\n+\t\tgoto fail1;\n \t}\n \n \tif (us > encp->enc_evq_timer_max_us) {\n \t\trc = EINVAL;\n-\t\tgoto fail3;\n+\t\tgoto fail2;\n \t}\n \n \t/* Set up the handler table */\n@@ -503,7 +494,7 @@ ef10_ev_qcreate(\n \t\trc = efx_mcdi_init_evq_v2(enp, index, esmp, ndescs, irq, us,\n \t\t flags);\n \t\tif (rc != 0)\n-\t\t\tgoto fail4;\n+\t\t\tgoto fail3;\n \t} else {\n \t\t/*\n \t\t * On Huntington we need to specify the settings to use.\n@@ -520,13 +511,11 @@ ef10_ev_qcreate(\n \t\trc = efx_mcdi_init_evq(enp, index, esmp, ndescs, irq, us, flags,\n \t\t low_latency);\n \t\tif (rc != 0)\n-\t\t\tgoto fail5;\n+\t\t\tgoto fail4;\n \t}\n \n \treturn (0);\n \n-fail5:\n-\tEFSYS_PROBE(fail5);\n fail4:\n \tEFSYS_PROBE(fail4);\n fail3:\ndiff --git a/drivers/net/sfc/base/efx_ev.c b/drivers/net/sfc/base/efx_ev.c\nindex f1788cad2..51c422c2d 100644\n--- a/drivers/net/sfc/base/efx_ev.c\n+++ b/drivers/net/sfc/base/efx_ev.c\n@@ -206,6 +206,7 @@ efx_ev_qcreate(\n {\n \tconst efx_ev_ops_t *eevop = enp->en_eevop;\n \tefx_evq_t *eep;\n+\tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(enp);\n \tefx_rc_t rc;\n \n \tEFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);\n@@ -228,11 +229,21 @@ efx_ev_qcreate(\n \t\tgoto fail2;\n \t}\n \n+\tEFSYS_ASSERT(ISP2(encp->enc_evq_max_nevs));\n+\tEFSYS_ASSERT(ISP2(encp->enc_evq_min_nevs));\n+\n+\tif (!ISP2(ndescs) ||\n+\t ndescs < encp->enc_evq_min_nevs ||\n+\t ndescs > encp->enc_evq_max_nevs) {\n+\t\trc = EINVAL;\n+\t\tgoto fail3;\n+\t}\n+\n \t/* Allocate an EVQ object */\n \tEFSYS_KMEM_ALLOC(enp->en_esip, sizeof (efx_evq_t), eep);\n \tif (eep == NULL) {\n \t\trc = ENOMEM;\n-\t\tgoto fail3;\n+\t\tgoto fail4;\n \t}\n \n \teep->ee_magic = EFX_EVQ_MAGIC;\n@@ -255,16 +266,18 @@ efx_ev_qcreate(\n \n \tif ((rc = eevop->eevo_qcreate(enp, index, esmp, ndescs, id, us, flags,\n \t eep)) != 0)\n-\t\tgoto fail4;\n+\t\tgoto fail5;\n \n \treturn (0);\n \n-fail4:\n-\tEFSYS_PROBE(fail4);\n+fail5:\n+\tEFSYS_PROBE(fail5);\n \n \t*eepp = NULL;\n \tenp->en_ev_qcount--;\n \tEFSYS_KMEM_FREE(enp->en_esip, sizeof (efx_evq_t), eep);\n+fail4:\n+\tEFSYS_PROBE(fail4);\n fail3:\n \tEFSYS_PROBE(fail3);\n fail2:\n@@ -1285,24 +1298,15 @@ siena_ev_qcreate(\n \n \t_NOTE(ARGUNUSED(esmp))\n \n-\tEFSYS_ASSERT(ISP2(encp->enc_evq_max_nevs));\n-\tEFSYS_ASSERT(ISP2(encp->enc_evq_min_nevs));\n-\n-\tif (!ISP2(ndescs) ||\n-\t (ndescs < encp->enc_evq_min_nevs) ||\n-\t (ndescs > encp->enc_evq_max_nevs)) {\n-\t\trc = EINVAL;\n-\t\tgoto fail1;\n-\t}\n \tif (index >= encp->enc_evq_limit) {\n \t\trc = EINVAL;\n-\t\tgoto fail2;\n+\t\tgoto fail1;\n \t}\n #if EFSYS_OPT_RX_SCALE\n \tif (enp->en_intr.ei_type == EFX_INTR_LINE &&\n \t index >= EFX_MAXRSS_LEGACY) {\n \t\trc = EINVAL;\n-\t\tgoto fail3;\n+\t\tgoto fail2;\n \t}\n #endif\n \tfor (size = 0;\n@@ -1312,7 +1316,7 @@ siena_ev_qcreate(\n \t\t\tbreak;\n \tif (id + (1 << size) >= encp->enc_buftbl_limit) {\n \t\trc = EINVAL;\n-\t\tgoto fail4;\n+\t\tgoto fail3;\n \t}\n \n \t/* Set up the handler table */\n@@ -1344,14 +1348,12 @@ siena_ev_qcreate(\n \n \treturn (0);\n \n-fail4:\n-\tEFSYS_PROBE(fail4);\n-#if EFSYS_OPT_RX_SCALE\n fail3:\n \tEFSYS_PROBE(fail3);\n-#endif\n+#if EFSYS_OPT_RX_SCALE\n fail2:\n \tEFSYS_PROBE(fail2);\n+#endif\n fail1:\n \tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n \n", "prefixes": [ "14/38" ] }