From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.54 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793116017; b=w5PLxxeAUY9sid2odEFH6/Nmqpa7+Iy6mrwgUuAOerjxRRXQLujMRFHUkylbys2UnXtr fRfLcUsTSDU7LRUe09UEXO3eVWtyvp/FePZCPZ4NTmBqZWCn/ywfE/CoX1aUulK3DewBU dU2nFgEy73v7N67F9Wl9/CwR5kZirgMF5QqZIcvno3af3DC4YpezJ2iBhuYooyfY0tjsB Tdy8x5M62ye7fYHPxKSu7S2llGSvDOuSIrAe1SFlR9BlBN8o87/X5x37DERF7Dpiy9MM4 LscTj8YVHEadyLLC8bVZcyYkl0v9ReggTXlXI2obwre67u80qGY1ZmozU4XCqcogzRA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793116017; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=pWprt0VFzCZQuUxRfAXX7XDBBCxPrrxztMBOVVS5Pdc=; b=D6d+5ZJ4g9oyvWe81Ii9dDmUZhzqn/T2q9jWsLe9kGBzSlnqMDXskMuS4T/ydfnNPTTe 9MQiBTYlLWJJDIjU4reGrMSCX8HmdFGwJGvHNmrRkSJMo4sdk3a2O7F5EJyC74V/IhjnB Cvs9sDTYS9UTDVUDgNwTH+Orp1F412zcDf127KQHPtoG3cHIDcdXYj2wLbbHrqac/hSj9 sPGb+ItUgYZ2fm6KClaRQjaik81/SYBiPTjHyxeFsEBLiCvJKK7MqOh25itvO1aQfEUwr me3/6Ibzea6dDh3V6Y7+R/pk7MoelSf4L2perR4eXrD1X9sabUoDVAieuEVLGzZ9lCg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=fAD5UC5b; arc=none smtp.remote-ip=209.85.221.54 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A067060A3819 for ; Tue, 27 Oct 2026 15:46:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A067060A3819 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=fAD5UC5b Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-48df4e9d2d4so2584671f8f.3 for ; Tue, 27 Oct 2026 08:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793116015; x=1793720815; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=pWprt0VFzCZQuUxRfAXX7XDBBCxPrrxztMBOVVS5Pdc=; b=fAD5UC5brdYhyKCEzKEDsQnTc0cFJ+Uz8YWiOJKSNGi5Lvpk++Y0Y0yBxBfAkFKRsy dlshEtGKz9da1aAuxEzdU55yBQXBOGnXUNyM/9ghAYCGFTWrL55UkvGjytj70POWZc2Y TeHB0SBvSGUAAWuO9fCYZnQ1YEIwh1ifh6cfqO1/zuDMjwYjH0dmjfRedJnOeAOqsmTa ILNAswA0YeuoutzwntvqhmU0U8SIR/6sgAqOY+aO6dvzE90WoJwJJYaXxbeX7Zgn/4sJ /K1Y8cQ5jY8GzVUAVg0LKIDFKADha+LqLYV1FE2bPRnS3s6fHqRLfvVqLLA4gVElscoy o0cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793116015; x=1793720815; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=pWprt0VFzCZQuUxRfAXX7XDBBCxPrrxztMBOVVS5Pdc=; b=q7xrz3p9ruRsGtjN9re4SxuXOS+nvP7sPpt3aP3paIqiP2Gh6EOdfJaDLY/1oMk2Lu iatlWrG8y0u2lra67BFP6woWXCVHrw8hzOGb//46qw7NCFyo5dZ3Dsb9NHsX1a3R/SE3 CYPHuYmK4phM9y92IfS3ZF+l1l8gk+r/OzAGiOg9vhpihvurvP4T++J7rLXvvrTJ4dGZ TwjWzdNIZi1Secu7i4M0+uZ6sjfctSPzjjyl/q0xaBM6WPhgP/IRF7JWq5z+fI3kAjPF 4l0WGjP2Uy/QCpMa34OfJWjcTk6r2hP+PTxccHGhutX1vCVy+zeSAUNuAk7byGlNqLEr yo2g== X-Forwarded-Encrypted: i=1; AKwUvBzSZuAOCBM1oT/lR6//zSXcPZ/hdbV5uD5ERDnFhpI/Nm/itgpkjYM9qsiJbdWot+awqIAF+A==@lists.linux.dev X-Gm-Message-State: AFq9FYLngfxFnWHlaZlEShlw/PFmJRNBO4/oP3RsPiZFXkigsOs7iYL2 oOois6L4HY6Zbd83VbAEooTIBVsPxoMYpDDRAXeHD/xP011Gi20yF649 X-Gm-Gg: AYBFou25hfYQnXT4hWyxjR5H3vbIVv0q3FNHlY+JlRhspSmFwGnGo67z8mVlkEVuLsh 7KI3aHg40WyIih7FCOYEBgBgVc3FmnTNPND0afxxX6LIs4H11RUPqkNSI2rxbFfzL64QRhrunIl QjOMS+4x6zyKAOFY8dswvEIecYuOwJ1zCPWjFC+L03RyiU3KOxCLunOM8cz77mHFi/jyAqI8cJI 8n7vtWopzLWwXPKv8S9aoX+QyduN9UUgHe/zysy0dKLg7GAdR8Du7UfedJ7ssflIh/oHLd5d4et JMvtE1gA+LIDKt5vZb4Bh7r1GG8ifeCrsqNo2WfaboyPMxaZtUzpYai+gduhl/5Dsss+tW9W1Xw BoiIgzH+P+T5EsPGl0wWqCwX6LOdzZvjYL1W+tYCk2RUenuED5qO5UtolljD3UvwIwxLCliHEDF DlxG6Fa24YRxWsOZuXyErHOwHPdKujuH+g+iJIaglljD+F9djBFh1T83fp4mXzquI8jtWA+c492 dMn09siBTiCnB5HvxDXV+YsN1GjP77dN+lZ05XvR0DZfIbymY14d9AKkO3QEgKxQ0ZgqW/BnttM qujGoLct42UXBEFrfCx1/r4hTEkYH836B7A3+OtwuXFVb3GkSdw91BFYEOrMAKnTfh+iq+QAmwg LpKyOH8uwAYWqrXMKFA== X-Received: by 2002:adf:e282:0:b0:48e:c0:9441 with SMTP id ffacd0b85a97d-48e3eb93390mr14113375f8f.29.1793116014709; Tue, 27 Oct 2026 08:46:54 -0700 (PDT) Received: from dev-dsk-fgriffo-1c-93421965.eu-west-1.amazon.com (54-240-197-234.amazon.com. [54.240.197.234]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48e3ebcb958sm23845574f8f.21.2026.10.27.08.46.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Oct 2026 08:46:54 -0700 (PDT) From: Fred Griffoul To: Ackerley Tng , Paolo Bonzini , Sean Christopherson , Jason Gunthorpe , Kevin Tian Cc: Alex Williamson , Alexander Graf , Alexander Viro , Alexey Kardashevskiy , Andrew Morton , "Aneesh Kumar K . V" , Ashish Kalra , Baolin Wang , Baolu Lu , Bill Wendling , Borislav Petkov , Catalin Marinas , Christian Brauner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Connor Williamson , Dave Hansen , Dave Jiang , David Hildenbrand , David Rientjes , David Woodhouse , Erdem Aktas , Frank van der Linden , Gregory Price , "H . Peter Anvin" , Hugh Dickins , Ingo Molnar , Jacob Pan , James Houghton , Jan Kara , Jianxiong Gao , Joerg Roedel , Joey Gouly , John Starks , Jonathan Corbet , Justin Stitt , Lorenzo Stoakes , Marc Zyngier , Michael Roth , Mike Rapoport , Nathan Chancellor , Nick Desaulniers , Nicolin Chen , Oliver Upton , Pratyush Yadav , Randy Dunlap , Robin Murphy , Samiullah Khawaja , Shuah Khan , Steffen Eiden , Steven Price , Suzuki K Poulose , Tarun Sahu , Thomas Gleixner , Tom Lendacky , Tycho Andersen , Vishal Annapurve , Vlastimil Babka , Will Deacon , Xu Yilun , Yan Zhao , Zenghui Yu , x86@kernel.org, Shuah Khan , Fuad Tabba , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev, iommu@lists.linux.dev Subject: [RFC PATCH 01/14] KVM: guest_memfd: Clamp the order of PFN mode blocks to what KVM can map Date: Tue, 27 Oct 2026 15:46:36 +0000 Message-ID: <20261027154649.91571-2-griffoul@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261027154649.91571-1-griffoul@gmail.com> References: <20261022-gmem-alternative-providers-v2-0-5dd1dc6c660a@google.com> <20261027154649.91571-1-griffoul@gmail.com> X-Mailing-List: iommu@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Fred Griffoul KVM maps guest memory in 4K, 2M or 1G blocks, and uses guest_memfd's max_order to choose. A folio of order N is physically aligned and never mixes shared and private pages, so the order needs no check. A PFN mode provider's frames need not be aligned and the provider does not know which pages are private, yet kvm_gmem_get_pfn() passes its order to KVM unchanged. KVM can then map a block over the wrong frames, or with one attribute over shared and private pages. Define the provider's order as that of the naturally aligned block around the index, preset to 0. Clamp it to a block size KVM supports, in which the gfn, the index and the pfn are aligned alike and every page has the same attribute. A fault that sized its block just before a revoke or conversion of another page in the block would not retry, since KVM only retries faults inside the invalidated range. Make every invalidation of a PFN mode file cover the 1G-aligned blocks around its range. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Fred Griffoul --- include/linux/guest_memfd.h | 5 +-- virt/kvm/guest_memfd.c | 63 +++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/include/linux/guest_memfd.h b/include/linux/guest_memfd.h index 3e2c0714ca33..a38a81693422 100644 --- a/include/linux/guest_memfd.h +++ b/include/linux/guest_memfd.h @@ -21,8 +21,9 @@ struct mempolicy; * @get_pfn: Obtain a PFN for a given index. The provider must ensure backing * memory is present and is responsible for its contents, such as * zeroing if necessary. On success, return 0 with the physical frame - * number in @pfn and, if @max_order is non-NULL, the maximum page - * order of contiguous backing memory containing @pfn. Returns a + * number in @pfn and, if @max_order is non-NULL, the largest order + * for which the naturally aligned block of 2^order pages that + * contains @index is backed by contiguous frames. Returns a * negative error code on failure. The provider must define * @lookup_pfn_range when @get_pfn is defined. * @lookup_pfn_range: Look up the PFN for a given index. Returns 0 on success diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 3c4bedceccfc..be26bd16d420 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -147,6 +147,8 @@ static int gmem_provider_get_pfn(struct gmem_inode *gi, pgoff_t index, unsigned long raw_pfn; int r; + if (max_order) + *max_order = 0; r = gi->provider_ops->get_pfn(gi->provider, index, &raw_pfn, max_order); if (r) return r; @@ -326,10 +328,13 @@ static enum kvm_gfn_range_filter kvm_gmem_get_all_gfns_filter(struct inode *inod return KVM_FILTER_PRIVATE; } -static void __kvm_gmem_invalidate_start(struct gmem_file *f, pgoff_t start, +static void __kvm_gmem_invalidate_start(struct inode *inode, + struct gmem_file *f, pgoff_t start, pgoff_t end, enum kvm_gfn_range_filter attr_filter) { + const gfn_t blk = kvm_gmem_is_pfn_mode(GMEM_I(inode)) ? + 1UL << PUD_ORDER : 1; bool flush = false, found_memslot = false; struct kvm_memory_slot *slot; struct kvm *kvm = f->kvm; @@ -355,6 +360,16 @@ static void __kvm_gmem_invalidate_start(struct gmem_file *f, pgoff_t start, flush |= kvm_mmu_unmap_gfn_range(kvm, &gfn_range); + /* + * In PFN mode, a fault may map a block of up to PUD_ORDER + * pages, sized before this invalidation (see + * kvm_gmem_pfn_map_order()): make faults anywhere in the + * blocks around the range retry. + */ + kvm_mmu_invalidate_range_add(kvm, + round_down(gfn_range.start, blk), + round_up(gfn_range.end, blk)); + #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE kvm_arch_gmem_invalidate_range(kvm, &gfn_range); #endif @@ -374,7 +389,7 @@ static void kvm_gmem_invalidate_start(struct inode *inode, pgoff_t start, struct gmem_file *f; kvm_gmem_for_each_file(f, inode) - __kvm_gmem_invalidate_start(f, start, end, filter); + __kvm_gmem_invalidate_start(inode, f, start, end, filter); } static void __kvm_gmem_invalidate_end(struct gmem_file *f, pgoff_t start, @@ -670,7 +685,7 @@ static int kvm_gmem_release(struct inode *inode, struct file *file) * Zap all SPTEs pointed at by this file. Do not free the backing * memory, as its lifetime is associated with the inode, not the file. */ - __kvm_gmem_invalidate_start(f, 0, -1ul, + __kvm_gmem_invalidate_start(inode, f, 0, -1ul, kvm_gmem_get_all_gfns_filter(inode)); __kvm_gmem_invalidate_end(f, 0, -1ul); @@ -1535,6 +1550,44 @@ static struct folio *__kvm_gmem_get_pfn(struct file *file, return folio; } +/* + * The order a PFN mode block can be mapped at: the provider's order, no + * larger than the alignment of @gfn and @pfn to @index allows, rounded down to + * a page-table size, and never over pages that are not all shared or all + * private, since KVM maps a block with a single attribute. Called with the + * invalidate lock held; an invalidation of any page of the block makes the + * fault retry (see __kvm_gmem_invalidate_start()). + */ +static int kvm_gmem_pfn_map_order(struct inode *inode, pgoff_t index, + gfn_t gfn, kvm_pfn_t pfn, int order) +{ + u64 misalign = (gfn ^ index) | (pfn ^ index); + u64 attrs; + + if (WARN_ON_ONCE(order < 0)) + return 0; + + order = min(order, PUD_ORDER); + if (misalign) + order = min_t(int, order, __ffs64(misalign)); + + if (order >= PUD_ORDER) + order = PUD_ORDER; + else if (order >= PMD_ORDER) + order = PMD_ORDER; + else + return 0; + + attrs = kvm_gmem_get_attributes(inode, + mtree_load(&GMEM_I(inode)->attributes, index)); + while (order && + !kvm_gmem_range_has_attributes(inode, + ALIGN_DOWN(index, 1UL << order), + 1UL << order, attrs)) + order = order == PUD_ORDER ? PMD_ORDER : 0; + return order; +} + int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, int *max_order) { @@ -1556,6 +1609,10 @@ int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, goto out; } + if (kvm_gmem_is_pfn_mode(GMEM_I(file_inode(file)))) + *max_order = kvm_gmem_pfn_map_order(file_inode(file), index, gfn, + *pfn, *max_order); + if (kvm_arch_has_gmem_convert() && kvm_gmem_is_private_mem(file_inode(file), index)) r = kvm_arch_gmem_make_private(kvm, gfn, *pfn, -- 2.47.3