KVM Archive on lore.kernel.org
 help / color / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	virtualization@lists.linux-foundation.org,
	netdev@vger.kernel.org
Subject: Re: [PATCH RFC v1 2/2] vhost: batching fetches
Date: Mon, 14 Oct 2019 09:47:18 +0800
Message-ID: <b6f24555-aaf8-b470-ab16-099055364cfc@redhat.com> (raw)
In-Reply-To: <20191012162759-mutt-send-email-mst@kernel.org>


On 2019/10/13 上午4:36, Michael S. Tsirkin wrote:
> On Sat, Oct 12, 2019 at 03:30:52PM +0800, Jason Wang wrote:
>> On 2019/10/11 下午9:46, Michael S. Tsirkin wrote:
>>> With this patch applied, new and old code perform identically.
>>>
>>> Lots of extra optimizations are now possible, e.g.
>>> we can fetch multiple heads with copy_from/to_user now.
>>> We can get rid of maintaining the log array.  Etc etc.
>>>
>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>> ---
>>>    drivers/vhost/test.c  |  2 +-
>>>    drivers/vhost/vhost.c | 50 ++++++++++++++++++++++++++++++++++++-------
>>>    drivers/vhost/vhost.h |  4 +++-
>>>    3 files changed, 46 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
>>> index 39a018a7af2d..e3a8e9db22cd 100644
>>> --- a/drivers/vhost/test.c
>>> +++ b/drivers/vhost/test.c
>>> @@ -128,7 +128,7 @@ static int vhost_test_open(struct inode *inode, struct file *f)
>>>    	dev = &n->dev;
>>>    	vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
>>>    	n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
>>> -	vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, UIO_MAXIOV,
>>> +	vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, UIO_MAXIOV + 64,
>>>    		       VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT);
>>>    	f->private_data = n;
>>> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
>>> index 36661d6cb51f..aa383e847865 100644
>>> --- a/drivers/vhost/vhost.c
>>> +++ b/drivers/vhost/vhost.c
>>> @@ -302,6 +302,7 @@ static void vhost_vq_reset(struct vhost_dev *dev,
>>>    {
>>>    	vq->num = 1;
>>>    	vq->ndescs = 0;
>>> +	vq->first_desc = 0;
>>>    	vq->desc = NULL;
>>>    	vq->avail = NULL;
>>>    	vq->used = NULL;
>>> @@ -390,6 +391,7 @@ static long vhost_dev_alloc_iovecs(struct vhost_dev *dev)
>>>    	for (i = 0; i < dev->nvqs; ++i) {
>>>    		vq = dev->vqs[i];
>>>    		vq->max_descs = dev->iov_limit;
>>> +		vq->batch_descs = dev->iov_limit - UIO_MAXIOV;
>>>    		vq->descs = kmalloc_array(vq->max_descs,
>>>    					  sizeof(*vq->descs),
>>>    					  GFP_KERNEL);
>>> @@ -2366,6 +2368,8 @@ static void pop_split_desc(struct vhost_virtqueue *vq)
>>>    	--vq->ndescs;
>>>    }
>>> +#define VHOST_DESC_FLAGS (VRING_DESC_F_INDIRECT | VRING_DESC_F_WRITE | \
>>> +			  VRING_DESC_F_NEXT)
>>>    static int push_split_desc(struct vhost_virtqueue *vq, struct vring_desc *desc, u16 id)
>>>    {
>>>    	struct vhost_desc *h;
>>> @@ -2375,7 +2379,7 @@ static int push_split_desc(struct vhost_virtqueue *vq, struct vring_desc *desc,
>>>    	h = &vq->descs[vq->ndescs++];
>>>    	h->addr = vhost64_to_cpu(vq, desc->addr);
>>>    	h->len = vhost32_to_cpu(vq, desc->len);
>>> -	h->flags = vhost16_to_cpu(vq, desc->flags);
>>> +	h->flags = vhost16_to_cpu(vq, desc->flags) & VHOST_DESC_FLAGS;
>>>    	h->id = id;
>>>    	return 0;
>>> @@ -2450,7 +2454,7 @@ static int fetch_indirect_descs(struct vhost_virtqueue *vq,
>>>    	return 0;
>>>    }
>>> -static int fetch_descs(struct vhost_virtqueue *vq)
>>> +static int fetch_buf(struct vhost_virtqueue *vq)
>>>    {
>>>    	struct vring_desc desc;
>>>    	unsigned int i, head, found = 0;
>>> @@ -2462,7 +2466,11 @@ static int fetch_descs(struct vhost_virtqueue *vq)
>>>    	/* Check it isn't doing very strange things with descriptor numbers. */
>>>    	last_avail_idx = vq->last_avail_idx;
>>> -	if (vq->avail_idx == vq->last_avail_idx) {
>>> +	if (unlikely(vq->avail_idx == vq->last_avail_idx)) {
>>> +		/* If we already have work to do, don't bother re-checking. */
>>> +		if (likely(vq->ndescs))
>>> +			return vq->num;
>>> +
>>>    		if (unlikely(vhost_get_avail_idx(vq, &avail_idx))) {
>>>    			vq_err(vq, "Failed to access avail idx at %p\n",
>>>    				&vq->avail->idx);
>>> @@ -2541,6 +2549,24 @@ static int fetch_descs(struct vhost_virtqueue *vq)
>>>    	return 0;
>>>    }
>>> +static int fetch_descs(struct vhost_virtqueue *vq)
>>> +{
>>> +	int ret = 0;
>>> +
>>> +	if (unlikely(vq->first_desc >= vq->ndescs)) {
>>> +		vq->first_desc = 0;
>>> +		vq->ndescs = 0;
>>> +	}
>>> +
>>> +	if (vq->ndescs)
>>> +		return 0;
>>> +
>>> +	while (!ret && vq->ndescs <= vq->batch_descs)
>>> +		ret = fetch_buf(vq);
>>
>> It looks to me descriptor chaining might be broken here.
> It should work because fetch_buf fetches a whole buf, following
> the chain. Seems to work in a small test ... what issues do you see?


Consider the case when fetch_buf return -EINVAL when push_split_desc() 
fail. This means we only have partial descriptors.

Do we need decreasing last_avail_idx and vq->ndescs here? Or having a 
head,tail instead of first_desc?

Thanks


>
>>> +
>>> +	return vq->ndescs ? 0 : ret;
>>> +}
>>> +
>>>    /* This looks in the virtqueue and for the first available buffer, and converts
>>>     * it to an iovec for convenient access.  Since descriptors consist of some
>>>     * number of output then some number of input descriptors, it's actually two
>>> @@ -2562,6 +2588,8 @@ int vhost_get_vq_desc_batch(struct vhost_virtqueue *vq,
>>>    	if (ret)
>>>    		return ret;
>>> +	/* Note: indirect descriptors are not batched */
>>> +	/* TODO: batch up to a limit */
>>>    	last = peek_split_desc(vq);
>>>    	id = last->id;
>>> @@ -2584,12 +2612,12 @@ int vhost_get_vq_desc_batch(struct vhost_virtqueue *vq,
>>>    	if (unlikely(log))
>>>    		*log_num = 0;
>>> -	for (i = 0; i < vq->ndescs; ++i) {
>>> +	for (i = vq->first_desc; i < vq->ndescs; ++i) {
>>>    		unsigned iov_count = *in_num + *out_num;
>>>    		struct vhost_desc *desc = &vq->descs[i];
>>>    		int access;
>>> -		if (desc->flags & ~(VRING_DESC_F_INDIRECT | VRING_DESC_F_WRITE)) {
>>> +		if (desc->flags & ~VHOST_DESC_FLAGS) {
>>>    			vq_err(vq, "Unexpected flags: 0x%x at descriptor id 0x%x\n",
>>>    			       desc->flags, desc->id);
>>>    			ret = -EINVAL;
>>> @@ -2628,15 +2656,21 @@ int vhost_get_vq_desc_batch(struct vhost_virtqueue *vq,
>>>    			}
>>>    			*out_num += ret;
>>>    		}
>>> +
>>> +		ret = desc->id;
>>> +
>>> +		if (!(desc->flags & VRING_DESC_F_NEXT))
>>> +			break;
>>>    	}
>>
>> What happens if we reach vq->ndescs but VRING_DESC_F_NEXT is still set?
>>
>> Thanks
> This can't happen: descriptors are pushed by push_split_desc each time
> we go through a loop in fetch_buf. The only way to exit the loop
> with return code 0 is if next_desc return -1 that is when VRING_DESC_F_NEXT
> is clear.
>
> But it's a good idea to add a BUG_ON here, I'll do it in the next version.
>
>
>>> -	ret = id;
>>> -	vq->ndescs = 0;
>>> +	vq->first_desc = i + 1;
>>>    	return ret;
>>>    err:
>>> -	vhost_discard_vq_desc(vq, 1);
>>> +	for (i = vq->first_desc; i < vq->ndescs; ++i)
>>> +		if (!(desc->flags & VRING_DESC_F_NEXT))
>>> +			vhost_discard_vq_desc(vq, 1);
>>>    	vq->ndescs = 0;
>>>    	return ret;
>>> diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
>>> index 1724f61b6c2d..8b88e0c903da 100644
>>> --- a/drivers/vhost/vhost.h
>>> +++ b/drivers/vhost/vhost.h
>>> @@ -100,7 +100,9 @@ struct vhost_virtqueue {
>>>    	struct vhost_desc *descs;
>>>    	int ndescs;
>>> +	int first_desc;
>>>    	int max_descs;
>>> +	int batch_descs;
>>>    	const struct vhost_umem_node *meta_iotlb[VHOST_NUM_ADDRS];
>>>    	struct file *kick;
>>> @@ -245,7 +247,7 @@ ssize_t vhost_chr_write_iter(struct vhost_dev *dev,
>>>    int vhost_init_device_iotlb(struct vhost_dev *d, bool enabled);
>>>    #define vq_err(vq, fmt, ...) do {                                  \
>>> -		pr_debug(pr_fmt(fmt), ##__VA_ARGS__);       \
>>> +		pr_err(pr_fmt(fmt), ##__VA_ARGS__);       \
>>>    		if ((vq)->error_ctx)                               \
>>>    				eventfd_signal((vq)->error_ctx, 1);\
>>>    	} while (0)

  reply index

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-11 13:45 [PATCH RFC v1 0/2] vhost: ring format independence Michael S. Tsirkin
2019-10-11 13:45 ` [PATCH RFC v1 1/2] vhost: option to fetch descriptors through an independent struct Michael S. Tsirkin
2019-10-12  7:28   ` Jason Wang
2019-10-12 20:27     ` Michael S. Tsirkin
2019-10-14  1:43       ` Jason Wang
2019-10-15 20:20         ` Michael S. Tsirkin
2019-10-16  4:38           ` Jason Wang
2019-10-11 13:46 ` [PATCH RFC v1 2/2] vhost: batching fetches Michael S. Tsirkin
2019-10-12  7:30   ` Jason Wang
2019-10-12 20:36     ` Michael S. Tsirkin
2019-10-14  1:47       ` Jason Wang [this message]
2019-10-12  7:31 ` [PATCH RFC v1 0/2] vhost: ring format independence Jason Wang
2019-10-12 20:36   ` Michael S. Tsirkin
2019-10-12  8:15 ` Jason Wang
2019-10-12 19:26   ` Michael S. Tsirkin

Reply instructions:

You may reply publically 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=b6f24555-aaf8-b470-ab16-099055364cfc@redhat.com \
    --to=jasowang@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.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

KVM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/kvm/0 kvm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 kvm kvm/ https://lore.kernel.org/kvm \
		kvm@vger.kernel.org
	public-inbox-index kvm

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.kvm


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git