Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/virtio: fix build caused by virtio_ring changes

Browse Source 
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>
This commit is contained in:
Shunsuke Mie 2023-04-17 11:20:37 +09:00 committed by Michael S. Tsirkin
parent 38fc29ea75
commit e9c4962c5d
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/include/linux/types.h
View File

@ -49,7 +49,12 @@ typedef __s8 s8;
#endif #endif
#define __force #define __force
/* This is defined in linux/compiler_types.h and is left for backward
* compatibility.
*/
#ifndef __user
#define __user #define __user
#endif
#define __must_check #define __must_check
#define __cold #define __cold

2
tools/virtio/linux/compiler.h
View File

@ -2,6 +2,8 @@
#ifndef LINUX_COMPILER_H #ifndef LINUX_COMPILER_H
#define LINUX_COMPILER_H #define LINUX_COMPILER_H
#include "../../../include/linux/compiler_types.h"
#define WRITE_ONCE(var, val) \ #define WRITE_ONCE(var, val) \
(*((volatile typeof(val) *)(&(var))) = (val)) (*((volatile typeof(val) *)(&(var))) = (val))

5
tools/virtio/linux/kernel.h
View File

@ -10,6 +10,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include "../../../include/linux/container_of.h"
#include <linux/log2.h> #include <linux/log2.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/overflow.h> #include <linux/overflow.h>
@ -107,10 +108,6 @@ static inline void free_page(unsigned long addr)
free((void *)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 # ifndef likely
# define likely(x) (__builtin_expect(!!(x), 1)) # define likely(x) (__builtin_expect(!!(x), 1))
# endif # endif

11
tools/virtio/linux/uaccess.h
View File

@ -6,15 +6,10 @@
extern void *__user_addr_min, *__user_addr_max; 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) \ #define put_user(x, ptr) \
({ \ ({ \
typeof(ptr) __pu_ptr = (ptr); \ typeof(ptr) __pu_ptr = (ptr); \
__chk_user_ptr(__pu_ptr, sizeof(*__pu_ptr)); \ __chk_user_ptr(__pu_ptr); \
WRITE_ONCE(*(__pu_ptr), x); \ WRITE_ONCE(*(__pu_ptr), x); \
0; \ 0; \
}) })
@ -22,7 +17,7 @@ static inline void __chk_user_ptr(const volatile void *p, size_t size)
#define get_user(x, ptr) \ #define get_user(x, ptr) \
({ \ ({ \
typeof(ptr) __pu_ptr = (ptr); \ typeof(ptr) __pu_ptr = (ptr); \
__chk_user_ptr(__pu_ptr, sizeof(*__pu_ptr)); \ __chk_user_ptr(__pu_ptr); \
x = READ_ONCE(*(__pu_ptr)); \ x = READ_ONCE(*(__pu_ptr)); \
0; \ 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, static inline int copy_from_user(void *to, const void __user volatile *from,
unsigned long n) unsigned long n)
{ {
__chk_user_ptr(from, n);
volatile_memcpy(to, from, n); volatile_memcpy(to, from, n);
return 0; 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, static inline int copy_to_user(void __user volatile *to, const void *from,
unsigned long n) unsigned long n)
{ {
__chk_user_ptr(to, n);
volatile_memcpy(to, from, n); volatile_memcpy(to, from, n);
return 0; return 0;
} }