From: Xie Yongji <xieyongji@bytedance.com>
To: mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com,
sgarzare@redhat.com, parav@nvidia.com, akpm@linux-foundation.org,
rdunlap@infradead.org, willy@infradead.org,
viro@zeniv.linux.org.uk, axboe@kernel.dk, bcrl@kvack.org,
corbet@lwn.net
Cc: virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, kvm@vger.kernel.org, linux-aio@kvack.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Subject: [RFC v2 07/13] vduse: support get/set virtqueue state
Date: Tue, 22 Dec 2020 22:52:15 +0800 [thread overview]
Message-ID: <20201222145221.711-8-xieyongji@bytedance.com> (raw)
In-Reply-To: <20201222145221.711-1-xieyongji@bytedance.com>
This patch makes vhost-vdpa bus driver can get/set virtqueue
state from userspace VDUSE process.
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
Documentation/driver-api/vduse.rst | 4 +++
drivers/vdpa/vdpa_user/vduse_dev.c | 54 ++++++++++++++++++++++++++++++++++++++
include/uapi/linux/vduse.h | 9 +++++++
3 files changed, 67 insertions(+)
diff --git a/Documentation/driver-api/vduse.rst b/Documentation/driver-api/vduse.rst
index da9b3040f20a..623f7b040ccf 100644
--- a/Documentation/driver-api/vduse.rst
+++ b/Documentation/driver-api/vduse.rst
@@ -30,6 +30,10 @@ The following types of messages are provided by the VDUSE framework now:
- VDUSE_GET_VQ_READY: Get ready status of virtqueue
+- VDUSE_SET_VQ_STATE: Set the state (last_avail_idx) for virtqueue
+
+- VDUSE_GET_VQ_STATE: Get the state (last_avail_idx) for virtqueue
+
- VDUSE_SET_FEATURES: Set virtio features supported by the driver
- VDUSE_GET_FEATURES: Get virtio features supported by the device
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index 4a869b9698ef..b974333ed4e9 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -291,6 +291,40 @@ static bool vduse_dev_get_vq_ready(struct vduse_dev *dev,
return ready;
}
+static int vduse_dev_get_vq_state(struct vduse_dev *dev,
+ struct vduse_virtqueue *vq,
+ struct vdpa_vq_state *state)
+{
+ struct vduse_dev_msg *msg = vduse_dev_new_msg(dev, VDUSE_GET_VQ_STATE);
+ int ret;
+
+ msg->req.size = sizeof(struct vduse_vq_state);
+ msg->req.vq_state.index = vq->index;
+
+ ret = vduse_dev_msg_sync(dev, msg);
+ state->avail_index = msg->resp.vq_state.avail_idx;
+ vduse_dev_msg_put(msg);
+
+ return ret;
+}
+
+static int vduse_dev_set_vq_state(struct vduse_dev *dev,
+ struct vduse_virtqueue *vq,
+ const struct vdpa_vq_state *state)
+{
+ struct vduse_dev_msg *msg = vduse_dev_new_msg(dev, VDUSE_SET_VQ_STATE);
+ int ret;
+
+ msg->req.size = sizeof(struct vduse_vq_state);
+ msg->req.vq_state.index = vq->index;
+ msg->req.vq_state.avail_idx = state->avail_index;
+
+ ret = vduse_dev_msg_sync(dev, msg);
+ vduse_dev_msg_put(msg);
+
+ return ret;
+}
+
static ssize_t vduse_dev_read_iter(struct kiocb *iocb, struct iov_iter *to)
{
struct file *file = iocb->ki_filp;
@@ -431,6 +465,24 @@ static bool vduse_vdpa_get_vq_ready(struct vdpa_device *vdpa, u16 idx)
return vq->ready;
}
+static int vduse_vdpa_set_vq_state(struct vdpa_device *vdpa, u16 idx,
+ const struct vdpa_vq_state *state)
+{
+ struct vduse_dev *dev = vdpa_to_vduse(vdpa);
+ struct vduse_virtqueue *vq = &dev->vqs[idx];
+
+ return vduse_dev_set_vq_state(dev, vq, state);
+}
+
+static int vduse_vdpa_get_vq_state(struct vdpa_device *vdpa, u16 idx,
+ struct vdpa_vq_state *state)
+{
+ struct vduse_dev *dev = vdpa_to_vduse(vdpa);
+ struct vduse_virtqueue *vq = &dev->vqs[idx];
+
+ return vduse_dev_get_vq_state(dev, vq, state);
+}
+
static u32 vduse_vdpa_get_vq_align(struct vdpa_device *vdpa)
{
struct vduse_dev *dev = vdpa_to_vduse(vdpa);
@@ -532,6 +584,8 @@ static const struct vdpa_config_ops vduse_vdpa_config_ops = {
.set_vq_num = vduse_vdpa_set_vq_num,
.set_vq_ready = vduse_vdpa_set_vq_ready,
.get_vq_ready = vduse_vdpa_get_vq_ready,
+ .set_vq_state = vduse_vdpa_set_vq_state,
+ .get_vq_state = vduse_vdpa_get_vq_state,
.get_vq_align = vduse_vdpa_get_vq_align,
.get_features = vduse_vdpa_get_features,
.set_features = vduse_vdpa_set_features,
diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h
index f8579abdaa3b..873305dfd93f 100644
--- a/include/uapi/linux/vduse.h
+++ b/include/uapi/linux/vduse.h
@@ -13,6 +13,8 @@ enum vduse_req_type {
VDUSE_SET_VQ_ADDR,
VDUSE_SET_VQ_READY,
VDUSE_GET_VQ_READY,
+ VDUSE_SET_VQ_STATE,
+ VDUSE_GET_VQ_STATE,
VDUSE_SET_FEATURES,
VDUSE_GET_FEATURES,
VDUSE_SET_STATUS,
@@ -38,6 +40,11 @@ struct vduse_vq_ready {
__u8 ready;
};
+struct vduse_vq_state {
+ __u32 index;
+ __u16 avail_idx;
+};
+
struct vduse_dev_config_data {
__u32 offset;
__u32 len;
@@ -53,6 +60,7 @@ struct vduse_dev_request {
struct vduse_vq_num vq_num; /* virtqueue num */
struct vduse_vq_addr vq_addr; /* virtqueue address */
struct vduse_vq_ready vq_ready; /* virtqueue ready status */
+ struct vduse_vq_state vq_state; /* virtqueue state */
struct vduse_dev_config_data config; /* virtio device config space */
__u64 features; /* virtio features */
__u8 status; /* device status */
@@ -64,6 +72,7 @@ struct vduse_dev_response {
__s32 result; /* the result of request */
union {
struct vduse_vq_ready vq_ready; /* virtqueue ready status */
+ struct vduse_vq_state vq_state; /* virtqueue state */
struct vduse_dev_config_data config; /* virtio device config space */
__u64 features; /* virtio features */
__u8 status; /* device status */
--
2.11.0
next prev parent reply other threads:[~2020-12-22 14:56 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-22 14:52 [RFC v2 00/13] Introduce VDUSE - vDPA Device in Userspace Xie Yongji
2020-12-22 14:52 ` [RFC v2 01/13] mm: export zap_page_range() for driver use Xie Yongji
2020-12-22 15:44 ` Christoph Hellwig
2020-12-22 14:52 ` [RFC v2 02/13] eventfd: track eventfd_signal() recursion depth separately in different cases Xie Yongji
2020-12-22 14:52 ` [RFC v2 03/13] eventfd: Increase the recursion depth of eventfd_signal() Xie Yongji
2020-12-22 14:52 ` [RFC v2 04/13] vdpa: Remove the restriction that only supports virtio-net devices Xie Yongji
2020-12-22 14:52 ` [RFC v2 05/13] vdpa: Pass the netlink attributes to ops.dev_add() Xie Yongji
2020-12-22 14:52 ` [RFC v2 06/13] vduse: Introduce VDUSE - vDPA Device in Userspace Xie Yongji
2020-12-23 8:08 ` Jason Wang
2020-12-23 14:17 ` Yongji Xie
2020-12-24 3:01 ` Jason Wang
2020-12-24 8:34 ` Yongji Xie
2020-12-25 6:59 ` Jason Wang
2021-01-08 13:32 ` Bob Liu
2021-01-10 10:03 ` Yongji Xie
2020-12-22 14:52 ` Xie Yongji [this message]
2020-12-22 14:52 ` [RFC v2 08/13] vdpa: Introduce process_iotlb_msg() in vdpa_config_ops Xie Yongji
2020-12-23 8:36 ` Jason Wang
2020-12-23 11:06 ` Yongji Xie
2020-12-24 2:36 ` Jason Wang
2020-12-24 7:24 ` Yongji Xie
2020-12-22 14:52 ` [RFC v2 09/13] vduse: Add support for processing vhost iotlb message Xie Yongji
2020-12-23 9:05 ` Jason Wang
2020-12-23 12:14 ` [External] " Yongji Xie
2020-12-24 2:41 ` Jason Wang
2020-12-24 7:37 ` Yongji Xie
2020-12-25 2:37 ` Yongji Xie
2020-12-25 7:02 ` Jason Wang
2020-12-25 11:36 ` Yongji Xie
2020-12-25 6:57 ` Jason Wang
2020-12-25 10:31 ` Yongji Xie
2020-12-28 7:43 ` Jason Wang
2020-12-28 8:14 ` Yongji Xie
2020-12-28 8:43 ` Jason Wang
2020-12-28 9:12 ` Yongji Xie
2020-12-29 9:11 ` Jason Wang
2020-12-29 10:26 ` Yongji Xie
2020-12-30 6:10 ` Jason Wang
2020-12-30 7:09 ` Yongji Xie
2020-12-30 8:41 ` Jason Wang
2020-12-30 10:12 ` Yongji Xie
2020-12-31 2:49 ` Jason Wang
2020-12-31 5:15 ` Yongji Xie
2020-12-31 5:49 ` Jason Wang
2020-12-31 6:52 ` Yongji Xie
2020-12-31 7:11 ` Jason Wang
2020-12-31 8:00 ` Yongji Xie
2020-12-22 14:52 ` [RFC v2 10/13] vduse: grab the module's references until there is no vduse device Xie Yongji
2020-12-22 14:52 ` [RFC v2 11/13] vduse/iova_domain: Support reclaiming bounce pages Xie Yongji
2020-12-22 14:52 ` [RFC v2 12/13] vduse: Add memory shrinker to reclaim " Xie Yongji
2020-12-22 14:52 ` [RFC v2 13/13] vduse: Introduce a workqueue for irq injection Xie Yongji
2020-12-23 6:38 ` [RFC v2 00/13] Introduce VDUSE - vDPA Device in Userspace Jason Wang
2020-12-23 8:14 ` Jason Wang
2020-12-23 10:59 ` Yongji Xie
2020-12-24 2:24 ` 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=20201222145221.711-8-xieyongji@bytedance.com \
--to=xieyongji@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=bcrl@kvack.org \
--cc=corbet@lwn.net \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-aio@kvack.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=parav@nvidia.com \
--cc=rdunlap@infradead.org \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=viro@zeniv.linux.org.uk \
--cc=virtualization@lists.linux-foundation.org \
--cc=willy@infradead.org \
/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).