On Wed, Mar 10, 2021 at 05:57:46PM +0000, Quentin Perret wrote: > In order to ease its re-use in other code paths, refactor > stage2_map_set_prot_attr() to not depend on a stage2_map_data struct. > No functional change intended. > > Signed-off-by: Quentin Perret <[email protected]> > --- > arch/arm64/kvm/hyp/pgtable.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > index e4670b639726..c16e0306dd9a 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -489,8 +489,7 @@ u64 kvm_get_vtcr(u64 mmfr0, u64 mmfr1, u32 phys_shift) > return vtcr; > } > > -static int stage2_map_set_prot_attr(enum kvm_pgtable_prot prot, > - struct stage2_map_data *data) > +static int stage2_set_prot_attr(enum kvm_pgtable_prot prot, kvm_pte_t *ptep) > { > bool device = prot & KVM_PGTABLE_PROT_DEVICE; > kvm_pte_t attr = device ? PAGE_S2_MEMATTR(DEVICE_nGnRE) : > @@ -510,7 +509,8 @@ static int stage2_map_set_prot_attr(enum kvm_pgtable_prot > prot, > > attr |= FIELD_PREP(KVM_PTE_LEAF_ATTR_LO_S2_SH, sh); > attr |= KVM_PTE_LEAF_ATTR_LO_S2_AF; > - data->attr = attr; > + *ptep = attr; > + > return 0; > } > > @@ -728,7 +728,7 @@ int kvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 > addr, u64 size, > .arg = &map_data, > }; > > - ret = stage2_map_set_prot_attr(prot, &map_data); > + ret = stage2_set_prot_attr(prot, &map_data.attr); > if (ret) > return ret;
(nit: this is now different to hyp_map_set_prot_attr() -- can we do the same thing there, please?) With that: Acked-by: Will Deacon <[email protected]> Will
