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 902C13E3C4E; Tue, 17 Mar 2026 14:13:33 +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=1773756816; cv=none; b=Pvx1W8ZU5wgAi1Dv8y3m1iVL6ULZDzFShENMgwc2t/9DhKV7cdDj16307gTMEzMrO6pyKqI7cDS77MMXXxnCpfPBSex7Zm+h/UM5xljgXymfp8XWpvFNDoB9rulYAFoVTHoqFD+udmRG1Rn87IjWLCgaPHEPxylNCSFjBf50VZg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756816; c=relaxed/simple; bh=/fQCHuNWnUhS56DtbpGlI5vqbejGgnKYXELMq3uJgmQ=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=BF6veJMGF2mndHwv2QZ93N1fLTJH2D+cMSZTDrMW9FuScdbUIvw08Cr+wmagC1qCaGMqBREtG0sZkUqYRbvCH39OLOOigp84rPGx4tn+uwiNtaciiXyp1coJsdxHLARC5aBGBaxQnEPuAmeZalJjb5xDZ9UDTz1P7DerXnER1/0= 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=LQ6HhyNY; 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="LQ6HhyNY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1773756814; x=1805292814; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=W8/3+FJkxcsEROL2thE2+vYz46ZwvVX20jiL524cKzw=; b=LQ6HhyNY09GPToie1W8khnOi66ZiKY2LvPn4Gqs+6B0ORH57NBDrKOXu zaEQTySoR13irjvh2pStgk1L3FC6e/oVPVbFWJ2k3eQrQOkEN9TgJFzmB 7Kxdp8qAv4ukcKbPp9nnnZ3be2BgRQQCSvOyZ58wKCOiSOZgeQx3FwNpk 0v6LnJkF2us2JaPTVAl+eM/rTg8EbwZYOoHM64eJlIgw6filJ0xO8w5J4 8eT5wXyNGR6wfKt63Zzdv3zKYkaeu3KaxkgZhsZnh5l8sv0UHsxonKqNT fzQyzxKjAZTRuNthNFqKL0QOyTV/s0Zkc8QJVIAYZvsBGW2sp5Kk1gGQr A==; X-CSE-ConnectionGUID: vvu2lbIiSLmcEXI8TC/SSQ== X-CSE-MsgGUID: Iet4OOZCTCSe8j9NC+6vfg== X-IronPort-AV: E=Sophos;i="6.23,124,1770595200"; d="scan'208";a="10999490" 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-008.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2026 14:13:28 +0000 Received: from EX19MTAEUC001.ant.amazon.com [54.240.197.233:1609] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.15.31:2525] with esmtp (Farcaster) id 2ed1f63a-ffce-4676-acd4-ff83462d1eaf; Tue, 17 Mar 2026 14:13:28 +0000 (UTC) X-Farcaster-Flow-ID: 2ed1f63a-ffce-4676-acd4-ff83462d1eaf Received: from EX19D005EUB001.ant.amazon.com (10.252.51.12) by EX19MTAEUC001.ant.amazon.com (10.252.51.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Tue, 17 Mar 2026 14:13:27 +0000 Received: from EX19D005EUB003.ant.amazon.com (10.252.51.31) by EX19D005EUB001.ant.amazon.com (10.252.51.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Tue, 17 Mar 2026 14:13:26 +0000 Received: from EX19D005EUB003.ant.amazon.com ([fe80::b825:becb:4b38:da0c]) by EX19D005EUB003.ant.amazon.com ([fe80::b825:becb:4b38:da0c%3]) with mapi id 15.02.2562.037; Tue, 17 Mar 2026 14:13:26 +0000 From: "Kalyazin, Nikita" To: "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" , "kernel@xen0n.name" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "loongarch@lists.linux.dev" , "linux-pm@vger.kernel.org" CC: "pbonzini@redhat.com" , "corbet@lwn.net" , "maz@kernel.org" , "oupton@kernel.org" , "joey.gouly@arm.com" , "suzuki.poulose@arm.com" , "yuzenghui@huawei.com" , "catalin.marinas@arm.com" , "will@kernel.org" , "seanjc@google.com" , "tglx@kernel.org" , "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@kernel.org" , "lorenzo.stoakes@oracle.com" , "vbabka@kernel.org" , "rppt@kernel.org" , "surenb@google.com" , "mhocko@suse.com" , "ast@kernel.org" , "daniel@iogearbox.net" , "andrii@kernel.org" , "martin.lau@linux.dev" , "eddyz87@gmail.com" , "song@kernel.org" , "yonghong.song@linux.dev" , "john.fastabend@gmail.com" , "kpsingh@kernel.org" , "sdf@fomichev.me" , "haoluo@google.com" , "jolsa@kernel.org" , "jgg@ziepe.ca" , "jhubbard@nvidia.com" , "peterx@redhat.com" , "jannh@google.com" , "pfalcato@suse.de" , "skhan@linuxfoundation.org" , "riel@surriel.com" , "ryan.roberts@arm.com" , "jgross@suse.com" , "yu-cheng.yu@intel.com" , "kas@kernel.org" , "coxu@redhat.com" , "kevin.brodsky@arm.com" , "ackerleytng@google.com" , "yosry@kernel.org" , "ajones@ventanamicro.com" , "maobibo@loongson.cn" , "tabba@google.com" , "prsampat@amd.com" , "wu.fei9@sanechips.com.cn" , "mlevitsk@redhat.com" , "jmattson@google.com" , "jthoughton@google.com" , "agordeev@linux.ibm.com" , "alex@ghiti.fr" , "aou@eecs.berkeley.edu" , "borntraeger@linux.ibm.com" , "chenhuacai@kernel.org" , "dev.jain@arm.com" , "gor@linux.ibm.com" , "hca@linux.ibm.com" , "palmer@dabbelt.com" , "pjw@kernel.org" , "shijie@os.amperecomputing.com" , "svens@linux.ibm.com" , "thuth@redhat.com" , "wyihan@google.com" , "yang@os.amperecomputing.com" , "Jonathan.Cameron@huawei.com" , "Liam.Howlett@oracle.com" , "urezki@gmail.com" , "zhengqi.arch@bytedance.com" , "gerald.schaefer@linux.ibm.com" , "jiayuan.chen@shopee.com" , "lenb@kernel.org" , "osalvador@suse.de" , "pavel@kernel.org" , "rafael@kernel.org" , "vannapurve@google.com" , "jackmanb@google.com" , "aneesh.kumar@kernel.org" , "patrick.roy@linux.dev" , "Thomson, Jack" , "Itazuri, Takahiro" , "Manwaring, Derek" , "Kalyazin, Nikita" Subject: [PATCH v11 15/16] KVM: selftests: stuff vm_mem_backing_src_type into vm_shape Thread-Topic: [PATCH v11 15/16] KVM: selftests: stuff vm_mem_backing_src_type into vm_shape Thread-Index: AQHcthg5pbxN1A1x+UmyJTMMAgm/Rw== Date: Tue, 17 Mar 2026 14:13:26 +0000 Message-ID: <20260317141031.514-16-kalyazin@amazon.com> References: <20260317141031.514-1-kalyazin@amazon.com> In-Reply-To: <20260317141031.514-1-kalyazin@amazon.com> Accept-Language: en-GB, 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Patrick Roy =0A= =0A= 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= Signed-off-by: Nikita Kalyazin =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 056a003a63c0..48b6ee8223aa 100644=0A= --- a/tools/testing/selftests/kvm/include/kvm_util.h=0A= +++ b/tools/testing/selftests/kvm/include/kvm_util.h=0A= @@ -215,7 +215,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= @@ -223,14 +223,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= extern enum vm_guest_mode vm_mode_default;=0A= diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c=0A= index fa4a2fc236fe..824c94c64864 100644=0A= --- a/tools/testing/selftests/kvm/lib/kvm_util.c=0A= +++ b/tools/testing/selftests/kvm/lib/kvm_util.c=0A= @@ -500,7 +500,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 93e603d91311..8a4d5af53fab 100644=0A= --- a/tools/testing/selftests/kvm/pre_fault_memory_test.c=0A= +++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c=0A= @@ -165,6 +165,7 @@ static void __test_pre_fault_memory(unsigned long vm_ty= pe, 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=