Context |
Check |
Description |
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/merge (6b450d0404ca83dc131dadffd40c5aa6f7a603af)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/next (612ee81b9461475b5a5612c2e8d71559dd3c7920)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linus/master (3b7c59a1950c75f2c0152e5a9cd77675b09233d6)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/fixes (d10f60ae27d26d811e2a1bb39ded47df96d7499f)
|
snowpatch_ozlabs/apply_patch |
success
|
Successfully applied on branch linux-next (f3c452cfc59c817950b150b51ec2b33409d7640b)
|
snowpatch_ozlabs/checkpatch |
fail
|
Test checkpatch on branch linux-next
|
@@ -299,9 +299,15 @@ static int vfio_lock_acct(struct vfio_dma *dma, long npage, bool async)
*/
static bool is_invalid_reserved_pfn(unsigned long pfn)
{
- if (pfn_valid(pfn))
- return PageReserved(pfn_to_page(pfn));
+ struct page *page = pfn_to_online_page(pfn);
+ /*
+ * We treat any pages that are not online (not managed by the buddy)
+ * as reserved - this includes ZONE_DEVICE pages and pages without
+ * a memmap (e.g., mapped via /dev/mem).
+ */
+ if (page)
+ return PageReserved(page);
return true;
}
Right now, ZONE_DEVICE memory is always set PG_reserved. We want to change that. KVM has this weird use case that you can map anything from /dev/mem into the guest. pfn_valid() is not a reliable check whether the memmap was initialized and can be touched. pfn_to_online_page() makes sure that we have an initialized memmap. Note that ZONE_DEVICE memory is never online (IOW, managed by the buddy). Switching to pfn_to_online_page() keeps the existing behavior for PFNs without a memmap and for ZONE_DEVICE memory. They are treated as reserved and the page is not touched (e.g., to set it dirty or accessed). Cc: Alex Williamson <alex.williamson@redhat.com> Cc: Cornelia Huck <cohuck@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- drivers/vfio/vfio_iommu_type1.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)