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 v5 05/13] vhost/net: pass net specific struct pointer
Date: Sun, 7 Jun 2020 10:11:34 -0400 [thread overview]
Message-ID: <20200607141057.704085-6-mst@redhat.com> (raw)
In-Reply-To: <20200607141057.704085-1-mst@redhat.com>
In preparation for further cleanup, pass net specific pointer
to ubuf callbacks so we can move net specific fields
out to net structures.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/vhost/net.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index bf5e1d81ae25..ff594eec8ae3 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -94,7 +94,7 @@ struct vhost_net_ubuf_ref {
*/
atomic_t refcount;
wait_queue_head_t wait;
- struct vhost_virtqueue *vq;
+ struct vhost_net_virtqueue *nvq;
};
#define VHOST_NET_BATCH 64
@@ -231,7 +231,7 @@ static void vhost_net_enable_zcopy(int vq)
}
static struct vhost_net_ubuf_ref *
-vhost_net_ubuf_alloc(struct vhost_virtqueue *vq, bool zcopy)
+vhost_net_ubuf_alloc(struct vhost_net_virtqueue *nvq, bool zcopy)
{
struct vhost_net_ubuf_ref *ubufs;
/* No zero copy backend? Nothing to count. */
@@ -242,7 +242,7 @@ vhost_net_ubuf_alloc(struct vhost_virtqueue *vq, bool zcopy)
return ERR_PTR(-ENOMEM);
atomic_set(&ubufs->refcount, 1);
init_waitqueue_head(&ubufs->wait);
- ubufs->vq = vq;
+ ubufs->nvq = nvq;
return ubufs;
}
@@ -384,13 +384,13 @@ static void vhost_zerocopy_signal_used(struct vhost_net *net,
static void vhost_zerocopy_callback(struct ubuf_info *ubuf, bool success)
{
struct vhost_net_ubuf_ref *ubufs = ubuf->ctx;
- struct vhost_virtqueue *vq = ubufs->vq;
+ struct vhost_net_virtqueue *nvq = ubufs->nvq;
int cnt;
rcu_read_lock_bh();
/* set len to mark this desc buffers done DMA */
- vq->heads[ubuf->desc].len = success ?
+ nvq->vq.heads[ubuf->desc].in_len = success ?
VHOST_DMA_DONE_LEN : VHOST_DMA_FAILED_LEN;
cnt = vhost_net_ubuf_put(ubufs);
@@ -402,7 +402,7 @@ static void vhost_zerocopy_callback(struct ubuf_info *ubuf, bool success)
* less than 10% of times).
*/
if (cnt <= 1 || !(cnt % 16))
- vhost_poll_queue(&vq->poll);
+ vhost_poll_queue(&nvq->vq.poll);
rcu_read_unlock_bh();
}
@@ -1525,7 +1525,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
/* start polling new socket */
oldsock = vhost_vq_get_backend(vq);
if (sock != oldsock) {
- ubufs = vhost_net_ubuf_alloc(vq,
+ ubufs = vhost_net_ubuf_alloc(nvq,
sock && vhost_sock_zcopy(sock));
if (IS_ERR(ubufs)) {
r = PTR_ERR(ubufs);
--
MST
next prev parent reply other threads:[~2020-06-07 14:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-07 14:11 [PATCH RFC v5 00/13] vhost: ring format independence Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 01/13] vhost: option to fetch descriptors through an independent struct Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 02/13] vhost: use batched version by default Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 03/13] vhost: batching fetches Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 04/13] vhost: cleanup fetch_buf return code handling Michael S. Tsirkin
2020-06-07 14:11 ` Michael S. Tsirkin [this message]
2020-06-07 14:11 ` [PATCH RFC v5 06/13] vhost: reorder functions Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 07/13] vhost: format-independent API for used buffers Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 08/13] vhost/net: convert to new API: heads->bufs Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 09/13] vhost/net: avoid iov length math Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 10/13] vhost/test: convert to the buf API Michael S. Tsirkin
2020-06-07 14:11 ` [PATCH RFC v5 11/13] vhost/scsi: switch to buf APIs Michael S. Tsirkin
2020-06-08 9:57 ` Stefan Hajnoczi
2020-06-07 14:11 ` [PATCH RFC v5 12/13] vhost/vsock: switch to the buf API Michael S. Tsirkin
2020-06-08 9:57 ` Stefan Hajnoczi
2020-06-08 10:17 ` Stefano Garzarella
2020-06-08 13:30 ` Michael S. Tsirkin
2020-06-08 16:26 ` Stefano Garzarella
2020-06-07 14:11 ` [PATCH RFC v5 13/13] vhost: drop head based APIs Michael S. Tsirkin
2020-06-08 3:57 ` Jason Wang
2020-06-08 6:45 ` 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=20200607141057.704085-6-mst@redhat.com \
--to=mst@redhat.com \
--cc=eperezma@redhat.com \
--cc=jasowang@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 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).