diff mbox series

net/virtio: fix vhost_kernel_set_owner for multi-queue devices

Message ID 20210408123729.9884-1-thierry.herbelot@6wind.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series net/virtio: fix vhost_kernel_set_owner for multi-queue devices |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/travis-robot success travis build: passed
ci/github-robot success github build: passed
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-mellanox-Functional success Functional Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-testing success Testing PASS

Commit Message

Thierry Herbelot April 8, 2021, 12:37 p.m. UTC 
  Restore the original code, where VHOST_SET_OWNER is applied to
all vhostfds of the device.

Fixes: 06856cabb89b0 ("net/virtio: add virtio-user ops to set owner")
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: Chenbo Xia <chenbo.xia@intel.com>
Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
---
 drivers/net/virtio/virtio_user/vhost_kernel.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Comments

Maxime Coquelin April 13, 2021, 8:45 a.m. UTC | #1 
Hi Thierry,

On 4/8/21 2:37 PM, Thierry Herbelot wrote:
> Restore the original code, where VHOST_SET_OWNER is applied to
> all vhostfds of the device.
> 
> Fixes: 06856cabb89b0 ("net/virtio: add virtio-user ops to set owner")
> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
> Cc: Chenbo Xia <chenbo.xia@intel.com>
> Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
> ---
>  drivers/net/virtio/virtio_user/vhost_kernel.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c
> index 768db55a6c1f..58e66bb7b4ae 100644
> --- a/drivers/net/virtio/virtio_user/vhost_kernel.c
> +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
> @@ -101,9 +101,20 @@ vhost_kernel_ioctl(int fd, uint64_t request, void *arg)
>  static int
>  vhost_kernel_set_owner(struct virtio_user_dev *dev)
>  {
> +	int ret;
> +	uint32_t i;
>  	struct vhost_kernel_data *data = dev->backend_data;
>  
> -	return vhost_kernel_ioctl(data->vhostfds[0], VHOST_SET_OWNER, NULL);
> +	for (i = 0; i < dev->max_queue_pairs; ++i) {
> +		if (data->vhostfds[i] < 0)
> +			continue;
> +
> +		ret = vhost_kernel_ioctl(data->vhostfds[i], VHOST_SET_OWNER, NULL);
> +		if (ret < 0)
> +			return ret;
> +	}
> +
> +	return 0;
>  }
>  
>  static int
> 

Thanks for the fix, we indeed have to set owner for all the queue pairs.

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime
Ferruh Yigit April 15, 2021, 12:48 p.m. UTC | #2 
On 4/13/2021 9:45 AM, Maxime Coquelin wrote:
> Hi Thierry,
> 
> On 4/8/21 2:37 PM, Thierry Herbelot wrote:
>> Restore the original code, where VHOST_SET_OWNER is applied to
>> all vhostfds of the device.
>>
>> Fixes: 06856cabb89b0 ("net/virtio: add virtio-user ops to set owner")
>> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Cc: Chenbo Xia <chenbo.xia@intel.com>
>> Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
>> ---
>>   drivers/net/virtio/virtio_user/vhost_kernel.c | 13 ++++++++++++-
>>   1 file changed, 12 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c
>> index 768db55a6c1f..58e66bb7b4ae 100644
>> --- a/drivers/net/virtio/virtio_user/vhost_kernel.c
>> +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
>> @@ -101,9 +101,20 @@ vhost_kernel_ioctl(int fd, uint64_t request, void *arg)
>>   static int
>>   vhost_kernel_set_owner(struct virtio_user_dev *dev)
>>   {
>> +	int ret;
>> +	uint32_t i;
>>   	struct vhost_kernel_data *data = dev->backend_data;
>>   
>> -	return vhost_kernel_ioctl(data->vhostfds[0], VHOST_SET_OWNER, NULL);
>> +	for (i = 0; i < dev->max_queue_pairs; ++i) {
>> +		if (data->vhostfds[i] < 0)
>> +			continue;
>> +
>> +		ret = vhost_kernel_ioctl(data->vhostfds[i], VHOST_SET_OWNER, NULL);
>> +		if (ret < 0)
>> +			return ret;
>> +	}
>> +
>> +	return 0;
>>   }
>>   
>>   static int
>>
> 
> Thanks for the fix, we indeed have to set owner for all the queue pairs.
> 
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> 

Applied to dpdk-next-net/main, thanks.
diff mbox series

Patch

diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c
index 768db55a6c1f..58e66bb7b4ae 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
@@ -101,9 +101,20 @@  vhost_kernel_ioctl(int fd, uint64_t request, void *arg)
 static int
 vhost_kernel_set_owner(struct virtio_user_dev *dev)
 {
+	int ret;
+	uint32_t i;
 	struct vhost_kernel_data *data = dev->backend_data;
 
-	return vhost_kernel_ioctl(data->vhostfds[0], VHOST_SET_OWNER, NULL);
+	for (i = 0; i < dev->max_queue_pairs; ++i) {
+		if (data->vhostfds[i] < 0)
+			continue;
+
+		ret = vhost_kernel_ioctl(data->vhostfds[i], VHOST_SET_OWNER, NULL);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
 }
 
 static int