mm: fix cache mode tracking in vm_insert_mixed()
vm_insert_mixed() unlike vm_insert_pfn_prot() and vmf_insert_pfn_pmd(), fails to check the pgprot_t it uses for the mapping against the one recorded in the memtype tracking tree. Add the missing call to track_pfn_insert() to preclude cases where incompatible aliased mappings are established for a given physical address range. Link: http://lkml.kernel.org/r/147328717909.35069.14256589123570653697.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com> Cc: David Airlie <airlied@linux.ie> Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
d66ba15bde
Коммит
87744ab383
|
@ -1649,10 +1649,14 @@ EXPORT_SYMBOL(vm_insert_pfn_prot);
|
|||
int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
|
||||
pfn_t pfn)
|
||||
{
|
||||
pgprot_t pgprot = vma->vm_page_prot;
|
||||
|
||||
BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
|
||||
|
||||
if (addr < vma->vm_start || addr >= vma->vm_end)
|
||||
return -EFAULT;
|
||||
if (track_pfn_insert(vma, &pgprot, pfn))
|
||||
return -EINVAL;
|
||||
|
||||
/*
|
||||
* If we don't have pte special, then we have to use the pfn_valid()
|
||||
|
@ -1670,9 +1674,9 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
|
|||
* result in pfn_t_has_page() == false.
|
||||
*/
|
||||
page = pfn_to_page(pfn_t_to_pfn(pfn));
|
||||
return insert_page(vma, addr, page, vma->vm_page_prot);
|
||||
return insert_page(vma, addr, page, pgprot);
|
||||
}
|
||||
return insert_pfn(vma, addr, pfn, vma->vm_page_prot);
|
||||
return insert_pfn(vma, addr, pfn, pgprot);
|
||||
}
|
||||
EXPORT_SYMBOL(vm_insert_mixed);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче