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 B3A59FD877B for ; Tue, 17 Mar 2026 14:13:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B0AE6B00AB; Tue, 17 Mar 2026 10:13:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 288D86B00AD; Tue, 17 Mar 2026 10:13:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 177AC6B00AE; Tue, 17 Mar 2026 10:13:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 011116B00AB for ; Tue, 17 Mar 2026 10:13:11 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id ADE8D139A45 for ; Tue, 17 Mar 2026 14:13:11 +0000 (UTC) X-FDA: 84555746982.09.17FFB66 Received: from fra-out-009.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-009.esa.eu-central-1.outbound.mail-perimeter.amazon.com [3.64.237.68]) by imf25.hostedemail.com (Postfix) with ESMTP id 0E90EA0018 for ; Tue, 17 Mar 2026 14:13:08 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b=jbUVHNJw; spf=pass (imf25.hostedemail.com: domain of "prvs=529a8c084=kalyazin@amazon.co.uk" designates 3.64.237.68 as permitted sender) smtp.mailfrom="prvs=529a8c084=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.co.uk ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1773756789; 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=ar/RLV2nTk0mEfqcj3AjlRvCzScvha3E/slvpgUYOeA=; b=unCjskjhN9m1dn4jT4ddygXYZu6FAtFCdO39FWXyqPbHCTrPFhY41EUOBv6wh9usFNUi/i S1lrkVCeI5OdD/UtNDudpaSQ0O2gnT8DhCYYaOkvHPG+H98zDwr+1H0BU39Bsyyj2P+RLf 4IBR9bIJq9tK2jiSbTbv6rbpOKrDbp4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1773756789; a=rsa-sha256; cv=none; b=gUCLHIOidHfKyaAT2No8P+bWJXPcT5BEDQ79LR62N+tT7yRSgzPB5PdrB35MHcfXN4ZWzH JDBqaP6H01DTl6q1+AQCuwC1sq51RkhTciI5NRzxtQG7wooW80qoKNOPP+r2tDaBoWnF75 nNcoAtVCwzKGGW9eG7rlh4rdOUaXXrE= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b=jbUVHNJw; spf=pass (imf25.hostedemail.com: domain of "prvs=529a8c084=kalyazin@amazon.co.uk" designates 3.64.237.68 as permitted sender) smtp.mailfrom="prvs=529a8c084=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.co.uk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1773756789; x=1805292789; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ar/RLV2nTk0mEfqcj3AjlRvCzScvha3E/slvpgUYOeA=; b=jbUVHNJwGJclZm7RY1eFJFviYmTdQbHqp5BQG6O6TlAi4mO+yBX7kb8h yuECiM2/15mVejmGq89yFSZjrSlkwJ9We6HLKAYaJUGEWeDGfFVOScaIn m4lMkHEqoqf/kcFnIGDIRlXnXY1iRh1eWqBhXgCJHGZHrg8gACRRH2HD2 wDTKxrNwNegRZdDucGnRZ4GG2BEE12PKSr7X3/FsGbMxQx7+p1NCRN2UI VRHDXgsVsNFruarrpCvOz6Dq0JogRSy6LsP8qXTATyYkkzWhvHAEYe93e 8/H2Rf0qpY9qsKzASWN2VGE2//QzXwYgjone9dHMhNm+ELZ97hwNuB1rd w==; X-CSE-ConnectionGUID: JF0NEqvkTCWWM6/3S7X9RQ== X-CSE-MsgGUID: fZJRC3bjRKuOf4zEpJ6/dQ== X-IronPort-AV: E=Sophos;i="6.23,124,1770595200"; d="scan'208";a="10906824" Received: from ip-10-6-3-216.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.3.216]) by internal-fra-out-009.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2026 14:13:05 +0000 Received: from EX19MTAEUA001.ant.amazon.com [54.240.197.233:31988] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.29.244:2525] with esmtp (Farcaster) id a9d392c6-d4f3-4dc6-86a0-65d9475b4fe7; Tue, 17 Mar 2026 14:13:05 +0000 (UTC) X-Farcaster-Flow-ID: a9d392c6-d4f3-4dc6-86a0-65d9475b4fe7 Received: from EX19D005EUB003.ant.amazon.com (10.252.51.31) by EX19MTAEUA001.ant.amazon.com (10.252.50.192) 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:03 +0000 Received: from EX19D005EUB003.ant.amazon.com (10.252.51.31) by EX19D005EUB003.ant.amazon.com (10.252.51.31) 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: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.037; Tue, 17 Mar 2026 14:13:03 +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 13/16] KVM: selftests: Add guest_memfd based vm_mem_backing_src_types Thread-Topic: [PATCH v11 13/16] KVM: selftests: Add guest_memfd based vm_mem_backing_src_types Thread-Index: AQHcthgrl2L6VQHT9EGNGtASEbZtQQ== Date: Tue, 17 Mar 2026 14:13:03 +0000 Message-ID: <20260317141031.514-14-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: 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-Stat-Signature: 11sh7dqg7ejisomrqmrwpk99ebpt4h8f X-Rspam-User: X-Rspamd-Queue-Id: 0E90EA0018 X-Rspamd-Server: rspam12 X-HE-Tag: 1773756788-285971 X-HE-Meta: U2FsdGVkX19wIrVt2qXsd3c0Bfh7r8XE2k+BKE/MGO4unruZVzWoBIO1z5Z4yArcGvf38bM4txsF9KM2hw88lssJi1yUjhmTOaVYPx1M2QP9W4GJv91ETjMvczqiA27pDvh0S2g5oimfVoqOzcWkvLHHDDWfJzyLAjBg/oSw6Mzu/RFQC4cPxJW9L3f7Cu7j0D7CymhrhuThjdLYwe2zZvOhNT7xhmATsdRdU9z4H6kthcnzhK/ohlrvPEaqlf9lFx/j+3alBe+wjyL1pookBxhcDPJmNbZHve1Dk+75g6Ru2G2P+d39QWoZUvbFxG8ncul9DnwSPsev+TkOTVC9sQsxNkPIzyFcw3Zjw6Plf/JHdBmKsyF+qf1bdn2UZePwh2o39CBmxQyPGvor3/5EoXZSGAtn+g/0Hi7nmZqyR+xwLFh31cZzV4aLh1T8cy1VD2x47abm5dnOUNzKf6CmmaicJPUDNc9Hg0JSfNvVxfWa4Ht3Tp5IOnqLkRzEvecohQ5qRGlsZSQwurVmYi+WOwretD1UFNgOdEcBdzFlswi2AQDxDyr/8u5695DkH1DNTesee3YmiDmnKMDWuiFw75p4DfFeTZ+kOKY0AH150VmN1GC5DGKORDvv1nfr1O1RNCzF5E+47PANDt40OWf8nwCae80muFwKugMykmOIHXVGH3Qi+4pGFM18tgyIm3UcHYeaNCfVXpYwR6RAkpHLI/2fjwVAo9Q/HfpElW3SEiLYBchpY4gHYhDNZIRgCBiQoD9f0qNd5l2ph8wEflBXCF7EiHuDJKy6A/Jh18XDmjvGLOqZGdjGw98r+ERPf3DiTYuRD858b0gzUjw48ARkaiyAVbqmen3DyNL8qiV2q79yYNEoB0W+JLS+nufc8RELFSARI/RwEvlsHHNhCOfR8tzdxl5/QsutSmJXpAz0QuxWbJ95U9X/Hr33K1ybl0cihtg8prHHw6OXYjLEcnv ANi1ev5G uRQx9b6p5YKfAaUKARslKUUyCkJeNaszW2U7NWWYM2xVhecHrMheSOnlB3NUL/dmlmp1cYSJv8RBnPCDcNDtLwu4jKt5qfDmazCgP0gte+qeAW8XHc4L2fQ5QExEUHZyp+b7tCBvqGAfwavx/mfiGh1hq76H8CCe94+nYw2kd2V71y/SKfZsjWIXF1vOhHYPQZNns5J6cTngr3MZNkREuADwGcMMeZP/YivqqQ1sevFOJD+edV+TKFnunPaP/UmB7ceJWRSDtlvxp3RCfHBcVsbf71i8aLlP5ivJCiyi5wsgNL9aEAwEbnYHljuSxgeIwte0tlzfPB4J77l7oW5mOT8LY2fUgK3OIlz7AXi7UlwWLMtgKElIwDD2ZI02W+9FNYRehPHwq9mhm7WGOqQozdu4clGhWEDSK3XF+K18VH0KkSrgrSAwsBpN6xMBRvu1Z/JoNELcUbQ77StTrKlIoZFL9JcRsoQBioW/PjPI/QYrN1mTnm1JZ9QaawzhpAESxhW9jojj2wEklhVisdGYcRH6nJiyBrEMT40HyMUqGV2xRvAroNeN7gm+8lqfhga9qvnuXyOE1TvO//DPCZl7SD6qr3s9J+7nqChCTJLA48b35TEcoODRtdThcfIqtNl00oJj6h1oSJ2Z38djWPgolpl3HqylvW/1+JIHaDxWyDUMftCNijr6Xp/sDcjt4OHgQrtuX3l8uIsUYshrxg4Gek6OBBswdvs2fWyeIvQWj3KPj87iHDMPQZFfQtv6zDM6z/0HJUkkHCow2cO8= 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= Allow selftests to configure their memslots such that userspace_addr is=0A= set to a MAP_SHARED mapping of the guest_memfd that's associated with=0A= the memslot. This setup is the configuration for non-CoCo VMs, where all=0A= guest memory is backed by a guest_memfd whose folios are all marked=0A= shared, but KVM is still able to access guest memory to provide=0A= functionality such as MMIO emulation on x86.=0A= =0A= Add backing types for normal guest_memfd, as well as direct map removed=0A= guest_memfd.=0A= =0A= Signed-off-by: Patrick Roy =0A= Signed-off-by: Nikita Kalyazin =0A= ---=0A= .../testing/selftests/kvm/include/kvm_util.h | 18 ++++++=0A= .../testing/selftests/kvm/include/test_util.h | 7 +++=0A= tools/testing/selftests/kvm/lib/kvm_util.c | 61 ++++++++++---------=0A= tools/testing/selftests/kvm/lib/test_util.c | 8 +++=0A= 4 files changed, 65 insertions(+), 29 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 8b39cb919f4f..056a003a63c0 100644=0A= --- a/tools/testing/selftests/kvm/include/kvm_util.h=0A= +++ b/tools/testing/selftests/kvm/include/kvm_util.h=0A= @@ -664,6 +664,24 @@ static inline bool is_smt_on(void)=0A= =0A= void vm_create_irqchip(struct kvm_vm *vm);=0A= =0A= +static inline uint32_t backing_src_guest_memfd_flags(enum vm_mem_backing_s= rc_type t)=0A= +{=0A= + uint32_t flags =3D 0;=0A= +=0A= + switch (t) {=0A= + case VM_MEM_SRC_GUEST_MEMFD_NO_DIRECT_MAP:=0A= + flags |=3D GUEST_MEMFD_FLAG_NO_DIRECT_MAP;=0A= + fallthrough;=0A= + case VM_MEM_SRC_GUEST_MEMFD:=0A= + flags |=3D GUEST_MEMFD_FLAG_MMAP | GUEST_MEMFD_FLAG_INIT_SHARED;=0A= + break;=0A= + default:=0A= + break;=0A= + }=0A= +=0A= + return flags;=0A= +}=0A= +=0A= static inline int __vm_create_guest_memfd(struct kvm_vm *vm, uint64_t size= ,=0A= uint64_t flags)=0A= {=0A= diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testin= g/selftests/kvm/include/test_util.h=0A= index 8140e59b59e5..ea6de20ce8ef 100644=0A= --- a/tools/testing/selftests/kvm/include/test_util.h=0A= +++ b/tools/testing/selftests/kvm/include/test_util.h=0A= @@ -152,6 +152,8 @@ enum vm_mem_backing_src_type {=0A= VM_MEM_SRC_ANONYMOUS_HUGETLB_16GB,=0A= VM_MEM_SRC_SHMEM,=0A= VM_MEM_SRC_SHARED_HUGETLB,=0A= + VM_MEM_SRC_GUEST_MEMFD,=0A= + VM_MEM_SRC_GUEST_MEMFD_NO_DIRECT_MAP,=0A= NUM_SRC_TYPES,=0A= };=0A= =0A= @@ -184,6 +186,11 @@ static inline bool backing_src_is_shared(enum vm_mem_b= acking_src_type t)=0A= return vm_mem_backing_src_alias(t)->flag & MAP_SHARED;=0A= }=0A= =0A= +static inline bool backing_src_is_guest_memfd(enum vm_mem_backing_src_type= t)=0A= +{=0A= + return t =3D=3D VM_MEM_SRC_GUEST_MEMFD || t =3D=3D VM_MEM_SRC_GUEST_MEMFD= _NO_DIRECT_MAP;=0A= +}=0A= +=0A= static inline bool backing_src_can_be_huge(enum vm_mem_backing_src_type t)= =0A= {=0A= return t !=3D VM_MEM_SRC_ANONYMOUS && t !=3D VM_MEM_SRC_SHMEM;=0A= diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c=0A= index 5b0865683047..fa4a2fc236fe 100644=0A= --- a/tools/testing/selftests/kvm/lib/kvm_util.c=0A= +++ b/tools/testing/selftests/kvm/lib/kvm_util.c=0A= @@ -1046,6 +1046,33 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backi= ng_src_type src_type,=0A= alignment =3D 1;=0A= #endif=0A= =0A= + if (guest_memfd < 0) {=0A= + if ((flags & KVM_MEM_GUEST_MEMFD) || backing_src_is_guest_memfd(src_type= )) {=0A= + uint32_t guest_memfd_flags =3D backing_src_guest_memfd_flags(src_type);= =0A= +=0A= + TEST_ASSERT(!guest_memfd_offset,=0A= + "Offset must be zero when creating new guest_memfd");=0A= + guest_memfd =3D vm_create_guest_memfd(vm, mem_size, guest_memfd_flags);= =0A= + }=0A= + } else {=0A= + /*=0A= + * Install a unique fd for each memslot so that the fd=0A= + * can be closed when the region is deleted without=0A= + * needing to track if the fd is owned by the framework=0A= + * or by the caller.=0A= + */=0A= + guest_memfd =3D kvm_dup(guest_memfd);=0A= + }=0A= +=0A= + if (guest_memfd >=3D 0) {=0A= + flags |=3D KVM_MEM_GUEST_MEMFD;=0A= +=0A= + region->region.guest_memfd =3D guest_memfd;=0A= + region->region.guest_memfd_offset =3D guest_memfd_offset;=0A= + } else {=0A= + region->region.guest_memfd =3D -1;=0A= + }=0A= +=0A= /*=0A= * When using THP mmap is not guaranteed to returned a hugepage aligned= =0A= * address so we have to pad the mmap. Padding is not needed for HugeTLB= =0A= @@ -1061,10 +1088,13 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_back= ing_src_type src_type,=0A= if (alignment > 1)=0A= region->mmap_size +=3D alignment;=0A= =0A= - region->fd =3D -1;=0A= - if (backing_src_is_shared(src_type))=0A= + if (backing_src_is_guest_memfd(src_type))=0A= + region->fd =3D guest_memfd;=0A= + else if (backing_src_is_shared(src_type))=0A= region->fd =3D kvm_memfd_alloc(region->mmap_size,=0A= src_type =3D=3D VM_MEM_SRC_SHARED_HUGETLB);=0A= + else=0A= + region->fd =3D -1;=0A= =0A= region->mmap_start =3D kvm_mmap(region->mmap_size, PROT_READ | PROT_WRITE= ,=0A= vm_mem_backing_src_alias(src_type)->flag,=0A= @@ -1089,33 +1119,6 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backi= ng_src_type src_type,=0A= }=0A= =0A= region->backing_src_type =3D src_type;=0A= -=0A= - if (guest_memfd < 0) {=0A= - if (flags & KVM_MEM_GUEST_MEMFD) {=0A= - uint32_t guest_memfd_flags =3D 0;=0A= - TEST_ASSERT(!guest_memfd_offset,=0A= - "Offset must be zero when creating new guest_memfd");=0A= - guest_memfd =3D vm_create_guest_memfd(vm, mem_size, guest_memfd_flags);= =0A= - }=0A= - } else {=0A= - /*=0A= - * Install a unique fd for each memslot so that the fd=0A= - * can be closed when the region is deleted without=0A= - * needing to track if the fd is owned by the framework=0A= - * or by the caller.=0A= - */=0A= - guest_memfd =3D kvm_dup(guest_memfd);=0A= - }=0A= -=0A= - if (guest_memfd >=3D 0) {=0A= - flags |=3D KVM_MEM_GUEST_MEMFD;=0A= -=0A= - region->region.guest_memfd =3D guest_memfd;=0A= - region->region.guest_memfd_offset =3D guest_memfd_offset;=0A= - } else {=0A= - region->region.guest_memfd =3D -1;=0A= - }=0A= -=0A= region->unused_phy_pages =3D sparsebit_alloc();=0A= if (vm_arch_has_protected_memory(vm))=0A= region->protected_phy_pages =3D sparsebit_alloc();=0A= diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/se= lftests/kvm/lib/test_util.c=0A= index 8a1848586a85..ce9fe0271515 100644=0A= --- a/tools/testing/selftests/kvm/lib/test_util.c=0A= +++ b/tools/testing/selftests/kvm/lib/test_util.c=0A= @@ -306,6 +306,14 @@ const struct vm_mem_backing_src_alias *vm_mem_backing_= src_alias(uint32_t i)=0A= */=0A= .flag =3D MAP_SHARED,=0A= },=0A= + [VM_MEM_SRC_GUEST_MEMFD] =3D {=0A= + .name =3D "guest_memfd",=0A= + .flag =3D MAP_SHARED,=0A= + },=0A= + [VM_MEM_SRC_GUEST_MEMFD_NO_DIRECT_MAP] =3D {=0A= + .name =3D "guest_memfd_no_direct_map",=0A= + .flag =3D MAP_SHARED,=0A= + }=0A= };=0A= _Static_assert(ARRAY_SIZE(aliases) =3D=3D NUM_SRC_TYPES,=0A= "Missing new backing src types?");=0A= -- =0A= 2.50.1=0A= =0A=