From patchwork Fri Apr 3 17:24:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wainer dos Santos Moschetta X-Patchwork-Id: 11473201 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1AEDA912 for ; Fri, 3 Apr 2020 17:24:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE075207FF for ; Fri, 3 Apr 2020 17:24:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="O+/sK1lD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391154AbgDCRYu (ORCPT ); Fri, 3 Apr 2020 13:24:50 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:22837 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2391126AbgDCRYt (ORCPT ); Fri, 3 Apr 2020 13:24:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585934688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=T9VXyQCNLGacVac6lDzMJmSSKgM4vqx/WPWQSRZzIiE=; b=O+/sK1lDFqwzR0X2pkeFHwdt2VRplefq63JsLtf1IlFUACwJCKy6ctEl2WoKuE6/5F6JeW ws5vjZ23rnvwXKMRyVrD32jBYmpLDCvkjlj5pHo4C0i0s5KznzzdqBOFjM3735OunTJOts EOM4PD2tEItWLP6PrrC1g+UYnSUpsrw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-aN-TBCs_Nr6dT7TtaTa2_A-1; Fri, 03 Apr 2020 13:24:43 -0400 X-MC-Unique: aN-TBCs_Nr6dT7TtaTa2_A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 187DB107ACCC; Fri, 3 Apr 2020 17:24:42 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-15.gru2.redhat.com [10.97.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0D7A5C1BE; Fri, 3 Apr 2020 17:24:38 +0000 (UTC) From: Wainer dos Santos Moschetta To: pbonzini@redhat.com, kvm@vger.kernel.org Cc: drjones@redhat.com, david@redhat.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 1/2] selftests: kvm: Add vm_get_fd() in kvm_util Date: Fri, 3 Apr 2020 14:24:27 -0300 Message-Id: <20200403172428.15574-2-wainersm@redhat.com> In-Reply-To: <20200403172428.15574-1-wainersm@redhat.com> References: <20200403172428.15574-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Introduces the vm_get_fd() function in kvm_util which returns the VM file descriptor. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Andrew Jones --- tools/testing/selftests/kvm/include/kvm_util.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index a99b875f50d2..4e122819ee24 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -254,6 +254,7 @@ bool vm_is_unrestricted_guest(struct kvm_vm *vm); unsigned int vm_get_page_size(struct kvm_vm *vm); unsigned int vm_get_page_shift(struct kvm_vm *vm); unsigned int vm_get_max_gfn(struct kvm_vm *vm); +int vm_get_fd(struct kvm_vm *vm); unsigned int vm_calc_num_guest_pages(enum vm_guest_mode mode, size_t size); unsigned int vm_num_host_pages(enum vm_guest_mode mode, unsigned int num_guest_pages); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 8a3523d4434f..3e36a1eb8771 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1734,6 +1734,11 @@ unsigned int vm_get_max_gfn(struct kvm_vm *vm) return vm->max_gfn; } +int vm_get_fd(struct kvm_vm *vm) +{ + return vm->fd; +} + static unsigned int vm_calc_num_pages(unsigned int num_pages, unsigned int page_shift, unsigned int new_page_shift, From patchwork Fri Apr 3 17:24:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wainer dos Santos Moschetta X-Patchwork-Id: 11473199 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B95A912 for ; Fri, 3 Apr 2020 17:24:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61417207FF for ; Fri, 3 Apr 2020 17:24:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M++cGpVV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404266AbgDCRYu (ORCPT ); Fri, 3 Apr 2020 13:24:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30595 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2391147AbgDCRYu (ORCPT ); Fri, 3 Apr 2020 13:24:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585934689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=Y3BsdkhQBkBibI3W5Dm8wcEfZJYqAxE4uyuJVmRry3c=; b=M++cGpVVJd/LnhBWLEmS+QiaZlIs0sChg6ov8/XB+K9DgJShIJqXjEMeZlwhaQRa4UmHms aTvKZusf0Seo6wom7JnMCDRJNrRaHJLImGuxPP69xCUyDZwFOX2FTieOajcWrCm7W8V9LX k38sSq6+7HMaxFIj82F1eed8UYq0oPg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-8K59qd7FM3ST3cJVRLED0w-1; Fri, 03 Apr 2020 13:24:47 -0400 X-MC-Unique: 8K59qd7FM3ST3cJVRLED0w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 459BC100550D; Fri, 3 Apr 2020 17:24:46 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-15.gru2.redhat.com [10.97.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE4865C1BE; Fri, 3 Apr 2020 17:24:42 +0000 (UTC) From: Wainer dos Santos Moschetta To: pbonzini@redhat.com, kvm@vger.kernel.org Cc: drjones@redhat.com, david@redhat.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 2/2] selftests: kvm: Add mem_slot_test test Date: Fri, 3 Apr 2020 14:24:28 -0300 Message-Id: <20200403172428.15574-3-wainersm@redhat.com> In-Reply-To: <20200403172428.15574-1-wainersm@redhat.com> References: <20200403172428.15574-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch introduces the mem_slot_test test which checks an VM can have added memory slots up to the limit defined in KVM_CAP_NR_MEMSLOTS. Then attempt to add one more slot to verify it fails as expected. Signed-off-by: Wainer dos Santos Moschetta --- tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 3 + tools/testing/selftests/kvm/mem_slot_test.c | 85 +++++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 tools/testing/selftests/kvm/mem_slot_test.c diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore index 16877c3daabf..232f24d6931a 100644 --- a/tools/testing/selftests/kvm/.gitignore +++ b/tools/testing/selftests/kvm/.gitignore @@ -22,3 +22,4 @@ /dirty_log_test /kvm_create_max_vcpus /steal_time +/mem_slot_test diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile index 712a2ddd2a27..69b44178f48b 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -33,12 +33,14 @@ TEST_GEN_PROGS_x86_64 += demand_paging_test TEST_GEN_PROGS_x86_64 += dirty_log_test TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus TEST_GEN_PROGS_x86_64 += steal_time +TEST_GEN_PROGS_x86_64 += mem_slot_test TEST_GEN_PROGS_aarch64 += clear_dirty_log_test TEST_GEN_PROGS_aarch64 += demand_paging_test TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus TEST_GEN_PROGS_aarch64 += steal_time +TEST_GEN_PROGS_aarch64 += mem_slot_test TEST_GEN_PROGS_s390x = s390x/memop TEST_GEN_PROGS_s390x += s390x/resets @@ -46,6 +48,7 @@ TEST_GEN_PROGS_s390x += s390x/sync_regs_test TEST_GEN_PROGS_s390x += demand_paging_test TEST_GEN_PROGS_s390x += dirty_log_test TEST_GEN_PROGS_s390x += kvm_create_max_vcpus +TEST_GEN_PROGS_s390x += mem_slot_test TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M)) LIBKVM += $(LIBKVM_$(UNAME_M)) diff --git a/tools/testing/selftests/kvm/mem_slot_test.c b/tools/testing/selftests/kvm/mem_slot_test.c new file mode 100644 index 000000000000..eef6f506f41d --- /dev/null +++ b/tools/testing/selftests/kvm/mem_slot_test.c @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * mem_slot_test + * + * Copyright (C) 2020, Red Hat, Inc. + * + * Test suite for memory region operations. + */ +#define _GNU_SOURCE /* for program_invocation_short_name */ +#include +#include + +#include "test_util.h" +#include "kvm_util.h" + +/* + * Test it can be added memory slots up to KVM_CAP_NR_MEMSLOTS, then any + * tentative to add further slots should fail. + */ +static void test_add_max_slots(void) +{ + struct kvm_vm *vm; + uint32_t max_mem_slots; + uint32_t slot; + uint64_t mem_reg_npages; + uint64_t mem_reg_size; + uint32_t mem_reg_flags; + uint64_t guest_addr; + int ret; + + max_mem_slots = kvm_check_cap(KVM_CAP_NR_MEMSLOTS); + TEST_ASSERT(max_mem_slots > 0, + "KVM_CAP_NR_MEMSLOTS should be greater than 0"); + pr_info("Allowed number of memory slots: %i\n", max_mem_slots); + + vm = vm_create(VM_MODE_DEFAULT, 0, O_RDWR); + + /* + * Uses 1MB sized/aligned memory region since this is the minimal + * required on s390x. + */ + mem_reg_size = 0x100000; + mem_reg_npages = vm_calc_num_guest_pages(VM_MODE_DEFAULT, mem_reg_size); + + mem_reg_flags = kvm_check_cap(KVM_CAP_READONLY_MEM) ? KVM_MEM_READONLY : + KVM_MEM_LOG_DIRTY_PAGES; + + guest_addr = 0x0; + + /* Check it can be added memory slots up to the maximum allowed */ + pr_info("Adding slots 0..%i, each memory region with %ldK size\n", + (max_mem_slots - 1), mem_reg_size >> 10); + for (slot = 0; slot < max_mem_slots; slot++) { + vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, + guest_addr, slot, mem_reg_npages, + mem_reg_flags); + guest_addr += mem_reg_size; + } + + /* Check it cannot be added memory slots beyond the limit */ + void *mem = mmap(NULL, mem_reg_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + TEST_ASSERT(mem != NULL, "Failed to mmap() host"); + + struct kvm_userspace_memory_region kvm_region = { + .slot = slot, + .flags = mem_reg_flags, + .guest_phys_addr = guest_addr, + .memory_size = mem_reg_size, + .userspace_addr = (uint64_t) mem, + }; + + ret = ioctl(vm_get_fd(vm), KVM_SET_USER_MEMORY_REGION, &kvm_region); + TEST_ASSERT(ret == -1, "Adding one more memory slot should fail"); + TEST_ASSERT(errno == EINVAL, "Should return EINVAL errno"); + + munmap(mem, mem_reg_size); + kvm_vm_free(vm); +} + +int main(int argc, char *argv[]) +{ + test_add_max_slots(); + return 0; +}