Merge: KVM: selftests: aarch64: Fix page_fault_test failure

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/3353

JIRA: https://issues.redhat.com/browse/RHEL-16004
Upstream Status: linux v6.7.rc1
Tested: No page_fault_test failure on ampere-hr330a-04.khw.rdu2.eng.redhat.com

There is page_fault_test failure reported by Jan Richter and it has been
fixed in upstream by commit beaf35b. Besides, another failure is
fixed by upstream commit 06899aa. Since we're here, 06899aa
is picked either.

06899aa KVM: arm64: selftest: Perform ISB before reading PAR_EL1
beaf35b KVM: arm64: selftest: Add the missing .guest_prepare()

Signed-off-by: Gavin Shan <[email protected]>

Approved-by: Eric Auger <[email protected]>
Approved-by: Shaoqin Huang <[email protected]>
Approved-by: Cornelia Huck <[email protected]>

Signed-off-by: Jan Stancek <[email protected]>

Author: jstancek

tools/testing/selftests/kvm/aarch64/page_fault_test.c

@@ -136,8 +136,8 @@ static void guest_at(void)
 	uint64_t par;
 
 	asm volatile("at s1e1r, %0" :: "r" (guest_test_memory));
-	par = read_sysreg(par_el1);
 	isb();
+	par = read_sysreg(par_el1);
 
 	/* Bit 1 indicates whether the AT was successful */
 	GUEST_ASSERT_EQ(par & 1, 0);
@@ -843,6 +843,7 @@ static void help(char *name)
 	.name			= SCAT2(ro_memslot_no_syndrome, _access),	\
 	.data_memslot_flags	= KVM_MEM_READONLY,				\
 	.pt_memslot_flags	= KVM_MEM_READONLY,				\
+	.guest_prepare		= { _PREPARE(_access) },			\
 	.guest_test		= _access,					\
 	.fail_vcpu_run_handler	= fail_vcpu_run_mmio_no_syndrome_handler,	\
 	.expected_events	= { .fail_vcpu_runs = 1 },			\
@@ -866,6 +867,7 @@ static void help(char *name)
 	.name			= SCAT2(ro_memslot_no_syn_and_dlog, _access),	\
 	.data_memslot_flags	= KVM_MEM_READONLY | KVM_MEM_LOG_DIRTY_PAGES,	\
 	.pt_memslot_flags	= KVM_MEM_READONLY | KVM_MEM_LOG_DIRTY_PAGES,	\
+	.guest_prepare		= { _PREPARE(_access) },			\
 	.guest_test		= _access,					\
 	.guest_test_check	= { _test_check },				\
 	.fail_vcpu_run_handler	= fail_vcpu_run_mmio_no_syndrome_handler,	\
@@ -895,6 +897,7 @@ static void help(char *name)
 	.data_memslot_flags	= KVM_MEM_READONLY,				\
 	.pt_memslot_flags	= KVM_MEM_READONLY,				\
 	.mem_mark_cmd		= CMD_HOLE_DATA | CMD_HOLE_PT,			\
+	.guest_prepare		= { _PREPARE(_access) },			\
 	.guest_test		= _access,					\
 	.uffd_data_handler	= _uffd_data_handler,				\
 	.uffd_pt_handler	= uffd_pt_handler,			\