From: Jason Wang <jasowang@redhat.com>
To: Xie Yongji <xieyongji@bytedance.com>,
mst@redhat.com, stefanha@redhat.com, sgarzare@redhat.com,
parav@nvidia.com, hch@infradead.org,
christian.brauner@canonical.com, rdunlap@infradead.org,
willy@infradead.org, viro@zeniv.linux.org.uk, axboe@kernel.dk,
bcrl@kvack.org, corbet@lwn.net, mika.penttila@nextfour.com,
dan.carpenter@oracle.com, joro@8bytes.org,
gregkh@linuxfoundation.org, zhe.he@windriver.com,
xiaodong.liu@intel.com, joe@perches.com, robin.murphy@arm.com
Cc: songmuchun@bytedance.com,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, kvm@vger.kernel.org,
linux-fsdevel@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v11 04/12] vdpa: Add reset callback in vdpa_config_ops
Date: Mon, 23 Aug 2021 14:31:16 +0800 [thread overview]
Message-ID: <4470fdac-89fb-1216-78d7-6335c3bfeb22@redhat.com> (raw)
In-Reply-To: <20210818120642.165-5-xieyongji@bytedance.com>
在 2021/8/18 下午8:06, Xie Yongji 写道:
> This adds a new callback to support device specific reset
> behavior. The vdpa bus driver will call the reset function
> instead of setting status to zero during resetting if device
> driver supports the new callback.
>
> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
> ---
> drivers/vhost/vdpa.c | 9 +++++++--
> include/linux/vdpa.h | 11 ++++++++++-
> 2 files changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
> index b07aa161f7ad..b1c91b4db0ba 100644
> --- a/drivers/vhost/vdpa.c
> +++ b/drivers/vhost/vdpa.c
> @@ -157,7 +157,7 @@ static long vhost_vdpa_set_status(struct vhost_vdpa *v, u8 __user *statusp)
> struct vdpa_device *vdpa = v->vdpa;
> const struct vdpa_config_ops *ops = vdpa->config;
> u8 status, status_old;
> - int nvqs = v->nvqs;
> + int ret, nvqs = v->nvqs;
> u16 i;
>
> if (copy_from_user(&status, statusp, sizeof(status)))
> @@ -172,7 +172,12 @@ static long vhost_vdpa_set_status(struct vhost_vdpa *v, u8 __user *statusp)
> if (status != 0 && (ops->get_status(vdpa) & ~status) != 0)
> return -EINVAL;
>
> - ops->set_status(vdpa, status);
> + if (status == 0 && ops->reset) {
> + ret = ops->reset(vdpa);
> + if (ret)
> + return ret;
> + } else
> + ops->set_status(vdpa, status);
>
> if ((status & VIRTIO_CONFIG_S_DRIVER_OK) && !(status_old & VIRTIO_CONFIG_S_DRIVER_OK))
> for (i = 0; i < nvqs; i++)
> diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
> index 8a645f8f4476..af7ea5ad795f 100644
> --- a/include/linux/vdpa.h
> +++ b/include/linux/vdpa.h
> @@ -196,6 +196,9 @@ struct vdpa_iova_range {
> * @vdev: vdpa device
> * Returns the iova range supported by
> * the device.
> + * @reset: Reset device (optional)
> + * @vdev: vdpa device
> + * Returns integer: success (0) or error (< 0)
It looks to me we'd better make this mandatory. This help to reduce the
confusion for the parent driver.
Thanks
> * @set_map: Set device memory mapping (optional)
> * Needed for device that using device
> * specific DMA translation (on-chip IOMMU)
> @@ -263,6 +266,7 @@ struct vdpa_config_ops {
> const void *buf, unsigned int len);
> u32 (*get_generation)(struct vdpa_device *vdev);
> struct vdpa_iova_range (*get_iova_range)(struct vdpa_device *vdev);
> + int (*reset)(struct vdpa_device *vdev);
>
> /* DMA ops */
> int (*set_map)(struct vdpa_device *vdev, struct vhost_iotlb *iotlb);
> @@ -351,12 +355,17 @@ static inline struct device *vdpa_get_dma_dev(struct vdpa_device *vdev)
> return vdev->dma_dev;
> }
>
> -static inline void vdpa_reset(struct vdpa_device *vdev)
> +static inline int vdpa_reset(struct vdpa_device *vdev)
> {
> const struct vdpa_config_ops *ops = vdev->config;
>
> vdev->features_valid = false;
> + if (ops->reset)
> + return ops->reset(vdev);
> +
> ops->set_status(vdev, 0);
> +
> + return 0;
> }
>
> static inline int vdpa_set_features(struct vdpa_device *vdev, u64 features)
next prev parent reply other threads:[~2021-08-23 6:31 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 12:06 [PATCH v11 00/12] Introduce VDUSE - vDPA Device in Userspace Xie Yongji
2021-08-18 12:06 ` [PATCH v11 01/12] iova: Export alloc_iova_fast() and free_iova_fast() Xie Yongji
2021-08-23 6:24 ` Jason Wang
2021-08-24 18:08 ` Michael S. Tsirkin
2021-08-25 9:55 ` Will Deacon
2021-08-25 10:39 ` John Garry
2021-08-25 12:17 ` Yongji Xie
2021-08-27 9:03 ` John Garry
2021-08-18 12:06 ` [PATCH v11 02/12] file: Export receive_fd() to modules Xie Yongji
2021-08-18 12:06 ` [PATCH v11 03/12] vdpa: Fix some coding style issues Xie Yongji
2021-08-23 6:27 ` Jason Wang
2021-08-24 11:09 ` Stefano Garzarella
2021-08-18 12:06 ` [PATCH v11 04/12] vdpa: Add reset callback in vdpa_config_ops Xie Yongji
2021-08-23 6:31 ` Jason Wang [this message]
2021-08-23 7:44 ` Yongji Xie
2021-08-18 12:06 ` [PATCH v11 05/12] vhost-vdpa: Handle the failure of vdpa_reset() Xie Yongji
2021-08-23 6:32 ` Jason Wang
2021-08-24 11:12 ` Stefano Garzarella
2021-08-18 12:06 ` [PATCH v11 06/12] vhost-iotlb: Add an opaque pointer for vhost IOTLB Xie Yongji
2021-08-18 12:06 ` [PATCH v11 07/12] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Xie Yongji
2021-08-18 12:06 ` [PATCH v11 08/12] vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap() Xie Yongji
2021-08-18 12:06 ` [PATCH v11 09/12] vdpa: Support transferring virtual addressing during DMA mapping Xie Yongji
2021-08-18 12:06 ` [PATCH v11 10/12] vduse: Implement an MMU-based software IOTLB Xie Yongji
2021-08-27 8:57 ` John Garry
2021-08-27 9:25 ` Yongji Xie
2021-08-18 12:06 ` [PATCH v11 11/12] vduse: Introduce VDUSE - vDPA Device in Userspace Xie Yongji
2021-08-23 6:56 ` Jason Wang
2021-08-24 18:10 ` Michael S. Tsirkin
2021-08-25 5:37 ` Yongji Xie
2021-08-18 12:06 ` [PATCH v11 12/12] Documentation: Add documentation for VDUSE Xie Yongji
2021-08-23 6:57 ` Jason Wang
2021-08-23 7:54 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4470fdac-89fb-1216-78d7-6335c3bfeb22@redhat.com \
--to=jasowang@redhat.com \
--cc=axboe@kernel.dk \
--cc=bcrl@kvack.org \
--cc=christian.brauner@canonical.com \
--cc=corbet@lwn.net \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joe@perches.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.penttila@nextfour.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=parav@nvidia.com \
--cc=rdunlap@infradead.org \
--cc=robin.murphy@arm.com \
--cc=sgarzare@redhat.com \
--cc=songmuchun@bytedance.com \
--cc=stefanha@redhat.com \
--cc=viro@zeniv.linux.org.uk \
--cc=virtualization@lists.linux-foundation.org \
--cc=willy@infradead.org \
--cc=xiaodong.liu@intel.com \
--cc=xieyongji@bytedance.com \
--cc=zhe.he@windriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).