verify: add missing free(ptr);
[fio.git] / verify.c
index 838db10d3cef39ce56b18f0d7deaf4390a86ddf9..1c39fa2e877f14511f575bf847f14c55acdba634 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -25,6 +25,7 @@
 #include "crc/sha512.h"
 #include "crc/sha1.h"
 #include "crc/xxhash.h"
+#include "crc/sha3.h"
 
 static void populate_hdr(struct thread_data *td, struct io_u *io_u,
                         struct verify_header *hdr, unsigned int header_num,
@@ -41,13 +42,14 @@ void fill_buffer_pattern(struct thread_data *td, void *p, unsigned int len)
        (void)cpy_pattern(td->o.buffer_pattern, td->o.buffer_pattern_bytes, p, len);
 }
 
-void __fill_buffer(struct thread_options *o, unsigned long seed, void *p,
-                  unsigned int len)
+static void __fill_buffer(struct thread_options *o, unsigned long seed, void *p,
+                         unsigned int len)
 {
        __fill_random_buf_percentage(seed, p, o->compress_percentage, len, len, o->buffer_pattern, o->buffer_pattern_bytes);
 }
 
-unsigned long fill_buffer(struct thread_data *td, void *p, unsigned int len)
+static unsigned long fill_buffer(struct thread_data *td, void *p,
+                                unsigned int len)
 {
        struct frand_state *fs = &td->verify_state;
        struct thread_options *o = &td->o;
@@ -171,6 +173,18 @@ static inline unsigned int __hdr_size(int verify_type)
        case VERIFY_SHA512:
                len = sizeof(struct vhdr_sha512);
                break;
+       case VERIFY_SHA3_224:
+               len = sizeof(struct vhdr_sha3_224);
+               break;
+       case VERIFY_SHA3_256:
+               len = sizeof(struct vhdr_sha3_256);
+               break;
+       case VERIFY_SHA3_384:
+               len = sizeof(struct vhdr_sha3_384);
+               break;
+       case VERIFY_SHA3_512:
+               len = sizeof(struct vhdr_sha3_512);
+               break;
        case VERIFY_XXHASH:
                len = sizeof(struct vhdr_xxhash);
                break;
@@ -257,6 +271,7 @@ static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
        fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0644);
        if (fd < 0) {
                perror("open verify buf file");
+               free(ptr);
                return;
        }
 
@@ -392,7 +407,8 @@ static int verify_io_u_pattern(struct verify_header *hdr, struct vcont *vc)
                                (unsigned char)pattern[mod],
                                bits);
                        log_err("fio: bad pattern block offset %u\n", i);
-                       dump_verify_buffers(hdr, vc);
+                       vc->name = "pattern";
+                       log_verify_failure(hdr, vc);
                        return EILSEQ;
                }
                mod++;
@@ -429,6 +445,84 @@ static int verify_io_u_xxhash(struct verify_header *hdr, struct vcont *vc)
        return EILSEQ;
 }
 
+static int verify_io_u_sha3(struct verify_header *hdr, struct vcont *vc,
+                           struct fio_sha3_ctx *sha3_ctx, uint8_t *sha,
+                           unsigned int sha_size, const char *name)
+{
+       void *p = io_u_verify_off(hdr, vc);
+
+       dprint(FD_VERIFY, "%s verify io_u %p, len %u\n", name, vc->io_u, hdr->len);
+
+       fio_sha3_update(sha3_ctx, p, hdr->len - hdr_size(vc->td, hdr));
+       fio_sha3_final(sha3_ctx);
+
+       if (!memcmp(sha, sha3_ctx->sha, sha_size))
+               return 0;
+
+       vc->name = name;
+       vc->good_crc = sha;
+       vc->bad_crc = sha3_ctx->sha;
+       vc->crc_len = sha_size;
+       log_verify_failure(hdr, vc);
+       return EILSEQ;
+}
+
+static int verify_io_u_sha3_224(struct verify_header *hdr, struct vcont *vc)
+{
+       struct vhdr_sha3_224 *vh = hdr_priv(hdr);
+       uint8_t sha[SHA3_224_DIGEST_SIZE];
+       struct fio_sha3_ctx sha3_ctx = {
+               .sha = sha,
+       };
+
+       fio_sha3_224_init(&sha3_ctx);
+
+       return verify_io_u_sha3(hdr, vc, &sha3_ctx, vh->sha,
+                               SHA3_224_DIGEST_SIZE, "sha3-224");
+}
+
+static int verify_io_u_sha3_256(struct verify_header *hdr, struct vcont *vc)
+{
+       struct vhdr_sha3_256 *vh = hdr_priv(hdr);
+       uint8_t sha[SHA3_256_DIGEST_SIZE];
+       struct fio_sha3_ctx sha3_ctx = {
+               .sha = sha,
+       };
+
+       fio_sha3_256_init(&sha3_ctx);
+
+       return verify_io_u_sha3(hdr, vc, &sha3_ctx, vh->sha,
+                               SHA3_256_DIGEST_SIZE, "sha3-256");
+}
+
+static int verify_io_u_sha3_384(struct verify_header *hdr, struct vcont *vc)
+{
+       struct vhdr_sha3_384 *vh = hdr_priv(hdr);
+       uint8_t sha[SHA3_384_DIGEST_SIZE];
+       struct fio_sha3_ctx sha3_ctx = {
+               .sha = sha,
+       };
+
+       fio_sha3_384_init(&sha3_ctx);
+
+       return verify_io_u_sha3(hdr, vc, &sha3_ctx, vh->sha,
+                               SHA3_384_DIGEST_SIZE, "sha3-384");
+}
+
+static int verify_io_u_sha3_512(struct verify_header *hdr, struct vcont *vc)
+{
+       struct vhdr_sha3_512 *vh = hdr_priv(hdr);
+       uint8_t sha[SHA3_512_DIGEST_SIZE];
+       struct fio_sha3_ctx sha3_ctx = {
+               .sha = sha,
+       };
+
+       fio_sha3_512_init(&sha3_ctx);
+
+       return verify_io_u_sha3(hdr, vc, &sha3_ctx, vh->sha,
+                               SHA3_512_DIGEST_SIZE, "sha3-512");
+}
+
 static int verify_io_u_sha512(struct verify_header *hdr, struct vcont *vc)
 {
        void *p = io_u_verify_off(hdr, vc);
@@ -651,7 +745,7 @@ int verify_io_u_async(struct thread_data *td, struct io_u **io_u_ptr)
 
        if (io_u->flags & IO_U_F_IN_CUR_DEPTH) {
                td->cur_depth--;
-               io_u_clear(io_u, IO_U_F_IN_CUR_DEPTH);
+               io_u_clear(td, io_u, IO_U_F_IN_CUR_DEPTH);
        }
        flist_add_tail(&io_u->verify_list, &td->verify_list);
        *io_u_ptr = NULL;
@@ -758,7 +852,7 @@ static int verify_header(struct io_u *io_u, struct thread_data *td,
         * state of numberio, that would have been written to each block
         * in a previous run of fio, has been reached.
         */
-       if ((td_write(td) || td_rw(td)) && (td_min_bs(td) == td_max_bs(td)) &&
+       if (td_write(td) && (td_min_bs(td) == td_max_bs(td)) &&
            !td->o.time_based)
                if (!td->o.verify_only || td->o.loops == 0)
                        if (hdr->numberio != io_u->numberio) {
@@ -802,7 +896,7 @@ int verify_io_u(struct thread_data *td, struct io_u **io_u_ptr)
         * If the IO engine is faking IO (like null), then just pretend
         * we verified everything.
         */
-       if (td->io_ops->flags & FIO_FAKEIO)
+       if (td_ioengine_flagged(td, FIO_FAKEIO))
                return 0;
 
        if (io_u->flags & IO_U_F_TRIMMED) {
@@ -880,6 +974,18 @@ int verify_io_u(struct thread_data *td, struct io_u **io_u_ptr)
                case VERIFY_SHA512:
                        ret = verify_io_u_sha512(hdr, &vc);
                        break;
+               case VERIFY_SHA3_224:
+                       ret = verify_io_u_sha3_224(hdr, &vc);
+                       break;
+               case VERIFY_SHA3_256:
+                       ret = verify_io_u_sha3_256(hdr, &vc);
+                       break;
+               case VERIFY_SHA3_384:
+                       ret = verify_io_u_sha3_384(hdr, &vc);
+                       break;
+               case VERIFY_SHA3_512:
+                       ret = verify_io_u_sha3_512(hdr, &vc);
+                       break;
                case VERIFY_XXHASH:
                        ret = verify_io_u_xxhash(hdr, &vc);
                        break;
@@ -917,6 +1023,56 @@ static void fill_xxhash(struct verify_header *hdr, void *p, unsigned int len)
        vh->hash = XXH32_digest(state);
 }
 
+static void fill_sha3(struct fio_sha3_ctx *sha3_ctx, void *p, unsigned int len)
+{
+       fio_sha3_update(sha3_ctx, p, len);
+       fio_sha3_final(sha3_ctx);
+}
+
+static void fill_sha3_224(struct verify_header *hdr, void *p, unsigned int len)
+{
+       struct vhdr_sha3_224 *vh = hdr_priv(hdr);
+       struct fio_sha3_ctx sha3_ctx = {
+               .sha = vh->sha,
+       };
+
+       fio_sha3_224_init(&sha3_ctx);
+       fill_sha3(&sha3_ctx, p, len);
+}
+
+static void fill_sha3_256(struct verify_header *hdr, void *p, unsigned int len)
+{
+       struct vhdr_sha3_256 *vh = hdr_priv(hdr);
+       struct fio_sha3_ctx sha3_ctx = {
+               .sha = vh->sha,
+       };
+
+       fio_sha3_256_init(&sha3_ctx);
+       fill_sha3(&sha3_ctx, p, len);
+}
+
+static void fill_sha3_384(struct verify_header *hdr, void *p, unsigned int len)
+{
+       struct vhdr_sha3_384 *vh = hdr_priv(hdr);
+       struct fio_sha3_ctx sha3_ctx = {
+               .sha = vh->sha,
+       };
+
+       fio_sha3_384_init(&sha3_ctx);
+       fill_sha3(&sha3_ctx, p, len);
+}
+
+static void fill_sha3_512(struct verify_header *hdr, void *p, unsigned int len)
+{
+       struct vhdr_sha3_512 *vh = hdr_priv(hdr);
+       struct fio_sha3_ctx sha3_ctx = {
+               .sha = vh->sha,
+       };
+
+       fio_sha3_512_init(&sha3_ctx);
+       fill_sha3(&sha3_ctx, p, len);
+}
+
 static void fill_sha512(struct verify_header *hdr, void *p, unsigned int len)
 {
        struct vhdr_sha512 *vh = hdr_priv(hdr);
@@ -1083,6 +1239,26 @@ static void populate_hdr(struct thread_data *td, struct io_u *io_u,
                                                io_u, hdr->len);
                fill_sha512(hdr, data, data_len);
                break;
+       case VERIFY_SHA3_224:
+               dprint(FD_VERIFY, "fill sha3-224 io_u %p, len %u\n",
+                                               io_u, hdr->len);
+               fill_sha3_224(hdr, data, data_len);
+               break;
+       case VERIFY_SHA3_256:
+               dprint(FD_VERIFY, "fill sha3-256 io_u %p, len %u\n",
+                                               io_u, hdr->len);
+               fill_sha3_256(hdr, data, data_len);
+               break;
+       case VERIFY_SHA3_384:
+               dprint(FD_VERIFY, "fill sha3-384 io_u %p, len %u\n",
+                                               io_u, hdr->len);
+               fill_sha3_384(hdr, data, data_len);
+               break;
+       case VERIFY_SHA3_512:
+               dprint(FD_VERIFY, "fill sha3-512 io_u %p, len %u\n",
+                                               io_u, hdr->len);
+               fill_sha3_512(hdr, data, data_len);
+               break;
        case VERIFY_XXHASH:
                dprint(FD_VERIFY, "fill xxhash io_u %p, len %u\n",
                                                io_u, hdr->len);
@@ -1168,10 +1344,10 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
                io_u->buflen = ipo->len;
                io_u->numberio = ipo->numberio;
                io_u->file = ipo->file;
-               io_u_set(io_u, IO_U_F_VER_LIST);
+               io_u_set(td, io_u, IO_U_F_VER_LIST);
 
                if (ipo->flags & IP_F_TRIMMED)
-                       io_u_set(io_u, IO_U_F_TRIMMED);
+                       io_u_set(td, io_u, IO_U_F_TRIMMED);
 
                if (!fio_file_open(io_u->file)) {
                        int r = td_io_open_file(td, io_u->file);
@@ -1210,6 +1386,7 @@ void fio_verify_init(struct thread_data *td)
 {
        if (td->o.verify == VERIFY_CRC32C_INTEL ||
            td->o.verify == VERIFY_CRC32C) {
+               crc32c_arm64_probe();
                crc32c_intel_probe();
        }
 }
@@ -1255,7 +1432,7 @@ static void *verify_async_thread(void *data)
                        io_u = flist_first_entry(&list, struct io_u, verify_list);
                        flist_del_init(&io_u->verify_list);
 
-                       io_u_set(io_u, IO_U_F_NO_FILE_PUT);
+                       io_u_set(td, io_u, IO_U_F_NO_FILE_PUT);
                        ret = verify_io_u(td, &io_u);
 
                        put_io_u(td, io_u);
@@ -1290,7 +1467,7 @@ int verify_async_init(struct thread_data *td)
        pthread_attr_t attr;
 
        pthread_attr_init(&attr);
-       pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
+       pthread_attr_setstacksize(&attr, 2 * PTHREAD_STACK_MIN);
 
        td->verify_thread_exit = 0;
 
@@ -1471,7 +1648,7 @@ struct all_io_list *get_all_io_list(int save_mask, size_t *sz)
 static int open_state_file(const char *name, const char *prefix, int num,
                           int for_write)
 {
-       char out[64];
+       char out[PATH_MAX];
        int flags;
        int fd;
 
@@ -1485,6 +1662,7 @@ static int open_state_file(const char *name, const char *prefix, int num,
        fd = open(out, flags, 0644);
        if (fd == -1) {
                perror("fio: open state file");
+               log_err("fio: state file: %s (for_write=%d)\n", out, for_write);
                return -1;
        }