From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2BF6D33992 for ; Fri, 5 Dec 2025 17:00:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F9176B0193; Fri, 5 Dec 2025 12:00:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A97A6B0195; Fri, 5 Dec 2025 12:00:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 171CD6B0196; Fri, 5 Dec 2025 12:00:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 005296B0193 for ; Fri, 5 Dec 2025 12:00:10 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B91A312C9E for ; Fri, 5 Dec 2025 17:00:10 +0000 (UTC) X-FDA: 84186030180.30.357919A Received: from fra-out-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com [63.178.143.178]) by imf23.hostedemail.com (Postfix) with ESMTP id 3A62714000C for ; Fri, 5 Dec 2025 17:00:08 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b=LYWMIzys; dmarc=pass (policy=quarantine) header.from=amazon.co.uk; spf=pass (imf23.hostedemail.com: domain of "prvs=42773fd06=kalyazin@amazon.co.uk" designates 63.178.143.178 as permitted sender) smtp.mailfrom="prvs=42773fd06=kalyazin@amazon.co.uk" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1764954008; a=rsa-sha256; cv=none; b=nSuYmRxEmqvHHJxwYoYYC0ZQGYZbG8nDnmcbRSE1U3Dc1FgDB1p8I3Pi+glspYKvIC7ISr WqKBzKSttEXFL04pGwheEE9ImlEFNIn/2LZsIfXdYz0eO/1W45yeE4Hgb8nt33f5rtCZyz Q0r6+yhNuAkUURzm8QfwroAm57t8nXY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b=LYWMIzys; dmarc=pass (policy=quarantine) header.from=amazon.co.uk; spf=pass (imf23.hostedemail.com: domain of "prvs=42773fd06=kalyazin@amazon.co.uk" designates 63.178.143.178 as permitted sender) smtp.mailfrom="prvs=42773fd06=kalyazin@amazon.co.uk" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1764954008; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=IZkODn83RzbQJlBtvngM/cf4CG/FWZhQcx+73Doqz/A=; b=qEO9q9Yi6q159dEQeStSrCOSSbpzGwIVctCXeUPmM9Ex/MlIc3mY+H5qEHIQEI5U+RzuEK y0paDsNR7PlnWhMUvDT6/AU+daZeI23fkszyenqczLWPaV6tnldEq5TO+h2UOo6bflBRb3 IJx+2nYGobK6fDPml59dJbthRsY6fQY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1764954008; x=1796490008; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=IZkODn83RzbQJlBtvngM/cf4CG/FWZhQcx+73Doqz/A=; b=LYWMIzysnOfvaiPMgTM/DDj1HMQ1TebMDxJJdOl7wcgLAtI3rzdX7r0U KD/CoxgcTvfnoe0qOPQlNZuLxoUY2mbkPmhLRjmG5tqlxkHfeSOdbteP0 mn25V6WtqHDFryncHrnEG6Xz6+NEI2dRsja9Jl13/WUlPdvNJCgA2edWK PZR0BVElBa8NHBonp5o4TXL3h0GvHhMiVe6r1SvWKVqBFAvwd74UJesds 7wshyxrnOo7xUZIJLkrEOYH04hE5xeS9CmnGWJG0m7a1n1DN1Fx6hKQyC 8D0V/8eNoDHPSh2bgHuRxp0WgE78VlQR5dGNGqRC8+2i2pv6ZPhjUvCLY w==; X-CSE-ConnectionGUID: 70z/0/sGTBusENXFXlvOxA== X-CSE-MsgGUID: VsA/mhPGSZae+4M1x3NuUg== X-IronPort-AV: E=Sophos;i="6.20,252,1758585600"; d="scan'208";a="6199879" 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-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2025 17:00:06 +0000 Received: from EX19MTAEUA001.ant.amazon.com [54.240.197.233:10609] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.6.214:2525] with esmtp (Farcaster) id f8a46f7a-3831-4d67-8580-6fc0412f1880; Fri, 5 Dec 2025 17:00:06 +0000 (UTC) X-Farcaster-Flow-ID: f8a46f7a-3831-4d67-8580-6fc0412f1880 Received: from EX19D005EUB001.ant.amazon.com (10.252.51.12) by EX19MTAEUA001.ant.amazon.com (10.252.50.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Fri, 5 Dec 2025 17:00:03 +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.29; Fri, 5 Dec 2025 17:00:03 +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.029; Fri, 5 Dec 2025 17:00:03 +0000 From: "Kalyazin, Nikita" To: "kvm@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "kvmarm@lists.linux.dev" , "linux-fsdevel@vger.kernel.org" , "linux-mm@kvack.org" , "bpf@vger.kernel.org" , "linux-kselftest@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@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@kernel.org" , "lorenzo.stoakes@oracle.com" , "Liam.Howlett@oracle.com" , "vbabka@suse.cz" , "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" , "shuah@kernel.org" , "riel@surriel.com" , "baohua@kernel.org" , "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" , "maobibo@loongson.cn" , "prsampat@amd.com" , "mlevitsk@redhat.com" , "isaku.yamahata@intel.com" , "jmattson@google.com" , "jthoughton@google.com" , "linux-arm-kernel@lists.infradead.org" , "vannapurve@google.com" , "jackmanb@google.com" , "aneesh.kumar@kernel.org" , "patrick.roy@linux.dev" , "Thomson, Jack" , "Itazuri, Takahiro" , "Manwaring, Derek" , "Cali, Marco" , "Kalyazin, Nikita" Subject: [PATCH v8 12/13] KVM: selftests: stuff vm_mem_backing_src_type into vm_shape Thread-Topic: [PATCH v8 12/13] KVM: selftests: stuff vm_mem_backing_src_type into vm_shape Thread-Index: AQHcZgiZNqXeJ9oFP0ueYDENIOOt0A== Date: Fri, 5 Dec 2025 17:00:02 +0000 Message-ID: <20251205165743.9341-13-kalyazin@amazon.com> References: <20251205165743.9341-1-kalyazin@amazon.com> In-Reply-To: <20251205165743.9341-1-kalyazin@amazon.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.19.103.116] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 3A62714000C X-Stat-Signature: idf4meb4tmc5s7g8oahnues6p3qjfs1c X-Rspam-User: X-HE-Tag: 1764954008-398313 X-HE-Meta: U2FsdGVkX19sfVUvIUPylGbJaZxd+J+y2UGyrzof23aVCr0A8oFCLlAmbPvyGl/w1xsTx3+LK48bfWiC22jk0GiPa7YOKELjf6tEvw2jXemyPXyiyFo0xazceuV3rO2lGItAEbVHVaU7nnvYO05uvbzrinrQV0Qyzw08tzOwK2cVNKyXjSgBRkGLhoFoD5sB/VgJ5i7oRnXmlRLZpNSDv1eU5z8nVxG4/Nr6oMmy0e57Zsn7kQ8I9ohdyblpeQlDxZR8Q6iodNhJ20tBW8FEwPPyHfsLSD9W4K0kgGQN6fa7Hd/q2WXTIH+H6ZK5ZclRWIKxB/EWRBCIPe4zbf0iEfRBwvmpJ3t89a/H1WUmz3FVptHSojiunFLZD2soG5yAGIvSHPvS3dzqFfpMjRctQyKsOEN8AdWqMWRHjkpOBhHHfflU5ufKg7NeWsCPHLjXpMO9HLge8nL0nGUcogePJeT0HawEvEqtam+0JOdHqlQhFU4j4Tjs+6G2y6dxaGLmR4ca53IHxepwUwuvAaBk7HJwd9zrEzm8/O0XfnM7hizo7T1gCY/oqXFgP8sKiltKfsCf3fxRGLBGyVP4JujemvNsemTQIPX0sYksFp1/zNE0YS8DPalOBkK7DDtmdhxWpZS+dO6UTFvy5RKlUoeAUCH71NpGYtl3szy1B0SpyGg5So1vg/GZ2Tb2ZbyqsDfaPEgdgcIi0PmkYEIWruPLNzyIxP5r2WhERWeBZ7NY2XZ9LMUUlogERHPNqRj8R9kBfZh1wE3dhkWofmpAUSrJ6JDHrffSCxVb/XOxMo+j3LohxT4oHzqNK9yk4n8Wskws80Hlf8oq0xYXOB+JYkyySncfL2KtcV2Td38i+la8rSG6RIXJlxnM3BF2ClPXqa9vVS2CHCr+3PaMs9EFgBDK8sl8Ia/p7EbTBwHrMYNFT9Z+J5YNcK4P9CPIcg3sDuNKoLncDsXaaEcPo0ZwFoB V0JAFTfa qRFRFS1HrCVfjtkbXLpwZRWbyLObGODUFRwTM0ZmtIXKJk4D97r6ubq2HyBmnWPgPg4RLDR/pjW/NGCQVuY+4P7SSMhdifB+lM3UZhPUyCiCKNFJxtJXXBoM/tRPme96WlzbKnGbIxi+GW7LntwFurcFMS7jZ8/Tmjv/frNNfc+rw3BMJFZyvj3nxqmRJRFLctCAZPMMZXcDsEuCOP4xsvI0HXs6NJKrgUsFdO2EO5SMUxPpmwVDvZBKrNWQ2fycfxpvS9uTtVvcVlFuoHQ+Lutf957kyRdM71as52Z1My7YQxehOtPXW8xw293S3dpoF/ROyBUEA5uJrFJSoKOvipT92AxCt3paR1F8AbLdvzepG+4ioOgAaFQlgv5vT8NXkzXJHiNcQ/P8waZy6nrCnX11KfqQlse41IG8LrcJ8SjNwUPWtQFKMAypFPFT4Ne7PPrnCPrVylstWEW5FJW8pnT0LWw9WtQxoYsVQJeqEp4ocdlhl3o2K3M6A+d64Haxkn8vEoDZ26J6077GHl6PDMxXdSIsjHNWbmYgMOg/4YVTulLUnTVIA+fe9h+2ya45K6LrGpBFq4kcgJFLsOCwcI5Bfo7h2lQEt9k8kNZjk2gNUQkWalYclIqNLfHWACPigenkpbGY6rH7r9F9MlE5Vhxz18D/tlWV2Jc35DE7yO4t7Jl6mfZjkzrNZ8mqgvdsmgY1pWgGCyOmdpaauCwyn9gILrIUdN5pFiQpP/yZDGtbmBFJuvLFzQ7S2L6AJ/omguiYcRYuM8Qhtg0sbhTcWjX7KrbpBaZ634vTe43pkSRIJlK7oBrBEq2rsMQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 6689b43810c1..4bc4af9a40cf 100644=0A= --- a/tools/testing/selftests/kvm/include/kvm_util.h=0A= +++ b/tools/testing/selftests/kvm/include/kvm_util.h=0A= @@ -192,7 +192,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= @@ -200,14 +200,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 28ee51253909..268a4520633b 100644=0A= --- a/tools/testing/selftests/kvm/lib/kvm_util.c=0A= +++ b/tools/testing/selftests/kvm/lib/kvm_util.c=0A= @@ -467,7 +467,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=