{"id":808118,"url":"http://patchwork.ozlabs.org/api/patches/808118/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831082210.8362-2-stefanha@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170831082210.8362-2-stefanha@redhat.com>","list_archive_url":null,"date":"2017-08-31T08:21:56","name":"[PULL,for-2.10,01/15] nvme: Fix get/set number of queues feature, again","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2f6f1ce67a4a35b79bc3f7e3ae9be662fa3a920e","submitter":{"id":17227,"url":"http://patchwork.ozlabs.org/api/people/17227/?format=json","name":"Stefan Hajnoczi","email":"stefanha@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831082210.8362-2-stefanha@redhat.com/mbox/","series":[{"id":766,"url":"http://patchwork.ozlabs.org/api/series/766/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=766","date":"2017-08-31T08:21:55","name":"[PULL,for-2.10,01/15] nvme: Fix get/set number of queues feature, again","version":1,"mbox":"http://patchwork.ozlabs.org/series/766/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808118/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808118/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=stefanha@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjb3N1Gcnz9s3w\n\tfor ;\n\tThu, 31 Aug 2017 18:22:56 +1000 (AEST)","from localhost ([::1]:54468 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnKkY-00059r-6O\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 04:22:54 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42352)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnKk0-00059A-5q\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:21 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnKjz-0005mX-2a\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:20 -0400","from mx1.redhat.com ([209.132.183.28]:45104)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnKjy-0005mJ-T7\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:19 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id E251B25BB4;\n\tThu, 31 Aug 2017 08:22:17 +0000 (UTC)","from localhost (ovpn-117-89.ams2.redhat.com [10.36.117.89])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 3933A91B35;\n\tThu, 31 Aug 2017 08:22:15 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com E251B25BB4","From":"Stefan Hajnoczi ","To":"","Date":"Thu, 31 Aug 2017 09:21:56 +0100","Message-Id":"<20170831082210.8362-2-stefanha@redhat.com>","In-Reply-To":"<20170831082210.8362-1-stefanha@redhat.com>","References":"<20170831082210.8362-1-stefanha@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tThu, 31 Aug 2017 08:22:18 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL for-2.10 01/15] nvme: Fix get/set number of\n\tqueues feature, again","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Keith Busch ,\n\tPeter Maydell ,\n\tAlex Friedman ,\n\tStefan Hajnoczi , Dan Aloni ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Dan Aloni \n\nThe number of queues that should be return by the admin command should:\n\n 1) Only mention the number of non-admin queues.\n 2) It is zero-based, meaning that '0 == one non-admin queue',\n '1 == two non-admin queues', and so forth.\n\nBecause our `num_queues` means the number of queues _plus_ the admin\nqueue, then the right calculation for the number returned from the admin\ncommand is `num_queues - 2`, combining the two requirements mentioned.\n\nThe issue was discovered by reducing num_queues from 64 to 8 and running\na Linux VM with an SMP parameter larger than that (e.g. 22). It tries to\nutilize all queues, and therefore fails with an invalid queue number\nwhen trying to queue I/Os on the last queue.\n\nSigned-off-by: Dan Aloni \nCC: Alex Friedman \nCC: Keith Busch \nCC: Stefan Hajnoczi \nReviewed-by: Keith Busch \nSigned-off-by: Stefan Hajnoczi \n---\n hw/block/nvme.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/hw/block/nvme.c b/hw/block/nvme.c\nindex 6071dc12d8..9aa32692a3 100644\n--- a/hw/block/nvme.c\n+++ b/hw/block/nvme.c\n@@ -615,7 +615,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)\n result = blk_enable_write_cache(n->conf.blk);\n break;\n case NVME_NUMBER_OF_QUEUES:\n- result = cpu_to_le32((n->num_queues - 1) | ((n->num_queues - 1) << 16));\n+ result = cpu_to_le32((n->num_queues - 2) | ((n->num_queues - 2) << 16));\n break;\n default:\n return NVME_INVALID_FIELD | NVME_DNR;\n@@ -636,7 +636,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)\n break;\n case NVME_NUMBER_OF_QUEUES:\n req->cqe.result =\n- cpu_to_le32((n->num_queues - 1) | ((n->num_queues - 1) << 16));\n+ cpu_to_le32((n->num_queues - 2) | ((n->num_queues - 2) << 16));\n break;\n default:\n return NVME_INVALID_FIELD | NVME_DNR;\n","prefixes":["PULL","for-2.10","01/15"]}