Re: [PATCH v2] virtio/test: fix up after IOTLB changes

[Jason Wang <jasowang@xxxxxxxxxx>]

On 2020/4/2 下午8:55, Michael S. Tsirkin wrote:
> 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 userspace builds.
>
> Cc: Jason Wang <jasowang@xxxxxxxxxx>
> Cc: Eugenio Pérez <eperezma@xxxxxxxxxx>
> Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
> ---
>
> changes from v1:
> 	use IS_REACHEABLE to fix error reported by build bot


Acked-by: Jason Wang <jasowang@xxxxxxxxxx>



>   drivers/vhost/test.c              | 4 ++--
>   drivers/vhost/vringh.c            | 5 +++++
>   include/linux/vringh.h            | 6 ++++++
>   tools/virtio/Makefile             | 5 +++--
>   tools/virtio/generated/autoconf.h | 0
>   5 files changed, 16 insertions(+), 4 deletions(-)
>   create mode 100644 tools/virtio/generated/autoconf.h
>
> diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
> index 394e2e5c772d..9a3a09005e03 100644
> --- a/drivers/vhost/test.c
> +++ b/drivers/vhost/test.c
> @@ -120,7 +120,7 @@ static int vhost_test_open(struct inode *inode, struct file *f)
>   	vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
>   	n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
>   	vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, UIO_MAXIOV,
> -		       VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT);
> +		       VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT, NULL);
>   
>   	f->private_data = n;
>   
> @@ -225,7 +225,7 @@ static long vhost_test_reset_owner(struct vhost_test *n)
>   {
>   	void *priv = NULL;
>   	long err;
> -	struct vhost_umem *umem;
> +	struct vhost_iotlb *umem;
>   
>   	mutex_lock(&n->dev.mutex);
>   	err = vhost_dev_check_owner(&n->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)
>   }
>   EXPORT_SYMBOL(vringh_need_notify_kern);
>   
> +#if IS_REACHABLE(CONFIG_VHOST_IOTLB)
> +
>   static int iotlb_translate(const struct vringh *vrh,
>   			   u64 addr, u64 len, struct bio_vec iov[],
>   			   int iov_size, u32 perm)
> @@ -1416,5 +1420,6 @@ int vringh_need_notify_iotlb(struct vringh *vrh)
>   }
>   EXPORT_SYMBOL(vringh_need_notify_iotlb);
>   
> +#endif
>   
>   MODULE_LICENSE("GPL");
> diff --git a/include/linux/vringh.h b/include/linux/vringh.h
> index bd0503ca6f8f..9e2763d7c159 100644
> --- a/include/linux/vringh.h
> +++ b/include/linux/vringh.h
> @@ -14,8 +14,10 @@
>   #include <linux/virtio_byteorder.h>
>   #include <linux/uio.h>
>   #include <linux/slab.h>
> +#if IS_REACHABLE(CONFIG_VHOST_IOTLB)
>   #include <linux/dma-direction.h>
>   #include <linux/vhost_iotlb.h>
> +#endif
>   #include <asm/barrier.h>
>   
>   /* virtio_ring with information needed for host access. */
> @@ -254,6 +256,8 @@ static inline __virtio64 cpu_to_vringh64(const struct vringh *vrh, u64 val)
>   	return __cpu_to_virtio64(vringh_is_little_endian(vrh), val);
>   }
>   
> +#if IS_REACHABLE(CONFIG_VHOST_IOTLB)
> +
>   void vringh_set_iotlb(struct vringh *vrh, struct vhost_iotlb *iotlb);
>   
>   int vringh_init_iotlb(struct vringh *vrh, u64 features,
> @@ -284,4 +288,6 @@ void vringh_notify_disable_iotlb(struct vringh *vrh);
>   
>   int vringh_need_notify_iotlb(struct vringh *vrh);
>   
> +#endif /* CONFIG_VHOST_IOTLB */
> +
>   #endif /* _LINUX_VRINGH_H */
> diff --git a/tools/virtio/Makefile b/tools/virtio/Makefile
> index f33f32f1d208..b587b9a7a124 100644
> --- a/tools/virtio/Makefile
> +++ b/tools/virtio/Makefile
> @@ -4,7 +4,7 @@ test: virtio_test vringh_test
>   virtio_test: virtio_ring.o virtio_test.o
>   vringh_test: vringh_test.o vringh.o virtio_ring.o
>   
> -CFLAGS += -g -O2 -Werror -Wall -I. -I../include/ -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE
> +CFLAGS += -g -O2 -Werror -Wall -I. -I../include/ -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE -include ../../include/linux/kconfig.h
>   vpath %.c ../../drivers/virtio ../../drivers/vhost
>   mod:
>   	${MAKE} -C `pwd`/../.. M=`pwd`/vhost_test V=${V}
> @@ -22,7 +22,8 @@ OOT_CONFIGS=\
>   	CONFIG_VHOST=m \
>   	CONFIG_VHOST_NET=n \
>   	CONFIG_VHOST_SCSI=n \
> -	CONFIG_VHOST_VSOCK=n
> +	CONFIG_VHOST_VSOCK=n \
> +	CONFIG_VHOST_RING=n
>   OOT_BUILD=KCFLAGS="-I "${OOT_VHOST} ${MAKE} -C ${OOT_KSRC} V=${V}
>   oot-build:
>   	echo "UNSUPPORTED! Don't use the resulting modules in production!"
> diff --git a/tools/virtio/generated/autoconf.h b/tools/virtio/generated/autoconf.h
> new file mode 100644
> index 000000000000..e69de29bb2d1

_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/virtualization