projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read stats for backlog verifies not reported for time-expired workloads
[fio.git]
/
zbd.h
diff --git
a/zbd.h
b/zbd.h
index e8dd3d6d5d3610c740a9f7da8baf695c05c0834e..d425707e8216faa5041088ce23eb892ce4110282 100644
(file)
--- a/
zbd.h
+++ b/
zbd.h
@@
-17,16
+17,18
@@
struct fio_file;
enum io_u_action {
io_u_accept = 0,
io_u_eof = 1,
enum io_u_action {
io_u_accept = 0,
io_u_eof = 1,
+ io_u_completed = 2,
};
/**
* struct fio_zone_info - information about a single ZBD zone
* @start: zone start location (bytes)
* @wp: zone write pointer location (bytes)
};
/**
* struct fio_zone_info - information about a single ZBD zone
* @start: zone start location (bytes)
* @wp: zone write pointer location (bytes)
- * @
verify_block: number of blocks that have been verified for this zone
+ * @
capacity: maximum size usable from the start of a zone (bytes)
* @mutex: protects the modifiable members in this structure
* @type: zone type (BLK_ZONE_TYPE_*)
* @cond: zone state (BLK_ZONE_COND_*)
* @mutex: protects the modifiable members in this structure
* @type: zone type (BLK_ZONE_TYPE_*)
* @cond: zone state (BLK_ZONE_COND_*)
+ * @has_wp: whether or not this zone can have a valid write pointer
* @open: whether or not this zone is currently open. Only relevant if
* max_open_zones > 0.
* @reset_zone: whether or not this zone should be reset before writing to it
* @open: whether or not this zone is currently open. Only relevant if
* max_open_zones > 0.
* @reset_zone: whether or not this zone should be reset before writing to it
@@
-35,9
+37,10
@@
struct fio_zone_info {
pthread_mutex_t mutex;
uint64_t start;
uint64_t wp;
pthread_mutex_t mutex;
uint64_t start;
uint64_t wp;
- uint
32_t verify_block
;
+ uint
64_t capacity
;
enum zbd_zone_type type:2;
enum zbd_zone_cond cond:4;
enum zbd_zone_type type:2;
enum zbd_zone_cond cond:4;
+ unsigned int has_wp:1;
unsigned int open:1;
unsigned int reset_zone:1;
};
unsigned int open:1;
unsigned int reset_zone:1;
};
@@
-45,10
+48,15
@@
struct fio_zone_info {
/**
* zoned_block_device_info - zoned block device characteristics
* @model: Device model.
/**
* zoned_block_device_info - zoned block device characteristics
* @model: Device model.
+ * @max_open_zones: global limit on the number of simultaneously opened
+ * sequential write zones. A zero value means unlimited open zones,
+ * and that open zones will not be tracked in the open_zones array.
* @mutex: Protects the modifiable members in this structure (refcount and
* num_open_zones).
* @mutex: Protects the modifiable members in this structure (refcount and
* num_open_zones).
- * @zone_size: size of a single zone in
units of 512 bytes
+ * @zone_size: size of a single zone in
bytes.
* @sectors_with_data: total size of data in all zones in units of 512 bytes
* @sectors_with_data: total size of data in all zones in units of 512 bytes
+ * @wp_sectors_with_data: total size of data in zones with write pointers in
+ * units of 512 bytes
* @zone_size_log2: log2 of the zone size in bytes if it is a power of 2 or 0
* if the zone size is not a power of 2.
* @nr_zones: number of zones
* @zone_size_log2: log2 of the zone size in bytes if it is a power of 2 or 0
* if the zone size is not a power of 2.
* @nr_zones: number of zones
@@
-65,9
+73,11
@@
struct fio_zone_info {
*/
struct zoned_block_device_info {
enum zbd_zoned_model model;
*/
struct zoned_block_device_info {
enum zbd_zoned_model model;
+ uint32_t max_open_zones;
pthread_mutex_t mutex;
uint64_t zone_size;
uint64_t sectors_with_data;
pthread_mutex_t mutex;
uint64_t zone_size;
uint64_t sectors_with_data;
+ uint64_t wp_sectors_with_data;
uint32_t zone_size_log2;
uint32_t nr_zones;
uint32_t refcount;
uint32_t zone_size_log2;
uint32_t nr_zones;
uint32_t refcount;
@@
-77,6
+87,8
@@
struct zoned_block_device_info {
struct fio_zone_info zone_info[0];
};
struct fio_zone_info zone_info[0];
};
+int zbd_init_files(struct thread_data *td);
+void zbd_recalc_options_with_zone_granularity(struct thread_data *td);
int zbd_setup_files(struct thread_data *td);
void zbd_free_zone_info(struct fio_file *f);
void zbd_file_reset(struct thread_data *td, struct fio_file *f);
int zbd_setup_files(struct thread_data *td);
void zbd_free_zone_info(struct fio_file *f);
void zbd_file_reset(struct thread_data *td, struct fio_file *f);
@@
-86,6
+98,7
@@
enum fio_ddir zbd_adjust_ddir(struct thread_data *td, struct io_u *io_u,
enum fio_ddir ddir);
enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u);
char *zbd_write_status(const struct thread_stat *ts);
enum fio_ddir ddir);
enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u);
char *zbd_write_status(const struct thread_stat *ts);
+int zbd_do_io_u_trim(const struct thread_data *td, struct io_u *io_u);
static inline void zbd_close_file(struct fio_file *f)
{
static inline void zbd_close_file(struct fio_file *f)
{
@@
-93,18
+106,19
@@
static inline void zbd_close_file(struct fio_file *f)
zbd_free_zone_info(f);
}
zbd_free_zone_info(f);
}
-static inline void zbd_queue_io_u(struct io_u *io_u, enum fio_q_status status)
+static inline void zbd_queue_io_u(struct thread_data *td, struct io_u *io_u,
+ enum fio_q_status status)
{
if (io_u->zbd_queue_io) {
{
if (io_u->zbd_queue_io) {
- io_u->zbd_queue_io(io_u, status, io_u->error == 0);
+ io_u->zbd_queue_io(
td,
io_u, status, io_u->error == 0);
io_u->zbd_queue_io = NULL;
}
}
io_u->zbd_queue_io = NULL;
}
}
-static inline void zbd_put_io_u(struct io_u *io_u)
+static inline void zbd_put_io_u(struct
thread_data *td, struct
io_u *io_u)
{
if (io_u->zbd_put_io) {
{
if (io_u->zbd_put_io) {
- io_u->zbd_put_io(io_u);
+ io_u->zbd_put_io(
td,
io_u);
io_u->zbd_queue_io = NULL;
io_u->zbd_put_io = NULL;
}
io_u->zbd_queue_io = NULL;
io_u->zbd_put_io = NULL;
}