Switch KVM code to using the macro. No functional changes intended.
Signed-off-by: Yury Norov <[email protected]>
---
arch/s390/kvm/gaccess.c | 6 +++---
arch/x86/kvm/emulate.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c
index 4630b2a067ea..40f85b7eca63 100644
--- a/arch/s390/kvm/gaccess.c
+++ b/arch/s390/kvm/gaccess.c
@@ -973,7 +973,7 @@ int access_guest_with_key(struct kvm_vcpu *vcpu, unsigned
long ga, u8 ar,
if (rc)
goto out_unlock;
for (idx = 0; idx < nr_pages; idx++) {
- fragment_len = min(PAGE_SIZE - offset_in_page(gpas[idx]), len);
+ fragment_len = min(rest_of_page(gpas[idx]), len);
if (try_fetch_prot_override && fetch_prot_override_applies(ga,
fragment_len)) {
rc = access_guest_page_gpa(vcpu->kvm, mode, gpas[idx],
data, fragment_len);
} else {
@@ -1015,7 +1015,7 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned
long gra,
while (len && !rc) {
gpa = kvm_s390_real_to_abs(vcpu, gra);
- fragment_len = min(PAGE_SIZE - offset_in_page(gpa), len);
+ fragment_len = min(rest_of_page(gpa), len);
rc = access_guest_page_gpa(vcpu->kvm, mode, gpa, data,
fragment_len);
len -= fragment_len;
gra += fragment_len;
@@ -1237,7 +1237,7 @@ int check_gpa_range(struct kvm *kvm, unsigned long gpa,
unsigned long length,
int rc = 0;
while (length && !rc) {
- fragment_len = min(PAGE_SIZE - offset_in_page(gpa), length);
+ fragment_len = min(rest_of_page(gpa), length);
rc = vm_check_access_key_gpa(kvm, access_key, mode, gpa);
length -= fragment_len;
gpa += fragment_len;
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index c8e292e9a24d..c060d1e2bb94 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -864,7 +864,7 @@ static int __do_insn_fetch_bytes(struct x86_emulate_ctxt
*ctxt, int op_size)
return rc;
size = min_t(unsigned, 15UL ^ cur_size, max_size);
- size = min_t(unsigned, size, PAGE_SIZE - offset_in_page(linear));
+ size = min_t(unsigned int, size, rest_of_page(linear));
/*
* One instruction can only straddle two pages,
@@ -1372,7 +1372,7 @@ static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
address_mask(ctxt, reg_read(ctxt, VCPU_REGS_RCX)) : 1;
in_page = (ctxt->eflags & X86_EFLAGS_DF) ?
offset_in_page(reg_read(ctxt, VCPU_REGS_RDI)) :
- PAGE_SIZE - offset_in_page(reg_read(ctxt,
VCPU_REGS_RDI));
+ rest_of_page(reg_read(ctxt, VCPU_REGS_RDI));
n = min3(in_page, (unsigned int)sizeof(rc->data) / size, count);
if (n == 0)
n = 1;
--
2.43.0
