projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/DevriesL/fio
[fio.git]
/
zbd.h
diff --git
a/zbd.h
b/zbd.h
index d750b67ecea45317f939f38d04f599046aa56e2d..6453439313f8de4d5c049c371237762f05d8b7d6 100644
(file)
--- a/
zbd.h
+++ b/
zbd.h
@@
-7,23
+7,13
@@
#ifndef FIO_ZBD_H
#define FIO_ZBD_H
#ifndef FIO_ZBD_H
#define FIO_ZBD_H
-#include <inttypes.h>
-#include "fio.h" /* FIO_MAX_OPEN_ZBD_ZONES */
-#ifdef CONFIG_LINUX_BLKZONED
-#include <linux/blkzoned.h>
-#endif
+#include "io_u.h"
+#include "ioengines.h"
+#include "oslib/blkzoned.h"
+#include "zbd_types.h"
struct fio_file;
struct fio_file;
-/*
- * Zoned block device models.
- */
-enum blk_zoned_model {
- ZBD_DM_NONE, /* Regular block device */
- ZBD_DM_HOST_AWARE, /* Host-aware zoned block device */
- ZBD_DM_HOST_MANAGED, /* Host-managed zoned block device */
-};
-
enum io_u_action {
io_u_accept = 0,
io_u_eof = 1,
enum io_u_action {
io_u_accept = 0,
io_u_eof = 1,
@@
-31,36
+21,42
@@
enum io_u_action {
/**
* struct fio_zone_info - information about a single ZBD zone
/**
* struct fio_zone_info - information about a single ZBD zone
- * @start: zone start in 512 byte units
- * @wp: zone write pointer location in 512 byte units
+ * @start: zone start location (bytes)
+ * @wp: zone write pointer location (bytes)
+ * @capacity: maximum size usable from the start of a zone (bytes)
* @verify_block: number of blocks that have been verified for this zone
* @mutex: protects the modifiable members in this structure
* @type: zone type (BLK_ZONE_TYPE_*)
* @cond: zone state (BLK_ZONE_COND_*)
* @verify_block: number of blocks that have been verified for this zone
* @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
*/
struct fio_zone_info {
* @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
*/
struct fio_zone_info {
-#ifdef CONFIG_LINUX_BLKZONED
pthread_mutex_t mutex;
uint64_t start;
uint64_t wp;
pthread_mutex_t mutex;
uint64_t start;
uint64_t wp;
+ uint64_t capacity;
uint32_t verify_block;
uint32_t verify_block;
- enum blk_zone_type type:2;
- enum blk_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;
-#endif
};
/**
* 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.
* @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
@@
-76,55
+72,55
@@
struct fio_zone_info {
* will be smaller than 'zone_size'.
*/
struct zoned_block_device_info {
* will be smaller than 'zone_size'.
*/
struct zoned_block_device_info {
- enum blk_zoned_model model;
+ 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 num_open_zones;
uint32_t write_cnt;
uint32_t zone_size_log2;
uint32_t nr_zones;
uint32_t refcount;
uint32_t num_open_zones;
uint32_t write_cnt;
- uint32_t open_zones[
FIO_MAX_OPEN_ZBD
_ZONES];
+ uint32_t open_zones[
ZBD_MAX_OPEN
_ZONES];
struct fio_zone_info zone_info[0];
};
struct fio_zone_info zone_info[0];
};
-#ifdef CONFIG_LINUX_BLKZONED
+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_free_zone_info(struct fio_file *f);
-int zbd_init(struct thread_data *td);
void zbd_file_reset(struct thread_data *td, struct fio_file *f);
bool zbd_unaligned_write(int error_code);
void zbd_file_reset(struct thread_data *td, struct fio_file *f);
bool zbd_unaligned_write(int error_code);
+void setup_zbd_zone_mode(struct thread_data *td, struct io_u *io_u);
+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 io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u);
char *zbd_write_status(const struct thread_stat *ts);
-#else
-static inline void zbd_free_zone_info(struct fio_file *f)
-{
-}
-
-static inline int zbd_init(struct thread_data *td)
-{
- return 0;
-}
-
-static inline void zbd_file_reset(struct thread_data *td, struct fio_file *f)
-{
-}
-static inline
bool zbd_unaligned_write(int error_code
)
+static inline
void zbd_close_file(struct fio_file *f
)
{
{
- return false;
+ if (f->zbd_info)
+ zbd_free_zone_info(f);
}
}
-static inline
enum io_u_action zbd_adjust_block(struct thread_data *td
,
-
struct io_u *io_u
)
+static inline
void zbd_queue_io_u(struct thread_data *td, struct io_u *io_u
,
+
enum fio_q_status status
)
{
{
- return io_u_accept;
+ if (io_u->zbd_queue_io) {
+ io_u->zbd_queue_io(td, io_u, status, io_u->error == 0);
+ io_u->zbd_queue_io = NULL;
+ }
}
}
-static inline
char *zbd_write_status(const struct thread_stat *ts
)
+static inline
void zbd_put_io_u(struct thread_data *td, struct io_u *io_u
)
{
{
- return NULL;
+ if (io_u->zbd_put_io) {
+ io_u->zbd_put_io(td, io_u);
+ io_u->zbd_queue_io = NULL;
+ io_u->zbd_put_io = NULL;
+ }
}
}
-#endif
#endif /* FIO_ZBD_H */
#endif /* FIO_ZBD_H */