Skip to content

Commit

Permalink
vhost: rename vq_iotlb_prefetch() to vq_meta_prefetch()
Browse files Browse the repository at this point in the history
Rename the function to be more accurate since it actually tries to
prefetch vq metadata address in IOTLB. And this will be used by
following patch to prefetch metadata virtual addresses.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Jason Wang authored and Michael S. Tsirkin committed Jun 5, 2019
1 parent 7b5d753 commit 9b5e830
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/vhost/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ static void handle_tx(struct vhost_net *net)
if (!sock)
goto out;

if (!vq_iotlb_prefetch(vq))
if (!vq_meta_prefetch(vq))
goto out;

vhost_disable_notify(&net->dev, vq);
Expand Down Expand Up @@ -1126,7 +1126,7 @@ static void handle_rx(struct vhost_net *net)
if (!sock)
goto out;

if (!vq_iotlb_prefetch(vq))
if (!vq_meta_prefetch(vq))
goto out;

vhost_disable_notify(&net->dev, vq);
Expand Down
4 changes: 2 additions & 2 deletions drivers/vhost/vhost.c
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ static bool iotlb_access_ok(struct vhost_virtqueue *vq,
return true;
}

int vq_iotlb_prefetch(struct vhost_virtqueue *vq)
int vq_meta_prefetch(struct vhost_virtqueue *vq)
{
size_t s = vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;
unsigned int num = vq->num;
Expand All @@ -1350,7 +1350,7 @@ int vq_iotlb_prefetch(struct vhost_virtqueue *vq)
num * sizeof(*vq->used->ring) + s,
VHOST_ADDR_USED);
}
EXPORT_SYMBOL_GPL(vq_iotlb_prefetch);
EXPORT_SYMBOL_GPL(vq_meta_prefetch);

/* Can we log writes? */
/* Caller should have device mutex but not vq mutex */
Expand Down
2 changes: 1 addition & 1 deletion drivers/vhost/vhost.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ bool vhost_enable_notify(struct vhost_dev *, struct vhost_virtqueue *);
int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log,
unsigned int log_num, u64 len,
struct iovec *iov, int count);
int vq_iotlb_prefetch(struct vhost_virtqueue *vq);
int vq_meta_prefetch(struct vhost_virtqueue *vq);

struct vhost_msg_node *vhost_new_msg(struct vhost_virtqueue *vq, int type);
void vhost_enqueue_msg(struct vhost_dev *dev,
Expand Down

0 comments on commit 9b5e830

Please sign in to comment.