KVM: s390: fix virtual vs physical address confusion

Alexander Gordeev · frankjaa · commit 7b2411e79367 · 2024-02-14T16:25:29.000+01:00
Fix virtual vs physical address confusion. This does not fix a bug
since virtual and physical address spaces are currently the same.

Suggested-by: Janosch Frank &lt;frankja@linux.ibm.com&gt;
Signed-off-by: Alexander Gordeev &lt;agordeev@linux.ibm.com&gt;
Acked-by: Janosch Frank &lt;frankja@linux.ibm.com&gt;
Acked-by: Anthony Krowiak &lt;akrowiak@linux.ibm.com&gt;
Signed-off-by: Janosch Frank &lt;frankja@linux.ibm.com&gt;
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
@@ -3153,7 +3153,7 @@ static int kvm_s390_apxa_installed(void)
  */
 static void kvm_s390_set_crycb_format(struct kvm *kvm)
 {
-	kvm->arch.crypto.crycbd = (__u32)(unsigned long) kvm->arch.crypto.crycb;
+	kvm->arch.crypto.crycbd = virt_to_phys(kvm->arch.crypto.crycb);
 
 	/* Clear the CRYCB format bits - i.e., set format 0 by default */
 	kvm->arch.crypto.crycbd &= ~(CRYCB_FORMAT_MASK);

Original file line number	Diff line number	Diff line change
`@@ -3153,7 +3153,7 @@ static int kvm_s390_apxa_installed(void)`
`3153`	`3153`	`*/`
`3154`	`3154`	`static void kvm_s390_set_crycb_format(struct kvm *kvm)`
`3155`	`3155`	`{`
`3156`		`- kvm->arch.crypto.crycbd = (__u32)(unsigned long) kvm->arch.crypto.crycb;`
	`3156`	`+ kvm->arch.crypto.crycbd = virt_to_phys(kvm->arch.crypto.crycb);`
`3157`	`3157`
`3158`	`3158`	`/* Clear the CRYCB format bits - i.e., set format 0 by default */`
`3159`	`3159`	`kvm->arch.crypto.crycbd &= ~(CRYCB_FORMAT_MASK);`