| Message ID | 20190514123125.29086-9-julien.grall@arm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen/arm: Provide a generic function to update Xen PT | expand |
On Tue, 14 May 2019, Julien Grall wrote: > The enum xenmap_operation is not used anymore. So remove it. > > Signed-off-by: Julien Grall <julien.grall@arm.com> > Reviewed-by: Andrii Anisov <andrii_anisov@epam.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org> > --- > Changes in v2: > - Add Andrii's reviewed-by > --- > xen/arch/arm/mm.c | 24 ++++++++---------------- > 1 file changed, 8 insertions(+), 16 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index 86e1faeeb5..651e296041 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -974,13 +974,6 @@ static int create_xen_table(lpae_t *entry) > return 0; > } > > -enum xenmap_operation { > - INSERT, > - REMOVE, > - MODIFY, > - RESERVE > -}; > - > /* Sanity check of the entry */ > static bool xen_pt_check_entry(lpae_t entry, mfn_t mfn, unsigned int flags) > { > @@ -1040,8 +1033,8 @@ static bool xen_pt_check_entry(lpae_t entry, mfn_t mfn, unsigned int flags) > return true; > } > > -static int xen_pt_update_entry(enum xenmap_operation op, unsigned long addr, > - mfn_t mfn, unsigned int flags) > +static int xen_pt_update_entry(unsigned long addr, mfn_t mfn, > + unsigned int flags) > { > lpae_t pte, *entry; > lpae_t *third = NULL; > @@ -1099,8 +1092,7 @@ static int xen_pt_update_entry(enum xenmap_operation op, unsigned long addr, > > static DEFINE_SPINLOCK(xen_pt_lock); > > -static int xen_pt_update(enum xenmap_operation op, > - unsigned long virt, > +static int xen_pt_update(unsigned long virt, > mfn_t mfn, > unsigned long nr_mfns, > unsigned int flags) > @@ -1131,7 +1123,7 @@ static int xen_pt_update(enum xenmap_operation op, > > for( ; addr < addr_end; addr += PAGE_SIZE ) > { > - rc = xen_pt_update_entry(op, addr, mfn, flags); > + rc = xen_pt_update_entry(addr, mfn, flags); > if ( rc ) > break; > > @@ -1156,24 +1148,24 @@ int map_pages_to_xen(unsigned long virt, > unsigned long nr_mfns, > unsigned int flags) > { > - return xen_pt_update(INSERT, virt, mfn, nr_mfns, flags); > + return xen_pt_update(virt, mfn, nr_mfns, flags); > } > > int populate_pt_range(unsigned long virt, unsigned long nr_mfns) > { > - return xen_pt_update(RESERVE, virt, INVALID_MFN, nr_mfns, _PAGE_POPULATE); > + return xen_pt_update(virt, INVALID_MFN, nr_mfns, _PAGE_POPULATE); > } > > int destroy_xen_mappings(unsigned long v, unsigned long e) > { > ASSERT(v <= e); > - return xen_pt_update(REMOVE, v, INVALID_MFN, (e - v) >> PAGE_SHIFT, 0); > + return xen_pt_update(v, INVALID_MFN, (e - v) >> PAGE_SHIFT, 0); > } > > int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int flags) > { > ASSERT(s <= e); > - return xen_pt_update(MODIFY, s, INVALID_MFN, (e - s) >> PAGE_SHIFT, flags); > + return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, flags); > } > > enum mg { mg_clear, mg_ro, mg_rw, mg_rx }; > -- > 2.11.0 >
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 86e1faeeb5..651e296041 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -974,13 +974,6 @@ static int create_xen_table(lpae_t *entry) return 0; } -enum xenmap_operation { - INSERT, - REMOVE, - MODIFY, - RESERVE -}; - /* Sanity check of the entry */ static bool xen_pt_check_entry(lpae_t entry, mfn_t mfn, unsigned int flags) { @@ -1040,8 +1033,8 @@ static bool xen_pt_check_entry(lpae_t entry, mfn_t mfn, unsigned int flags) return true; } -static int xen_pt_update_entry(enum xenmap_operation op, unsigned long addr, - mfn_t mfn, unsigned int flags) +static int xen_pt_update_entry(unsigned long addr, mfn_t mfn, + unsigned int flags) { lpae_t pte, *entry; lpae_t *third = NULL; @@ -1099,8 +1092,7 @@ static int xen_pt_update_entry(enum xenmap_operation op, unsigned long addr, static DEFINE_SPINLOCK(xen_pt_lock); -static int xen_pt_update(enum xenmap_operation op, - unsigned long virt, +static int xen_pt_update(unsigned long virt, mfn_t mfn, unsigned long nr_mfns, unsigned int flags) @@ -1131,7 +1123,7 @@ static int xen_pt_update(enum xenmap_operation op, for( ; addr < addr_end; addr += PAGE_SIZE ) { - rc = xen_pt_update_entry(op, addr, mfn, flags); + rc = xen_pt_update_entry(addr, mfn, flags); if ( rc ) break; @@ -1156,24 +1148,24 @@ int map_pages_to_xen(unsigned long virt, unsigned long nr_mfns, unsigned int flags) { - return xen_pt_update(INSERT, virt, mfn, nr_mfns, flags); + return xen_pt_update(virt, mfn, nr_mfns, flags); } int populate_pt_range(unsigned long virt, unsigned long nr_mfns) { - return xen_pt_update(RESERVE, virt, INVALID_MFN, nr_mfns, _PAGE_POPULATE); + return xen_pt_update(virt, INVALID_MFN, nr_mfns, _PAGE_POPULATE); } int destroy_xen_mappings(unsigned long v, unsigned long e) { ASSERT(v <= e); - return xen_pt_update(REMOVE, v, INVALID_MFN, (e - v) >> PAGE_SHIFT, 0); + return xen_pt_update(v, INVALID_MFN, (e - v) >> PAGE_SHIFT, 0); } int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int flags) { ASSERT(s <= e); - return xen_pt_update(MODIFY, s, INVALID_MFN, (e - s) >> PAGE_SHIFT, flags); + return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, flags); } enum mg { mg_clear, mg_ro, mg_rw, mg_rx };