2022-08-11 13:56:51

by Eugenio Perez Martin

Subject: [PATCH v8 2/3] vdpa: Remove wrong doc of VHOST_VDPA_SUSPEND ioctl

It was a leftover from previous versions.

Signed-off-by: Eugenio Pérez <[email protected]>
---
include/linux/vdpa.h | 2 +-
include/uapi/linux/vhost.h | 15 +++++----------
2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
index d282f464d2f1..6c4e6ea7f7eb 100644
--- a/include/linux/vdpa.h
+++ b/include/linux/vdpa.h
@@ -218,7 +218,7 @@ struct vdpa_map_file {
* @reset: Reset device
* @vdev: vdpa device
* Returns integer: success (0) or error (< 0)
- * @suspend: Suspend or resume the device (optional)
+ * @suspend: Suspend the device (optional)
* @vdev: vdpa device
* Returns integer: success (0) or error (< 0)
* @get_config_size: Get the size of the configuration space includes
diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
index 6d9f45163155..89fcb2afe472 100644
--- a/include/uapi/linux/vhost.h
+++ b/include/uapi/linux/vhost.h
@@ -171,17 +171,12 @@
#define VHOST_VDPA_SET_GROUP_ASID _IOW(VHOST_VIRTIO, 0x7C, \
struct vhost_vring_state)

-/* Suspend or resume a device so it does not process virtqueue requests anymore
+/* Suspend a device so it does not process virtqueue requests anymore
*
- * After the return of ioctl with suspend != 0, the device must finish any
- * pending operations like in flight requests. It must also preserve all the
- * necessary state (the virtqueue vring base plus the possible device specific
- * states) that is required for restoring in the future. The device must not
- * change its configuration after that point.
- *
- * After the return of ioctl with suspend == 0, the device can continue
- * processing buffers as long as typical conditions are met (vq is enabled,
- * DRIVER_OK status bit is enabled, etc).
+ * After the return of ioctl the device must finish any pending operations. It
+ * must also preserve all the necessary state (the virtqueue vring base plus
+ * the possible device specific states) that is required for restoring in the
+ * future. The device must not change its configuration after that point.
*/
#define VHOST_VDPA_SUSPEND _IOW(VHOST_VIRTIO, 0x7D, int)

--
2.31.1

2022-08-19 00:57:52

by Jason Wang

Subject: Re: [PATCH v8 2/3] vdpa: Remove wrong doc of VHOST_VDPA_SUSPEND ioctl

On Thu, Aug 11, 2022 at 9:54 PM Eugenio Pérez <[email protected]> wrote:
>
> It was a leftover from previous versions.
>
> Signed-off-by: Eugenio Pérez <[email protected]>

Acked-by: Jason Wang <[email protected]>

> ---
> include/linux/vdpa.h | 2 +-
> include/uapi/linux/vhost.h | 15 +++++----------
> 2 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
> index d282f464d2f1..6c4e6ea7f7eb 100644
> --- a/include/linux/vdpa.h
> +++ b/include/linux/vdpa.h
> @@ -218,7 +218,7 @@ struct vdpa_map_file {
> * @reset: Reset device
> * @vdev: vdpa device
> * Returns integer: success (0) or error (< 0)
> - * @suspend: Suspend or resume the device (optional)
> + * @suspend: Suspend the device (optional)
> * @vdev: vdpa device
> * Returns integer: success (0) or error (< 0)
> * @get_config_size: Get the size of the configuration space includes
> diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
> index 6d9f45163155..89fcb2afe472 100644
> --- a/include/uapi/linux/vhost.h
> +++ b/include/uapi/linux/vhost.h
> @@ -171,17 +171,12 @@
> #define VHOST_VDPA_SET_GROUP_ASID _IOW(VHOST_VIRTIO, 0x7C, \
> struct vhost_vring_state)
>
> -/* Suspend or resume a device so it does not process virtqueue requests anymore
> +/* Suspend a device so it does not process virtqueue requests anymore
> *
> - * After the return of ioctl with suspend != 0, the device must finish any
> - * pending operations like in flight requests. It must also preserve all the
> - * necessary state (the virtqueue vring base plus the possible device specific
> - * states) that is required for restoring in the future. The device must not
> - * change its configuration after that point.
> - *
> - * After the return of ioctl with suspend == 0, the device can continue
> - * processing buffers as long as typical conditions are met (vq is enabled,
> - * DRIVER_OK status bit is enabled, etc).
> + * After the return of ioctl the device must finish any pending operations. It
> + * must also preserve all the necessary state (the virtqueue vring base plus
> + * the possible device specific states) that is required for restoring in the
> + * future. The device must not change its configuration after that point.
> */
> #define VHOST_VDPA_SUSPEND _IOW(VHOST_VIRTIO, 0x7D, int)
>
> --
> 2.31.1
>