From patchwork Tue Jul 24 07:41:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 172799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A14352C008C for ; Tue, 24 Jul 2012 17:42:23 +1000 (EST) Received: from localhost ([::1]:54539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StZl6-0003dd-Fg for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 03:42:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StZkj-0003Ms-TX for qemu-devel@nongnu.org; Tue, 24 Jul 2012 03:42:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StZki-0007Ji-PU for qemu-devel@nongnu.org; Tue, 24 Jul 2012 03:41:57 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:35164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StZki-0007Io-L7 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 03:41:56 -0400 Received: by mail-gh0-f173.google.com with SMTP id r14so6444553ghr.4 for ; Tue, 24 Jul 2012 00:41:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=bUcMkXyI2HDYIvsTW8S0G6lsL9jiK5Y56a7+Ry4867g=; b=xGnZcf7xOzkAfZvM/Vp5iYwXyJy6o1mlF0Yty63wbCbPjfbpYDAFdyvgNgOPNBfW7V MImRD8TIEjOnw87Ha2TaKD54xUxMXblxju/Gp8xQD+CeFZnjkA5egQ1j+U5SGRL2qd0y 4mIhB5FyG8VN2QIUfCQuVqp9gL0Gg/RSrHwZRUFsJlRDmR/LH/oDqHlsAMFM+c7kPtc1 zZBID0NKbAP+jOV+LEofEHICkcEY0Xx1JeT88337wDN8WV4lcwf3Mz+YRqSQNzw9TcLj /2gbVETUp03+XFKK1sxa/6H0s6SNMZ0XrOZLq+83IyDZtJfOq9fB8FUdMl9brDgV2zzi q3GQ== Received: by 10.42.29.4 with SMTP id p4mr13085654icc.30.1343115716205; Tue, 24 Jul 2012 00:41:56 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id k5sm1473308igq.12.2012.07.24.00.41.54 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 00:41:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 09:41:39 +0200 Message-Id: <1343115699-26377-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343115699-26377-1-git-send-email-pbonzini@redhat.com> References: <1343115699-26377-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.173 Subject: [Qemu-devel] [PATCH 2/2] qemu-nbd: add --cache and --aio options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add two options to tune the I/O implementation of qemu-nbd, matching the possibilities given by the QEMU -drive option. Signed-off-by: Paolo Bonzini --- qemu-nbd.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index 1c32290..1c1cf6a 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -33,7 +33,9 @@ #include #include -#define SOCKET_PATH "/var/lock/qemu-nbd-%s" +#define SOCKET_PATH "/var/lock/qemu-nbd-%s" +#define QEMU_NBD_OPT_CACHE 1 +#define QEMU_NBD_OPT_AIO 2 static NBDExport *exp; static int verbose; @@ -77,6 +79,10 @@ static void usage(const char *name) " -r, --read-only export read-only\n" " -s, --snapshot use snapshot file\n" " -n, --nocache disable host cache\n" +" --cache=MODE set cache mode (none, writeback, ...)\n" +#ifdef CONFIG_LINUX_AIO +" --aio=MODE set AIO mode (native or threads)\n" +#endif "\n" "Report bugs to \n" , name, NBD_DEFAULT_PORT, "DEVICE"); @@ -306,6 +312,10 @@ int main(int argc, char **argv) { "disconnect", 0, NULL, 'd' }, { "snapshot", 0, NULL, 's' }, { "nocache", 0, NULL, 'n' }, + { "cache", 1, NULL, QEMU_NBD_OPT_CACHE }, +#ifdef CONFIG_LINUX_AIO + { "aio", 1, NULL, QEMU_NBD_OPT_AIO }, +#endif { "shared", 1, NULL, 'e' }, { "persistent", 0, NULL, 't' }, { "verbose", 0, NULL, 'v' }, @@ -320,6 +330,10 @@ int main(int argc, char **argv) int ret; int fd; int persistent = 0; + bool seen_cache = false; +#ifdef CONFIG_LINUX_AIO + bool seen_aio = false; +#endif pthread_t client_thread; /* The client thread uses SIGTERM to interrupt the server. A signal @@ -336,8 +350,32 @@ int main(int argc, char **argv) flags |= BDRV_O_SNAPSHOT; break; case 'n': - flags |= BDRV_O_NOCACHE | BDRV_O_CACHE_WB; + optarg = (char *) "none"; + /* fallthrough */ + case QEMU_NBD_OPT_CACHE: + if (seen_cache) { + errx(EXIT_FAILURE, "-n and --cache can only be specified once"); + } + seen_cache = true; + if (bdrv_parse_cache_flags(optarg, &flags) == -1) { + errx(EXIT_FAILURE, "Invalid cache mode `%s'", optarg); + } break; +#ifdef CONFIG_LINUX_AIO + case QEMU_NBD_OPT_AIO: + if (seen_aio) { + errx(EXIT_FAILURE, "--aio can only be specified once"); + } + seen_aio = true; + if (!strcmp(optarg, "native")) { + flags |= BDRV_O_NATIVE_AIO; + } else if (!strcmp(optarg, "threads")) { + /* this is the default */ + } else { + errx(EXIT_FAILURE, "invalid aio mode `%s'", optarg); + } + break; +#endif case 'b': bindto = optarg; break;