From: "tip-bot2 for Michael Kelley" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Michael Kelley <mikelley@microsoft.com>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Tianyu Lan <Tianyu.Lan@microsoft.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/sev] Drivers: hv: Explicitly request decrypted in vmap_pfn() calls
Date: Mon, 27 Mar 2023 20:09:53 -0000 [thread overview]
Message-ID: <167994779321.5837.13303658601319169134.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1679838727-87310-4-git-send-email-mikelley@microsoft.com>
The following commit has been merged into the x86/sev branch of tip:
Commit-ID: d33ddc92db8a61416473ff3d7f1c621c50733dc0
Gitweb: https://git.kernel.org/tip/d33ddc92db8a61416473ff3d7f1c621c50733dc0
Author: Michael Kelley <mikelley@microsoft.com>
AuthorDate: Sun, 26 Mar 2023 06:51:58 -07:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 27 Mar 2023 08:46:43 +02:00
Drivers: hv: Explicitly request decrypted in vmap_pfn() calls
Update vmap_pfn() calls to explicitly request that the mapping
be for decrypted access to the memory. There's no change in
functionality since the PFNs passed to vmap_pfn() are above the
shared_gpa_boundary, implicitly producing a decrypted mapping.
But explicitly requesting "decrypted" allows the code to work
before and after changes that cause vmap_pfn() to mask the
PFNs to being below the shared_gpa_boundary.
Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
Link: https://lore.kernel.org/r/1679838727-87310-4-git-send-email-mikelley@microsoft.com
---
arch/x86/hyperv/ivm.c | 2 +-
drivers/hv/ring_buffer.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c
index f33c67e..5648efb 100644
--- a/arch/x86/hyperv/ivm.c
+++ b/arch/x86/hyperv/ivm.c
@@ -343,7 +343,7 @@ void *hv_map_memory(void *addr, unsigned long size)
pfns[i] = vmalloc_to_pfn(addr + i * PAGE_SIZE) +
(ms_hyperv.shared_gpa_boundary >> PAGE_SHIFT);
- vaddr = vmap_pfn(pfns, size / PAGE_SIZE, PAGE_KERNEL_IO);
+ vaddr = vmap_pfn(pfns, size / PAGE_SIZE, pgprot_decrypted(PAGE_KERNEL));
kfree(pfns);
return vaddr;
diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c
index c6692fd..2111e97 100644
--- a/drivers/hv/ring_buffer.c
+++ b/drivers/hv/ring_buffer.c
@@ -211,7 +211,7 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,
ring_info->ring_buffer = (struct hv_ring_buffer *)
vmap_pfn(pfns_wraparound, page_cnt * 2 - 1,
- PAGE_KERNEL);
+ pgprot_decrypted(PAGE_KERNEL));
kfree(pfns_wraparound);
if (!ring_info->ring_buffer)
next prev parent reply other threads:[~2023-03-27 20:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-26 13:51 [PATCH v7 00/12] Add PCI pass-thru support to Hyper-V Confidential VMs Michael Kelley
2023-03-26 13:51 ` [PATCH v7 01/12] x86/ioremap: Add hypervisor callback for private MMIO mapping in coco VM Michael Kelley
2023-03-26 13:51 ` [PATCH v7 02/12] x86/hyperv: Reorder code to facilitate future work Michael Kelley
2023-03-27 20:09 ` [tip: x86/sev] " tip-bot2 for Michael Kelley
2023-03-26 13:51 ` [PATCH v7 03/12] Drivers: hv: Explicitly request decrypted in vmap_pfn() calls Michael Kelley
2023-03-27 20:09 ` tip-bot2 for Michael Kelley [this message]
2023-03-26 13:51 ` [PATCH v7 04/12] x86/mm: Handle decryption/re-encryption of bss_decrypted consistently Michael Kelley
2023-03-26 13:52 ` [PATCH v7 05/12] init: Call mem_encrypt_init() after Hyper-V hypercall init is done Michael Kelley
2023-03-26 13:52 ` [PATCH v7 06/12] x86/hyperv: Change vTOM handling to use standard coco mechanisms Michael Kelley
2023-03-27 20:09 ` [tip: x86/sev] " tip-bot2 for Michael Kelley
2023-03-26 13:52 ` [PATCH v7 07/12] swiotlb: Remove bounce buffer remapping for Hyper-V Michael Kelley
2023-03-26 13:52 ` [PATCH v7 08/12] Drivers: hv: vmbus: Remove second mapping of VMBus monitor pages Michael Kelley
2023-03-26 13:52 ` [PATCH v7 09/12] Drivers: hv: vmbus: Remove second way of mapping ring buffers Michael Kelley
2023-03-26 13:52 ` [PATCH v7 10/12] hv_netvsc: Remove second mapping of send and recv buffers Michael Kelley
2023-03-26 13:52 ` [PATCH v7 11/12] Drivers: hv: Don't remap addresses that are above shared_gpa_boundary Michael Kelley
2023-03-26 13:52 ` [PATCH v7 12/12] PCI: hv: Enable PCI pass-thru devices in Confidential VMs Michael Kelley
2023-04-13 1:05 ` [PATCH v7 00/12] Add PCI pass-thru support to Hyper-V " Wei Liu
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=167994779321.5837.13303658601319169134.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=Tianyu.Lan@microsoft.com \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®