xen/arm: mm: Add more ASSERT() in {destroy, modify}_xen_mappings()

Both destroy_xen_mappings() and modify_xen_mappings() will take in
parameter a range [start, end[. Both end should be page aligned.

Add extra ASSERT() to ensure start and end are page aligned. Take the
opportunity to rename 'v' to 's' to be consistent with the other helper.

Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

----
    Changes in v2:
        - Also modify prototype. Note that on x86, the first parameter
          was not matching in the declaration and prototype.
        - Add Bertrand's reviewed-by
This commit is contained in:
Julien Grall authored and Julien Grall committed 2022-07-17 14:10:08 +01:00
1 parent 25424d1a6b
commit 9b962e6183
2 files changed
+8 -4

No files matched your search

+7 -3
View File
@@ -1368,14 +1368,18 @@ int populate_pt_range(unsigned long virt, unsigned long nr_mfns)
return xen_pt_update(virt, INVALID_MFN, nr_mfns, _PAGE_POPULATE);
}
int destroy_xen_mappings(unsigned long v, unsigned long e)
int destroy_xen_mappings(unsigned long s, unsigned long e)
{
ASSERT(v <= e);
return xen_pt_update(v, INVALID_MFN, (e - v) >> PAGE_SHIFT, 0);
ASSERT(IS_ALIGNED(s, PAGE_SIZE));
ASSERT(IS_ALIGNED(e, PAGE_SIZE));
ASSERT(s <= e);
return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, 0);
}
int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int flags)
{
ASSERT(IS_ALIGNED(s, PAGE_SIZE));
ASSERT(IS_ALIGNED(e, PAGE_SIZE));
ASSERT(s <= e);
return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, flags);
}
+1 -1
View File
@@ -101,7 +101,7 @@ int map_pages_to_xen(
unsigned int flags);
/* Alter the permissions of a range of Xen virtual address space. */
int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int flags);
int destroy_xen_mappings(unsigned long v, unsigned long e);
int destroy_xen_mappings(unsigned long s, unsigned long e);
/* Retrieve the MFN mapped by VA in Xen virtual address space. */
mfn_t xen_map_to_mfn(unsigned long va);
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.