KVM: s390: GISA: sort out physical vs virtual pointers usage

Fix virtual vs physical address confusion (which currently are the same).

In chsc_sgib(), do the virtual-physical conversion in the caller since
the caller needs to make sure it is a 31-bit address and zero has a
special meaning (disassociating the GIB).

Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Michael Mueller <mimu@linux.ibm.com>
Link: https://lore.kernel.org/r/20221107085727.1533792-1-nrb@linux.ibm.com
Message-Id: <20221107085727.1533792-1-nrb@linux.ibm.com>
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 1dae78deddf28602d32d051dc5ad956be6dd5315..bbb280633cb8860c84141fbf3c710cb06035bc41 100644 (file)
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -3099,9 +3099,9 @@ static enum hrtimer_restart gisa_vcpu_kicker(struct hrtimer *timer)
 static void process_gib_alert_list(void)
 {
        struct kvm_s390_gisa_interrupt *gi;
+       u32 final, gisa_phys, origin = 0UL;
        struct kvm_s390_gisa *gisa;
        struct kvm *kvm;
-       u32 final, origin = 0UL;
 
        do {
                /*
@@ -3127,9 +3127,10 @@ static void process_gib_alert_list(void)
                 * interruptions asap.
                 */
                while (origin & GISA_ADDR_MASK) {
-                       gisa = (struct kvm_s390_gisa *)(u64)origin;
+                       gisa_phys = origin;
+                       gisa = phys_to_virt(gisa_phys);
                        origin = gisa->next_alert;
-                       gisa->next_alert = (u32)(u64)gisa;
+                       gisa->next_alert = gisa_phys;
                        kvm = container_of(gisa, struct sie_page2, gisa)->kvm;
                        gi = &kvm->arch.gisa_int;
                        if (hrtimer_active(&gi->timer))
@@ -3413,6 +3414,7 @@ void kvm_s390_gib_destroy(void)
 
 int kvm_s390_gib_init(u8 nisc)
 {
+       u32 gib_origin;
        int rc = 0;
 
        if (!css_general_characteristics.aiv) {
@@ -3434,7 +3436,8 @@ int kvm_s390_gib_init(u8 nisc)
        }
 
        gib->nisc = nisc;
-       if (chsc_sgib((u32)(u64)gib)) {
+       gib_origin = virt_to_phys(gib);
+       if (chsc_sgib(gib_origin)) {
                pr_err("Associating the GIB with the AIV facility failed\n");
                free_page((unsigned long)gib);
                gib = NULL;