virtio_ring: add a struct device forward declaration
PATCH v3 1/2 virtio_ring: add a struct device forward declaration
The virtio_ring header file uses the struct device without a forward declaration.
Signed-off-by Shunsuke Mie <[email protected]>
---
Changes from v2:
- Fix a typo of commit title
include/linux/virtio_ring.h | 1 + 1 file changed, 1 insertion(+)
include/linux/virtio_ring.h +1 -0
@@ -58,6 +58,7 @@ do { \struct virtio_device ;struct virtqueue ; +struct device ;/* * Creates a virtqueue and allocates the descriptor ring. If
Signature · 6 lines
2.25.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v3 2/2 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 <[email protected]>
---
Changes from v2:
- Remove an unnecessary change
- Correct indentations
- Retrieve the __user definition to prevent any unintended side effects
tools/include/linux/types.h | 5 +++++ tools/virtio/linux/compiler.h | 2 ++ tools/virtio/linux/kernel.h | 5 +---- tools/virtio/linux/uaccess.h | 11 ++--------- 4 files changed, 10 insertions(+), 13 deletions(-)
tools/include/linux/types.h +5 -0
@@ -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
tools/virtio/linux/compiler.h +2 -0
@@ -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))
tools/virtio/linux/kernel.h +1 -4
@@ -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
tools/virtio/linux/uaccess.h +2 -9
@@ -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 ; }
Signature · 1 line
2.25.1