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 4E2FAD33990 for ; Fri, 5 Dec 2025 16:59:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A982C6B0012; Fri, 5 Dec 2025 11:59:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A48326B0022; Fri, 5 Dec 2025 11:59:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 910A66B0023; Fri, 5 Dec 2025 11:59:04 -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 75AFE6B0012 for ; Fri, 5 Dec 2025 11:59:04 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 40B0A8857B for ; Fri, 5 Dec 2025 16:59:04 +0000 (UTC) X-FDA: 84186027408.28.CBD057E 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 imf26.hostedemail.com (Postfix) with ESMTP id 92F7814001C for ; Fri, 5 Dec 2025 16:59:01 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b="H/dT67sO"; spf=pass (imf26.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"; 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=1764953942; 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=ioJNos7hxVKCZgZqEai7R/nyP1L59yWcXHZaL1WkvB4=; b=yn6X95d6KD2wzm/Fq/B9qSVgcHGggDoBy45iXK+29iGtWiV18gLuYwFOF6xBY8T0bW2WEo XxK+SmUXUinLFO9KeSoQovmDbRT1hh0jqWJr+GR/Qw+wGScegdrT5nX0yCjL5kmgf2nJZo YrdHiOnWJCPzZQVy6JrHnL00B96aqbw= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b="H/dT67sO"; spf=pass (imf26.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"; dmarc=pass (policy=quarantine) header.from=amazon.co.uk ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1764953942; a=rsa-sha256; cv=none; b=rgt3Age4cP/08iFDaZR91rRYPQxIqMBpKviu1j0E3oi8Ojrwg/AxKhNPyEPMPbuYbI8yUo 16qDJ4Hrn98rkgpNjyf5//wJ9PszvRvWcBlI5Xr6caL6wQBKHhxOAoKUMSfYdmkxC2ysmi G/w10R06Gve7ctpESrSTGfMovnvHXrc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1764953941; x=1796489941; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ioJNos7hxVKCZgZqEai7R/nyP1L59yWcXHZaL1WkvB4=; b=H/dT67sORIF1wBEexWxNzFft9ioGrhBhcM9abg6eY1Rhs1pHhDD6nOCb KKPeKH6z6vjwt8mBpeBCHTsnNq6VOKxLQR+fC6nqhvg/0dEdus642OwvW IaSqLahLAVTCMJkgHGR+CnzHDQyR0w7bX31VsMCMyEaMiZRiXieHckeJ+ sKHcIDRw2FrP0baHfC3+M9IAvyWYydaSQKjTrvvZQS8emx9xJDoz/zdLh 9+HYttiZdoDydxnWpPmcgL+EHyaxx7MVUC4KuV4HqFWk1dX39/QpYYUe3 LzdN4zzlC0EO/ArIH2Isz86I40lA8Y6VBE1vfDFCtRK1w2Zj8ZSSh/H70 w==; X-CSE-ConnectionGUID: iB+IdF+LR5aqvP28mlAo6g== X-CSE-MsgGUID: Oewbkl1pSgGBoL2ZAj/lYw== X-IronPort-AV: E=Sophos;i="6.20,252,1758585600"; d="scan'208";a="6199842" 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-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2025 16:58:44 +0000 Received: from EX19MTAEUA002.ant.amazon.com [54.240.197.232:25188] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.34.107:2525] with esmtp (Farcaster) id 64f2d293-0d8e-44f4-ba51-89912e231554; Fri, 5 Dec 2025 16:58:44 +0000 (UTC) X-Farcaster-Flow-ID: 64f2d293-0d8e-44f4-ba51-89912e231554 Received: from EX19D005EUB004.ant.amazon.com (10.252.51.126) by EX19MTAEUA002.ant.amazon.com (10.252.50.126) 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 16:58:44 +0000 Received: from EX19D005EUB003.ant.amazon.com (10.252.51.31) by EX19D005EUB004.ant.amazon.com (10.252.51.126) 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 16:58:43 +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 16:58:43 +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 05/13] KVM: guest_memfd: Add flag to remove from direct map Thread-Topic: [PATCH v8 05/13] KVM: guest_memfd: Add flag to remove from direct map Thread-Index: AQHcZghpe03+EzzQP0GBbIS7sNUUeQ== Date: Fri, 5 Dec 2025 16:58:43 +0000 Message-ID: <20251205165743.9341-6-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-Queue-Id: 92F7814001C X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: dqp4sosrjzqpsasx4rgyrns48cakknao X-HE-Tag: 1764953941-78442 X-HE-Meta: U2FsdGVkX18ttmVet0d0Cw45U3Sx3a96di/LYSqK0qSTA9v9TNYOcsEc7xG9hURDDGmNhAu7bNDSkR6AROqOuo3H5b+IemWqf9O/NQnFFWIBdl2sNhdndufzL1GDdeHvXEJ+9faxUfLfqume9PJjx4s+UMwdVsUEWNTTmxprH1eYQ5SlY18uPY7PI1uqU/CmqHT+CMHzSBVnlZMryxYN8ll6VD5ZqTcwWCQ/8zgrEgYgnnNXqwKeqOKJJI50mB3ixoDweLnATuY4befUc/QpkKvMSz8LgM0Xr/2DxwmStQadWf0nosUMoKwsDWjyVs8TuqbJ/IEKKB4nrgS2F/x6EsJpBm7zIdDKLy/e4VnPT/E5aNV4vO2D77Z4VzglEFwTc5tankPP/cNtXHznrxYHMzpjiiYXiqQzXLSYUBnShLXJXC2uBKOUEtKFVuEbib+mumMfGelnNBCYJXIX9ym9ZTkDW9PdwI2Zxz+xJ5gS9W7y0XC5ia07NbH2Wav4rNNZ5VH/xalI3FARz2gKtn3GmEXoi/MFOnVi4V3dJp5uFreGCzjAjyA7W9ZgRDrne12BSQrj+z0BPN41pnLKlPa5eeUWhYoEtz/yz1zYQ0udfBFjqge0ar6yYtWuRYH9AgLZwREHkvBV0Hu1JtryoKqqYmb22b3HYLNIBnE+M2DLceZP5FzdwjdbXPDqYRBT+R268x6yvsXBvfJE/FGVv2WTpW8xzs34MW8kisXwL7Qb4RTHYpsiV1VWKFql9pF+n+KUvQ7EuKHhWTr9e74XLjrSDTD8XGs87VhetYSdk8DzlMnpIplDurc2d8sKkG79+o8k+CgqQSQLabP/F3uW8ERrkAZRf/VD1naNqO9lxC1l7pgKiNMxfWD5omLiOrWqSd0wGWeUbOCuKwRhd9b5Q+n0d0mN4kibf1kmEbK6YdHzrlYAzDXWCa3IkCLExnD6v5ALGhe43B7esuLx4cw1hEs vUinZE4/ uJllBd5fIOOY7yNrYBI7BWtQnSg9Jnfq7eCEx4uBPry2NPCnuBHXJhSjGsreCk3iQQJbqmexOCBs8XIfHSaT4pAJmVNvikjw0AIgaqE7gEBy6JX4gbDGOT+Q8Sh9A31jlJkuTYYGPrK95ppBUxcUQq+lehHF00M9GLoJ/TeWafb3gsQ45PvR1bYZiF8MVkAeemFvmmA51ypHtW2ipS4Owgn0bvspRlB0T9YdQC6toHR4nHVHJD0d0+swIWfY1SEVpbPJHFAHr9Dl538ccALRorPiy1qWAk8N6aitsZzuQVNBX3ufkBQCS/nYbGTkk6OEb4p4tBr6KsCip82aqzUQaoB7DZIB/MkxxKDwsYprJmKwip901qV4bGd9MSNnVkqP/wq/DMIzf2YQJJBxnMFGXjyxWPbI+2IPBo3ATRci6imW9hDO9F1meRG+6bozDrdZkgs3mxvY5j580u00hXUkYRbnnKDt+oDZDgR/czv2nutMaHAPBP8hpZiAr5SgMAS/1ATiuKZmaFeKZMEVrR0dTDDanhjMS2DMtu5P1SB3zaIq0HLNxWcf1mDwZu2hFSMKeso24Koz7npcjG2HdoHchgBlsQLsLVD+m5UnoXaLtPRwwb36RG6iI3dKw9lE75UaNgtDRrYUlybbEBiFzIPzHBh1wrmvLvZG7SrENLE5PVhr26TfNjWV9AB3koAmyT8dYL9WacsozR+DCAgvd281K+xqsxuv2jFNlfWURUjHwfqbr6Sg= 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= 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]. The only place where=0A= a gmem folio can be allocated without being mapped anywhere is=0A= kvm_gmem_populate(), where handling potential failures of direct map=0A= removal is not possible (by the time direct map removal is attempted,=0A= the folio is already marked as prepared, meaning attempting to re-try=0A= kvm_gmem_populate() would just result in -EEXIST without fixing up the=0A= direct map state). These folios are then removed form the direct map=0A= upon kvm_gmem_get_pfn(), e.g. when they are mapped into the guest later.=0A= =0A= Signed-off-by: Patrick Roy =0A= Signed-off-by: Nikita Kalyazin =0A= ---=0A= Documentation/virt/kvm/api.rst | 22 ++++++++-----=0A= include/linux/kvm_host.h | 12 +++++++=0A= include/uapi/linux/kvm.h | 1 +=0A= virt/kvm/guest_memfd.c | 60 ++++++++++++++++++++++++++++++++++=0A= 4 files changed, 86 insertions(+), 9 deletions(-)=0A= =0A= diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rs= t=0A= index 01a3abef8abb..c5f54f1370c8 100644=0A= --- a/Documentation/virt/kvm/api.rst=0A= +++ b/Documentation/virt/kvm/api.rst=0A= @@ -6440,15 +6440,19 @@ 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 behave simi= larly=0A= + to memfd_secret, and unmaps the memory ba= cking=0A= + it from the kernel's address space before= =0A= + being passed off to userspace or the gues= t.=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 27796a09d29b..d4d5306075bf 100644=0A= --- a/include/linux/kvm_host.h=0A= +++ b/include/linux/kvm_host.h=0A= @@ -738,10 +738,22 @@ static inline u64 kvm_gmem_get_supported_flags(struct= kvm *kvm)=0A= if (!kvm || kvm_arch_supports_gmem_init_shared(kvm))=0A= flags |=3D GUEST_MEMFD_FLAG_INIT_SHARED;=0A= =0A= + if (kvm_arch_gmem_supports_no_direct_map())=0A= + flags |=3D GUEST_MEMFD_FLAG_NO_DIRECT_MAP;=0A= +=0A= return flags;=0A= }=0A= #endif=0A= =0A= +#ifdef CONFIG_KVM_GUEST_MEMFD=0A= +#ifndef kvm_arch_gmem_supports_no_direct_map=0A= +static inline bool kvm_arch_gmem_supports_no_direct_map(void)=0A= +{=0A= + return false;=0A= +}=0A= +#endif=0A= +#endif /* CONFIG_KVM_GUEST_MEMFD */=0A= +=0A= #ifndef kvm_arch_has_readonly_mem=0A= static inline bool kvm_arch_has_readonly_mem(struct kvm *kvm)=0A= {=0A= diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h=0A= index dddb781b0507..60341e1ba1be 100644=0A= --- a/include/uapi/linux/kvm.h=0A= +++ b/include/uapi/linux/kvm.h=0A= @@ -1612,6 +1612,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 92e7f8c1f303..ec4966a47d5e 100644=0A= --- a/virt/kvm/guest_memfd.c=0A= +++ b/virt/kvm/guest_memfd.c=0A= @@ -7,6 +7,9 @@=0A= #include =0A= #include =0A= #include =0A= +#include =0A= +=0A= +#include =0A= =0A= #include "kvm_mm.h"=0A= =0A= @@ -76,6 +79,49 @@ 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= + unsigned long addr =3D (unsigned long) folio_address(folio);=0A= + u64 gmem_flags =3D GMEM_I(folio_inode(folio))->flags;=0A= +=0A= + if (kvm_gmem_folio_no_direct_map(folio) || !(gmem_flags & GUEST_MEMFD_FLA= G_NO_DIRECT_MAP))=0A= + goto out;=0A= +=0A= + r =3D set_direct_map_valid_noflush(folio_page(folio, 0), folio_nr_pages(f= olio),=0A= + false);=0A= +=0A= + if (r)=0A= + goto out;=0A= +=0A= + folio->private =3D (void *) KVM_GMEM_FOLIO_NO_DIRECT_MAP;=0A= + flush_tlb_kernel_range(addr, addr + folio_size(folio));=0A= +=0A= +out:=0A= + return r;=0A= +}=0A= +=0A= +static void kvm_gmem_folio_restore_direct_map(struct folio *folio)=0A= +{=0A= + /*=0A= + * Direct map restoration cannot fail, as the only error condition=0A= + * for direct map manipulation is failure to allocate page tables=0A= + * when splitting huge pages, but this split would have already=0A= + * happened in set_direct_map_invalid_noflush() in kvm_gmem_folio_zap_dir= ect_map().=0A= + * Thus set_direct_map_valid_noflush() here only updates prot bits.=0A= + */=0A= + if (kvm_gmem_folio_no_direct_map(folio))=0A= + set_direct_map_valid_noflush(folio_page(folio, 0), folio_nr_pages(folio)= ,=0A= + true);=0A= +}=0A= +=0A= static inline void kvm_gmem_mark_prepared(struct folio *folio)=0A= {=0A= folio_mark_uptodate(folio);=0A= @@ -398,6 +444,7 @@ static vm_fault_t kvm_gmem_fault_user_mapping(struct vm= _fault *vmf)=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= @@ -423,6 +470,12 @@ static vm_fault_t kvm_gmem_fault_user_mapping(struct v= m_fault *vmf)=0A= kvm_gmem_mark_prepared(folio);=0A= }=0A= =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= vmf->page =3D folio_file_page(folio, vmf->pgoff);=0A= =0A= out_folio:=0A= @@ -533,6 +586,8 @@ static void kvm_gmem_free_folio(struct folio *folio)=0A= kvm_pfn_t pfn =3D page_to_pfn(page);=0A= int order =3D folio_order(folio);=0A= =0A= + kvm_gmem_folio_restore_direct_map(folio);=0A= +=0A= kvm_arch_gmem_invalidate(pfn, pfn + (1ul << order));=0A= }=0A= =0A= @@ -596,6 +651,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= @@ -807,6 +865,8 @@ int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory= _slot *slot,=0A= if (!is_prepared)=0A= r =3D kvm_gmem_prepare_folio(kvm, slot, gfn, folio);=0A= =0A= + kvm_gmem_folio_zap_direct_map(folio);=0A= +=0A= folio_unlock(folio);=0A= =0A= if (!r)=0A= -- =0A= 2.50.1=0A= =0A=