gpu: ensure that we convert gpu_dev_id options

Fixes: 03553853 ("GPUDirect RDMA support")
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/cconv.c b/cconv.c
index 886140d414bef7271127e47d4a2b39ea111fa330..3295824b5a26f18459fa119fbeeb00596342fb5f 100644 (file)
--- 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 393e51ef976f5ead6d45afb3375678d9dc718556..876f85444c962c46a3a6d4d9671d3a2832341ea6 100644 (file)
--- 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;