From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fra-out-002.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-002.esa.eu-central-1.outbound.mail-perimeter.amazon.com [3.65.3.180]) (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 B8B6D31770B; Wed, 24 Sep 2025 15:23:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=3.65.3.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758727387; cv=none; b=gbEITZeffgg70y9QuzjS5CoN0gnJo4CbNbrEG6QSej99gN40MYare7MmlBhxYhNQnoegKT695lesLnc2/78He24BAng2JqD5GqPP9hTQSe9m4zQCwqiQSaufIxM4dqMiaH2Z1vuwduIeCXy/7//3c9x4NRgYNcGWy+jMQUgwvLg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758727387; c=relaxed/simple; bh=GSYaWzjybOeENt7WTzP9YwkxMKkQTTKYfPmC2c3O7pM=; h=From:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=FOORRmll5XzaFr7JOLmDb8yiUbKju38LEmP/QBnc41+4NUn88wI4xQdLh8siPAURW6G8u4wg1xTLJxpNJTQHRxGZ+KozBEboGQQurBXDMa+aLXRCrmpYtOXEJlIwnCK86pY4u0FI5z4ieY0f5gUdk92/H00qKfA3JCal+ZIPH3I= 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=VA0jQ4Ti; arc=none smtp.client-ip=3.65.3.180 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="VA0jQ4Ti" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1758727385; x=1790263385; h=from:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=Zo29nLVVEqNQE60LDs8ecp6mhlnjq/VaFgPB1m/VqPI=; b=VA0jQ4TiIyheMAQamOjnZY04Ha7meYBwHr8otyakU6iZhyRBUXrzNiGO BVNUx9XzhY+2wYMjHzuCR2VxTBrPr6JqK2ckCeZcon2xQGUG7Y440vvCp PBMplnbdNy+b/Bo8nDLLPp++liTUHD59fBZD8kan8O7LTvNW6+FDqiOm3 wmfWDTfW62ZmRDN6ZMAoja0/BOX7RpawJB+Z5gOPu3FgoAHItpqMQbUmj ekWc8Gzt3D/JmDv7VDH1PVqmO/HVYPkoQf8UJHwSvXy9R9hJM1eg8yr/R MqcStDHXNyGTkU/03u535hOCcLHY4T8Hf3XmINrRCR+w3e/3m81M94rmD A==; X-CSE-ConnectionGUID: NOVVk6GdTc+ry/BCCcWsqQ== X-CSE-MsgGUID: H3J/emL5ShupkcGKPK6ptg== X-IronPort-AV: E=Sophos;i="6.18,290,1751241600"; d="scan'208";a="2622601" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-002.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2025 15:22:54 +0000 Received: from EX19MTAEUB002.ant.amazon.com [54.240.197.224:10918] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.16.16:2525] with esmtp (Farcaster) id c6ec7cb5-6667-4a23-be25-5fd13c977552; Wed, 24 Sep 2025 15:22:54 +0000 (UTC) X-Farcaster-Flow-ID: c6ec7cb5-6667-4a23-be25-5fd13c977552 Received: from EX19D015EUB001.ant.amazon.com (10.252.51.114) by EX19MTAEUB002.ant.amazon.com (10.252.51.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Wed, 24 Sep 2025 15:22:50 +0000 Received: from EX19D015EUB004.ant.amazon.com (10.252.51.13) by EX19D015EUB001.ant.amazon.com (10.252.51.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Wed, 24 Sep 2025 15:22:49 +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.020; Wed, 24 Sep 2025 15:22:49 +0000 From: "Roy, Patrick" CC: "Roy, Patrick" , "pbonzini@redhat.com" , "corbet@lwn.net" , "maz@kernel.org" , "oliver.upton@linux.dev" , "joey.gouly@arm.com" , "suzuki.poulose@arm.com" , "yuzenghui@huawei.com" , "catalin.marinas@arm.com" , "will@kernel.org" , "tglx@linutronix.de" , "mingo@redhat.com" , "bp@alien8.de" , "dave.hansen@linux.intel.com" , "x86@kernel.org" , "hpa@zytor.com" , "luto@kernel.org" , "peterz@infradead.org" , "willy@infradead.org" , "akpm@linux-foundation.org" , "david@redhat.com" , "lorenzo.stoakes@oracle.com" , "Liam.Howlett@oracle.com" , "vbabka@suse.cz" , "rppt@kernel.org" , "surenb@google.com" , "mhocko@suse.com" , "song@kernel.org" , "jolsa@kernel.org" , "ast@kernel.org" , "daniel@iogearbox.net" , "andrii@kernel.org" , "martin.lau@linux.dev" , "eddyz87@gmail.com" , "yonghong.song@linux.dev" , "john.fastabend@gmail.com" , "kpsingh@kernel.org" , "sdf@fomichev.me" , "haoluo@google.com" , "jgg@ziepe.ca" , "jhubbard@nvidia.com" , "peterx@redhat.com" , "jannh@google.com" , "pfalcato@suse.de" , "shuah@kernel.org" , "seanjc@google.com" , "kvm@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "linux-fsdevel@vger.kernel.org" , "linux-mm@kvack.org" , "bpf@vger.kernel.org" , "linux-kselftest@vger.kernel.org" , "Cali, Marco" , "Kalyazin, Nikita" , "Thomson, Jack" , "derekmn@amazon.co.uk" , "tabba@google.com" , "ackerleytng@google.com" Subject: [PATCH v7 11/12] KVM: selftests: stuff vm_mem_backing_src_type into vm_shape Thread-Topic: [PATCH v7 11/12] KVM: selftests: stuff vm_mem_backing_src_type into vm_shape Thread-Index: AQHcLWcWSBJv2Dh2m0ma3LK8YIjHKg== Date: Wed, 24 Sep 2025 15:22:49 +0000 Message-ID: <20250924152214.7292-8-roypat@amazon.co.uk> References: <20250924151101.2225820-4-patrick.roy@campus.lmu.de> <20250924152214.7292-1-roypat@amazon.co.uk> In-Reply-To: <20250924152214.7292-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: linux-kselftest@vger.kernel.org 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.51.0=0A= =0A=