From 6599ce5a12eb08f412536f4f9345f4506e1feae0 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 26 Apr 2017 15:04:21 -0600 Subject: [PATCH] gpu: ensure that we convert gpu_dev_id options Fixes: 03553853 ("GPUDirect RDMA support") Signed-off-by: Jens Axboe --- cconv.c | 2 ++ thread_options.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cconv.c b/cconv.c index 886140d4..3295824b 100644 --- a/cconv.c +++ b/cconv.c @@ -235,6 +235,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, o->new_group = le32_to_cpu(top->new_group); o->numjobs = le32_to_cpu(top->numjobs); o->cpus_allowed_policy = le32_to_cpu(top->cpus_allowed_policy); + o->gpu_dev_id = le32_to_cpu(top->gpu_dev_id); o->iolog = le32_to_cpu(top->iolog); o->rwmixcycle = le32_to_cpu(top->rwmixcycle); o->nice = le32_to_cpu(top->nice); @@ -420,6 +421,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->new_group = cpu_to_le32(o->new_group); top->numjobs = cpu_to_le32(o->numjobs); top->cpus_allowed_policy = cpu_to_le32(o->cpus_allowed_policy); + top->gpu_dev_id = cpu_to_le32(o->gpu_dev_id); top->iolog = cpu_to_le32(o->iolog); top->rwmixcycle = cpu_to_le32(o->rwmixcycle); top->nice = cpu_to_le32(o->nice); diff --git a/thread_options.h b/thread_options.h index 393e51ef..876f8544 100644 --- a/thread_options.h +++ b/thread_options.h @@ -20,9 +20,7 @@ enum fio_memtype { MEM_MMAP, /* use anonynomous mmap */ MEM_MMAPHUGE, /* memory mapped huge file */ MEM_MMAPSHARED, /* use mmap with shared flag */ -#ifdef CONFIG_CUDA MEM_CUDA_MALLOC,/* use GPU memory */ -#endif }; #define ERROR_STR_MAX 128 @@ -472,6 +470,8 @@ struct thread_options_pack { uint8_t verify_cpumask[FIO_TOP_STR_MAX]; uint8_t log_gz_cpumask[FIO_TOP_STR_MAX]; #endif + uint32_t gpu_dev_id; + uint32_t pad; uint32_t cpus_allowed_policy; uint32_t iolog; uint32_t rwmixcycle; -- 2.25.1