Pull xen updates from Juergen Gross: "A small series for fixing a problem with Xen PVH guests when running as backends (e.g. as dom0). Mapping other guests' memory is now working via ZONE_DEVICE, thus not requiring to abuse the memory hotplug functionality for that purpose" * tag 'for-linus-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: add helpers to allocate unpopulated memory memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC xen/balloon: add header guard
Showing the changes to include/linux (1 of 14 files). Show all
Unified · Split
| @@ -46,11 +46,10 @@ struct vmem_altmap { · 45 unmodified lines | |||
| 46 | * wakeup is used to coordinate physical address space management (ex: | 46 | * wakeup is used to coordinate physical address space management (ex: |
| 47 | * fs truncate/hole punch) vs pinned pages (ex: device dma). | 47 | * fs truncate/hole punch) vs pinned pages (ex: device dma). |
| 48 | * | 48 | * |
| 49 | * MEMORY_DEVICE_DEVDAX: | 49 | * MEMORY_DEVICE_GENERIC: |
| 50 | * Host memory that has similar access semantics as System RAM i.e. DMA | 50 | * Host memory that has similar access semantics as System RAM i.e. DMA |
| 51 | * coherent and supports page pinning. In contrast to | 51 | * coherent and supports page pinning. This is for example used by DAX devices |
| 52 | * MEMORY_DEVICE_FS_DAX, this memory is access via a device-dax | 52 | * that expose memory using a character device. |
| 53 | * character device. | ||
| 54 | * | 53 | * |
| 55 | * MEMORY_DEVICE_PCI_P2PDMA: | 54 | * MEMORY_DEVICE_PCI_P2PDMA: |
| 56 | * Device memory residing in a PCI BAR intended for use with Peer-to-Peer | 55 | * Device memory residing in a PCI BAR intended for use with Peer-to-Peer |
| @@ -60,7 +59,7 @@ enum memory_type { · 3 unmodified lines | |||
| 60 | /* 0 is reserved to catch uninitialized type fields */ | 59 | /* 0 is reserved to catch uninitialized type fields */ |
| 61 | MEMORY_DEVICE_PRIVATE = 1, | 60 | MEMORY_DEVICE_PRIVATE = 1, |
| 62 | MEMORY_DEVICE_FS_DAX, | 61 | MEMORY_DEVICE_FS_DAX, |
| 63 | MEMORY_DEVICE_DEVDAX, | 62 | MEMORY_DEVICE_GENERIC, |
| 64 | MEMORY_DEVICE_PCI_P2PDMA, | 63 | MEMORY_DEVICE_PCI_P2PDMA, |
| 65 | }; | 64 | }; |
| 66 | 65 | ||