From nobody Thu May 16 01:51:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1566319729; cv=none; d=zoho.com; s=zohoarc; b=egZ5/11Yjw07SZvOb+MPZK/sLqwVWaIRPY1W7jXaNgcGLLYylrSLskTyzzM6zSawD/3rWi0N6iNWSSwFKvDgty3Ue7RydLXNvZgDIAGGOFNcjnoMMjmuRdPOkS6pzk9yjDhVeF2gbAGt0KuN4dq4z0tbgILIXGxLRvJdILOuEpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566319729; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=eAYZWpkpLmwPWObu9BPZH8Dl17wQZVjLdftadK+wofg=; b=imAgGnrRyVgWSMrI7fC5S0zfBGVGnD8fpS6M0swBhH3KhflNJjkNLkY6vhDAZEtS877IrBkG2u/ApMF6Lwo08lptR1jKuNXNV57g6W2iP8xy8swebfUCDrCDj+MB5Na8TXX0aRas+b74jXFy+FAPSe/2f/NHWC/bPEcaB3mvrUQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566319729472109.6397453833955; Tue, 20 Aug 2019 09:48:49 -0700 (PDT) Received: from localhost ([::1]:39796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i07JQ-0005Kx-4J for importer@patchew.org; Tue, 20 Aug 2019 12:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47721) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i07Hb-0003ug-7m for qemu-devel@nongnu.org; Tue, 20 Aug 2019 12:46:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i07HZ-0002TW-8n for qemu-devel@nongnu.org; Tue, 20 Aug 2019 12:46:54 -0400 Received: from relay.sw.ru ([185.231.240.75]:36362) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i07HY-0002PT-Vv; Tue, 20 Aug 2019 12:46:53 -0400 Received: from [10.94.4.71] (helo=dptest2.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1i07HT-0006UE-3q; Tue, 20 Aug 2019 19:46:47 +0300 From: Denis Plotnikov To: qemu-devel@nongnu.org Date: Tue, 20 Aug 2019 19:46:16 +0300 Message-Id: <20190820164616.4072-1-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 2.17.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v10] qemu-io: add pattern file for write command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The patch allows to provide a pattern file for write command. There was no similar ability before. Signed-off-by: Denis Plotnikov Reviewed-by: Eric Blake --- v10: * fix overflow [Max] * remove casting to bool [Max, Eric] * fix wording [Max] v9: * replace flag cast to int with bool [Eric] * fix the error message [Eric] * use qemu_io_free instead of qemu_vfree [Eric] * add function description [Eric] v8: fix according to Max's comments * get rid of unnecessary buffer for the pattern * buffer allocation just in bytes * take into account the missalign offset * don't copy file name * changed char* to const char* in input params v7: * fix variable naming * make code more readable * extend help for write command v6: * the pattern file is read once to reduce io v5: * file name initiated with null to make compilers happy v4: * missing signed-off clause added v3: * missing file closing added * exclusive flags processing changed * buffer void* converted to char* to fix pointer arithmetics * file reading error processing added --- qemu-io-cmds.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 6 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 09750a23ce..f411811d95 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -351,6 +351,79 @@ static void qemu_io_free(void *p) qemu_vfree(p); } =20 +/* + * qemu_io_alloc_from_file() + * + * Allocates the buffer and populates it with the content of the given file + * up to @len bytes. If the file length is less than @len, then the buffer + * is populated with the file content cyclically. + * + * @blk - the block backend where the buffer content is going to be writte= n to + * @len - the buffer length + * @file_name - the file to read the content from + * + * Returns: the buffer pointer on success + * NULL on error + */ +static void *qemu_io_alloc_from_file(BlockBackend *blk, size_t len, + const char *file_name) +{ + char *buf, *buf_origin; + FILE *f =3D fopen(file_name, "r"); + int pattern_len; + + if (!f) { + perror(file_name); + return NULL; + } + + if (qemuio_misalign) { + len +=3D MISALIGN_OFFSET; + } + + buf_origin =3D buf =3D blk_blockalign(blk, len); + + if (qemuio_misalign) { + buf_origin +=3D MISALIGN_OFFSET; + buf +=3D MISALIGN_OFFSET; + len -=3D MISALIGN_OFFSET; + } + + pattern_len =3D fread(buf_origin, 1, len, f); + + if (ferror(f)) { + perror(file_name); + goto error; + } + + if (pattern_len =3D=3D 0) { + fprintf(stderr, "%s: file is empty\n", file_name); + goto error; + } + + fclose(f); + + if (len > pattern_len) { + len -=3D pattern_len; + buf +=3D pattern_len; + + while (len > 0) { + size_t len_to_copy =3D MIN(pattern_len, len); + + memcpy(buf, buf_origin, len_to_copy); + + len -=3D len_to_copy; + buf +=3D len_to_copy; + } + } + + return buf_origin; + +error: + qemu_io_free(buf_origin); + return NULL; +} + static void dump_buffer(const void *buffer, int64_t offset, int64_t len) { uint64_t i; @@ -949,6 +1022,7 @@ static void write_help(void) " -n, -- with -z, don't allow slow fallback\n" " -p, -- ignored for backwards compatibility\n" " -P, -- use different pattern to fill file\n" +" -s, -- use a pattern file to fill the write buffer\n" " -C, -- report statistics in a machine parsable format\n" " -q, -- quiet mode, do not show I/O statistics\n" " -u, -- with -z, allow unmapping\n" @@ -965,7 +1039,7 @@ static const cmdinfo_t write_cmd =3D { .perm =3D BLK_PERM_WRITE, .argmin =3D 2, .argmax =3D -1, - .args =3D "[-bcCfnquz] [-P pattern] off len", + .args =3D "[-bcCfnquz] [-P pattern | -s source_file] off len", .oneline =3D "writes a number of bytes at a specified offset", .help =3D write_help, }; @@ -974,7 +1048,7 @@ static int write_f(BlockBackend *blk, int argc, char *= *argv) { struct timeval t1, t2; bool Cflag =3D false, qflag =3D false, bflag =3D false; - bool Pflag =3D false, zflag =3D false, cflag =3D false; + bool Pflag =3D false, zflag =3D false, cflag =3D false, sflag =3D fals= e; int flags =3D 0; int c, cnt, ret; char *buf =3D NULL; @@ -983,8 +1057,9 @@ static int write_f(BlockBackend *blk, int argc, char *= *argv) /* Some compilers get confused and warn if this is not initialized. */ int64_t total =3D 0; int pattern =3D 0xcd; + const char *file_name =3D NULL; =20 - while ((c =3D getopt(argc, argv, "bcCfnpP:quz")) !=3D -1) { + while ((c =3D getopt(argc, argv, "bcCfnpP:quzs:")) !=3D -1) { switch (c) { case 'b': bflag =3D true; @@ -1020,6 +1095,10 @@ static int write_f(BlockBackend *blk, int argc, char= **argv) case 'z': zflag =3D true; break; + case 's': + sflag =3D true; + file_name =3D optarg; + break; default: qemuio_command_usage(&write_cmd); return -EINVAL; @@ -1051,8 +1130,9 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) return -EINVAL; } =20 - if (zflag && Pflag) { - printf("-z and -P cannot be specified at the same time\n"); + if (zflag + Pflag + sflag > 1) { + printf("Only one of -z, -P, and -s " + "can be specified at the same time\n"); return -EINVAL; } =20 @@ -1088,7 +1168,14 @@ static int write_f(BlockBackend *blk, int argc, char= **argv) } =20 if (!zflag) { - buf =3D qemu_io_alloc(blk, count, pattern); + if (sflag) { + buf =3D qemu_io_alloc_from_file(blk, count, file_name); + if (!buf) { + return -EINVAL; + } + } else { + buf =3D qemu_io_alloc(blk, count, pattern); + } } =20 gettimeofday(&t1, NULL); --=20 2.17.0