diff mbox series

[30/40] net/virtio: add Virtio-user vring address ops

Message ID	20201220211405.313012-31-maxime.coquelin@redhat.com (mailing list archive)
State	Superseded, archived
Delegated to:	Maxime Coquelin
Headers	From: Maxime Coquelin <maxime.coquelin@redhat.com> To: dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com, amorenoz@redhat.com, david.marchand@redhat.com Cc: Maxime Coquelin <maxime.coquelin@redhat.com> Date: Sun, 20 Dec 2020 22:13:55 +0100 Message-Id: <20201220211405.313012-31-maxime.coquelin@redhat.com> In-Reply-To: <20201220211405.313012-1-maxime.coquelin@redhat.com> References: <20201220211405.313012-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-dev] [PATCH 30/40] net/virtio: add Virtio-user vring address ops Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	net/virtio: Virtio PMD rework \| [00/40] net/virtio: Virtio PMD rework [01/40] bus/vdev: add helper to get vdev from eth dev [02/40] net/virtio: Introduce Virtio bus type [03/40] net/virtio: refactor virtio-user device [04/40] net/virtio: introduce PCI device metadata [05/40] net/virtio: move PCI device init in dedicated file [06/40] net/virtio: move PCI specific dev init to PCI ethdev init [07/40] net/virtio: move MSIX detection to PCI ethdev [08/40] net/virtio: force IOVA as VA mode for Virtio-user [09/40] net/virtio: store PCI type in Virtio device metadata [10/40] net/virtio: add callback for device closing [11/40] net/virtio: validate features at bus level [12/40] net/virtio: remove bus type enum [13/40] net/virtio: move PCI-specific fields to PCI device [14/40] net/virtio: pack virtio HW struct [15/40] net/virtio: move legacy IO to Virtio PCI [16/40] net/virtio: introduce generic virtio header [17/40] net/virtio: move features definition to generic header [18/40] net/virtio: move virtqueue defines in generic header [19/40] net/virtio: move config definitions to generic header [20/40] net/virtio: make interrupt handling more generic [21/40] net/virtio: move vring alignment to generic header [22/40] net/virtio: remove last PCI refs in non-PCI code [23/40] net/virtio: make Vhost-user req sender consistent [24/40] net/virtio: add Virtio-user ops to set owner [25/40] net/virtio: add Virtio-user features ops [26/40] net/virtio: add Virtio-user protocol features ops [27/40] net/virtio: add Virtio-user memory tables ops [28/40] net/virtio: add Virtio-user vring setting ops [29/40] net/virtio: add Virtio-user vring file ops [30/40] net/virtio: add Virtio-user vring address ops [31/40] net/virtio: add Virtio-user status ops [32/40] net/virtio: remove useless request ops [33/40] net/virtio: improve Virtio-user errors handling [34/40] net/virtio: move Vhost-user reqs to Vhost-user backend [35/40] net/virtio: make server mode blocking [36/40] net/virtio: move protocol features to Vhost-user [37/40] net/virtio: introduce backend data [38/40] net/virtio: move Vhost-user specifics to its backend [39/40] net/virtio: move Vhost-kernel data to its backend [40/40] net/virtio: move Vhost-vDPA data to its backend

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Maxime Coquelin Dec. 20, 2020, 9:13 p.m. UTC

  This patch introduces a new callback for setting
vrings addresses.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_user/vhost.h        |  1 +
 drivers/net/virtio/virtio_user/vhost_kernel.c | 32 +++++++++++++------
 drivers/net/virtio/virtio_user/vhost_user.c   | 29 +++++++++++++----
 drivers/net/virtio/virtio_user/vhost_vdpa.c   |  8 ++++-
 .../net/virtio/virtio_user/virtio_user_dev.c  |  2 +-
 5 files changed, 55 insertions(+), 17 deletions(-)

Comments

Chenbo Xia Jan. 6, 2021, 12:06 p.m. UTC | #1

Hi Maxime,

> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Monday, December 21, 2020 5:14 AM
> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>; olivier.matz@6wind.com;
> amorenoz@redhat.com; david.marchand@redhat.com
> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
> Subject: [PATCH 30/40] net/virtio: add Virtio-user vring address ops
> 
> This patch introduces a new callback for setting
> vrings addresses.
> 
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
>  drivers/net/virtio/virtio_user/vhost.h        |  1 +
>  drivers/net/virtio/virtio_user/vhost_kernel.c | 32 +++++++++++++------
>  drivers/net/virtio/virtio_user/vhost_user.c   | 29 +++++++++++++----
>  drivers/net/virtio/virtio_user/vhost_vdpa.c   |  8 ++++-
>  .../net/virtio/virtio_user/virtio_user_dev.c  |  2 +-
>  5 files changed, 55 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_user/vhost.h
> b/drivers/net/virtio/virtio_user/vhost.h
> index b296ee215d..956eb58728 100644
> --- a/drivers/net/virtio/virtio_user/vhost.h
> +++ b/drivers/net/virtio/virtio_user/vhost.h
> @@ -113,6 +113,7 @@ struct virtio_user_backend_ops {
>  	int (*get_vring_base)(struct virtio_user_dev *dev, struct
> vhost_vring_state *state);
>  	int (*set_vring_call)(struct virtio_user_dev *dev, struct
> vhost_vring_file *file);
>  	int (*set_vring_kick)(struct virtio_user_dev *dev, struct
> vhost_vring_file *file);
> +	int (*set_vring_addr)(struct virtio_user_dev *dev, struct
> vhost_vring_addr *addr);
>  	int (*send_request)(struct virtio_user_dev *dev,
>  			    enum vhost_user_request req,
>  			    void *arg);
> diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c
> b/drivers/net/virtio/virtio_user/vhost_kernel.c
> index 1805aee7f7..8cd86b72c6 100644
> --- a/drivers/net/virtio/virtio_user/vhost_kernel.c
> +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
> @@ -294,9 +294,30 @@ vhost_kernel_set_vring_call(struct virtio_user_dev *dev,
> struct vhost_vring_file
>  	return vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_KICK, file);
>  }
> 
> +static int
> +vhost_kernel_set_vring_addr(struct virtio_user_dev *dev, struct
> vhost_vring_addr *addr)
> +{
> +	int ret, fd;
> +	uint32_t index = addr->index;

Better use 'unsigned int index' here? It can hardly cause problem but I think
it's better to use the type in struct vhost_vring_addr.

Thanks,
Chenbo

> +
> +	/* Convert from queue index to queue-pair & offset */
> +	fd = dev->vhostfds[addr->index / 2];
> +	addr->index %= 2;
> +
> +	ret = vhost_kernel_ioctl(fd, VHOST_SET_VRING_ADDR, addr);
> +	if (ret < 0) {
> +		PMD_DRV_LOG(ERR, "Failed to set vring address");
> +		return -1;
> +	}
> +
> +	/* restore index back to queue index */
> +	addr->index = index;
> +
> +	return 0;
> +}
> +
>  static uint64_t vhost_req_user_to_kernel[] = {
>  	[VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
> -	[VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,
>  };
> 
>  static int
> @@ -308,20 +329,12 @@ vhost_kernel_send_request(struct virtio_user_dev *dev,
>  	unsigned int i;
>  	uint64_t req_kernel;
>  	int vhostfd;
> -	unsigned int queue_sel;
> 
>  	PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
> 
>  	req_kernel = vhost_req_user_to_kernel[req];
> 
>  	switch (req_kernel) {
> -	case VHOST_SET_VRING_ADDR:
> -		queue_sel = *(unsigned int *)arg;
> -		vhostfd = dev->vhostfds[queue_sel / 2];
> -		*(unsigned int *)arg = queue_sel % 2;
> -		PMD_DRV_LOG(DEBUG, "vhostfd=%d, index=%u",
> -			    vhostfd, *(unsigned int *)arg);
> -		break;
>  	default:
>  		vhostfd = -1;
>  	}
> @@ -473,6 +486,7 @@ struct virtio_user_backend_ops virtio_ops_kernel = {
>  	.get_vring_base = vhost_kernel_get_vring_base,
>  	.set_vring_call = vhost_kernel_set_vring_call,
>  	.set_vring_kick = vhost_kernel_set_vring_kick,
> +	.set_vring_addr = vhost_kernel_set_vring_addr,
>  	.send_request = vhost_kernel_send_request,
>  	.enable_qp = vhost_kernel_enable_queue_pair
>  };
> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c
> b/drivers/net/virtio/virtio_user/vhost_user.c
> index 509a96dfbc..59cf366683 100644
> --- a/drivers/net/virtio/virtio_user/vhost_user.c
> +++ b/drivers/net/virtio/virtio_user/vhost_user.c
> @@ -523,11 +523,32 @@ vhost_user_set_vring_kick(struct virtio_user_dev *dev,
> struct vhost_vring_file *
>  	return vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_KICK, file);
>  }
> 
> +
> +static int
> +vhost_user_set_vring_addr(struct virtio_user_dev *dev, struct
> vhost_vring_addr *addr)
> +{
> +	int ret;
> +	struct vhost_user_msg msg = {
> +		.request = VHOST_USER_SET_VRING_ADDR,
> +		.flags = VHOST_USER_VERSION,
> +		.size = sizeof(*addr),
> +		.payload.addr = *addr,
> +	};
> +
> +	ret = vhost_user_write(dev->vhostfd, &msg, NULL, 0);
> +	if (ret < 0) {
> +		PMD_DRV_LOG(ERR, "Failed to send vring addresses");
> +		return -1;
> +	}
> +
> +	return 0;
> +}
> +
> +
>  static struct vhost_user_msg m;
> 
>  const char * const vhost_msg_strings[] = {
>  	[VHOST_USER_RESET_OWNER] = "VHOST_RESET_OWNER",
> -	[VHOST_USER_SET_VRING_ADDR] = "VHOST_SET_VRING_ADDR",
>  	[VHOST_USER_SET_STATUS] = "VHOST_SET_STATUS",
>  	[VHOST_USER_GET_STATUS] = "VHOST_GET_STATUS",
>  };
> @@ -589,11 +610,6 @@ vhost_user_sock(struct virtio_user_dev *dev,
>  		fds[fd_num++] = *((int *)arg);
>  		break;
> 
> -	case VHOST_USER_SET_VRING_ADDR:
> -		memcpy(&msg.payload.addr, arg, sizeof(msg.payload.addr));
> -		msg.size = sizeof(m.payload.addr);
> -		break;
> -
>  	case VHOST_USER_SET_VRING_ERR:
>  		file = arg;
>  		msg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK;
> @@ -767,6 +783,7 @@ struct virtio_user_backend_ops virtio_ops_user = {
>  	.get_vring_base = vhost_user_get_vring_base,
>  	.set_vring_call = vhost_user_set_vring_call,
>  	.set_vring_kick = vhost_user_set_vring_kick,
> +	.set_vring_addr = vhost_user_set_vring_addr,
>  	.send_request = vhost_user_sock,
>  	.enable_qp = vhost_user_enable_queue_pair
>  };
> diff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c
> b/drivers/net/virtio/virtio_user/vhost_vdpa.c
> index 48fe3f23e8..e09e7c9fb8 100644
> --- a/drivers/net/virtio/virtio_user/vhost_vdpa.c
> +++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c
> @@ -36,7 +36,6 @@
> 
>  static uint64_t vhost_req_user_to_vdpa[] = {
>  	[VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
> -	[VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,
>  	[VHOST_USER_SET_STATUS] = VHOST_VDPA_SET_STATUS,
>  	[VHOST_USER_GET_STATUS] = VHOST_VDPA_GET_STATUS,
>  };
> @@ -248,6 +247,12 @@ vhost_vdpa_set_vring_kick(struct virtio_user_dev *dev,
> struct vhost_vring_file *
>  	return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_KICK, file);
>  }
> 
> +static int
> +vhost_vdpa_set_vring_addr(struct virtio_user_dev *dev, struct
> vhost_vring_addr *addr)
> +{
> +	return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_ADDR, addr);
> +}
> +
>  /* with below features, vhost vdpa does not need to do the checksum and TSO,
>   * these info will be passed to virtio_user through virtio net header.
>   */
> @@ -357,6 +362,7 @@ struct virtio_user_backend_ops virtio_ops_vdpa = {
>  	.get_vring_base = vhost_vdpa_get_vring_base,
>  	.set_vring_call = vhost_vdpa_set_vring_call,
>  	.set_vring_kick = vhost_vdpa_set_vring_kick,
> +	.set_vring_addr = vhost_vdpa_set_vring_addr,
>  	.send_request = vhost_vdpa_send_request,
>  	.enable_qp = vhost_vdpa_enable_queue_pair,
>  	.dma_map = vhost_vdpa_dma_map,
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index e4975838ea..48ca7a2548 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -81,7 +81,7 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t
> queue_sel)
>  		state.num |= (1 << 15);
>  	dev->ops->set_vring_base(dev, &state);
> 
> -	dev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr);
> +	dev->ops->set_vring_addr(dev, &addr);
> 
>  	/* Of all per virtqueue MSGs, make sure VHOST_USER_SET_VRING_KICK comes
>  	 * lastly because vhost depends on this msg to judge if
> --
> 2.29.2

Maxime Coquelin Jan. 15, 2021, 10:19 a.m. UTC | #2

On 1/6/21 1:06 PM, Xia, Chenbo wrote:
> Hi Maxime,
> 
>> -----Original Message-----
>> From: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Sent: Monday, December 21, 2020 5:14 AM
>> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>; olivier.matz@6wind.com;
>> amorenoz@redhat.com; david.marchand@redhat.com
>> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Subject: [PATCH 30/40] net/virtio: add Virtio-user vring address ops
>>
>> This patch introduces a new callback for setting
>> vrings addresses.
>>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>>  drivers/net/virtio/virtio_user/vhost.h        |  1 +
>>  drivers/net/virtio/virtio_user/vhost_kernel.c | 32 +++++++++++++------
>>  drivers/net/virtio/virtio_user/vhost_user.c   | 29 +++++++++++++----
>>  drivers/net/virtio/virtio_user/vhost_vdpa.c   |  8 ++++-
>>  .../net/virtio/virtio_user/virtio_user_dev.c  |  2 +-
>>  5 files changed, 55 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/net/virtio/virtio_user/vhost.h
>> b/drivers/net/virtio/virtio_user/vhost.h
>> index b296ee215d..956eb58728 100644
>> --- a/drivers/net/virtio/virtio_user/vhost.h
>> +++ b/drivers/net/virtio/virtio_user/vhost.h
>> @@ -113,6 +113,7 @@ struct virtio_user_backend_ops {
>>  	int (*get_vring_base)(struct virtio_user_dev *dev, struct
>> vhost_vring_state *state);
>>  	int (*set_vring_call)(struct virtio_user_dev *dev, struct
>> vhost_vring_file *file);
>>  	int (*set_vring_kick)(struct virtio_user_dev *dev, struct
>> vhost_vring_file *file);
>> +	int (*set_vring_addr)(struct virtio_user_dev *dev, struct
>> vhost_vring_addr *addr);
>>  	int (*send_request)(struct virtio_user_dev *dev,
>>  			    enum vhost_user_request req,
>>  			    void *arg);
>> diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c
>> b/drivers/net/virtio/virtio_user/vhost_kernel.c
>> index 1805aee7f7..8cd86b72c6 100644
>> --- a/drivers/net/virtio/virtio_user/vhost_kernel.c
>> +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
>> @@ -294,9 +294,30 @@ vhost_kernel_set_vring_call(struct virtio_user_dev *dev,
>> struct vhost_vring_file
>>  	return vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_KICK, file);
>>  }
>>
>> +static int
>> +vhost_kernel_set_vring_addr(struct virtio_user_dev *dev, struct
>> vhost_vring_addr *addr)
>> +{
>> +	int ret, fd;
>> +	uint32_t index = addr->index;
> 
> Better use 'unsigned int index' here? It can hardly cause problem but I think
> it's better to use the type in struct vhost_vring_addr.

Fixed, thanks.
Maxime

> Thanks,
> Chenbo
>

diff mbox series

Patch

diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h
index b296ee215d..956eb58728 100644
--- a/drivers/net/virtio/virtio_user/vhost.h
+++ b/drivers/net/virtio/virtio_user/vhost.h
@@ -113,6 +113,7 @@  struct virtio_user_backend_ops {
 	int (*get_vring_base)(struct virtio_user_dev *dev, struct vhost_vring_state *state);
 	int (*set_vring_call)(struct virtio_user_dev *dev, struct vhost_vring_file *file);
 	int (*set_vring_kick)(struct virtio_user_dev *dev, struct vhost_vring_file *file);
+	int (*set_vring_addr)(struct virtio_user_dev *dev, struct vhost_vring_addr *addr);
 	int (*send_request)(struct virtio_user_dev *dev,
 			    enum vhost_user_request req,
 			    void *arg);
diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c
index 1805aee7f7..8cd86b72c6 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
@@ -294,9 +294,30 @@  vhost_kernel_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file
 	return vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_KICK, file);
 }
 
+static int
+vhost_kernel_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)
+{
+	int ret, fd;
+	uint32_t index = addr->index;
+
+	/* Convert from queue index to queue-pair & offset */
+	fd = dev->vhostfds[addr->index / 2];
+	addr->index %= 2;
+
+	ret = vhost_kernel_ioctl(fd, VHOST_SET_VRING_ADDR, addr);
+	if (ret < 0) {
+		PMD_DRV_LOG(ERR, "Failed to set vring address");
+		return -1;
+	}
+
+	/* restore index back to queue index */
+	addr->index = index;
+
+	return 0;
+}
+
 static uint64_t vhost_req_user_to_kernel[] = {
 	[VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
-	[VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,
 };
 
 static int
@@ -308,20 +329,12 @@  vhost_kernel_send_request(struct virtio_user_dev *dev,
 	unsigned int i;
 	uint64_t req_kernel;
 	int vhostfd;
-	unsigned int queue_sel;
 
 	PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
 
 	req_kernel = vhost_req_user_to_kernel[req];
 
 	switch (req_kernel) {
-	case VHOST_SET_VRING_ADDR:
-		queue_sel = *(unsigned int *)arg;
-		vhostfd = dev->vhostfds[queue_sel / 2];
-		*(unsigned int *)arg = queue_sel % 2;
-		PMD_DRV_LOG(DEBUG, "vhostfd=%d, index=%u",
-			    vhostfd, *(unsigned int *)arg);
-		break;
 	default:
 		vhostfd = -1;
 	}
@@ -473,6 +486,7 @@  struct virtio_user_backend_ops virtio_ops_kernel = {
 	.get_vring_base = vhost_kernel_get_vring_base,
 	.set_vring_call = vhost_kernel_set_vring_call,
 	.set_vring_kick = vhost_kernel_set_vring_kick,
+	.set_vring_addr = vhost_kernel_set_vring_addr,
 	.send_request = vhost_kernel_send_request,
 	.enable_qp = vhost_kernel_enable_queue_pair
 };
diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index 509a96dfbc..59cf366683 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -523,11 +523,32 @@  vhost_user_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *
 	return vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_KICK, file);
 }
 
+
+static int
+vhost_user_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)
+{
+	int ret;
+	struct vhost_user_msg msg = {
+		.request = VHOST_USER_SET_VRING_ADDR,
+		.flags = VHOST_USER_VERSION,
+		.size = sizeof(*addr),
+		.payload.addr = *addr,
+	};
+
+	ret = vhost_user_write(dev->vhostfd, &msg, NULL, 0);
+	if (ret < 0) {
+		PMD_DRV_LOG(ERR, "Failed to send vring addresses");
+		return -1;
+	}
+
+	return 0;
+}
+
+
 static struct vhost_user_msg m;
 
 const char * const vhost_msg_strings[] = {
 	[VHOST_USER_RESET_OWNER] = "VHOST_RESET_OWNER",
-	[VHOST_USER_SET_VRING_ADDR] = "VHOST_SET_VRING_ADDR",
 	[VHOST_USER_SET_STATUS] = "VHOST_SET_STATUS",
 	[VHOST_USER_GET_STATUS] = "VHOST_GET_STATUS",
 };
@@ -589,11 +610,6 @@  vhost_user_sock(struct virtio_user_dev *dev,
 		fds[fd_num++] = *((int *)arg);
 		break;
 
-	case VHOST_USER_SET_VRING_ADDR:
-		memcpy(&msg.payload.addr, arg, sizeof(msg.payload.addr));
-		msg.size = sizeof(m.payload.addr);
-		break;
-
 	case VHOST_USER_SET_VRING_ERR:
 		file = arg;
 		msg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK;
@@ -767,6 +783,7 @@  struct virtio_user_backend_ops virtio_ops_user = {
 	.get_vring_base = vhost_user_get_vring_base,
 	.set_vring_call = vhost_user_set_vring_call,
 	.set_vring_kick = vhost_user_set_vring_kick,
+	.set_vring_addr = vhost_user_set_vring_addr,
 	.send_request = vhost_user_sock,
 	.enable_qp = vhost_user_enable_queue_pair
 };
diff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c b/drivers/net/virtio/virtio_user/vhost_vdpa.c
index 48fe3f23e8..e09e7c9fb8 100644
--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c
+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c
@@ -36,7 +36,6 @@ 
 
 static uint64_t vhost_req_user_to_vdpa[] = {
 	[VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
-	[VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,
 	[VHOST_USER_SET_STATUS] = VHOST_VDPA_SET_STATUS,
 	[VHOST_USER_GET_STATUS] = VHOST_VDPA_GET_STATUS,
 };
@@ -248,6 +247,12 @@  vhost_vdpa_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *
 	return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_KICK, file);
 }
 
+static int
+vhost_vdpa_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)
+{
+	return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_ADDR, addr);
+}
+
 /* with below features, vhost vdpa does not need to do the checksum and TSO,
  * these info will be passed to virtio_user through virtio net header.
  */
@@ -357,6 +362,7 @@  struct virtio_user_backend_ops virtio_ops_vdpa = {
 	.get_vring_base = vhost_vdpa_get_vring_base,
 	.set_vring_call = vhost_vdpa_set_vring_call,
 	.set_vring_kick = vhost_vdpa_set_vring_kick,
+	.set_vring_addr = vhost_vdpa_set_vring_addr,
 	.send_request = vhost_vdpa_send_request,
 	.enable_qp = vhost_vdpa_enable_queue_pair,
 	.dma_map = vhost_vdpa_dma_map,
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index e4975838ea..48ca7a2548 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -81,7 +81,7 @@  virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)
 		state.num |= (1 << 15);
 	dev->ops->set_vring_base(dev, &state);
 
-	dev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr);
+	dev->ops->set_vring_addr(dev, &addr);
 
 	/* Of all per virtqueue MSGs, make sure VHOST_USER_SET_VRING_KICK comes
 	 * lastly because vhost depends on this msg to judge if