From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5557B43A7F6 for ; Tue, 28 Jul 2026 12:11:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785240718; cv=none; b=obqgNJgqJVE+FMZCz4qvtWcw2krdzqmWC1qzcvIhIDRxPEVGsRghX/FcijK+nwLNIJM/3IJc2pDeO1IM7uleNWn2mh3XQhTYCn2OmbYUZFAYcmANb/BL8uDPNspht5tlDjhqvv4Db0Em1EJzfh0nZjuXk3gTxUOvqALmD44Q9qY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785240718; c=relaxed/simple; bh=//dOX4zO0X4ZoL8mOmAWmQQZNeudbM5AbI8VS+aFh2I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fINxndFvtjnzmq/7cxKBEoLOWMMQNoIfVmGftAfSyZRSMZxOI42uRpKqO2F4NFVIJsUszpEqRPII7B3uXhxJgj3m1TiX37mjhM6w3+KlDG6xKOy4EN1M0Hufna1rYsIqT5ynyWqGZBjmnlewWha43gyh5QCqR5lC7RTOb8wv1g8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tarunsahu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PwT0kHZg; arc=none smtp.client-ip=209.85.218.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tarunsahu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PwT0kHZg" Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-c1c4715cf0eso393537466b.2 for ; Tue, 28 Jul 2026 05:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785240713; x=1785845513; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=jLf4NZ8GM7enE5DcNnXkHjbguMY0Wvl4QcagAqNt0Jg=; b=PwT0kHZgdGHMQk9bDTH7Ko/9eWgZRlWIlbQoAUqCWaIQryHfstL8Pgq/GOpThUgYsk lsHipXHcmKoOu3pRdq6kZDXZW6ewtYW0X2cL2Dg6u+BqBsC/y+VrWVpZgC/i/5QKjg43 HyV/6xbdFrE9miA4FEtfvFTakf14NjHnIDiDoqr20vWx5swniYbLUD12XnRSYlIL8U6D WYw41KOuN2d8edkX2KiEDvyzSYdrEfSYzlStLhi/m2iI1yqSlTImch1qHGUv+rXr1bcx vVq0zIHG4/dheEptgjUv85x7Ecg7raCF3OL9ScCHqACZuQgvShJEEy82S0WNSLyB2vBb BO5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785240713; x=1785845513; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jLf4NZ8GM7enE5DcNnXkHjbguMY0Wvl4QcagAqNt0Jg=; b=ELDt9IXwbu/gA9se1UqCiPTnq4AwPMpnkA/Uv+81db5uilYetBu3V0Dp5SbzNbVWKf S3Kks/13K1R1f2sJF97K7Vd2qpF1wSzHsL1pAkccgomTKxbjB9N5cyuFy6kgp1zYM6a1 ueREfben6W9qd7YA6LUFcG2apCLoxTs0lvgvpSUXEhgZHsMSpwDKcFVoAoVK8ioTt4qQ 85qZDTWpB1EIj3sGQGBB/aDuda9HVOZctaowGg8T7hW/xW+llH1k7AMEJTS79kqcOSAX Fu8ALo9efzKKuWp29iqMTM6LbUTJeVYy7+w5NkCqlPYA/N8/T/t977K/+IlLHpttk5QN PcfQ== X-Gm-Message-State: AOJu0Yxc4XH/w/866L0Watqj3nFV/6pcJCbXBvBSbU/4wFEjk6gghnis +q91cJxnR9Z0+nrhzGYuSrFcDYqg+i2fWDe0A1IKKLajWGnXi/+/AOOhoAXlWi9orPIRJ0DuTYF oyjiY/ph7F2R+bU8CKQ== X-Received: from ejet14.prod.google.com ([2002:a17:906:178e:b0:c09:e2fc:4344]) (user=tarunsahu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:6a02:b0:c1f:586a:8514 with SMTP id a640c23a62f3a-c1f725124camr96102666b.65.1785240713183; Tue, 28 Jul 2026 05:11:53 -0700 (PDT) Date: Tue, 28 Jul 2026 12:11:37 +0000 In-Reply-To: <20260728121138.1103610-1-tarunsahu@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260728121138.1103610-1-tarunsahu@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260728121138.1103610-11-tarunsahu@google.com> Subject: [PATCH v4 10/11] KVM: selftests: Split ____vm_create() and add vm_create_from_fd() From: Tarun Sahu To: ackerleytng@google.com, fuad.tabba@linux.dev, Andrew Morton , seanjc@google.com, dmatlack@google.com, Shuah Khan , Jonathan Corbet , david@redhat.com, Tarun Sahu , Pasha Tatashin , Pratyush Yadav , sagis@google.com, Paolo Bonzini , Mike Rapoport , Alexander Graf Cc: linux-kselftest@vger.kernel.org, andre.przywara@arm.com, michael.roth@amd.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, will@kernel.org, vannapurve@google.com, maz@kernel.org, fvdl@google.com, kvm@vger.kernel.org, oliver.upton@linux.dev, kvmarm@lists.linux.dev, alexandru.elisei@arm.com, skhawaja@google.com, aneesh.kumar@kernel.org, linux-doc@vger.kernel.org, David Hildenbrand , yan.y.zhao@intel.com, kexec@lists.infradead.org, suzuki.poulose@arm.com Content-Type: text/plain; charset="UTF-8" Refactor ____vm_create() in the KVM selftest library to extract its initialization steps into separate helpers vm_init_fields() and vm_init_memory_properties(). Also introduce vm_create_from_fd() to instantiate a struct kvm_vm from an existing VM file descriptor. This allows test setups (such as guest_memfd preservation tests) to reconstruct and initialize a struct kvm_vm when restoring preserved VMs across live updates. No functional change is introduced for existing tests. Signed-off-by: Tarun Sahu --- .../testing/selftests/kvm/include/kvm_util.h | 3 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 49 ++++++++++++++++--- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 04a910164a29..0626efa5a73b 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -471,6 +471,9 @@ const char *vm_guest_mode_string(u32 i); void kvm_vm_free(struct kvm_vm *vmp); void kvm_vm_restart(struct kvm_vm *vmp); +void vm_init_fields(struct kvm_vm *vm, struct vm_shape shape); +void vm_init_memory_properties(struct kvm_vm *vm); +struct kvm_vm *vm_create_from_fd(int vm_fd, struct vm_shape shape); void kvm_vm_release(struct kvm_vm *vmp); void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename); int kvm_memfd_alloc(size_t size, bool hugepages); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 195f3fdae1e3..d3f98d9eb709 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -276,13 +276,8 @@ __weak void vm_populate_gva_bitmap(struct kvm_vm *vm) (1ULL << (vm->va_bits - 1)) >> vm->page_shift); } -struct kvm_vm *____vm_create(struct vm_shape shape) +void vm_init_fields(struct kvm_vm *vm, struct vm_shape shape) { - struct kvm_vm *vm; - - vm = calloc(1, sizeof(*vm)); - TEST_ASSERT(vm != NULL, "Insufficient Memory"); - INIT_LIST_HEAD(&vm->vcpus); vm->regions.gpa_tree = RB_ROOT; vm->regions.hva_tree = RB_ROOT; @@ -380,9 +375,10 @@ struct kvm_vm *____vm_create(struct vm_shape shape) if (vm->pa_bits != 40) vm->type = KVM_VM_TYPE_ARM_IPA_SIZE(vm->pa_bits); #endif +} - vm_open(vm); - +void vm_init_memory_properties(struct kvm_vm *vm) +{ /* Limit to VA-bit canonical virtual addresses. */ vm->vpages_valid = sparsebit_alloc(); vm_populate_gva_bitmap(vm); @@ -392,10 +388,47 @@ struct kvm_vm *____vm_create(struct vm_shape shape) /* Allocate and setup memory for guest. */ vm->vpages_mapped = sparsebit_alloc(); +} + +struct kvm_vm *____vm_create(struct vm_shape shape) +{ + struct kvm_vm *vm; + + vm = calloc(1, sizeof(*vm)); + TEST_ASSERT(vm != NULL, "Insufficient Memory"); + + vm_init_fields(vm, shape); + + vm_open(vm); + + vm_init_memory_properties(vm); + + return vm; +} + +struct kvm_vm *vm_create_from_fd(int vm_fd, struct vm_shape shape) +{ + struct kvm_vm *vm; + + vm = calloc(1, sizeof(*vm)); + TEST_ASSERT(vm != NULL, "Insufficient Memory"); + + vm_init_fields(vm, shape); + + vm->kvm_fd = _open_kvm_dev_path_or_exit(O_RDWR); + vm->fd = vm_fd; + + if (kvm_has_cap(KVM_CAP_BINARY_STATS_FD)) + vm->stats.fd = vm_get_stats_fd(vm); + else + vm->stats.fd = -1; + + vm_init_memory_properties(vm); return vm; } + static u64 vm_nr_pages_required(enum vm_guest_mode mode, u32 nr_runnable_vcpus, u64 extra_mem_pages) -- 2.55.0.229.g6434b31f56-goog