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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5E2ACCD1BE for ; Thu, 23 Oct 2025 15:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=9NfMnAmjROSFiYieI6wm7PLWsLeSRxHP0C+GYVUkYL0=; b=zRDVStUaJe/BZdKoV72g1H0eC0 LdOQEw495W53XOdryCOkBzpK0KpjvqreiRLSw2wVUfoNWhJ9zdpZ1q2P02lEkgmkhd30rHZ+afpjE 04EuHvYxuuhRUmqbRfK9IJPais1sAu12z5kQlTBBJfmuc04rTrmHkEkhmJYUSqRB0CzAjHOZXTRPl MZ5cp8GCGtuamVjNsTa4vHLegBD7IXOdSu5qyGoB16zlv6bHxXVl5M5NaYw6YqU4g1MyzRLt7TlQa qgbZrXQEMkdpV+OPnPesPwht37cLnIRgyXqc4uARzvmHo7yOnhr5KN21/uMUUYZZ3g84eJm9is0zr 6Rag+3TQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vBx11-00000006ivv-1TBa; Thu, 23 Oct 2025 15:14:11 +0000 Received: from mail-pj1-x1049.google.com ([2607:f8b0:4864:20::1049]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vBx0y-00000006iuX-0FHv for kvm-riscv@lists.infradead.org; Thu, 23 Oct 2025 15:14:10 +0000 Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-33dadf7c5c0so1016362a91.0 for ; Thu, 23 Oct 2025 08:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1761232446; x=1761837246; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eGj/4U8Cjm7Jzuo0N797IrKS+KWnd9Al6qyj+0gj5DU=; b=etxsONN1RpZiTrf+VxD43bLWM1ygNaDp24NTSL93O/L1+GAu7pRWehjF24KOm9w4/I xmgcsgBXM/rhWGZ+jd2Rirxk7q+HFVoA40OdhhkKIKBWw5tiXWG0yj195eBbJpBBgbHL 9L2DEww3IC36EwFIfUmTIE0Ow2RRCA930eskUNVO3P6w8pHA7k6UL5LKZC5ZmSoFCyr1 kA6gEyZGuCpez/j+Zu9trcdkKTIM21BUeesDiin1/sBwn6nMOZjQDpAkuwzlWtspyaQD XkfDGq6Ik3bNYmgnYJRP9ayknyyKePa3NoaTSmH43AokVoXmzP91INyffOFfC0pj81E1 CyTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761232446; x=1761837246; h=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; bh=eGj/4U8Cjm7Jzuo0N797IrKS+KWnd9Al6qyj+0gj5DU=; b=e0ts/zKm+FJdu5BPx1c9nsJ+VsZzf6DFLTNHqEvurjjKMua8QtNpEp7R4/UbXr368A 0zr6Qyv/eAD7zX4OfHoUWXeqPqxSDxStZljmgM1BPQiLaMLzWpv9+aj2eTkykrs3fk+d FnQUhKwtK0ybNyy523lHbF4CaoL+UtDumR27FMIPgSH2w6b5b+CwI6l1yCrnzZX46gHh 0XsQYcMQFl4958hs6TJEctKJ5Tphr1NSVryOIRDCU8ffFCnwjfI9mwZXEkd7a3yCxidH JfrRwjlFFkTHvSs7GPJZMz+/W4Tc339XasT4e3BFG/zIhagsyQQXAIkAGH0OwFuYk4u7 h6XQ== X-Forwarded-Encrypted: i=1; AJvYcCXh7vmHvHiLX32UvTAEtZYEQvG+jhF+2eS01PsXBvorraGDDNlViO1srm8NsCHOoJRJr5roJYDGlOk=@lists.infradead.org X-Gm-Message-State: AOJu0Yxv7PwN8GIoPUXq+kyM78SKYMgDaz+q0ip0zF/yr68RQJx7nuY4 AafZtgFIXRvwnjAza7T0nteipq0kZ8eEaLYICMkcToh4dYGYn2N1o8iFHlmHh5T+opdCdV2broC oYIQeJA== X-Google-Smtp-Source: AGHT+IGyk+8DKCi3tYCJowX0kgLUyc4PpyLVM16G5qza1KYeH4GEBaOP8pzea9wQFWKumE2t1taaAoPvn3M= X-Received: from pjbrm7.prod.google.com ([2002:a17:90b:3ec7:b0:330:6c04:207]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:570e:b0:32e:7ff6:6dbd with SMTP id 98e67ed59e1d1-33e21dedc9fmr9424992a91.0.1761232446100; Thu, 23 Oct 2025 08:14:06 -0700 (PDT) Date: Thu, 23 Oct 2025 08:14:04 -0700 In-Reply-To: Mime-Version: 1.0 References: <20251017003244.186495-1-seanjc@google.com> <20251017003244.186495-20-seanjc@google.com> Message-ID: Subject: Re: [PATCH v3 19/25] KVM: TDX: Assert that mmu_lock is held for write when removing S-EPT entries From: Sean Christopherson To: Yan Zhao Cc: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Paolo Bonzini , "Kirill A. Shutemov" , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Ira Weiny , Kai Huang , Michael Roth , Vishal Annapurve , Rick Edgecombe , Ackerley Tng , Binbin Wu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251023_081408_105648_1C8EB494 X-CRM114-Status: GOOD ( 24.28 ) X-BeenThere: kvm-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kvm-riscv" Errors-To: kvm-riscv-bounces+kvm-riscv=archiver.kernel.org@lists.infradead.org On Thu, Oct 23, 2025, Yan Zhao wrote: > On Thu, Oct 16, 2025 at 05:32:37PM -0700, Sean Christopherson wrote: > > Unconditionally assert that mmu_lock is held for write when removing S-EPT > > entries, not just when removing S-EPT entries triggers certain conditions, > > e.g. needs to do TDH_MEM_TRACK or kick vCPUs out of the guest. > > Conditionally asserting implies that it's safe to hold mmu_lock for read > > when those paths aren't hit, which is simply not true, as KVM doesn't > > support removing S-EPT entries under read-lock. > > > > Only two paths lead to remove_external_spte(), and both paths asserts that > > mmu_lock is held for write (tdp_mmu_set_spte() via lockdep, and > > handle_removed_pt() via KVM_BUG_ON()). > > > > Deliberately leave lockdep assertions in the "no vCPUs" helpers to document > > that wait_for_sept_zap is guarded by holding mmu_lock for write. > > > > Signed-off-by: Sean Christopherson > > --- > > arch/x86/kvm/vmx/tdx.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c > > index e517ad3d5f4f..f6782b0ffa98 100644 > > --- a/arch/x86/kvm/vmx/tdx.c > > +++ b/arch/x86/kvm/vmx/tdx.c > > @@ -1711,8 +1711,6 @@ static void tdx_track(struct kvm *kvm) > > if (unlikely(kvm_tdx->state != TD_STATE_RUNNABLE)) > > return; > > > > - lockdep_assert_held_write(&kvm->mmu_lock); > Could we also deliberately leave lockdep assertion for tdx_track()? Can do. > This is because if we allow removing S-EPT entries while holding mmu_lock for > read in future, tdx_track() needs to be protected by a separate spinlock to > ensure serialization of tdh_mem_track() and vCPUs kick-off (kicking off vCPUs > must follow each tdh_mem_track() to unblock the next tdh_mem_track()). Does this look/sound right? From: Sean Christopherson Date: Thu, 28 Aug 2025 17:06:17 -0700 Subject: [PATCH] KVM: TDX: Assert that mmu_lock is held for write when removing S-EPT entries Unconditionally assert that mmu_lock is held for write when removing S-EPT entries, not just when removing S-EPT entries triggers certain conditions, e.g. needs to do TDH_MEM_TRACK or kick vCPUs out of the guest. Conditionally asserting implies that it's safe to hold mmu_lock for read when those paths aren't hit, which is simply not true, as KVM doesn't support removing S-EPT entries under read-lock. Only two paths lead to remove_external_spte(), and both paths asserts that mmu_lock is held for write (tdp_mmu_set_spte() via lockdep, and handle_removed_pt() via KVM_BUG_ON()). Deliberately leave lockdep assertions in the "no vCPUs" helpers to document that wait_for_sept_zap is guarded by holding mmu_lock for write, and keep the conditional assert in tdx_track() as well, but with a comment to help explain why holding mmu_lock for write matters (above and beyond why tdx_sept_remove_private_spte()'s requirements). Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/tdx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index dca9e2561270..899051c64faa 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1715,6 +1715,11 @@ static void tdx_track(struct kvm *kvm) if (unlikely(kvm_tdx->state != TD_STATE_RUNNABLE)) return; + /* + * The full sequence of TDH.MEM.TRACK and forcing vCPUs out of guest + * mode must be serialized, as TDH.MEM.TRACK will fail if the previous + * tracking epoch hasn't completed. + */ lockdep_assert_held_write(&kvm->mmu_lock); err = tdh_mem_track(&kvm_tdx->td); @@ -1762,6 +1767,8 @@ static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn, gpa_t gpa = gfn_to_gpa(gfn); u64 err, entry, level_state; + lockdep_assert_held_write(&kvm->mmu_lock); + /* * HKID is released after all private pages have been removed, and set * before any might be populated. Warn if zapping is attempted when base-commit: 69564844a116861ebea4396894005c8b4e48f870 -- -- kvm-riscv mailing list kvm-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kvm-riscv From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 E7158332EBD for ; Thu, 23 Oct 2025 15:14:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761232449; cv=none; b=U/G24UPYigt/1nB25hsEZRowckBa46F5FZ2/PvKYLVOVIAQ73TRyDEpl99j1QXsZHLzMOLcHuYQ27Lr3/HoFyJgiAgfE4h8AiftaHJM1RCNbBKKgHhs5gwe/hbuZju7ITqBIrWrjLZYlwCy/iNNTBZ+kzM9i2lZMgctnMGmsxr0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761232449; c=relaxed/simple; bh=uHRCY9cQRjtJ7szhlZgEWB+vNgN2UZvp04I8fLcJxas=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cum0wq4j9mjwdiijolPhH8zPNZraw1Z6A5dCQHVKcJ+GkXDkTdWV8mQvJWaLa2iW9GHd4L7sXwm/pvLCNu3zaSXkJ2oZS0FLnMTNzo+UQL/PCVLSz0op4QqwVkFtf86IPtz2PcDwMBIx2haHDEMh0ay/B2V3qubFK8Cms7YaDTE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=08Yc9jXp; arc=none smtp.client-ip=209.85.216.74 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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="08Yc9jXp" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-33ba9047881so1111322a91.1 for ; Thu, 23 Oct 2025 08:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1761232446; x=1761837246; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eGj/4U8Cjm7Jzuo0N797IrKS+KWnd9Al6qyj+0gj5DU=; b=08Yc9jXpCeupaaVxf/cVy0KseieZvS12CLVA/wtmXlwb4C6IQsSWgr8qOsnqcEOtRI S02ISPacnH91KiBtzr4mopy8Ng+827PR2X4NxfTzlvHeMv/LvXEPCToS/jUrCBNuMiVo b2EAQHpSDLmEErN9vIqFaQB/RmH+W7Tpv9xWtOAN+bXPoSoYeUYOAQVzsP6b8B4QOk2F WooynTNo+2MTInZCdn9gLeb4Ae6xkPx067DneYzRr5MLDfeyokx9RrDmop1HfeaRtQzU qmHZVNIwY4oIBbDLX9X66dWqowFi2uZv0Ae8VwR4Tf+5fwDOD/5WexlZrUzF08sqyH6h pm/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761232446; x=1761837246; h=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; bh=eGj/4U8Cjm7Jzuo0N797IrKS+KWnd9Al6qyj+0gj5DU=; b=cwIvkV72pjX8Nn6vkNYHuGfFqrDaqsZBYhBNpwFJHDdQSJ2whGTZDyAPjeWnv2+yYd DZ+6fzmyOaYKzf86I3zvTwzpQQwGKIrsiwpOgirvPOVscv8Wu/2SQdEOHUvoJXXlsn1h dh0yhZRp8d2+SX+9azMLTKfvStB8OxcJLKk4HWm294/xviXPqJqm/2nHF0VNBs7QLGx3 s9nWEVIgaCZ5qfyG0hFWCgQUpOPg1E27eOwVrWGLwIc3UQQEGE+Rn8bzWu/NwvwiJ/uY d7EngrM8sIC1eTX5k1O8Dt3c7U3PkqtmEyNQbjTcMM5SJDGpPthKmTUBJfK3YHmqrSGc /QPg== X-Forwarded-Encrypted: i=1; AJvYcCXMAKqbIBj9IX8aoLBHmhcCW7I2o2AKeH/2Rw0ELCrCRwJ48kaMkwT/DilYEbKEUNET49c=@vger.kernel.org X-Gm-Message-State: AOJu0YyvEtfVti3y77iUXOZ+1Oaj7lWZZqtGmE7bog47GidJ9keIuhAF C9OlKHwGkKWJpJQVnTTYahHYJp+zTxK5w6pBZ70O8iIrpFc6YTlXe22IL83DzeF8+SYvN0lvMJh 7noNBvA== X-Google-Smtp-Source: AGHT+IGyk+8DKCi3tYCJowX0kgLUyc4PpyLVM16G5qza1KYeH4GEBaOP8pzea9wQFWKumE2t1taaAoPvn3M= X-Received: from pjbrm7.prod.google.com ([2002:a17:90b:3ec7:b0:330:6c04:207]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:570e:b0:32e:7ff6:6dbd with SMTP id 98e67ed59e1d1-33e21dedc9fmr9424992a91.0.1761232446100; Thu, 23 Oct 2025 08:14:06 -0700 (PDT) Date: Thu, 23 Oct 2025 08:14:04 -0700 In-Reply-To: Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251017003244.186495-1-seanjc@google.com> <20251017003244.186495-20-seanjc@google.com> Message-ID: Subject: Re: [PATCH v3 19/25] KVM: TDX: Assert that mmu_lock is held for write when removing S-EPT entries From: Sean Christopherson To: Yan Zhao Cc: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Paolo Bonzini , "Kirill A. Shutemov" , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Ira Weiny , Kai Huang , Michael Roth , Vishal Annapurve , Rick Edgecombe , Ackerley Tng , Binbin Wu Content-Type: text/plain; charset="us-ascii" On Thu, Oct 23, 2025, Yan Zhao wrote: > On Thu, Oct 16, 2025 at 05:32:37PM -0700, Sean Christopherson wrote: > > Unconditionally assert that mmu_lock is held for write when removing S-EPT > > entries, not just when removing S-EPT entries triggers certain conditions, > > e.g. needs to do TDH_MEM_TRACK or kick vCPUs out of the guest. > > Conditionally asserting implies that it's safe to hold mmu_lock for read > > when those paths aren't hit, which is simply not true, as KVM doesn't > > support removing S-EPT entries under read-lock. > > > > Only two paths lead to remove_external_spte(), and both paths asserts that > > mmu_lock is held for write (tdp_mmu_set_spte() via lockdep, and > > handle_removed_pt() via KVM_BUG_ON()). > > > > Deliberately leave lockdep assertions in the "no vCPUs" helpers to document > > that wait_for_sept_zap is guarded by holding mmu_lock for write. > > > > Signed-off-by: Sean Christopherson > > --- > > arch/x86/kvm/vmx/tdx.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c > > index e517ad3d5f4f..f6782b0ffa98 100644 > > --- a/arch/x86/kvm/vmx/tdx.c > > +++ b/arch/x86/kvm/vmx/tdx.c > > @@ -1711,8 +1711,6 @@ static void tdx_track(struct kvm *kvm) > > if (unlikely(kvm_tdx->state != TD_STATE_RUNNABLE)) > > return; > > > > - lockdep_assert_held_write(&kvm->mmu_lock); > Could we also deliberately leave lockdep assertion for tdx_track()? Can do. > This is because if we allow removing S-EPT entries while holding mmu_lock for > read in future, tdx_track() needs to be protected by a separate spinlock to > ensure serialization of tdh_mem_track() and vCPUs kick-off (kicking off vCPUs > must follow each tdh_mem_track() to unblock the next tdh_mem_track()). Does this look/sound right? From: Sean Christopherson Date: Thu, 28 Aug 2025 17:06:17 -0700 Subject: [PATCH] KVM: TDX: Assert that mmu_lock is held for write when removing S-EPT entries Unconditionally assert that mmu_lock is held for write when removing S-EPT entries, not just when removing S-EPT entries triggers certain conditions, e.g. needs to do TDH_MEM_TRACK or kick vCPUs out of the guest. Conditionally asserting implies that it's safe to hold mmu_lock for read when those paths aren't hit, which is simply not true, as KVM doesn't support removing S-EPT entries under read-lock. Only two paths lead to remove_external_spte(), and both paths asserts that mmu_lock is held for write (tdp_mmu_set_spte() via lockdep, and handle_removed_pt() via KVM_BUG_ON()). Deliberately leave lockdep assertions in the "no vCPUs" helpers to document that wait_for_sept_zap is guarded by holding mmu_lock for write, and keep the conditional assert in tdx_track() as well, but with a comment to help explain why holding mmu_lock for write matters (above and beyond why tdx_sept_remove_private_spte()'s requirements). Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/tdx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index dca9e2561270..899051c64faa 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1715,6 +1715,11 @@ static void tdx_track(struct kvm *kvm) if (unlikely(kvm_tdx->state != TD_STATE_RUNNABLE)) return; + /* + * The full sequence of TDH.MEM.TRACK and forcing vCPUs out of guest + * mode must be serialized, as TDH.MEM.TRACK will fail if the previous + * tracking epoch hasn't completed. + */ lockdep_assert_held_write(&kvm->mmu_lock); err = tdh_mem_track(&kvm_tdx->td); @@ -1762,6 +1767,8 @@ static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn, gpa_t gpa = gfn_to_gpa(gfn); u64 err, entry, level_state; + lockdep_assert_held_write(&kvm->mmu_lock); + /* * HKID is released after all private pages have been removed, and set * before any might be populated. Warn if zapping is attempted when base-commit: 69564844a116861ebea4396894005c8b4e48f870 -- 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 75E0CCCD1BE for ; Thu, 23 Oct 2025 15:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=yJtCMgsETtQ6CBLWv/66AAafg9ITeAQWQfE+GGs9KZk=; b=E+7b9aTlxmbJB04AZGcTtRm1uf mqLOOO9EbA0GNMTmTZTGC595QBfYvkXOtpsy9htvXHG1WdudEBRnth40NqGAzfdHc8QDOHTJfFnmv SxmfhbxsDv2mIpoRoOAqv2osUnNtcbmvqcYo5d8EMkDy4GzvgJZtDSVMJy3aAyIR+QYXrwPUDRTB4 nwlgxz6wt+BRUCDPdd84j+vJEOIdSRPvgqpvmG5OUQuPnorGb4JXIoNLNE+LbZEeqph6Croi7gUOQ QJXyHFwtpmkI/K2pF9P94xWgHkrqDTYlfHaPj0DYVQhOxrKdUzfimpBgVicW+SD3VYnPLeoiGt/0r bM5JpdGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vBx11-00000006iw4-2cK1; Thu, 23 Oct 2025 15:14:11 +0000 Received: from mail-pj1-x104a.google.com ([2607:f8b0:4864:20::104a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vBx0y-00000006iuY-0wUu for linux-riscv@lists.infradead.org; Thu, 23 Oct 2025 15:14:10 +0000 Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-33dadf7c5c0so1016364a91.0 for ; Thu, 23 Oct 2025 08:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1761232446; x=1761837246; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eGj/4U8Cjm7Jzuo0N797IrKS+KWnd9Al6qyj+0gj5DU=; b=etxsONN1RpZiTrf+VxD43bLWM1ygNaDp24NTSL93O/L1+GAu7pRWehjF24KOm9w4/I xmgcsgBXM/rhWGZ+jd2Rirxk7q+HFVoA40OdhhkKIKBWw5tiXWG0yj195eBbJpBBgbHL 9L2DEww3IC36EwFIfUmTIE0Ow2RRCA930eskUNVO3P6w8pHA7k6UL5LKZC5ZmSoFCyr1 kA6gEyZGuCpez/j+Zu9trcdkKTIM21BUeesDiin1/sBwn6nMOZjQDpAkuwzlWtspyaQD XkfDGq6Ik3bNYmgnYJRP9ayknyyKePa3NoaTSmH43AokVoXmzP91INyffOFfC0pj81E1 CyTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761232446; x=1761837246; h=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; bh=eGj/4U8Cjm7Jzuo0N797IrKS+KWnd9Al6qyj+0gj5DU=; b=EcpBNVbj50SyVPDvPN3XTCkLYUSFw4Kjd6MYGT5EE0CQX4thZMJt1FRlxDNON4RtdC z8Cn63BGxG/32+Bc9aYPnWOio6OMsSjDNsGX+DaeR1lZXtw6BvDgHu+or+J4Ar+lzL0d r1KL1XK5lDKXT79Fr2jjh1cC2f493CKeZ8TjUxsaxkEb7VVD9XUlthrDOCl+FR9C5gR9 K9u9lrSTvLzd8Z0JZMEyn0h/LP+rjDPY4gK1Q1KrdQn1IZJctS0otVSsgC6jGnqvl8zA FgNo3wFPAfp1A03f2hmP/Uevz9WYNhMwba+EUmEELepF2nGAZ9i0woGsvEmUK+ac5GKK pM9A== X-Forwarded-Encrypted: i=1; AJvYcCV2UW0tsV12Cn7kOb7HFsPvvOfCsd5sXVYhvUWRoGAHkX1U33n89WPFOAfo0sqCpZey7+AhY1F8WHo+5Q==@lists.infradead.org X-Gm-Message-State: AOJu0Yyyq/bod0G+mAD4R2c/recq9Blqmtg0MsGTTDiXPkPuZjy5onS1 Zv8QVcyslnaXzFBqFEYM/habTpzdSBRtlG5i72/wnm9UE41IVzhZ3tcBt3XPOnWE+KgIcN/13WQ 5T7NOJw== X-Google-Smtp-Source: AGHT+IGyk+8DKCi3tYCJowX0kgLUyc4PpyLVM16G5qza1KYeH4GEBaOP8pzea9wQFWKumE2t1taaAoPvn3M= X-Received: from pjbrm7.prod.google.com ([2002:a17:90b:3ec7:b0:330:6c04:207]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:570e:b0:32e:7ff6:6dbd with SMTP id 98e67ed59e1d1-33e21dedc9fmr9424992a91.0.1761232446100; Thu, 23 Oct 2025 08:14:06 -0700 (PDT) Date: Thu, 23 Oct 2025 08:14:04 -0700 In-Reply-To: Mime-Version: 1.0 References: <20251017003244.186495-1-seanjc@google.com> <20251017003244.186495-20-seanjc@google.com> Message-ID: Subject: Re: [PATCH v3 19/25] KVM: TDX: Assert that mmu_lock is held for write when removing S-EPT entries From: Sean Christopherson To: Yan Zhao Cc: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Paolo Bonzini , "Kirill A. Shutemov" , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Ira Weiny , Kai Huang , Michael Roth , Vishal Annapurve , Rick Edgecombe , Ackerley Tng , Binbin Wu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251023_081408_268112_706AA883 X-CRM114-Status: GOOD ( 24.28 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Thu, Oct 23, 2025, Yan Zhao wrote: > On Thu, Oct 16, 2025 at 05:32:37PM -0700, Sean Christopherson wrote: > > Unconditionally assert that mmu_lock is held for write when removing S-EPT > > entries, not just when removing S-EPT entries triggers certain conditions, > > e.g. needs to do TDH_MEM_TRACK or kick vCPUs out of the guest. > > Conditionally asserting implies that it's safe to hold mmu_lock for read > > when those paths aren't hit, which is simply not true, as KVM doesn't > > support removing S-EPT entries under read-lock. > > > > Only two paths lead to remove_external_spte(), and both paths asserts that > > mmu_lock is held for write (tdp_mmu_set_spte() via lockdep, and > > handle_removed_pt() via KVM_BUG_ON()). > > > > Deliberately leave lockdep assertions in the "no vCPUs" helpers to document > > that wait_for_sept_zap is guarded by holding mmu_lock for write. > > > > Signed-off-by: Sean Christopherson > > --- > > arch/x86/kvm/vmx/tdx.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c > > index e517ad3d5f4f..f6782b0ffa98 100644 > > --- a/arch/x86/kvm/vmx/tdx.c > > +++ b/arch/x86/kvm/vmx/tdx.c > > @@ -1711,8 +1711,6 @@ static void tdx_track(struct kvm *kvm) > > if (unlikely(kvm_tdx->state != TD_STATE_RUNNABLE)) > > return; > > > > - lockdep_assert_held_write(&kvm->mmu_lock); > Could we also deliberately leave lockdep assertion for tdx_track()? Can do. > This is because if we allow removing S-EPT entries while holding mmu_lock for > read in future, tdx_track() needs to be protected by a separate spinlock to > ensure serialization of tdh_mem_track() and vCPUs kick-off (kicking off vCPUs > must follow each tdh_mem_track() to unblock the next tdh_mem_track()). Does this look/sound right? From: Sean Christopherson Date: Thu, 28 Aug 2025 17:06:17 -0700 Subject: [PATCH] KVM: TDX: Assert that mmu_lock is held for write when removing S-EPT entries Unconditionally assert that mmu_lock is held for write when removing S-EPT entries, not just when removing S-EPT entries triggers certain conditions, e.g. needs to do TDH_MEM_TRACK or kick vCPUs out of the guest. Conditionally asserting implies that it's safe to hold mmu_lock for read when those paths aren't hit, which is simply not true, as KVM doesn't support removing S-EPT entries under read-lock. Only two paths lead to remove_external_spte(), and both paths asserts that mmu_lock is held for write (tdp_mmu_set_spte() via lockdep, and handle_removed_pt() via KVM_BUG_ON()). Deliberately leave lockdep assertions in the "no vCPUs" helpers to document that wait_for_sept_zap is guarded by holding mmu_lock for write, and keep the conditional assert in tdx_track() as well, but with a comment to help explain why holding mmu_lock for write matters (above and beyond why tdx_sept_remove_private_spte()'s requirements). Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/tdx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index dca9e2561270..899051c64faa 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1715,6 +1715,11 @@ static void tdx_track(struct kvm *kvm) if (unlikely(kvm_tdx->state != TD_STATE_RUNNABLE)) return; + /* + * The full sequence of TDH.MEM.TRACK and forcing vCPUs out of guest + * mode must be serialized, as TDH.MEM.TRACK will fail if the previous + * tracking epoch hasn't completed. + */ lockdep_assert_held_write(&kvm->mmu_lock); err = tdh_mem_track(&kvm_tdx->td); @@ -1762,6 +1767,8 @@ static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn, gpa_t gpa = gfn_to_gpa(gfn); u64 err, entry, level_state; + lockdep_assert_held_write(&kvm->mmu_lock); + /* * HKID is released after all private pages have been removed, and set * before any might be populated. Warn if zapping is attempted when base-commit: 69564844a116861ebea4396894005c8b4e48f870 -- _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv