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 CA2E6F459F4 for ; Fri, 10 Apr 2026 15:19:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 40DEF6B00AC; Fri, 10 Apr 2026 11:19:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3BEA66B00AD; Fri, 10 Apr 2026 11:19:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 286DA6B00AE; Fri, 10 Apr 2026 11:19:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 143006B00AC for ; Fri, 10 Apr 2026 11:19:43 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A1B05B9155 for ; Fri, 10 Apr 2026 15:19:42 +0000 (UTC) X-FDA: 84643005804.16.AFD0430 Received: from iad-out-002.esa.us-east-1.outbound.mail-perimeter.amazon.com (iad-out-002.esa.us-east-1.outbound.mail-perimeter.amazon.com [13.216.54.180]) by imf22.hostedemail.com (Postfix) with ESMTP id E1CDEC000A for ; Fri, 10 Apr 2026 15:19:39 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b=NB2QQGtJ; dmarc=pass (policy=quarantine) header.from=amazon.co.uk; spf=pass (imf22.hostedemail.com: domain of "prvs=5539d40d4=kalyazin@amazon.co.uk" designates 13.216.54.180 as permitted sender) smtp.mailfrom="prvs=5539d40d4=kalyazin@amazon.co.uk" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1775834380; a=rsa-sha256; cv=none; b=mfGzxRE/yJKvBGfiUo0CHUWRJib3qbxdlixpuzVGPJFDn5/6HaWnP8xAYl99P1VbQe/lGl YEBR8P/TbuBL2IzWo7nZ0Wbmb9QADrXqTQKENrjQSQy7oAVV5qnkP5iLb6wKU5aWL2MZZY FelVoSPMk6vK3JXTYx1Vt4242EeTBfc= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b=NB2QQGtJ; dmarc=pass (policy=quarantine) header.from=amazon.co.uk; spf=pass (imf22.hostedemail.com: domain of "prvs=5539d40d4=kalyazin@amazon.co.uk" designates 13.216.54.180 as permitted sender) smtp.mailfrom="prvs=5539d40d4=kalyazin@amazon.co.uk" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1775834380; 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=5C9AEaTZC2vnX9WJzvecdU4TcSrFHbDbWhfB5ZZnz/U=; b=6IN88Fipl616PgaAURgvA+VPOZ2YcU1VaGt7cU8sBQ5uplKYEOXQdR0k+PVPrf46kRAwB6 WP4ih4iKC9kHaNkLH4rgHlL8kSrzrR7KCzGu6+wPzGa11jR8+YHYSBxyIoaI4YWvf+EEw1 Lay8CdzNSAGf99XeFCl2KivZ1W2wdjY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1775834380; x=1807370380; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=5C9AEaTZC2vnX9WJzvecdU4TcSrFHbDbWhfB5ZZnz/U=; b=NB2QQGtJvApou6Tz9C4qTQqDKZNzrV/qM7XMIhqYQMRAcZajLm3aLbHr nep2axjzGogIU6pjmuFNYAv2a6zgzc/DosMRmloazXIVamyIwNNMdkRLJ y0POo/ru6Uiv03VbxdLtkZvCb2MfkZ7EQQzq/59v7YCtlIQSrWhYCnt8c ehnijbINXgJJLdz2itU88/ep6ZAdXTALuxCPaBFG0TKd2lG+Eann1GpR7 Ko+kTJz0XVjNTiQHoD8wuXUDaI/C86S8Jxs/kf1ptQjW676UjTinKRGud YkZ3pxz8F1a+Msam7CIgvfPix1ecLNlia+LsWKt6nLjMledYCEVMcr5n0 A==; X-CSE-ConnectionGUID: 18qYh3HmQaibfh/VI2oe3g== X-CSE-MsgGUID: XjBPrBJnTOmInJJy00mcRg== X-IronPort-AV: E=Sophos;i="6.23,171,1770595200"; d="scan'208";a="15981021" Received: from ip-10-4-3-150.ec2.internal (HELO smtpout.naws.us-east-1.prod.farcaster.email.amazon.dev) ([10.4.3.150]) by internal-iad-out-002.esa.us-east-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2026 15:19:36 +0000 Received: from EX19MTAUEB001.ant.amazon.com [72.21.198.67:7247] by smtpin.naws.us-east-1.prod.farcaster.email.amazon.dev [10.0.46.155:2525] with esmtp (Farcaster) id 7679b919-827f-4863-9b32-918b6977df81; Fri, 10 Apr 2026 15:19:36 +0000 (UTC) X-Farcaster-Flow-ID: 7679b919-827f-4863-9b32-918b6977df81 Received: from EX19D027UEC003.ant.amazon.com (10.252.137.250) by EX19MTAUEB001.ant.amazon.com (10.252.135.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Fri, 10 Apr 2026 15:19:36 +0000 Received: from EX19D027UEC003.ant.amazon.com (10.252.137.250) by EX19D027UEC003.ant.amazon.com (10.252.137.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Fri, 10 Apr 2026 15:19:35 +0000 Received: from EX19D027UEC003.ant.amazon.com ([fe80::887f:519b:ba73:21d]) by EX19D027UEC003.ant.amazon.com ([fe80::887f:519b:ba73:21d%3]) with mapi id 15.02.2562.037; Fri, 10 Apr 2026 15:19:35 +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" , "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" , "baolu.lu@linux.intel.com" , "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" , "yang@os.amperecomputing.com" , "Liam.Howlett@oracle.com" , "urezki@gmail.com" , "zhengqi.arch@bytedance.com" , "gerald.schaefer@linux.ibm.com" , "jiayuan.chen@shopee.com" , "lenb@kernel.org" , "pavel@kernel.org" , "rafael@kernel.org" , "yangyicong@hisilicon.com" , "vannapurve@google.com" , "jackmanb@google.com" , "patrick.roy@linux.dev" , "Thomson, Jack" , "Itazuri, Takahiro" , "Manwaring, Derek" , "Kalyazin, Nikita" , Nikita Kalyazin Subject: [PATCH v12 10/16] KVM: guest_memfd: Add flag to remove from direct map Thread-Topic: [PATCH v12 10/16] KVM: guest_memfd: Add flag to remove from direct map Thread-Index: AQHcyP1wgECm8Dfrh0CyY43UsmUx2g== Date: Fri, 10 Apr 2026 15:19:35 +0000 Message-ID: <20260410151746.61150-11-kalyazin@amazon.com> References: <20260410151746.61150-1-kalyazin@amazon.com> In-Reply-To: <20260410151746.61150-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-Queue-Id: E1CDEC000A X-Stat-Signature: kcz5rmraf7b1w6hqmwfptmooidrt41qq X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1775834379-276427 X-HE-Meta: U2FsdGVkX182+JXQicZZje/CXzsCpIE3g8KrHpHPRooB7XIEA+d8Fq4lb+6rMcQCwH2REJjYEMsbc7iMJXcgdhwjGtmqIPjk1+EIBaMb8dicQLoGsABs+M48W9RJXeGRSUPrp5rsZXId/xrQxEJAMVRE+Yx8/hMT1IrpLgx++BEvNZywN3QTNFP9O4WtsniazZhlh/++Ku2+tpf4F4Du3XrKrDWUiLQNZb7pV3WQg1ID+zTmuLu9mUfKm98OvDee9BE6r5A17A9AStvOLoL8WZlwkSshERYmEopH34P0nbC/eCXIMa3ZfrHKnSRSjw3kJoecHrcNFmCzlhx4RMgE1FPUb4KyOouRGMtKHLcxTziSdKu3WQt6IX3p4Q8SYA410J7jbfxBnFSaiWOa3UnJUl4ma/nd74NNAipWMDYzUhbE+O/A1MhFST+QC1L7d5sRbY/fSLKt6fDhcmpVrC2VpJEWYNAGEL9OPQNJUZHeKXmkGjOPT6R7ayQJTJCni38AeyoTSYRkO5l/ogURaDgvfh+GpToMCtUOBw+CXJhhXYv/gG8AWhi93/TxKf0Jb3qrj0ZElyYKSJPqsn8MAFoXhMKOC+6dkfWxmjsF1+UZqJOQBA8ZicsvmkLcoxYO1SbjhVUX+U5Ahr5c+TABR45u1uMXYQHZnSN6GP8Sv4tKaTRrhLgs2Jf/wi9laxwugj8yO+wchXLJF17UW9v05C9L2VtBU6uDdXH4SO5ZftVqRu87RWfJKVCl6xqN6bRGR/ZwbFE/STF8XfFRIZBsbQwc5P76f3kcjtqU01AuoILGi9jZMJvNfDOd9eG1DNXSZsZH/I3awFkJQ3L7M5uBe7/JZ3JPAl62D4BCzrfHw9z5WG97m7L0tvZGASMJL3SpX0qcqL/aiWnfHxVt/RyOaCyhnEddd9BLfJ5asaDNcqOb3uqJr9wNWPw5FTN2Rk0ja1crW6rKvmKQPqo2jaK0s8p kWKskmeA ftskDpRKt670JuR0hD87NkVLbs/vF/8we5Mj4udpE1FQsfdmhgXNe7c+8w9T1ppszpMjZDGQ21+ihvL/vNDLzqTMRrG+UupF27YJ5zGbUcOFKaCeNcaUMdBN8CjeGDf9s56prmU1go8w7tyydhOYd8/7b9mPcgQ18AfFNt7Z+feAUqj0cq+6wtSinLNc00NLzHd9ufThSofak9UiSeSGcTtG/Sfq3HHceFeDkMxtJTxHk3ZzWZ7Q/CGbExT2imO9qyivb9ZxKWEgmFlgzzneFqcRkqsqeiP84dmrNaJjbscB9tdWQwIrOe0NBYwhKkK7cbzLNI31zdNON/ayLhJg51AnfgNk7f1s1jZn/0QOc7vFvUk9UXZAJ6XLawI6sK1WZcrQAgNMaO7a3+5w5O7vF6v6m2Qi4lQ4FFoSKLOVXKghpDovsdHoWSspz0CM6x+6ktoiAg6vuk4pf6ka4CHlpgrP6RUmD9QMmSxolFAlVzG08fS+nTh57wohVhi2Uo+ZONonQrq+Re45GO46tV4zfycV+P+eelXfx0j9kaI0SCIAMcKkKh2AqT3iGqVs5703K54kGVdJxzrHxKgRCmfGhBDgCn1RQY+Qib6mG9JlnNPjdB/3OxP+qoF/447lWle0QyGxlexCQ84A4cFj+7xlSHw5AaLsZpY/Fo8VFhzMYE0ZGwqa6Ch8BKs17G0hzuc4BxGfYcuzm+prcI1nuC8JK8xkSbOrp8f5TZKJe2feCz7rIUj6PV9AVNBhqxQ== 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= Add GUEST_MEMFD_FLAG_NO_DIRECT_MAP flag for KVM_CREATE_GUEST_MEMFD()=0A= ioctl. When set, guest_memfd folios will be removed from the direct map=0A= after preparation, with direct map entries only restored when the folios=0A= are freed.=0A= =0A= To ensure these folios do not end up in places where the kernel cannot=0A= deal with them, set AS_NO_DIRECT_MAP on the guest_memfd's struct=0A= address_space if GUEST_MEMFD_FLAG_NO_DIRECT_MAP is requested.=0A= =0A= Note that this flag causes removal of direct map entries for all=0A= guest_memfd folios independent of whether they are "shared" or "private"=0A= (although current guest_memfd only supports either all folios in the=0A= "shared" state, or all folios in the "private" state if=0A= GUEST_MEMFD_FLAG_MMAP is not set). The usecase for removing direct map=0A= entries of also the shared parts of guest_memfd are a special type of=0A= non-CoCo VM where, host userspace is trusted to have access to all of=0A= guest memory, but where Spectre-style transient execution attacks=0A= through the host kernel's direct map should still be mitigated. In this=0A= setup, KVM retains access to guest memory via userspace mappings of=0A= guest_memfd, which are reflected back into KVM's memslots via=0A= userspace_addr. This is needed for things like MMIO emulation on x86_64=0A= to work.=0A= =0A= Direct map entries are zapped right before guest or userspace mappings=0A= of gmem folios are set up, e.g. in kvm_gmem_fault_user_mapping() or=0A= kvm_gmem_get_pfn() [called from the KVM MMU code]. At present, direct=0A= map removal is not supported on platforms that support=0A= kvm_gmem_populate(). In case such support is added in the future, the=0A= following ordering is maintained: zap then prepare, invalidate then=0A= restore, to avoid having guest-owned pages being temporarily mapped on=0A= by host. This assumes that preparation or invalidation code does not=0A= access the page content.=0A= =0A= Signed-off-by: Patrick Roy =0A= Co-developed-by: Nikita Kalyazin =0A= Signed-off-by: Nikita Kalyazin =0A= ---=0A= Documentation/virt/kvm/api.rst | 21 +++++-----=0A= include/linux/kvm_host.h | 3 ++=0A= include/uapi/linux/kvm.h | 1 +=0A= virt/kvm/guest_memfd.c | 71 ++++++++++++++++++++++++++++++++--=0A= 4 files changed, 83 insertions(+), 13 deletions(-)=0A= =0A= diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rs= t=0A= index 032516783e96..8feec77b03fe 100644=0A= --- a/Documentation/virt/kvm/api.rst=0A= +++ b/Documentation/virt/kvm/api.rst=0A= @@ -6439,15 +6439,18 @@ a single guest_memfd file, but the bound ranges mus= t not overlap).=0A= The capability KVM_CAP_GUEST_MEMFD_FLAGS enumerates the `flags` that can b= e=0A= specified via KVM_CREATE_GUEST_MEMFD. Currently defined flags:=0A= =0A= - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=0A= - GUEST_MEMFD_FLAG_MMAP Enable using mmap() on the guest_memfd file= =0A= - descriptor.=0A= - GUEST_MEMFD_FLAG_INIT_SHARED Make all memory in the file shared during= =0A= - KVM_CREATE_GUEST_MEMFD (memory files create= d=0A= - without INIT_SHARED will be marked private)= .=0A= - Shared memory can be faulted into host user= space=0A= - page tables. Private memory cannot.=0A= - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=0A= + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=0A= + GUEST_MEMFD_FLAG_MMAP Enable using mmap() on the guest_memfd fi= le=0A= + descriptor.=0A= + GUEST_MEMFD_FLAG_INIT_SHARED Make all memory in the file shared during= =0A= + KVM_CREATE_GUEST_MEMFD (memory files crea= ted=0A= + without INIT_SHARED will be marked privat= e).=0A= + Shared memory can be faulted into host us= erspace=0A= + page tables. Private memory cannot.=0A= + GUEST_MEMFD_FLAG_NO_DIRECT_MAP The guest_memfd instance will unmap the m= emory=0A= + backing it from the kernel's address spac= e=0A= + before passing it off to userspace or the= guest.=0A= + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=0A= =0A= When the KVM MMU performs a PFN lookup to service a guest fault and the ba= cking=0A= guest_memfd has the GUEST_MEMFD_FLAG_MMAP set, then the fault will always = be=0A= diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h=0A= index ce8c5fdf2752..c95747e2278c 100644=0A= --- a/include/linux/kvm_host.h=0A= +++ b/include/linux/kvm_host.h=0A= @@ -738,6 +738,9 @@ static inline u64 kvm_gmem_get_supported_flags(struct k= vm *kvm)=0A= if (!kvm || kvm_arch_supports_gmem_init_shared(kvm))=0A= flags |=3D GUEST_MEMFD_FLAG_INIT_SHARED;=0A= =0A= + if (!kvm || kvm_arch_gmem_supports_no_direct_map(kvm))=0A= + flags |=3D GUEST_MEMFD_FLAG_NO_DIRECT_MAP;=0A= +=0A= return flags;=0A= }=0A= #endif=0A= diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h=0A= index 80364d4dbebb..d864f67efdb7 100644=0A= --- a/include/uapi/linux/kvm.h=0A= +++ b/include/uapi/linux/kvm.h=0A= @@ -1642,6 +1642,7 @@ struct kvm_memory_attributes {=0A= #define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest= _memfd)=0A= #define GUEST_MEMFD_FLAG_MMAP (1ULL << 0)=0A= #define GUEST_MEMFD_FLAG_INIT_SHARED (1ULL << 1)=0A= +#define GUEST_MEMFD_FLAG_NO_DIRECT_MAP (1ULL << 2)=0A= =0A= struct kvm_create_guest_memfd {=0A= __u64 size;=0A= diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c=0A= index 651649623448..80d4a6aca128 100644=0A= --- a/virt/kvm/guest_memfd.c=0A= +++ b/virt/kvm/guest_memfd.c=0A= @@ -7,6 +7,7 @@=0A= #include =0A= #include =0A= #include =0A= +#include =0A= =0A= #include "kvm_mm.h"=0A= =0A= @@ -76,6 +77,39 @@ static int __kvm_gmem_prepare_folio(struct kvm *kvm, str= uct kvm_memory_slot *slo=0A= return 0;=0A= }=0A= =0A= +#define KVM_GMEM_FOLIO_NO_DIRECT_MAP BIT(0)=0A= +=0A= +static bool kvm_gmem_folio_no_direct_map(struct folio *folio)=0A= +{=0A= + return ((u64)folio->private) & KVM_GMEM_FOLIO_NO_DIRECT_MAP;=0A= +}=0A= +=0A= +static int kvm_gmem_folio_zap_direct_map(struct folio *folio)=0A= +{=0A= + int r =3D 0;=0A= +=0A= + VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio);=0A= +=0A= + if (WARN_ON_ONCE(!(GMEM_I(folio_inode(folio))->flags & GUEST_MEMFD_FLAG_N= O_DIRECT_MAP)))=0A= + return -EINVAL;=0A= +=0A= + if (kvm_gmem_folio_no_direct_map(folio))=0A= + goto out;=0A= +=0A= + r =3D folio_zap_direct_map(folio);=0A= + if (!r)=0A= + folio->private =3D (void *)((u64)folio->private | KVM_GMEM_FOLIO_NO_DIRE= CT_MAP);=0A= +=0A= +out:=0A= + return r;=0A= +}=0A= +=0A= +static void kvm_gmem_folio_restore_direct_map(struct folio *folio)=0A= +{=0A= + folio_restore_direct_map(folio);=0A= + folio->private =3D (void *)((u64)folio->private & ~KVM_GMEM_FOLIO_NO_DIRE= CT_MAP);=0A= +}=0A= +=0A= /*=0A= * Process @folio, which contains @gfn, so that the guest can use it.=0A= * The folio must be locked and the gfn must be contained in @slot.=0A= @@ -388,11 +422,17 @@ static bool kvm_gmem_supports_mmap(struct inode *inod= e)=0A= return GMEM_I(inode)->flags & GUEST_MEMFD_FLAG_MMAP;=0A= }=0A= =0A= +static bool kvm_gmem_no_direct_map(struct inode *inode)=0A= +{=0A= + return GMEM_I(inode)->flags & GUEST_MEMFD_FLAG_NO_DIRECT_MAP;=0A= +}=0A= +=0A= static vm_fault_t kvm_gmem_fault_user_mapping(struct vm_fault *vmf)=0A= {=0A= struct inode *inode =3D file_inode(vmf->vma->vm_file);=0A= struct folio *folio;=0A= vm_fault_t ret =3D VM_FAULT_LOCKED;=0A= + int err;=0A= =0A= if (((loff_t)vmf->pgoff << PAGE_SHIFT) >=3D i_size_read(inode))=0A= return VM_FAULT_SIGBUS;=0A= @@ -418,6 +458,14 @@ static vm_fault_t kvm_gmem_fault_user_mapping(struct v= m_fault *vmf)=0A= folio_mark_uptodate(folio);=0A= }=0A= =0A= + if (kvm_gmem_no_direct_map(folio_inode(folio))) {=0A= + err =3D kvm_gmem_folio_zap_direct_map(folio);=0A= + if (err) {=0A= + ret =3D vmf_error(err);=0A= + goto out_folio;=0A= + }=0A= + }=0A= +=0A= vmf->page =3D folio_file_page(folio, vmf->pgoff);=0A= =0A= out_folio:=0A= @@ -529,6 +577,9 @@ static void kvm_gmem_free_folio(struct folio *folio)=0A= int order =3D folio_order(folio);=0A= =0A= kvm_arch_gmem_invalidate(pfn, pfn + (1ul << order));=0A= +=0A= + if (kvm_gmem_folio_no_direct_map(folio))=0A= + kvm_gmem_folio_restore_direct_map(folio);=0A= }=0A= =0A= static const struct address_space_operations kvm_gmem_aops =3D {=0A= @@ -591,6 +642,9 @@ static int __kvm_gmem_create(struct kvm *kvm, loff_t si= ze, u64 flags)=0A= /* Unmovable mappings are supposed to be marked unevictable as well. */= =0A= WARN_ON_ONCE(!mapping_unevictable(inode->i_mapping));=0A= =0A= + if (flags & GUEST_MEMFD_FLAG_NO_DIRECT_MAP)=0A= + mapping_set_no_direct_map(inode->i_mapping);=0A= +=0A= GMEM_I(inode)->flags =3D flags;=0A= =0A= file =3D alloc_file_pseudo(inode, kvm_gmem_mnt, name, O_RDWR, &kvm_gmem_f= ops);=0A= @@ -802,14 +856,23 @@ int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memo= ry_slot *slot,=0A= folio_mark_uptodate(folio);=0A= }=0A= =0A= + if (kvm_gmem_no_direct_map(folio_inode(folio))) {=0A= + r =3D kvm_gmem_folio_zap_direct_map(folio);=0A= + if (r)=0A= + goto out_unlock;=0A= + }=0A= +=0A= r =3D kvm_gmem_prepare_folio(kvm, slot, gfn, folio);=0A= + if (r)=0A= + goto out_unlock;=0A= =0A= + *page =3D folio_file_page(folio, index);=0A= folio_unlock(folio);=0A= + return 0;=0A= =0A= - if (!r)=0A= - *page =3D folio_file_page(folio, index);=0A= - else=0A= - folio_put(folio);=0A= +out_unlock:=0A= + folio_unlock(folio);=0A= + folio_put(folio);=0A= =0A= return r;=0A= }=0A= -- =0A= 2.50.1=0A= =0A=