tools/virtio: fix build caused by virtio_ring changes

Fix the build dependency for virtio_test. The virtio_ring that is used from
the test requires container_of_const(). Change to use container_of.h kernel
header directly and adapt related codes.

Signed-off-by: Shunsuke Mie <mie@igel.co.jp>
Message-Id: <20230417022037.917668-2-mie@igel.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/tools/include/linux/types.h b/tools/include/linux/types.h
index 051fdeaf267073d669e3732488406693a004cfe2..8519386acd2391e6a1cfbb7c731515d10c997c0e 100644 (file)
--- a/tools/include/linux/types.h
+++ b/tools/include/linux/types.h
@@ -49,7 +49,12 @@ typedef __s8  s8;
 #endif
 
 #define __force
+/* This is defined in linux/compiler_types.h and is left for backward
+ * compatibility.
+ */
+#ifndef __user
 #define __user
+#endif
 #define __must_check
 #define __cold
 

diff --git a/tools/virtio/linux/compiler.h b/tools/virtio/linux/compiler.h
index 2c51bccb97bb27ee816e64644c41b4c00f967796..1f3a15b954b9cc8935c4536ba0015fbb240dcb65 100644 (file)
--- a/tools/virtio/linux/compiler.h
+++ b/tools/virtio/linux/compiler.h
@@ -2,6 +2,8 @@
 #ifndef LINUX_COMPILER_H
 #define LINUX_COMPILER_H
 
+#include "../../../include/linux/compiler_types.h"
+
 #define WRITE_ONCE(var, val) \
        (*((volatile typeof(val) *)(&(var))) = (val))
 

diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h
index 8b877167933d13df8dca2519c429cba395843cd6..6702008f7f5c69a6199755340785b3c0fc05d1f2 100644 (file)
--- a/tools/virtio/linux/kernel.h
+++ b/tools/virtio/linux/kernel.h
@@ -10,6 +10,7 @@
 #include <stdarg.h>
 
 #include <linux/compiler.h>
+#include "../../../include/linux/container_of.h"
 #include <linux/log2.h>
 #include <linux/types.h>
 #include <linux/overflow.h>
@@ -107,10 +108,6 @@ static inline void free_page(unsigned long addr)
        free((void *)addr);
 }
 
-#define container_of(ptr, type, member) ({                     \
-       const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
-       (type *)( (char *)__mptr - offsetof(type,member) );})
-
 # ifndef likely
 #  define likely(x)    (__builtin_expect(!!(x), 1))
 # endif

diff --git a/tools/virtio/linux/uaccess.h b/tools/virtio/linux/uaccess.h
index 991dfb2639987f23475f7cb261031ae5dedb3b39..f13828e0c4095b390010daeeb30ca77206d6a469 100644 (file)
--- a/tools/virtio/linux/uaccess.h
+++ b/tools/virtio/linux/uaccess.h
@@ -6,15 +6,10 @@
 
 extern void *__user_addr_min, *__user_addr_max;
 
-static inline void __chk_user_ptr(const volatile void *p, size_t size)
-{
-       assert(p >= __user_addr_min && p + size <= __user_addr_max);
-}
-
 #define put_user(x, ptr)                                       \
 ({                                                             \
        typeof(ptr) __pu_ptr = (ptr);                           \
-       __chk_user_ptr(__pu_ptr, sizeof(*__pu_ptr));            \
+       __chk_user_ptr(__pu_ptr);                               \
        WRITE_ONCE(*(__pu_ptr), x);                             \
        0;                                                      \
 })
@@ -22,7 +17,7 @@ static inline void __chk_user_ptr(const volatile void *p, size_t size)
 #define get_user(x, ptr)                                       \
 ({                                                             \
        typeof(ptr) __pu_ptr = (ptr);                           \
-       __chk_user_ptr(__pu_ptr, sizeof(*__pu_ptr));            \
+       __chk_user_ptr(__pu_ptr);                               \
        x = READ_ONCE(*(__pu_ptr));                             \
        0;                                                      \
 })
@@ -37,7 +32,6 @@ static void volatile_memcpy(volatile char *to, const volatile char *from,
 static inline int copy_from_user(void *to, const void __user volatile *from,
                                 unsigned long n)
 {
-       __chk_user_ptr(from, n);
        volatile_memcpy(to, from, n);
        return 0;
 }
@@ -45,7 +39,6 @@ static inline int copy_from_user(void *to, const void __user volatile *from,
 static inline int copy_to_user(void __user volatile *to, const void *from,
                               unsigned long n)
 {
-       __chk_user_ptr(to, n);
        volatile_memcpy(to, from, n);
        return 0;
 }