From 660e7dc57899e79e85c19baa93be009b0382ae8e Mon Sep 17 00:00:00 2001 From: Gary R Hook Date: Wed, 10 Apr 2019 00:08:03 +0100 Subject: [PATCH 3/5] target/i386: sev: Do not pin the ram device memory region RH-Author: Gary R Hook Message-id: <20190410000803.1744-3-ghook@redhat.com> Patchwork-id: 85542 O-Subject: [RHEL-8.1 virt 2/2] target/i386: sev: Do not pin the ram device memory region Bugzilla: 1667249 RH-Acked-by: Eduardo Habkost RH-Acked-by: Paolo Bonzini RH-Acked-by: Alex Williamson BZ: 1667249 Branch: rhel-8.1.0 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1667249 Upstream Status: 4.0.0-rc1 Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=20980582 Conflicts: None commit cedc0ad539afbbb669dba9e73dfad2915bc1c25b Author: Singh, Brijesh Date: Mon Feb 4 22:23:40 2019 +0000 target/i386: sev: Do not pin the ram device memory region The RAM device presents a memory region that should be handled as an IO region and should not be pinned. In the case of the vfio-pci, RAM device represents a MMIO BAR and the memory region is not backed by pages hence KVM_MEMORY_ENCRYPT_REG_REGION fails to lock the memory range. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1667249 Cc: Alex Williamson Cc: Paolo Bonzini Signed-off-by: Brijesh Singh Message-Id: <20190204222322.26766-3-brijesh.singh@amd.com> Signed-off-by: Paolo Bonzini Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: qemu-devel@nongnu.org Signed-off-by: Danilo C. L. de Paula --- target/i386/sev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target/i386/sev.c b/target/i386/sev.c index 2395171..b8009b0 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -130,6 +130,17 @@ sev_ram_block_added(RAMBlockNotifier *n, void *host, size_t size) { int r; struct kvm_enc_region range; + ram_addr_t offset; + MemoryRegion *mr; + + /* + * The RAM device presents a memory region that should be treated + * as IO region and should not be pinned. + */ + mr = memory_region_from_host(host, &offset); + if (mr && memory_region_is_ram_device(mr)) { + return; + } range.addr = (__u64)(unsigned long)host; range.size = size; -- 1.8.3.1