From nobody Mon Nov 17 12:05:12 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=1603807072; cv=none; d=zohomail.com; s=zohoarc; b=NQo133jjodASWf3b2+p1sxuo+RbdajvrXq2arLsrO8uRzUE7jvHCXdj3itfS9pZ+ikYDkPd1BY3m2M2ZrlQCAQEAX63pMLGEwoKUz2CFncQ2VCjxTDxBm7yOBVXZzSDSW62OIpHlnVipnB9t2lInWVQgZAc2e3hPzY5mNo8PFJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603807072; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=aGgz+XLiFf+ohpuvMEd9wbrelu41fy1wd5IWGvE3gyY=; b=ZzqcSt47zTV9fIld+vxSE0xYHA9VN/mi+7UtTC5IZ+zZ1qtIlf/ikYnek60cQemTxTkWZ2uW9GSRUMpH5HnrQO7UQsgYrShk6KTq8F0qeCbWVq+22OL1ycuj+jAed4nmpRHJd12InzYrYQQ0okxr91UxdRSs1JyTFE6nFl4wtbU= 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 1603807072631591.1286283965471; Tue, 27 Oct 2020 06:57:52 -0700 (PDT) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-460-WjeX4r6HP3OCevjcrbQETg-1; Tue, 27 Oct 2020 09:57:50 -0400 Received: by mail-ej1-f71.google.com with SMTP id z25so946971ejd.2 for ; Tue, 27 Oct 2020 06:57:49 -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 h22sm1129238ejc.80.2020.10.27.06.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 06:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603807072; 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=aGgz+XLiFf+ohpuvMEd9wbrelu41fy1wd5IWGvE3gyY=; b=QfFjLa+BDYFeYswrPwoP+C4BQNq7BzneUSqyUXjrun99cfNbNWJFABws4tGTfa3FuWxBa4 VvOxPK1iqSZ++QAkyPg4YNn2si89A+I7Us9HClF8Oswzjv+vuB9LFCynAkelxlOkDpBavX RHRr2/Ml3Rrx83U9HOPjKdKdcIXemzY= X-MC-Unique: WjeX4r6HP3OCevjcrbQETg-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=aGgz+XLiFf+ohpuvMEd9wbrelu41fy1wd5IWGvE3gyY=; b=bkdjuci0B9artBcqxeCl5pbHoULShvxIRZ/wrdoDKxqoaMWja1SN5DVT/NqAmHxjZo F8m4AWJ2iXCv7XUYMoKpQ0cW3JmkQaVlVXiezC1vvJqecpORW6WOvFCyeDMecW7fbzxy QX3XmrnV0/9/qvZdvqwyumplpOw6QavE40nUfkk+s0KCyG3gDLOEtR8c0AoX6ev8E0r4 /jC6Bftk2EZinyyGfP2wmVvUWISMUs4vt73gb0l8Xjw2+N8EgQD1fzdLn1JOnd6BBSnC OKfk7HrQIKa2vmvkEo2c4AvNTWUNa/ti/af27De2AAaeTGppFYCA+QOWMVDAx8ho/dHs HWQA== X-Gm-Message-State: AOAM531IN1RBz2dnKgQxxRotvFFU9seabm4GiAtv8Aghyk5v3dHIFX0o upeW5b5XmTl4BseWBJn+yYhgFIrB/w0IvfauAUpsxc6uOKwV7zsGMW4FtojQGnKYHaczEToB3Re EAdbiB+UmLOz+/g== X-Received: by 2002:a17:906:6a94:: with SMTP id p20mr2404751ejr.499.1603807068875; Tue, 27 Oct 2020 06:57:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwOUz6H00BT4J8Of8oTGNZFsFpvU1WqANY1FB+xfxYbL26MBj/7nMSy4BYnPJXl69yqxaYDQ== X-Received: by 2002:a17:906:6a94:: with SMTP id p20mr2404735ejr.499.1603807068718; Tue, 27 Oct 2020 06:57:48 -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 22/25] block/nvme: Change size and alignment of queue Date: Tue, 27 Oct 2020 14:55:44 +0100 Message-Id: <20201027135547.374946-23-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) From: Eric Auger In preparation of 64kB host page support, let's change the size and alignment of the queue so that the VFIO DMA MAP succeeds. We align on the host page size. Signed-off-by: Eric Auger Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi --- block/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index ad70303c5c1..941f96b4c92 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -167,9 +167,9 @@ static bool nvme_init_queue(BDRVNVMeState *s, NVMeQueue= *q, size_t bytes; int r; =20 - bytes =3D ROUND_UP(nentries * entry_bytes, s->page_size); + bytes =3D ROUND_UP(nentries * entry_bytes, qemu_real_host_page_size); q->head =3D q->tail =3D 0; - q->queue =3D qemu_try_memalign(s->page_size, bytes); + q->queue =3D qemu_try_memalign(qemu_real_host_page_size, bytes); if (!q->queue) { error_setg(errp, "Cannot allocate queue"); return false; --=20 2.26.2