From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B474DA0521 for ; Mon, 3 Aug 2020 10:25:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9F03A2BD8; Mon, 3 Aug 2020 10:25:49 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 47C822BD8 for ; Mon, 3 Aug 2020 10:25:48 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from matan@mellanox.com) with SMTP; 3 Aug 2020 11:25:42 +0300 Received: from pegasus25.mtr.labs.mlnx. (pegasus25.mtr.labs.mlnx [10.210.16.10]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 0738PgFN024508; Mon, 3 Aug 2020 11:25:42 +0300 From: Matan Azrad To: Maxime Coquelin Cc: dev@dpdk.org, stable@dpdk.org Date: Mon, 3 Aug 2020 08:25:24 +0000 Message-Id: <1596443124-270157-1-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-stable] [PATCH] vdpa/mlx5: fix virtq unset X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" When a virtq is destroyed, the SW should be able to continue the virtq processing from where the HW stopped. The current destroy behavior in the driver saves the virtq state (used and available indexes) only when LM is requested. So, when LM is not requested the queue state is not saved and the SW indexes stay invalid. Save the virtq state in the virtq destroy process. Fixes: bff735011078 ("vdpa/mlx5: prepare virtio queues") Cc: stable@dpdk.org Signed-off-by: Matan Azrad Acked-by: Xueming Li --- drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h index 57044d9..5963e35 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h @@ -86,6 +86,7 @@ struct mlx5_vdpa_virtq { uint16_t index; uint16_t vq_size; uint8_t notifier_state; + bool stopped; struct mlx5_vdpa_priv *priv; struct mlx5_devx_obj *virtq; struct mlx5_devx_obj *counters; diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c index 19554f6..17e71cf 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c @@ -72,8 +72,13 @@ } virtq->intr_handle.fd = -1; } - if (virtq->virtq) + if (virtq->virtq) { + ret = mlx5_vdpa_virtq_stop(virtq->priv, virtq->index); + if (ret) + DRV_LOG(WARNING, "Failed to stop virtq %d.", + virtq->index); claim_zero(mlx5_devx_cmd_destroy(virtq->virtq)); + } virtq->virtq = NULL; for (i = 0; i < RTE_DIM(virtq->umems); ++i) { if (virtq->umems[i].obj) @@ -135,10 +140,14 @@ { struct mlx5_devx_virtq_attr attr = {0}; struct mlx5_vdpa_virtq *virtq = &priv->virtqs[index]; - int ret = mlx5_vdpa_virtq_modify(virtq, 0); + int ret; + if (virtq->stopped) + return 0; + ret = mlx5_vdpa_virtq_modify(virtq, 0); if (ret) return -1; + virtq->stopped = true; if (mlx5_devx_cmd_query_virtq(virtq->virtq, &attr)) { DRV_LOG(ERR, "Failed to query virtq %d.", index); return -1; @@ -323,6 +332,7 @@ virtq->intr_handle.fd, index); } } + virtq->stopped = false; DRV_LOG(DEBUG, "vid %u virtq %u was created successfully.", priv->vid, index); return 0; @@ -489,9 +499,6 @@ DRV_LOG(WARNING, "Failed to disable steering " "for virtq %d.", index); } - ret = mlx5_vdpa_virtq_stop(priv, index); - if (ret) - DRV_LOG(WARNING, "Failed to stop virtq %d.", index); mlx5_vdpa_virtq_unset(virtq); } if (enable) { -- 1.8.3.1