From patchwork Fri Apr 3 17:00:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Zhao X-Patchwork-Id: 1265938 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48tt153kmdz9sRf for ; Fri, 3 Apr 2020 19:11:05 +1100 (AEDT) Received: from localhost ([::1]:51804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKHPr-0002pn-CA for incoming@patchwork.ozlabs.org; Fri, 03 Apr 2020 04:11:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43289) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKHOU-0000ua-Ae for qemu-devel@nongnu.org; Fri, 03 Apr 2020 04:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKHOT-0005gH-8r for qemu-devel@nongnu.org; Fri, 03 Apr 2020 04:09:38 -0400 Received: from mga01.intel.com ([192.55.52.88]:21024) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKHOS-0005cT-VM for qemu-devel@nongnu.org; Fri, 03 Apr 2020 04:09:37 -0400 IronPort-SDR: yXWWt1MUAmpDtNzNsr9MQX0fLpeJKx+gJ3cInbGzxfAaynhDi4LgPKRBmo0gcPmAQ25BP+LZkv 9thRbNpGL+jQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2020 01:09:33 -0700 IronPort-SDR: 5Zolj/Qeuu7/qv/+rfE4AznJe1L42UgCAFgeny6H3BNKCzCyFg8vQIEHmOCCQJ9vksaeAlZIpV A7L7le4ot2Ow== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,339,1580803200"; d="scan'208";a="449944029" Received: from dpdk-zhirun.sh.intel.com ([10.67.119.121]) by fmsmga005.fm.intel.com with ESMTP; 03 Apr 2020 01:09:31 -0700 From: Yan Zhao To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] hw/vfio: drop guest writes to ro regions Date: Fri, 3 Apr 2020 17:00:24 +0000 Message-Id: <20200403170024.20676-1-yan.y.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403165657.20566-1-yan.y.zhao@intel.com> References: <20200403165657.20566-1-yan.y.zhao@intel.com> X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 192.55.52.88 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Zhao , pbonzini@redhat.com, alex.williamson@redhat.com, philmd@redhat.com, xin.zeng@intel.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" for vfio regions that are without write permission, drop guest writes to those regions. Signed-off-by: Yan Zhao Signed-off-by: Xin Zeng --- hw/vfio/common.c | 8 +++++++- hw/vfio/trace-events | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 0b3593b3c0..fd6ee1fe3e 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -190,6 +190,11 @@ void vfio_region_write(void *opaque, hwaddr addr, uint64_t qword; } buf; + if (!(region->flags & VFIO_REGION_INFO_FLAG_WRITE)) { + trace_vfio_region_write(vbasedev->name, region->nr, + addr, data, size, true); + return; + } switch (size) { case 1: buf.byte = data; @@ -215,7 +220,8 @@ void vfio_region_write(void *opaque, hwaddr addr, addr, data, size); } - trace_vfio_region_write(vbasedev->name, region->nr, addr, data, size); + trace_vfio_region_write(vbasedev->name, region->nr, addr, data, size, + false); /* * A read or write to a BAR always signals an INTx EOI. This will diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index b1ef55a33f..fb9ff604e6 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -91,7 +91,7 @@ vfio_pci_nvlink2_setup_quirk_ssatgt(const char *name, uint64_t tgt, uint64_t siz vfio_pci_nvlink2_setup_quirk_lnkspd(const char *name, uint32_t link_speed) "%s link_speed=0x%x" # common.c -vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)" +vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size, bool readonly) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)" " is_readonly_region=%d." vfio_region_read(char *name, int index, uint64_t addr, unsigned size, uint64_t data) " (%s:region%d+0x%"PRIx64", %d) = 0x%"PRIx64 vfio_iommu_map_notify(const char *op, uint64_t iova_start, uint64_t iova_end) "iommu %s @ 0x%"PRIx64" - 0x%"PRIx64 vfio_listener_region_add_skip(uint64_t start, uint64_t end) "SKIPPING region_add 0x%"PRIx64" - 0x%"PRIx64