Kernel KVM virtualization development
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Andrew Jones <drjones@redhat.com>, kvm@vger.kernel.org
Cc: borntraeger@de.ibm.com, frankja@linux.ibm.com, david@redhat.com,
	cohuck@redhat.com, thuth@redhat.com
Subject: Re: [PATCH] KVM: selftests: s390x: Provide additional num-guest-pages adjustment
Date: Sat, 14 Mar 2020 11:58:54 +0100	[thread overview]
Message-ID: <77c7ee95-dba0-e35f-b03c-3a5252c41c66@redhat.com> (raw)
In-Reply-To: <20200312104055.8558-1-drjones@redhat.com>

On 12/03/20 11:40, Andrew Jones wrote:
> s390 requires 1M aligned guest sizes. Embedding the rounding in
> vm_adjust_num_guest_pages() allows us to remove it from a few
> other places.
> 
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
>  tools/testing/selftests/kvm/demand_paging_test.c | 4 ----
>  tools/testing/selftests/kvm/dirty_log_test.c     | 5 +----
>  tools/testing/selftests/kvm/include/kvm_util.h   | 8 +++++++-
>  3 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c
> index c1e326d3ed7f..ae086c5dc118 100644
> --- a/tools/testing/selftests/kvm/demand_paging_test.c
> +++ b/tools/testing/selftests/kvm/demand_paging_test.c
> @@ -378,10 +378,6 @@ static void run_test(enum vm_guest_mode mode, bool use_uffd,
>  	guest_num_pages = (vcpus * vcpu_memory_bytes) / guest_page_size;
>  	guest_num_pages = vm_adjust_num_guest_pages(mode, guest_num_pages);
>  
> -#ifdef __s390x__
> -	/* Round up to multiple of 1M (segment size) */
> -	guest_num_pages = (guest_num_pages + 0xff) & ~0xffUL;
> -#endif
>  	/*
>  	 * If there should be more memory in the guest test region than there
>  	 * can be pages in the guest, it will definitely cause problems.
> diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
> index 518a94a7a8b5..8a79f5d6b979 100644
> --- a/tools/testing/selftests/kvm/dirty_log_test.c
> +++ b/tools/testing/selftests/kvm/dirty_log_test.c
> @@ -296,10 +296,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations,
>  	guest_num_pages = (1ul << (DIRTY_MEM_BITS -
>  				   vm_get_page_shift(vm))) + 3;
>  	guest_num_pages = vm_adjust_num_guest_pages(mode, guest_num_pages);
> -#ifdef __s390x__
> -	/* Round up to multiple of 1M (segment size) */
> -	guest_num_pages = (guest_num_pages + 0xff) & ~0xffUL;
> -#endif
> +
>  	host_page_size = getpagesize();
>  	host_num_pages = vm_num_host_pages(mode, guest_num_pages);
>  
> diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
> index 707b44805149..ade5a40afbee 100644
> --- a/tools/testing/selftests/kvm/include/kvm_util.h
> +++ b/tools/testing/selftests/kvm/include/kvm_util.h
> @@ -164,7 +164,13 @@ unsigned int vm_num_guest_pages(enum vm_guest_mode mode, unsigned int num_host_p
>  static inline unsigned int
>  vm_adjust_num_guest_pages(enum vm_guest_mode mode, unsigned int num_guest_pages)
>  {
> -	return vm_num_guest_pages(mode, vm_num_host_pages(mode, num_guest_pages));
> +	unsigned int n;
> +	n = vm_num_guest_pages(mode, vm_num_host_pages(mode, num_guest_pages));
> +#ifdef __s390x__
> +	/* s390 requires 1M aligned guest sizes */
> +	n = (n + 255) & ~255;
> +#endif
> +	return n;
>  }
>  
>  struct kvm_userspace_memory_region *
> 

Queued, thanks.

Paolo


      parent reply	other threads:[~2020-03-15  3:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12 10:40 [PATCH] KVM: selftests: s390x: Provide additional num-guest-pages adjustment Andrew Jones
2020-03-12 10:48 ` Christian Borntraeger
2020-03-14 10:58 ` Paolo Bonzini [this message]

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=77c7ee95-dba0-e35f-b03c-3a5252c41c66@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=drjones@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --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