From patchwork Mon Mar 30 20:43:09 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: 11466297 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 34BE092C for ; Mon, 30 Mar 2020 20:43:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13DF820784 for ; Mon, 30 Mar 2020 20:43:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EK25I1nU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728494AbgC3Unt (ORCPT ); Mon, 30 Mar 2020 16:43:49 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:31033 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728393AbgC3Unt (ORCPT ); Mon, 30 Mar 2020 16:43:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585601028; 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=8WcGc/uVHG7ylmz9BTpf5JgzJOmoF9uEr8u6eJ8H6Dk=; b=EK25I1nU+ShRY/cYSxSUsYu4Iy2aWNQMHx5h8FWev6tLZFDICBXLyB34LkW+2+86NcjoTK bVc1P61/0lIAgGyfXAR1tjhW94/GjI+i3dBF7oiGENquIpo59kpx7Hw5w85Atdi1XS2/W2 tqm24OJsJUlUpikobEkGPDDeor1liJI= 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-378-28sXCqmINh-LnPyBKYXAsw-1; Mon, 30 Mar 2020 16:43:43 -0400 X-MC-Unique: 28sXCqmINh-LnPyBKYXAsw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C969E1922960; Mon, 30 Mar 2020 20:43: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 DC74519C58; Mon, 30 Mar 2020 20:43:26 +0000 (UTC) From: Wainer dos Santos Moschetta To: kvm@vger.kernel.org, pbonzini@redhat.com Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, david@redhat.com, drjones@redhat.com Subject: [PATCH 1/2] selftests: kvm: Add vm_get_fd() in kvm_util Date: Mon, 30 Mar 2020 17:43:09 -0300 Message-Id: <20200330204310.21736-2-wainersm@redhat.com> In-Reply-To: <20200330204310.21736-1-wainersm@redhat.com> References: <20200330204310.21736-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@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 --- 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 ae0d14c2540a..aa4a70f969ed 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -163,6 +163,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); +unsigned int vm_get_fd(struct kvm_vm *vm); struct kvm_userspace_memory_region * kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start, diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index a6dd0401eb50..0961986c0d74 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1703,3 +1703,8 @@ unsigned int vm_get_max_gfn(struct kvm_vm *vm) { return vm->max_gfn; } + +unsigned int vm_get_fd(struct kvm_vm *vm) +{ + return vm->fd; +} From patchwork Mon Mar 30 20:43:10 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: 11466301 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 4013592C for ; Mon, 30 Mar 2020 20:43:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1460E20786 for ; Mon, 30 Mar 2020 20:43:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EFIRA7hX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728709AbgC3Unx (ORCPT ); Mon, 30 Mar 2020 16:43:53 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:24206 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727328AbgC3Unx (ORCPT ); Mon, 30 Mar 2020 16:43:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585601032; 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=hH/iO6FDRZxlFvpDCLckIcIJQzohrbkDKXNiBqkh6qA=; b=EFIRA7hXtlh1M0hoGMvu9V/Op36t55Afri3rbemUwhvaKnsmTSLbWCZG9eykVaSQbfbQLV /wZTETGh/2Y21HPKCViD7078ye6e7XL7RjeVqvkLZzCnKE1m3s+w1SpvvScp/uTLf0CPRP W4WGuV8MgixsWf+aL4B3V4kXXI8r8dA= 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-343-WVIWNsR0MXWxq5PiSYhXpQ-1; Mon, 30 Mar 2020 16:43:51 -0400 X-MC-Unique: WVIWNsR0MXWxq5PiSYhXpQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 09AD3DB62; Mon, 30 Mar 2020 20:43:50 +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 C9B2C19C58; Mon, 30 Mar 2020 20:43:43 +0000 (UTC) From: Wainer dos Santos Moschetta To: kvm@vger.kernel.org, pbonzini@redhat.com Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, david@redhat.com, drjones@redhat.com Subject: [PATCH 2/2] selftests: kvm: Add mem_slot_test test Date: Mon, 30 Mar 2020 17:43:10 -0300 Message-Id: <20200330204310.21736-3-wainersm@redhat.com> In-Reply-To: <20200330204310.21736-1-wainersm@redhat.com> References: <20200330204310.21736-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@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 | 92 +++++++++++++++++++++ 3 files changed, 96 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 30072c3f52fb..b1b94d50f6a2 100644 --- a/tools/testing/selftests/kvm/.gitignore +++ b/tools/testing/selftests/kvm/.gitignore @@ -17,3 +17,4 @@ /clear_dirty_log_test /dirty_log_test /kvm_create_max_vcpus +/mem_slot_test diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile index d91c53b726e6..070133349403 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -30,16 +30,19 @@ TEST_GEN_PROGS_x86_64 += x86_64/svm_vmcall_test TEST_GEN_PROGS_x86_64 += clear_dirty_log_test TEST_GEN_PROGS_x86_64 += dirty_log_test TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus +TEST_GEN_PROGS_x86_64 += mem_slot_test TEST_GEN_PROGS_aarch64 += clear_dirty_log_test TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus +TEST_GEN_PROGS_aarch64 += mem_slot_test TEST_GEN_PROGS_s390x = s390x/memop TEST_GEN_PROGS_s390x += s390x/sync_regs_test TEST_GEN_PROGS_s390x += s390x/resets 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..75d2bbd71642 --- /dev/null +++ b/tools/testing/selftests/kvm/mem_slot_test.c @@ -0,0 +1,92 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * mem_slot_test + * + * Copyright (C) 2020, Red Hat, Inc. + * + * Test it can be added memory slots up to KVM_CAP_NR_MEMSLOTS, then any + * tentative to add further slots should fail. + */ +#define _GNU_SOURCE /* for program_invocation_short_name */ +#include +#include +#include + +#include "test_util.h" +#include "kvm_util.h" + +/* Memory region flags */ +#define MEM_REG_FLAGS KVM_MEM_LOG_DIRTY_PAGES + +/* Guest VM mode */ +#define GUEST_VM_MODE VM_MODE_DEFAULT + +int main(int argc, char *argv[]) +{ + struct kvm_vm *vm; + /* Maximum allowed number of memory slots */ + uint32_t max_mem_slots; + /* Slot number */ + uint32_t slot; + /* Number of pages in a memory region */ + uint64_t mem_reg_npages; + /* Memory region size */ + uint64_t mem_reg_size; + /* Guest physical memory guest_address */ + uint64_t guest_addr; + /* VM page size */ + uint64_t vm_page_size; + 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"); + DEBUG("Allowed number of memory slots: %i\n", max_mem_slots); + + vm = vm_create(GUEST_VM_MODE, 0, O_RDWR); + + /* Determine the minimal number of pages as possible per region. */ + vm_page_size = vm_get_page_size(vm); +#ifdef __s390x__ + mem_reg_size = 0x100000; +#else + uint64_t host_page_size = sysconf(_SC_PAGESIZE); + + mem_reg_size = (host_page_size > vm_page_size) ? host_page_size : + vm_page_size; +#endif + mem_reg_npages = mem_reg_size / vm_page_size; + guest_addr = 0x0; + + /* Check it can be added memory slots up to the maximum allowed */ + DEBUG("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 */ + guest_addr += mem_reg_size; + 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"); + + munmap(mem, mem_reg_size); + kvm_vm_free(vm); + + return 0; +}