ihk_mc_map/unmap_virtual(): do proper TLB invalidation

This commit is contained in:
Balazs Gerofi
2018-03-24 07:56:49 +09:00
parent 0f049c5ed7
commit 73731d2a0d

View File

@@ -1664,6 +1664,8 @@ void *ihk_mc_map_virtual(unsigned long phys, int npages,
ihk_pagealloc_free(vmap_allocator, virt_to_phys(p), npages); ihk_pagealloc_free(vmap_allocator, virt_to_phys(p), npages);
return NULL; return NULL;
} }
flush_tlb_single((unsigned long)(p + (i << PAGE_SHIFT)));
} }
barrier(); barrier();
return (char *)p + offset; return (char *)p + offset;
@@ -1676,17 +1678,14 @@ void ihk_mc_unmap_virtual(void *va, int npages, int free_physical)
va = (void *)((unsigned long)va & PAGE_MASK); va = (void *)((unsigned long)va & PAGE_MASK);
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
ihk_mc_pt_clear_page(NULL, (char *)va + (i << PAGE_SHIFT)); ihk_mc_pt_clear_page(NULL, (char *)va + (i << PAGE_SHIFT));
flush_tlb_single((unsigned long)(va + (i << PAGE_SHIFT)));
} }
#ifdef POSTK_DEBUG_TEMP_FIX_42 /* add unmap virtual tlb flush. */
flush_tlb();
#endif /* POSTK_DEBUG_TEMP_FIX_42 */
#ifdef POSTK_DEBUG_TEMP_FIX_51 /* ihk_mc_unmap_virtual() free_physical disabled */ #ifdef POSTK_DEBUG_TEMP_FIX_51 /* ihk_mc_unmap_virtual() free_physical disabled */
ihk_pagealloc_free(vmap_allocator, (unsigned long)va, npages); ihk_pagealloc_free(vmap_allocator, (unsigned long)va, npages);
#else /* POSTK_DEBUG_TEMP_FIX_51 */ #else /* POSTK_DEBUG_TEMP_FIX_51 */
if (free_physical) { if (free_physical) {
ihk_pagealloc_free(vmap_allocator, (unsigned long)va, npages); ihk_pagealloc_free(vmap_allocator, (unsigned long)va, npages);
flush_tlb_single((unsigned long)va);
} }
#endif /* POSTK_DEBUG_TEMP_FIX_51 */ #endif /* POSTK_DEBUG_TEMP_FIX_51 */
} }