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 D7BE8CCD19A for ; Fri, 17 Oct 2025 00:34:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To: From:Subject:Message-ID:References:Mime-Version:In-Reply-To:Date: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6nFGgJBVWEpkJy+c6A8c/BAOcJuYsJfcEhqI0sTwd+k=; b=KjyIRfFEN99GUY6JJ+/KKWUdSS NjQl4mbCVnedEXmOrsOGwBZD69dcAUlCjDc9tWQ1+jHHknI5pMVp4NPsOrZC4T1lIiVu4IDW10BFj dpLNk/fsrcYvhkkVJSFUZiCktGSCmoHO78ned/YxDVjy9mc/O5GbjDO+rQEm0tRhUgQooV5nIF8FM da/9YK4yVnEERvAMkxjn9rk1ThwjYRvZmdysGXV21gzgy7uwZNdbZaDQIdY3NCI+JpnrShT/k8s4T sSfgQ69b10Ymp7GAwrVSqxpuYFk87K9cLZWE4ALF6Gk6KDCo7/ZXzBHq7BY997HufU5zinN0eZwxF 2uO/hc2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1v9YQO-00000006Eje-1QR0; Fri, 17 Oct 2025 00:34:28 +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 1v9YPN-00000006DG4-0kDX for linux-arm-kernel@lists.infradead.org; Fri, 17 Oct 2025 00:33:27 +0000 Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-3307af9b55eso1200443a91.2 for ; Thu, 16 Oct 2025 17:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1760661202; x=1761266002; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=6nFGgJBVWEpkJy+c6A8c/BAOcJuYsJfcEhqI0sTwd+k=; b=R1K0rcsp0+vqrW5OnxEfK3p1Pi71YCzgewcLVtawlX0QdRYDAVKNTaQkdIhVRUMaKe TKCGsfUkpcEPfQZtZN7X82kC4DKpl3j26AmjSy4EV1Xo6QMnYYAtvA9/77YXBNYZsG5B kS3aqvTsbEDXZrmGW8zRzFXz0rNTXp64CtNHSbcoySFTbipEsCaGJbBcfzyxCpLBAk4I YDn2pc2kkW30Jr41K2YemlmCMmkIVzmQNJackd1ZcDm7+P1Vxo5yGbsPvVh2erK+GhId JqOTAuBzqcWsJC9xlfZuSlSkYVAuiTaSfG/MmQfEDs5w5+Eyw2fzXh10G/awWuM69PKQ SQiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760661202; x=1761266002; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6nFGgJBVWEpkJy+c6A8c/BAOcJuYsJfcEhqI0sTwd+k=; b=uZpJvkZNdbytOueVLLgtTxO2jJhuSEy5U2RgSlS1tgg5uUyZ3nVb2hdoeOJIyLUhIy UFGog8k7lQd8RNbCUx24yei4gIGez0H62vhPLvh3QozhN/yBWO6gqN+tuoiYUed3l9F4 mzm8+0aDAJ1+AAVDFNRbXQA3odZTkAsv+l/cfwfjZiYgpZFSQH0Rzzw2u4dA/H0qIIKQ oqNPg873pc05U6qARvdE22GhNMMbUUKXAJOaSV/dfZONQcgl6Oo1aAodVtGyqoAg7ZOA khCCZxwzWbuXCKrL5/uBm4qjhN5LderEoFS8J5hIgBXeH7Yq+l9tIfi9zCQ3JGOlYMue OaUQ== X-Gm-Message-State: AOJu0YwYS2EtPs4WsF1qnowDmBdeGwq4UgAPizCOMc2ujYTBHA6qETds XSZdplmFOuZAqu+MVsKZVcwzxG2WSTaSeQrgHSN27c1TgLQgvJrZTnYc9j2tgpGzurWYRNuaaFx +dsn8PQ== X-Google-Smtp-Source: AGHT+IGwUk2DKc/Clop/mYKkbeytMt0iZD/Bzj0bONucI419CZOE9/NPfh2luTSi9dr6fi1GHUAnQKjomOI= X-Received: from pjnu19.prod.google.com ([2002:a17:90a:8913:b0:329:ec3d:72ad]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4fc6:b0:330:6d5e:f17e with SMTP id 98e67ed59e1d1-33bcf8faaeamr1865014a91.24.1760661201850; Thu, 16 Oct 2025 17:33:21 -0700 (PDT) Date: Thu, 16 Oct 2025 17:32:37 -0700 In-Reply-To: <20251017003244.186495-1-seanjc@google.com> Mime-Version: 1.0 References: <20251017003244.186495-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.858.gf9c4a03a3a-goog Message-ID: <20251017003244.186495-20-seanjc@google.com> Subject: [PATCH v3 19/25] KVM: TDX: Assert that mmu_lock is held for write when removing S-EPT entries From: Sean Christopherson To: 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 , Sean Christopherson , Paolo Bonzini , "Kirill A. Shutemov" Cc: 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 , Yan Zhao , Vishal Annapurve , Rick Edgecombe , Ackerley Tng , Binbin Wu Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251016_173325_517276_1781A8B6 X-CRM114-Status: GOOD ( 13.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Sean Christopherson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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); - err = tdh_mem_track(&kvm_tdx->td); if (unlikely(tdx_operand_busy(err))) { /* After no vCPUs enter, the second retry is expected to succeed */ @@ -1758,6 +1756,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 -- 2.51.0.858.gf9c4a03a3a-goog