Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/112367/?format=api
{ "id": 112367, "url": "https://patches.dpdk.org/api/patches/112367/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220606112109.208873-27-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-27-lizh@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220606112109.208873-27-lizh@nvidia.com", "date": "2022-06-06T11:21:03", "name": "[14/16] vdpa/mlx5: add device close task", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c9680d5822b5126ec517bc40beba454a3ec60148", "submitter": { "id": 1967, "url": "https://patches.dpdk.org/api/people/1967/?format=api", "name": "Li Zhang", "email": "lizh@nvidia.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220606112109.208873-27-lizh@nvidia.com/mbox/", "series": [ { "id": 23339, "url": "https://patches.dpdk.org/api/series/23339/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=23339", "date": "2022-06-06T11:20:37", "name": "Add vDPA multi-threads optiomization", "version": 1, "mbox": "https://patches.dpdk.org/series/23339/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/112367/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/112367/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 0C3AEA0543;\n\tMon, 6 Jun 2022 13:24:54 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B4E4442BDA;\n\tMon, 6 Jun 2022 13:22:56 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2075.outbound.protection.outlook.com [40.107.244.75])\n by mails.dpdk.org (Postfix) with ESMTP id 3B9A142BD6\n for <dev@dpdk.org>; Mon, 6 Jun 2022 13:22:55 +0200 (CEST)", "from BN6PR21CA0006.namprd21.prod.outlook.com (2603:10b6:404:8e::16)\n by CH2PR12MB4262.namprd12.prod.outlook.com (2603:10b6:610:af::8) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Mon, 6 Jun\n 2022 11:22:53 +0000", "from BN8NAM11FT038.eop-nam11.prod.protection.outlook.com\n (2603:10b6:404:8e:cafe::15) by BN6PR21CA0006.outlook.office365.com\n (2603:10b6:404:8e::16) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.1 via Frontend\n Transport; Mon, 6 Jun 2022 11:22:53 +0000", "from mail.nvidia.com (12.22.5.236) by\n BN8NAM11FT038.mail.protection.outlook.com (10.13.176.246) 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:52 +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 Mon, 6 Jun 2022 11:22:51 +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:48 -0700" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=No5KBLE9rDNN4SQYy3PKxqRkMy6IQDSOILmVgLVwgfsRNrgBbkgWdoSC2Z3KUZJIcf5k0Z7o1Qqbyv5rFrxKRwc9EzLxu+R6O0GNvZ7FSFnsoLLmczOn48QwQE8RxYLodmkMc1cboSDalrz/8ppS53LslacKx+rax4oVHREMlGHlVcqIFxNxGjvL/6Qaztn9yydTMuGIjpsbk5MovFpx2jhlqSuFU/V6jxStBE7r/1wP2XrE97Wjv5ehx5r7P6I/Hn4bn2XZw3LrczQCYy4JChljdMvyihRKt+RyyM5dC+9zZsUGTcfAZBdiSIxeSwvHNRojijRl3Jo0yME0mHC1Vw==", "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=CFwda5vOA5XlHexKDRkII1aR3V+Nqm/BytjADmQ2iyE=;\n b=bpTK0mkt56/TdZi1M8rkFp6hOIdoV4ti3+bqndB5qcyotB8D28XzAdUWiOC9g3KAkenhVPsiACd7FKlUGxIGW4scjtUe53C4OJs+3f8DpPKtXb8/V9qNtxVcqaxBCCAM26JDNftArVwjl3Yu5tFpOqZ0C2WDxjKSI2qKrGmX6XnVa0Ldq1p5mqSAgNXPZxVHU7i0uKCBby0V0TLUZjNCvQCdYO5DCbiu0LIxjr8/zOnDSGFZKyX6A9eRVqxJt2YlXlvYs4+2rJjrZvMlA6IKEkaTqnqmu+sXr1FHV4mhtI0y2mfqFG4cXV3YOn820qiYVqTXULNh2QxK8HUiJ/X07Q==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 12.22.5.236) 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=CFwda5vOA5XlHexKDRkII1aR3V+Nqm/BytjADmQ2iyE=;\n b=Y8LbITcWb7d4ZLvqKg93ZNwFgF7ESHT4KmfHR+nCjE1PGihxL9TgRdgvmxhXYuTHdjPkQirD88a35rXmz+4Gp2L54VZlb6hwegHKPxPjA4Onni5cR1PXZOKugEk6A5xQa3OGk1bZCcxFonSuMghUQYBRsCYzdWBB5nH1xG1WaVRmCcBxhbbsl4IPRbiQSjlSNuC5GCt2T9ACo9QKMTM4eT1cHv4Bkc377Rydk/Ye+cX/tzr8RqtP60MEk1FYkMHE/bFRHlpNEXB9tsUPBF3izcnhSj1eQVFC8LiluGjSM4dZjQTj2w/cb0T6DFjSt54A2ST4/HB4zJ1rBcB7BRhRmg==", "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>", "Subject": "[PATCH 14/16] vdpa/mlx5: add device close task", "Date": "Mon, 6 Jun 2022 14:21:03 +0300", "Message-ID": "<20220606112109.208873-27-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": "ec2c72ff-be5b-4384-6873-08da47aee594", "X-MS-TrafficTypeDiagnostic": "CH2PR12MB4262:EE_", "X-LD-Processed": "43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr", "X-Microsoft-Antispam-PRVS": "\n <CH2PR12MB42625D2969F86443C4A22B79BFA29@CH2PR12MB4262.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 jPUDkBCCZ6W3tsmnyTXFA0vqb4X6x/v4aKnz2X2JDrGShsranPL2o079q9IcR1+zcpOmu1YopCXQnWFzY3W8GqwAPZTWR+YFp62xmqVnE+TgsSer4Pc2csbNODOPEWuylTxleX+RGlw5FEinrKEV8H4zeVTfHiajH00SSRGCzGdt8Ic12wCpzXn/Z5Vhafb2L0h6TD6GiZRc0dhb/Z2GZzozq/7MSjfTLaHR2VMMQxVMO64pplBiFGx5HyfaRpEDfoDendEKdYwiMe5Ts/nt6oq7WPZj2t1NCTwkUhr0uXjNY/f2WwLVMJuVPLgebbiFsh/AEuxCMeEYTKn3alMTMbgeDJp1pz7AzSs+DgoDRKEf+2sGmv2BX0FyxILCJ5+BhOID7K2XLh7cv9RMSCrqxUK56+IY23FgXQ6IptZzKdrtbMk/cF9+5xUYuBQc0OnIyXQ6T7RlC0kLpJxdm+q+kcfhG+FdKNFNJos99Icf6a4Gpjm8RvAHD3qKf0loimvNDDaYX8BSheZUZtiidWCBI7ooRbrdTMhN8kJr0fhrzsih2NPRK1UDILKM9vxyHRMt3AtW58cd+ZD1Jv013xx2/qAUPOARGO/LJ/eXVb04TdEWs0QstTL5EU6iHlWTuKxju9UYTNKrEoEJJlH5KFUx3o26k0hPyvmPKMkMrOod7uZKidux9G/Et8h6F36hpm8H2BGL+7HZevTdq01mkoDKNg==", "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:(13230001)(4636009)(40470700004)(46966006)(36840700001)(55016003)(186003)(16526019)(86362001)(316002)(426003)(40460700003)(8936002)(1076003)(54906003)(36860700001)(110136005)(508600001)(70206006)(70586007)(8676002)(82310400005)(107886003)(4326008)(6636002)(2616005)(81166007)(336012)(356005)(7696005)(2906002)(47076005)(6666004)(5660300002)(26005)(36756003)(6286002)(83380400001)(36900700001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "06 Jun 2022 11:22:52.6218 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n ec2c72ff-be5b-4384-6873-08da47aee594", "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 BN8NAM11FT038.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CH2PR12MB4262", "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 device close tasks after\nstopping virt-queue between the configuration threads.\nThis accelerates the LM process and\nreduces its time by 50%.\n\nSigned-off-by: Li Zhang <lizh@nvidia.com>\n---\n drivers/vdpa/mlx5/mlx5_vdpa.c | 56 +++++++++++++++++++++++++--\n drivers/vdpa/mlx5/mlx5_vdpa.h | 8 ++++\n drivers/vdpa/mlx5/mlx5_vdpa_cthread.c | 20 +++++++++-\n drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 14 +++++++\n 4 files changed, 94 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c\nindex e3b32fa087..d000854c08 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa.c\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c\n@@ -245,7 +245,7 @@ mlx5_vdpa_mtu_set(struct mlx5_vdpa_priv *priv)\n \treturn kern_mtu == vhost_mtu ? 0 : -1;\n }\n \n-static void\n+void\n mlx5_vdpa_dev_cache_clean(struct mlx5_vdpa_priv *priv)\n {\n \t/* Clean pre-created resource in dev removal only. */\n@@ -254,6 +254,26 @@ mlx5_vdpa_dev_cache_clean(struct mlx5_vdpa_priv *priv)\n \tmlx5_vdpa_mem_dereg(priv);\n }\n \n+static bool\n+mlx5_vdpa_wait_dev_close_tasks_done(struct mlx5_vdpa_priv *priv)\n+{\n+\tuint32_t timeout = 0;\n+\n+\t/* Check and wait all close tasks done. */\n+\twhile (__atomic_load_n(&priv->dev_close_progress,\n+\t\t__ATOMIC_RELAXED) != 0 && timeout < 1000) {\n+\t\trte_delay_us_sleep(10000);\n+\t\ttimeout++;\n+\t}\n+\tif (priv->dev_close_progress) {\n+\t\tDRV_LOG(ERR,\n+\t\t\"Failed to wait close device tasks done vid %d.\",\n+\t\tpriv->vid);\n+\t\treturn true;\n+\t}\n+\treturn false;\n+}\n+\n static int\n mlx5_vdpa_dev_close(int vid)\n {\n@@ -271,6 +291,27 @@ mlx5_vdpa_dev_close(int vid)\n \t\tret |= mlx5_vdpa_lm_log(priv);\n \t\tpriv->state = MLX5_VDPA_STATE_IN_PROGRESS;\n \t}\n+\tif (priv->use_c_thread) {\n+\t\tif (priv->last_c_thrd_idx >=\n+\t\t\t(conf_thread_mng.max_thrds - 1))\n+\t\t\tpriv->last_c_thrd_idx = 0;\n+\t\telse\n+\t\t\tpriv->last_c_thrd_idx++;\n+\t\t__atomic_store_n(&priv->dev_close_progress,\n+\t\t\t1, __ATOMIC_RELAXED);\n+\t\tif (mlx5_vdpa_task_add(priv,\n+\t\t\tpriv->last_c_thrd_idx,\n+\t\t\tMLX5_VDPA_TASK_DEV_CLOSE_NOWAIT,\n+\t\t\tNULL, NULL, NULL, 1)) {\n+\t\t\tDRV_LOG(ERR,\n+\t\t\t\"Fail to add dev close task. \");\n+\t\t\tgoto single_thrd;\n+\t\t}\n+\t\tpriv->state = MLX5_VDPA_STATE_PROBED;\n+\t\tDRV_LOG(INFO, \"vDPA device %d was closed.\", vid);\n+\t\treturn ret;\n+\t}\n+single_thrd:\n \tpthread_mutex_lock(&priv->steer_update_lock);\n \tmlx5_vdpa_steer_unset(priv);\n \tpthread_mutex_unlock(&priv->steer_update_lock);\n@@ -278,10 +319,12 @@ mlx5_vdpa_dev_close(int vid)\n \tmlx5_vdpa_drain_cq(priv);\n \tif (priv->lm_mr.addr)\n \t\tmlx5_os_wrapped_mkey_destroy(&priv->lm_mr);\n-\tpriv->state = MLX5_VDPA_STATE_PROBED;\n \tif (!priv->connected)\n \t\tmlx5_vdpa_dev_cache_clean(priv);\n \tpriv->vid = 0;\n+\t__atomic_store_n(&priv->dev_close_progress, 0,\n+\t\t__ATOMIC_RELAXED);\n+\tpriv->state = MLX5_VDPA_STATE_PROBED;\n \tDRV_LOG(INFO, \"vDPA device %d was closed.\", vid);\n \treturn ret;\n }\n@@ -302,6 +345,8 @@ mlx5_vdpa_dev_config(int vid)\n \t\tDRV_LOG(ERR, \"Failed to reconfigure vid %d.\", vid);\n \t\treturn -1;\n \t}\n+\tif (mlx5_vdpa_wait_dev_close_tasks_done(priv))\n+\t\treturn -1;\n \tpriv->vid = vid;\n \tpriv->connected = true;\n \tif (mlx5_vdpa_mtu_set(priv))\n@@ -444,8 +489,11 @@ mlx5_vdpa_dev_cleanup(int vid)\n \t\tDRV_LOG(ERR, \"Invalid vDPA device: %s.\", vdev->device->name);\n \t\treturn -1;\n \t}\n-\tif (priv->state == MLX5_VDPA_STATE_PROBED)\n+\tif (priv->state == MLX5_VDPA_STATE_PROBED) {\n+\t\tif (priv->use_c_thread)\n+\t\t\tmlx5_vdpa_wait_dev_close_tasks_done(priv);\n \t\tmlx5_vdpa_dev_cache_clean(priv);\n+\t}\n \tpriv->connected = false;\n \treturn 0;\n }\n@@ -839,6 +887,8 @@ mlx5_vdpa_dev_release(struct mlx5_vdpa_priv *priv)\n {\n \tif (priv->state == MLX5_VDPA_STATE_CONFIGURED)\n \t\tmlx5_vdpa_dev_close(priv->vid);\n+\tif (priv->use_c_thread)\n+\t\tmlx5_vdpa_wait_dev_close_tasks_done(priv);\n \tmlx5_vdpa_release_dev_resources(priv);\n \tif (priv->vdev)\n \t\trte_vdpa_unregister_device(priv->vdev);\ndiff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h\nindex e08931719f..b6392b9d66 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa.h\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa.h\n@@ -84,6 +84,7 @@ 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+\tMLX5_VDPA_TASK_DEV_CLOSE_NOWAIT,\n };\n \n /* Generic task information and size must be multiple of 4B. */\n@@ -206,6 +207,7 @@ struct mlx5_vdpa_priv {\n \tuint64_t features; /* Negotiated features. */\n \tuint16_t log_max_rqt_size;\n \tuint16_t last_c_thrd_idx;\n+\tuint16_t dev_close_progress;\n \tuint16_t num_mrs; /* Number of memory regions. */\n \tstruct mlx5_vdpa_steer steer;\n \tstruct mlx5dv_var *var;\n@@ -578,4 +580,10 @@ mlx5_vdpa_c_thread_wait_bulk_tasks_done(uint32_t *remaining_cnt,\n \t\tuint32_t *err_cnt, uint32_t sleep_time);\n int\n mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index, bool reg_kick);\n+void\n+mlx5_vdpa_vq_destroy(struct mlx5_vdpa_virtq *virtq);\n+void\n+mlx5_vdpa_dev_cache_clean(struct mlx5_vdpa_priv *priv);\n+void\n+mlx5_vdpa_virtq_unreg_intr_handle_all(struct mlx5_vdpa_priv *priv);\n #endif /* RTE_PMD_MLX5_VDPA_H_ */\ndiff --git a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c\nindex 98369f0887..bb2279440b 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c\n@@ -63,7 +63,8 @@ mlx5_vdpa_task_add(struct mlx5_vdpa_priv *priv,\n \t\ttask[i].type = task_type;\n \t\ttask[i].remaining_cnt = remaining_cnt;\n \t\ttask[i].err_cnt = err_cnt;\n-\t\ttask[i].idx = data[i];\n+\t\tif (data)\n+\t\t\ttask[i].idx = data[i];\n \t}\n \tif (!mlx5_vdpa_c_thrd_ring_enqueue_bulk(rng, (void **)&task, num, NULL))\n \t\treturn -1;\n@@ -187,6 +188,23 @@ mlx5_vdpa_c_thread_handle(void *arg)\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\tcase MLX5_VDPA_TASK_DEV_CLOSE_NOWAIT:\n+\t\t\tmlx5_vdpa_virtq_unreg_intr_handle_all(priv);\n+\t\t\tpthread_mutex_lock(&priv->steer_update_lock);\n+\t\t\tmlx5_vdpa_steer_unset(priv);\n+\t\t\tpthread_mutex_unlock(&priv->steer_update_lock);\n+\t\t\tmlx5_vdpa_virtqs_release(priv);\n+\t\t\tmlx5_vdpa_drain_cq(priv);\n+\t\t\tif (priv->lm_mr.addr)\n+\t\t\t\tmlx5_os_wrapped_mkey_destroy(\n+\t\t\t\t\t&priv->lm_mr);\n+\t\t\tif (!priv->connected)\n+\t\t\t\tmlx5_vdpa_dev_cache_clean(priv);\n+\t\t\tpriv->vid = 0;\n+\t\t\t__atomic_store_n(\n+\t\t\t\t&priv->dev_close_progress, 0,\n+\t\t\t\t__ATOMIC_RELAXED);\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_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c\nindex db05220e76..a08c854b14 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c\n@@ -102,6 +102,20 @@ mlx5_vdpa_virtq_unregister_intr_handle(struct mlx5_vdpa_virtq *virtq)\n \tvirtq->intr_handle = NULL;\n }\n \n+void\n+mlx5_vdpa_virtq_unreg_intr_handle_all(struct mlx5_vdpa_priv *priv)\n+{\n+\tuint32_t i;\n+\tstruct mlx5_vdpa_virtq *virtq;\n+\n+\tfor (i = 0; i < priv->nr_virtqs; i++) {\n+\t\tvirtq = &priv->virtqs[i];\n+\t\tpthread_mutex_lock(&virtq->virtq_lock);\n+\t\tmlx5_vdpa_virtq_unregister_intr_handle(virtq);\n+\t\tpthread_mutex_unlock(&virtq->virtq_lock);\n+\t}\n+}\n+\n /* Release cached VQ resources. */\n void\n mlx5_vdpa_virtqs_cleanup(struct mlx5_vdpa_priv *priv)\n", "prefixes": [ "14/16" ] }