Some of the checksums carry a lot of data. We unionize the checksum
header right now inside the verify header, causing a lot of wasted
space for the leaner variants.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
+/*
+ * Prepare for seperation of verify_header and checksum header
+ */
+static inline unsigned int __hdr_size(int fio_unused verify_type)
+{
+ return sizeof(struct verify_header);
+
+}
+
+static inline unsigned int hdr_size(struct verify_header *hdr)
+{
+ return sizeof(*hdr);
+}
+
/*
* Return data area 'header_num'
*/
/*
* Return data area 'header_num'
*/
struct io_u *io_u,
unsigned char header_num)
{
struct io_u *io_u,
unsigned char header_num)
{
- return io_u->buf + sizeof(*hdr) + header_num * hdr->len;
+ return io_u->buf + header_num * hdr->len + hdr_size(hdr);
}
static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
}
static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
};
sha512_init(&sha512_ctx);
};
sha512_init(&sha512_ctx);
- sha512_update(&sha512_ctx, p, hdr->len - sizeof(*hdr));
+ sha512_update(&sha512_ctx, p, hdr->len - hdr_size(hdr));
if (memcmp(hdr->sha512, sha512_ctx.buf, sizeof(sha512))) {
log_err("sha512: verify failed at %llu/%u\n",
if (memcmp(hdr->sha512, sha512_ctx.buf, sizeof(sha512))) {
log_err("sha512: verify failed at %llu/%u\n",
};
sha256_init(&sha256_ctx);
};
sha256_init(&sha256_ctx);
- sha256_update(&sha256_ctx, p, hdr->len - sizeof(*hdr));
+ sha256_update(&sha256_ctx, p, hdr->len - hdr_size(hdr));
if (memcmp(hdr->sha256, sha256_ctx.buf, sizeof(sha256))) {
log_err("sha256: verify failed at %llu/%u\n",
if (memcmp(hdr->sha256, sha256_ctx.buf, sizeof(sha256))) {
log_err("sha256: verify failed at %llu/%u\n",
void *p = io_u_verify_off(hdr, io_u, header_num);
unsigned char c;
void *p = io_u_verify_off(hdr, io_u, header_num);
unsigned char c;
- c = crc7(p, hdr->len - sizeof(*hdr));
+ c = crc7(p, hdr->len - hdr_size(hdr));
if (c != hdr->crc7) {
log_err("crc7: verify failed at %llu/%u\n",
if (c != hdr->crc7) {
log_err("crc7: verify failed at %llu/%u\n",
void *p = io_u_verify_off(hdr, io_u, header_num);
unsigned short c;
void *p = io_u_verify_off(hdr, io_u, header_num);
unsigned short c;
- c = crc16(p, hdr->len - sizeof(*hdr));
+ c = crc16(p, hdr->len - hdr_size(hdr));
if (c != hdr->crc16) {
log_err("crc16: verify failed at %llu/%u\n",
if (c != hdr->crc16) {
log_err("crc16: verify failed at %llu/%u\n",
void *p = io_u_verify_off(hdr, io_u, header_num);
unsigned long long c;
void *p = io_u_verify_off(hdr, io_u, header_num);
unsigned long long c;
- c = crc64(p, hdr->len - sizeof(*hdr));
+ c = crc64(p, hdr->len - hdr_size(hdr));
if (c != hdr->crc64) {
log_err("crc64: verify failed at %llu/%u\n",
if (c != hdr->crc64) {
log_err("crc64: verify failed at %llu/%u\n",
void *p = io_u_verify_off(hdr, io_u, header_num);
unsigned long c;
void *p = io_u_verify_off(hdr, io_u, header_num);
unsigned long c;
- c = crc32(p, hdr->len - sizeof(*hdr));
+ c = crc32(p, hdr->len - hdr_size(hdr));
if (c != hdr->crc32) {
log_err("crc32: verify failed at %llu/%u\n",
if (c != hdr->crc32) {
log_err("crc32: verify failed at %llu/%u\n",
- md5_update(&md5_ctx, p, hdr->len - sizeof(*hdr));
+ md5_update(&md5_ctx, p, hdr->len - hdr_size(hdr));
if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(hash))) {
log_err("md5: verify failed at %llu/%u\n",
if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(hash))) {
log_err("md5: verify failed at %llu/%u\n",
for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc) {
if (td->o.verify_offset)
for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc) {
if (td->o.verify_offset)
- memswp(p, p + td->o.verify_offset, sizeof(*hdr));
+ memswp(p, p + td->o.verify_offset, __hdr_size(hdr->verify_type));
hdr_inc = io_u->buflen;
if (td->o.verify_interval)
hdr_inc = td->o.verify_interval;
hdr_inc = io_u->buflen;
if (td->o.verify_interval)
hdr_inc = td->o.verify_interval;
- data_len = hdr_inc - sizeof(*hdr);
for (;p < io_u->buf + io_u->buflen; p += hdr_inc) {
hdr = p;
for (;p < io_u->buf + io_u->buflen; p += hdr_inc) {
hdr = p;
hdr->fio_magic = FIO_HDR_MAGIC;
hdr->verify_type = td->o.verify;
hdr->len = hdr_inc;
hdr->fio_magic = FIO_HDR_MAGIC;
hdr->verify_type = td->o.verify;
hdr->len = hdr_inc;
+ data_len = hdr_inc - hdr_size(hdr);
- data = p + sizeof(*hdr);
+ data = p + hdr_size(hdr);
switch (td->o.verify) {
case VERIFY_MD5:
fill_md5(hdr, data, data_len);
switch (td->o.verify) {
case VERIFY_MD5:
fill_md5(hdr, data, data_len);
assert(0);
}
if (td->o.verify_offset)
assert(0);
}
if (td->o.verify_offset)
- memswp(p, p + td->o.verify_offset, sizeof(*hdr));
+ memswp(p, p + td->o.verify_offset, hdr_size(hdr));