From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org, Peter Xu <peterx@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PATCH 25/99] intel-iommu: send PSI always even if across PDEs
Date: Mon, 23 Jul 2018 15:16:34 -0500 [thread overview]
Message-ID: <20180723201748.25573-26-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com>
From: Peter Xu <peterx@redhat.com>
SECURITY IMPLICATION: without this patch, any guest with both assigned
device and a vIOMMU might encounter stale IO page mappings even if guest
has already unmapped the page, which may lead to guest memory
corruption. The stale mappings will only be limited to the guest's own
memory range, so it should not affect the host memory or other guests on
the host.
During IOVA page table walking, there is a special case when the PSI
covers one whole PDE (Page Directory Entry, which contains 512 Page
Table Entries) or more. In the past, we skip that entry and we don't
notify the IOMMU notifiers. This is not correct. We should send UNMAP
notification to registered UNMAP notifiers in this case.
For UNMAP only notifiers, this might cause IOTLBs cached in the devices
even if they were already invalid. For MAP/UNMAP notifiers like
vfio-pci, this will cause stale page mappings.
This special case doesn't trigger often, but it is very easy to be
triggered by nested device assignments, since in that case we'll
possibly map the whole L2 guest RAM region into the device's IOVA
address space (several GBs at least), which is far bigger than normal
kernel driver usages of the device (tens of MBs normally).
Without this patch applied to L1 QEMU, nested device assignment to L2
guests will dump some errors like:
qemu-system-x86_64: VFIO_MAP_DMA: -17
qemu-system-x86_64: vfio_dma_map(0x557305420c30, 0xad000, 0x1000,
0x7f89a920d000) = -17 (File exists)
CC: QEMU Stable <qemu-stable@nongnu.org>
Acked-by: Jason Wang <jasowang@redhat.com>
[peterx: rewrite the commit message]
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 36d2d52bdb45f5b753a61fdaf0fe7891f1f5b61d)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/i386/intel_iommu.c | 42 ++++++++++++++++++++++++++++++------------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index fb31de9416..b359efd6f9 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -722,6 +722,15 @@ static int vtd_iova_to_slpte(VTDContextEntry *ce, uint64_t iova, bool is_write,
typedef int (*vtd_page_walk_hook)(IOMMUTLBEntry *entry, void *private);
+static int vtd_page_walk_one(IOMMUTLBEntry *entry, int level,
+ vtd_page_walk_hook hook_fn, void *private)
+{
+ assert(hook_fn);
+ trace_vtd_page_walk_one(level, entry->iova, entry->translated_addr,
+ entry->addr_mask, entry->perm);
+ return hook_fn(entry, private);
+}
+
/**
* vtd_page_walk_level - walk over specific level for IOVA range
*
@@ -781,28 +790,37 @@ static int vtd_page_walk_level(dma_addr_t addr, uint64_t start,
*/
entry_valid = read_cur | write_cur;
+ entry.target_as = &address_space_memory;
+ entry.iova = iova & subpage_mask;
+ entry.perm = IOMMU_ACCESS_FLAG(read_cur, write_cur);
+ entry.addr_mask = ~subpage_mask;
+
if (vtd_is_last_slpte(slpte, level)) {
- entry.target_as = &address_space_memory;
- entry.iova = iova & subpage_mask;
/* NOTE: this is only meaningful if entry_valid == true */
entry.translated_addr = vtd_get_slpte_addr(slpte, aw);
- entry.addr_mask = ~subpage_mask;
- entry.perm = IOMMU_ACCESS_FLAG(read_cur, write_cur);
if (!entry_valid && !notify_unmap) {
trace_vtd_page_walk_skip_perm(iova, iova_next);
goto next;
}
- trace_vtd_page_walk_one(level, entry.iova, entry.translated_addr,
- entry.addr_mask, entry.perm);
- if (hook_fn) {
- ret = hook_fn(&entry, private);
- if (ret < 0) {
- return ret;
- }
+ ret = vtd_page_walk_one(&entry, level, hook_fn, private);
+ if (ret < 0) {
+ return ret;
}
} else {
if (!entry_valid) {
- trace_vtd_page_walk_skip_perm(iova, iova_next);
+ if (notify_unmap) {
+ /*
+ * The whole entry is invalid; unmap it all.
+ * Translated address is meaningless, zero it.
+ */
+ entry.translated_addr = 0x0;
+ ret = vtd_page_walk_one(&entry, level, hook_fn, private);
+ if (ret < 0) {
+ return ret;
+ }
+ } else {
+ trace_vtd_page_walk_skip_perm(iova, iova_next);
+ }
goto next;
}
ret = vtd_page_walk_level(vtd_get_slpte_addr(slpte, aw), iova,
--
2.17.1
next prev parent reply other threads:[~2018-07-23 20:19 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 20:16 [Qemu-devel] [PATCH 00/99] Patch Round-up for stable 2.12.1, freeze on 2018-07-30 Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 01/99] tests: fix tpm-crb tpm-tis tests race Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 02/99] device_tree: Increase FDT_MAX_SIZE to 1 MiB Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 03/99] ccid: Fix dwProtocols advertisement of T=0 Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 04/99] nbd/client: Fix error messages during NBD_INFO_BLOCK_SIZE Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 05/99] s390-ccw: force diag 308 subcode to unsigned long Michael Roth
2018-07-23 22:14 ` Michael Roth
2018-07-24 9:40 ` Cornelia Huck
2018-07-24 11:07 ` Cornelia Huck
2018-07-24 19:16 ` Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 06/99] tcg/arm: Fix memory barrier encoding Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 07/99] target/arm: Implement v8M VLLDM and VLSTM Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 08/99] target/ppc: always set PPC_MEM_TLBIE in pre 2.8 migration hack Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 09/99] spapr: don't advertise radix GTSE if max-compat-cpu < power9 Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 10/99] qxl: fix local renderer crash Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 11/99] configure: recognize more rpmbuild macros Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 12/99] qemu-img: Resolve relative backing paths in rebase Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 13/99] iotests: Add test for rebasing with relative paths Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 14/99] qemu-io: Use purely string blockdev options Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 15/99] qemu-img: Use only string options in img_open_opts Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 16/99] iotests: Add test for -U/force-share conflicts Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 17/99] lm32: take BQL before writing IP/IM register Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 18/99] raw: Check byte range uniformly Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 19/99] s390x/css: disabled subchannels cannot be status pending Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 20/99] pc-bios/s390-ccw: struct tpi_info must be declared as aligned(4) Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 21/99] virtio-ccw: common reset handler Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 22/99] s390x/ccw: make sure all ccw devices are properly reset Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 23/99] console: Avoid segfault in screendump Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 24/99] hw/intc/arm_gicv3: Fix APxR<n> register dispatching Michael Roth
2018-07-23 20:16 ` Michael Roth [this message]
2018-07-23 20:16 ` [Qemu-devel] [PATCH 26/99] intel-iommu: remove IntelIOMMUNotifierNode Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 27/99] intel-iommu: add iommu lock Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 28/99] intel-iommu: only do page walk for MAP notifiers Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 29/99] intel-iommu: introduce vtd_page_walk_info Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 30/99] intel-iommu: pass in address space when page walk Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 31/99] intel-iommu: trace domain id during " Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 32/99] util: implement simple iova tree Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 33/99] intel-iommu: rework the page walk logic Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 34/99] arm_gicv3_kvm: increase clroffset accordingly Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 35/99] Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 36/99] ahci: fix PxCI register race Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 37/99] arm_gicv3_kvm: kvm_dist_get/put: skip the registers banked by GICR Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 38/99] block: Make bdrv_is_writable() public Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 39/99] qcow2: Do not mark inactive images corrupt Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 40/99] iotests: Add case for a corrupted inactive image Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 41/99] throttle: Fix crash on reopen Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 42/99] i386: define the 'ssbd' CPUID feature bit (CVE-2018-3639) Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 43/99] i386: Define the Virt SSBD MSR and handling of it (CVE-2018-3639) Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 44/99] i386: define the AMD 'virt-ssbd' CPUID feature bit (CVE-2018-3639) Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 45/99] tap: set vhostfd passed from qemu cli to non-blocking Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 46/99] vhost-user: delete net client if necessary Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 47/99] qemu-img: Fix assert when mapping unaligned raw file Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 48/99] iotests: Add test 221 to catch qemu-img map regression Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 49/99] arm_gicv3_kvm: kvm_dist_get/put_priority: skip the registers banked by GICR_IPRIORITYR Michael Roth
2018-07-23 20:16 ` [Qemu-devel] [PATCH 50/99] usb: correctly handle Zero Length Packets Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 51/99] usb/dev-mtp: Fix use of uninitialized values Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 52/99] vnc: fix use-after-free Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 53/99] block/mirror: honor ratelimit again Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 54/99] cpus: tcg: fix never exiting loop on unplug Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 55/99] nbd/client: fix nbd_negotiate_simple_meta_context Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 56/99] migration/block-dirty-bitmap: fix memory leak in dirty_bitmap_load_bits Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 57/99] qapi: fill in CpuInfoFast.arch in query-cpus-fast Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 58/99] block/mirror: Make cancel always cancel pre-READY Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 59/99] iotests: Add test for cancelling a mirror job Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 60/99] riscv: spike: allow base == 0 Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 61/99] riscv: htif: increase the priority of the htif subregion Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 62/99] riscv: requires libfdt Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 63/99] nbd/client: Relax handling of large NBD_CMD_BLOCK_STATUS reply Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 64/99] tcg/i386: Fix dup_vec in non-AVX2 codepath Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 65/99] softfloat: Handle default NaN mode after pickNaNMulAdd, not before Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 66/99] tcg: Limit the number of ops in a TB Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 67/99] RISC-V: Minimal QEMU 2.12 fix for sifive_u machine Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 68/99] blockjob: expose error string via query Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 69/99] target/arm: Fix fp_status_f16 tininess before rounding Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 70/99] fpu/softfloat: Don't set Invalid for float-to-int(MAXINT) Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 71/99] target/arm: Implement vector shifted SCVF/UCVF for fp16 Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 72/99] target/arm: Implement vector shifted FCVT " Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 73/99] target/arm: Fix float16 to/from int16 Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 74/99] target/arm: Clear SVE high bits for FMOV Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 75/99] fpu/softfloat: Fix conversion from uint64 to float128 Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 76/99] target/arm: Implement FMOV (general) for fp16 Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 77/99] target/arm: Implement FCVT (scalar, integer) " Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 78/99] target/arm: Implement FCVT (scalar, fixed-point) " Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 79/99] target/arm: Introduce and use read_fp_hreg Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 80/99] target/arm: Implement FP data-processing (2 source) for fp16 Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 81/99] target/arm: Implement FP data-processing (3 " Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 82/99] target/arm: Implement FCMP " Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 83/99] target/arm: Implement FCSEL " Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 84/99] target/arm: Implement FMOV (immediate) " Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 85/99] target/arm: Fix sqrt_f16 exception raising Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 86/99] hw/isa/superio: Fix inconsistent use of Chardev->be Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 87/99] mux: fix ctrl-a b again Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 88/99] nfs: Remove processed options from QDict Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 89/99] replace functions which are only available in glib-2.24 Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 90/99] vfio/pci: Default display option to "off" Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 91/99] migration/block-dirty-bitmap: fix dirty_bitmap_load Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 92/99] tcg: Reduce max TB opcode count Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 93/99] nbd/server: Reject 0-length block status request Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 94/99] iscsi: Avoid potential for get_status overflow Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 95/99] virtio-rng: process pending requests on DRIVER_OK Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 96/99] target/ppc: set is_jmp on ppc_tr_breakpoint_check Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 97/99] tap: fix memory leak on success to create a tap device Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 98/99] qemu-img: avoid overflow of min_sparse parameter Michael Roth
2018-07-23 20:17 ` [Qemu-devel] [PATCH 99/99] tcg/i386: Mark xmm registers call-clobbered Michael Roth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180723201748.25573-26-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=mst@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).