From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 AB3DD1D63EF for ; Fri, 29 Aug 2025 00:06:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756425996; cv=none; b=tPdASvpL3FWLd7h0TPSL9zZ2NeUGo9r0+TSBBWly6RMV/29Xnn8I6REAMDrX+QOKKvPoQ1gVxDEYcctCrXauB4Zj29Oqba3nCbJdk6U7IjUgYN4DKdTI8026ZnMe98aEP72OvhGbrnwS4j0kDWYvJEjZf96e1gGNAdkKzLgGVKQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756425996; c=relaxed/simple; bh=r/3zHVEQRVjjS59stLqVm327G9mTH4dmq7IdLAwoFjA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aFDSv7vnfPvcZwEgawPSoX1sZtlVEvJ+BcJVXjgMq01xiUqYqQlcNE6mKVYdFEEWLWNrisGjoUq1HK3gFcBPtfq/mkF/INM7viL8R8VFxBw7KilxS9ljWwKBT7EEX92oZTWjRK5KVgOQMqLRlUlUAq70IHZO6mNrD4vpQafFZ4E= 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=rfJcURXE; arc=none smtp.client-ip=209.85.215.202 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="rfJcURXE" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b47174bdce2so1193972a12.2 for ; Thu, 28 Aug 2025 17:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756425994; x=1757030794; darn=vger.kernel.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=zLX9mH2pJ6CieCfe/KZk+xGWiI2ikAnsCO1rb0udaH8=; b=rfJcURXEEL7zRWgs4vsrAWmUFw721T3oB7HrjzCmFXDOl1Bwod4vXNvsoPiFnvmu5y XF6hyzhOlAte71+iSwcjdLbglpGyrb5dmrwPZpvLJavO0oGJd1pNutM44SOUVKlWjG8v Usqt3pa2Hpq6MNaRuiCIV4nLHw26bGJfa2uhs4zXJXD2q11rSO9HfyogtHbcz65FlRyq 74tJLRny0J5hIG1mh2wpdU1m22LU4tLL+nwbX6gR80/X9xZa9mxl9EKZJxii8qcE0kP1 5Hwk5W/I89v9bXJVBkarLzk+EAV/iwkRGBb9nc/eKaAJaWq4GWwV/Ybgf/ztY0zQf2ZF 8JQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756425994; x=1757030794; 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=zLX9mH2pJ6CieCfe/KZk+xGWiI2ikAnsCO1rb0udaH8=; b=tzL7CxaNk3TIcuArdzoxkB48BRrGIT0IymesTlUuXIKsb3mK/yqxTuDFxySR/ei37u YhA8me5Gi6C+6swE/vjUyAqS5INotcZzGHQaMPkdUPK7Z810gaeemKvUXF50sBXgevTE WpvuCHvpiZMwtac3wVgEMo/X1MHnUFBxmu/xgJT1ZXwEifnc1nG9F6F6VrdqdNBid7Vr chWatzVKhl9IaBIT0O6BN1XMBkG/ervU9De702yhq107J9YmZCUlc+ZG3Z7yAKDYstnP 8Be4/C8+A37MauL8CItwp00iJnxWlUa/lIv4Q69l4PuJoy9HUXiJra2VdT6Yl+4ocWNA ilzw== X-Gm-Message-State: AOJu0YyqWYhsofvllRwRUwP+Y0iiswfmpwazn0P712r9uIZu2P7MPHci p6redcoMGqjch1Rfbk5IwCzLvo+qB1mTwOfX6WgABH0AXQhicPoLBtwsrDRHIp7iBlpapCn8Fwy TLUTdbg== X-Google-Smtp-Source: AGHT+IFYNfjkckW49CdVPG0lAwBRb8biFN/AaTS3cgVRThu+320Td61aGs0d05hkOzNiLg/kzzdXrDa63Mc= X-Received: from plbmg12.prod.google.com ([2002:a17:903:348c:b0:248:d665:58c7]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2286:b0:248:75da:f791 with SMTP id d9443c01a7336-24875dafd03mr143314385ad.47.1756425993908; Thu, 28 Aug 2025 17:06:33 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 28 Aug 2025 17:06:07 -0700 In-Reply-To: <20250829000618.351013-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250829000618.351013-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.318.gd7df087d1a-goog Message-ID: <20250829000618.351013-8-seanjc@google.com> Subject: [RFC PATCH v2 07/18] KVM: TDX: Fold tdx_sept_drop_private_spte() into tdx_sept_remove_private_spte() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Ira Weiny , Kai Huang , Michael Roth , Yan Zhao , Vishal Annapurve , Rick Edgecombe , Ackerley Tng Content-Type: text/plain; charset="UTF-8" Fold tdx_sept_drop_private_spte() into tdx_sept_remove_private_spte() to avoid having to differnatiate between "zap", "drop", and "remove", and to eliminate dead code due to redundant checks, e.g. on an HKID being assigned. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/tdx.c | 90 +++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 50 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 50a9d81dad53..8cb6a2627eb2 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1651,55 +1651,6 @@ static int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn, return tdx_mem_page_record_premap_cnt(kvm, gfn, level, pfn); } -static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn, - enum pg_level level, struct page *page) -{ - int tdx_level = pg_level_to_tdx_sept_level(level); - struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm); - gpa_t gpa = gfn_to_gpa(gfn); - u64 err, entry, level_state; - - /* TODO: handle large pages. */ - if (KVM_BUG_ON(level != PG_LEVEL_4K, kvm)) - return -EIO; - - if (KVM_BUG_ON(!is_hkid_assigned(kvm_tdx), kvm)) - return -EIO; - - /* - * When zapping private page, write lock is held. So no race condition - * with other vcpu sept operation. - * Race with TDH.VP.ENTER due to (0-step mitigation) and Guest TDCALLs. - */ - err = tdh_mem_page_remove(&kvm_tdx->td, gpa, tdx_level, &entry, - &level_state); - - if (unlikely(tdx_operand_busy(err))) { - /* - * The second retry is expected to succeed after kicking off all - * other vCPUs and prevent them from invoking TDH.VP.ENTER. - */ - tdx_no_vcpus_enter_start(kvm); - err = tdh_mem_page_remove(&kvm_tdx->td, gpa, tdx_level, &entry, - &level_state); - tdx_no_vcpus_enter_stop(kvm); - } - - if (KVM_BUG_ON(err, kvm)) { - pr_tdx_error_2(TDH_MEM_PAGE_REMOVE, err, entry, level_state); - return -EIO; - } - - err = tdh_phymem_page_wbinvd_hkid((u16)kvm_tdx->hkid, page); - - if (KVM_BUG_ON(err, kvm)) { - pr_tdx_error(TDH_PHYMEM_PAGE_WBINVD, err); - return -EIO; - } - tdx_clear_page(page); - return 0; -} - static int tdx_sept_link_private_spt(struct kvm *kvm, gfn_t gfn, enum pg_level level, void *private_spt) { @@ -1861,7 +1812,11 @@ static int tdx_sept_free_private_spt(struct kvm *kvm, gfn_t gfn, static int tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn, enum pg_level level, kvm_pfn_t pfn) { + int tdx_level = pg_level_to_tdx_sept_level(level); + struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm); struct page *page = pfn_to_page(pfn); + gpa_t gpa = gfn_to_gpa(gfn); + u64 err, entry, level_state; int ret; /* @@ -1872,6 +1827,10 @@ static int tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn, if (KVM_BUG_ON(!is_hkid_assigned(to_kvm_tdx(kvm)), kvm)) return -EIO; + /* TODO: handle large pages. */ + if (KVM_BUG_ON(level != PG_LEVEL_4K, kvm)) + return -EIO; + ret = tdx_sept_zap_private_spte(kvm, gfn, level, page); if (ret <= 0) return ret; @@ -1882,7 +1841,38 @@ static int tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn, */ tdx_track(kvm); - return tdx_sept_drop_private_spte(kvm, gfn, level, page); + /* + * When zapping private page, write lock is held. So no race condition + * with other vcpu sept operation. + * Race with TDH.VP.ENTER due to (0-step mitigation) and Guest TDCALLs. + */ + err = tdh_mem_page_remove(&kvm_tdx->td, gpa, tdx_level, &entry, + &level_state); + + if (unlikely(tdx_operand_busy(err))) { + /* + * The second retry is expected to succeed after kicking off all + * other vCPUs and prevent them from invoking TDH.VP.ENTER. + */ + tdx_no_vcpus_enter_start(kvm); + err = tdh_mem_page_remove(&kvm_tdx->td, gpa, tdx_level, &entry, + &level_state); + tdx_no_vcpus_enter_stop(kvm); + } + + if (KVM_BUG_ON(err, kvm)) { + pr_tdx_error_2(TDH_MEM_PAGE_REMOVE, err, entry, level_state); + return -EIO; + } + + err = tdh_phymem_page_wbinvd_hkid((u16)kvm_tdx->hkid, page); + if (KVM_BUG_ON(err, kvm)) { + pr_tdx_error(TDH_PHYMEM_PAGE_WBINVD, err); + return -EIO; + } + + tdx_clear_page(page); + return 0; } void tdx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode, -- 2.51.0.318.gd7df087d1a-goog