From b150f14fa8adcfe255c0380427e31d033bd44789 Mon Sep 17 00:00:00 2001

From: Alex Williamson <alex.williamson@redhat.com>

Date: Mon, 22 Jul 2019 18:09:47 +0100

Subject: [PATCH 21/39] target/i386: sev: Do not unpin ram device memory region

RH-Author: Alex Williamson <alex.williamson@redhat.com>

Message-id: <156381893103.14196.5165276806848335745.stgit@gimli.home>

Patchwork-id: 89617

O-Subject: [RHEL-8.1 qemu-kvm PATCH] target/i386: sev: Do not unpin ram device memory region

Bugzilla: 1728958

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Auger Eric <eric.auger@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1728958

Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=22722091

Branch: rhel-8.1.0

The commit referenced below skipped pinning ram device memory when

ram blocks are added, we need to do the same when they're removed.

Cc: Brijesh Singh <brijesh.singh@amd.com>

Cc: Paolo Bonzini <pbonzini@redhat.com>

Fixes: cedc0ad539af ("target/i386: sev: Do not pin the ram device memory region")

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Message-Id: <156320087103.2556.10983987500488190423.stgit@gimli.home>

Reviewed-by: Singh, Brijesh <brijesh.singh@amd.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit 56e2ec9488b3b281130e064929f8ae5595d6ac39)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/sev.c | 11 +++++++++++

 1 file changed, 11 insertions(+)

diff --git a/target/i386/sev.c b/target/i386/sev.c

index b8009b0..7051a30 100644

--- a/target/i386/sev.c

+++ b/target/i386/sev.c

@@ -159,6 +159,17 @@ sev_ram_block_removed(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 have been 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