X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=zbd.c;h=9b603b97b18344b5e17baf31f199371a8c5f11ff;hp=9c3092ab2424dae64c6f19646ff8ae85cbda9515;hb=a824149a09e541c08e2236d8c6b828437e7781a7;hpb=a0c84dd4354eaf0a84b8bf0a3126f65301f2206f diff --git a/zbd.c b/zbd.c index 9c3092ab..9b603b97 100644 --- a/zbd.c +++ b/zbd.c @@ -228,12 +228,45 @@ static enum blk_zoned_model get_zbd_model(const char *file_name) char *zoned_attr_path = NULL; char *model_str = NULL; struct stat statbuf; + char *sys_devno_path = NULL; + char *part_attr_path = NULL; + char *part_str = NULL; + char sys_path[PATH_MAX]; + ssize_t sz; + char *delim = NULL; if (stat(file_name, &statbuf) < 0) goto out; - if (asprintf(&zoned_attr_path, "/sys/dev/block/%d:%d/queue/zoned", + + if (asprintf(&sys_devno_path, "/sys/dev/block/%d:%d", major(statbuf.st_rdev), minor(statbuf.st_rdev)) < 0) goto out; + + sz = readlink(sys_devno_path, sys_path, sizeof(sys_path) - 1); + if (sz < 0) + goto out; + sys_path[sz] = '\0'; + + /* + * If the device is a partition device, cut the device name in the + * canonical sysfs path to obtain the sysfs path of the holder device. + * e.g.: /sys/devices/.../sda/sda1 -> /sys/devices/.../sda + */ + if (asprintf(&part_attr_path, "/sys/dev/block/%s/partition", + sys_path) < 0) + goto out; + part_str = read_file(part_attr_path); + if (part_str && *part_str == '1') { + delim = strrchr(sys_path, '/'); + if (!delim) + goto out; + *delim = '\0'; + } + + if (asprintf(&zoned_attr_path, + "/sys/dev/block/%s/queue/zoned", sys_path) < 0) + goto out; + model_str = read_file(zoned_attr_path); if (!model_str) goto out; @@ -246,6 +279,9 @@ static enum blk_zoned_model get_zbd_model(const char *file_name) out: free(model_str); free(zoned_attr_path); + free(part_str); + free(part_attr_path); + free(sys_devno_path); return model; } @@ -606,7 +642,7 @@ static int zbd_reset_range(struct thread_data *td, const struct fio_file *f, static unsigned int zbd_zone_nr(struct zoned_block_device_info *zbd_info, struct fio_zone_info *zone) { - return (uintptr_t) zone - (uintptr_t) zbd_info->zone_info; + return zone - zbd_info->zone_info; } /** @@ -620,12 +656,10 @@ static unsigned int zbd_zone_nr(struct zoned_block_device_info *zbd_info, static int zbd_reset_zone(struct thread_data *td, const struct fio_file *f, struct fio_zone_info *z) { - int ret; - dprint(FD_ZBD, "%s: resetting wp of zone %u.\n", f->file_name, zbd_zone_nr(f->zbd_info, z)); - ret = zbd_reset_range(td, f, z->start, (z+1)->start - z->start); - return ret; + + return zbd_reset_range(td, f, z->start, (z+1)->start - z->start); } /* @@ -728,34 +762,68 @@ static bool zbd_dec_and_reset_write_cnt(const struct thread_data *td, return write_cnt == 0; } -/* Check whether the value of zbd_info.sectors_with_data is correct. */ -static void check_swd(const struct thread_data *td, const struct fio_file *f) +enum swd_action { + CHECK_SWD, + SET_SWD, +}; + +/* Calculate the number of sectors with data (swd) and perform action 'a' */ +static uint64_t zbd_process_swd(const struct fio_file *f, enum swd_action a) { -#if 0 struct fio_zone_info *zb, *ze, *z; - uint64_t swd; + uint64_t swd = 0; zb = &f->zbd_info->zone_info[zbd_zone_idx(f, f->file_offset)]; ze = &f->zbd_info->zone_info[zbd_zone_idx(f, f->file_offset + f->io_size)]; - swd = 0; for (z = zb; z < ze; z++) { pthread_mutex_lock(&z->mutex); swd += z->wp - z->start; } pthread_mutex_lock(&f->zbd_info->mutex); - assert(f->zbd_info->sectors_with_data == swd); + switch (a) { + case CHECK_SWD: + assert(f->zbd_info->sectors_with_data == swd); + break; + case SET_SWD: + f->zbd_info->sectors_with_data = swd; + break; + } pthread_mutex_unlock(&f->zbd_info->mutex); for (z = zb; z < ze; z++) pthread_mutex_unlock(&z->mutex); -#endif + + return swd; +} + +/* + * The swd check is useful for debugging but takes too much time to leave + * it enabled all the time. Hence it is disabled by default. + */ +static const bool enable_check_swd = false; + +/* Check whether the value of zbd_info.sectors_with_data is correct. */ +static void zbd_check_swd(const struct fio_file *f) +{ + if (!enable_check_swd) + return; + + zbd_process_swd(f, CHECK_SWD); +} + +static void zbd_init_swd(struct fio_file *f) +{ + uint64_t swd; + + swd = zbd_process_swd(f, SET_SWD); + dprint(FD_ZBD, "%s(%s): swd = %" PRIu64 "\n", __func__, f->file_name, + swd); } void zbd_file_reset(struct thread_data *td, struct fio_file *f) { - struct fio_zone_info *zb, *ze, *z; + struct fio_zone_info *zb, *ze; uint32_t zone_idx_e; - uint64_t swd = 0; if (!f->zbd_info) return; @@ -763,17 +831,7 @@ void zbd_file_reset(struct thread_data *td, struct fio_file *f) zb = &f->zbd_info->zone_info[zbd_zone_idx(f, f->file_offset)]; zone_idx_e = zbd_zone_idx(f, f->file_offset + f->io_size); ze = &f->zbd_info->zone_info[zone_idx_e]; - for (z = zb ; z < ze; z++) { - pthread_mutex_lock(&z->mutex); - swd += z->wp - z->start; - } - pthread_mutex_lock(&f->zbd_info->mutex); - f->zbd_info->sectors_with_data = swd; - pthread_mutex_unlock(&f->zbd_info->mutex); - for (z = zb ; z < ze; z++) - pthread_mutex_unlock(&z->mutex); - dprint(FD_ZBD, "%s(%s): swd = %llu\n", __func__, f->file_name, - (unsigned long long) swd); + zbd_init_swd(f); /* * If data verification is enabled reset the affected zones before * writing any data to avoid that a zone reset has to be issued while @@ -1102,6 +1160,8 @@ static void zbd_post_submit(const struct io_u *io_u, bool success) } unlock: pthread_mutex_unlock(&z->mutex); + + zbd_check_swd(io_u->file); } bool zbd_unaligned_write(int error_code) @@ -1154,6 +1214,8 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u) io_u->ddir == DDIR_READ && td->o.read_beyond_wp) return io_u_accept; + zbd_check_swd(f); + pthread_mutex_lock(&zb->mutex); switch (io_u->ddir) { case DDIR_READ: @@ -1227,7 +1289,6 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u) } /* Check whether the zone reset threshold has been exceeded */ if (td->o.zrf.u.f) { - check_swd(td, f); if (f->zbd_info->sectors_with_data >= f->io_size * td->o.zrt.u.f && zbd_dec_and_reset_write_cnt(td, f)) { @@ -1248,7 +1309,6 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u) zb->reset_zone = 0; if (zbd_reset_zone(td, f, zb) < 0) goto eof; - check_swd(td, f); } /* Make writes occur at the write pointer */ assert(!zbd_zone_full(f, zb, min_bs));