Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/75493/?format=api
{ "id": 75493, "url": "http://patches.dpdk.org/api/patches/75493/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200813112806.164578-3-bruce.richardson@intel.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": "<20200813112806.164578-3-bruce.richardson@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200813112806.164578-3-bruce.richardson@intel.com", "date": "2020-08-13T11:28:00", "name": "[v2,2/7] rawdev: allow drivers to return error from info function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a021bf30f0abe8b3ab95210d2f3937b3bf98b812", "submitter": { "id": 20, "url": "http://patches.dpdk.org/api/people/20/?format=api", "name": "Bruce Richardson", "email": "bruce.richardson@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200813112806.164578-3-bruce.richardson@intel.com/mbox/", "series": [ { "id": 11639, "url": "http://patches.dpdk.org/api/series/11639/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11639", "date": "2020-08-13T11:27:58", "name": "Enhance rawdev APIs", "version": 2, "mbox": "http://patches.dpdk.org/series/11639/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/75493/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/75493/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 A49E1A04B0;\n\tThu, 13 Aug 2020 13:28:33 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6DF621C0C1;\n\tThu, 13 Aug 2020 13:28:21 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by dpdk.org (Postfix) with ESMTP id 49E371C0BE\n for <dev@dpdk.org>; Thu, 13 Aug 2020 13:28:19 +0200 (CEST)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 13 Aug 2020 04:28:18 -0700", "from silpixa00399126.ir.intel.com ([10.237.222.56])\n by fmsmga005.fm.intel.com with ESMTP; 13 Aug 2020 04:28:16 -0700" ], "IronPort-SDR": [ "\n 6O6eBi0fHlcW4o2MFM57EMGNeYPQIQcYkAF1bUunyo6w/vm3CpETWk9xmzFX7jN9WHupoGxHGG\n QF8/ldxAIXlg==", "\n MJbW24FDjLHmWnO8uiCchNY1wn+jPn1JBiLIO3LaTKjkz+dY/S/nq4aOkBh2Zs7aVkhMl4C30H\n hSvAfD3Ukvlw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9711\"; a=\"141827882\"", "E=Sophos;i=\"5.76,308,1592895600\"; d=\"scan'208\";a=\"141827882\"", "E=Sophos;i=\"5.76,308,1592895600\"; d=\"scan'208\";a=\"495832596\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Bruce Richardson <bruce.richardson@intel.com>", "To": "Nipun Gupta <nipun.gupta@nxp.com>, Hemant Agrawal <hemant.agrawal@nxp.com>", "Cc": "dev@dpdk.org, Bruce Richardson <bruce.richardson@intel.com>,\n Rosen Xu <rosen.xu@intel.com>, Tianfei zhang <tianfei.zhang@intel.com>,\n Xiaoyun Li <xiaoyun.li@intel.com>, Jingjing Wu <jingjing.wu@intel.com>", "Date": "Thu, 13 Aug 2020 12:28:00 +0100", "Message-Id": "<20200813112806.164578-3-bruce.richardson@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200813112806.164578-1-bruce.richardson@intel.com>", "References": "<20200709152047.167730-1-bruce.richardson@intel.com>\n <20200813112806.164578-1-bruce.richardson@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 2/7] rawdev: allow drivers to return error\n\tfrom info function", "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": "Since we now allow some parameter checking inside the driver info_get()\nfunctions, it makes sense to allow error return from those functions to the\ncaller. Therefore we change the driver callback return type from void to\nint.\n\nSigned-off-by: Bruce Richardson <bruce.richardson@intel.com>\nReviewed-by: Rosen Xu <rosen.xu@intel.com>\n---\n drivers/raw/ifpga/ifpga_rawdev.c | 15 ++++++++-------\n drivers/raw/ioat/ioat_rawdev.c | 9 ++++++---\n drivers/raw/ntb/ntb.c | 8 +++++---\n drivers/raw/skeleton/skeleton_rawdev.c | 6 ++++--\n lib/librte_rawdev/rte_rawdev.c | 6 ++++--\n lib/librte_rawdev/rte_rawdev_pmd.h | 4 ++--\n 6 files changed, 29 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c\nindex 47cfa38778..32a2b96c90 100644\n--- a/drivers/raw/ifpga/ifpga_rawdev.c\n+++ b/drivers/raw/ifpga/ifpga_rawdev.c\n@@ -603,7 +603,7 @@ ifpga_fill_afu_dev(struct opae_accelerator *acc,\n \treturn 0;\n }\n \n-static void\n+static int\n ifpga_rawdev_info_get(struct rte_rawdev *dev,\n \t\t rte_rawdev_obj_t dev_info,\n \t\t size_t dev_info_size)\n@@ -620,12 +620,12 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,\n \n \tif (!dev_info || dev_info_size != sizeof(*afu_dev)) {\n \t\tIFPGA_RAWDEV_PMD_ERR(\"Invalid request\");\n-\t\treturn;\n+\t\treturn -EINVAL;\n \t}\n \n \tadapter = ifpga_rawdev_get_priv(dev);\n \tif (!adapter)\n-\t\treturn;\n+\t\treturn -ENOENT;\n \n \tafu_dev = dev_info;\n \tafu_dev->rawdev = dev;\n@@ -637,7 +637,7 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,\n \n \t\tif (ifpga_fill_afu_dev(acc, afu_dev)) {\n \t\t\tIFPGA_RAWDEV_PMD_ERR(\"cannot get info\\n\");\n-\t\t\treturn;\n+\t\t\treturn -ENOENT;\n \t\t}\n \t}\n \n@@ -647,21 +647,21 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,\n \t\t/* get LineSide BAR Index */\n \t\tif (opae_manager_get_eth_group_region_info(mgr, 0,\n \t\t\t&opae_lside_eth_info)) {\n-\t\t\treturn;\n+\t\t\treturn -ENOENT;\n \t\t}\n \t\tlside_bar_idx = opae_lside_eth_info.mem_idx;\n \n \t\t/* get NICSide BAR Index */\n \t\tif (opae_manager_get_eth_group_region_info(mgr, 1,\n \t\t\t&opae_nside_eth_info)) {\n-\t\t\treturn;\n+\t\t\treturn -ENOENT;\n \t\t}\n \t\tnside_bar_idx = opae_nside_eth_info.mem_idx;\n \n \t\tif (lside_bar_idx >= PCI_MAX_RESOURCE ||\n \t\t\tnside_bar_idx >= PCI_MAX_RESOURCE ||\n \t\t\tlside_bar_idx == nside_bar_idx)\n-\t\t\treturn;\n+\t\t\treturn -ENOENT;\n \n \t\t/* fill LineSide BAR Index */\n \t\tafu_dev->mem_resource[lside_bar_idx].phys_addr =\n@@ -679,6 +679,7 @@ ifpga_rawdev_info_get(struct rte_rawdev *dev,\n \t\tafu_dev->mem_resource[nside_bar_idx].addr =\n \t\t\topae_nside_eth_info.addr;\n \t}\n+\treturn 0;\n }\n \n static int\ndiff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c\nindex a5c0452d7e..e2fc787263 100644\n--- a/drivers/raw/ioat/ioat_rawdev.c\n+++ b/drivers/raw/ioat/ioat_rawdev.c\n@@ -110,15 +110,18 @@ ioat_dev_stop(struct rte_rawdev *dev)\n \tRTE_SET_USED(dev);\n }\n \n-static void\n+static int\n ioat_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,\n \t\tsize_t dev_info_size)\n {\n \tstruct rte_ioat_rawdev_config *cfg = dev_info;\n \tstruct rte_ioat_rawdev *ioat = dev->dev_private;\n \n-\tif (cfg != NULL && dev_info_size == sizeof(*cfg))\n-\t\tcfg->ring_size = ioat->ring_size;\n+\tif (dev_info == NULL || dev_info_size != sizeof(*cfg))\n+\t\treturn -EINVAL;\n+\n+\tcfg->ring_size = ioat->ring_size;\n+\treturn 0;\n }\n \n static const char * const xstat_names[] = {\ndiff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c\nindex c890c43a32..ced5b6d624 100644\n--- a/drivers/raw/ntb/ntb.c\n+++ b/drivers/raw/ntb/ntb.c\n@@ -800,7 +800,7 @@ ntb_dequeue_bufs(struct rte_rawdev *dev,\n \treturn nb_rx;\n }\n \n-static void\n+static int\n ntb_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,\n \t\tsize_t dev_info_size)\n {\n@@ -809,7 +809,7 @@ ntb_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,\n \n \tif (dev_info_size != sizeof(*info)) {\n \t\tNTB_LOG(ERR, \"Invalid size parameter to %s\", __func__);\n-\t\treturn;\n+\t\treturn -EINVAL;\n \t}\n \n \tinfo->mw_cnt = hw->mw_cnt;\n@@ -824,7 +824,7 @@ ntb_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,\n \n \tif (!hw->queue_size || !hw->queue_pairs) {\n \t\tNTB_LOG(ERR, \"No queue size and queue num assigned.\");\n-\t\treturn;\n+\t\treturn -EAGAIN;\n \t}\n \n \thw->hdr_size_per_queue = RTE_ALIGN(sizeof(struct ntb_header) +\n@@ -832,6 +832,8 @@ ntb_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,\n \t\t\t\thw->queue_size * sizeof(struct ntb_used),\n \t\t\t\tRTE_CACHE_LINE_SIZE);\n \tinfo->ntb_hdr_size = hw->hdr_size_per_queue * hw->queue_pairs;\n+\n+\treturn 0;\n }\n \n static int\ndiff --git a/drivers/raw/skeleton/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c\nindex dc05f3ecf8..dce300c358 100644\n--- a/drivers/raw/skeleton/skeleton_rawdev.c\n+++ b/drivers/raw/skeleton/skeleton_rawdev.c\n@@ -41,7 +41,7 @@ struct queue_buffers {\n static struct queue_buffers queue_buf[SKELETON_MAX_QUEUES] = {};\n static void clear_queue_bufs(int queue_id);\n \n-static void skeleton_rawdev_info_get(struct rte_rawdev *dev,\n+static int skeleton_rawdev_info_get(struct rte_rawdev *dev,\n \t\t\t\t rte_rawdev_obj_t dev_info,\n \t\t\t\t size_t dev_info_size)\n {\n@@ -52,7 +52,7 @@ static void skeleton_rawdev_info_get(struct rte_rawdev *dev,\n \n \tif (!dev_info || dev_info_size != sizeof(*skeldev_conf)) {\n \t\tSKELETON_PMD_ERR(\"Invalid request\");\n-\t\treturn;\n+\t\treturn -EINVAL;\n \t}\n \n \tskeldev = skeleton_rawdev_get_priv(dev);\n@@ -63,6 +63,8 @@ static void skeleton_rawdev_info_get(struct rte_rawdev *dev,\n \tskeldev_conf->capabilities = skeldev->capabilities;\n \tskeldev_conf->device_state = skeldev->device_state;\n \tskeldev_conf->firmware_state = skeldev->fw.firmware_state;\n+\n+\treturn 0;\n }\n \n static int skeleton_rawdev_configure(const struct rte_rawdev *dev,\ndiff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/librte_rawdev/rte_rawdev.c\nindex a576890356..bde33763ee 100644\n--- a/lib/librte_rawdev/rte_rawdev.c\n+++ b/lib/librte_rawdev/rte_rawdev.c\n@@ -82,6 +82,7 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info,\n \t\tsize_t dev_private_size)\n {\n \tstruct rte_rawdev *rawdev;\n+\tint ret = 0;\n \n \tRTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);\n \tRTE_FUNC_PTR_OR_ERR_RET(dev_info, -EINVAL);\n@@ -90,7 +91,8 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info,\n \n \tif (dev_info->dev_private != NULL) {\n \t\tRTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);\n-\t\t(*rawdev->dev_ops->dev_info_get)(rawdev, dev_info->dev_private,\n+\t\tret = (*rawdev->dev_ops->dev_info_get)(rawdev,\n+\t\t\t\tdev_info->dev_private,\n \t\t\t\tdev_private_size);\n \t}\n \n@@ -98,7 +100,7 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info,\n \tdev_info->device = rawdev->device;\n \tdev_info->socket_id = rawdev->socket_id;\n \n-\treturn 0;\n+\treturn ret;\n }\n \n int\ndiff --git a/lib/librte_rawdev/rte_rawdev_pmd.h b/lib/librte_rawdev/rte_rawdev_pmd.h\nindex 0e72a92058..89e46412a3 100644\n--- a/lib/librte_rawdev/rte_rawdev_pmd.h\n+++ b/lib/librte_rawdev/rte_rawdev_pmd.h\n@@ -142,9 +142,9 @@ rte_rawdev_pmd_is_valid_dev(uint8_t dev_id)\n * The size of the structure pointed to by dev_info->dev_private\n *\n * @return\n- * Returns 0 on success\n+ * Returns 0 on success, negative error code on failure\n */\n-typedef void (*rawdev_info_get_t)(struct rte_rawdev *dev,\n+typedef int (*rawdev_info_get_t)(struct rte_rawdev *dev,\n \t\t\t\t rte_rawdev_obj_t dev_info,\n \t\t\t\t size_t dev_private_size);\n \n", "prefixes": [ "v2", "2/7" ] }