#include "crc/md5.h"
#include "crc/crc64.h"
#include "crc/crc32.h"
+#include "crc/crc32c.h"
#include "crc/crc16.h"
#include "crc/crc7.h"
#include "crc/sha256.h"
*/
static inline unsigned int __hdr_size(int verify_type)
{
- unsigned int len;
+ unsigned int len = len;
switch (verify_type) {
case VERIFY_NONE:
case VERIFY_CRC64:
len = sizeof(struct vhdr_crc64);
break;
+ case VERIFY_CRC32C:
case VERIFY_CRC32:
+ case VERIFY_CRC32C_INTEL:
len = sizeof(struct vhdr_crc32);
break;
case VERIFY_CRC16:
* Return data area 'header_num'
*/
static inline void *io_u_verify_off(struct verify_header *hdr,
- struct io_u *io_u,
- unsigned char header_num)
+ struct io_u *io_u, unsigned char header_num)
{
return io_u->buf + header_num * hdr->len + hdr_size(hdr);
}
static int verify_io_u_meta(struct verify_header *hdr, struct thread_data *td,
- struct io_u *io_u, unsigned int header_num)
+ struct io_u *io_u, unsigned int header_num)
{
struct vhdr_meta *vh = hdr_priv(hdr);
if (vh->offset != io_u->offset + header_num * td->o.verify_interval) {
log_err("meta: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len,
- hdr->len);
- return EIO;
+ io_u->offset + header_num * hdr->len, hdr->len);
+ return EILSEQ;
}
return 0;
if (memcmp(vh->sha512, sha512_ctx.buf, sizeof(sha512))) {
log_err("sha512: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len,
- hdr->len);
+ io_u->offset + header_num * hdr->len, hdr->len);
hexdump(vh->sha512, sizeof(vh->sha512));
hexdump(sha512_ctx.buf, sizeof(sha512));
- return EIO;
+ return EILSEQ;
}
return 0;
if (memcmp(vh->sha256, sha256_ctx.buf, sizeof(sha256))) {
log_err("sha256: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len,
- hdr->len);
+ io_u->offset + header_num * hdr->len, hdr->len);
hexdump(vh->sha256, sizeof(vh->sha256));
hexdump(sha256_ctx.buf, sizeof(sha256));
- return EIO;
+ return EILSEQ;
}
return 0;
}
static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
- unsigned char header_num)
+ unsigned char header_num)
{
void *p = io_u_verify_off(hdr, io_u, header_num);
struct vhdr_crc7 *vh = hdr_priv(hdr);
if (c != vh->crc7) {
log_err("crc7: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len,
- hdr->len);
+ io_u->offset + header_num * hdr->len, hdr->len);
log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
- return EIO;
+ return EILSEQ;
}
return 0;
}
static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+ unsigned int header_num)
{
void *p = io_u_verify_off(hdr, io_u, header_num);
struct vhdr_crc16 *vh = hdr_priv(hdr);
if (c != vh->crc16) {
log_err("crc16: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len,
- hdr->len);
+ io_u->offset + header_num * hdr->len, hdr->len);
log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
- return EIO;
+ return EILSEQ;
}
return 0;
}
static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+ unsigned int header_num)
{
void *p = io_u_verify_off(hdr, io_u, header_num);
struct vhdr_crc64 *vh = hdr_priv(hdr);
log_err("crc64: verify failed at %llu/%u\n",
io_u->offset + header_num * hdr->len,
hdr->len);
- log_err("crc64: wanted %llx, got %llx\n", (unsigned long long) vh->crc64, c);
- return EIO;
+ log_err("crc64: wanted %llx, got %llx\n",
+ (unsigned long long) vh->crc64, c);
+ return EILSEQ;
}
return 0;
}
static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+ unsigned int header_num)
{
void *p = io_u_verify_off(hdr, io_u, header_num);
struct vhdr_crc32 *vh = hdr_priv(hdr);
if (c != vh->crc32) {
log_err("crc32: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len,
- hdr->len);
+ io_u->offset + header_num * hdr->len, hdr->len);
log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
- return EIO;
+ return EILSEQ;
+ }
+
+ return 0;
+}
+
+static int verify_io_u_crc32c(struct verify_header *hdr, struct io_u *io_u,
+ unsigned int header_num)
+{
+ void *p = io_u_verify_off(hdr, io_u, header_num);
+ struct vhdr_crc32 *vh = hdr_priv(hdr);
+ uint32_t c;
+
+ dprint(FD_VERIFY, "crc32c verify io_u %p, len %u\n", io_u, hdr->len);
+
+ if (hdr->verify_type == VERIFY_CRC32C_INTEL)
+ c = crc32c_intel(p, hdr->len - hdr_size(hdr));
+ else
+ c = crc32c(p, hdr->len - hdr_size(hdr));
+
+ if (c != vh->crc32) {
+ log_err("crc32c: verify failed at %llu/%u\n",
+ io_u->offset + header_num * hdr->len, hdr->len);
+ log_err("crc32c: wanted %x, got %x\n", vh->crc32, c);
+ return EILSEQ;
}
return 0;
}
static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+ unsigned int header_num)
{
void *p = io_u_verify_off(hdr, io_u, header_num);
struct vhdr_md5 *vh = hdr_priv(hdr);
if (memcmp(vh->md5_digest, md5_ctx.hash, sizeof(hash))) {
log_err("md5: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len,
- hdr->len);
+ io_u->offset + header_num * hdr->len, hdr->len);
hexdump(vh->md5_digest, sizeof(vh->md5_digest));
hexdump(md5_ctx.hash, sizeof(hash));
- return EIO;
+ return EILSEQ;
}
return 0;
}
int verify_io_u_pattern(unsigned long pattern, unsigned long pattern_size,
- char *buf, unsigned int len, unsigned int mod)
+ char *buf, unsigned int len, unsigned int mod)
{
unsigned int i;
char split_pattern[4];
log_err("fio: got pattern %x, wanted %x. Bad bits %d\n",
buf[i], split_pattern[mod], bits);
log_err("fio: bad pattern block offset %u\n", i);
- return EIO;
+ return EILSEQ;
}
mod++;
if (mod == pattern_size)
hdr_inc = td->o.verify_interval;
ret = 0;
- for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc, hdr_num++) {
+ for (p = io_u->buf; p < io_u->buf + io_u->buflen;
+ p += hdr_inc, hdr_num++) {
if (ret && td->o.verify_fatal) {
td->terminate = 1;
break;
if (hdr->fio_magic != FIO_HDR_MAGIC) {
log_err("Bad verify header %x\n", hdr->fio_magic);
- return EIO;
+ return EILSEQ;
}
if (td->o.verify_pattern_bytes) {
dprint(FD_VERIFY, "pattern verify io_u %p, len %u\n",
io_u, hdr->len);
ret = verify_io_u_pattern(td->o.verify_pattern,
- td->o.verify_pattern_bytes,
- p + hdr_size,
- hdr_inc - hdr_size,
- hdr_size % 4);
+ td->o.verify_pattern_bytes,
+ p + hdr_size,
+ hdr_inc - hdr_size,
+ hdr_size % 4);
if (ret)
log_err("fio: verify failed at %llu/%u\n",
io_u->offset + hdr_num * hdr->len,
case VERIFY_CRC64:
ret = verify_io_u_crc64(hdr, io_u, hdr_num);
break;
+ case VERIFY_CRC32C:
+ case VERIFY_CRC32C_INTEL:
+ ret = verify_io_u_crc32c(hdr, io_u, hdr_num);
+ break;
case VERIFY_CRC32:
ret = verify_io_u_crc32(hdr, io_u, hdr_num);
break;
}
static void fill_meta(struct verify_header *hdr, struct thread_data *td,
- struct io_u *io_u, unsigned int header_num)
+ struct io_u *io_u, unsigned int header_num)
{
struct vhdr_meta *vh = hdr_priv(hdr);
vh->crc32 = crc32(p, len);
}
+static void fill_crc32c(struct verify_header *hdr, void *p, unsigned int len)
+{
+ struct vhdr_crc32 *vh = hdr_priv(hdr);
+
+ if (hdr->verify_type == VERIFY_CRC32C_INTEL)
+ vh->crc32 = crc32c_intel(p, len);
+ else
+ vh->crc32 = crc32c(p, len);
+}
+
static void fill_crc64(struct verify_header *hdr, void *p, unsigned int len)
{
struct vhdr_crc64 *vh = hdr_priv(hdr);
if (td->o.verify_interval)
hdr_inc = td->o.verify_interval;
- for (;p < io_u->buf + io_u->buflen; p += hdr_inc) {
+ for (; p < io_u->buf + io_u->buflen; p += hdr_inc) {
hdr = p;
hdr->fio_magic = FIO_HDR_MAGIC;
io_u, hdr->len);
fill_crc64(hdr, data, data_len);
break;
+ case VERIFY_CRC32C:
+ case VERIFY_CRC32C_INTEL:
+ dprint(FD_VERIFY, "fill crc32c io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_crc32c(hdr, data, data_len);
+ break;
case VERIFY_CRC32:
dprint(FD_VERIFY, "fill crc32 io_u %p, len %u\n",
io_u, hdr->len);
ipo = rb_entry(n, struct io_piece, rb_node);
rb_erase(n, &td->io_hist_tree);
- } else if (!list_empty(&td->io_hist_list)) {
- ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
- list_del(&ipo->list);
+ } else if (!flist_empty(&td->io_hist_list)) {
+ ipo = flist_entry(td->io_hist_list.next, struct io_piece, list);
+ flist_del(&ipo->list);
}
if (ipo) {