Recent changes (master)
The following changes since commit 791f697320637fb39375ce4a80c287afaff8f395:
t/nvmept_fdp: accommodate devices with many RUHS (2024-07-15 20:12:02 +0000)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to c63e8658bb776f2d50cde992ad07232a61e6d031:
Merge branch 'fdp/pid_limit_fix' of https://github.com/ankit-sam/fio (2024-07-17 17:30:14 -0400)
----------------------------------------------------------------
Ankit Kumar (3):
dataplacement: remove FDP_MAX_RUHS
dataplacement: change log_info to log_err for error messages
ioengines: bump up FIO_IOOPS_VERSION
Vincent Fu (1):
Merge branch 'fdp/pid_limit_fix' of https://github.com/ankit-sam/fio
dataplacement.c | 27 +++++++++++++-------------- dataplacement.h | 1 - ioengines.h | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-)
---
Diff of recent changes:
dataplacement.c +13 -14
@@ -52,7 +52,7 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f)log_err ("fio: stream IDs must be provided for dataplacement=streams\n" );return -EINVAL ; } - ruhs =scalloc (1 ,sizeof (*ruhs) +FDP_MAX_RUHS *sizeof (*ruhs->plis)); + ruhs =scalloc (1 ,sizeof (*ruhs) +FIO_MAX_DP_IDS *sizeof (*ruhs->plis));if (!ruhs)return -ENOMEM ;
@@ -71,16 +71,16 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f) ruhs =calloc (1 ,sizeof (*ruhs)); ret =fdp_ruh_info (td, f, ruhs);if (ret) { -log_info ("fio: ruh info failed for %s (%d)\n" , - f->file_name, -ret); +log_err ("fio: ruh info failed for %s (%d)\n" , + f->file_name, -ret); goto out; } nr_ruhs = ruhs->nr_ruhs; ruhs =realloc (ruhs,sizeof (*ruhs) + nr_ruhs *sizeof (*ruhs->plis));if (!ruhs) { -log_info ("fio: ruhs buffer realloc failed for %s\n" , - f->file_name); +log_err ("fio: ruhs buffer realloc failed for %s\n" , + f->file_name); ret = -ENOMEM ; goto out; }
@@ -88,21 +88,20 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f) ruhs->nr_ruhs = nr_ruhs; ret =fdp_ruh_info (td, f, ruhs);if (ret) { -log_info ("fio: ruh info failed for %s (%d)\n" , - f->file_name, -ret); +log_err ("fio: ruh info failed for %s (%d)\n" , + f->file_name, -ret); goto out; }if (td->o.dp_nr_ids ==0 ) { -if (ruhs->nr_ruhs >FDP_MAX_RUHS ) - ruhs->nr_ruhs =FDP_MAX_RUHS ; +if (ruhs->nr_ruhs >FIO_MAX_DP_IDS ) + ruhs->nr_ruhs =FIO_MAX_DP_IDS ; }else { -if (td->o.dp_nr_ids >FDP_MAX_RUHS ) { - ret = -EINVAL ; - goto out; - }for (i =0 ; i < td->o.dp_nr_ids; i++) {if (td->o.dp_ids[i] >= ruhs->nr_ruhs) { +log_err ("fio: for %s PID index %d must be smaller than %d\n" , + f->file_name, td->o.dp_ids[i], + ruhs->nr_ruhs); ret = -EINVAL ; goto out; }
@@ -152,7 +151,7 @@ static int init_ruh_scheme(struct thread_data *td, struct fio_file *f)if (!scheme_fp) {log_err ("fio: ruh scheme failed to open scheme file %s\n" , - td->o.dp_scheme_file); + td->o.dp_scheme_file); ret = -errno; goto out; }
dataplacement.h +0 -1
@@ -5,7 +5,6 @@#define STREAMS_DIR_DTYPE 1#define FDP_DIR_DTYPE 2 -#define FDP_MAX_RUHS 128#define FIO_MAX_DP_IDS 128#define DP_MAX_SCHEME_ENTRIES 32
ioengines.h +1 -1
@@ -9,7 +9,7 @@#include "zbd_types.h" #include "dataplacement.h" -#define FIO_IOOPS_VERSION 34 +#define FIO_IOOPS_VERSION 35#ifndef CONFIG_DYNAMIC_ENGINES #define FIO_STATIC static