From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D0A23BCD3F for ; Wed, 26 Aug 2026 09:18:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787735911; cv=none; b=M5H1P6bm4xAUtqldTUWFMHZF0RkrxpvAYj/t5EqlM1VrNteZVgCVnnJHVmICJw9Tt91h91d9JaHSZBlvNPxCXipH9Y2Klfk+ErKofoMlD0TghODTz2xupSHNZE5eBzeWklbSnjjdZWlUUhnY10tuK/YRnotWiehiqzivpAZ9IcM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787735911; c=relaxed/simple; bh=n/D+CzWXtwjWicmG4cHiWBsmxeUa/gdAF4ktY4FQ6mA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gafGcSM/kyn5J11LMdsQI1FpfXQiCpC46KpC8odctI+R+PUeZgrGuPN6nVuK+VXIZgrbs4TBKK1XuCS7PxqJ4SOkVePvNlrRwz/UpYhEjh6jfJ2dd/tJj7cQexkRrqsvZJdNesou/4XEfo0kbw3SMETBG3y4g7CbWeDeuGyfJPU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ackerleytng.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KUOpAS7H; arc=none smtp.client-ip=209.85.214.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ackerleytng.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KUOpAS7H" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2cacd6d37edso11906235ad.0 for ; Wed, 26 Aug 2026 02:18:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1787735907; x=1788340707; darn=lists.linux.dev; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=oTE6Asm+7RXlDcDxfjIUoFgKCyFEbiLPZQMuOphEUv0=; b=KUOpAS7HrGed4QKDXGF0i8cLMbDDslVUhidrPlcuVe37PXnLHz3ETamGPqQka8pmlM dJOLSWoWSUuc7qk+d8FkgwYNjuvcozFwXR/pSrwqqVMIsV/rtBqfG0nIHuh87FAqzru7 ToSAYs00JHSF2h/6PBlXKTJTO+kAdGmygbvytc2VV4w0XLSZIULvqG4jMBwArJXrmnUT YVE+1QCEmrTpbc8BY5qNvXYnqHEMRCTxBY/fRL4gewxnQ/EiZB806g4ojpT8KD+mZ5m1 1l9oVHh48cYG7D/1Mn8EMoJ2h64lIOfL2D3hMqMlgQYC9K1VdoD+Mo78+kaXv9Me6PJH cIgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787735907; x=1788340707; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=oTE6Asm+7RXlDcDxfjIUoFgKCyFEbiLPZQMuOphEUv0=; b=EzjWCzCvIL7pcGf9BhZKpkAk3BErjlu2DOwhN5jXn9mpyt1gaIVrZEb5qY/DEKA7pL RPpXRgoRgLhc8a4pTVn4CMrRY2f/zGn8AlLR7hRE32kd4W/Hy5IbWa3FoVG1DNQup0Cz mLI5qFDcPbZgARgxMtgvG7iCTT8j2R0SH2BpoxQPvsqUhnvU/jYlDQSfdqtcj9VyCkLP XS+T1FNQyAdakooGYYkXKnxkHNXMt49B7YoUJHVbElV/Mc13j3yYGx+hekN1OB1k+Xqu +yNUqgA/EfaWq7bEn/aQbYXJeWAybp4JqSZJvUMRRy2jtbAG1D+Km3qOnsDiZId3B/C8 vu/A== X-Forwarded-Encrypted: i=1; AHgh+RpjNTYiWjZg+EBVjeyvLSZAdXS8otZAdcpVEs8zpGjuQiQjJDwo8Jm0ABTgOB0GBdb1xRqsDHkkwtFP@lists.linux.dev X-Gm-Message-State: AFuF++mXztFralvWk4cOdJY82VEBA5cagxmZx37SKLaE1WYuH4EpHFPM KY/AQHFgQ3bXMvI1b+BteTFEyWj25X5DTe5cr7yKafLmNNAh6RT6fsux1GyhxVrLPThtj2AFita cuZFGyTIrvRXui5J/kyjJppHCew== X-Received: from plcx11.prod.google.com ([2002:a17:903:cb:b0:2d6:e968:e012]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e549:b0:2d6:fec3:bd51 with SMTP id d9443c01a7336-2d707a069c4mr76735725ad.5.1787735906226; Wed, 26 Aug 2026 02:18:26 -0700 (PDT) Date: Wed, 26 Aug 2026 09:18:09 +0000 In-Reply-To: <20260826-gmem-inplace-conversion-v11-0-0a15d8a799aa@google.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260826-gmem-inplace-conversion-v11-0-0a15d8a799aa@google.com> X-Developer-Key: i=ackerleytng@google.com; a=ed25519; pk=sAZDYXdm6Iz8FHitpHeFlCMXwabodTm7p8/3/8xUxuU= X-Developer-Signature: v=1; a=ed25519-sha256; t=1787735885; l=3177; i=ackerleytng@google.com; s=20260225; h=from:subject:message-id; bh=YUnwhC+mh4fTP4jvnneQXyA3asq1d/voGqOiDIo7t1o=; b=Wjc/Pos7KfwzIVN8Ns8lzU7jxfHIdmvfrZOOpjQ6O4nJ/C7BmszK2LLtQ7rlqfZLTDl01NH3d k6lZKdmqN+mCdTG+AcXcUlLBxQxLmTU7lbl3u9elGj0Dg7z285TAHtw X-Mailer: b4 0.16.0 Message-ID: <20260826-gmem-inplace-conversion-v11-11-0a15d8a799aa@google.com> Subject: [PATCH v11 11/46] KVM: guest_memfd: Invalidate both SHARED and PRIVATE mappings for in-place conversions From: Ackerley Tng To: aik@amd.com, andrew.jones@linux.dev, binbin.wu@linux.intel.com, brauner@kernel.org, chao.p.peng@linux.intel.com, david@kernel.org, jmattson@google.com, jthoughton@google.com, michael.roth@amd.com, oupton@kernel.org, pankaj.gupta@amd.com, qperret@google.com, rick.p.edgecombe@intel.com, rientjes@google.com, shivankg@amd.com, steven.price@arm.com, willy@infradead.org, wyihan@google.com, yan.y.zhao@intel.com, forkloop@google.com, pratyush@kernel.org, suzuki.poulose@arm.com, aneesh.kumar@kernel.org, liam@infradead.org, Paolo Bonzini , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Jonathan Corbet , Shuah Khan , Shuah Khan , Vishal Annapurve , Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Youngjun Park , Qi Zheng , Shakeel Butt , Kiryl Shutsemau , Baoquan He , Jason Gunthorpe , John Hubbard , Peter Xu , tarunsahu@google.com, Fuad Tabba , Vlastimil Babka Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, Ackerley Tng Content-Type: text/plain; charset="utf-8" From: Sean Christopherson When removing one or more folios from a guest_memfd instance, invalidate both SHARED and PRIVATE mappings if in-place conversion is enabled, because stating the obvious, KVM needs to ensure that all mappings to the folio(s) are dropped. Opportunistically rename the helper to capture that it returns a filter for all gfns in anticipation of zapping only the previous mapping types on conversion. I.e. when doing in-place conversion to PRIVATE, only SHARED mappings need to be zapped (ignoring that KVM would ideally not invalidate ranges whose attributes aren't changing in the first place). Note, precisely zapping only the possible mapping types when in-place conversion is disabled is important for functional correctness, not just for performance. Specifically, if KVM zaps both when SHARED vs. PRIVATE is tracked per-VM, then a PUNCH_HOLE operation on a PRIVATE guest_memfd will incorrectly zap SHARED mappings that have nothing to do with that gmem instance (because they're mapped via a VMA, not a gmem fd). And vice versa, a PUNCH_HOLE on a SHARED gmem (if userspace is using an INIT_SHARED gmem for the shared branch of a memslot) could invalidate the PRIVATE mappings of a different gmem instance. The latter case in particular would be a functional bug, as spuriously zapping PRIVATE SPTEs is fatal to TDX, as doing so destroys the contents of the memory. Signed-off-by: Sean Christopherson Signed-off-by: Ackerley Tng --- virt/kvm/guest_memfd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 5399ae4aae0e7..d4a9877b29ab0 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -139,8 +139,11 @@ static struct folio *kvm_gmem_get_folio(struct inode *inode, pgoff_t index) return folio; } -static enum kvm_gfn_range_filter kvm_gmem_get_invalidate_filter(struct inode *inode) +static enum kvm_gfn_range_filter kvm_gmem_get_all_gfns_filter(struct inode *inode) { + if (gmem_in_place_conversion) + return KVM_FILTER_SHARED | KVM_FILTER_PRIVATE; + if (GMEM_I(inode)->flags & GUEST_MEMFD_FLAG_INIT_SHARED) return KVM_FILTER_SHARED; @@ -191,11 +194,9 @@ static void __kvm_gmem_invalidate_start(struct gmem_file *f, pgoff_t start, static void kvm_gmem_invalidate_start(struct inode *inode, pgoff_t start, pgoff_t end) { - enum kvm_gfn_range_filter attr_filter; + enum kvm_gfn_range_filter attr_filter = kvm_gmem_get_all_gfns_filter(inode); struct gmem_file *f; - attr_filter = kvm_gmem_get_invalidate_filter(inode); - kvm_gmem_for_each_file(f, inode) __kvm_gmem_invalidate_start(f, start, end, attr_filter); } @@ -347,7 +348,7 @@ static int kvm_gmem_release(struct inode *inode, struct file *file) * memory, as its lifetime is associated with the inode, not the file. */ __kvm_gmem_invalidate_start(f, 0, -1ul, - kvm_gmem_get_invalidate_filter(inode)); + kvm_gmem_get_all_gfns_filter(inode)); __kvm_gmem_invalidate_end(f, 0, -1ul); list_del(&f->entry); -- 2.55.0.887.g758fc8c411-goog