dataplacement: increase max data placement IDs to 128

Some users have requested the ability to test a larger number of placement IDs in a single job. Bump the max placement IDs to 128. Change the type to 16 bits to reduce the amount of space these additional IDs will consume. Also bump the server version for this change. Signed-off-by: Vincent Fu <[email protected]>
axboe · Jun 5, 2024 · 695ab5c · 695ab5c
1 parent 612da74
commit 695ab5c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/cconv.c b/cconv.c
@@ -359,7 +359,7 @@ int convert_thread_options_to_cpu(struct thread_options *o,
 	o->dp_id_select = le32_to_cpu(top->dp_id_select);
 	o->dp_nr_ids = le32_to_cpu(top->dp_nr_ids);
 	for (i = 0; i < o->dp_nr_ids; i++)
-		o->dp_ids[i] = le32_to_cpu(top->dp_ids[i]);
+		o->dp_ids[i] = le16_to_cpu(top->dp_ids[i]);
 #if 0
 	uint8_t cpumask[FIO_TOP_STR_MAX];
 	uint8_t verify_cpumask[FIO_TOP_STR_MAX];
@@ -659,7 +659,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	top->dp_id_select = cpu_to_le32(o->dp_id_select);
 	top->dp_nr_ids = cpu_to_le32(o->dp_nr_ids);
 	for (i = 0; i < o->dp_nr_ids; i++)
-		top->dp_ids[i] = cpu_to_le32(o->dp_ids[i]);
+		top->dp_ids[i] = cpu_to_le16(o->dp_ids[i]);
 #if 0
 	uint8_t cpumask[FIO_TOP_STR_MAX];
 	uint8_t verify_cpumask[FIO_TOP_STR_MAX];

diff --git a/dataplacement.h b/dataplacement.h
@@ -6,7 +6,7 @@
 #define STREAMS_DIR_DTYPE	1
 #define FDP_DIR_DTYPE		2
 #define FDP_MAX_RUHS		128
-#define FIO_MAX_DP_IDS 		16
+#define FIO_MAX_DP_IDS 		128
 #define DP_MAX_SCHEME_ENTRIES	32
 
 /*

diff --git a/server.h b/server.h
@@ -51,7 +51,7 @@ struct fio_net_cmd_reply {
 };
 
 enum {
-	FIO_SERVER_VER			= 105,
+	FIO_SERVER_VER			= 106,
 
 	FIO_SERVER_MAX_FRAGMENT_PDU	= 1024,
 	FIO_SERVER_MAX_CMD_MB		= 2048,

diff --git a/thread_options.h b/thread_options.h
@@ -394,7 +394,7 @@ struct thread_options {
 	unsigned int fdp;
 	unsigned int dp_type;
 	unsigned int dp_id_select;
-	unsigned int dp_ids[FIO_MAX_DP_IDS];
+	uint16_t dp_ids[FIO_MAX_DP_IDS];
 	unsigned int dp_nr_ids;
 	char *dp_scheme_file;
 
@@ -712,7 +712,7 @@ struct thread_options_pack {
 	uint32_t fdp;
 	uint32_t dp_type;
 	uint32_t dp_id_select;
-	uint32_t dp_ids[FIO_MAX_DP_IDS];
+	uint16_t dp_ids[FIO_MAX_DP_IDS];
 	uint32_t dp_nr_ids;
 	uint8_t dp_scheme_file[FIO_TOP_STR_MAX];