X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos.h;h=e47296801345d312249a277445e32bb42a6477a1;hb=07a2919d7a86607d42f5fb69f1f0ba98097d4d98;hp=f809a366ca35f354a2219dbb8497761f796f0f2b;hpb=c08ad04c17e63c275ff477b21460ed6fa3b493f9;p=fio.git diff --git a/os/os.h b/os/os.h index f809a366..e4729680 100644 --- a/os/os.h +++ b/os/os.h @@ -8,7 +8,8 @@ #include #include -#include "../arch/arch.h" +#include "../arch/arch.h" /* IWYU pragma: export */ +#include "../lib/types.h" enum { os_linux = 1, @@ -26,6 +27,11 @@ enum { os_nr, }; +typedef enum { + CPU_ARM64_CRC32C, +} cpu_features; + +/* IWYU pragma: begin_exports */ #if defined(__ANDROID__) #include "os-android.h" #elif defined(__linux__) @@ -59,14 +65,14 @@ typedef struct aiocb os_aiocb_t; #endif #endif -#ifdef FIO_HAVE_SGIO -#include -#include +#ifndef CONFIG_STRSEP +#include "../oslib/strsep.h" #endif -#ifndef CONFIG_STRSEP -#include "../lib/strsep.h" +#ifndef CONFIG_STRLCAT +#include "../oslib/strlcat.h" #endif +/* IWYU pragma: end_exports */ #ifdef MSG_DONTWAIT #define OS_MSG_DONTWAIT MSG_DONTWAIT @@ -76,10 +82,10 @@ typedef struct aiocb os_aiocb_t; #define POSIX_FADV_DONTNEED (0) #define POSIX_FADV_SEQUENTIAL (0) #define POSIX_FADV_RANDOM (0) +#define POSIX_FADV_NORMAL (0) #endif #ifndef FIO_HAVE_CPU_AFFINITY -#define fio_getaffinity(pid, mask) do { } while (0) #define fio_cpu_clear(mask, cpu) do { } while (0) typedef unsigned long os_cpu_mask_t; @@ -88,6 +94,11 @@ static inline int fio_setaffinity(int pid, os_cpu_mask_t cpumask) return 0; } +static inline int fio_getaffinity(int pid, os_cpu_mask_t *cpumask) +{ + return -1; +} + static inline int fio_cpuset_exit(os_cpu_mask_t *mask) { return -1; @@ -146,11 +157,11 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu); #endif #ifndef FIO_PREFERRED_ENGINE -#define FIO_PREFERRED_ENGINE "sync" +#define FIO_PREFERRED_ENGINE "psync" #endif #ifndef FIO_OS_PATH_SEPARATOR -#define FIO_OS_PATH_SEPARATOR "/" +#define FIO_OS_PATH_SEPARATOR '/' #endif #ifndef FIO_PREFERRED_CLOCK_SOURCE @@ -162,7 +173,7 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu); #endif #ifndef FIO_MAX_JOBS -#define FIO_MAX_JOBS 2048 +#define FIO_MAX_JOBS 4096 #endif #ifndef CONFIG_SOCKLEN_T @@ -199,16 +210,28 @@ static inline uint64_t fio_swap64(uint64_t val) #ifndef FIO_HAVE_BYTEORDER_FUNCS #ifdef CONFIG_LITTLE_ENDIAN +#define __be16_to_cpu(x) fio_swap16(x) +#define __be32_to_cpu(x) fio_swap32(x) +#define __be64_to_cpu(x) fio_swap64(x) #define __le16_to_cpu(x) (x) #define __le32_to_cpu(x) (x) #define __le64_to_cpu(x) (x) +#define __cpu_to_be16(x) fio_swap16(x) +#define __cpu_to_be32(x) fio_swap32(x) +#define __cpu_to_be64(x) fio_swap64(x) #define __cpu_to_le16(x) (x) #define __cpu_to_le32(x) (x) #define __cpu_to_le64(x) (x) #else +#define __be16_to_cpu(x) (x) +#define __be32_to_cpu(x) (x) +#define __be64_to_cpu(x) (x) #define __le16_to_cpu(x) fio_swap16(x) #define __le32_to_cpu(x) fio_swap32(x) #define __le64_to_cpu(x) fio_swap64(x) +#define __cpu_to_be16(x) (x) +#define __cpu_to_be32(x) (x) +#define __cpu_to_be64(x) (x) #define __cpu_to_le16(x) fio_swap16(x) #define __cpu_to_le32(x) fio_swap32(x) #define __cpu_to_le64(x) fio_swap64(x) @@ -216,6 +239,18 @@ static inline uint64_t fio_swap64(uint64_t val) #endif /* FIO_HAVE_BYTEORDER_FUNCS */ #ifdef FIO_INTERNAL +#define be16_to_cpu(val) ({ \ + typecheck(uint16_t, val); \ + __be16_to_cpu(val); \ +}) +#define be32_to_cpu(val) ({ \ + typecheck(uint32_t, val); \ + __be32_to_cpu(val); \ +}) +#define be64_to_cpu(val) ({ \ + typecheck(uint64_t, val); \ + __be64_to_cpu(val); \ +}) #define le16_to_cpu(val) ({ \ typecheck(uint16_t, val); \ __le16_to_cpu(val); \ @@ -230,6 +265,18 @@ static inline uint64_t fio_swap64(uint64_t val) }) #endif +#define cpu_to_be16(val) ({ \ + typecheck(uint16_t, val); \ + __cpu_to_be16(val); \ +}) +#define cpu_to_be32(val) ({ \ + typecheck(uint32_t, val); \ + __cpu_to_be32(val); \ +}) +#define cpu_to_be64(val) ({ \ + typecheck(uint64_t, val); \ + __cpu_to_be64(val); \ +}) #define cpu_to_le16(val) ({ \ typecheck(uint16_t, val); \ __cpu_to_le16(val); \ @@ -243,19 +290,6 @@ static inline uint64_t fio_swap64(uint64_t val) __cpu_to_le64(val); \ }) -#ifndef FIO_HAVE_BLKTRACE -static inline int is_blktrace(const char *fname, int *need_swap) -{ - return 0; -} -struct thread_data; -static inline int load_blktrace(struct thread_data *td, const char *fname, - int need_swap) -{ - return 1; -} -#endif - #define FIO_DEF_CL_SIZE 128 static inline int os_cache_line_size(void) @@ -288,30 +322,8 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) } #endif -#ifdef FIO_USE_GENERIC_RAND -typedef unsigned int os_random_state_t; - -static inline void os_random_seed(unsigned long seed, os_random_state_t *rs) -{ - srand(seed); -} - -static inline long os_random_long(os_random_state_t *rs) -{ - long val; - - val = rand_r(rs); - return val; -} -#endif - #ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE -extern void td_fill_rand_seeds(struct thread_data *td); -/* - * Initialize the various random states we need (random io, block size ranges, - * read/write mix, etc). - */ -static inline int init_random_state(struct thread_data *td, unsigned long *rand_seeds, int size) +static inline int init_random_seeds(uint64_t *rand_seeds, int size) { int fd; @@ -326,7 +338,6 @@ static inline int init_random_state(struct thread_data *td, unsigned long *rand_ } close(fd); - td_fill_rand_seeds(td); return 0; } #endif @@ -362,10 +373,38 @@ static inline int CPU_COUNT(os_cpu_mask_t *mask) #endif #ifndef FIO_HAVE_GETTID +#ifndef CONFIG_HAVE_GETTID static inline int gettid(void) { return getpid(); } #endif +#endif + +#ifndef FIO_HAVE_SHM_ATTACH_REMOVED +static inline int shm_attach_to_open_removed(void) +{ + return 0; +} +#endif + +#ifndef FIO_HAVE_NATIVE_FALLOCATE +static inline bool fio_fallocate(struct fio_file *f, uint64_t offset, uint64_t len) +{ + errno = ENOSYS; + return false; +} +#endif + +#if defined(CONFIG_POSIX_FALLOCATE) || defined(FIO_HAVE_NATIVE_FALLOCATE) +# define FIO_HAVE_ANY_FALLOCATE +#endif + +#ifndef FIO_HAVE_CPU_HAS +static inline bool os_cpu_has(cpu_features feature) +{ + return false; +} +#endif #endif