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 CDF6CA0560;
Tue, 18 Oct 2022 08:23:37 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id F01D1410F2;
Tue, 18 Oct 2022 08:23:32 +0200 (CEST)
Received: from mga12.intel.com (mga12.intel.com [192.55.52.136])
by mails.dpdk.org (Postfix) with ESMTP id 1849B410F2
for <dev@dpdk.org>; Tue, 18 Oct 2022 08:23:30 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1666074211; x=1697610211;
h=from:to:cc:subject:date:message-id:in-reply-to: references;
bh=MZkE2BhYeMTxAZlKloqSsOQ5PvQYywfYmwmnp/qtYZA=;
b=DXA+t5So/Kkp10uktmmha5jpK3E69KR/tig53n0FUy48A8d0GEVXvAWb
cKbPSTdYmGDJgwHrcSzbOc2zmJX6lsmy+PhiLfgtk98eXDBw0OF/n2cle
dAfDP4nbxYVpAx0SihfzhpQtFbxOVKfPauBv45FDbNcDJK5mu/o8vWP3Q
rcgZ05K9Q6SABKkc2k9xHnfHP24Lkdjlj7qN7GyeQ/SAsWm5ZA1LiHjUb
S9Kv6172ZE8OBfSwj/T3RsLYlHZh535uey7oMx6Md2ORsBhRVvbk5CoGz
LppATiDt8NHpeZoWqJMXaswthxe9IlH80ZmmzWPE7wFbI63+bT9XbUvxm w==;
X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="285732665"
X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="285732665"
Received: from orsmga008.jf.intel.com ([10.7.209.65])
by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
17 Oct 2022 23:23:30 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="659655775"
X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="659655775"
Received: from dpdk-dipei.sh.intel.com ([10.67.110.251])
by orsmga008.jf.intel.com with ESMTP; 17 Oct 2022 23:23:28 -0700
From: Andy Pei <andy.pei@intel.com>
To: dev@dpdk.org
Cc: chenbo.xia@intel.com, rosen.xu@intel.com, wei.huang@intel.com,
gang.cao@intel.com, maxime.coquelin@redhat.com
Subject: [PATCH v7 02/12] vdpa/ifc: add multi-queue support
Date: Tue, 18 Oct 2022 14:19:27 +0800
Message-Id: <1666073977-175484-3-git-send-email-andy.pei@intel.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1666073977-175484-1-git-send-email-andy.pei@intel.com>
References: <1661229305-240952-2-git-send-email-andy.pei@intel.com>
<1666073977-175484-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
Enable VHOST_USER_PROTOCOL_F_MQ feature.
Expose IFCVF_MQ_OFFSET register to enable multi-queue.
Signed-off-by: Andy Pei <andy.pei@intel.com>
Signed-off-by: Huang Wei <wei.huang@intel.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
drivers/vdpa/ifc/base/ifcvf.c | 9 +++++++++
drivers/vdpa/ifc/base/ifcvf.h | 2 ++
drivers/vdpa/ifc/ifcvf_vdpa.c | 1 +
3 files changed, 12 insertions(+)
diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c
index f1e1474..81c68c0 100644
--- a/drivers/vdpa/ifc/base/ifcvf.c
+++ b/drivers/vdpa/ifc/base/ifcvf.c
@@ -90,6 +90,15 @@
if (!hw->lm_cfg)
WARNINGOUT("HW support live migration not support!\n");
+ /* For some hardware implementation, for example:
+ * the BAR 4 of PF is NULL, while BAR 4 of VF is not.
+ * This code makes sure hw->mq_cfg is a valid address.
+ */
+ if (hw->mem_resource[4].addr)
+ hw->mq_cfg = hw->mem_resource[4].addr + IFCVF_MQ_OFFSET;
+ else
+ hw->mq_cfg = NULL;
+
if (hw->common_cfg == NULL || hw->notify_base == NULL ||
hw->isr == NULL || hw->dev_cfg == NULL) {
DEBUGOUT("capability incomplete\n");
diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h
index ef7697a..d16d9ab 100644
--- a/drivers/vdpa/ifc/base/ifcvf.h
+++ b/drivers/vdpa/ifc/base/ifcvf.h
@@ -50,6 +50,7 @@
#define IFCVF_LM_CFG_SIZE 0x40
#define IFCVF_LM_RING_STATE_OFFSET 0x20
+#define IFCVF_MQ_OFFSET 0x28
#define IFCVF_LM_LOGGING_CTRL 0x0
@@ -149,6 +150,7 @@ struct ifcvf_hw {
u16 *notify_base;
u16 *notify_addr[IFCVF_MAX_QUEUES * 2];
u8 *lm_cfg;
+ u8 *mq_cfg;
struct vring_info vring[IFCVF_MAX_QUEUES * 2];
u8 nr_vring;
int device_type;
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index b4389a0..008cf89 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -1248,6 +1248,7 @@ struct rte_vdpa_dev_info {
1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD | \
1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER | \
1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD | \
+ 1ULL << VHOST_USER_PROTOCOL_F_MQ | \
1ULL << VHOST_USER_PROTOCOL_F_STATUS)
#define VDPA_BLK_PROTOCOL_FEATURES \
--
1.8.3.1