From nobody Wed Oct 8 10:21:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1600763913; cv=none; d=zohomail.com; s=zohoarc; b=lHWy1pSAT7IXo8f83HdpyPVasLEbEKPwxi46zuqb7Y3wrODJinxjAXmVngS09KZuh8m8kOfym/OutpPobLiX7FV1KmX4QIiAFETmUqFq7vwDTDBkRym4vRPpJzKnruANGucq3ljuTbqNyrah9r/h4vTGa8diAoaR+ixtKgkE+pU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600763913; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=xGl0Wf6pnfWpWYSfHB9A49lGc8kjUq8riXJkPMG2AM8=; b=EmydSoOsNcEIcH0XiKfXw2wJrW/fGNq2PPKGy1G4VvxLo6ROUkP0kCZubSVvBtUpOq9GGfsbhs33aqbF5pysTsR86vJD9n0bYfnVgO/PM37KfyRI8p0SztReQyrqsQIjXiH0C7HyoLrgUB/1jDzU4CLgCNyjK9lH7RRkUjRDO4E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1600763913204898.1296163559388; Tue, 22 Sep 2020 01:38:33 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-561-pys2GlcKPyy9ElQBYWqKzA-1; Tue, 22 Sep 2020 04:38:30 -0400 Received: by mail-wm1-f70.google.com with SMTP id t10so382963wmi.9 for ; Tue, 22 Sep 2020 01:38:30 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id i83sm3541626wma.22.2020.09.22.01.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 01:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600763912; 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=xGl0Wf6pnfWpWYSfHB9A49lGc8kjUq8riXJkPMG2AM8=; b=dQaptuIU0GNJ65rR2chV9Z9R4c4kaCFVQexLeTJhTJJlJC21reUrnGW5yMmQZjJ+OyIFZV b/rJEEz944r1j+J/J7DheRatRUZyKQpnylrTAdphNTiZshjplRXaHzgPDONJ26od2Eqq8o rCoT67OrJvBXbcN/5rL8MsqPYwYsUlw= X-MC-Unique: pys2GlcKPyy9ElQBYWqKzA-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=xGl0Wf6pnfWpWYSfHB9A49lGc8kjUq8riXJkPMG2AM8=; b=NuuxnbJsQwvmERYExcMrFKoqttV1bcaVOYwxKqM+geT3e4fyRXYdTjlRGFJnykGQ6Y gXkomTBEhjYU1wMIIIa5rf1zkV7+oJXYiwtr1W8q3MzXqhBI/IhqJEPX2pAIvSevBmpD 57mvR/+50MsuViwWjTHRzqU5MY2YdvP2R2wS94duObEk34ZNV3r+0cNVp79JeyFw2942 C9OkiPBGFNyMdKCdK+rVCiqKmerH0Biz53bMR98VPKvT2Qo8MHUCWMl0nZWYKeMBI6ei +RIHoBZbElsEhEawaNxx2u1HtqQj+bgcvaSVgAdxvLbC/WTXhgPmzlg5t4BiZAKmMnG6 nzLg== X-Gm-Message-State: AOAM530UM6MAqZ6nnz0LucRTRHPICxjgT7sePXm3cP/z4wSry1ltBlAa ugk8oUi1eHv2KNFs6ddgkEm8a2VlWy2gLHbYdfBf8MOekoviPaoebVYpQL7U6TUowJNRcLrhKcg 0a065zgS5Wa9RPQ== X-Received: by 2002:a05:600c:4149:: with SMTP id h9mr3316538wmm.86.1600763909478; Tue, 22 Sep 2020 01:38:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQLofMZAoDPTa2aZvcFu29fhUcwukrKKrzgPM8+1ptGSVoTwwZnHD0D9289WJpCJRdzF5n3g== X-Received: by 2002:a05:600c:4149:: with SMTP id h9mr3316519wmm.86.1600763909260; Tue, 22 Sep 2020 01:38:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Fam Zheng , Max Reitz , qemu-block@nongnu.org, Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/6] util/vfio-helpers: Pass page protections to qemu_vfio_pci_map_bar() Date: Tue, 22 Sep 2020 10:38:16 +0200 Message-Id: <20200922083821.578519-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200922083821.578519-1-philmd@redhat.com> References: <20200922083821.578519-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"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Pages are currently mapped READ/WRITE. To be able to use different protections, add a new argument to qemu_vfio_pci_map_bar(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/vfio-helpers.h | 2 +- block/nvme.c | 3 ++- util/vfio-helpers.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/qemu/vfio-helpers.h b/include/qemu/vfio-helpers.h index 1f057c2b9e4..4491c8e1a6e 100644 --- a/include/qemu/vfio-helpers.h +++ b/include/qemu/vfio-helpers.h @@ -22,7 +22,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_= t size, int qemu_vfio_dma_reset_temporary(QEMUVFIOState *s); void qemu_vfio_dma_unmap(QEMUVFIOState *s, void *host); void *qemu_vfio_pci_map_bar(QEMUVFIOState *s, int index, - uint64_t offset, uint64_t size, + uint64_t offset, uint64_t size, int prot, Error **errp); void qemu_vfio_pci_unmap_bar(QEMUVFIOState *s, int index, void *bar, uint64_t offset, uint64_t size); diff --git a/block/nvme.c b/block/nvme.c index f4f27b6da7d..5a4dc6a722a 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -712,7 +712,8 @@ static int nvme_init(BlockDriverState *bs, const char *= device, int namespace, goto out; } =20 - s->regs =3D qemu_vfio_pci_map_bar(s->vfio, 0, 0, NVME_BAR_SIZE, errp); + s->regs =3D qemu_vfio_pci_map_bar(s->vfio, 0, 0, NVME_BAR_SIZE, + PROT_READ | PROT_WRITE, errp); if (!s->regs) { ret =3D -EINVAL; goto out; diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 583bdfb36fc..9ac307e3d42 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -146,13 +146,13 @@ static int qemu_vfio_pci_init_bar(QEMUVFIOState *s, i= nt index, Error **errp) * Map a PCI bar area. */ void *qemu_vfio_pci_map_bar(QEMUVFIOState *s, int index, - uint64_t offset, uint64_t size, + uint64_t offset, uint64_t size, int prot, Error **errp) { void *p; assert_bar_index_valid(s, index); p =3D mmap(NULL, MIN(size, s->bar_region_info[index].size - offset), - PROT_READ | PROT_WRITE, MAP_SHARED, + prot, MAP_SHARED, s->device, s->bar_region_info[index].offset + offset); if (p =3D=3D MAP_FAILED) { error_setg_errno(errp, errno, "Failed to map BAR region"); --=20 2.26.2