Hi Andy,
> -----Original Message-----
> From: Pei, Andy <andy....@intel.com>
> Sent: Thursday, April 21, 2022 4:34 PM
> To: dev@dpdk.org
> Cc: Xia, Chenbo <chenbo....@intel.com>; maxime.coque...@redhat.com; Cao,
> Gang <gang....@intel.com>; Liu, Changpeng <changpeng....@intel.com>
> Subject: [PATCH v6 07/16] examples/vdpa: add vDPA blk support in example
>
> Add virtio blk device support to vDPA example.
>
> Signed-off-by: Andy Pei <andy....@intel.com>
> ---
> examples/vdpa/main.c | 61 +++++++++++++-
> examples/vdpa/vdpa_blk_compact.h | 72 +++++++++++++++++
> examples/vdpa/vhost_user.h | 169
> +++++++++++++++++++++++++++++++++++++++
> 3 files changed, 301 insertions(+), 1 deletion(-)
> create mode 100644 examples/vdpa/vdpa_blk_compact.h
> create mode 100644 examples/vdpa/vhost_user.h
>
> diff --git a/examples/vdpa/main.c b/examples/vdpa/main.c
> index 5ab0765..1c809ab 100644
> --- 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
> @@ -41,6 +42,7 @@ struct vdpa_port {
> static int devcnt;
> static int interactive;
> static int client_mode;
> +static int isblk;
>
> /* display usage */
> static void
> @@ -49,7 +51,8 @@ struct vdpa_port {
> printf("Usage: %s [EAL options] -- "
> " --interactive|-i: run in interactive
> mode.\n"
> " --iface <path>: specify the path prefix
> of
> the socket files, e.g. /tmp/vhost-user-.\n"
> - " --client: register a vhost-user socket
> as
> client mode.\n",
> + " --client: register a vhost-user socket
> as
> client mode.\n"
> + " --isblk: device is a block device, e.g.
> virtio_blk device.\n",
> prgname);
> }
>
> @@ -61,6 +64,7 @@ struct vdpa_port {
> {"iface", required_argument, NULL, 0},
> {"interactive", no_argument, &interactive, 1},
> {"client", no_argument, &client_mode, 1},
> + {"isblk", no_argument, &isblk, 1},
I think a new API for get_device_type will be better than asking user to
specify the
device type.
> {NULL, 0, 0, 0},
> };
> int opt, idx;
> @@ -159,6 +163,52 @@ struct vdpa_port {
> };
>
> 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_BASE);
> + 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_VDPA_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 |= (1ULL << VHOST_USER_PROTOCOL_F_CONFIG);
> + protocol_features |= (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD);
> +
> + 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);
> + goto out;
> + }
> +
> +out:
> + return ret;
> +}
> +
> +static int
> start_vdpa(struct vdpa_port *vport)
> {
> int ret;
> @@ -192,6 +242,15 @@ struct vdpa_port {
> "attach vdpa device failed: %s\n",
> socket_path);
>
> + if (isblk) {
> + RTE_LOG(NOTICE, VDPA, "is a blk device\n");
> + 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
Please remove unused definition in this header. I didn't check all, but it
seems at least VHOST_BLK_PROTOCOL_FEATURES is not used.
> new file mode 100644
> index 0000000..e7c0f22
> --- /dev/null
> +++ b/examples/vdpa/vdpa_blk_compact.h
> @@ -0,0 +1,72 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2022 Intel Corporation
> + */
> +
> +#ifndef _VDPA_BLK_COMPACT_H_
> +#define _VDPA_BLK_COMPACT_H_
> +
> +/**
> + * @file
> + *
> + * Device specific vhost lib
> + */
> +
> +#include <stdbool.h>
> +
> +#include <rte_pci.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_RO 5 /* Disk is read-only */
> +#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 */
> +#define VIRTIO_BLK_F_DISCARD 13 /* DISCARD is supported */
> +#define VIRTIO_BLK_F_WRITE_ZEROES 14 /* WRITE ZEROES is supported */
> +
> +/* Legacy feature bits */
> +#ifndef VIRTIO_BLK_NO_LEGACY
> +#define VIRTIO_BLK_F_BARRIER 0 /* Does host support barriers? */
> +#define VIRTIO_BLK_F_SCSI 7 /* Supports scsi command passthru
> */
> +#define VIRTIO_BLK_F_FLUSH 9 /* Flush command supported */
> +#define VIRTIO_BLK_F_CONFIG_WCE 11 /* Writeback mode available in
> config */
> +
> +/* Old (deprecated) name for VIRTIO_BLK_F_FLUSH. */
> +#define VIRTIO_BLK_F_WCE VIRTIO_BLK_F_FLUSH
> +#endif /* !VIRTIO_BLK_NO_LEGACY */
> +
> +#ifndef VHOST_USER_F_PROTOCOL_FEATURES
> +#define VHOST_USER_F_PROTOCOL_FEATURES 30
> +#endif
> +
> +#define VHOST_BLK_FEATURES ((1ULL << VHOST_F_LOG_ALL) | \
> + (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \
> + (1ULL << VIRTIO_F_VERSION_1) | \
> + (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \
> + (1ULL << VIRTIO_RING_F_EVENT_IDX) | \
> + (1ULL << VIRTIO_RING_F_INDIRECT_DESC))
> +
> +#define VHOST_BLK_DISABLED_FEATURES ((1ULL << VIRTIO_RING_F_EVENT_IDX) |
> \
> + (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY))
> +
> +#define VHOST_BLK_FEATURES_BASE (VHOST_BLK_FEATURES | \
> + (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_VDPA_BLK_DISABLED_FEATURES (VHOST_BLK_DISABLED_FEATURES | \
> + (1ULL << VIRTIO_BLK_F_GEOMETRY) | (1ULL << VIRTIO_BLK_F_CONFIG_WCE)
> | \
> + (1ULL << VIRTIO_BLK_F_BARRIER) | (1ULL << VIRTIO_BLK_F_SCSI))
> +
> +/* Vhost-blk support protocol features */
> +#define VHOST_BLK_PROTOCOL_FEATURES \
> + ((1ULL << VHOST_USER_PROTOCOL_F_CONFIG) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))
> +
> +#endif /* _VDPA_BLK_COMPACT_H_ */
> diff --git a/examples/vdpa/vhost_user.h b/examples/vdpa/vhost_user.h
> new file mode 100644
> index 0000000..137bbc2
> --- /dev/null
> +++ b/examples/vdpa/vhost_user.h
I don't understand, why introduce this header? It seems never used.
Thanks,
Chenbo
> @@ -0,0 +1,169 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2022 Intel Corporation
> + */
> +
> +#ifndef _VHOST_NET_USER_H
> +#define _VHOST_NET_USER_H
> +
> +#include <stdint.h>
> +#include <linux/vhost.h>
> +
> +#include "rte_vhost.h"
> +
> +/* refer to hw/virtio/vhost-user.c */
> +
> +#define VHOST_MEMORY_MAX_NREGIONS 8
> +
> +#ifndef VHOST_USER_MAX_CONFIG_SIZE
> +#define VHOST_USER_MAX_CONFIG_SIZE 256
> +#endif
> +
> +#define VHOST_USER_PROTOCOL_FEATURES ((1ULL <<
> VHOST_USER_PROTOCOL_F_MQ) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD) |\
> + (1ULL << VHOST_USER_PROTOCOL_F_RARP) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_NET_MTU) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_CRYPTO_SESSION) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_PAGEFAULT))
> +
> +typedef enum VhostUserRequest {
> + VHOST_USER_NONE = 0,
> + VHOST_USER_GET_FEATURES = 1,
> + VHOST_USER_SET_FEATURES = 2,
> + VHOST_USER_SET_OWNER = 3,
> + VHOST_USER_RESET_OWNER = 4,
> + VHOST_USER_SET_MEM_TABLE = 5,
> + VHOST_USER_SET_LOG_BASE = 6,
> + VHOST_USER_SET_LOG_FD = 7,
> + VHOST_USER_SET_VRING_NUM = 8,
> + VHOST_USER_SET_VRING_ADDR = 9,
> + VHOST_USER_SET_VRING_BASE = 10,
> + VHOST_USER_GET_VRING_BASE = 11,
> + VHOST_USER_SET_VRING_KICK = 12,
> + VHOST_USER_SET_VRING_CALL = 13,
> + VHOST_USER_SET_VRING_ERR = 14,
> + VHOST_USER_GET_PROTOCOL_FEATURES = 15,
> + VHOST_USER_SET_PROTOCOL_FEATURES = 16,
> + VHOST_USER_GET_QUEUE_NUM = 17,
> + VHOST_USER_SET_VRING_ENABLE = 18,
> + VHOST_USER_SEND_RARP = 19,
> + VHOST_USER_NET_SET_MTU = 20,
> + VHOST_USER_SET_SLAVE_REQ_FD = 21,
> + VHOST_USER_IOTLB_MSG = 22,
> + VHOST_USER_CRYPTO_CREATE_SESS = 26,
> + VHOST_USER_CRYPTO_CLOSE_SESS = 27,
> + VHOST_USER_POSTCOPY_ADVISE = 28,
> + VHOST_USER_POSTCOPY_LISTEN = 29,
> + VHOST_USER_POSTCOPY_END = 30,
> + VHOST_USER_GET_INFLIGHT_FD = 31,
> + VHOST_USER_SET_INFLIGHT_FD = 32,
> + VHOST_USER_MAX = 33
> +} VhostUserRequest;
> +
> +typedef enum VhostUserSlaveRequest {
> + VHOST_USER_SLAVE_NONE = 0,
> + VHOST_USER_SLAVE_IOTLB_MSG = 1,
> + VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3,
> + VHOST_USER_SLAVE_MAX
> +} VhostUserSlaveRequest;
> +
> +typedef struct VhostUserMemoryRegion {
> + uint64_t guest_phys_addr;
> + uint64_t memory_size;
> + uint64_t userspace_addr;
> + uint64_t mmap_offset;
> +} VhostUserMemoryRegion;
> +
> +typedef struct VhostUserMemory {
> + uint32_t nregions;
> + uint32_t padding;
> + VhostUserMemoryRegion regions[VHOST_MEMORY_MAX_NREGIONS];
> +} VhostUserMemory;
> +
> +typedef struct VhostUserLog {
> + uint64_t mmap_size;
> + uint64_t mmap_offset;
> +} VhostUserLog;
> +
> +/* Comply with Cryptodev-Linux */
> +#define VHOST_USER_CRYPTO_MAX_HMAC_KEY_LENGTH 512
> +#define VHOST_USER_CRYPTO_MAX_CIPHER_KEY_LENGTH 64
> +
> +/* Same structure as vhost-user backend session info */
> +typedef struct VhostUserCryptoSessionParam {
> + int64_t session_id;
> + uint32_t op_code;
> + uint32_t cipher_algo;
> + uint32_t cipher_key_len;
> + uint32_t hash_algo;
> + uint32_t digest_len;
> + uint32_t auth_key_len;
> + uint32_t aad_len;
> + uint8_t op_type;
> + uint8_t dir;
> + uint8_t hash_mode;
> + uint8_t chaining_dir;
> + uint8_t *ciphe_key;
> + uint8_t *auth_key;
> + uint8_t cipher_key_buf[VHOST_USER_CRYPTO_MAX_CIPHER_KEY_LENGTH];
> + uint8_t auth_key_buf[VHOST_USER_CRYPTO_MAX_HMAC_KEY_LENGTH];
> +} VhostUserCryptoSessionParam;
> +
> +typedef struct VhostUserVringArea {
> + uint64_t u64;
> + uint64_t size;
> + uint64_t offset;
> +} VhostUserVringArea;
> +
> +typedef struct VhostUserInflight {
> + uint64_t mmap_size;
> + uint64_t mmap_offset;
> + uint16_t num_queues;
> + uint16_t queue_size;
> +} VhostUserInflight;
> +
> +/** Get/set config msg payload */
> +struct vhost_user_config {
> + uint32_t offset;
> + uint32_t size;
> + uint32_t flags;
> + uint8_t region[VHOST_USER_MAX_CONFIG_SIZE];
> +};
> +
> +typedef struct VhostUserMsg {
> + union {
> + uint32_t master; /* a VhostUserRequest value */
> + uint32_t slave; /* a VhostUserSlaveRequest value*/
> + } request;
> +
> +#define VHOST_USER_VERSION_MASK 0x3
> +#define VHOST_USER_REPLY_MASK (0x1 << 2)
> +#define VHOST_USER_NEED_REPLY (0x1 << 3)
> + uint32_t flags;
> + uint32_t size; /* the following payload size */
> + union {
> +#define VHOST_USER_VRING_IDX_MASK 0xff
> +#define VHOST_USER_VRING_NOFD_MASK (0x1<<8)
> + uint64_t u64;
> + struct vhost_vring_state state;
> + struct vhost_vring_addr addr;
> + VhostUserMemory memory;
> + VhostUserLog log;
> + struct vhost_iotlb_msg iotlb;
> + VhostUserCryptoSessionParam crypto_session;
> + VhostUserVringArea area;
> + VhostUserInflight inflight;
> + struct vhost_user_config cfg;
> + } payload;
> + int fds[VHOST_MEMORY_MAX_NREGIONS];
> + int fd_num;
> +} __attribute((packed)) VhostUserMsg;
> +
> +#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
> +
> +/* The version of the protocol we support */
> +#define VHOST_USER_VERSION 0x1
> +#endif
> --
> 1.8.3.1
