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 01816299AB3 for ; Fri, 17 Oct 2025 00:33:16 +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=1760661198; cv=none; b=KeclLMK6GSkK1d+thQfSz7nklslaT7YCRpKP16FfIUqwfHmofh/g66ani0oGRx4PfT1hrKwhrEU/iA1SyGSrEX5nYWXSE5khRpsb0xLV/eLmEGaYPRCnlyYtfPZ+1V9M8O6Yz+5Sy+3xGuA5qdbxzMv5lxdqVejQwOnI32Tc0Q0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760661198; c=relaxed/simple; bh=NWFHLZ0jbzvVfPfe8vtwcPHvovnjfevJyNbSF69oZ6Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UljVEXAlQ+fXpffNXqK8b1/5IoJ3c8imNd7xfeWzeWVnZ9V7fNUagQQJzEliuT7tsuprYHUPJcqv8+Q8CrHZ2fNnku1BelFOyMcnY07pwkdfpF3epJk+/9T4w695Ae8ywupVRTmZrtEQeoMRVZj78TJyE06lFNxNCxiKshbJ2xY= 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=yI3SKA7Z; 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="yI3SKA7Z" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-33baef12edaso1233409a91.0 for ; Thu, 16 Oct 2025 17:33:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1760661196; x=1761265996; 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=WBWRMN6X3w3vTrUF8QjNUM8q/tVPNzKCX5eXLQ+Uu38=; b=yI3SKA7ZvSa9mXc8NcCU/oVf8S+VApiTTX3F70Q3JM8b8whuE2v8PPl9MSjK0qvgkx vCDHCdk/ju/pC8hZCiYmTm2OLxWX+FdeL2ftm672WuZ5eyboRJdzKZkTZB+mq0WpGjVJ 1YpuYzwDXDqyohqdu/+RsIEyU9zSVRZJ/eNN5OIJ7HBbG/QrxsUZQtMfolwBlRrqewk5 +N00exqtzNY4TzgujEFcdH2JVgqalv3x4+Dt5Nzqwxhq2bVZZc4tdKttsBRPOLQ27zED SZN+EuzXA6wGyaJncK1ZdwVbiV2/hMdAkCjfxMBri6EPlzMEob5J25FafdFn7wJV5uUp xFBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760661196; x=1761265996; 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=WBWRMN6X3w3vTrUF8QjNUM8q/tVPNzKCX5eXLQ+Uu38=; b=FTOFtgedFwFzu9mfVYykxWUZnl4fVKL4CCtMStH5oC+5jR8h+zzvjlVamT9rJVrbR+ vx3yewzVgEKgBGPIBxCYsmuq0bmDkn3/apDyTk/ECeAFX918vf2iTe25Dru7soVGjmaC uWGrp2/SZmM6fpAL6rN6bKNYgSAGzr+tozEbCthgitMkqsEvfayOMeyR5Pdf8SGVU7C8 lNf4AvXTs19gtMvZnlXFLgWoQ1uza8TL9xkOL+Ke/diRxHwIAIJrfiAkuTt8HykIjwPY FXUXA1IJfAx08F+fqfGBCsww1/2whnnHs3JUsQh6zH1jOb6iojwUmrp1iLC2BHeLUMm2 OQWA== X-Forwarded-Encrypted: i=1; AJvYcCV2QFmHQjKkjF01TZdY5keIpTqj0UGGSSKjC3mE/N7wKZVvFI5wgggxMGYEREwzk8RKH1k7/SNrXDB+@vger.kernel.org X-Gm-Message-State: AOJu0YxPZm0bimTfNS2fRjXX/GuwqSJPhPUXKoqbnkOYqjNZ+nGnyOMz Wk3nOdZ9/dZnBpKeHWjUfAwoljfaxjF7y5BSzDoGS+Qfew2k09CRHkWYBhc9dlquaUw5UAgI4h6 I7iGFow== X-Google-Smtp-Source: AGHT+IH07aQeXAQe/gpM4oI6RLK2u3p52mKtLGzZsiMbsodE1gcNl3/aTBVcK7Ae83foyLaxFhiKihoxiME= X-Received: from pjbpt2.prod.google.com ([2002:a17:90b:3d02:b0:329:e84e:1c50]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:c2c3:b0:32e:4924:6902 with SMTP id 98e67ed59e1d1-33bcf85a829mr1565388a91.3.1760661196491; Thu, 16 Oct 2025 17:33:16 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 16 Oct 2025 17:32:34 -0700 In-Reply-To: <20251017003244.186495-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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-17-seanjc@google.com> Subject: [PATCH v3 16/25] KVM: TDX: Fold tdx_sept_zap_private_spte() into tdx_sept_remove_private_spte() 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" Do TDH_MEM_RANGE_BLOCK directly in tdx_sept_remove_private_spte() instead of using a one-off helper now that the nr_premapped tracking is gone. Opportunistically drop the WARN on hugepages, which was dead code (see the KVM_BUG_ON() in tdx_sept_remove_private_spte()). No functional change intended. Reviewed-by: Rick Edgecombe Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/tdx.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 76030461c8f7..d77b2de6db8a 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1679,33 +1679,6 @@ static int tdx_sept_link_private_spt(struct kvm *kvm, gfn_t gfn, return 0; } -static int tdx_sept_zap_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) & KVM_HPAGE_MASK(level); - u64 err, entry, level_state; - - /* For now large page isn't supported yet. */ - WARN_ON_ONCE(level != PG_LEVEL_4K); - - err = tdh_mem_range_block(&kvm_tdx->td, gpa, tdx_level, &entry, &level_state); - - if (unlikely(tdx_operand_busy(err))) { - /* After no vCPUs enter, the second retry is expected to succeed */ - tdx_no_vcpus_enter_start(kvm); - err = tdh_mem_range_block(&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_RANGE_BLOCK, err, entry, level_state); - return -EIO; - } - return 1; -} - /* * Ensure shared and private EPTs to be flushed on all vCPUs. * tdh_mem_track() is the only caller that increases TD epoch. An increase in @@ -1786,7 +1759,6 @@ static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn, struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm); gpa_t gpa = gfn_to_gpa(gfn); u64 err, entry, level_state; - int ret; /* * HKID is released after all private pages have been removed, and set @@ -1800,9 +1772,18 @@ static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn, if (KVM_BUG_ON(level != PG_LEVEL_4K, kvm)) return; - ret = tdx_sept_zap_private_spte(kvm, gfn, level, page); - if (ret <= 0) + err = tdh_mem_range_block(&kvm_tdx->td, gpa, tdx_level, &entry, &level_state); + if (unlikely(tdx_operand_busy(err))) { + /* After no vCPUs enter, the second retry is expected to succeed */ + tdx_no_vcpus_enter_start(kvm); + err = tdh_mem_range_block(&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_RANGE_BLOCK, err, entry, level_state); return; + } /* * TDX requires TLB tracking before dropping private page. Do -- 2.51.0.858.gf9c4a03a3a-goog