engines/libblkio: Add option libblkio_write_zeroes_on_trim

[fio.git] / engines / libblkio.c

diff --git a/engines/libblkio.c b/engines/libblkio.c
index 219bb0dc4bd8750848107be2483a61cb1f7adee8..66a9bd31f81ed6d195c54e421aa45764d8a4bcb4 100644 (file)
--- a/engines/libblkio.c
+++ b/engines/libblkio.c
@@ -41,6 +41,7 @@ struct fio_blkio_options {
 
        unsigned int hipri;
        unsigned int vectored;
+       unsigned int write_zeroes_on_trim;
 };
 
 static struct fio_option options[] = {
@@ -89,6 +90,16 @@ static struct fio_option options[] = {
                .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_LIBBLKIO,
        },
+       {
+               .name   = "libblkio_write_zeroes_on_trim",
+               .lname  = "Use blkioq_write_zeroes() for TRIM",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = offsetof(struct fio_blkio_options,
+                                  write_zeroes_on_trim),
+               .help   = "Use blkioq_write_zeroes() for TRIM instead of blkioq_discard()",
+               .category = FIO_OPT_C_ENGINE,
+               .group  = FIO_OPT_G_LIBBLKIO,
+       },
        {
                .name = NULL,
        },
@@ -455,8 +466,13 @@ static enum fio_q_status fio_blkio_queue(struct thread_data *td,
                        }
                        break;
                case DDIR_TRIM:
-                       blkioq_discard(data->q, io_u->offset, io_u->xfer_buflen,
-                                      io_u, 0);
+                       if (options->write_zeroes_on_trim) {
+                               blkioq_write_zeroes(data->q, io_u->offset,
+                                                   io_u->xfer_buflen, io_u, 0);
+                       } else {
+                               blkioq_discard(data->q, io_u->offset,
+                                              io_u->xfer_buflen, io_u, 0);
+                       }
                        break;
                case DDIR_SYNC:
                case DDIR_DATASYNC: