From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fra-out-008.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-008.esa.eu-central-1.outbound.mail-perimeter.amazon.com [35.158.23.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C8C62EDD59 for ; Thu, 28 Aug 2025 09:39:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=35.158.23.94 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756373976; cv=none; b=ZM0wSDkL+2jk9duPWWlVu5Jy99TRgJmXAIDeX67lL2aHS8zcOkgBq/sd6NrOWR6gZH8+fZhO6GH795qPr8qdmImtVli1ZQC7wsPVwPu+0eW/AW2uguBfKT68tWrIHoXPu6n5N7pnFZlAPL65qyk5tNnISOHPun05JidJ9hZXz/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756373976; c=relaxed/simple; bh=5qrqzd2bzp1VEU3Ni1twqHTCfuhzgLqgZV39ew/49cY=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=QXiPKSKPQyhgu158Sw7NGjLR78p2f/KK1fIz2JqSViWqCdDwRkWPirnxok8XrnaT+O4aSqoAS05QGT77kGoWKdxz7XgztQ8p8kZKtAJr5U2jnWmdjNDsTOL9yDFMS7LSrxYFqwRiabm0iZTl+BKMbkBOUa7e+acseYZF7216ljE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.co.uk; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (2048-bit key) header.d=amazon.co.uk header.i=@amazon.co.uk header.b=G635qR8/; arc=none smtp.client-ip=35.158.23.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.co.uk header.i=@amazon.co.uk header.b="G635qR8/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1756373973; x=1787909973; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=2GKsQpLhDwEigIcg6L6Ns++AnIJyQDate+xl8DCsoZg=; b=G635qR8/xDcO8Wrv8y3JFeL9FXfKaJojrlyLzrLq5GHCJR8AiDI6StwP 38c7Iq9+7XSGNC7d0azEHf5bVv5uXVliey+ozyrLfCCshsvdnMlaotXO9 oh4EblbKJY9bD4ywpQIr83AqzL4CUr3qaazE/ZFePDbrFKqCvmkio/XAU KXug8Gi7u1JAvKgZ58xwLftQ27zosFfGcs6rH7PR3YI4FibWx+5DFSut/ pgmxbNBYKBPditmic1gWfH4+agQKur3poOMn9e9M4a+qh3rfsrr+NLl56 4IxPlK58vHrKBIACM0yrCEhfrDrfav4sodHvLtSxv4Cim4koIDcSA4qxX w==; X-CSE-ConnectionGUID: lWd8i2WJRJqgu4AJCZSeLQ== X-CSE-MsgGUID: EUKWcsB7TEWoNzzYRDs/cA== X-IronPort-AV: E=Sophos;i="6.18,214,1751241600"; d="scan'208";a="1303840" Received: from ip-10-6-6-97.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.6.97]) by internal-fra-out-008.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2025 09:39:31 +0000 Received: from EX19MTAEUA002.ant.amazon.com [54.240.197.232:30454] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.42.3:2525] with esmtp (Farcaster) id b6128983-88e8-4af1-9711-47b2713193ad; Thu, 28 Aug 2025 09:39:31 +0000 (UTC) X-Farcaster-Flow-ID: b6128983-88e8-4af1-9711-47b2713193ad Received: from EX19D015EUB002.ant.amazon.com (10.252.51.123) by EX19MTAEUA002.ant.amazon.com (10.252.50.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.17; Thu, 28 Aug 2025 09:39:28 +0000 Received: from EX19D015EUB004.ant.amazon.com (10.252.51.13) by EX19D015EUB002.ant.amazon.com (10.252.51.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.17; Thu, 28 Aug 2025 09:39:28 +0000 Received: from EX19D015EUB004.ant.amazon.com ([fe80::2dc9:7aa9:9cd3:fc8a]) by EX19D015EUB004.ant.amazon.com ([fe80::2dc9:7aa9:9cd3:fc8a%3]) with mapi id 15.02.2562.017; Thu, 28 Aug 2025 09:39:28 +0000 From: "Roy, Patrick" To: "david@redhat.com" , "seanjc@google.com" CC: "Roy, Patrick" , "tabba@google.com" , "ackerleytng@google.com" , "pbonzini@redhat.com" , "kvm@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" , "rppt@kernel.org" , "will@kernel.org" , "vbabka@suse.cz" , "Cali, Marco" , "Kalyazin, Nikita" , "Thomson, Jack" , "Manwaring, Derek" Subject: [PATCH v5 09/12] KVM: selftests: stuff vm_mem_backing_src_type into vm_shape Thread-Topic: [PATCH v5 09/12] KVM: selftests: stuff vm_mem_backing_src_type into vm_shape Thread-Index: AQHcF/+lpVChiqeOEU2vKPY3yGmqIQ== Date: Thu, 28 Aug 2025 09:39:28 +0000 Message-ID: <20250828093902.2719-10-roypat@amazon.co.uk> References: <20250828093902.2719-1-roypat@amazon.co.uk> In-Reply-To: <20250828093902.2719-1-roypat@amazon.co.uk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use one of the padding fields in struct vm_shape to carry an enum=0A= vm_mem_backing_src_type value, to give the option to overwrite the=0A= default of VM_MEM_SRC_ANONYMOUS in __vm_create().=0A= =0A= Overwriting this default will allow tests to create VMs where the test=0A= code is backed by mmap'd guest_memfd instead of anonymous memory.=0A= =0A= Signed-off-by: Patrick Roy =0A= ---=0A= .../testing/selftests/kvm/include/kvm_util.h | 19 ++++++++++---------=0A= tools/testing/selftests/kvm/lib/kvm_util.c | 2 +-=0A= tools/testing/selftests/kvm/lib/x86/sev.c | 1 +=0A= .../selftests/kvm/pre_fault_memory_test.c | 1 +=0A= 4 files changed, 13 insertions(+), 10 deletions(-)=0A= =0A= diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing= /selftests/kvm/include/kvm_util.h=0A= index 5204a0a18a7f..8baa0bbacd09 100644=0A= --- a/tools/testing/selftests/kvm/include/kvm_util.h=0A= +++ b/tools/testing/selftests/kvm/include/kvm_util.h=0A= @@ -188,7 +188,7 @@ enum vm_guest_mode {=0A= struct vm_shape {=0A= uint32_t type;=0A= uint8_t mode;=0A= - uint8_t pad0;=0A= + uint8_t src_type;=0A= uint16_t pad1;=0A= };=0A= =0A= @@ -196,14 +196,15 @@ kvm_static_assert(sizeof(struct vm_shape) =3D=3D size= of(uint64_t));=0A= =0A= #define VM_TYPE_DEFAULT 0=0A= =0A= -#define VM_SHAPE(__mode) \=0A= -({ \=0A= - struct vm_shape shape =3D { \=0A= - .mode =3D (__mode), \=0A= - .type =3D VM_TYPE_DEFAULT \=0A= - }; \=0A= - \=0A= - shape; \=0A= +#define VM_SHAPE(__mode) \=0A= +({ \=0A= + struct vm_shape shape =3D { \=0A= + .mode =3D (__mode), \=0A= + .type =3D VM_TYPE_DEFAULT, \=0A= + .src_type =3D VM_MEM_SRC_ANONYMOUS \=0A= + }; \=0A= + \=0A= + shape; \=0A= })=0A= =0A= #if defined(__aarch64__)=0A= diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c=0A= index a81089f7c83f..3a22794bd959 100644=0A= --- a/tools/testing/selftests/kvm/lib/kvm_util.c=0A= +++ b/tools/testing/selftests/kvm/lib/kvm_util.c=0A= @@ -495,7 +495,7 @@ struct kvm_vm *__vm_create(struct vm_shape shape, uint3= 2_t nr_runnable_vcpus,=0A= if (is_guest_memfd_required(shape))=0A= flags |=3D KVM_MEM_GUEST_MEMFD;=0A= =0A= - vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, 0, 0, nr_pages, fla= gs);=0A= + vm_userspace_mem_region_add(vm, shape.src_type, 0, 0, nr_pages, flags);= =0A= for (i =3D 0; i < NR_MEM_REGIONS; i++)=0A= vm->memslots[i] =3D 0;=0A= =0A= diff --git a/tools/testing/selftests/kvm/lib/x86/sev.c b/tools/testing/self= tests/kvm/lib/x86/sev.c=0A= index c3a9838f4806..d920880e4fc0 100644=0A= --- a/tools/testing/selftests/kvm/lib/x86/sev.c=0A= +++ b/tools/testing/selftests/kvm/lib/x86/sev.c=0A= @@ -164,6 +164,7 @@ struct kvm_vm *vm_sev_create_with_one_vcpu(uint32_t typ= e, void *guest_code,=0A= struct vm_shape shape =3D {=0A= .mode =3D VM_MODE_DEFAULT,=0A= .type =3D type,=0A= + .src_type =3D VM_MEM_SRC_ANONYMOUS,=0A= };=0A= struct kvm_vm *vm;=0A= struct kvm_vcpu *cpus[1];=0A= diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/te= sting/selftests/kvm/pre_fault_memory_test.c=0A= index 0350a8896a2f..d403f8d2f26f 100644=0A= --- a/tools/testing/selftests/kvm/pre_fault_memory_test.c=0A= +++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c=0A= @@ -68,6 +68,7 @@ static void __test_pre_fault_memory(unsigned long vm_type= , bool private)=0A= const struct vm_shape shape =3D {=0A= .mode =3D VM_MODE_DEFAULT,=0A= .type =3D vm_type,=0A= + .src_type =3D VM_MEM_SRC_ANONYMOUS,=0A= };=0A= struct kvm_vcpu *vcpu;=0A= struct kvm_run *run;=0A= -- =0A= 2.50.1=0A= =0A=