From: Janosch Frank <frankja@linux.ibm.com>
To: Janis Schoetterl-Glausch <scgl@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>
Cc: David Hildenbrand <david@redhat.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
kvm@vger.kernel.org, linux-s390@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/3] KVM: s390: gaccess: Refactor gpa and length calculation
Date: Fri, 19 Nov 2021 09:27:26 +0100 [thread overview]
Message-ID: <c169ed6d-7712-c8bc-d132-449afe9a753c@linux.ibm.com> (raw)
In-Reply-To: <20211028135556.1793063-2-scgl@linux.ibm.com>
On 10/28/21 15:55, Janis Schoetterl-Glausch wrote:
> Improve readability be renaming the length variable and
> not calculating the offset manually.
>
> Signed-off-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
> ---
> arch/s390/kvm/gaccess.c | 32 +++++++++++++++++---------------
> 1 file changed, 17 insertions(+), 15 deletions(-)
>
> diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c
> index 6af59c59cc1b..0d11cea92603 100644
> --- a/arch/s390/kvm/gaccess.c
> +++ b/arch/s390/kvm/gaccess.c
> @@ -831,7 +831,8 @@ int access_guest(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, void *data,
> unsigned long len, enum gacc_mode mode)
> {
> psw_t *psw = &vcpu->arch.sie_block->gpsw;
> - unsigned long _len, nr_pages, gpa, idx;
> + unsigned long nr_pages, gpa, idx;
> + unsigned int fragment_len;
> unsigned long pages_array[2];
> unsigned long *pages;
> int need_ipte_lock;
> @@ -855,15 +856,15 @@ int access_guest(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, void *data,
> ipte_lock(vcpu);
> rc = guest_page_range(vcpu, ga, ar, pages, nr_pages, asce, mode);
> for (idx = 0; idx < nr_pages && !rc; idx++) {
> - gpa = *(pages + idx) + (ga & ~PAGE_MASK);
> - _len = min(PAGE_SIZE - (gpa & ~PAGE_MASK), len);
> + gpa = pages[idx] + offset_in_page(ga);
> + fragment_len = min(PAGE_SIZE - offset_in_page(gpa), len);
> if (mode == GACC_STORE)
> - rc = kvm_write_guest(vcpu->kvm, gpa, data, _len);
> + rc = kvm_write_guest(vcpu->kvm, gpa, data, fragment_len);
> else
> - rc = kvm_read_guest(vcpu->kvm, gpa, data, _len);
> - len -= _len;
> - ga += _len;
> - data += _len;
> + rc = kvm_read_guest(vcpu->kvm, gpa, data, fragment_len);
> + len -= fragment_len;
> + ga += fragment_len;
> + data += fragment_len;
> }
> if (need_ipte_lock)
> ipte_unlock(vcpu);
> @@ -875,19 +876,20 @@ int access_guest(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, void *data,
> int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra,
> void *data, unsigned long len, enum gacc_mode mode)
> {
> - unsigned long _len, gpa;
> + unsigned int fragment_len;
> + unsigned long gpa;
> int rc = 0;
>
> while (len && !rc) {
> gpa = kvm_s390_real_to_abs(vcpu, gra);
> - _len = min(PAGE_SIZE - (gpa & ~PAGE_MASK), len);
> + fragment_len = min(PAGE_SIZE - offset_in_page(gpa), len);
> if (mode)
> - rc = write_guest_abs(vcpu, gpa, data, _len);
> + rc = write_guest_abs(vcpu, gpa, data, fragment_len);
> else
> - rc = read_guest_abs(vcpu, gpa, data, _len);
> - len -= _len;
> - gra += _len;
> - data += _len;
> + rc = read_guest_abs(vcpu, gpa, data, fragment_len);
> + len -= fragment_len;
> + gra += fragment_len;
> + data += fragment_len;
> }
> return rc;
> }
>
next prev parent reply other threads:[~2021-11-19 8:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 13:55 [PATCH v2 0/3] KVM: s390: Some gaccess cleanup Janis Schoetterl-Glausch
2021-10-28 13:55 ` [PATCH v2 1/3] KVM: s390: gaccess: Refactor gpa and length calculation Janis Schoetterl-Glausch
2021-11-19 8:27 ` Janosch Frank [this message]
2021-11-23 12:38 ` Janosch Frank
2021-10-28 13:55 ` [PATCH v2] KVM: s390: gaccess: Refactor access address range check Janis Schoetterl-Glausch
2021-11-19 8:56 ` Janosch Frank
2021-11-19 10:01 ` Janis Schoetterl-Glausch
2021-10-28 13:55 ` [PATCH v2 3/3] KVM: s390: gaccess: Cleanup access to guest frames Janis Schoetterl-Glausch
2021-10-28 14:25 ` David Hildenbrand
2021-10-28 14:48 ` Janis Schoetterl-Glausch
2021-11-19 9:00 ` Janosch Frank
2021-11-22 11:13 ` David Hildenbrand
2021-11-23 12:39 ` [PATCH v2 0/3] KVM: s390: Some gaccess cleanup Janosch Frank
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c169ed6d-7712-c8bc-d132-449afe9a753c@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=scgl@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).