[v2,3/3] net/ifcvf: enable mutliqueue support
Checks
Commit Message
Enable mutliqueue support for ifcvf devices by setting the mutliqueue
configuration space.
Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
Signed-off-by: Andy Pei <andy.pei@intel.com>
---
drivers/net/ifc/base/ifcvf.c | 8 ++++++++
drivers/net/ifc/base/ifcvf.h | 5 ++++-
drivers/net/ifc/ifcvf_vdpa.c | 30 ++++++++++++++++++++++++++++--
3 files changed, 40 insertions(+), 3 deletions(-)
@@ -310,6 +310,14 @@
*(u32 *)(lm_cfg + IFCVF_LM_LOGGING_CTRL) = IFCVF_LM_DISABLE;
}
+void ifcvf_enable_multiqueue(struct ifcvf_hw *hw, u16 nr_queue_pair)
+{
+ u8 *mq_cfg;
+
+ mq_cfg = hw->mq_cfg;
+ *(u32 *)mq_cfg = nr_queue_pair;
+}
+
void
ifcvf_notify_queue(struct ifcvf_hw *hw, u16 qid)
{
@@ -12,7 +12,7 @@
#define IFCVF_SUBSYS_VENDOR_ID 0x8086
#define IFCVF_SUBSYS_DEVICE_ID 0x001A
-#define IFCVF_MAX_QUEUES 1
+#define IFCVF_MAX_QUEUES 32
#define VIRTIO_F_IOMMU_PLATFORM 33
/* Common configuration */
@@ -153,6 +153,9 @@ struct ifcvf_hw {
ifcvf_disable_logging(struct ifcvf_hw *hw);
void
+ifcvf_enable_multiqueue(struct ifcvf_hw *hw, u16 nr_queue_pair);
+
+void
ifcvf_notify_queue(struct ifcvf_hw *hw, u16 qid);
u8
@@ -994,6 +994,30 @@ struct internal_list {
}
static int
+ifcvf_set_vring_state(int vid, int nr_active_vring)
+{
+ int did, nr_queue_pair;
+ struct internal_list *list;
+
+ if (nr_active_vring == 0) {
+ DRV_LOG(ERR, "No enabled vring");
+ return -1;
+ }
+ nr_queue_pair = (nr_active_vring + 1) / 2;
+
+ did = rte_vhost_get_vdpa_device_id(vid);
+ list = find_internal_resource_by_did(did);
+ if (list == NULL) {
+ DRV_LOG(ERR, "Invalid device id: %d", did);
+ return -1;
+ }
+
+ ifcvf_enable_multiqueue(&list->internal->hw, nr_queue_pair);
+
+ return 0;
+}
+
+static int
ifcvf_get_notify_area(int vid, int qid, uint64_t *offset, uint64_t *size)
{
int did;
@@ -1062,7 +1086,9 @@ struct internal_list {
1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ | \
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_LOG_SHMFD | \
+ 1ULL << VHOST_USER_PROTOCOL_F_MQ)
+
static int
ifcvf_get_protocol_features(int did __rte_unused, uint64_t *features)
{
@@ -1076,7 +1102,7 @@ struct internal_list {
.get_protocol_features = ifcvf_get_protocol_features,
.dev_conf = ifcvf_dev_config,
.dev_close = ifcvf_dev_close,
- .set_vring_state = NULL,
+ .set_vring_state = ifcvf_set_vring_state,
.set_features = ifcvf_set_features,
.migration_done = NULL,
.get_vfio_group_fd = ifcvf_get_vfio_group_fd,