Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/112369/?format=api
{ "id": 112369, "url": "https://patches.dpdk.org/api/patches/112369/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220606112109.208873-28-lizh@nvidia.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": "<20220606112109.208873-28-lizh@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220606112109.208873-28-lizh@nvidia.com", "date": "2022-06-06T11:21:04", "name": "[v1,14/17] vdpa/mlx5: add virtq LM log task", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ab6e45298eb400233e109fca67571c2f5ef959aa", "submitter": { "id": 1967, "url": "https://patches.dpdk.org/api/people/1967/?format=api", "name": "Li Zhang", "email": "lizh@nvidia.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220606112109.208873-28-lizh@nvidia.com/mbox/", "series": [ { "id": 23352, "url": "https://patches.dpdk.org/api/series/23352/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=23352", "date": "2022-06-06T11:21:04", "name": null, "version": 1, "mbox": "https://patches.dpdk.org/series/23352/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/112369/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/112369/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8E54EA0543;\n\tMon, 6 Jun 2022 13:25:07 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CE97E427F9;\n\tMon, 6 Jun 2022 13:23:00 +0200 (CEST)", "from NAM10-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam10on2083.outbound.protection.outlook.com [40.107.94.83])\n by mails.dpdk.org (Postfix) with ESMTP id 91C1F42BE8\n for <dev@dpdk.org>; Mon, 6 Jun 2022 13:22:57 +0200 (CEST)", "from BN6PR2001CA0016.namprd20.prod.outlook.com\n (2603:10b6:404:b4::26) by DM6PR12MB2938.namprd12.prod.outlook.com\n (2603:10b6:5:18a::31) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.16; Mon, 6 Jun\n 2022 11:22:55 +0000", "from BN8NAM11FT036.eop-nam11.prod.protection.outlook.com\n (2603:10b6:404:b4:cafe::f8) by BN6PR2001CA0016.outlook.office365.com\n (2603:10b6:404:b4::26) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.18 via Frontend\n Transport; Mon, 6 Jun 2022 11:22:55 +0000", "from mail.nvidia.com (12.22.5.235) by\n BN8NAM11FT036.mail.protection.outlook.com (10.13.177.168) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.5314.12 via Frontend Transport; Mon, 6 Jun 2022 11:22:55 +0000", "from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com\n (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32;\n Mon, 6 Jun 2022 11:22:54 +0000", "from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com\n (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Mon, 6 Jun 2022\n 04:22:51 -0700" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=RcehBqzGy+dYrDt9YtG44Y0CqbbYZdLuOoEg0k5SQ0xSOs6PtClbTbWsVrThmxGbHEL2mGyIbaIcfMdCjSVKS3Z/L3hVlml5Udz82xHDJzPPN+olg8Sf3DfNEdmR0k43aID1WGUdh82Qqygu0+XCXjhJdbWy9RAreucd7v4OkCEXV7yS+eTzgacBjVzxwwPKxYt909ppkuJjOHTFhzeFklqUqn3zQa3ZLvKvLdmgysON8nFihRS9ekhialex/jUFTv7Q4hFLLBjvWeaa18OP+wI7koVvRvObvzwQp+Hai/Mj4si5svyqku412ZF0m07zeS4TSHuFsjOcVdRQ/JTr7g==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=TFlSU0NM+Vl7ACH+AnzFBZIOnfKwLgjvtRy8gMC45iw=;\n b=WUzpLRi6HAqhnrCRiBTE+/dnVhSs87wqrNUjNhsiTR5bwFXwqhgEslMwT6XuYkbWHLSzidyXahT9HyXZquaUA3LLCrq1HSwVdAKfEt6vW7fDi9reKsI3yA8QMV+QlulC2jIRZ+HUnb/5GLI1JIS/xnsQKpbvtIxYRSZcPg4vYjSsJ5L6fpfPZhVAUvNhze46P4R/3zsnOimflZ12tYbMI6/tqFgBKMH9LK2ogW4yb0ryjw7Uj9akCQKy1zxYcY620V/1hM4QPAk0he8tQkFydh/xhAX01gp9CysWe0ZIksGdSaheghodY+31df3511SKYCtjJvfjQvF6I2llLc99Gw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 12.22.5.235) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com;\n dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=TFlSU0NM+Vl7ACH+AnzFBZIOnfKwLgjvtRy8gMC45iw=;\n b=mcoAHAXCp0X9I2Csa/lzYE+AjFu5sbruNUNp1mnYcmNqUG73lA0LMTrSACsTxdkwHbf7YpLdDu06LspNNnbenaoly6YHFVVMSvlGmrBOzKYlgxpIws3VgV7AbRW2A2wTcQ3phI4mWG6+Pl17JYJ8cJjaEq095IT93o1ggJ1SVvtIz+rFSu6E5zifQutTboOOm47aTyvWz7+PmcqBwdddb3i+89i0/S2C25qKkqnw8qB3fkI4ZERQunz6a7HYqm8mI508tA8qYCggSIK9HjFgL0fgpd2Hr3o+4n7eBGgfOsm69pKeEBj8ZtVAuWNZkc635HOKzbl48dH/nExD7eGO4g==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 12.22.5.235)\n smtp.mailfrom=nvidia.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 12.22.5.235 as permitted sender) receiver=protection.outlook.com;\n client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C", "From": "Li Zhang <lizh@nvidia.com>", "To": "<orika@nvidia.com>, <viacheslavo@nvidia.com>, <matan@nvidia.com>,\n <shahafs@nvidia.com>", "CC": "<dev@dpdk.org>, <thomas@monjalon.net>, <rasland@nvidia.com>,\n <roniba@nvidia.com>", "Subject": "[PATCH v1 14/17] vdpa/mlx5: add virtq LM log task", "Date": "Mon, 6 Jun 2022 14:21:04 +0300", "Message-ID": "<20220606112109.208873-28-lizh@nvidia.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20220606112109.208873-1-lizh@nvidia.com>", "References": "<20220408075606.33056-1-lizh@nvidia.com>\n <20220606112109.208873-1-lizh@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.126.231.35]", "X-ClientProxiedBy": "rnnvmail202.nvidia.com (10.129.68.7) To\n rnnvmail201.nvidia.com (10.129.68.8)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "a93da1b4-7ef7-45cd-09b9-08da47aee74e", "X-MS-TrafficTypeDiagnostic": "DM6PR12MB2938:EE_", "X-LD-Processed": "43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr", "X-Microsoft-Antispam-PRVS": "\n <DM6PR12MB29387DD3A2E1047D332B1751BFA29@DM6PR12MB2938.namprd12.prod.outlook.com>", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n NZ9kEyx42gbS0pLUzJwYBCZV8JFJvocdFf5lHsk6ymqLY/lv8/1RVAODb8Va4lQjo8XQGyYpPpu7IxYlkDeJrTVgkxLZQz0o1EPwpTrtD3LOXddPCFIUuligU4zHXbFwcXeGCrfAePS8oR+tYYAJvC/RoaGOWML0Xg1dcmIYHSho6oQmdVNpB3o6PW8OqYeywrZat3nFiQBhOU2SvfoOIfRGjvUX3W5CU/CRP7dzxiCj6v+w+yLFilpK7c6kknBPMTD6cFmlxvDpkBGe/LTgySGWng/XB1Bi7gXW49O4Lz7YC0aw5ksCvxwykWNXnrujOu8Id4YpxuV5XwKpIgSewL9eUytYyYkEKn44xjcAwM5G1JWLHfntTqA7nnSbnG15JyYAwuLF67hw5JQzqSo18Fa42xDFrjVEwEc71AP0z+CGbgGzjdEQyt29BNi+mIj1594eP5CG1tsvZmnD2QsY51kPk5O3DhTeQC+5KzA1px1cd3IYcLlEeWeh8mX6Q8eipKiYB7IsOTABK/agytf5N/feiqHmuruCFG/dPE3cHu/qvmBgRNxGfoPP0nDVS+ebvpRrC7wkUREkL4VQ4TD8S8kwfAReJcoQA5kGd46f7JWlRrknHwa9htWfIfewyEGGLEiPIjNefpH7W6Rd4I7syq30LLK1IqdBJtPcab48d07rhQAElS7ew2LUkRT8nXL5EwAWGb+9apDZsZ2UygJwLg==", "X-Forefront-Antispam-Report": "CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE;\n SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(5660300002)(8936002)(2906002)(6286002)(356005)(36860700001)(7696005)(86362001)(6666004)(26005)(8676002)(4326008)(186003)(70206006)(1076003)(2616005)(16526019)(336012)(83380400001)(107886003)(426003)(47076005)(54906003)(70586007)(82310400005)(36756003)(40460700003)(81166007)(55016003)(6636002)(316002)(508600001)(110136005)(36900700001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "06 Jun 2022 11:22:55.4535 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n a93da1b4-7ef7-45cd-09b9-08da47aee74e", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n BN8NAM11FT036.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM6PR12MB2938", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "Split the virtqs LM log between the configuration threads.\nThis accelerates the LM process and reduces its time by 20%.\n\nSigned-off-by: Li Zhang <lizh@nvidia.com>\n---\n drivers/vdpa/mlx5/mlx5_vdpa.h | 3 +\n drivers/vdpa/mlx5/mlx5_vdpa_cthread.c | 34 +++++++++++\n drivers/vdpa/mlx5/mlx5_vdpa_lm.c | 85 +++++++++++++++++++++------\n 3 files changed, 105 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h\nindex 35221f5ddc..e08931719f 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa.h\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa.h\n@@ -72,6 +72,8 @@ enum {\n \tMLX5_VDPA_NOTIFIER_STATE_ERR\n };\n \n+#define MLX5_VDPA_USED_RING_LEN(size) \\\n+\t((size) * sizeof(struct vring_used_elem) + sizeof(uint16_t) * 3)\n #define MLX5_VDPA_MAX_C_THRD 256\n #define MLX5_VDPA_MAX_TASKS_PER_THRD 4096\n #define MLX5_VDPA_TASKS_PER_DEV 64\n@@ -81,6 +83,7 @@ enum {\n enum mlx5_vdpa_task_type {\n \tMLX5_VDPA_TASK_REG_MR = 1,\n \tMLX5_VDPA_TASK_SETUP_VIRTQ,\n+\tMLX5_VDPA_TASK_STOP_VIRTQ,\n };\n \n /* Generic task information and size must be multiple of 4B. */\ndiff --git a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c\nindex 1389d369ae..98369f0887 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c\n@@ -104,6 +104,7 @@ mlx5_vdpa_c_thread_handle(void *arg)\n \tstruct mlx5_vdpa_priv *priv;\n \tstruct mlx5_vdpa_task task;\n \tstruct rte_ring *rng;\n+\tuint64_t features;\n \tuint32_t thrd_idx;\n \tuint32_t task_num;\n \tint ret;\n@@ -153,6 +154,39 @@ mlx5_vdpa_c_thread_handle(void *arg)\n \t\t\t}\n \t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n \t\t\tbreak;\n+\t\tcase MLX5_VDPA_TASK_STOP_VIRTQ:\n+\t\t\tvirtq = &priv->virtqs[task.idx];\n+\t\t\tpthread_mutex_lock(&virtq->virtq_lock);\n+\t\t\tret = mlx5_vdpa_virtq_stop(priv,\n+\t\t\t\t\ttask.idx);\n+\t\t\tif (ret) {\n+\t\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\"Failed to stop virtq %d.\",\n+\t\t\t\ttask.idx);\n+\t\t\t\t__atomic_fetch_add(\n+\t\t\t\t\ttask.err_cnt, 1,\n+\t\t\t\t\t__ATOMIC_RELAXED);\n+\t\t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tret = rte_vhost_get_negotiated_features(\n+\t\t\t\tpriv->vid, &features);\n+\t\t\tif (ret) {\n+\t\t\t\tDRV_LOG(ERR,\n+\t\t\"Failed to get negotiated features virtq %d.\",\n+\t\t\t\ttask.idx);\n+\t\t\t\t__atomic_fetch_add(\n+\t\t\t\t\ttask.err_cnt, 1,\n+\t\t\t\t\t__ATOMIC_RELAXED);\n+\t\t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tif (RTE_VHOST_NEED_LOG(features))\n+\t\t\t\trte_vhost_log_used_vring(\n+\t\t\t\tpriv->vid, task.idx, 0,\n+\t\t\t MLX5_VDPA_USED_RING_LEN(virtq->vq_size));\n+\t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tDRV_LOG(ERR, \"Invalid vdpa task type %d.\",\n \t\t\ttask.type);\ndiff --git a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c\nindex efebf364d0..c2e78218ca 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c\n@@ -89,39 +89,90 @@ mlx5_vdpa_dirty_bitmap_set(struct mlx5_vdpa_priv *priv, uint64_t log_base,\n \treturn -1;\n }\n \n-#define MLX5_VDPA_USED_RING_LEN(size) \\\n-\t((size) * sizeof(struct vring_used_elem) + sizeof(uint16_t) * 3)\n-\n int\n mlx5_vdpa_lm_log(struct mlx5_vdpa_priv *priv)\n {\n+\tuint32_t remaining_cnt = 0, err_cnt = 0, task_num = 0;\n+\tuint32_t i, thrd_idx, data[1];\n \tstruct mlx5_vdpa_virtq *virtq;\n \tuint64_t features;\n-\tint ret = rte_vhost_get_negotiated_features(priv->vid, &features);\n-\tint i;\n+\tint ret;\n \n+\tret = rte_vhost_get_negotiated_features(priv->vid, &features);\n \tif (ret) {\n \t\tDRV_LOG(ERR, \"Failed to get negotiated features.\");\n \t\treturn -1;\n \t}\n-\tif (!RTE_VHOST_NEED_LOG(features))\n-\t\treturn 0;\n-\tfor (i = 0; i < priv->nr_virtqs; ++i) {\n-\t\tvirtq = &priv->virtqs[i];\n-\t\tif (!priv->virtqs[i].virtq) {\n-\t\t\tDRV_LOG(DEBUG, \"virtq %d is invalid for LM log.\", i);\n-\t\t} else {\n+\tif (priv->use_c_thread && priv->nr_virtqs) {\n+\t\tuint32_t main_task_idx[priv->nr_virtqs];\n+\n+\t\tfor (i = 0; i < priv->nr_virtqs; i++) {\n+\t\t\tvirtq = &priv->virtqs[i];\n+\t\t\tif (!virtq->configured)\n+\t\t\t\tcontinue;\n+\t\t\tthrd_idx = i % (conf_thread_mng.max_thrds + 1);\n+\t\t\tif (!thrd_idx) {\n+\t\t\t\tmain_task_idx[task_num] = i;\n+\t\t\t\ttask_num++;\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tthrd_idx = priv->last_c_thrd_idx + 1;\n+\t\t\tif (thrd_idx >= conf_thread_mng.max_thrds)\n+\t\t\t\tthrd_idx = 0;\n+\t\t\tpriv->last_c_thrd_idx = thrd_idx;\n+\t\t\tdata[0] = i;\n+\t\t\tif (mlx5_vdpa_task_add(priv, thrd_idx,\n+\t\t\t\tMLX5_VDPA_TASK_STOP_VIRTQ,\n+\t\t\t\t&remaining_cnt, &err_cnt,\n+\t\t\t\t(void **)&data, 1)) {\n+\t\t\t\tDRV_LOG(ERR, \"Fail to add \"\n+\t\t\t\t\t\"task stop virtq (%d).\", i);\n+\t\t\t\tmain_task_idx[task_num] = i;\n+\t\t\t\ttask_num++;\n+\t\t\t}\n+\t\t}\n+\t\tfor (i = 0; i < task_num; i++) {\n+\t\t\tvirtq = &priv->virtqs[main_task_idx[i]];\n \t\t\tpthread_mutex_lock(&virtq->virtq_lock);\n-\t\t\tret = mlx5_vdpa_virtq_stop(priv, i);\n+\t\t\tret = mlx5_vdpa_virtq_stop(priv,\n+\t\t\t\t\tmain_task_idx[i]);\n+\t\t\tif (ret) {\n+\t\t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n+\t\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\"Failed to stop virtq %d.\", i);\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t\tif (RTE_VHOST_NEED_LOG(features))\n+\t\t\t\trte_vhost_log_used_vring(priv->vid, i, 0,\n+\t\t\t\tMLX5_VDPA_USED_RING_LEN(virtq->vq_size));\n \t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n+\t\t}\n+\t\tif (mlx5_vdpa_c_thread_wait_bulk_tasks_done(&remaining_cnt,\n+\t\t\t&err_cnt, 2000)) {\n+\t\t\tDRV_LOG(ERR,\n+\t\t\t\"Failed to wait virt-queue setup tasks ready.\");\n+\t\t\treturn -1;\n+\t\t}\n+\t} else {\n+\t\tfor (i = 0; i < priv->nr_virtqs; i++) {\n+\t\t\tvirtq = &priv->virtqs[i];\n+\t\t\tpthread_mutex_lock(&virtq->virtq_lock);\n+\t\t\tif (!virtq->configured) {\n+\t\t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tret = mlx5_vdpa_virtq_stop(priv, i);\n \t\t\tif (ret) {\n-\t\t\t\tDRV_LOG(ERR, \"Failed to stop virtq %d for LM \"\n-\t\t\t\t\t\"log.\", i);\n+\t\t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n+\t\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\"Failed to stop virtq %d for LM log.\", i);\n \t\t\t\treturn -1;\n \t\t\t}\n+\t\t\tif (RTE_VHOST_NEED_LOG(features))\n+\t\t\t\trte_vhost_log_used_vring(priv->vid, i, 0,\n+\t\t\t\tMLX5_VDPA_USED_RING_LEN(virtq->vq_size));\n+\t\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n \t\t}\n-\t\trte_vhost_log_used_vring(priv->vid, i, 0,\n-\t\t\t MLX5_VDPA_USED_RING_LEN(priv->virtqs[i].vq_size));\n \t}\n \treturn 0;\n }\n", "prefixes": [ "v1", "14/17" ] }