Skip to contentSkip to conversation

KVM: s390: VSIE: sort out virtual/physical address in pin_guest_page

PATCH Superseded Nico Boehr 2 participants 3 messages Oct 24, 2022 – Oct 25, 2022

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Nico Boehr

author
#0 lore raw

PATCH 1/1 KVM: s390: VSIE: sort out virtual/physical address in pin_guest_page

pin_guest_page() used page_to_virt() to calculate the hpa of the pinned page. This currently works, because virtual and physical addresses are the same. Use page_to_phys() instead to resolve the virtual-real address confusion.

One caller of pin_guest_page() actually expected the hpa to be a hva, so add the missing phys_to_virt() conversion here.

---
 arch/s390/kvm/vsie.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/kvm/vsie.c +2 -2
index 94138f8f0c1c..c6a10ff46d58 100644
@@ -654,7 +654,7 @@ static int pin_guest_page(struct kvm *kvm, gpa_t gpa, hpa_t *hpa)
 	page = gfn_to_page(kvm, gpa_to_gfn(gpa));
 	if (is_error_page(page))
 		return -EINVAL;
-	*hpa = (hpa_t) page_to_virt(page) + (gpa & ~PAGE_MASK);
+	*hpa = (hpa_t)page_to_phys(page) + (gpa & ~PAGE_MASK);
 	return 0;
 }
 
@@ -869,7 +869,7 @@ static int pin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page,
 		WARN_ON_ONCE(rc);
 		return 1;
 	}
-	vsie_page->scb_o = (struct kvm_s390_sie_block *) hpa;
+	vsie_page->scb_o = (struct kvm_s390_sie_block *)phys_to_virt(hpa);
 	return 0;
 }
 
Signature · 1 line
2.37.3
#1 lore raw

Am 24.10.22 um 18:02 schrieb Nico Boehr:

Quoted 27 lines

pin_guest_page() used page_to_virt() to calculate the hpa of the pinned page. This currently works, because virtual and physical addresses are the same. Use page_to_phys() instead to resolve the virtual-real address confusion.

One caller of pin_guest_page() actually expected the hpa to be a hva, so add the missing phys_to_virt() conversion here.

---
  arch/s390/kvm/vsie.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/kvm/vsie.c +1 -1
index 94138f8f0c1c..c6a10ff46d58 100644
@@ -654,7 +654,7 @@ static int pin_guest_page(struct kvm *kvm, gpa_t gpa, hpa_t *hpa)
  	page = gfn_to_page(kvm, gpa_to_gfn(gpa));
  	if (is_error_page(page))
  		return -EINVAL;
-	*hpa = (hpa_t) page_to_virt(page) + (gpa & ~PAGE_MASK);
+	*hpa = (hpa_t)page_to_phys(page) + (gpa & ~PAGE_MASK);
  	return 0;
  }
 

arch/s390/kvm/vsie.c static int pin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, · line 872

Quoted 5 lines
arch/s390/kvm/vsie.c +1 -1
@@ -869,7 +869,7 @@ static int pin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page,
  		WARN_ON_ONCE(rc);
  		return 1;
  	}
-	vsie_page->scb_o = (struct kvm_s390_sie_block *) hpa;
+	vsie_page->scb_o = (struct kvm_s390_sie_block *)phys_to_virt(hpa);

Do we still need the cast here? phys_to_virt should return a void * and the assignment should succeed.

Quoted 3 lines
arch/s390/kvm/vsie.c +0 -0
  	return 0;
  }
 
author
#2 lore raw

Quoting Christian Borntraeger (2022-10-25 08:37:21) [...]

Quoted 2 lines
Quoted 2 lines
arch/s390/kvm/vsie.c +0 -0
index 94138f8f0c1c..c6a10ff46d58 100644

[...]

Quoted 8 lines

arch/s390/kvm/vsie.c static int pin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, · line 872

Quoted 6 lines
arch/s390/kvm/vsie.c +1 -1
@@ -869,7 +869,7 @@ static int pin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page,
              WARN_ON_ONCE(rc);
              return 1;
      }
-     vsie_page->scb_o = (struct kvm_s390_sie_block *) hpa;
+     vsie_page->scb_o = (struct kvm_s390_sie_block *)phys_to_virt(hpa);

Do we still need the cast here? phys_to_virt should return a void * and the assignment should succeed.

Yes, right. Fixed in v2.