From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 84388A034C;
Mon, 28 Mar 2022 10:03:34 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 0B218428CA;
Mon, 28 Mar 2022 10:02:13 +0200 (CEST)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by mails.dpdk.org (Postfix) with ESMTP id D9DD5428C1
for <dev@dpdk.org>; Mon, 28 Mar 2022 10:02:11 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1648454532; x=1679990532;
h=from:to:cc:subject:date:message-id:in-reply-to: references;
bh=yYyXFYqgz0puIq2GVHnWhzhyLTI1QjF0KdG3TdYh/GA=;
b=lEDfPYPVmkyhcH61XC5N1YlWj8amo35UBWg2aATPBQlVY1rkgaxsc6oF
fjQok9ZyMZwDgZeBKFIgqmAfjpjWCYkmEVcy3r8TfIeTytbXqghrMjkje
qP3RFy1fWX4kwBpvQo7f4MGJSHAAp5yUprAoZsC9PXWJULSplTzXB415l
vZT0aRpkx7PatprtEd6py8f6Bx1tUI0PNR3mYAd9tvQuWqb2H1mXz22ul
49FNCKh9iB3tKqtGqwWiFJ58tyaOy/fr5lDl4g8Wqgix62WWDHI5tilF3
KTBOKUg68IST6+FSiYdKvq8SCGAj8kF+M9oecRpYC3kJKOc1KnTEg93rW g==;
X-IronPort-AV: E=McAfee;i="6200,9189,10299"; a="256515800"
X-IronPort-AV: E=Sophos;i="5.90,216,1643702400"; d="scan'208";a="256515800"
Received: from orsmga008.jf.intel.com ([10.7.209.65])
by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
28 Mar 2022 01:02:11 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.90,216,1643702400"; d="scan'208";a="563421927"
Received: from dpdk-dipei.sh.intel.com ([10.67.110.238])
by orsmga008.jf.intel.com with ESMTP; 28 Mar 2022 01:02:09 -0700
From: Andy Pei <andy.pei@intel.com>
To: dev@dpdk.org
Cc: chenbo.xia@intel.com, maxime.coquelin@redhat.com, gang.cao@intel.com,
changpeng.liu@intel.com
Subject: [PATCH v5 15/16] vdpa/ifc: make sure hardware last_avail_idx and
last_used_idx is the same when blk device pause
Date: Mon, 28 Mar 2022 15:17:41 +0800
Message-Id: <1648451862-123318-16-git-send-email-andy.pei@intel.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1648451862-123318-1-git-send-email-andy.pei@intel.com>
References: <1643093258-47258-2-git-send-email-andy.pei@intel.com>
<1648451862-123318-1-git-send-email-andy.pei@intel.com>
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
When virtio blk device is pause, make sure hardware last_avail_idx
and last_used_idx are the same.
Signed-off-by: Andy Pei <andy.pei@intel.com>
---
drivers/vdpa/ifc/base/ifcvf.c | 2 +-
drivers/vdpa/ifc/base/ifcvf.h | 3 +++
drivers/vdpa/ifc/ifcvf_vdpa.c | 32 +++++++++++++++++++++++---------
3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c
index d923266..d89cb73 100644
--- a/drivers/vdpa/ifc/base/ifcvf.c
+++ b/drivers/vdpa/ifc/base/ifcvf.c
@@ -118,7 +118,7 @@
IFCVF_WRITE_REG8(status, &hw->common_cfg->device_status);
}
-STATIC void
+void
ifcvf_reset(struct ifcvf_hw *hw)
{
ifcvf_set_status(hw, 0);
diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h
index 7367094..f22d18b 100644
--- a/drivers/vdpa/ifc/base/ifcvf.h
+++ b/drivers/vdpa/ifc/base/ifcvf.h
@@ -157,6 +157,9 @@ struct ifcvf_hw {
int
ifcvf_init_hw(struct ifcvf_hw *hw, PCI_DEV *dev);
+void
+ifcvf_reset(struct ifcvf_hw *hw);
+
u64
ifcvf_get_features(struct ifcvf_hw *hw);
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index f54beaf..578bf6c 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -351,23 +351,32 @@ struct rte_vdpa_dev_info {
vdpa_ifcvf_blk_pause(struct ifcvf_internal *internal)
{
struct ifcvf_hw *hw = &internal->hw;
- struct rte_vhost_vring vq;
int i, vid;
uint64_t features = 0;
uint64_t log_base = 0, log_size = 0;
uint64_t len;
+ u32 ring_state = 0;
vid = internal->vid;
if (internal->device_type == IFCVF_BLK) {
for (i = 0; i < hw->nr_vring; i++) {
- rte_vhost_get_vhost_vring(internal->vid, i, &vq);
- while (vq.avail->idx != vq.used->idx) {
- ifcvf_notify_queue(hw, i);
- usleep(10);
- }
- hw->vring[i].last_avail_idx = vq.avail->idx;
- hw->vring[i].last_used_idx = vq.used->idx;
+ do {
+ if (hw->lm_cfg != NULL)
+ ring_state = *(u32 *)(hw->lm_cfg +
+ IFCVF_LM_RING_STATE_OFFSET +
+ i * IFCVF_LM_CFG_SIZE);
+ hw->vring[i].last_avail_idx =
+ (u16)(ring_state & IFCVF_16_BIT_MASK);
+ hw->vring[i].last_used_idx =
+ (u16)(ring_state >> 16);
+ if (hw->vring[i].last_avail_idx !=
+ hw->vring[i].last_used_idx) {
+ ifcvf_notify_queue(hw, i);
+ usleep(10);
+ }
+ } while (hw->vring[i].last_avail_idx !=
+ hw->vring[i].last_used_idx);
}
}
@@ -751,7 +760,12 @@ struct rte_vdpa_dev_info {
if (ret)
goto err;
- vdpa_ifcvf_stop(internal);
+ if (internal->device_type == IFCVF_BLK) {
+ vdpa_ifcvf_blk_pause(internal);
+ ifcvf_reset(&internal->hw);
+ } else {
+ vdpa_ifcvf_stop(internal);
+ }
ret = vdpa_disable_vfio_intr(internal);
if (ret)
--
1.8.3.1