public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: borntraeger@de.ibm.com, frankja@linux.ibm.com, thuth@redhat.com,
	pasic@linux.ibm.com, david@redhat.com,
	linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org,
	scgl@linux.ibm.com, mimu@linux.ibm.com, nrb@linux.ibm.com
Subject: [PATCH v11 02/19] KVM: s390: pv: handle secure storage violations for protected guests
Date: Fri,  3 Jun 2022 08:56:28 +0200	[thread overview]
Message-ID: <20220603065645.10019-3-imbrenda@linux.ibm.com> (raw)
In-Reply-To: <20220603065645.10019-1-imbrenda@linux.ibm.com>

A secure storage violation is triggered when a protected guest tries to
access secure memory that has been mapped erroneously, or that belongs
to a different protected guest or to the ultravisor.

With upcoming patches, protected guests will be able to trigger secure
storage violations in normal operation. This happens for example if a
protected guest is rebooted with deferred destroy enabled and the new
guest is also protected.

When the new protected guest touches pages that have not yet been
destroyed, and thus are accounted to the previous protected guest, a
secure storage violation is raised.

This patch adds handling of secure storage violations for protected
guests.

This exception is handled by first trying to destroy the page, because
it is expected to belong to a defunct protected guest where a destroy
should be possible. Note that a secure page can only be destroyed if
its protected VM does not have any CPUs, which only happens when the
protected VM is being terminated. If that fails, a normal export of
the page is attempted.

This means that pages that trigger the exception will be made
non-secure (in one way or another) before attempting to use them again
for a different secure guest.

Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Acked-by: Janosch Frank <frankja@linux.ibm.com>
---
 arch/s390/include/asm/uv.h |  1 +
 arch/s390/kernel/uv.c      | 55 ++++++++++++++++++++++++++++++++++++++
 arch/s390/mm/fault.c       | 10 +++++++
 3 files changed, 66 insertions(+)

diff --git a/arch/s390/include/asm/uv.h b/arch/s390/include/asm/uv.h
index cfea7b77a5b8..ba64e0be03bb 100644
--- a/arch/s390/include/asm/uv.h
+++ b/arch/s390/include/asm/uv.h
@@ -378,6 +378,7 @@ static inline int is_prot_virt_host(void)
 }
 
 int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb);
+int gmap_destroy_page(struct gmap *gmap, unsigned long gaddr);
 int uv_destroy_owned_page(unsigned long paddr);
 int uv_convert_from_secure(unsigned long paddr);
 int uv_convert_owned_from_secure(unsigned long paddr);
diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c
index a5425075dd25..2754471cc789 100644
--- a/arch/s390/kernel/uv.c
+++ b/arch/s390/kernel/uv.c
@@ -334,6 +334,61 @@ int gmap_convert_to_secure(struct gmap *gmap, unsigned long gaddr)
 }
 EXPORT_SYMBOL_GPL(gmap_convert_to_secure);
 
+/**
+ * gmap_destroy_page - Destroy a guest page.
+ * @gmap the gmap of the guest
+ * @gaddr the guest address to destroy
+ *
+ * An attempt will be made to destroy the given guest page. If the attempt
+ * fails, an attempt is made to export the page. If both attempts fail, an
+ * appropriate error is returned.
+ */
+int gmap_destroy_page(struct gmap *gmap, unsigned long gaddr)
+{
+	struct vm_area_struct *vma;
+	unsigned long uaddr;
+	struct page *page;
+	int rc;
+
+	rc = -EFAULT;
+	mmap_read_lock(gmap->mm);
+
+	uaddr = __gmap_translate(gmap, gaddr);
+	if (IS_ERR_VALUE(uaddr))
+		goto out;
+	vma = vma_lookup(gmap->mm, uaddr);
+	if (!vma)
+		goto out;
+	/*
+	 * Huge pages should not be able to become secure
+	 */
+	if (is_vm_hugetlb_page(vma))
+		goto out;
+
+	rc = 0;
+	/* we take an extra reference here */
+	page = follow_page(vma, uaddr, FOLL_WRITE | FOLL_GET);
+	if (IS_ERR_OR_NULL(page))
+		goto out;
+	rc = uv_destroy_owned_page(page_to_phys(page));
+	/*
+	 * Fault handlers can race; it is possible that two CPUs will fault
+	 * on the same secure page. One CPU can destroy the page, reboot,
+	 * re-enter secure mode and import it, while the second CPU was
+	 * stuck at the beginning of the handler. At some point the second
+	 * CPU will be able to progress, and it will not be able to destroy
+	 * the page. In that case we do not want to terminate the process,
+	 * we instead try to export the page.
+	 */
+	if (rc)
+		rc = uv_convert_owned_from_secure(page_to_phys(page));
+	put_page(page);
+out:
+	mmap_read_unlock(gmap->mm);
+	return rc;
+}
+EXPORT_SYMBOL_GPL(gmap_destroy_page);
+
 /*
  * To be called with the page locked or with an extra reference! This will
  * prevent gmap_make_secure from touching the page concurrently. Having 2
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index e173b6187ad5..af1ac49168fb 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -837,6 +837,16 @@ NOKPROBE_SYMBOL(do_non_secure_storage_access);
 
 void do_secure_storage_violation(struct pt_regs *regs)
 {
+	unsigned long gaddr = regs->int_parm_long & __FAIL_ADDR_MASK;
+	struct gmap *gmap = (struct gmap *)S390_lowcore.gmap;
+
+	/*
+	 * If the VM has been rebooted, its address space might still contain
+	 * secure pages from the previous boot.
+	 * Clear the page so it can be reused.
+	 */
+	if (!gmap_destroy_page(gmap, gaddr))
+		return;
 	/*
 	 * Either KVM messed up the secure guest mapping or the same
 	 * page is mapped into multiple secure guests.
-- 
2.36.1


  parent reply	other threads:[~2022-06-03  6:57 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-03  6:56 [PATCH v11 00/19] KVM: s390: pv: implement lazy destroy for reboot Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 01/19] KVM: s390: pv: leak the topmost page table when destroy fails Claudio Imbrenda
2022-06-03  6:56 ` Claudio Imbrenda [this message]
2022-06-03  6:56 ` [PATCH v11 03/19] KVM: s390: pv: handle secure storage exceptions for normal guests Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 04/19] KVM: s390: pv: refactor s390_reset_acc Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 05/19] KVM: s390: pv: usage counter instead of flag Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 06/19] KVM: s390: pv: add export before import Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 07/19] KVM: s390: pv: module parameter to fence asynchronous destroy Claudio Imbrenda
2022-06-15  9:53   ` Janosch Frank
2022-06-15  9:59     ` Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 08/19] KVM: s390: pv: clear the state without memset Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 09/19] KVM: s390: pv: Add kvm_s390_cpus_from_pv to kvm-s390.h and add documentation Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 10/19] KVM: s390: pv: add mmu_notifier Claudio Imbrenda
2022-06-08 12:02   ` Nico Boehr
2022-06-03  6:56 ` [PATCH v11 11/19] s390/mm: KVM: pv: when tearing down, try to destroy protected pages Claudio Imbrenda
2022-06-08 12:03   ` Nico Boehr
2022-06-03  6:56 ` [PATCH v11 12/19] KVM: s390: pv: refactoring of kvm_s390_pv_deinit_vm Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 13/19] KVM: s390: pv: destroy the configuration before its memory Claudio Imbrenda
2022-06-08 12:06   ` Nico Boehr
2022-06-14 14:23   ` Janosch Frank
2022-06-03  6:56 ` [PATCH v11 14/19] KVM: s390: pv: cleanup leftover protected VMs if needed Claudio Imbrenda
2022-06-15  9:59   ` Janosch Frank
2022-06-15 10:19     ` Claudio Imbrenda
2022-06-15 10:57       ` Janosch Frank
2022-06-15 11:13         ` Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 15/19] KVM: s390: pv: asynchronous destroy for reboot Claudio Imbrenda
2022-06-15 10:58   ` Janosch Frank
2022-06-20  9:41   ` Janosch Frank
2022-06-03  6:56 ` [PATCH v11 16/19] KVM: s390: pv: api documentation for asynchronous destroy Claudio Imbrenda
2022-06-20  9:13   ` Janosch Frank
2022-06-03  6:56 ` [PATCH v11 17/19] KVM: s390: pv: add KVM_CAP_S390_PROTECTED_ASYNC_DISABLE Claudio Imbrenda
2022-06-03  6:56 ` [PATCH v11 18/19] KVM: s390: pv: avoid export before import if possible Claudio Imbrenda
2022-06-07 14:33   ` Nico Boehr
2022-06-20  9:56   ` Janosch Frank
2022-06-03  6:56 ` [PATCH v11 19/19] KVM: s390: pv: support for Destroy fast UVC Claudio Imbrenda
2022-06-14 14:29 ` [PATCH v11 00/19] KVM: s390: pv: implement lazy destroy for reboot Janosch Frank

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=20220603065645.10019-3-imbrenda@linux.ibm.com \
    --to=imbrenda@linux.ibm.com \
    --cc=borntraeger@de.ibm.com \
    --cc=david@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=mimu@linux.ibm.com \
    --cc=nrb@linux.ibm.com \
    --cc=pasic@linux.ibm.com \
    --cc=scgl@linux.ibm.com \
    --cc=thuth@redhat.com \
    /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