public inbox for linux-s390@vger.kernel.org
 help / color / mirror / Atom feed
From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
	borntraeger@de.ibm.com, frankja@linux.ibm.com, nsg@linux.ibm.com,
	nrb@linux.ibm.com, seiden@linux.ibm.com, gra@linux.ibm.com,
	schlameuss@linux.ibm.com, hca@linux.ibm.com, svens@linux.ibm.com,
	agordeev@linux.ibm.com, gor@linux.ibm.com, david@redhat.com,
	gerald.schaefer@linux.ibm.com
Subject: [PATCH v4 16/23] KVM: s390: Add some helper functions needed for vSIE
Date: Thu, 20 Nov 2025 18:15:37 +0100	[thread overview]
Message-ID: <20251120171544.96841-17-imbrenda@linux.ibm.com> (raw)
In-Reply-To: <20251120171544.96841-1-imbrenda@linux.ibm.com>

Implement gmap_protect_asce_top_level(), which was a stub. This
function was a stub due to cross dependencies with other patches.

Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
 arch/s390/kvm/gmap.c | 73 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap.c
index 29ce8df697dd..cbb777e940d1 100644
--- a/arch/s390/kvm/gmap.c
+++ b/arch/s390/kvm/gmap.c
@@ -22,6 +22,7 @@
 #include "dat.h"
 #include "gmap.h"
 #include "kvm-s390.h"
+#include "faultin.h"
 
 static inline bool kvm_s390_is_in_sie(struct kvm_vcpu *vcpu)
 {
@@ -988,10 +989,78 @@ static struct gmap *gmap_find_shadow(struct gmap *parent, union asce asce, int e
 	return NULL;
 }
 
+#define CRST_TABLE_PAGES (_CRST_TABLE_SIZE / PAGE_SIZE)
+struct gmap_protect_asce_top_level {
+	unsigned long seq;
+	struct guest_fault f[CRST_TABLE_PAGES];
+};
+
+static inline int __gmap_protect_asce_top_level(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
+						struct gmap_protect_asce_top_level *context)
+{
+	int rc, i;
+
+	guard(write_lock)(&sg->kvm->mmu_lock);
+
+	if (kvm_s390_array_needs_retry_safe(sg->kvm, context->seq, context->f))
+		return -EAGAIN;
+
+	scoped_guard(spinlock, &sg->parent->children_lock) {
+		for (i = 0; i < CRST_TABLE_PAGES; i++) {
+			rc = gmap_protect_rmap(mc, sg, context->f[i].gfn, 0, context->f[i].pfn,
+					       TABLE_TYPE_REGION1 + 1, context->f[i].writable);
+			if (rc)
+				return rc;
+		}
+		sg->initialized = true;
+		gmap_add_child(sg->parent, sg);
+	}
+
+	kvm_s390_release_faultin_array(sg->kvm, context->f, false);
+	return 0;
+}
+
+static inline int _gmap_protect_asce_top_level(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
+					       struct gmap_protect_asce_top_level *context)
+{
+	int rc;
+
+	if (kvm_s390_array_needs_retry_unsafe(sg->kvm, context->seq, context->f))
+		return -EAGAIN;
+	do {
+		rc = kvm_s390_mmu_cache_topup(mc);
+		if (rc)
+			return rc;
+		rc = radix_tree_preload(GFP_KERNEL);
+		if (rc)
+			return rc;
+		rc = __gmap_protect_asce_top_level(mc, sg, context);
+		radix_tree_preload_end();
+	} while (rc == -ENOMEM);
+
+	return rc;
+}
+
 static int gmap_protect_asce_top_level(struct kvm_s390_mmu_cache *mc, struct gmap *sg)
 {
-	KVM_BUG_ON(1, sg->kvm);
-	return -EINVAL;
+	struct gmap_protect_asce_top_level context = {};
+	union asce asce = sg->guest_asce;
+	int rc;
+
+	KVM_BUG_ON(!sg->is_shadow, sg->kvm);
+
+	context.seq = sg->kvm->mmu_invalidate_seq;
+	/* Pairs with the smp_wmb() in kvm_mmu_invalidate_end(). */
+	smp_rmb();
+
+	rc = kvm_s390_get_guest_pages(sg->kvm, context.f, asce.rsto, asce.dt + 1, false);
+	if (rc > 0)
+		rc = -EFAULT;
+	if (!rc)
+		rc = _gmap_protect_asce_top_level(mc, sg, &context);
+	if (rc)
+		kvm_s390_release_faultin_array(sg->kvm, context.f, true);
+	return rc;
 }
 
 /**
-- 
2.51.1


  parent reply	other threads:[~2025-11-20 17:16 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-20 17:15 [PATCH v4 00/23] KVM: s390: gmap rewrite, the real deal Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 01/23] KVM: s390: Refactor pgste lock and unlock functions Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 02/23] KVM: s390: add P bit in table entry bitfields, move union vaddress Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 03/23] s390: Move sske_frame() to a header Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 04/23] KVM: s390: Add gmap_helper_set_unused() Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 05/23] KVM: s390: Enable KVM_GENERIC_MMU_NOTIFIER Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 06/23] KVM: s390: Rename some functions in gaccess.c Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 07/23] KVM: s390: KVM-specific bitfields and helper functions Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 08/23] KVM: s390: KVM page table management functions: allocation Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 09/23] KVM: s390: KVM page table management functions: clear and replace Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 10/23] KVM: s390: KVM page table management functions: walks Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 11/23] KVM: s390: KVM page table management functions: storage keys Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 12/23] KVM: s390: KVM page table management functions: lifecycle management Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 13/23] KVM: s390: KVM page table management functions: CMMA Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 14/23] KVM: s390: New gmap code Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 15/23] KVM: s390: Add helper functions for fault handling Claudio Imbrenda
2025-11-20 17:15 ` Claudio Imbrenda [this message]
2025-11-20 17:15 ` [PATCH v4 17/23] KVM: s390: Stop using CONFIG_PGSTE Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 18/23] KVM: s390: Storage key functions refactoring Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 19/23] KVM: s390: Switch to new gmap Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 20/23] KVM: s390: Remove gmap from s390/mm Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 21/23] KVM: S390: Remove PGSTE code from linux/s390 mm Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 22/23] KVM: s390: Enable 1M pages for gmap Claudio Imbrenda
2025-11-20 17:15 ` [PATCH v4 23/23] KVM: s390: Storage key manipulation IOCTL Claudio Imbrenda

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=20251120171544.96841-17-imbrenda@linux.ibm.com \
    --to=imbrenda@linux.ibm.com \
    --cc=agordeev@linux.ibm.com \
    --cc=borntraeger@de.ibm.com \
    --cc=david@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=gerald.schaefer@linux.ibm.com \
    --cc=gor@linux.ibm.com \
    --cc=gra@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=nrb@linux.ibm.com \
    --cc=nsg@linux.ibm.com \
    --cc=schlameuss@linux.ibm.com \
    --cc=seiden@linux.ibm.com \
    --cc=svens@linux.ibm.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