Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: [PATCH 1/1] drivers/char/mem.c: Disable encryption bit in page tables
 for, MMIO access
From:   James Puthukattukaran <james.puthukattukaran@oracle.com>
To:     "Lendacky, Thomas" <thomas.lendacky@amd.com>,
        "Singh, Brijesh" <brijesh.singh@amd.com>
Cc:     gregkh@linuxfoundation.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
References: <671c6651-71b3-0e0d-8e87-191ca14fed50@oracle.com>
Message-ID: <f2160d42-9bbf-b7fc-315c-7db8f799cab3@oracle.com>
Date:   Thu, 4 Oct 2018 13:18:58 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <671c6651-71b3-0e0d-8e87-191ca14fed50@oracle.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Attempting to mmap to a memory mapped IO space returns -1s because the
memory encryption bit is set for these pages. According to the AMD spec,
this bit should not be set for non-DRAM space. The patch checks if this
is an memory IO region being accessed and decrypts accordingly.

Signed-off-by: James Puthukattukaran<james.puthukattukaran@oracle.com>
---
 drivers/char/mem.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index ffeb60d..beaa374 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -355,10 +355,30 @@ static inline int private_mapping_ok(struct vm_area_struct *vma)
 #endif
 };
 
+static int check_flags(struct resource *res, void *arg)
+{
+	int *mmio = arg;
+	*mmio = (!((res->flags & IORESOURCE_SYSTEM_RAM) ==
+		IORESOURCE_SYSTEM_RAM) && (res->desc == IORES_DESC_NONE));
+	return *mmio;
+}
+
+static void check_iomem_region(phys_addr_t addr, size_t size,
+				int *mmio)
+{
+	u64 start, end;
+
+	start = (u64)addr;
+	end = start + size - 1;
+	*mmio = 0;
+	walk_mem_res(start, end, mmio, check_flags);
+}
+
 static int mmap_mem(struct file *file, struct vm_area_struct *vma)
 {
 	size_t size = vma->vm_end - vma->vm_start;
 	phys_addr_t offset = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT;
+	int mmio;
 
 	/* Does it even fit in phys_addr_t? */
 	if (offset >> PAGE_SHIFT != vma->vm_pgoff)
@@ -387,6 +407,13 @@ static int mmap_mem(struct file *file, struct vm_area_struct *vma)
 
 	vma->vm_ops = &mmap_mem_ops;
 
+	if (mem_encrypt_active()) {
+		check_iomem_region(vma->vm_pgoff, size, &mmio);
+		if (mmio)
+			vma->vm_page_prot  =
+					pgprot_decrypted(vma->vm_page_prot);
+	}
+
 	/* Remap-pfn-range will mark the range VM_IO */
 	if (remap_pfn_range(vma,
 			    vma->vm_start,