Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/113053/?format=api
{ "id": 113053, "url": "http://patches.dpdk.org/api/patches/113053/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220618084805.87315-13-lizh@nvidia.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": "<20220618084805.87315-13-lizh@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220618084805.87315-13-lizh@nvidia.com", "date": "2022-06-18T08:48:02", "name": "[v3,12/15] vdpa/mlx5: add virtq LM log task", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ab6e45298eb400233e109fca67571c2f5ef959aa", "submitter": { "id": 1967, "url": "http://patches.dpdk.org/api/people/1967/?format=api", "name": "Li Zhang", "email": "lizh@nvidia.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220618084805.87315-13-lizh@nvidia.com/mbox/", "series": [ { "id": 23621, "url": "http://patches.dpdk.org/api/series/23621/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=23621", "date": "2022-06-18T08:47:50", "name": "mlx5/vdpa: optimize live migration time", "version": 3, "mbox": "http://patches.dpdk.org/series/23621/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/113053/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/113053/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 98C28A0032;\n\tSat, 18 Jun 2022 10:49:50 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D591942B9B;\n\tSat, 18 Jun 2022 10:49:05 +0200 (CEST)", "from NAM10-BN7-obe.outbound.protection.outlook.com\n (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64])\n by mails.dpdk.org (Postfix) with ESMTP id 06EFC42B8A\n for <dev@dpdk.org>; Sat, 18 Jun 2022 10:49:02 +0200 (CEST)", "from DM6PR04CA0016.namprd04.prod.outlook.com (2603:10b6:5:334::21)\n by DM4PR12MB5037.namprd12.prod.outlook.com (2603:10b6:5:39a::21) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Sat, 18 Jun\n 2022 08:48:59 +0000", "from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com\n (2603:10b6:5:334:cafe::13) by DM6PR04CA0016.outlook.office365.com\n (2603:10b6:5:334::21) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.22 via Frontend\n Transport; Sat, 18 Jun 2022 08:48:59 +0000", "from mail.nvidia.com (12.22.5.236) by\n DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.5353.14 via Frontend Transport; Sat, 18 Jun 2022 08:48:59 +0000", "from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com\n (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32;\n Sat, 18 Jun 2022 08:48:58 +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; Sat, 18 Jun\n 2022 01:48:55 -0700" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=T20uN5o1s0ZvaPYpYYXLsoNo0XVl3cPBGdxfDiGjNKah9LopYeqH9apqs0WWjTOUqnti0pcLTenz55Ei4hakodUcjq+kIo/CjNt+KkjEz6p8rnYlOi/vIkY/nv8sHn3WFVpcsP5M9hqJi2/8R4D3kqRrGblzR17+K8BSdAfZH2yKr7jaaUxRSs/GTwRoyZT39LrkogGILrvtTwSCIC3hALAdDVDJouxtPgNtQauadS1KTGCqvPJ9PqyL2E2oDS/BfrbVlBWwOfc6ZYVTHfFHpSPLzgDzRAo0EEPN6UoFd43ieucAY2nEtr/OkkI01okg3D3OrnNMTAUQThsvXTPVXg==", "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=VjWDzK+T7nVLhoPGczjOlASeotTMpbI33q1pEv6djFc=;\n b=oVSOlMaiCVW9saMCickehzvpNTKdDJSKbEgssMByxgDe3z5rhfM/H38f0sFWZ5peHAjjhzwkOM8RXsjGm1KbnxJV/yXitElO1ZtHqmHzy8vkBLrEYlrc2kzEsyz4E3g2LpVKjyTp/LSYzX9EmZkVU5APhVgGRq6IeG75/juC30gRZKIa2sgFiU5HHIbxQXAVJnMCsVrwyzNLdc9Tu+JtT7JERbAuC4/8Bt/wDzfl0AoWpluJax1q2uMx8ZiJxDmHPmCxAKtbP62e5NI7nnCcPKI5Jbs2lP9Z+YidOv4jsqLwgboJpXoC9Rlr/XNLmbB4UNm5Hq7w7zsj8PJQN+FxlA==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 12.22.5.236) smtp.rcpttodomain=redhat.com 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=VjWDzK+T7nVLhoPGczjOlASeotTMpbI33q1pEv6djFc=;\n b=J0S9J8QLGN3NbEYcSPoyh/z795o/rz6zODKZI80Wal7u2pqayoUCRyJCn9yLWxpzV40xUTpUBoFcRc0GajINgeIk+9cEwyPva2/+I+JnrbH5b7hwgyX9VSID+p5xYJkeTB2HzWfRtZiPQVaV1BdQ3Hao7pEgQuEgg+D9zkLzs/QtkT5GP2+DMHEn6bqIxjC2mCLEOfW7ZfjIVE3hKuy1lu4fwbHpW95TR34F7lCL9NWDHrB9qjVPeR/1LkO6zjV2l1N2Cu/B3Q2hqaoq5MLNJ24346qBsiR6qsfUJrir/oZ8yYPMnQC0vfzm/bEUXKajn/f4NEpSdR90LcwVVtA3Fg==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 12.22.5.236)\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.236 as permitted sender) receiver=protection.outlook.com;\n client-ip=12.22.5.236; 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>, <maxime.coquelin@redhat.com>", "Subject": "[PATCH v3 12/15] vdpa/mlx5: add virtq LM log task", "Date": "Sat, 18 Jun 2022 11:48:02 +0300", "Message-ID": "<20220618084805.87315-13-lizh@nvidia.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20220618084805.87315-1-lizh@nvidia.com>", "References": "<20220408075606.33056-1-lizh@nvidia.com>\n <20220618084805.87315-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": "rnnvmail203.nvidia.com (10.129.68.9) To\n rnnvmail201.nvidia.com (10.129.68.8)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "f999d657-1226-41d2-8c58-08da51076320", "X-MS-TrafficTypeDiagnostic": "DM4PR12MB5037:EE_", "X-LD-Processed": "43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr", "X-Microsoft-Antispam-PRVS": "\n <DM4PR12MB503744F5D6AA93B573C28321BFAE9@DM4PR12MB5037.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 usq1uiJFNwpxDqcIBTTwGgzJTgqJS5V2XNo4XIAoQzQknGXrmQeGnDS2eBXk7nJOoZPt7qZ31w3YOFvJBiR/PlDqs7oeRJglJJe8UrH8d60mvB0ZomfiNrnPZPoU806pvmgjstvYKkrvbbVEcPciLYMKuspW963WP0UhNvl62RagcPpXdWq0XTrljs4SF7xtjp+03K61FgAe79m2kvmVXhePkB20yzIAAIHUhUZmiim4UEzGBLowoK3SzOF+iQ0B/5x6pTC4Yrr77yE2w+NENT2iZN1aj3L7Ntze7wwQPDKrZYcTaMbB4ct8zARh2jnNLb8ByvNGtP6nR6DU1prLOSeBzx02PlxLpyV/1RK99jhJ/4uw+G5ErQsFGMfD8wolxXZcWc1yJXT82fVqXz93DxaUzG+T7HY32fBe+BsndsfZiMUx8/ecoQh9gsj/ac2OikwZU0Gbf+2fVhltfEDnXhj2isNOQyk3YM0RoBetTFMoprhV8XLaPweSumqNQsOyXpjQJYTprc+uPo+wjGmDJJsyaHBlNV7L8S9bWtXL4MKgzmEx/CcAxJsdIR/+Zd4ZwkstiiQjHIKEGx4dnG9S6znysDsSkQJ5cHwBk4IVB3hx96xdTLKVAJ4CBFTK5gp4WWUYlVT9IMPcUsVQ6FL8NEPdf6cV6zG7RMEOhqOTETw+WwvU05DoZPh67BRM92V/ULd4oMPeS+rvoPUw/I0/WA==", "X-Forefront-Antispam-Report": "CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE;\n SFS:(13230016)(4636009)(36840700001)(40470700004)(46966006)(82310400005)(40460700003)(26005)(2906002)(316002)(54906003)(6286002)(70206006)(36756003)(498600001)(8936002)(2616005)(86362001)(7696005)(6666004)(336012)(83380400001)(1076003)(186003)(426003)(16526019)(4326008)(36860700001)(356005)(55016003)(8676002)(81166007)(110136005)(5660300002)(70586007)(6636002)(47076005)(36900700001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Jun 2022 08:48:59.4951 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n f999d657-1226-41d2-8c58-08da51076320", "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.236];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n DM6NAM11FT003.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM4PR12MB5037", "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>\nAcked-by: Matan Azrad <matan@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 ae495a35f3..016e2a097b 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c\n@@ -87,39 +87,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": [ "v3", "12/15" ] }