All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Deacon <will@kernel.org>
To: kvmarm@lists.cs.columbia.edu
Cc: kernel-team@android.com, Marc Zyngier <maz@kernel.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 19/22] KVM: arm64: Check the pgt instead of the pgd when modifying page-table
Date: Tue, 18 Aug 2020 14:28:15 +0100	[thread overview]
Message-ID: <20200818132818.16065-20-will@kernel.org> (raw)
In-Reply-To: <20200818132818.16065-1-will@kernel.org>

In preparation for removing the 'pgd' field of 'struct kvm_s2_mmu',
update the few remaining users to check the 'pgt' field instead.

Cc: Marc Zyngier <maz@kernel.org>
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
---
 arch/arm64/kvm/mmu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index c2b27935ca46..c34117cc7f59 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -1812,7 +1812,7 @@ static int kvm_unmap_hva_handler(struct kvm *kvm, gpa_t gpa, u64 size, void *dat
 int kvm_unmap_hva_range(struct kvm *kvm,
 			unsigned long start, unsigned long end, unsigned flags)
 {
-	if (!kvm->arch.mmu.pgd)
+	if (!kvm->arch.mmu.pgt)
 		return 0;
 
 	trace_kvm_unmap_hva_range(start, end);
@@ -1875,7 +1875,7 @@ static int kvm_test_age_hva_handler(struct kvm *kvm, gpa_t gpa, u64 size, void *
 
 int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end)
 {
-	if (!kvm->arch.mmu.pgd)
+	if (!kvm->arch.mmu.pgt)
 		return 0;
 	trace_kvm_age_hva(start, end);
 	return handle_hva_to_gpa(kvm, start, end, kvm_age_hva_handler, NULL);
@@ -1883,7 +1883,7 @@ int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end)
 
 int kvm_test_age_hva(struct kvm *kvm, unsigned long hva)
 {
-	if (!kvm->arch.mmu.pgd)
+	if (!kvm->arch.mmu.pgt)
 		return 0;
 	trace_kvm_test_age_hva(hva);
 	return handle_hva_to_gpa(kvm, hva, hva + PAGE_SIZE,
-- 
2.28.0.220.ged08abb693-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will@kernel.org>
To: kvmarm@lists.cs.columbia.edu
Cc: kernel-team@android.com, Suzuki Poulose <suzuki.poulose@arm.com>,
	Marc Zyngier <maz@kernel.org>,
	Quentin Perret <qperret@google.com>,
	James Morse <james.morse@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 19/22] KVM: arm64: Check the pgt instead of the pgd when modifying page-table
Date: Tue, 18 Aug 2020 14:28:15 +0100	[thread overview]
Message-ID: <20200818132818.16065-20-will@kernel.org> (raw)
In-Reply-To: <20200818132818.16065-1-will@kernel.org>

In preparation for removing the 'pgd' field of 'struct kvm_s2_mmu',
update the few remaining users to check the 'pgt' field instead.

Cc: Marc Zyngier <maz@kernel.org>
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
---
 arch/arm64/kvm/mmu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index c2b27935ca46..c34117cc7f59 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -1812,7 +1812,7 @@ static int kvm_unmap_hva_handler(struct kvm *kvm, gpa_t gpa, u64 size, void *dat
 int kvm_unmap_hva_range(struct kvm *kvm,
 			unsigned long start, unsigned long end, unsigned flags)
 {
-	if (!kvm->arch.mmu.pgd)
+	if (!kvm->arch.mmu.pgt)
 		return 0;
 
 	trace_kvm_unmap_hva_range(start, end);
@@ -1875,7 +1875,7 @@ static int kvm_test_age_hva_handler(struct kvm *kvm, gpa_t gpa, u64 size, void *
 
 int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end)
 {
-	if (!kvm->arch.mmu.pgd)
+	if (!kvm->arch.mmu.pgt)
 		return 0;
 	trace_kvm_age_hva(start, end);
 	return handle_hva_to_gpa(kvm, start, end, kvm_age_hva_handler, NULL);
@@ -1883,7 +1883,7 @@ int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end)
 
 int kvm_test_age_hva(struct kvm *kvm, unsigned long hva)
 {
-	if (!kvm->arch.mmu.pgd)
+	if (!kvm->arch.mmu.pgt)
 		return 0;
 	trace_kvm_test_age_hva(hva);
 	return handle_hva_to_gpa(kvm, hva, hva + PAGE_SIZE,
-- 
2.28.0.220.ged08abb693-goog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-08-18 13:29 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-18 13:27 [PATCH v2 00/22] KVM: arm64: Rewrite page-table code and fault handling Will Deacon
2020-08-18 13:27 ` Will Deacon
2020-08-18 13:27 ` [PATCH v2 01/22] KVM: arm64: Don't free memcache pages in kvm_phys_addr_ioremap() Will Deacon
2020-08-18 13:27   ` Will Deacon
2020-08-19  4:38   ` Gavin Shan
2020-08-19  4:38     ` Gavin Shan
2020-08-19  9:03     ` Will Deacon
2020-08-19  9:03       ` Will Deacon
2020-08-18 13:27 ` [PATCH v2 02/22] KVM: arm64: Remove kvm_mmu_free_memory_caches() Will Deacon
2020-08-18 13:27   ` Will Deacon
2020-08-19  4:45   ` Gavin Shan
2020-08-19  4:45     ` Gavin Shan
2020-08-18 13:27 ` [PATCH v2 03/22] KVM: arm64: Add stand-alone page-table walker infrastructure Will Deacon
2020-08-18 13:27   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 04/22] KVM: arm64: Add support for creating kernel-agnostic stage-1 page tables Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 05/22] KVM: arm64: Use generic allocator for hyp stage-1 page-tables Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 06/22] KVM: arm64: Add support for creating kernel-agnostic stage-2 page tables Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 07/22] KVM: arm64: Add support for stage-2 map()/unmap() in generic page-table Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 08/22] KVM: arm64: Convert kvm_phys_addr_ioremap() to generic page-table API Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 09/22] KVM: arm64: Convert kvm_set_spte_hva() " Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 10/22] KVM: arm64: Convert unmap_stage2_range() " Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 11/22] KVM: arm64: Add support for stage-2 page-aging in generic page-table Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 12/22] KVM: arm64: Convert page-aging and access faults to generic page-table API Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 13/22] KVM: arm64: Add support for stage-2 write-protect in generic page-table Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 14/22] KVM: arm64: Convert write-protect operation to generic page-table API Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 15/22] KVM: arm64: Add support for stage-2 cache flushing in generic page-table Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 16/22] KVM: arm64: Convert memslot cache-flushing code to generic page-table API Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 17/22] KVM: arm64: Add support for relaxing stage-2 perms in generic page-table code Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 18/22] KVM: arm64: Convert user_mem_abort() to generic page-table API Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` Will Deacon [this message]
2020-08-18 13:28   ` [PATCH v2 19/22] KVM: arm64: Check the pgt instead of the pgd when modifying page-table Will Deacon
2020-08-18 13:28 ` [PATCH v2 20/22] KVM: arm64: Remove unused page-table code Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 21/22] KVM: arm64: Remove unused 'pgd' field from 'struct kvm_s2_mmu' Will Deacon
2020-08-18 13:28   ` Will Deacon
2020-08-18 13:28 ` [PATCH v2 22/22] KVM: arm64: Don't constrain maximum IPA size based on host configuration Will Deacon
2020-08-18 13:28   ` Will Deacon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200818132818.16065-20-will@kernel.org \
    --to=will@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=kernel-team@android.com \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=maz@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.