examples/vdpa: support virtio block device

Add virtio blk device support to vDPA example.

Signed-off-by: Andy Pei <andy.pei@intel.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>

diff --git a/examples/vdpa/main.c b/examples/vdpa/main.c
index 5ab07655aed962674b8e46b1863fb7327a251858..7e11ef4e26eb121bb7a1beed86949d19ed385e1e 100644 (file)
--- a/examples/vdpa/main.c
+++ b/examples/vdpa/main.c
@@ -20,6 +20,7 @@
 #include <cmdline_parse_string.h>
 #include <cmdline_parse_num.h>
 #include <cmdline.h>
+#include "vdpa_blk_compact.h"
 
 #define MAX_PATH_LEN 128
 #define MAX_VDPA_SAMPLE_PORTS 1024
@@ -158,9 +159,54 @@ static const struct rte_vhost_device_ops vdpa_sample_devops = {
        .destroy_device = destroy_device,
 };
 
+static int
+vdpa_blk_device_set_features_and_protocol(const char *path)
+{
+       uint64_t protocol_features = 0;
+       int ret;
+
+       ret = rte_vhost_driver_set_features(path, VHOST_BLK_FEATURES);
+       if (ret != 0) {
+               RTE_LOG(ERR, VDPA,
+                       "rte_vhost_driver_set_features for %s failed.\n",
+                       path);
+               goto out;
+       }
+
+       ret = rte_vhost_driver_disable_features(path,
+               VHOST_BLK_DISABLED_FEATURES);
+       if (ret != 0) {
+               RTE_LOG(ERR, VDPA,
+                       "rte_vhost_driver_disable_features for %s failed.\n",
+                       path);
+               goto out;
+       }
+
+       ret = rte_vhost_driver_get_protocol_features(path, &protocol_features);
+       if (ret != 0) {
+               RTE_LOG(ERR, VDPA,
+                       "rte_vhost_driver_get_protocol_features for %s failed.\n",
+                       path);
+               goto out;
+       }
+
+       protocol_features |= VHOST_BLK_PROTOCOL_FEATURES;
+
+       ret = rte_vhost_driver_set_protocol_features(path, protocol_features);
+       if (ret != 0) {
+               RTE_LOG(ERR, VDPA,
+                       "rte_vhost_driver_set_protocol_features for %s failed.\n",
+                       path);
+       }
+
+out:
+       return ret;
+}
+
 static int
 start_vdpa(struct vdpa_port *vport)
 {
+       uint32_t device_type = 0;
        int ret;
        char *socket_path = vport->ifname;
 
@@ -192,6 +238,16 @@ start_vdpa(struct vdpa_port *vport)
                        "attach vdpa device failed: %s\n",
                        socket_path);
 
+       ret = rte_vhost_driver_get_vdpa_dev_type(socket_path, &device_type);
+       if (ret == 0 && device_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK) {
+               RTE_LOG(NOTICE, VDPA, "%s is a blk device\n", socket_path);
+               ret = vdpa_blk_device_set_features_and_protocol(socket_path);
+               if (ret != 0)
+                       rte_exit(EXIT_FAILURE,
+                               "set vhost blk driver features and protocol features failed: %s\n",
+                               socket_path);
+       }
+
        if (rte_vhost_driver_start(socket_path) < 0)
                rte_exit(EXIT_FAILURE,
                        "start vhost driver failed: %s\n",

diff --git a/examples/vdpa/vdpa_blk_compact.h b/examples/vdpa/vdpa_blk_compact.h
new file mode 100644 (file)
index 0000000..143548e
--- /dev/null
+++ b/examples/vdpa/vdpa_blk_compact.h
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2022 Intel Corporation
+ */
+
+#ifndef _VDPA_BLK_COMPACT_H_
+#define _VDPA_BLK_COMPACT_H_
+
+#include <rte_vhost.h>
+
+/* Feature bits */
+#define VIRTIO_BLK_F_SIZE_MAX     1    /* Indicates maximum segment size */
+#define VIRTIO_BLK_F_SEG_MAX      2    /* Indicates maximum # of segments */
+#define VIRTIO_BLK_F_GEOMETRY     4    /* Legacy geometry available  */
+#define VIRTIO_BLK_F_BLK_SIZE     6    /* Block size of disk is available */
+#define VIRTIO_BLK_F_TOPOLOGY     10   /* Topology information is available */
+#define VIRTIO_BLK_F_MQ           12   /* support more than one vq */
+
+/* Legacy feature bits */
+#define VIRTIO_BLK_F_BARRIER      0    /* Does host support barriers? */
+#define VIRTIO_BLK_F_SCSI         7    /* Supports scsi command passthru */
+#define VIRTIO_BLK_F_CONFIG_WCE   11   /* Writeback mode available in config */
+
+#define VHOST_BLK_FEATURES_BASE ((1ULL << VHOST_F_LOG_ALL) | \
+       (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \
+       (1ULL << VIRTIO_RING_F_INDIRECT_DESC) | \
+       (1ULL << VIRTIO_RING_F_EVENT_IDX) | \
+       (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \
+       (1ULL << VIRTIO_F_VERSION_1))
+
+#define VHOST_BLK_DISABLED_FEATURES_BASE ((1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \
+       (1ULL << VIRTIO_RING_F_EVENT_IDX))
+
+#define VHOST_BLK_FEATURES (VHOST_BLK_FEATURES_BASE | \
+       (1ULL << VIRTIO_BLK_F_SIZE_MAX) | (1ULL << VIRTIO_BLK_F_SEG_MAX) | \
+       (1ULL << VIRTIO_BLK_F_GEOMETRY) | (1ULL << VIRTIO_BLK_F_BLK_SIZE) | \
+       (1ULL << VIRTIO_BLK_F_TOPOLOGY) | (1ULL << VIRTIO_BLK_F_BARRIER)  | \
+       (1ULL << VIRTIO_BLK_F_SCSI)     | (1ULL << VIRTIO_BLK_F_CONFIG_WCE) | \
+       (1ULL << VIRTIO_BLK_F_MQ))
+
+/* Not supported features */
+#define VHOST_BLK_DISABLED_FEATURES (VHOST_BLK_DISABLED_FEATURES_BASE | \
+       (1ULL << VIRTIO_BLK_F_GEOMETRY) | (1ULL << VIRTIO_BLK_F_BARRIER) | \
+       (1ULL << VIRTIO_BLK_F_SCSI)  | (1ULL << VIRTIO_BLK_F_CONFIG_WCE))
+
+/* Vhost-blk support protocol features */
+#define VHOST_BLK_PROTOCOL_FEATURES \
+       ((1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD) | \
+       (1ULL << VHOST_USER_PROTOCOL_F_CONFIG))
+
+#endif /* _VDPA_BLK_COMPACT_H_ */