From: Ben Gardon <bgardon@google.com>
To: Andrew Jones <drjones@redhat.com>
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
borntraeger@de.ibm.com, frankja@linux.ibm.com, thuth@redhat.com,
Peter Xu <peterx@redhat.com>
Subject: Re: [PATCH 03/13] fixup! KVM: selftests: Support multiple vCPUs in demand paging test
Date: Tue, 18 Feb 2020 09:39:02 -0800 [thread overview]
Message-ID: <CANgfPd884HrKF+0R-SymmZrg6VbOXsRyvKxUzUiMbMB4Fq3Giw@mail.gmail.com> (raw)
In-Reply-To: <20200214145920.30792-4-drjones@redhat.com>
On Fri, Feb 14, 2020 at 6:59 AM Andrew Jones <drjones@redhat.com> wrote:
>
> [guest_code() can't return, use GUEST_ASSERT(). Ensure the number
> of guests pages is compatible with the host.]
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
> tools/testing/selftests/kvm/demand_paging_test.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c
> index ec8860b70129..2e6e3db8418a 100644
> --- a/tools/testing/selftests/kvm/demand_paging_test.c
> +++ b/tools/testing/selftests/kvm/demand_paging_test.c
> @@ -115,9 +115,8 @@ static void guest_code(uint32_t vcpu_id)
> uint64_t pages;
> int i;
>
> - /* Return to signal error if vCPU args data structure is courrupt. */
> - if (vcpu_args[vcpu_id].vcpu_id != vcpu_id)
> - return;
> + /* Make sure vCPU args data structure is not corrupt. */
> + GUEST_ASSERT(vcpu_args[vcpu_id].vcpu_id == vcpu_id);
>
> gva = vcpu_args[vcpu_id].gva;
> pages = vcpu_args[vcpu_id].pages;
> @@ -186,6 +185,12 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, int vcpus,
> pages += ((2 * vcpus * vcpu_memory_bytes) >> PAGE_SHIFT_4K) /
> PTES_PER_4K_PT;
>
> + /*
> + * If the host is uing 64K pages, then we need the number of 4K
s/uing/using
> + * guest pages to be a multiple of 16.
> + */
> + pages += 16 - pages % 16;
> +
Could we use some derivative of getpagesize() here instead?
e.g.
ASSERT(getpagesize() >= (1 << PAGE_SHIFT_4K));
ASSERT(!(getpagesize() % (1 << PAGE_SHIFT_4K)));
pages_4k_per_host_page = getpagesize() / (1 << PAGE_SHIFT_4K);
pages += pages_4k_per_host_page - pages % pages_4k_per_host_page;
> vm = _vm_create(mode, pages, O_RDWR);
> kvm_vm_elf_load(vm, program_invocation_name, 0, 0);
> #ifdef __x86_64__
> --
> 2.21.1
>
next prev parent reply other threads:[~2020-02-18 17:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 14:59 [PATCH 00/13] KVM: selftests: Various fixes and cleanups Andrew Jones
2020-02-14 14:59 ` [PATCH 01/13] HACK: Ensure __NR_userfaultfd is defined Andrew Jones
2020-02-20 16:38 ` Paolo Bonzini
2020-02-14 14:59 ` [PATCH 02/13] fixup! KVM: selftests: Add support for vcpu_args_set to aarch64 and s390x Andrew Jones
2020-02-14 20:35 ` Christian Borntraeger
2020-02-15 7:04 ` Andrew Jones
2020-02-18 17:30 ` Ben Gardon
2020-02-18 17:38 ` Andrew Jones
2020-02-20 16:40 ` Paolo Bonzini
2020-02-14 14:59 ` [PATCH 03/13] fixup! KVM: selftests: Support multiple vCPUs in demand paging test Andrew Jones
2020-02-18 17:39 ` Ben Gardon [this message]
2020-02-14 14:59 ` [PATCH 04/13] fixup! KVM: selftests: Add memory size parameter to the " Andrew Jones
2020-02-18 17:43 ` Ben Gardon
2020-02-14 14:59 ` [PATCH 05/13] fixup! KVM: selftests: Time guest demand paging Andrew Jones
2020-02-14 14:59 ` [PATCH 06/13] KVM: selftests: Remove unnecessary defines Andrew Jones
2020-02-14 14:59 ` [PATCH 07/13] KVM: selftests: aarch64: Remove unnecessary ifdefs Andrew Jones
2020-02-14 14:59 ` [PATCH 08/13] KVM: selftests: aarch64: Use stream when given Andrew Jones
2020-02-14 14:59 ` [PATCH 09/13] KVM: selftests: Rework debug message printing Andrew Jones
2020-02-14 14:59 ` [PATCH 10/13] KVM: selftests: Convert some printf's to pr_info's Andrew Jones
2020-02-14 14:59 ` [PATCH 11/13] KVM: selftests: Rename vm_guest_mode_params Andrew Jones
2020-02-14 14:59 ` [PATCH 12/13] KVM: selftests: Introduce vm_guest_mode_params Andrew Jones
2020-02-14 14:59 ` [PATCH 13/13] KVM: selftests: Introduce num-pages conversion utilities Andrew Jones
2020-02-20 16:46 ` Paolo Bonzini
2020-02-14 15:23 ` [PATCH 00/13] KVM: selftests: Various fixes and cleanups Paolo Bonzini
2020-02-15 7:04 ` Andrew Jones
2020-02-14 22:26 ` Peter Xu
2020-02-15 7:07 ` Andrew Jones
2020-02-15 19:11 ` Peter Xu
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=CANgfPd884HrKF+0R-SymmZrg6VbOXsRyvKxUzUiMbMB4Fq3Giw@mail.gmail.com \
--to=bgardon@google.com \
--cc=borntraeger@de.ibm.com \
--cc=drjones@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=thuth@redhat.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).