From nobody Mon Nov 17 12:05:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603807030; cv=none; d=zohomail.com; s=zohoarc; b=AVXhZZh1fzX8ryppqWzyR5mhf4d9MOAZZlz0/dJbbCbgJdv/xSuxQKkZnIsytuCCTtMXJUQQFly1Jq4KYkqQcY4/W0pXzD/NVipsHBDmI2I5vSdo/Q2baHT353kYfBQmu98Ya7xlEnte+BXvtKmhsMBKsLLyFUXtn81zLTZnOKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603807030; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=wZTuWnB45c6bHWmlLJk/6WmCKmM3xNLscyekei4DbYk=; b=bfEI4cWnst3ZeEryplry5eAHy5s0vIxjrU0RSMC/uWqY7PVB0gEtiUF8Ju/f2vfNI6dLA0NSc4CtlC6pbPcVsmj18BLmLrw841JjwcKNyG0aFcbXcSs3EI1Xdj9vViVeVGaaoI+WmOjXeGlvVYzg4kVkxeFzcaxEaaWpV4SNZ0A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603807030119459.77596853651573; Tue, 27 Oct 2020 06:57:10 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-568-aW1ky8XMO0a0lUmcb2Rxew-1; Tue, 27 Oct 2020 09:57:07 -0400 Received: by mail-ed1-f69.google.com with SMTP id be19so682701edb.22 for ; Tue, 27 Oct 2020 06:57:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id d11sm1020685eds.83.2020.10.27.06.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 06:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603807029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wZTuWnB45c6bHWmlLJk/6WmCKmM3xNLscyekei4DbYk=; b=YwWfLw9pSto5zrViQ9k5FBYVgsUxuWRASkeYHqx/VVi1/4tzI+JH9hRB4UGbkVQwm+DP0e B+ch3MzLbej8OE2Dh3i88LIbEE+R8fp+wFcLbDe9ENUU1h5q0aLWXXJnpcBsK/wPkI4SGV H5Q+1f4GO5VzJFftq3ssI/OuY5+uubY= X-MC-Unique: aW1ky8XMO0a0lUmcb2Rxew-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wZTuWnB45c6bHWmlLJk/6WmCKmM3xNLscyekei4DbYk=; b=EF6M6bnrS8y1zIGIR9/VlUWNFaUfDPzDe88aeIifOAzqZyTfhrS+CA7Houn+ZCmm9d gP0gmZtIFpJ2FNUTHB/JO2jsJebmql1DVLHMz+SpmtbNcULpBPsCONk3fFYAILmwqoer f73TQhSNAcDT2C8NliQVHl3FKQkfOVvR9g1AUEHVO1fpnbEx5ZKnRz3hxVEtpTGg4GMa SQj1HIYguMZbLakwO+5SS/CZM0IFG/JgujD9yabrDc8fEvxGeOa0YbLBP+CFfP6y+lQd udaXUU9EP7tFE71vdN8MvOdya8S2xJpIUh1ABgoiZiu3Ln9C6JMYiB8Zp5Q16M1T38QE r2jA== X-Gm-Message-State: AOAM532bZ0u8z7XcHpo1WCdrRtnFLVRnbHkgxb7L8L5cEckkqrbNx+9F YpeytPDUHInkdzmglhAMRa3QKs4q3PyCwnd6ZSMVfWo+MSXRuSR1M9ZhmfbqOnyQdYAj0b2hgUn g2o05ZwuDAVsjMA== X-Received: by 2002:a17:906:7e0e:: with SMTP id e14mr2491163ejr.238.1603807026170; Tue, 27 Oct 2020 06:57:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1wYqlaQlG8sxRdujiq3rO5sh9mL8zesoXuQ6cAyg+E4ABW83HnXdcg42awns1qsnWrdInCg== X-Received: by 2002:a17:906:7e0e:: with SMTP id e14mr2491151ejr.238.1603807025948; Tue, 27 Oct 2020 06:57:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Klaus Jensen , qemu-block@nongnu.org, Fam Zheng , Keith Busch , Eric Auger , Stefan Hajnoczi , Kevin Wolf , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 14/25] block/nvme: Use definitions instead of magic values in add_io_queue() Date: Tue, 27 Oct 2020 14:55:36 +0100 Message-Id: <20201027135547.374946-15-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201027135547.374946-1-philmd@redhat.com> References: <20201027135547.374946-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Replace magic values by definitions, and simplifiy since the number of queues will never reach 64K. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Auger Reviewed-by: Stefan Hajnoczi --- block/nvme.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 9324f0bfdc4..2dfcf8c41d7 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -651,6 +651,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Err= or **errp) NvmeCmd cmd; unsigned queue_size =3D NVME_QUEUE_SIZE; =20 + assert(n <=3D UINT16_MAX); q =3D nvme_create_queue_pair(s, bdrv_get_aio_context(bs), n, queue_size, errp); if (!q) { @@ -659,8 +660,8 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Err= or **errp) cmd =3D (NvmeCmd) { .opcode =3D NVME_ADM_CMD_CREATE_CQ, .dptr.prp1 =3D cpu_to_le64(q->cq.iova), - .cdw10 =3D cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)), - .cdw11 =3D cpu_to_le32(0x3), + .cdw10 =3D cpu_to_le32(((queue_size - 1) << 16) | n), + .cdw11 =3D cpu_to_le32(NVME_CQ_IEN | NVME_CQ_PC), }; if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { error_setg(errp, "Failed to create CQ io queue [%u]", n); @@ -669,8 +670,8 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Err= or **errp) cmd =3D (NvmeCmd) { .opcode =3D NVME_ADM_CMD_CREATE_SQ, .dptr.prp1 =3D cpu_to_le64(q->sq.iova), - .cdw10 =3D cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)), - .cdw11 =3D cpu_to_le32(0x1 | (n << 16)), + .cdw10 =3D cpu_to_le32(((queue_size - 1) << 16) | n), + .cdw11 =3D cpu_to_le32(NVME_SQ_PC | (n << 16)), }; if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { error_setg(errp, "Failed to create SQ io queue [%u]", n); --=20 2.26.2