Commit cc5e7107 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

vhost: log dirty page correctly 



Vhost dirty page logging API is designed to sync through GPA. But we
try to log GIOVA when device IOTLB is enabled. This is wrong and may
lead to missing data after migration.

To solve this issue, when logging with device IOTLB enabled, we will:

1) reuse the device IOTLB translation result of GIOVA->HVA mapping to
   get HVA, for writable descriptor, get HVA through iovec. For used
   ring update, translate its GIOVA to HVA
2) traverse the GPA->HVA mapping to get the possible GPA and log
   through GPA. Pay attention this reverse mapping is not guaranteed
   to be unique, so we should log each possible GPA in this case.

This fix the failure of scp to guest during migration. In -next, we
will probably support passing GIOVA->GPA instead of GIOVA->HVA.

Fixes: 6b1e6cc7 ("vhost: new device IOTLB API")
Reported-by: default avatarJintack Lim <jintack@cs.columbia.edu>
Cc: Jintack Lim <jintack@cs.columbia.edu>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f655f8b8

drivers/vhost/net.c

+2 −1
Original line number Diff line number Diff line
@@ -1236,7 +1236,8 @@ static void handle_rx(struct vhost_net *net) 
		if (nvq->done_idx > VHOST_NET_BATCH)

			vhost_net_signal_used(nvq);

		if (unlikely(vq_log))

			vhost_log_write(vq, vq_log, log, vhost_len);

			vhost_log_write(vq, vq_log, log, vhost_len,

					vq->iov, in);

		total_len += vhost_len;

		if (unlikely(vhost_exceeds_weight(++recv_pkts, total_len))) {

			vhost_poll_queue(&vq->poll);

drivers/vhost/vhost.c

+83 −14
Original line number Diff line number Diff line
@@ -1733,13 +1733,87 @@ static int log_write(void __user *log_base, 
	return r;

}



static int log_write_hva(struct vhost_virtqueue *vq, u64 hva, u64 len)

{

	struct vhost_umem *umem = vq->umem;

	struct vhost_umem_node *u;

	u64 start, end, l, min;

	int r;

	bool hit = false;



	while (len) {

		min = len;

		/* More than one GPAs can be mapped into a single HVA. So

		 * iterate all possible umems here to be safe.

		 */

		list_for_each_entry(u, &umem->umem_list, link) {

			if (u->userspace_addr > hva - 1 + len ||

			    u->userspace_addr - 1 + u->size < hva)

				continue;

			start = max(u->userspace_addr, hva);

			end = min(u->userspace_addr - 1 + u->size,

				  hva - 1 + len);

			l = end - start + 1;

			r = log_write(vq->log_base,

				      u->start + start - u->userspace_addr,

				      l);

			if (r < 0)

				return r;

			hit = true;

			min = min(l, min);

		}



		if (!hit)

			return -EFAULT;



		len -= min;

		hva += min;

	}



	return 0;

}



static int log_used(struct vhost_virtqueue *vq, u64 used_offset, u64 len)

{

	struct iovec iov[64];

	int i, ret;



	if (!vq->iotlb)

		return log_write(vq->log_base, vq->log_addr + used_offset, len);



	ret = translate_desc(vq, (uintptr_t)vq->used + used_offset,

			     len, iov, 64, VHOST_ACCESS_WO);

	if (ret)

		return ret;



	for (i = 0; i < ret; i++) {

		ret = log_write_hva(vq,	(uintptr_t)iov[i].iov_base,

				    iov[i].iov_len);

		if (ret)

			return ret;

	}



	return 0;

}



int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log,

		    unsigned int log_num, u64 len)

		    unsigned int log_num, u64 len, struct iovec *iov, int count)

{

	int i, r;



	/* Make sure data written is seen before log. */

	smp_wmb();



	if (vq->iotlb) {

		for (i = 0; i < count; i++) {

			r = log_write_hva(vq, (uintptr_t)iov[i].iov_base,

					  iov[i].iov_len);

			if (r < 0)

				return r;

		}

		return 0;

	}



	for (i = 0; i < log_num; ++i) {

		u64 l = min(log[i].len, len);

		r = log_write(vq->log_base, log[i].addr, l);
@@ -1769,8 +1843,7 @@ static int vhost_update_used_flags(struct vhost_virtqueue *vq) 
		smp_wmb();

		/* Log used flag write. */

		used = &vq->used->flags;

		log_write(vq->log_base, vq->log_addr +

			  (used - (void __user *)vq->used),

		log_used(vq, (used - (void __user *)vq->used),

			 sizeof vq->used->flags);

		if (vq->log_ctx)

			eventfd_signal(vq->log_ctx, 1);
@@ -1789,8 +1862,7 @@ static int vhost_update_avail_event(struct vhost_virtqueue *vq, u16 avail_event) 
		smp_wmb();

		/* Log avail event write */

		used = vhost_avail_event(vq);

		log_write(vq->log_base, vq->log_addr +

			  (used - (void __user *)vq->used),

		log_used(vq, (used - (void __user *)vq->used),

			 sizeof *vhost_avail_event(vq));

		if (vq->log_ctx)

			eventfd_signal(vq->log_ctx, 1);
@@ -2191,9 +2263,7 @@ static int __vhost_add_used_n(struct vhost_virtqueue *vq, 
		/* Make sure data is seen before log. */

		smp_wmb();

		/* Log used ring entry write. */

		log_write(vq->log_base,

			  vq->log_addr +

			   ((void __user *)used - (void __user *)vq->used),

		log_used(vq, ((void __user *)used - (void __user *)vq->used),

			 count * sizeof *used);

	}

	old = vq->last_used_idx;
@@ -2236,8 +2306,7 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads, 
		/* Make sure used idx is seen before log. */

		smp_wmb();

		/* Log used index update. */

		log_write(vq->log_base,

			  vq->log_addr + offsetof(struct vring_used, idx),

		log_used(vq, offsetof(struct vring_used, idx),

			 sizeof vq->used->idx);

		if (vq->log_ctx)

			eventfd_signal(vq->log_ctx, 1);

drivers/vhost/vhost.h

+2 −1
Original line number Diff line number Diff line
@@ -205,7 +205,8 @@ bool vhost_vq_avail_empty(struct vhost_dev *, struct vhost_virtqueue *); 
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);

		    unsigned int log_num, u64 len,

		    struct iovec *iov, int count);

int vq_iotlb_prefetch(struct vhost_virtqueue *vq);



struct vhost_msg_node *vhost_new_msg(struct vhost_virtqueue *vq, int type);

CRA Git | Maintained and supported by SUSTech CRA and CCSE