| Message ID | 20181212100819.21295-5-jasowang@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix various issue of vhost | expand |
On Wed, Dec 12, 2018 at 06:08:19PM +0800, Jason Wang wrote: > 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: 6b1e6cc7855b ("vhost: new device IOTLB API") > Reported-by: Jintack Lim <jintack@cs.columbia.edu> > Cc: Jintack Lim <jintack@cs.columbia.edu> > Signed-off-by: Jason Wang <jasowang@redhat.com> It's a nasty bug for sure but it's been like this for a long time so I'm inclined to say let's put it in 4.21, and queue for stable. So please split this out from this series. Also, I'd like to see a feature bit that allows GPA in IOTLBs. > --- > drivers/vhost/net.c | 3 +- > drivers/vhost/vhost.c | 79 +++++++++++++++++++++++++++++++++++-------- > drivers/vhost/vhost.h | 3 +- > 3 files changed, 69 insertions(+), 16 deletions(-) > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > index ad7a6f475a44..784df2b49628 100644 > --- a/drivers/vhost/net.c > +++ b/drivers/vhost/net.c > @@ -1192,7 +1192,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); > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > index 55e5aa662ad5..3660310604fd 100644 > --- a/drivers/vhost/vhost.c > +++ b/drivers/vhost/vhost.c > @@ -1733,11 +1733,67 @@ 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 gpa; > + int r; > + bool hit = false; > + > + list_for_each_entry(u, &umem->umem_list, link) { > + if (u->userspace_addr < hva && > + u->userspace_addr + u->size >= > + hva + len) { > + gpa = u->start + hva - u->userspace_addr; > + r = log_write(vq->log_base, gpa, len); > + if (r < 0) > + return r; > + hit = true; > + } > + } > + > + /* No reverse mapping, should be a bug */ > + WARN_ON(!hit); Maybe it should but userspace can trigger this easily I think. We need to stop the device not warn in kernel log. Also there's an error fd: VHOST_SET_VRING_ERR, need to wake it up. > + return 0; > +} > + > +static void log_used(struct vhost_virtqueue *vq, u64 used_offset, u64 len) > +{ > + struct iovec iov[64]; > + int i, ret; > + > + if (!vq->iotlb) { > + log_write(vq->log_base, vq->log_addr + used_offset, len); > + return; > + } This change seems questionable. used ring writes use their own machinery it does not go through iotlb. Same should apply to log I think. > + > + ret = translate_desc(vq, (u64)(uintptr_t)vq->used + used_offset, > + len, iov, 64, VHOST_ACCESS_WO); > + WARN_ON(ret < 0); Same thing here. translation failures can be triggered from guest. warn on is not a good error handling strategy ... > + > + for (i = 0; i < ret; i++) { > + ret = log_write_hva(vq, (u64)(uintptr_t)iov[i].iov_base, > + iov[i].iov_len); > + WARN_ON(ret); > + } > +} > + > 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; > > + if (vq->iotlb) { > + for (i = 0; i < count; i++) { > + r = log_write_hva(vq, (u64)(uintptr_t)iov[i].iov_base, > + iov[i].iov_len); > + if (r < 0) > + return r; > + } > + return 0; > + } > + > /* Make sure data written is seen before log. */ > smp_wmb(); > for (i = 0; i < log_num; ++i) { > @@ -1769,9 +1825,8 @@ 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), > - sizeof vq->used->flags); > + log_used(vq, (used - (void __user *)vq->used), > + sizeof vq->used->flags); > if (vq->log_ctx) > eventfd_signal(vq->log_ctx, 1); > } > @@ -1789,9 +1844,8 @@ 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), > - sizeof *vhost_avail_event(vq)); > + log_used(vq, (used - (void __user *)vq->used), > + sizeof *vhost_avail_event(vq)); > if (vq->log_ctx) > eventfd_signal(vq->log_ctx, 1); > } > @@ -2191,10 +2245,8 @@ 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), > - count * sizeof *used); > + log_used(vq, ((void __user *)used - (void __user *)vq->used), > + count * sizeof *used); > } > old = vq->last_used_idx; > new = (vq->last_used_idx += count); > @@ -2236,9 +2288,8 @@ 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), > - sizeof vq->used->idx); > + log_used(vq, offsetof(struct vring_used, idx), > + sizeof vq->used->idx); > if (vq->log_ctx) > eventfd_signal(vq->log_ctx, 1); > } > diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h > index 466ef7542291..1b675dad5e05 100644 > --- a/drivers/vhost/vhost.h > +++ b/drivers/vhost/vhost.h > @@ -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); > -- > 2.17.1
On 2018/12/12 下午10:32, Michael S. Tsirkin wrote: > On Wed, Dec 12, 2018 at 06:08:19PM +0800, Jason Wang wrote: >> 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: 6b1e6cc7855b ("vhost: new device IOTLB API") >> Reported-by: Jintack Lim <jintack@cs.columbia.edu> >> Cc: Jintack Lim <jintack@cs.columbia.edu> >> Signed-off-by: Jason Wang <jasowang@redhat.com> > It's a nasty bug for sure but it's been like this for a long > time so I'm inclined to say let's put it in 4.21, > and queue for stable. > > So please split this out from this series. Ok. > > Also, I'd like to see a feature bit that allows GPA in IOTLBs. Just to make sure I understand this. It looks to me we should: - allow passing GIOVA->GPA through UAPI - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for performance Is this what you suggest? Thanks > >> --- >> drivers/vhost/net.c | 3 +- >> drivers/vhost/vhost.c | 79 +++++++++++++++++++++++++++++++++++-------- >> drivers/vhost/vhost.h | 3 +- >> 3 files changed, 69 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c >> index ad7a6f475a44..784df2b49628 100644 >> --- a/drivers/vhost/net.c >> +++ b/drivers/vhost/net.c >> @@ -1192,7 +1192,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); >> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c >> index 55e5aa662ad5..3660310604fd 100644 >> --- a/drivers/vhost/vhost.c >> +++ b/drivers/vhost/vhost.c >> @@ -1733,11 +1733,67 @@ 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 gpa; >> + int r; >> + bool hit = false; >> + >> + list_for_each_entry(u, &umem->umem_list, link) { >> + if (u->userspace_addr < hva && >> + u->userspace_addr + u->size >= >> + hva + len) { >> + gpa = u->start + hva - u->userspace_addr; >> + r = log_write(vq->log_base, gpa, len); >> + if (r < 0) >> + return r; >> + hit = true; >> + } >> + } >> + >> + /* No reverse mapping, should be a bug */ >> + WARN_ON(!hit); > Maybe it should but userspace can trigger this easily I think. > We need to stop the device not warn in kernel log. > > Also there's an error fd: VHOST_SET_VRING_ERR, need to wake it up. > Ok. >> + return 0; >> +} >> + >> +static void log_used(struct vhost_virtqueue *vq, u64 used_offset, u64 len) >> +{ >> + struct iovec iov[64]; >> + int i, ret; >> + >> + if (!vq->iotlb) { >> + log_write(vq->log_base, vq->log_addr + used_offset, len); >> + return; >> + } > This change seems questionable. used ring writes > use their own machinery it does not go through iotlb. > Same should apply to log I think. The problem is used ring may not be physically contiguous with Device IOTLB enabled. So it should go through it. > >> + >> + ret = translate_desc(vq, (u64)(uintptr_t)vq->used + used_offset, >> + len, iov, 64, VHOST_ACCESS_WO); >> + WARN_ON(ret < 0); > > Same thing here. translation failures can be triggered from guest. > warn on is not a good error handling strategy ... Ok. Let me fix it. Thanks >> + >> + for (i = 0; i < ret; i++) { >> + ret = log_write_hva(vq, (u64)(uintptr_t)iov[i].iov_base, >> + iov[i].iov_len); >> + WARN_ON(ret); >> + } >> +} >> + >> 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; >> >> + if (vq->iotlb) { >> + for (i = 0; i < count; i++) { >> + r = log_write_hva(vq, (u64)(uintptr_t)iov[i].iov_base, >> + iov[i].iov_len); >> + if (r < 0) >> + return r; >> + } >> + return 0; >> + } >> + >> /* Make sure data written is seen before log. */ >> smp_wmb(); >> for (i = 0; i < log_num; ++i) { >> @@ -1769,9 +1825,8 @@ 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), >> - sizeof vq->used->flags); >> + log_used(vq, (used - (void __user *)vq->used), >> + sizeof vq->used->flags); >> if (vq->log_ctx) >> eventfd_signal(vq->log_ctx, 1); >> } >> @@ -1789,9 +1844,8 @@ 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), >> - sizeof *vhost_avail_event(vq)); >> + log_used(vq, (used - (void __user *)vq->used), >> + sizeof *vhost_avail_event(vq)); >> if (vq->log_ctx) >> eventfd_signal(vq->log_ctx, 1); >> } >> @@ -2191,10 +2245,8 @@ 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), >> - count * sizeof *used); >> + log_used(vq, ((void __user *)used - (void __user *)vq->used), >> + count * sizeof *used); >> } >> old = vq->last_used_idx; >> new = (vq->last_used_idx += count); >> @@ -2236,9 +2288,8 @@ 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), >> - sizeof vq->used->idx); >> + log_used(vq, offsetof(struct vring_used, idx), >> + sizeof vq->used->idx); >> if (vq->log_ctx) >> eventfd_signal(vq->log_ctx, 1); >> } >> diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h >> index 466ef7542291..1b675dad5e05 100644 >> --- a/drivers/vhost/vhost.h >> +++ b/drivers/vhost/vhost.h >> @@ -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); >> -- >> 2.17.1
On Thu, Dec 13, 2018 at 10:39:41AM +0800, Jason Wang wrote: > > On 2018/12/12 下午10:32, Michael S. Tsirkin wrote: > > On Wed, Dec 12, 2018 at 06:08:19PM +0800, Jason Wang wrote: > > > 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: 6b1e6cc7855b ("vhost: new device IOTLB API") > > > Reported-by: Jintack Lim <jintack@cs.columbia.edu> > > > Cc: Jintack Lim <jintack@cs.columbia.edu> > > > Signed-off-by: Jason Wang <jasowang@redhat.com> > > It's a nasty bug for sure but it's been like this for a long > > time so I'm inclined to say let's put it in 4.21, > > and queue for stable. > > > > So please split this out from this series. > > > Ok. > > > > > > Also, I'd like to see a feature bit that allows GPA in IOTLBs. > > > Just to make sure I understand this. It looks to me we should: > > - allow passing GIOVA->GPA through UAPI > > - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for > performance > > Is this what you suggest? > > Thanks Not really. We already have GPA->HVA, so I suggested a flag to pass GIOVA->GPA in the IOTLB. This has advantages for security since a single table needs then to be validated to ensure guest does not corrupt QEMU memory. > > > > > > --- > > > drivers/vhost/net.c | 3 +- > > > drivers/vhost/vhost.c | 79 +++++++++++++++++++++++++++++++++++-------- > > > drivers/vhost/vhost.h | 3 +- > > > 3 files changed, 69 insertions(+), 16 deletions(-) > > > > > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > > > index ad7a6f475a44..784df2b49628 100644 > > > --- a/drivers/vhost/net.c > > > +++ b/drivers/vhost/net.c > > > @@ -1192,7 +1192,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); > > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > > > index 55e5aa662ad5..3660310604fd 100644 > > > --- a/drivers/vhost/vhost.c > > > +++ b/drivers/vhost/vhost.c > > > @@ -1733,11 +1733,67 @@ 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 gpa; > > > + int r; > > > + bool hit = false; > > > + > > > + list_for_each_entry(u, &umem->umem_list, link) { > > > + if (u->userspace_addr < hva && > > > + u->userspace_addr + u->size >= > > > + hva + len) { > > > + gpa = u->start + hva - u->userspace_addr; > > > + r = log_write(vq->log_base, gpa, len); > > > + if (r < 0) > > > + return r; > > > + hit = true; > > > + } > > > + } > > > + > > > + /* No reverse mapping, should be a bug */ > > > + WARN_ON(!hit); > > Maybe it should but userspace can trigger this easily I think. > > We need to stop the device not warn in kernel log. > > > > Also there's an error fd: VHOST_SET_VRING_ERR, need to wake it up. > > > > Ok. > > > > > + return 0; > > > +} > > > + > > > +static void log_used(struct vhost_virtqueue *vq, u64 used_offset, u64 len) > > > +{ > > > + struct iovec iov[64]; > > > + int i, ret; > > > + > > > + if (!vq->iotlb) { > > > + log_write(vq->log_base, vq->log_addr + used_offset, len); > > > + return; > > > + } > > This change seems questionable. used ring writes > > use their own machinery it does not go through iotlb. > > Same should apply to log I think. > > > The problem is used ring may not be physically contiguous with Device IOTLB > enabled. So it should go through it. > > > > > > > + > > > + ret = translate_desc(vq, (u64)(uintptr_t)vq->used + used_offset, > > > + len, iov, 64, VHOST_ACCESS_WO); > > > + WARN_ON(ret < 0); > > > > Same thing here. translation failures can be triggered from guest. > > warn on is not a good error handling strategy ... > > > Ok. Let me fix it. > > > Thanks > > > > > + > > > + for (i = 0; i < ret; i++) { > > > + ret = log_write_hva(vq, (u64)(uintptr_t)iov[i].iov_base, > > > + iov[i].iov_len); > > > + WARN_ON(ret); > > > + } > > > +} > > > + > > > 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; > > > + if (vq->iotlb) { > > > + for (i = 0; i < count; i++) { > > > + r = log_write_hva(vq, (u64)(uintptr_t)iov[i].iov_base, > > > + iov[i].iov_len); > > > + if (r < 0) > > > + return r; > > > + } > > > + return 0; > > > + } > > > + > > > /* Make sure data written is seen before log. */ > > > smp_wmb(); > > > for (i = 0; i < log_num; ++i) { > > > @@ -1769,9 +1825,8 @@ 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), > > > - sizeof vq->used->flags); > > > + log_used(vq, (used - (void __user *)vq->used), > > > + sizeof vq->used->flags); > > > if (vq->log_ctx) > > > eventfd_signal(vq->log_ctx, 1); > > > } > > > @@ -1789,9 +1844,8 @@ 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), > > > - sizeof *vhost_avail_event(vq)); > > > + log_used(vq, (used - (void __user *)vq->used), > > > + sizeof *vhost_avail_event(vq)); > > > if (vq->log_ctx) > > > eventfd_signal(vq->log_ctx, 1); > > > } > > > @@ -2191,10 +2245,8 @@ 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), > > > - count * sizeof *used); > > > + log_used(vq, ((void __user *)used - (void __user *)vq->used), > > > + count * sizeof *used); > > > } > > > old = vq->last_used_idx; > > > new = (vq->last_used_idx += count); > > > @@ -2236,9 +2288,8 @@ 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), > > > - sizeof vq->used->idx); > > > + log_used(vq, offsetof(struct vring_used, idx), > > > + sizeof vq->used->idx); > > > if (vq->log_ctx) > > > eventfd_signal(vq->log_ctx, 1); > > > } > > > diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h > > > index 466ef7542291..1b675dad5e05 100644 > > > --- a/drivers/vhost/vhost.h > > > +++ b/drivers/vhost/vhost.h > > > @@ -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); > > > -- > > > 2.17.1
On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: >> Just to make sure I understand this. It looks to me we should: >> >> - allow passing GIOVA->GPA through UAPI >> >> - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for >> performance >> >> Is this what you suggest? >> >> Thanks > Not really. We already have GPA->HVA, so I suggested a flag to pass > GIOVA->GPA in the IOTLB. > > This has advantages for security since a single table needs > then to be validated to ensure guest does not corrupt > QEMU memory. > I wonder how much we can gain through this. Currently, qemu IOMMU gives GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass GIOVA->HVA to vhost. It looks no difference to me. Thanks
On Fri, Dec 14, 2018 at 10:43:03AM +0800, Jason Wang wrote: > > On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: > > > Just to make sure I understand this. It looks to me we should: > > > > > > - allow passing GIOVA->GPA through UAPI > > > > > > - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for > > > performance > > > > > > Is this what you suggest? > > > > > > Thanks > > Not really. We already have GPA->HVA, so I suggested a flag to pass > > GIOVA->GPA in the IOTLB. > > > > This has advantages for security since a single table needs > > then to be validated to ensure guest does not corrupt > > QEMU memory. > > > > I wonder how much we can gain through this. Currently, qemu IOMMU gives > GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass > GIOVA->HVA to vhost. It looks no difference to me. > > Thanks The difference is in security not in performance. Getting a bad HVA corrupts QEMU memory and it might be guest controlled. Very risky. If translations to HVA are done in a single place through a single table it's safer as there's a single risky place.
On 2018/12/14 下午9:20, Michael S. Tsirkin wrote: > On Fri, Dec 14, 2018 at 10:43:03AM +0800, Jason Wang wrote: >> On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: >>>> Just to make sure I understand this. It looks to me we should: >>>> >>>> - allow passing GIOVA->GPA through UAPI >>>> >>>> - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for >>>> performance >>>> >>>> Is this what you suggest? >>>> >>>> Thanks >>> Not really. We already have GPA->HVA, so I suggested a flag to pass >>> GIOVA->GPA in the IOTLB. >>> >>> This has advantages for security since a single table needs >>> then to be validated to ensure guest does not corrupt >>> QEMU memory. >>> >> I wonder how much we can gain through this. Currently, qemu IOMMU gives >> GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass >> GIOVA->HVA to vhost. It looks no difference to me. >> >> Thanks > The difference is in security not in performance. Getting a bad HVA > corrupts QEMU memory and it might be guest controlled. Very risky. How can this be controlled by guest? HVA was generated from qemu ram blocks which is totally under the control of qemu memory core instead of guest. Thanks > If > translations to HVA are done in a single place through a single table > it's safer as there's a single risky place. >
On Mon, Dec 24, 2018 at 11:43:31AM +0800, Jason Wang wrote: > > On 2018/12/14 下午9:20, Michael S. Tsirkin wrote: > > On Fri, Dec 14, 2018 at 10:43:03AM +0800, Jason Wang wrote: > > > On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: > > > > > Just to make sure I understand this. It looks to me we should: > > > > > > > > > > - allow passing GIOVA->GPA through UAPI > > > > > > > > > > - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for > > > > > performance > > > > > > > > > > Is this what you suggest? > > > > > > > > > > Thanks > > > > Not really. We already have GPA->HVA, so I suggested a flag to pass > > > > GIOVA->GPA in the IOTLB. > > > > > > > > This has advantages for security since a single table needs > > > > then to be validated to ensure guest does not corrupt > > > > QEMU memory. > > > > > > > I wonder how much we can gain through this. Currently, qemu IOMMU gives > > > GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass > > > GIOVA->HVA to vhost. It looks no difference to me. > > > > > > Thanks > > The difference is in security not in performance. Getting a bad HVA > > corrupts QEMU memory and it might be guest controlled. Very risky. > > > How can this be controlled by guest? HVA was generated from qemu ram blocks > which is totally under the control of qemu memory core instead of guest. > > > Thanks It is ultimately under guest influence as guest supplies IOVA->GPA translations. qemu translates GPA->HVA and gives the translated result to the kernel. If it's not buggy and kernel isn't buggy it's all fine. But that's the approach that was proven not to work in the 20th century. In the 21st century we are trying defence in depth approach. My point is that a single code path that is responsible for the HVA translations is better than two. > > > If > > translations to HVA are done in a single place through a single table > > it's safer as there's a single risky place. > >
On 2018/12/25 上午1:41, Michael S. Tsirkin wrote: > On Mon, Dec 24, 2018 at 11:43:31AM +0800, Jason Wang wrote: >> On 2018/12/14 下午9:20, Michael S. Tsirkin wrote: >>> On Fri, Dec 14, 2018 at 10:43:03AM +0800, Jason Wang wrote: >>>> On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: >>>>>> Just to make sure I understand this. It looks to me we should: >>>>>> >>>>>> - allow passing GIOVA->GPA through UAPI >>>>>> >>>>>> - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for >>>>>> performance >>>>>> >>>>>> Is this what you suggest? >>>>>> >>>>>> Thanks >>>>> Not really. We already have GPA->HVA, so I suggested a flag to pass >>>>> GIOVA->GPA in the IOTLB. >>>>> >>>>> This has advantages for security since a single table needs >>>>> then to be validated to ensure guest does not corrupt >>>>> QEMU memory. >>>>> >>>> I wonder how much we can gain through this. Currently, qemu IOMMU gives >>>> GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass >>>> GIOVA->HVA to vhost. It looks no difference to me. >>>> >>>> Thanks >>> The difference is in security not in performance. Getting a bad HVA >>> corrupts QEMU memory and it might be guest controlled. Very risky. >> How can this be controlled by guest? HVA was generated from qemu ram blocks >> which is totally under the control of qemu memory core instead of guest. >> >> >> Thanks > It is ultimately under guest influence as guest supplies IOVA->GPA > translations. qemu translates GPA->HVA and gives the translated result > to the kernel. If it's not buggy and kernel isn't buggy it's all > fine. If qemu provides buggy GPA->HVA, we can't workaround this. And I don't get the point why we even want to try this. Buggy qemu code can crash itself in many ways. > > But that's the approach that was proven not to work in the 20th century. > In the 21st century we are trying defence in depth approach. > > My point is that a single code path that is responsible for > the HVA translations is better than two. > So the difference whether or not use memory table information: Current: 1) SET_MEM_TABLE: GPA->HVA 2) Qemu GIOVA->GPA 3) Qemu GPA->HVA 4) IOTLB_UPDATE: GIOVA->HVA If I understand correctly you want to drop step 3 consider it might be buggy which is just 19 lines of code in qemu (vhost_memory_region_lookup()). This will ends up: 1) Do GPA->HVA translation in IOTLB_UPDATE path (I believe we won't want to do it during device IOTLB lookup). 2) Extra bits to enable this capability. So this looks need more codes in kernel than what qemu did in userspace. Is this really worthwhile? Thanks
On Tue, Dec 25, 2018 at 05:43:25PM +0800, Jason Wang wrote: > > On 2018/12/25 上午1:41, Michael S. Tsirkin wrote: > > On Mon, Dec 24, 2018 at 11:43:31AM +0800, Jason Wang wrote: > > > On 2018/12/14 下午9:20, Michael S. Tsirkin wrote: > > > > On Fri, Dec 14, 2018 at 10:43:03AM +0800, Jason Wang wrote: > > > > > On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: > > > > > > > Just to make sure I understand this. It looks to me we should: > > > > > > > > > > > > > > - allow passing GIOVA->GPA through UAPI > > > > > > > > > > > > > > - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for > > > > > > > performance > > > > > > > > > > > > > > Is this what you suggest? > > > > > > > > > > > > > > Thanks > > > > > > Not really. We already have GPA->HVA, so I suggested a flag to pass > > > > > > GIOVA->GPA in the IOTLB. > > > > > > > > > > > > This has advantages for security since a single table needs > > > > > > then to be validated to ensure guest does not corrupt > > > > > > QEMU memory. > > > > > > > > > > > I wonder how much we can gain through this. Currently, qemu IOMMU gives > > > > > GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass > > > > > GIOVA->HVA to vhost. It looks no difference to me. > > > > > > > > > > Thanks > > > > The difference is in security not in performance. Getting a bad HVA > > > > corrupts QEMU memory and it might be guest controlled. Very risky. > > > How can this be controlled by guest? HVA was generated from qemu ram blocks > > > which is totally under the control of qemu memory core instead of guest. > > > > > > > > > Thanks > > It is ultimately under guest influence as guest supplies IOVA->GPA > > translations. qemu translates GPA->HVA and gives the translated result > > to the kernel. If it's not buggy and kernel isn't buggy it's all > > fine. > > > If qemu provides buggy GPA->HVA, we can't workaround this. And I don't get > the point why we even want to try this. Buggy qemu code can crash itself in > many ways. > > > > > > But that's the approach that was proven not to work in the 20th century. > > In the 21st century we are trying defence in depth approach. > > > > My point is that a single code path that is responsible for > > the HVA translations is better than two. > > > > So the difference whether or not use memory table information: > > Current: > > 1) SET_MEM_TABLE: GPA->HVA > > 2) Qemu GIOVA->GPA > > 3) Qemu GPA->HVA > > 4) IOTLB_UPDATE: GIOVA->HVA > > If I understand correctly you want to drop step 3 consider it might be buggy > which is just 19 lines of code in qemu (vhost_memory_region_lookup()). This > will ends up: > > 1) Do GPA->HVA translation in IOTLB_UPDATE path (I believe we won't want to > do it during device IOTLB lookup). > > 2) Extra bits to enable this capability. > > So this looks need more codes in kernel than what qemu did in userspace. Is > this really worthwhile? > > Thanks So there are several points I would like to make 1. At the moment without an iommu it is possible to change GPA-HVA mappings and everything keeps working because a change in memory tables flushes the rings. However I don't see the iotlb cache being invalidated on that path - did I miss it? If it is not there it's a related minor bug. 2. qemu already has a GPA. Discarding it and re-calculating when logging is on just seems wrong. However if you would like to *also* keep the HVA in the iotlb to avoid doing extra translations, that sounds like a reasonable optimization. 3. it also means that the hva->gpa translation only runs when logging is enabled. That is a rarely excercised path so any bugs there will not be caught. So I really would like us long term to move away from hva->gpa translations, keep them for legacy userspace only but I don't really mind how we do it. How about - a new flag to pass an iotlb with *both* a gpa and hva - for legacy userspace, calculate the gpa on iotlb update so the device then uses a shared code path what do you think?
On 2018/12/26 上午12:25, Michael S. Tsirkin wrote: > On Tue, Dec 25, 2018 at 05:43:25PM +0800, Jason Wang wrote: >> On 2018/12/25 上午1:41, Michael S. Tsirkin wrote: >>> On Mon, Dec 24, 2018 at 11:43:31AM +0800, Jason Wang wrote: >>>> On 2018/12/14 下午9:20, Michael S. Tsirkin wrote: >>>>> On Fri, Dec 14, 2018 at 10:43:03AM +0800, Jason Wang wrote: >>>>>> On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: >>>>>>>> Just to make sure I understand this. It looks to me we should: >>>>>>>> >>>>>>>> - allow passing GIOVA->GPA through UAPI >>>>>>>> >>>>>>>> - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for >>>>>>>> performance >>>>>>>> >>>>>>>> Is this what you suggest? >>>>>>>> >>>>>>>> Thanks >>>>>>> Not really. We already have GPA->HVA, so I suggested a flag to pass >>>>>>> GIOVA->GPA in the IOTLB. >>>>>>> >>>>>>> This has advantages for security since a single table needs >>>>>>> then to be validated to ensure guest does not corrupt >>>>>>> QEMU memory. >>>>>>> >>>>>> I wonder how much we can gain through this. Currently, qemu IOMMU gives >>>>>> GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass >>>>>> GIOVA->HVA to vhost. It looks no difference to me. >>>>>> >>>>>> Thanks >>>>> The difference is in security not in performance. Getting a bad HVA >>>>> corrupts QEMU memory and it might be guest controlled. Very risky. >>>> How can this be controlled by guest? HVA was generated from qemu ram blocks >>>> which is totally under the control of qemu memory core instead of guest. >>>> >>>> >>>> Thanks >>> It is ultimately under guest influence as guest supplies IOVA->GPA >>> translations. qemu translates GPA->HVA and gives the translated result >>> to the kernel. If it's not buggy and kernel isn't buggy it's all >>> fine. >> >> If qemu provides buggy GPA->HVA, we can't workaround this. And I don't get >> the point why we even want to try this. Buggy qemu code can crash itself in >> many ways. >> >> >>> But that's the approach that was proven not to work in the 20th century. >>> In the 21st century we are trying defence in depth approach. >>> >>> My point is that a single code path that is responsible for >>> the HVA translations is better than two. >>> >> So the difference whether or not use memory table information: >> >> Current: >> >> 1) SET_MEM_TABLE: GPA->HVA >> >> 2) Qemu GIOVA->GPA >> >> 3) Qemu GPA->HVA >> >> 4) IOTLB_UPDATE: GIOVA->HVA >> >> If I understand correctly you want to drop step 3 consider it might be buggy >> which is just 19 lines of code in qemu (vhost_memory_region_lookup()). This >> will ends up: >> >> 1) Do GPA->HVA translation in IOTLB_UPDATE path (I believe we won't want to >> do it during device IOTLB lookup). >> >> 2) Extra bits to enable this capability. >> >> So this looks need more codes in kernel than what qemu did in userspace. Is >> this really worthwhile? >> >> Thanks > So there are several points I would like to make > > 1. At the moment without an iommu it is possible to > change GPA-HVA mappings and everything keeps working > because a change in memory tables flushes the rings. Interesting, I don't know this before. But when can this happen? > However I don't see the iotlb cache being invalidated > on that path - did I miss it? If it is not there it's > a related minor bug. It might have a bug. But a question is consider the case without IOMMU. We only update mem table (SET_MEM_TABLE), but not vring address. This looks like a bug as well? > > 2. qemu already has a GPA. Discarding it and re-calculating > when logging is on just seems wrong. > However if you would like to *also* keep the HVA in the iotlb > to avoid doing extra translations, that sounds like a > reasonable optimization. Yes, traverse GPA->HVA mapping seems unnecessary. > > 3. it also means that the hva->gpa translation only runs > when logging is enabled. That is a rarely excercised > path so any bugs there will not be caught. I wonder maybe some kind of unit-test may help here. > > So I really would like us long term to move away from > hva->gpa translations, keep them for legacy userspace only > but I don't really mind how we do it. > > How about > - a new flag to pass an iotlb with *both* a gpa and hva > - for legacy userspace, calculate the gpa on iotlb update > so the device then uses a shared code path > > what do you think? > > I don't object this idea so I can try, just want to figure out why it was a must. Thanks
On Wed, Dec 26, 2018 at 01:43:26PM +0800, Jason Wang wrote: > > On 2018/12/26 上午12:25, Michael S. Tsirkin wrote: > > On Tue, Dec 25, 2018 at 05:43:25PM +0800, Jason Wang wrote: > > > On 2018/12/25 上午1:41, Michael S. Tsirkin wrote: > > > > On Mon, Dec 24, 2018 at 11:43:31AM +0800, Jason Wang wrote: > > > > > On 2018/12/14 下午9:20, Michael S. Tsirkin wrote: > > > > > > On Fri, Dec 14, 2018 at 10:43:03AM +0800, Jason Wang wrote: > > > > > > > On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: > > > > > > > > > Just to make sure I understand this. It looks to me we should: > > > > > > > > > > > > > > > > > > - allow passing GIOVA->GPA through UAPI > > > > > > > > > > > > > > > > > > - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for > > > > > > > > > performance > > > > > > > > > > > > > > > > > > Is this what you suggest? > > > > > > > > > > > > > > > > > > Thanks > > > > > > > > Not really. We already have GPA->HVA, so I suggested a flag to pass > > > > > > > > GIOVA->GPA in the IOTLB. > > > > > > > > > > > > > > > > This has advantages for security since a single table needs > > > > > > > > then to be validated to ensure guest does not corrupt > > > > > > > > QEMU memory. > > > > > > > > > > > > > > > I wonder how much we can gain through this. Currently, qemu IOMMU gives > > > > > > > GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass > > > > > > > GIOVA->HVA to vhost. It looks no difference to me. > > > > > > > > > > > > > > Thanks > > > > > > The difference is in security not in performance. Getting a bad HVA > > > > > > corrupts QEMU memory and it might be guest controlled. Very risky. > > > > > How can this be controlled by guest? HVA was generated from qemu ram blocks > > > > > which is totally under the control of qemu memory core instead of guest. > > > > > > > > > > > > > > > Thanks > > > > It is ultimately under guest influence as guest supplies IOVA->GPA > > > > translations. qemu translates GPA->HVA and gives the translated result > > > > to the kernel. If it's not buggy and kernel isn't buggy it's all > > > > fine. > > > > > > If qemu provides buggy GPA->HVA, we can't workaround this. And I don't get > > > the point why we even want to try this. Buggy qemu code can crash itself in > > > many ways. > > > > > > > > > > But that's the approach that was proven not to work in the 20th century. > > > > In the 21st century we are trying defence in depth approach. > > > > > > > > My point is that a single code path that is responsible for > > > > the HVA translations is better than two. > > > > > > > So the difference whether or not use memory table information: > > > > > > Current: > > > > > > 1) SET_MEM_TABLE: GPA->HVA > > > > > > 2) Qemu GIOVA->GPA > > > > > > 3) Qemu GPA->HVA > > > > > > 4) IOTLB_UPDATE: GIOVA->HVA > > > > > > If I understand correctly you want to drop step 3 consider it might be buggy > > > which is just 19 lines of code in qemu (vhost_memory_region_lookup()). This > > > will ends up: > > > > > > 1) Do GPA->HVA translation in IOTLB_UPDATE path (I believe we won't want to > > > do it during device IOTLB lookup). > > > > > > 2) Extra bits to enable this capability. > > > > > > So this looks need more codes in kernel than what qemu did in userspace. Is > > > this really worthwhile? > > > > > > Thanks > > So there are several points I would like to make > > > > 1. At the moment without an iommu it is possible to > > change GPA-HVA mappings and everything keeps working > > because a change in memory tables flushes the rings. > > > Interesting, I don't know this before. But when can this happen? It doesn't happen with existing qemu. But it seems like a valid thing to do to remap memory at a different address. > > > However I don't see the iotlb cache being invalidated > > on that path - did I miss it? If it is not there it's > > a related minor bug. > > > It might have a bug. But a question is consider the case without IOMMU. We > only update mem table (SET_MEM_TABLE), but not vring address. This looks > like a bug as well? I think that without an iommu it can only work without races if backend is stopped or if the vring isn't in guest memory with ring aliasing). > > > > > 2. qemu already has a GPA. Discarding it and re-calculating > > when logging is on just seems wrong. > > However if you would like to *also* keep the HVA in the iotlb > > to avoid doing extra translations, that sounds like a > > reasonable optimization. > > > Yes, traverse GPA->HVA mapping seems unnecessary. > > > > > > 3. it also means that the hva->gpa translation only runs > > when logging is enabled. That is a rarely excercised > > path so any bugs there will not be caught. > > > I wonder maybe some kind of unit-test may help here. > > > > > > So I really would like us long term to move away from > > hva->gpa translations, keep them for legacy userspace only > > but I don't really mind how we do it. > > > > How about > > - a new flag to pass an iotlb with *both* a gpa and hva > > - for legacy userspace, calculate the gpa on iotlb update > > so the device then uses a shared code path > > > > what do you think? > > > > > > I don't object this idea so I can try, just want to figure out why it was a > must. > > Thanks Not a must but I think it's a good interface extension.
On 2018/12/26 下午9:46, Michael S. Tsirkin wrote: > On Wed, Dec 26, 2018 at 01:43:26PM +0800, Jason Wang wrote: >> On 2018/12/26 上午12:25, Michael S. Tsirkin wrote: >>> On Tue, Dec 25, 2018 at 05:43:25PM +0800, Jason Wang wrote: >>>> On 2018/12/25 上午1:41, Michael S. Tsirkin wrote: >>>>> On Mon, Dec 24, 2018 at 11:43:31AM +0800, Jason Wang wrote: >>>>>> On 2018/12/14 下午9:20, Michael S. Tsirkin wrote: >>>>>>> On Fri, Dec 14, 2018 at 10:43:03AM +0800, Jason Wang wrote: >>>>>>>> On 2018/12/13 下午10:31, Michael S. Tsirkin wrote: >>>>>>>>>> Just to make sure I understand this. It looks to me we should: >>>>>>>>>> >>>>>>>>>> - allow passing GIOVA->GPA through UAPI >>>>>>>>>> >>>>>>>>>> - cache GIOVA->GPA somewhere but still use GIOVA->HVA in device IOTLB for >>>>>>>>>> performance >>>>>>>>>> >>>>>>>>>> Is this what you suggest? >>>>>>>>>> >>>>>>>>>> Thanks >>>>>>>>> Not really. We already have GPA->HVA, so I suggested a flag to pass >>>>>>>>> GIOVA->GPA in the IOTLB. >>>>>>>>> >>>>>>>>> This has advantages for security since a single table needs >>>>>>>>> then to be validated to ensure guest does not corrupt >>>>>>>>> QEMU memory. >>>>>>>>> >>>>>>>> I wonder how much we can gain through this. Currently, qemu IOMMU gives >>>>>>>> GIOVA->GPA mapping, and qemu vhost code will translate GPA to HVA then pass >>>>>>>> GIOVA->HVA to vhost. It looks no difference to me. >>>>>>>> >>>>>>>> Thanks >>>>>>> The difference is in security not in performance. Getting a bad HVA >>>>>>> corrupts QEMU memory and it might be guest controlled. Very risky. >>>>>> How can this be controlled by guest? HVA was generated from qemu ram blocks >>>>>> which is totally under the control of qemu memory core instead of guest. >>>>>> >>>>>> >>>>>> Thanks >>>>> It is ultimately under guest influence as guest supplies IOVA->GPA >>>>> translations. qemu translates GPA->HVA and gives the translated result >>>>> to the kernel. If it's not buggy and kernel isn't buggy it's all >>>>> fine. >>>> If qemu provides buggy GPA->HVA, we can't workaround this. And I don't get >>>> the point why we even want to try this. Buggy qemu code can crash itself in >>>> many ways. >>>> >>>> >>>>> But that's the approach that was proven not to work in the 20th century. >>>>> In the 21st century we are trying defence in depth approach. >>>>> >>>>> My point is that a single code path that is responsible for >>>>> the HVA translations is better than two. >>>>> >>>> So the difference whether or not use memory table information: >>>> >>>> Current: >>>> >>>> 1) SET_MEM_TABLE: GPA->HVA >>>> >>>> 2) Qemu GIOVA->GPA >>>> >>>> 3) Qemu GPA->HVA >>>> >>>> 4) IOTLB_UPDATE: GIOVA->HVA >>>> >>>> If I understand correctly you want to drop step 3 consider it might be buggy >>>> which is just 19 lines of code in qemu (vhost_memory_region_lookup()). This >>>> will ends up: >>>> >>>> 1) Do GPA->HVA translation in IOTLB_UPDATE path (I believe we won't want to >>>> do it during device IOTLB lookup). >>>> >>>> 2) Extra bits to enable this capability. >>>> >>>> So this looks need more codes in kernel than what qemu did in userspace. Is >>>> this really worthwhile? >>>> >>>> Thanks >>> So there are several points I would like to make >>> >>> 1. At the moment without an iommu it is possible to >>> change GPA-HVA mappings and everything keeps working >>> because a change in memory tables flushes the rings. >> >> Interesting, I don't know this before. But when can this happen? > > It doesn't happen with existing qemu. But it seems like a valid > thing to do to remap memory at a different address. > Ok. >>> However I don't see the iotlb cache being invalidated >>> on that path - did I miss it? If it is not there it's >>> a related minor bug. >> >> It might have a bug. But a question is consider the case without IOMMU. We >> only update mem table (SET_MEM_TABLE), but not vring address. This looks >> like a bug as well? > I think that without an iommu it can only work without races if backend is > stopped or if the vring isn't in guest memory with ring aliasing). Right. > >>> 2. qemu already has a GPA. Discarding it and re-calculating >>> when logging is on just seems wrong. >>> However if you would like to *also* keep the HVA in the iotlb >>> to avoid doing extra translations, that sounds like a >>> reasonable optimization. >> >> Yes, traverse GPA->HVA mapping seems unnecessary. >> >> >>> 3. it also means that the hva->gpa translation only runs >>> when logging is enabled. That is a rarely excercised >>> path so any bugs there will not be caught. >> >> I wonder maybe some kind of unit-test may help here. >> >> >>> So I really would like us long term to move away from >>> hva->gpa translations, keep them for legacy userspace only >>> but I don't really mind how we do it. >>> >>> How about >>> - a new flag to pass an iotlb with *both* a gpa and hva >>> - for legacy userspace, calculate the gpa on iotlb update >>> so the device then uses a shared code path >>> >>> what do you think? >>> >>> >> I don't object this idea so I can try, just want to figure out why it was a >> must. >> >> Thanks > Not a must but I think it's a good interface extension. > Ok. let me try to do this. Thanks
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index ad7a6f475a44..784df2b49628 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1192,7 +1192,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); diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 55e5aa662ad5..3660310604fd 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1733,11 +1733,67 @@ 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 gpa; + int r; + bool hit = false; + + list_for_each_entry(u, &umem->umem_list, link) { + if (u->userspace_addr < hva && + u->userspace_addr + u->size >= + hva + len) { + gpa = u->start + hva - u->userspace_addr; + r = log_write(vq->log_base, gpa, len); + if (r < 0) + return r; + hit = true; + } + } + + /* No reverse mapping, should be a bug */ + WARN_ON(!hit); + return 0; +} + +static void log_used(struct vhost_virtqueue *vq, u64 used_offset, u64 len) +{ + struct iovec iov[64]; + int i, ret; + + if (!vq->iotlb) { + log_write(vq->log_base, vq->log_addr + used_offset, len); + return; + } + + ret = translate_desc(vq, (u64)(uintptr_t)vq->used + used_offset, + len, iov, 64, VHOST_ACCESS_WO); + WARN_ON(ret < 0); + + for (i = 0; i < ret; i++) { + ret = log_write_hva(vq, (u64)(uintptr_t)iov[i].iov_base, + iov[i].iov_len); + WARN_ON(ret); + } +} + 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; + if (vq->iotlb) { + for (i = 0; i < count; i++) { + r = log_write_hva(vq, (u64)(uintptr_t)iov[i].iov_base, + iov[i].iov_len); + if (r < 0) + return r; + } + return 0; + } + /* Make sure data written is seen before log. */ smp_wmb(); for (i = 0; i < log_num; ++i) { @@ -1769,9 +1825,8 @@ 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), - sizeof vq->used->flags); + log_used(vq, (used - (void __user *)vq->used), + sizeof vq->used->flags); if (vq->log_ctx) eventfd_signal(vq->log_ctx, 1); } @@ -1789,9 +1844,8 @@ 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), - sizeof *vhost_avail_event(vq)); + log_used(vq, (used - (void __user *)vq->used), + sizeof *vhost_avail_event(vq)); if (vq->log_ctx) eventfd_signal(vq->log_ctx, 1); } @@ -2191,10 +2245,8 @@ 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), - count * sizeof *used); + log_used(vq, ((void __user *)used - (void __user *)vq->used), + count * sizeof *used); } old = vq->last_used_idx; new = (vq->last_used_idx += count); @@ -2236,9 +2288,8 @@ 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), - sizeof vq->used->idx); + log_used(vq, offsetof(struct vring_used, idx), + sizeof vq->used->idx); if (vq->log_ctx) eventfd_signal(vq->log_ctx, 1); } diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 466ef7542291..1b675dad5e05 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -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);
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: 6b1e6cc7855b ("vhost: new device IOTLB API") Reported-by: Jintack Lim <jintack@cs.columbia.edu> Cc: Jintack Lim <jintack@cs.columbia.edu> Signed-off-by: Jason Wang <jasowang@redhat.com> --- drivers/vhost/net.c | 3 +- drivers/vhost/vhost.c | 79 +++++++++++++++++++++++++++++++++++-------- drivers/vhost/vhost.h | 3 +- 3 files changed, 69 insertions(+), 16 deletions(-)