X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-linux.h;h=869a25d8ee5d86c684762d91c4f7a4496f2b5d7f;hp=34a7cc53fb33d680e6750bd16c20e127ed51df89;hb=95820b6e6c92025df8d89c0bf39b174e53137c41;hpb=804bb9a18bb747c8c7c481c9d8dca86a29837ecd diff --git a/os/os-linux.h b/os/os-linux.h index 34a7cc53..869a25d8 100644 --- a/os/os-linux.h +++ b/os/os-linux.h @@ -1,10 +1,13 @@ #ifndef FIO_OS_LINUX_H #define FIO_OS_LINUX_H +#define FIO_OS os_linux + #include #include #include #include +#include #include #include #include @@ -13,83 +16,51 @@ #include #include -#include "indirect.h" #include "binject.h" #include "../file.h" -#define FIO_HAVE_LIBAIO -#define FIO_HAVE_POSIXAIO -#define FIO_HAVE_FADVISE #define FIO_HAVE_CPU_AFFINITY #define FIO_HAVE_DISK_UTIL #define FIO_HAVE_SGIO #define FIO_HAVE_IOPRIO -#define FIO_HAVE_SPLICE #define FIO_HAVE_IOSCHED_SWITCH #define FIO_HAVE_ODIRECT #define FIO_HAVE_HUGETLB #define FIO_HAVE_RAWBIND #define FIO_HAVE_BLKTRACE -#define FIO_HAVE_STRSEP -#define FIO_HAVE_FALLOCATE -#define FIO_HAVE_POSIXAIO_FSYNC #define FIO_HAVE_PSHARED_MUTEX #define FIO_HAVE_CL_SIZE #define FIO_HAVE_CGROUPS -#define FIO_HAVE_FDATASYNC #define FIO_HAVE_FS_STAT #define FIO_HAVE_TRIM #define FIO_HAVE_BINJECT -#define FIO_HAVE_CLOCK_MONOTONIC - -/* - * Can only enable this for newer glibcs, or the header and defines are - * missing - */ -#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 6 -#define FIO_HAVE_LINUX_FALLOCATE -#endif +#define FIO_HAVE_GETTID +#define FIO_USE_GENERIC_INIT_RANDOM_STATE -#ifdef SYNC_FILE_RANGE_WAIT_BEFORE -#define FIO_HAVE_SYNC_FILE_RANGE +#ifdef MAP_HUGETLB +#define FIO_HAVE_MMAP_HUGE #endif #define OS_MAP_ANON MAP_ANONYMOUS -#ifndef CLOCK_MONOTONIC -#define CLOCK_MONOTONIC 1 -#endif - typedef cpu_set_t os_cpu_mask_t; typedef struct drand48_data os_random_state_t; -/* - * we want fadvise64 really, but it's so tangled... later - */ -#ifdef FIO_HAVE_FADVISE -#define fadvise(fd, off, len, advice) \ - posix_fadvise((fd), (off_t)(off), (len), (advice)) -#endif - -/* - * If you are on an ancient glibc (2.3.2), then define GLIBC_2_3_2 if you want - * the affinity helpers to work. - */ -#ifndef GLIBC_2_3_2 +#ifdef CONFIG_3ARG_AFFINITY #define fio_setaffinity(pid, cpumask) \ sched_setaffinity((pid), sizeof(cpumask), &(cpumask)) #define fio_getaffinity(pid, ptr) \ sched_getaffinity((pid), sizeof(cpu_set_t), (ptr)) -#else +#elif defined(CONFIG_2ARG_AFFINITY) #define fio_setaffinity(pid, cpumask) \ sched_setaffinity((pid), &(cpumask)) #define fio_getaffinity(pid, ptr) \ sched_getaffinity((pid), (ptr)) #endif -#define fio_cpu_clear(mask, cpu) CPU_CLR((cpu), (mask)) -#define fio_cpu_set(mask, cpu) CPU_SET((cpu), (mask)) +#define fio_cpu_clear(mask, cpu) (void) CPU_CLR((cpu), (mask)) +#define fio_cpu_set(mask, cpu) (void) CPU_SET((cpu), (mask)) static inline int fio_cpuset_init(os_cpu_mask_t *mask) { @@ -104,76 +75,6 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask) #define FIO_MAX_CPUS CPU_SETSIZE -static inline int ioprio_set(int which, int who, int ioprio) -{ - return syscall(__NR_ioprio_set, which, who, ioprio); -} - -/* - * Just check for SPLICE_F_MOVE, if that isn't there, assume the others - * aren't either. - */ -#ifndef SPLICE_F_MOVE -#define SPLICE_F_MOVE (0x01) /* move pages instead of copying */ -#define SPLICE_F_NONBLOCK (0x02) /* don't block on the pipe splicing (but */ - /* we may still block on the fd we splice */ - /* from/to, of course */ -#define SPLICE_F_MORE (0x04) /* expect more data */ -#define SPLICE_F_GIFT (0x08) /* pages passed in are a gift */ - -static inline int splice(int fdin, loff_t *off_in, int fdout, loff_t *off_out, - size_t len, unsigned int flags) -{ - return syscall(__NR_sys_splice, fdin, off_in, fdout, off_out, len, flags); -} - -static inline int tee(int fdin, int fdout, size_t len, unsigned int flags) -{ - return syscall(__NR_sys_tee, fdin, fdout, len, flags); -} - -static inline int vmsplice(int fd, const struct iovec *iov, - unsigned long nr_segs, unsigned int flags) -{ - return syscall(__NR_sys_vmsplice, fd, iov, nr_segs, flags); -} -#endif - -#define SPLICE_DEF_SIZE (64*1024) - -#ifdef FIO_HAVE_SYSLET - -struct syslet_uatom; -struct async_head_user; - -/* - * syslet stuff - */ -static inline struct syslet_uatom * -async_exec(struct syslet_uatom *atom, struct async_head_user *ahu) -{ - return (struct syslet_uatom *) syscall(__NR_async_exec, atom, ahu); -} - -static inline long -async_wait(unsigned long min_wait_events, unsigned long user_ring_idx, - struct async_head_user *ahu) -{ - return syscall(__NR_async_wait, min_wait_events, - user_ring_idx, ahu); -} - -static inline long async_thread(void *event, struct async_head_user *ahu) -{ - return syscall(__NR_async_thread, event, ahu); -} - -static inline long umem_add(unsigned long *uptr, unsigned long inc) -{ - return syscall(__NR_umem_add, uptr, inc); -} -#endif /* FIO_HAVE_SYSLET */ - enum { IOPRIO_CLASS_NONE, IOPRIO_CLASS_RT, @@ -190,6 +91,25 @@ enum { #define IOPRIO_BITS 16 #define IOPRIO_CLASS_SHIFT 13 +static inline int ioprio_set(int which, int who, int ioprio_class, int ioprio) +{ + /* + * If no class is set, assume BE + */ + if (!ioprio_class) + ioprio_class = IOPRIO_CLASS_BE; + + ioprio |= ioprio_class << IOPRIO_CLASS_SHIFT; + return syscall(__NR_ioprio_set, which, who, ioprio); +} + +static inline int gettid(void) +{ + return syscall(__NR_gettid); +} + +#define SPLICE_DEF_SIZE (64*1024) + #ifndef BLKGETSIZE64 #define BLKGETSIZE64 _IOR(0x12,114,size_t) #endif @@ -280,6 +200,10 @@ static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev) #define FIO_MADV_FREE MADV_REMOVE #endif +#define fio_swap16(x) __bswap_16(x) +#define fio_swap32(x) __bswap_32(x) +#define fio_swap64(x) __bswap_64(x) + #define CACHE_LINE_FILE \ "/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size" @@ -329,4 +253,12 @@ static inline int os_trim(int fd, unsigned long long start, return errno; } +#ifdef CONFIG_SCHED_IDLE +static inline int fio_set_sched_idle(void) +{ + struct sched_param p = { .sched_priority = 0, }; + return sched_setscheduler(gettid(), SCHED_IDLE, &p); +} +#endif + #endif