Skip to contentSkip to conversation

s390/mm: add missing secure storage access fixups for donated memory

PATCH Superseded Janosch Frank 2 participants 2 messages Mar 9

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390/mm: add missing secure storage access fixups for donated memory

There are special cases where secure storage access exceptions happen in a kernel context for pages that don't have the PG_arch_1 bit set. That bit is set for non-exported guest secure storage (memory) but is absent on storage donated to the Ultravisor since the kernel isn't allowed to export donated pages.

Prior to this patch we would try to export the page by calling arch_make_folio_accessible() which would instantly return since the arch bit is absent signifying that the page was already exported and no further action is necessary. This leads to secure storage access exception loops which can never be resolved.

With this patch we unconditionally try to export and if that fails we fixup.

Fixes 084ea4d611a3 ("s390/mm: add (non)secure page access exceptions handlers")
---
 arch/s390/mm/fault.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
arch/s390/mm/fault.c +7 -2
index a52aa7a99b6b..71bad4257aab 100644
@@ -441,10 +441,15 @@ void do_secure_storage_access(struct pt_regs *regs)
 		folio = phys_to_folio(addr);
 		if (unlikely(!folio_try_get(folio)))
 			return;
-		rc = arch_make_folio_accessible(folio);
+		rc = uv_convert_from_secure(folio_to_phys(folio));
 		folio_put(folio);
+		/*
+		 * There are some valid fixup types for kernel
+		 * accesses to donated secure memory. zeropad is one
+		 * of them.
+		 */
 		if (rc)
-			BUG();
+			return handle_fault_error(regs, 0);
 	} else {
 		if (faulthandler_disabled())
 			return handle_fault_error_nolock(regs, 0);
Signature · 1 line
2.51.0
maintainer
#1 lore raw
Quoted 31 lines · Janosch Frank

There are special cases where secure storage access exceptions happen in a kernel context for pages that don't have the PG_arch_1 bit set. That bit is set for non-exported guest secure storage (memory) but is absent on storage donated to the Ultravisor since the kernel isn't allowed to export donated pages.

Prior to this patch we would try to export the page by calling arch_make_folio_accessible() which would instantly return since the arch bit is absent signifying that the page was already exported and no further action is necessary. This leads to secure storage access exception loops which can never be resolved.

With this patch we unconditionally try to export and if that fails we fixup.

Fixes 084ea4d611a3 ("s390/mm: add (non)secure page access exceptions handlers")
---
 arch/s390/mm/fault.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
arch/s390/mm/fault.c +0 -1
index a52aa7a99b6b..71bad4257aab 100644
@@ -441,10 +441,15 @@ void do_secure_storage_access(struct pt_regs *regs)
 		folio = phys_to_folio(addr);
 		if (unlikely(!folio_try_get(folio)))
 			return;
-		rc = arch_make_folio_accessible(folio);

arch/s390/mm/fault.c void do_secure_storage_access(struct pt_regs *regs) · line 452

Quoted 10 lines
arch/s390/mm/fault.c +7 -1
+		rc = uv_convert_from_secure(folio_to_phys(folio));
 		folio_put(folio);
+		/*
+		 * There are some valid fixup types for kernel
+		 * accesses to donated secure memory. zeropad is one
+		 * of them.
+		 */
 		if (rc)
-			BUG();
+			return handle_fault_error(regs, 0);

This context doesn't hold mmlock, so it should be:

			return handle_fault_error_nolock(regs, 0);

And, yes, you can blame me, since I proposed the wrong call off-list.