Add cpus_allowed option
cpumask can be cumbersome to use, since it requires you to calculate
a decimal mask to pass to fio. So add a cpus_allowed option that
takes a text list of allowed cpus, ala: cpus_allowed=1,3,8 will set
the affinity mask for CPUS 1, 3, and 8.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/options.c b/options.c
index 839af0b..db3279e 100644
--- a/options.c
+++ b/options.c
@@ -98,28 +98,47 @@
return 0;
}
-static void fill_cpu_mask(os_cpu_mask_t *cpumask, int cpu)
-{
#ifdef FIO_HAVE_CPU_AFFINITY
- unsigned int i;
-
- CPU_ZERO(cpumask);
-
- for (i = 0; i < sizeof(int) * 8; i++)
- if ((1 << i) & cpu)
- CPU_SET(i, cpumask);
-#endif
-}
-
static int str_cpumask_cb(void *data, unsigned int *val)
{
struct thread_data *td = data;
+ unsigned int i;
- fill_cpu_mask(&td->o.cpumask, *val);
+ CPU_ZERO(&td->o.cpumask);
+
+ for (i = 0; i < sizeof(int) * 8; i++)
+ if ((1 << i) & *val)
+ CPU_SET(*val, &td->o.cpumask);
+
td->o.cpumask_set = 1;
return 0;
}
+static int str_cpus_allowed_cb(void *data, const char *input)
+{
+ struct thread_data *td = data;
+ char *cpu, *str, *p;
+
+ CPU_ZERO(&td->o.cpumask);
+
+ p = str = strdup(input);
+
+ strip_blank_front(&str);
+ strip_blank_end(str);
+
+ while ((cpu = strsep(&str, ",")) != NULL) {
+ if (!strlen(cpu))
+ break;
+ CPU_SET(atoi(cpu), &td->o.cpumask);
+ }
+
+ free(p);
+ td->o.cpumask_set = 1;
+ exit(0);
+ return 0;
+}
+#endif
+
static int str_fst_cb(void *data, const char *str)
{
struct thread_data *td = data;
@@ -775,6 +794,12 @@
.cb = str_cpumask_cb,
.help = "CPU affinity mask",
},
+ {
+ .name = "cpus_allowed",
+ .type = FIO_OPT_STR,
+ .cb = str_cpus_allowed_cb,
+ .help = "Set CPUs allowed",
+ },
#endif
{
.name = "end_fsync",