search for: config_vhost_iotlb

...dev); diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c index ee0491f579ac..ba8e0d6cfd97 100644 --- a/drivers/vhost/vringh.c +++ b/drivers/vhost/vringh.c @@ -13,9 +13,11 @@ #include <linux/uaccess.h> #include <linux/slab.h> #include <linux/export.h> +#if IS_REACHABLE(CONFIG_VHOST_IOTLB) #include <linux/bvec.h> #include <linux/highmem.h> #include <linux/vhost_iotlb.h> +#endif #include <uapi/linux/virtio_config.h> static __printf(1,2) __cold void vringh_bad(const char *fmt, ...) @@ -1059,6 +1061,8 @@ int vringh_need_notify_kern(struct vringh *vrh) }...

...dev); diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c index ee0491f579ac..ba8e0d6cfd97 100644 --- a/drivers/vhost/vringh.c +++ b/drivers/vhost/vringh.c @@ -13,9 +13,11 @@ #include <linux/uaccess.h> #include <linux/slab.h> #include <linux/export.h> +#if IS_REACHABLE(CONFIG_VHOST_IOTLB) #include <linux/bvec.h> #include <linux/highmem.h> #include <linux/vhost_iotlb.h> +#endif #include <uapi/linux/virtio_config.h> static __printf(1,2) __cold void vringh_bad(const char *fmt, ...) @@ -1059,6 +1061,8 @@ int vringh_need_notify_kern(struct vringh *vrh) }...

During randconfig build testing, I ran into a configuration that has CONFIG_VHOST=m, CONFIG_VHOST_IOTLB=m and CONFIG_VHOST_RING=y, which makes the iotlb implementation left out from vhost_ring, and in turn leads to a link failure of the vdpa_sim module: ERROR: modpost: "vringh_set_iotlb" [drivers/vdpa/vdpa_sim/vdpa_sim.ko] undefined! ERROR: modpost: "vringh_init_iotlb" [drivers/v...

...> @@ -13,9 +13,11 @@ > > #include <linux/uaccess.h> > > #include <linux/slab.h> > > #include <linux/export.h> > > +#ifdef VHOST_IOTLB > > > Kbuild bot reports build issues with this. > > It looks to me we should use #if IS_ENABLED(CONFIG_VHOST_IOTLB) here and > following checks. > > Thanks > In fact IS_REACHEABLE is probably the right thing to do. > > > #include <linux/bvec.h> > > #include <linux/highmem.h> > > #include <linux/vhost_iotlb.h> > > +#endif > > #include &...

...set CONFIG_UIO_NETX=y CONFIG_UIO_PRUSS=y CONFIG_UIO_MF624=y CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=y CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_PCI is not set CONFIG_VIRTIO_VDPA=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VDPA=m CONFIG_VDPA_SIM=m CONFIG_IFCVF=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=y CONFIG_VHOST_MENU=y # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set # # Microsoft Hyper-V guest support # # end of Microsoft Hyper-V guest support CONFIG_GREYBUS=y # CONFIG_GREYBUS_ES2 is not set CONFIG_STAGING=y CONFIG_COMEDI=y # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_D...

...set CONFIG_UIO_NETX=y CONFIG_UIO_PRUSS=y CONFIG_UIO_MF624=y CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=y CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_PCI is not set CONFIG_VIRTIO_VDPA=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VDPA=m CONFIG_VDPA_SIM=m CONFIG_IFCVF=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=y CONFIG_VHOST_MENU=y # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set # # Microsoft Hyper-V guest support # # end of Microsoft Hyper-V guest support CONFIG_GREYBUS=y # CONFIG_GREYBUS_ES2 is not set CONFIG_STAGING=y CONFIG_COMEDI=y # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_D...

Allow building vringh without IOTLB (that's the case for userspace builds, will be useful for CAIF/VOD down the road too). Update for API tweaks. Don't include vringh with kernel builds. Cc: Jason Wang <jasowang at redhat.com> Cc: Eugenio P?rez <eperezma at redhat.com> Signed-off-by: Michael S. Tsirkin <mst at redhat.com> --- drivers/vhost/test.c | 4 ++--

Allow building vringh without IOTLB (that's the case for userspace builds, will be useful for CAIF/VOD down the road too). Update for API tweaks. Don't include vringh with kernel builds. Cc: Jason Wang <jasowang at redhat.com> Cc: Eugenio P?rez <eperezma at redhat.com> Signed-off-by: Michael S. Tsirkin <mst at redhat.com> --- drivers/vhost/test.c | 4 ++--

...m/vdpa_sim.ko] undefined! > ERROR: modpost: "vringh_complete_iotlb" [drivers/vdpa/vdpa_sim/vdpa_sim.ko] undefined! > ERROR: modpost: "vringh_getdesc_iotlb" [drivers/vdpa/vdpa_sim/vdpa_sim.ko] undefined! > > > Full randconfig file is attached. > The config has CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=y But we don't select VHOST_IOTLB in VHOST_RING after commit e6faeaa128417("vhost: drop vring dependency on iotlb"). Which seems wrong. Thanks

...t/vringh.c > +++ b/drivers/vhost/vringh.c > @@ -13,9 +13,11 @@ > #include <linux/uaccess.h> > #include <linux/slab.h> > #include <linux/export.h> > +#ifdef VHOST_IOTLB Kbuild bot reports build issues with this. It looks to me we should use #if IS_ENABLED(CONFIG_VHOST_IOTLB) here and following checks. Thanks > #include <linux/bvec.h> > #include <linux/highmem.h> > #include <linux/vhost_iotlb.h> > +#endif > #include <uapi/linux/virtio_config.h> > > static __printf(1,2) __cold void vringh_bad(const char *fmt,...

....notify = NULL; > } > diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c > index 0ba3ef809e48..72c88519329a 100644 > --- a/drivers/vhost/vringh.c > +++ b/drivers/vhost/vringh.c > @@ -1094,10 +1094,18 @@ EXPORT_SYMBOL(vringh_need_notify_kern); > > #if IS_REACHABLE(CONFIG_VHOST_IOTLB) > > +struct iotlb_vec { > + union { > + struct iovec *iovec; > + struct bio_vec *bvec; > + } iov; > + size_t count; > + bool is_iovec; I wonder if this is needed (if vringh is passed to every iotlb_vec helper). > +};...

...e, NULL, NULL, NULL); vq->vring.notify = NULL; } diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c index 0ba3ef809e48..72c88519329a 100644 --- a/drivers/vhost/vringh.c +++ b/drivers/vhost/vringh.c @@ -1094,10 +1094,18 @@ EXPORT_SYMBOL(vringh_need_notify_kern); #if IS_REACHABLE(CONFIG_VHOST_IOTLB) +struct iotlb_vec { + union { + struct iovec *iovec; + struct bio_vec *bvec; + } iov; + size_t count; + bool is_iovec; +}; + static int iotlb_translate(const struct vringh *vrh, u64 addr, u64 len, u64 *translated, - struct bio_vec iov[], - int iov_size, u32 perm) + struc...

On Wed, Apr 01, 2020 at 10:29:32PM +0800, Jason Wang wrote: > > On 2020/4/1 ??10:13, Michael S. Tsirkin wrote: > > On Wed, Apr 01, 2020 at 10:08:59PM +0800, Jason Wang wrote: > > > On 2020/4/1 ??9:22, Michael S. Tsirkin wrote: > > > > On Thu, Mar 26, 2020 at 10:01:17PM +0800, Jason Wang wrote: > > > > > Currently, CONFIG_VHOST depends on

...> > +++ b/drivers/vhost/Makefile > > @@ -10,6 +10,9 @@ vhost_vsock-y := vsock.o > > obj-$(CONFIG_VHOST_RING) += vringh.o > > +obj-$(CONFIG_VHOST_VDPA) += vhost_vdpa.o > > +vhost_vdpa-y := vdpa.o > > + > > obj-$(CONFIG_VHOST) += vhost.o > > obj-$(CONFIG_VHOST_IOTLB) += vhost_iotlb.o > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > new file mode 100644 > > index 000000000000..631d994d37ac > > --- /dev/null > > +++ b/drivers/vhost/vdpa.c > > @@ -0,0 +1,705 @@ > > +// SPDX-License-Identifier: GPL-2.0 >...

...host and vringh. diff --git a/drivers/vhost/Makefile b/drivers/vhost/Makefile index 6c6df24f770c..df99756fbb26 100644 --- a/drivers/vhost/Makefile +++ b/drivers/vhost/Makefile @@ -11,3 +11,5 @@ vhost_vsock-y := vsock.o obj-$(CONFIG_VHOST_RING) += vringh.o obj-$(CONFIG_VHOST) += vhost.o + +obj-$(CONFIG_VHOST_IOTLB) += vhost_iotlb.o diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index e158159671fa..e4a20d7a2921 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1594,7 +1594,7 @@ static long vhost_net_reset_owner(struct vhost_net *n) struct socket *tx_sock = NULL; struct socket *rx_sock...

.../vhost/Makefile > +++ b/drivers/vhost/Makefile > @@ -10,6 +10,9 @@ vhost_vsock-y := vsock.o > > obj-$(CONFIG_VHOST_RING) += vringh.o > > +obj-$(CONFIG_VHOST_VDPA) += vhost_vdpa.o > +vhost_vdpa-y := vdpa.o > + > obj-$(CONFIG_VHOST) += vhost.o > > obj-$(CONFIG_VHOST_IOTLB) += vhost_iotlb.o > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > new file mode 100644 > index 000000000000..631d994d37ac > --- /dev/null > +++ b/drivers/vhost/vdpa.c > @@ -0,0 +1,705 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2018-20...

.../vhost/Makefile > +++ b/drivers/vhost/Makefile > @@ -10,6 +10,9 @@ vhost_vsock-y := vsock.o > > obj-$(CONFIG_VHOST_RING) += vringh.o > > +obj-$(CONFIG_VHOST_VDPA) += vhost_vdpa.o > +vhost_vdpa-y := vdpa.o > + > obj-$(CONFIG_VHOST) += vhost.o > > obj-$(CONFIG_VHOST_IOTLB) += vhost_iotlb.o > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > new file mode 100644 > index 000000000000..631d994d37ac > --- /dev/null > +++ b/drivers/vhost/vdpa.c > @@ -0,0 +1,705 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2018-20...

This series adds support for the use of user virtual addresses in the vDPA simulator devices. The main reason for this change is to lift the pinning of all guest memory. Especially with virtio devices implemented in software. The next step would be to generalize the code in vdpa-sim to allow the implementation of in-kernel software devices. Similar to vhost, but using vDPA so we can reuse the

v2: - rebased on Linus' tree, commit ae3419fbac84 ("vc_screen: don't clobber return value in vcs_read") - removed `struct task_struct *owner` param (unused for now, maybe ?useful to support cgroups) [Jason] - add unbind_mm callback [Jason] - call the new unbind_mm callback during the release [Jason] - avoid to call bind_mm callback after the reset, since the device ?is not

This series adds support for the use of user virtual addresses in the vDPA simulator devices. The main reason for this change is to lift the pinning of all guest memory. Especially with virtio devices implemented in software. The next step would be to generalize the code in vdpa-sim to allow the implementation of in-kernel software devices. Similar to vhost, but using vDPA so we can reuse the