Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/76902/?format=api
{ "id": 76902, "url": "http://patches.dpdk.org/api/patches/76902/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1599556475-27820-12-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": "<1599556475-27820-12-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1599556475-27820-12-git-send-email-arybchenko@solarflare.com", "date": "2020-09-08T09:14:31", "name": "[10/14] net/sfc: add MCDI callbacks to allocate/free DMA memory", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "087671714bcf68949cdf3fc4188e3769f6a79d8f", "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/1599556475-27820-12-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 12014, "url": "http://patches.dpdk.org/api/series/12014/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12014", "date": "2020-09-08T09:14:20", "name": "net/sfc: factor out common driver library", "version": 1, "mbox": "http://patches.dpdk.org/series/12014/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/76902/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/76902/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5A49FA04AA;\n\tTue, 8 Sep 2020 11:18:42 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F0F851C0CF;\n\tTue, 8 Sep 2020 11:17:28 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 47EB81C0CE\n for <dev@dpdk.org>; Tue, 8 Sep 2020 11:17:27 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.144])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n E576620074 for <dev@dpdk.org>; Tue, 8 Sep 2020 09:17:26 +0000 (UTC)", "from us4-mdac16-59.at1.mdlocal (unknown [10.110.50.152])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 1BFFE800B1\n for <dev@dpdk.org>; Tue, 8 Sep 2020 09:17:26 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.12])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id AA3E040135\n for <dev@dpdk.org>; Tue, 8 Sep 2020 09:14:57 +0000 (UTC)", "from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n (No client certificate requested)\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id C28EA4005E\n for <dev@dpdk.org>; Tue, 8 Sep 2020 09:14:56 +0000 (UTC)", "from ukex01.SolarFlarecom.com (10.17.10.4) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2; Tue, 8 Sep 2020 10:14:49 +0100", "from opal.uk.solarflarecom.com (10.17.10.1) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id\n 15.0.1497.2 via Frontend Transport; Tue, 8 Sep 2020 10:14:49 +0100", "from ukv-loginhost.uk.solarflarecom.com\n (ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 0889EnRN032435\n for <dev@dpdk.org>; Tue, 8 Sep 2020 10:14:49 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id A1A951613AB\n for <dev@dpdk.org>; Tue, 8 Sep 2020 10:14:49 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Tue, 8 Sep 2020 10:14:31 +0100", "Message-ID": "<1599556475-27820-12-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1599556475-27820-1-git-send-email-arybchenko@solarflare.com>", "References": "<1599556475-27820-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.6.1012-25652.003", "X-TM-AS-Result": "No-7.265700-8.000000-10", "X-TMASE-MatchedRID": "klLfDUJzcbG/kNGHVZrsls50DGuIExk9UXlp1FHYSPVwkdIrVt8X1dN+\n VO8UR4MhfGzuoVn0Vs6PQi9XuOWoOLQHnhaRx4GgMy+jMkhCdFZrd+wrP/NNVMd4gWcpDnUclSY\n jj5D227bG42pGgsfFnI2Ow18fgOyZKjPlgWuJZGwk/b03uBR3ULpKkQnaF6lazdATtc2zn0DlbG\n AwGirFMOJRsev36MRgiiiUp2zjfThf7y77NDsmYp4CIKY/Hg3AGdQnQSTrKGPEQdG7H66TyMdRT\n 5TQAJnASWt0iRbOvZk/863Ch77M8LV3TVOy7ItOvVBQZC5rCkGeqD9WtJkSIw==", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--7.265700-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25652.003", "X-MDID": "1599556640-9lrWPnnfVxVf", "Subject": "[dpdk-dev] [PATCH 10/14] net/sfc: add MCDI callbacks to\n\tallocate/free DMA memory", "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 <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Net driver should use rte_eth_dma_zone_reserve(), but it is ethdev\nspecific API which is not available for vDPA.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/net/sfc/sfc_mcdi.c | 46 +++++++++++++++++++++++++++++++-------\n drivers/net/sfc/sfc_mcdi.h | 12 ++++++++++\n 2 files changed, 50 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c\nindex 928a08c0a2..5077fcddd6 100644\n--- a/drivers/net/sfc/sfc_mcdi.c\n+++ b/drivers/net/sfc/sfc_mcdi.c\n@@ -278,16 +278,22 @@ sfc_efx_mcdi_ev_proxy_response(void *arg, uint32_t handle, efx_rc_t result)\n \n static int\n sfc_efx_mcdi_init(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi,\n-\t\t uint32_t logtype, const char *log_prefix, efx_nic_t *nic)\n+\t\t uint32_t logtype, const char *log_prefix, efx_nic_t *nic,\n+\t\t const struct sfc_efx_mcdi_ops *ops, void *ops_cookie)\n {\n \tsize_t max_msg_size;\n \tefx_mcdi_transport_t *emtp;\n \tint rc;\n \n+\tif (ops->dma_alloc == NULL || ops->dma_free == NULL)\n+\t\treturn EINVAL;\n+\n \tSFC_ASSERT(mcdi->state == SFC_EFX_MCDI_UNINITIALIZED);\n \n \trte_spinlock_init(&mcdi->lock);\n \n+\tmcdi->ops = ops;\n+\tmcdi->ops_cookie = ops_cookie;\n \tmcdi->nic = nic;\n \n \tmcdi->state = SFC_EFX_MCDI_INITIALIZED;\n@@ -296,8 +302,7 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi,\n \tmcdi->log_prefix = log_prefix;\n \n \tmax_msg_size = sizeof(uint32_t) + MCDI_CTL_SDU_LEN_MAX_V2;\n-\trc = sfc_dma_alloc(sa, \"mcdi\", 0, max_msg_size, sa->socket_id,\n-\t\t\t &mcdi->mem);\n+\trc = ops->dma_alloc(ops_cookie, \"mcdi\", max_msg_size, &mcdi->mem);\n \tif (rc != 0)\n \t\tgoto fail_dma_alloc;\n \n@@ -319,7 +324,7 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi,\n \n fail_mcdi_init:\n \tmemset(emtp, 0, sizeof(*emtp));\n-\tsfc_dma_free(sa, &mcdi->mem);\n+\tops->dma_free(ops_cookie, &mcdi->mem);\n \n fail_dma_alloc:\n \tmcdi->state = SFC_EFX_MCDI_UNINITIALIZED;\n@@ -327,7 +332,7 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi,\n }\n \n static void\n-sfc_efx_mcdi_fini(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi)\n+sfc_efx_mcdi_fini(struct sfc_efx_mcdi *mcdi)\n {\n \tefx_mcdi_transport_t *emtp;\n \n@@ -345,9 +350,33 @@ sfc_efx_mcdi_fini(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi)\n \n \trte_spinlock_unlock(&mcdi->lock);\n \n-\tsfc_dma_free(sa, &mcdi->mem);\n+\tmcdi->ops->dma_free(mcdi->ops_cookie, &mcdi->mem);\n+}\n+\n+static sfc_efx_mcdi_dma_alloc_cb sfc_mcdi_dma_alloc;\n+static int\n+sfc_mcdi_dma_alloc(void *cookie, const char *name, size_t len,\n+\t\t efsys_mem_t *esmp)\n+{\n+\tconst struct sfc_adapter *sa = cookie;\n+\n+\treturn sfc_dma_alloc(sa, name, 0, len, sa->socket_id, esmp);\n }\n \n+static sfc_efx_mcdi_dma_free_cb sfc_mcdi_dma_free;\n+static void\n+sfc_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)\n+{\n+\tconst struct sfc_adapter *sa = cookie;\n+\n+\tsfc_dma_free(sa, esmp);\n+}\n+\n+static const struct sfc_efx_mcdi_ops sfc_mcdi_ops = {\n+\t.dma_alloc\t= sfc_mcdi_dma_alloc,\n+\t.dma_free\t= sfc_mcdi_dma_free,\n+};\n+\n int\n sfc_mcdi_init(struct sfc_adapter *sa)\n {\n@@ -360,12 +389,13 @@ sfc_mcdi_init(struct sfc_adapter *sa)\n \t\t\t\t RTE_LOG_NOTICE);\n \n \treturn sfc_efx_mcdi_init(sa, &sa->mcdi, logtype,\n-\t\t\t\t sa->priv.shared->log_prefix, sa->nic);\n+\t\t\t\t sa->priv.shared->log_prefix, sa->nic,\n+\t\t\t\t &sfc_mcdi_ops, sa);\n }\n \n void\n sfc_mcdi_fini(struct sfc_adapter *sa)\n {\n \tsfc_log_init(sa, \"entry\");\n-\tsfc_efx_mcdi_fini(sa, &sa->mcdi);\n+\tsfc_efx_mcdi_fini(&sa->mcdi);\n }\ndiff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h\nindex b93b268e32..ef24a8bc67 100644\n--- a/drivers/net/sfc/sfc_mcdi.h\n+++ b/drivers/net/sfc/sfc_mcdi.h\n@@ -32,8 +32,20 @@ enum sfc_efx_mcdi_state {\n \tSFC_EFX_MCDI_NSTATES\n };\n \n+typedef int (sfc_efx_mcdi_dma_alloc_cb)(void *cookie, const char *name,\n+\t\t\t\t\t size_t len, efsys_mem_t *esmp);\n+\n+typedef void (sfc_efx_mcdi_dma_free_cb)(void *cookie, efsys_mem_t *esmp);\n+\n+struct sfc_efx_mcdi_ops {\n+\tsfc_efx_mcdi_dma_alloc_cb\t*dma_alloc;\n+\tsfc_efx_mcdi_dma_free_cb\t*dma_free;\n+};\n+\n struct sfc_efx_mcdi {\n \trte_spinlock_t\t\t\tlock;\n+\tconst struct sfc_efx_mcdi_ops\t*ops;\n+\tvoid\t\t\t\t*ops_cookie;\n \tefx_nic_t\t\t\t*nic;\n \tefsys_mem_t\t\t\tmem;\n \tenum sfc_efx_mcdi_state\t\tstate;\n", "prefixes": [ "10/14" ] }