From nobody Tue Oct 7 19:56:06 2025 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 E341B21D3CA for ; Mon, 7 Jul 2025 22:48:29 +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=1751928511; cv=none; b=MkmbDSHccFkee/XC1sy4XJc748y+kgt5D6+j9a47Zo094txkju1HyjpVKij59yVQOCQMjWtUn7dOSVLl1hEmoP0zqe1YxVjvlBw4C2Atn811x8l3V2LguJiFeMqjUCsRHbFZWqO0iDYNhJ7qDr78n2Bo/ImAzz0hcYachXuyqtw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751928511; c=relaxed/simple; bh=LzKYRQCVuaJMqlGvxUBg23DAUAcSx2WIUPKtC6dbxMU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jBITWq/6rXaZoczM/1kPC5yQZiIKFbZASAs50DLi7IMGcuI1g8dX+phjW8Vm2SYGvKvDafTbFtNqCU7TakcCaKpxYKqo8scascVg6d1gKkzPqr68KlwzDnXELHt7JZmfNhxguIJOUGuNu8GMzOFo5XFdbRX2HsIrt2cZwzWjuMA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=GWcareNK; 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--jthoughton.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GWcareNK" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b3184712fd8so2910013a12.3 for ; Mon, 07 Jul 2025 15:48:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751928509; x=1752533309; 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=kyLCHmkUQILbp25o/Y3USfag+DNv6QnpeB4rV3o77kE=; b=GWcareNKYUGFL2h2/u30T0QJR38Vwkia93mIHnRqf0+Tc6VUPFHzqrnMDuOvv0sftE 4M2QuUMbclhoc6VnXcb7BqWh9/oIp127n16HgDVZ4fOIPzxKrYUonYLrKft36SoGgDPI zsjxU4xKkPoyf579apH1FdNvft5sJadRKjwYEhW3HNoqssmApSdlu9eZxEuWot5hJzdu 9YfOe352l3/8oX60KuVuRprZR99aXc6ecI4bhlS/CG7UKzFz6A6mmcjKRKr3V7HK/ylt yr9ZEZOMvyBtaOagmH5xSBalYQW0bgJ0Mj1oDW05jqWyFRNQbi6FXpNRaoN05mhQtHv4 iCBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751928509; x=1752533309; 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=kyLCHmkUQILbp25o/Y3USfag+DNv6QnpeB4rV3o77kE=; b=N3QpavtprMQUG5GBOS0FqKgWTzOVF+Eq4Oqe7yy75oIC1KRIADg6e3dnc8zTgFvTz2 9t81nYz9ms3EHfqEBtwvKCG44475KvBuccSVaXCYFOcAlI8exrDuZqbbrY7+kVlehUB0 4c+dfWqHpsYUBJR0spS2Pc5/WlhjCdsG5MQFFHZTgSyZTQNJr6mGTprfIKhr5P7OGg64 p0Bw45j0/9NLqemUaGClRYXXcrVOq5C1IEzcf0meBXLR/tcWasPpaKLd8gUNvLr5KhDt dpXn1LZvxQjZY6J02VYOSdbzmt3E+PTBPB08aIa4oYBHj2iHUc8FU61HZAnll+V2yStL wgwQ== X-Forwarded-Encrypted: i=1; AJvYcCWpbvF5JsD5ROf3sIFES47nVn8Vs5tDZ+8u3TofHlmYVAPxWckBPXcQrBlUvqDcCNqSVqXJXiU3LbU/YV4=@vger.kernel.org X-Gm-Message-State: AOJu0YxQscyCkoV2gcdbNc1SCMvijexjUyKuA1kXoaI46Hb5tiXf7Yj+ nL9DpJRO4UPnV5c1IRln0A4hl0iZ7T/2pRHYxcmT2l2YDrf7kGw60db/vcLnhTjOl6mSPYYKIUX VjMv8nqPBZG0v7yt/YXZoDw== X-Google-Smtp-Source: AGHT+IEES6dWaYObQEJRBDnpbfu3sljQUDi7DMpVdgtUHxweHCDJwqF3Bnh9vM7cmXgUWD6fPN0ZK/bTTYK4yTL5 X-Received: from pjbnd10.prod.google.com ([2002:a17:90b:4cca:b0:313:2213:1f54]) (user=jthoughton job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4c0a:b0:315:c77b:37d6 with SMTP id 98e67ed59e1d1-31aac4dfa9emr17263064a91.23.1751928509156; Mon, 07 Jul 2025 15:48:29 -0700 (PDT) Date: Mon, 7 Jul 2025 22:47:15 +0000 In-Reply-To: <20250707224720.4016504-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250707224720.4016504-1-jthoughton@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250707224720.4016504-3-jthoughton@google.com> Subject: [PATCH v5 2/7] KVM: x86/mmu: Rename kvm_tdp_mmu_zap_sp() to better indicate its purpose From: James Houghton To: Paolo Bonzini , Sean Christopherson Cc: Vipin Sharma , David Matlack , James Houghton , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vipin Sharma kvm_tdp_mmu_zap_sp() is only used for NX huge page recovery, so rename it to kvm_tdp_mmu_zap_possible_nx_huge_page(). In a future commit, this function will be changed to include logic specific to NX huge page recovery. Signed-off-by: Vipin Sharma Signed-off-by: James Houghton --- arch/x86/kvm/mmu/mmu.c | 2 +- arch/x86/kvm/mmu/tdp_mmu.c | 3 ++- arch/x86/kvm/mmu/tdp_mmu.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index f44d7f3acc179..b074f7bb5cc58 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -7607,7 +7607,7 @@ static void kvm_recover_nx_huge_pages(struct kvm *kvm, if (slot && kvm_slot_dirty_track_enabled(slot)) unaccount_nx_huge_page(kvm, sp); else if (mmu_type =3D=3D KVM_TDP_MMU) - flush |=3D kvm_tdp_mmu_zap_sp(kvm, sp); + flush |=3D kvm_tdp_mmu_zap_possible_nx_huge_page(kvm, sp); else kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list); WARN_ON_ONCE(sp->nx_huge_page_disallowed); diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 48b070f9f4e13..19907eb04a9c4 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -925,7 +925,8 @@ static void tdp_mmu_zap_root(struct kvm *kvm, struct kv= m_mmu_page *root, rcu_read_unlock(); } =20 -bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp) +bool kvm_tdp_mmu_zap_possible_nx_huge_page(struct kvm *kvm, + struct kvm_mmu_page *sp) { u64 old_spte; =20 diff --git a/arch/x86/kvm/mmu/tdp_mmu.h b/arch/x86/kvm/mmu/tdp_mmu.h index 52acf99d40a00..bd62977c9199e 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.h +++ b/arch/x86/kvm/mmu/tdp_mmu.h @@ -64,7 +64,8 @@ static inline struct kvm_mmu_page *tdp_mmu_get_root(struc= t kvm_vcpu *vcpu, } =20 bool kvm_tdp_mmu_zap_leafs(struct kvm *kvm, gfn_t start, gfn_t end, bool f= lush); -bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp); +bool kvm_tdp_mmu_zap_possible_nx_huge_page(struct kvm *kvm, + struct kvm_mmu_page *sp); void kvm_tdp_mmu_zap_all(struct kvm *kvm); void kvm_tdp_mmu_invalidate_roots(struct kvm *kvm, enum kvm_tdp_mmu_root_types root_types); --=20 2.50.0.727.gbf7dc18ff4-goog