QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix u2mfn.ko for > 16TB RAM by not truncating to 32-bit improperly

Browse Source 
At the moment, Xen has a 16TB limit on x86, so this has no practical
impact, aside for silencing compiler truncation warnings.

Also, the rest of the GUI/u2mfn code and protocol would need to be
expanded to use 64-bit mfns for Qubes to actually work there.
This commit is contained in:
qubesuser 2015-10-10 11:17:12 +02:00 committed by Marek Marczykowski-Górecki
parent 1a3be481b5
commit 71ce41cf61
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel-modules/u2mfn/u2mfn.c
View File

@ -50,8 +50,7 @@ static inline unsigned long virt_to_phys(volatile void *address)
extern unsigned long *phys_to_machine_mapping; extern unsigned long *phys_to_machine_mapping;
static inline unsigned long VIRT_TO_MFN(void *addr) static inline unsigned long VIRT_TO_MFN(void *addr)
{ {
unsigned int pfn = virt_to_phys(addr) >> PAGE_SHIFT; return phys_to_machine_mapping[virt_to_phys(addr) >> PAGE_SHIFT] & ~FOREIGN_FRAME_BIT;
return phys_to_machine_mapping[pfn] & ~FOREIGN_FRAME_BIT;
} }
#endif #endif
@ -66,7 +65,7 @@ static long u2mfn_ioctl(struct file *f, unsigned int cmd,
{ {
struct page *user_page; struct page *user_page;
void *kaddr; void *kaddr;
int ret; long ret;
if (_IOC_TYPE(cmd) != U2MFN_MAGIC) { if (_IOC_TYPE(cmd) != U2MFN_MAGIC) {
printk("Qubes u2mfn: wrong IOCTL magic"); printk("Qubes u2mfn: wrong IOCTL magic");