[PATCH 0/3] Follow VirtIO initialization properly at vdpa net cvq isolation probing

[PATCH 0/3] Follow VirtIO initialization properly at vdpa net cvq isolation probing

[Eugenio Pérez]

This series solves a few issues.  The most obvious is that the feature set was
done previous to ACKNOWLEDGE | DRIVER status bit set.  Current vdpa devices are
permissive with this, but it is better to follow the standard.

Apart from that it fixes two issues reported by Peter Maydell:
* Stop probing CVQ isolation if cannot set features (goto missed).
* Fix incorrect error message statis "error setting features", while it should
say status.

Eugenio Pérez (3):
  vdpa net: fix error message setting virtio status
  vdpa net: stop probing if cannot set features
  vdpa net: follow VirtIO initialization properly at cvq isolation
    probing

 net/vhost-vdpa.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

-- 
2.39.3

[PATCH 1/3] vdpa net: fix error message setting virtio status

[Eugenio Pérez]

It incorrectly prints "error setting features", probably because a copy
paste miss.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 net/vhost-vdpa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 34202ca009..9845e2db9c 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -1293,7 +1293,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
 
     r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
     if (unlikely(r)) {
-        error_setg_errno(errp, -r, "Cannot set device features");
+        error_setg_errno(errp, -r, "Cannot set status");
         goto out;
     }
 
-- 
2.39.3

[PATCH 2/3] vdpa net: stop probing if cannot set features

[Eugenio Pérez]

Otherwise it continues the CVQ isolation probing.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 net/vhost-vdpa.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 9845e2db9c..51d8144070 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -1289,6 +1289,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
     r = ioctl(device_fd, VHOST_SET_FEATURES, &features);
     if (unlikely(r)) {
         error_setg_errno(errp, errno, "Cannot set features");
+        goto out;
     }
 
     r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
-- 
2.39.3

[PATCH 3/3] vdpa net: follow VirtIO initialization properly at cvq isolation probing

[Eugenio Pérez]

This patch solves a few issues.  The most obvious is that the feature
set was done previous to ACKNOWLEDGE | DRIVER status bit set.  Current
vdpa devices are permissive with this, but it is better to follow the
standard.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 net/vhost-vdpa.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 51d8144070..4b30325977 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -1270,8 +1270,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
     uint64_t backend_features;
     int64_t cvq_group;
     uint8_t status = VIRTIO_CONFIG_S_ACKNOWLEDGE |
-                     VIRTIO_CONFIG_S_DRIVER |
-                     VIRTIO_CONFIG_S_FEATURES_OK;
+                     VIRTIO_CONFIG_S_DRIVER;
     int r;
 
     ERRP_GUARD();
@@ -1286,15 +1285,22 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
         return 0;
     }
 
+    r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
+    if (unlikely(r)) {
+        error_setg_errno(errp, -r, "Cannot set device status");
+        goto out;
+    }
+
     r = ioctl(device_fd, VHOST_SET_FEATURES, &features);
     if (unlikely(r)) {
-        error_setg_errno(errp, errno, "Cannot set features");
+        error_setg_errno(errp, -r, "Cannot set features");
         goto out;
     }
 
+    status |= VIRTIO_CONFIG_S_FEATURES_OK;
     r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
     if (unlikely(r)) {
-        error_setg_errno(errp, -r, "Cannot set status");
+        error_setg_errno(errp, -r, "Cannot set device status");
         goto out;
     }
 
-- 
2.39.3

Re: [PATCH 1/3] vdpa net: fix error message setting virtio status

[Philippe Mathieu-Daudé]

On 15/9/23 19:03, Eugenio Pérez wrote:
> It incorrectly prints "error setting features", probably because a copy
> paste miss.
> 
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
> ---
>   net/vhost-vdpa.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 2/3] vdpa net: stop probing if cannot set features

[Philippe Mathieu-Daudé]

On 15/9/23 19:03, Eugenio Pérez wrote:
> Otherwise it continues the CVQ isolation probing.
> 

Fixes: 152128d646 ("vdpa: move CVQ isolation check to net_init_vhost_vdpa")
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
> ---
>   net/vhost-vdpa.c | 1 +
>   1 file changed, 1 insertion(+)

Re: [PATCH 1/3] vdpa net: fix error message setting virtio status

[Jason Wang]

On Sat, Sep 16, 2023 at 1:03 AM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> It incorrectly prints "error setting features", probably because a copy
> paste miss.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

Acked-by: Jason Wang <jasowang@redhat.com>

Thanks

> ---
>  net/vhost-vdpa.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index 34202ca009..9845e2db9c 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -1293,7 +1293,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
>
>      r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
>      if (unlikely(r)) {
> -        error_setg_errno(errp, -r, "Cannot set device features");
> +        error_setg_errno(errp, -r, "Cannot set status");
>          goto out;
>      }
>
> --
> 2.39.3
>

Re: [PATCH 2/3] vdpa net: stop probing if cannot set features

[Jason Wang]

On Sat, Sep 16, 2023 at 1:03 AM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> Otherwise it continues the CVQ isolation probing.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

Acked-by: Jason Wang <jasowang@redhat.com>

Thanks

> ---
>  net/vhost-vdpa.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index 9845e2db9c..51d8144070 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -1289,6 +1289,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
>      r = ioctl(device_fd, VHOST_SET_FEATURES, &features);
>      if (unlikely(r)) {
>          error_setg_errno(errp, errno, "Cannot set features");
> +        goto out;
>      }
>
>      r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
> --
> 2.39.3
>

Re: [PATCH 3/3] vdpa net: follow VirtIO initialization properly at cvq isolation probing

[Jason Wang]

On Sat, Sep 16, 2023 at 1:03 AM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> This patch solves a few issues.  The most obvious is that the feature
> set was done previous to ACKNOWLEDGE | DRIVER status bit set.  Current
> vdpa devices are permissive with this, but it is better to follow the
> standard.
>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
> ---
>  net/vhost-vdpa.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index 51d8144070..4b30325977 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -1270,8 +1270,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
>      uint64_t backend_features;
>      int64_t cvq_group;
>      uint8_t status = VIRTIO_CONFIG_S_ACKNOWLEDGE |
> -                     VIRTIO_CONFIG_S_DRIVER |
> -                     VIRTIO_CONFIG_S_FEATURES_OK;
> +                     VIRTIO_CONFIG_S_DRIVER;
>      int r;
>
>      ERRP_GUARD();
> @@ -1286,15 +1285,22 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
>          return 0;
>      }
>
> +    r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
> +    if (unlikely(r)) {
> +        error_setg_errno(errp, -r, "Cannot set device status");
> +        goto out;
> +    }
> +
>      r = ioctl(device_fd, VHOST_SET_FEATURES, &features);
>      if (unlikely(r)) {
> -        error_setg_errno(errp, errno, "Cannot set features");
> +        error_setg_errno(errp, -r, "Cannot set features");
>          goto out;
>      }
>

Spec requires a re-read ?

"
Re-read device status to ensure the FEATURES_OK bit is still set:
otherwise, the device does not support our subset of features and the
device is unusable.
"

Thanks

> +    status |= VIRTIO_CONFIG_S_FEATURES_OK;
>      r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
>      if (unlikely(r)) {
> -        error_setg_errno(errp, -r, "Cannot set status");
> +        error_setg_errno(errp, -r, "Cannot set device status");
>          goto out;
>      }
>
> --
> 2.39.3
>