mbox series

[v3,0/6] KVM: selftests: memslot_perf_test: aarch64 cleanup/fixes

Message ID 20221020071209.559062-1-gshan@redhat.com
Headers
Series KVM: selftests: memslot_perf_test: aarch64 cleanup/fixes |

Message

Gavin Shan Oct. 20, 2022, 7:12 a.m. UTC 
  kvm/selftests/memslots_perf_test doesn't work with 64KB-page-size-host
and 4KB-page-size-guest on aarch64. In the implementation, the host and
guest page size have been hardcoded to 4KB. It's ovbiously not working
on aarch64 which supports 4KB, 16KB, 64KB individually on host and guest.

This series tries to fix it. After the series is applied, the test runs
successfully with 64KB-page-size-host and 4KB-page-size-guest.

   # ./memslots_perf_tests -v -s 512

Since we're here, the code is cleaned up a bit as PATCH[1-3] do. The
other patches are fixes to handle the mismatched host/guest page
sized.

v1: https://lore.kernel.org/kvmarm/20221014071914.227134-1-gshan@redhat.com/T/#t
v2: https://lore.kernel.org/kvmarm/20221018040454.405719-1-gshan@redhat.com/T/#t

Changelog
=========
v3:
  * Improved comments about MEM_TEST_MOVE_SIZE, which is set
    to 64KB in PATCH[v3 4/6] and finally fixed to 192KB in
    PATCH[v3 5/6].                                              (Maciej)
  * Use size instead of pages to do the comparison in
    test_memslot_move_prepare()                                 (Maciej)
  * Use tools/include/linux/sizes.h instead of inventing
    our own macros.                                             (Oliver)
v2:
  * Pick the smaller value between the ones specified by
    user or probed from KVM_CAP_NR_MEMSLOTS in PATCH[v2 3/6]    (Maciej)
  * Improved comments about MEM_TEST_MOVE_SIZE in
    PATCH[v2 4/6]                                               (Maciej)
  * Avoid mismatched guest page size after VM is started in
    prepare_vm() in PATCH[v2 4/6]                               (Maciej)
  * Fix condition to check MEM_TEST_{UNMAP, UNMAP_CHUNK}_SIZE
    in check_memory_size() in PATCH[v2 4/6]                     (Maciej)
  * Define base and huge page size in kvm_util_base.h in
    PATCH[v2 5/6]                                               (Sean)
  * Add checks on host/guest page size in check_memory_size()
    and fail early if any of them exceeds 64KB in PATCH[v2 5/6] (Maciej)


Gavin Shan (6):
  KVM: selftests: memslot_perf_test: Use data->nslots in prepare_vm()
  KVM: selftests: memslot_perf_test: Consolidate loop conditions in
    prepare_vm()
  KVM: selftests: memslot_perf_test: Probe memory slots for once
  KVM: selftests: memslot_perf_test: Support variable guest page size
  KVM: selftests: memslot_perf_test: Consolidate memory
  KVM: selftests: memslot_perf_test: Report optimal memory slots

 .../testing/selftests/kvm/memslot_perf_test.c | 317 ++++++++++++------
 1 file changed, 208 insertions(+), 109 deletions(-)

Comments

Maciej S. Szmigiero Oct. 24, 2022, 11:18 p.m. UTC | #1 
On 20.10.2022 09:12, Gavin Shan wrote:
> kvm/selftests/memslots_perf_test doesn't work with 64KB-page-size-host
> and 4KB-page-size-guest on aarch64. In the implementation, the host and
> guest page size have been hardcoded to 4KB. It's ovbiously not working
> on aarch64 which supports 4KB, 16KB, 64KB individually on host and guest.
> 
> This series tries to fix it. After the series is applied, the test runs
> successfully with 64KB-page-size-host and 4KB-page-size-guest.
> 
>     # ./memslots_perf_tests -v -s 512
> 
> Since we're here, the code is cleaned up a bit as PATCH[1-3] do. The
> other patches are fixes to handle the mismatched host/guest page
> sized.
> 
> v1: https://lore.kernel.org/kvmarm/20221014071914.227134-1-gshan@redhat.com/T/#t
> v2: https://lore.kernel.org/kvmarm/20221018040454.405719-1-gshan@redhat.com/T/#t
> 
> Changelog
> =========
> v3:
>    * Improved comments about MEM_TEST_MOVE_SIZE, which is set
>      to 64KB in PATCH[v3 4/6] and finally fixed to 192KB in
>      PATCH[v3 5/6].                                              (Maciej)
>    * Use size instead of pages to do the comparison in
>      test_memslot_move_prepare()                                 (Maciej)
>    * Use tools/include/linux/sizes.h instead of inventing
>      our own macros.                                             (Oliver)
> v2:
>    * Pick the smaller value between the ones specified by
>      user or probed from KVM_CAP_NR_MEMSLOTS in PATCH[v2 3/6]    (Maciej)
>    * Improved comments about MEM_TEST_MOVE_SIZE in
>      PATCH[v2 4/6]                                               (Maciej)
>    * Avoid mismatched guest page size after VM is started in
>      prepare_vm() in PATCH[v2 4/6]                               (Maciej)
>    * Fix condition to check MEM_TEST_{UNMAP, UNMAP_CHUNK}_SIZE
>      in check_memory_size() in PATCH[v2 4/6]                     (Maciej)
>    * Define base and huge page size in kvm_util_base.h in
>      PATCH[v2 5/6]                                               (Sean)
>    * Add checks on host/guest page size in check_memory_size()
>      and fail early if any of them exceeds 64KB in PATCH[v2 5/6] (Maciej)
> 
> 
> Gavin Shan (6):
>    KVM: selftests: memslot_perf_test: Use data->nslots in prepare_vm()
>    KVM: selftests: memslot_perf_test: Consolidate loop conditions in
>      prepare_vm()
>    KVM: selftests: memslot_perf_test: Probe memory slots for once
>    KVM: selftests: memslot_perf_test: Support variable guest page size
>    KVM: selftests: memslot_perf_test: Consolidate memory
>    KVM: selftests: memslot_perf_test: Report optimal memory slots
> 

This patch set now looks good to me, so for the whole series:
Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>

Thanks,
Maciej
Gavin Shan Nov. 4, 2022, 11:57 p.m. UTC | #2 
On 10/25/22 7:18 AM, Maciej S. Szmigiero wrote:
> On 20.10.2022 09:12, Gavin Shan wrote:
>> kvm/selftests/memslots_perf_test doesn't work with 64KB-page-size-host
>> and 4KB-page-size-guest on aarch64. In the implementation, the host and
>> guest page size have been hardcoded to 4KB. It's ovbiously not working
>> on aarch64 which supports 4KB, 16KB, 64KB individually on host and guest.
>>
>> This series tries to fix it. After the series is applied, the test runs
>> successfully with 64KB-page-size-host and 4KB-page-size-guest.
>>
>>     # ./memslots_perf_tests -v -s 512
>>
>> Since we're here, the code is cleaned up a bit as PATCH[1-3] do. The
>> other patches are fixes to handle the mismatched host/guest page
>> sized.
>>
>> v1: https://lore.kernel.org/kvmarm/20221014071914.227134-1-gshan@redhat.com/T/#t
>> v2: https://lore.kernel.org/kvmarm/20221018040454.405719-1-gshan@redhat.com/T/#t
>>
>> Changelog
>> =========
>> v3:
>>    * Improved comments about MEM_TEST_MOVE_SIZE, which is set
>>      to 64KB in PATCH[v3 4/6] and finally fixed to 192KB in
>>      PATCH[v3 5/6].                                              (Maciej)
>>    * Use size instead of pages to do the comparison in
>>      test_memslot_move_prepare()                                 (Maciej)
>>    * Use tools/include/linux/sizes.h instead of inventing
>>      our own macros.                                             (Oliver)
>> v2:
>>    * Pick the smaller value between the ones specified by
>>      user or probed from KVM_CAP_NR_MEMSLOTS in PATCH[v2 3/6]    (Maciej)
>>    * Improved comments about MEM_TEST_MOVE_SIZE in
>>      PATCH[v2 4/6]                                               (Maciej)
>>    * Avoid mismatched guest page size after VM is started in
>>      prepare_vm() in PATCH[v2 4/6]                               (Maciej)
>>    * Fix condition to check MEM_TEST_{UNMAP, UNMAP_CHUNK}_SIZE
>>      in check_memory_size() in PATCH[v2 4/6]                     (Maciej)
>>    * Define base and huge page size in kvm_util_base.h in
>>      PATCH[v2 5/6]                                               (Sean)
>>    * Add checks on host/guest page size in check_memory_size()
>>      and fail early if any of them exceeds 64KB in PATCH[v2 5/6] (Maciej)
>>
>>
>> Gavin Shan (6):
>>    KVM: selftests: memslot_perf_test: Use data->nslots in prepare_vm()
>>    KVM: selftests: memslot_perf_test: Consolidate loop conditions in
>>      prepare_vm()
>>    KVM: selftests: memslot_perf_test: Probe memory slots for once
>>    KVM: selftests: memslot_perf_test: Support variable guest page size
>>    KVM: selftests: memslot_perf_test: Consolidate memory
>>    KVM: selftests: memslot_perf_test: Report optimal memory slots
>>
> 
> This patch set now looks good to me, so for the whole series:
> Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
> 

Thanks for your time on reviews, Maciej. The broken test case was reported
in our downstream Linux, which means our downstream linux needs the improvements
and fixes to make the test case working.

Thanks,
Gavin
Gavin Shan Nov. 10, 2022, 10:54 a.m. UTC | #3 
Hi Marc,

On 10/25/22 7:18 AM, Maciej S. Szmigiero wrote:
> On 20.10.2022 09:12, Gavin Shan wrote:
>> kvm/selftests/memslots_perf_test doesn't work with 64KB-page-size-host
>> and 4KB-page-size-guest on aarch64. In the implementation, the host and
>> guest page size have been hardcoded to 4KB. It's ovbiously not working
>> on aarch64 which supports 4KB, 16KB, 64KB individually on host and guest.
>>
>> This series tries to fix it. After the series is applied, the test runs
>> successfully with 64KB-page-size-host and 4KB-page-size-guest.
>>
>>     # ./memslots_perf_tests -v -s 512
>>
>> Since we're here, the code is cleaned up a bit as PATCH[1-3] do. The
>> other patches are fixes to handle the mismatched host/guest page
>> sized.
>>
>> v1: https://lore.kernel.org/kvmarm/20221014071914.227134-1-gshan@redhat.com/T/#t
>> v2: https://lore.kernel.org/kvmarm/20221018040454.405719-1-gshan@redhat.com/T/#t
>>
>> Changelog
>> =========
>> v3:
>>    * Improved comments about MEM_TEST_MOVE_SIZE, which is set
>>      to 64KB in PATCH[v3 4/6] and finally fixed to 192KB in
>>      PATCH[v3 5/6].                                              (Maciej)
>>    * Use size instead of pages to do the comparison in
>>      test_memslot_move_prepare()                                 (Maciej)
>>    * Use tools/include/linux/sizes.h instead of inventing
>>      our own macros.                                             (Oliver)
>> v2:
>>    * Pick the smaller value between the ones specified by
>>      user or probed from KVM_CAP_NR_MEMSLOTS in PATCH[v2 3/6]    (Maciej)
>>    * Improved comments about MEM_TEST_MOVE_SIZE in
>>      PATCH[v2 4/6]                                               (Maciej)
>>    * Avoid mismatched guest page size after VM is started in
>>      prepare_vm() in PATCH[v2 4/6]                               (Maciej)
>>    * Fix condition to check MEM_TEST_{UNMAP, UNMAP_CHUNK}_SIZE
>>      in check_memory_size() in PATCH[v2 4/6]                     (Maciej)
>>    * Define base and huge page size in kvm_util_base.h in
>>      PATCH[v2 5/6]                                               (Sean)
>>    * Add checks on host/guest page size in check_memory_size()
>>      and fail early if any of them exceeds 64KB in PATCH[v2 5/6] (Maciej)
>>
>>
>> Gavin Shan (6):
>>    KVM: selftests: memslot_perf_test: Use data->nslots in prepare_vm()
>>    KVM: selftests: memslot_perf_test: Consolidate loop conditions in
>>      prepare_vm()
>>    KVM: selftests: memslot_perf_test: Probe memory slots for once
>>    KVM: selftests: memslot_perf_test: Support variable guest page size
>>    KVM: selftests: memslot_perf_test: Consolidate memory
>>    KVM: selftests: memslot_perf_test: Report optimal memory slots
>>
> 
> This patch set now looks good to me, so for the whole series:
> Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
> 

If possible, could you please merge this series to 'next' branch either?
I hope it can be merged early because our downstream needs the fixes to
make the test case work. It's definitely fine to wait for more comments,
but I haven't receive any more comments in last month :)

Thanks,
Gavin
Marc Zyngier Nov. 10, 2022, 7 p.m. UTC | #4 
On Thu, 20 Oct 2022 15:12:03 +0800, Gavin Shan wrote:
> kvm/selftests/memslots_perf_test doesn't work with 64KB-page-size-host
> and 4KB-page-size-guest on aarch64. In the implementation, the host and
> guest page size have been hardcoded to 4KB. It's ovbiously not working
> on aarch64 which supports 4KB, 16KB, 64KB individually on host and guest.
> 
> This series tries to fix it. After the series is applied, the test runs
> successfully with 64KB-page-size-host and 4KB-page-size-guest.
> 
> [...]

Applied to next, thanks!

[1/6] KVM: selftests: memslot_perf_test: Use data->nslots in prepare_vm()
      commit: 3bfadb2325891d122771ce534336af531e93d7b2
[2/6] KVM: selftests: memslot_perf_test: Consolidate loop conditions in prepare_vm()
      commit: 2aae5e6795e1407334bb849f96f11c9051b959e2
[3/6] KVM: selftests: memslot_perf_test: Probe memory slots for once
      commit: 34396437b11f904fc61b272e3974f4c92868451b
[4/6] KVM: selftests: memslot_perf_test: Support variable guest page size
      commit: 8675c6f226986ddb67752be22279a0e2385b197e
[5/6] KVM: selftests: memslot_perf_test: Consolidate memory
      commit: 88a64e65484ef6b5cb09fe545d0dd00c950a1131
[6/6] KVM: selftests: memslot_perf_test: Report optimal memory slots
      commit: a69170c65acdf430e24fc1b6174dcc3aa501fe2f

Cheers,

	M.