From: Jason Wang <jasowang@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH V3 4/6] vhost_net: determine whether or not to use zerocopy at one time
Date: Thu, 05 Sep 2013 10:54:44 +0800 [thread overview]
Message-ID: <5227F274.9040506@redhat.com> (raw)
In-Reply-To: <20130904115929.GA9393@redhat.com>
On 09/04/2013 07:59 PM, Michael S. Tsirkin wrote:
> On Mon, Sep 02, 2013 at 04:40:59PM +0800, Jason Wang wrote:
>> Currently, even if the packet length is smaller than VHOST_GOODCOPY_LEN, if
>> upend_idx != done_idx we still set zcopy_used to true and rollback this choice
>> later. This could be avoided by determining zerocopy once by checking all
>> conditions at one time before.
>>
>> Signed-off-by: Jason Wang <jasowang@redhat.com>
>> ---
>> drivers/vhost/net.c | 47 ++++++++++++++++++++---------------------------
>> 1 files changed, 20 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
>> index 8a6dd0d..3f89dea 100644
>> --- a/drivers/vhost/net.c
>> +++ b/drivers/vhost/net.c
>> @@ -404,43 +404,36 @@ static void handle_tx(struct vhost_net *net)
>> iov_length(nvq->hdr, s), hdr_size);
>> break;
>> }
>> - zcopy_used = zcopy && (len >= VHOST_GOODCOPY_LEN ||
>> - nvq->upend_idx != nvq->done_idx);
>> +
>> + zcopy_used = zcopy && len >= VHOST_GOODCOPY_LEN
>> + && (nvq->upend_idx + 1) % UIO_MAXIOV !=
>> + nvq->done_idx
> Thinking about this, this looks strange.
> The original idea was that once we start doing zcopy, we keep
> using the heads ring even for short packets until no zcopy is outstanding.
What's the reason for keep using the heads ring?
>
> What's the logic behind (nvq->upend_idx + 1) % UIO_MAXIOV != nvq->done_idx
> here?
Because we initialize both upend_idx and done_idx to zero, so upend_idx
!= done_idx could not be used to check whether or not the heads ring
were full.
>> + && vhost_net_tx_select_zcopy(net);
>>
>> /* use msg_control to pass vhost zerocopy ubuf info to skb */
>> if (zcopy_used) {
>> + struct ubuf_info *ubuf;
>> + ubuf = nvq->ubuf_info + nvq->upend_idx;
>> +
>> vq->heads[nvq->upend_idx].id = head;
>> - if (!vhost_net_tx_select_zcopy(net) ||
>> - len < VHOST_GOODCOPY_LEN) {
>> - /* copy don't need to wait for DMA done */
>> - vq->heads[nvq->upend_idx].len =
>> - VHOST_DMA_DONE_LEN;
>> - msg.msg_control = NULL;
>> - msg.msg_controllen = 0;
>> - ubufs = NULL;
>> - } else {
>> - struct ubuf_info *ubuf;
>> - ubuf = nvq->ubuf_info + nvq->upend_idx;
>> -
>> - vq->heads[nvq->upend_idx].len =
>> - VHOST_DMA_IN_PROGRESS;
>> - ubuf->callback = vhost_zerocopy_callback;
>> - ubuf->ctx = nvq->ubufs;
>> - ubuf->desc = nvq->upend_idx;
>> - msg.msg_control = ubuf;
>> - msg.msg_controllen = sizeof(ubuf);
>> - ubufs = nvq->ubufs;
>> - kref_get(&ubufs->kref);
>> - }
>> + vq->heads[nvq->upend_idx].len = VHOST_DMA_IN_PROGRESS;
>> + ubuf->callback = vhost_zerocopy_callback;
>> + ubuf->ctx = nvq->ubufs;
>> + ubuf->desc = nvq->upend_idx;
>> + msg.msg_control = ubuf;
>> + msg.msg_controllen = sizeof(ubuf);
>> + ubufs = nvq->ubufs;
>> + kref_get(&ubufs->kref);
>> nvq->upend_idx = (nvq->upend_idx + 1) % UIO_MAXIOV;
>> - } else
>> + } else {
>> msg.msg_control = NULL;
>> + ubufs = NULL;
>> + }
>> /* TODO: Check specific error and bomb out unless ENOBUFS? */
>> err = sock->ops->sendmsg(NULL, sock, &msg, len);
>> if (unlikely(err < 0)) {
>> if (zcopy_used) {
>> - if (ubufs)
>> - vhost_net_ubuf_put(ubufs);
>> + vhost_net_ubuf_put(ubufs);
>> nvq->upend_idx = ((unsigned)nvq->upend_idx - 1)
>> % UIO_MAXIOV;
>> }
>> --
>> 1.7.1
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, virtualization@lists.linux-foundation.org
Subject: Re: [PATCH V3 4/6] vhost_net: determine whether or not to use zerocopy at one time
Date: Thu, 05 Sep 2013 10:54:44 +0800 [thread overview]
Message-ID: <5227F274.9040506@redhat.com> (raw)
In-Reply-To: <20130904115929.GA9393@redhat.com>
On 09/04/2013 07:59 PM, Michael S. Tsirkin wrote:
> On Mon, Sep 02, 2013 at 04:40:59PM +0800, Jason Wang wrote:
>> Currently, even if the packet length is smaller than VHOST_GOODCOPY_LEN, if
>> upend_idx != done_idx we still set zcopy_used to true and rollback this choice
>> later. This could be avoided by determining zerocopy once by checking all
>> conditions at one time before.
>>
>> Signed-off-by: Jason Wang <jasowang@redhat.com>
>> ---
>> drivers/vhost/net.c | 47 ++++++++++++++++++++---------------------------
>> 1 files changed, 20 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
>> index 8a6dd0d..3f89dea 100644
>> --- a/drivers/vhost/net.c
>> +++ b/drivers/vhost/net.c
>> @@ -404,43 +404,36 @@ static void handle_tx(struct vhost_net *net)
>> iov_length(nvq->hdr, s), hdr_size);
>> break;
>> }
>> - zcopy_used = zcopy && (len >= VHOST_GOODCOPY_LEN ||
>> - nvq->upend_idx != nvq->done_idx);
>> +
>> + zcopy_used = zcopy && len >= VHOST_GOODCOPY_LEN
>> + && (nvq->upend_idx + 1) % UIO_MAXIOV !=
>> + nvq->done_idx
> Thinking about this, this looks strange.
> The original idea was that once we start doing zcopy, we keep
> using the heads ring even for short packets until no zcopy is outstanding.
What's the reason for keep using the heads ring?
>
> What's the logic behind (nvq->upend_idx + 1) % UIO_MAXIOV != nvq->done_idx
> here?
Because we initialize both upend_idx and done_idx to zero, so upend_idx
!= done_idx could not be used to check whether or not the heads ring
were full.
>> + && vhost_net_tx_select_zcopy(net);
>>
>> /* use msg_control to pass vhost zerocopy ubuf info to skb */
>> if (zcopy_used) {
>> + struct ubuf_info *ubuf;
>> + ubuf = nvq->ubuf_info + nvq->upend_idx;
>> +
>> vq->heads[nvq->upend_idx].id = head;
>> - if (!vhost_net_tx_select_zcopy(net) ||
>> - len < VHOST_GOODCOPY_LEN) {
>> - /* copy don't need to wait for DMA done */
>> - vq->heads[nvq->upend_idx].len =
>> - VHOST_DMA_DONE_LEN;
>> - msg.msg_control = NULL;
>> - msg.msg_controllen = 0;
>> - ubufs = NULL;
>> - } else {
>> - struct ubuf_info *ubuf;
>> - ubuf = nvq->ubuf_info + nvq->upend_idx;
>> -
>> - vq->heads[nvq->upend_idx].len =
>> - VHOST_DMA_IN_PROGRESS;
>> - ubuf->callback = vhost_zerocopy_callback;
>> - ubuf->ctx = nvq->ubufs;
>> - ubuf->desc = nvq->upend_idx;
>> - msg.msg_control = ubuf;
>> - msg.msg_controllen = sizeof(ubuf);
>> - ubufs = nvq->ubufs;
>> - kref_get(&ubufs->kref);
>> - }
>> + vq->heads[nvq->upend_idx].len = VHOST_DMA_IN_PROGRESS;
>> + ubuf->callback = vhost_zerocopy_callback;
>> + ubuf->ctx = nvq->ubufs;
>> + ubuf->desc = nvq->upend_idx;
>> + msg.msg_control = ubuf;
>> + msg.msg_controllen = sizeof(ubuf);
>> + ubufs = nvq->ubufs;
>> + kref_get(&ubufs->kref);
>> nvq->upend_idx = (nvq->upend_idx + 1) % UIO_MAXIOV;
>> - } else
>> + } else {
>> msg.msg_control = NULL;
>> + ubufs = NULL;
>> + }
>> /* TODO: Check specific error and bomb out unless ENOBUFS? */
>> err = sock->ops->sendmsg(NULL, sock, &msg, len);
>> if (unlikely(err < 0)) {
>> if (zcopy_used) {
>> - if (ubufs)
>> - vhost_net_ubuf_put(ubufs);
>> + vhost_net_ubuf_put(ubufs);
>> nvq->upend_idx = ((unsigned)nvq->upend_idx - 1)
>> % UIO_MAXIOV;
>> }
>> --
>> 1.7.1
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-09-05 2:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 8:40 [PATCH V3 0/6] vhost code cleanup and minor enhancement Jason Wang
2013-09-02 8:40 ` Jason Wang
2013-09-02 8:40 ` [PATCH V3 1/6] vhost_net: make vhost_zerocopy_signal_used() return void Jason Wang
2013-09-02 8:40 ` Jason Wang
2013-09-02 8:40 ` [PATCH V3 2/6] vhost_net: use vhost_add_used_and_signal_n() in vhost_zerocopy_signal_used() Jason Wang
2013-09-02 8:40 ` Jason Wang
2013-09-02 8:40 ` [PATCH V3 3/6] vhost: switch to use vhost_add_used_n() Jason Wang
2013-09-02 8:40 ` Jason Wang
2013-09-02 8:40 ` [PATCH V3 4/6] vhost_net: determine whether or not to use zerocopy at one time Jason Wang
2013-09-02 8:40 ` Jason Wang
2013-09-04 11:59 ` Michael S. Tsirkin
2013-09-04 11:59 ` Michael S. Tsirkin
2013-09-05 2:54 ` Jason Wang [this message]
2013-09-05 2:54 ` Jason Wang
2013-09-23 7:16 ` Michael S. Tsirkin
2013-09-23 7:16 ` Michael S. Tsirkin
2013-09-26 4:30 ` Jason Wang
2013-09-26 4:30 ` Jason Wang
2013-09-29 9:36 ` Jason Wang
2013-09-29 9:36 ` Jason Wang
2013-09-02 8:41 ` [PATCH V3 5/6] vhost_net: poll vhost queue after marking DMA is done Jason Wang
2013-09-02 8:41 ` Jason Wang
2013-09-02 8:41 ` [PATCH V3 6/6] vhost_net: correctly limit the max pending buffers Jason Wang
2013-09-02 8:41 ` Jason Wang
2013-09-04 2:47 ` [PATCH V3 0/6] vhost code cleanup and minor enhancement David Miller
2013-09-04 2:47 ` David Miller
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=5227F274.9040506@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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.