From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org, eperezma@redhat.com, kvm@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: [PATCH RFC v8 07/11] vhost/net: avoid iov length math
Date: Thu, 11 Jun 2020 07:34:30 -0400 [thread overview]
Message-ID: <20200611113404.17810-8-mst@redhat.com> (raw)
In-Reply-To: <20200611113404.17810-1-mst@redhat.com>
Now that API exposes buffer length, we no longer need to
scan IOVs to figure it out.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/vhost/net.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 830fe84912a5..0b509be8d7b1 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -607,11 +607,9 @@ static bool vhost_exceeds_maxpend(struct vhost_net *net)
}
static size_t init_iov_iter(struct vhost_virtqueue *vq, struct iov_iter *iter,
- size_t hdr_size, int out)
+ size_t len, size_t hdr_size, int out)
{
/* Skip header. TODO: support TSO. */
- size_t len = iov_length(vq->iov, out);
-
iov_iter_init(iter, WRITE, vq->iov, out, len);
iov_iter_advance(iter, hdr_size);
@@ -640,7 +638,7 @@ static int get_tx_bufs(struct vhost_net *net,
}
/* Sanity check */
- *len = init_iov_iter(vq, &msg->msg_iter, nvq->vhost_hlen, *out);
+ *len = init_iov_iter(vq, &msg->msg_iter, buf->out_len, nvq->vhost_hlen, *out);
if (*len == 0) {
vq_err(vq, "Unexpected header len for TX: %zd expected %zd\n",
*len, nvq->vhost_hlen);
@@ -1080,7 +1078,7 @@ static int get_rx_bufs(struct vhost_virtqueue *vq,
nlogs += *log_num;
log += *log_num;
}
- len = iov_length(vq->iov + seg, in);
+ len = bufs[bufcount].in_len;
datalen -= len;
++bufcount;
seg += in;
--
MST
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, Jason Wang <jasowang@redhat.com>,
eperezma@redhat.com
Subject: [PATCH RFC v8 07/11] vhost/net: avoid iov length math
Date: Thu, 11 Jun 2020 07:34:30 -0400 [thread overview]
Message-ID: <20200611113404.17810-8-mst@redhat.com> (raw)
In-Reply-To: <20200611113404.17810-1-mst@redhat.com>
Now that API exposes buffer length, we no longer need to
scan IOVs to figure it out.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/vhost/net.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 830fe84912a5..0b509be8d7b1 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -607,11 +607,9 @@ static bool vhost_exceeds_maxpend(struct vhost_net *net)
}
static size_t init_iov_iter(struct vhost_virtqueue *vq, struct iov_iter *iter,
- size_t hdr_size, int out)
+ size_t len, size_t hdr_size, int out)
{
/* Skip header. TODO: support TSO. */
- size_t len = iov_length(vq->iov, out);
-
iov_iter_init(iter, WRITE, vq->iov, out, len);
iov_iter_advance(iter, hdr_size);
@@ -640,7 +638,7 @@ static int get_tx_bufs(struct vhost_net *net,
}
/* Sanity check */
- *len = init_iov_iter(vq, &msg->msg_iter, nvq->vhost_hlen, *out);
+ *len = init_iov_iter(vq, &msg->msg_iter, buf->out_len, nvq->vhost_hlen, *out);
if (*len == 0) {
vq_err(vq, "Unexpected header len for TX: %zd expected %zd\n",
*len, nvq->vhost_hlen);
@@ -1080,7 +1078,7 @@ static int get_rx_bufs(struct vhost_virtqueue *vq,
nlogs += *log_num;
log += *log_num;
}
- len = iov_length(vq->iov + seg, in);
+ len = bufs[bufcount].in_len;
datalen -= len;
++bufcount;
seg += in;
--
MST
next prev parent reply other threads:[~2020-06-11 11:34 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 11:34 [PATCH RFC v8 00/11] vhost: ring format independence Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin
2020-06-11 11:34 ` [PATCH RFC v8 01/11] vhost: option to fetch descriptors through an independent struct Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin
2020-06-11 11:34 ` [PATCH RFC v8 02/11] vhost: use batched get_vq_desc version Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin
2020-06-11 15:22 ` Konrad Rzeszutek Wilk
2020-06-11 15:22 ` Konrad Rzeszutek Wilk
2020-06-15 12:28 ` Eugenio Perez Martin
2020-06-19 18:07 ` Eugenio Perez Martin
2020-06-19 18:25 ` Eugenio Perez Martin
2020-06-22 9:07 ` Jason Wang
2020-06-22 10:44 ` Eugenio Perez Martin
2020-06-22 15:55 ` Michael S. Tsirkin
2020-06-22 16:11 ` Eugenio Perez Martin
2020-06-22 16:29 ` Michael S. Tsirkin
2020-06-23 16:15 ` Eugenio Perez Martin
2020-07-01 10:43 ` Eugenio Perez Martin
2020-07-01 11:11 ` Michael S. Tsirkin
2020-07-01 11:11 ` Michael S. Tsirkin
2020-07-01 12:56 ` Eugenio Perez Martin
2020-07-01 12:39 ` Jason Wang
2020-07-01 13:04 ` Eugenio Perez Martin
2020-07-01 14:09 ` Jason Wang
2020-07-09 16:46 ` Eugenio Perez Martin
2020-07-09 17:37 ` Michael S. Tsirkin
2020-07-10 3:56 ` Jason Wang
2020-07-10 5:39 ` Eugenio Perez Martin
2020-07-10 5:58 ` Michael S. Tsirkin
2020-07-16 17:16 ` Eugenio Perez Martin
2020-07-20 8:55 ` Jason Wang
2020-07-20 13:07 ` Eugenio Perez Martin
2020-07-20 9:27 ` Michael S. Tsirkin
2020-07-20 11:16 ` Eugenio Pérez
2020-07-20 11:45 ` Michael S. Tsirkin
2020-07-21 2:55 ` Jason Wang
2020-07-29 18:37 ` Eugenio Perez Martin
2020-07-10 6:44 ` Jason Wang
2020-06-17 3:19 ` Jason Wang
2020-06-19 17:56 ` Eugenio Perez Martin
2020-06-22 16:00 ` Michael S. Tsirkin
2020-06-23 2:51 ` Jason Wang
2020-06-23 7:00 ` Eugenio Perez Martin
2020-06-23 7:15 ` Jason Wang
2020-06-23 8:25 ` Michael S. Tsirkin
2020-06-23 15:54 ` Eugenio Perez Martin
2020-06-11 11:34 ` [PATCH RFC v8 03/11] vhost/net: pass net specific struct pointer Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin
2020-06-15 16:08 ` Eugenio Perez Martin
2020-06-11 11:34 ` [PATCH RFC v8 04/11] vhost: reorder functions Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin
2020-06-11 11:34 ` [PATCH RFC v8 05/11] vhost: format-independent API for used buffers Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin
2020-06-15 16:11 ` Eugenio Perez Martin
2020-06-11 11:34 ` [PATCH RFC v8 06/11] vhost/net: convert to new API: heads->bufs Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin [this message]
2020-06-11 11:34 ` [PATCH RFC v8 07/11] vhost/net: avoid iov length math Michael S. Tsirkin
2020-06-11 11:34 ` [PATCH RFC v8 08/11] vhost/test: convert to the buf API Michael S. Tsirkin
2020-06-11 11:34 ` Michael S. Tsirkin
2020-06-11 11:34 ` [PATCH RFC v8 09/11] vhost/scsi: switch to buf APIs Michael S. Tsirkin
2020-06-11 11:34 ` [PATCH RFC v8 10/11] vhost/vsock: switch to the buf API Michael S. Tsirkin
2020-06-11 11:34 ` [PATCH RFC v8 11/11] vhost: drop head based APIs Michael S. Tsirkin
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=20200611113404.17810-8-mst@redhat.com \
--to=mst@redhat.com \
--cc=eperezma@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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.