2021-09-18 11:31:33

by Lai Jiangshan

Subject: [PATCH V2 08/10] KVM: X86: Remove FNAME(update_pte)

From: Lai Jiangshan <[email protected]>

Its solo caller is changed to use FNAME(prefetch_gpte) directly.

Signed-off-by: Lai Jiangshan <[email protected]>
---
arch/x86/kvm/mmu/paging_tmpl.h | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
index c3edbc0f06b3..ca5fdd07cfa2 100644
--- a/arch/x86/kvm/mmu/paging_tmpl.h
+++ b/arch/x86/kvm/mmu/paging_tmpl.h
@@ -589,14 +589,6 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
return true;
}

-static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
- u64 *spte, const void *pte)
-{
- pt_element_t gpte = *(const pt_element_t *)pte;
-
- FNAME(prefetch_gpte)(vcpu, sp, spte, gpte, false);
-}
-
static bool FNAME(gpte_changed)(struct kvm_vcpu *vcpu,
struct guest_walker *gw, int level)
{
@@ -1001,7 +993,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva, hpa_t root_hpa)
sizeof(pt_element_t)))
break;

- FNAME(update_pte)(vcpu, sp, sptep, &gpte);
+ FNAME(prefetch_gpte)(vcpu, sp, sptep, gpte, false);
}

if (!sp->unsync_children)
--
2.19.1.6.gb485710b

2021-09-18 12:10:07

by Lai Jiangshan

Subject: Re: [PATCH V2 08/10] KVM: X86: Remove FNAME(update_pte)

On 2021/9/18 08:56, Lai Jiangshan wrote:
> From: Lai Jiangshan <[email protected]>
>
> Its solo caller is changed to use FNAME(prefetch_gpte) directly.
>
> Signed-off-by: Lai Jiangshan <[email protected]>
> ---

Sorry, I've forgotten to add Maxim's Reviewed-by from V1:

Reviewed-by: Maxim Levitsky <[email protected]>

> arch/x86/kvm/mmu/paging_tmpl.h | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
> index c3edbc0f06b3..ca5fdd07cfa2 100644
> --- a/arch/x86/kvm/mmu/paging_tmpl.h
> +++ b/arch/x86/kvm/mmu/paging_tmpl.h
> @@ -589,14 +589,6 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
> return true;
> }
>
> -static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
> - u64 *spte, const void *pte)
> -{
> - pt_element_t gpte = *(const pt_element_t *)pte;
> -
> - FNAME(prefetch_gpte)(vcpu, sp, spte, gpte, false);
> -}
> -
> static bool FNAME(gpte_changed)(struct kvm_vcpu *vcpu,
> struct guest_walker *gw, int level)
> {
> @@ -1001,7 +993,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva, hpa_t root_hpa)
> sizeof(pt_element_t)))
> break;
>
> - FNAME(update_pte)(vcpu, sp, sptep, &gpte);
> + FNAME(prefetch_gpte)(vcpu, sp, sptep, gpte, false);
> }
>
> if (!sp->unsync_children)
>