From nobody Mon Nov 17 11:51:52 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=1603807089; cv=none; d=zohomail.com; s=zohoarc; b=X9u3qqaf24QdDlUCZrBQjygQIugojqstZgkqpxlVnSWe5Goa5wm/B3lW/qoH9qQVEEYmFBwPxAWV/nRL9Qu+AqrXXnK8S44STjykA6G7jd+dPwdyo5FGAFifoplD35UmxipmmaewgRGWq+vs59JPzLNZk+svY5T/1mZRCMQwda0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603807089; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MB1ipRfRNkXChQukvt9rriPJxQdgZRtBkWvpvX32y+s=; b=kJi/yYdY3GXt9tNr3e/+uqdBbXKeNotL9RMXgJt0unsQ2ydnTuGy7edvxUUIjXdwJl+2laC+HhhhNFv2e+MEA33OL/9vVdn1xEfxngRtCCLbGDKvhwJ++aOHVKDGRBom1Rn0pRqM2l4JUeFO4sNNhi2NXGOgUhocQM+ucOaf47c= 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 1603807089884758.3103213022243; Tue, 27 Oct 2020 06:58:09 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-348-NNGhBfmqOFeLxN9iadVC7w-1; Tue, 27 Oct 2020 09:58:06 -0400 Received: by mail-ej1-f70.google.com with SMTP id z18so955017eji.1 for ; Tue, 27 Oct 2020 06:58:06 -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 11sm1084734ejy.19.2020.10.27.06.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 06:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603807089; 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=MB1ipRfRNkXChQukvt9rriPJxQdgZRtBkWvpvX32y+s=; b=Fh6fs/uJ16jOO7qNxFtCQ/EdPx4VwSJhjBWsBs0x2g9B70r1IxGCkkOtEJx53kFwuTpDjA 7PHIvpedm1lzekqMa/JUxs2XnxRAHImJ2o/MATQn+6wlJ92q9zH8kz+GeDnWVjyjXPmBe7 rICNfESuVMcGxtBZSdLL/T+aoj4L6NY= X-MC-Unique: NNGhBfmqOFeLxN9iadVC7w-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=MB1ipRfRNkXChQukvt9rriPJxQdgZRtBkWvpvX32y+s=; b=UdBrEcpJtLZYyJCxyylIJF47DRtihOwQbvfIGwE4T38VtTjBVKxUjfRiCis+yIK3ck 70TVgxDZF0tIht8hgBpB4cIJrQgKSCr4INd8MBwyfs2/W7f+mvWW2v5wvhHQE40z8Ocn TBTHjsbvz99bpRrp3Z/8jKjLBUw5Ah94kgeUi5vT8YpuTX3BEM+u/GyaavHFQ6rYk3je cyAz1XfkLwZdZwtBZxez+kgRg1Ztob6Xcu1YA7wllxlt83BXYRXucbwWG3hWXhz1qK9l JG6nVcx7NfSbiXqRD3EUd+oRN09GUV2jz+c2cAjFJXPJf/IvYk9k0fBsC63ZF9b8UKdv Fvfg== X-Gm-Message-State: AOAM532xmNMRG30BEiV5mIsTXFRuoShbAd/old4Ofwe0pvTBbkvWRcSx IPXLn0no6PdKiejOUM+0a7jTvr0qXxwvBl5Q96WbKJ9e2u9ug55u2gDzIBB9mGdc2Hh7nKbLFIh MapWxu8kxmsLmQw== X-Received: by 2002:a17:906:d89:: with SMTP id m9mr2683053eji.18.1603807084942; Tue, 27 Oct 2020 06:58:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymVc4dVnOkyLbfsI+Fr2X1rcFLIDMM9dqqTlvJbktlhH+2ZQuRpkw8vcWq5D7Ppx2VxD6+VA== X-Received: by 2002:a17:906:d89:: with SMTP id m9mr2683032eji.18.1603807084740; Tue, 27 Oct 2020 06:58:04 -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: [RFC PATCH 25/25] block/nvme: Fix use of write-only doorbells page on Aarch64 arch Date: Tue, 27 Oct 2020 14:55:47 +0100 Message-Id: <20201027135547.374946-26-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) qemu_vfio_pci_map_bar() calls mmap(), and mmap(2) states: 'offset' must be a multiple of the page size as returned by sysconf(_SC_PAGE_SIZE). In commit f68453237b9 we started to use an offset of 4K which broke this contract on Aarch64 arch. Fix by mapping at offset 0, and and accessing doorbells at offset=3D4K. Fixes: f68453237b9 ("block/nvme: Map doorbells pages write-only") Reported-by: Eric Auger Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Auger Reviewed-by: Stefan Hajnoczi --- block/nvme.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index c1c52bae44f..ff645eefe6a 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -94,6 +94,7 @@ typedef struct { struct BDRVNVMeState { AioContext *aio_context; QEMUVFIOState *vfio; + void *bar0_wo_map; /* Memory mapped registers */ volatile struct { uint32_t sq_tail; @@ -778,8 +779,10 @@ static int nvme_init(BlockDriverState *bs, const char = *device, int namespace, } } =20 - s->doorbells =3D qemu_vfio_pci_map_bar(s->vfio, 0, sizeof(NvmeBar), - NVME_DOORBELL_SIZE, PROT_WRITE, e= rrp); + s->bar0_wo_map =3D qemu_vfio_pci_map_bar(s->vfio, 0, 0, + sizeof(NvmeBar) + NVME_DOORBELL= _SIZE, + PROT_WRITE, errp); + s->doorbells =3D (void *)((uintptr_t)s->bar0_wo_map + sizeof(NvmeBar)); if (!s->doorbells) { ret =3D -EINVAL; goto out; @@ -913,8 +916,8 @@ static void nvme_close(BlockDriverState *bs) &s->irq_notifier[MSIX_SHARED_IRQ_IDX], false, NULL, NULL); event_notifier_cleanup(&s->irq_notifier[MSIX_SHARED_IRQ_IDX]); - qemu_vfio_pci_unmap_bar(s->vfio, 0, (void *)s->doorbells, - sizeof(NvmeBar), NVME_DOORBELL_SIZE); + qemu_vfio_pci_unmap_bar(s->vfio, 0, s->bar0_wo_map, + 0, sizeof(NvmeBar) + NVME_DOORBELL_SIZE); qemu_vfio_close(s->vfio); =20 g_free(s->device); --=20 2.26.2