luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: mic: scif bug fix for vmalloc_to_page crash

Browse Source 
v4.2-rc1 enabled huge page support for ioremap(..).
Calling vmalloc_to_page after v4.2-rc1 results in the
crash shown below on the host upon booting X100 coprocessors:

BUG: unable to handle kernel paging request at ffffc47c00000000
IP: [<ffffffff811a2c0c>] vmalloc_to_page+0x6c/0xb0

This patch fixes this crash by obtaining the fake struct page
pointer which is required to be passed into dma_map_sg(..)
by calling pfn_to_page(..) instead of vmalloc_to_page(..).

Link: https://lkml.org/lkml/2015/7/18/110
Reviewed-by: Nikhil Rao <nikhil.rao@intel.com>
Suggested-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudeep Dutt 2015-07-22 11:50:10 -07:00 committed by Greg Kroah-Hartman
parent 68d35c7b3b
commit a63444375f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/misc/mic/scif/scif_nodeqp.c
View File

@ -357,7 +357,7 @@ static void scif_p2p_freesg(struct scatterlist *sg)
} }
static struct scatterlist * static struct scatterlist *
scif_p2p_setsg(void __iomem *va, int page_size, int page_cnt) scif_p2p_setsg(phys_addr_t pa, int page_size, int page_cnt)
{ {
struct scatterlist *sg; struct scatterlist *sg;
struct page *page; struct page *page;
@ -368,16 +368,11 @@ scif_p2p_setsg(void __iomem *va, int page_size, int page_cnt)
return NULL; return NULL;
sg_init_table(sg, page_cnt); sg_init_table(sg, page_cnt);
for (i = 0; i < page_cnt; i++) { for (i = 0; i < page_cnt; i++) {
page = vmalloc_to_page((void __force *)va); page = pfn_to_page(pa >> PAGE_SHIFT);
if (!page)
goto p2p_sg_err;
sg_set_page(&sg[i], page, page_size, 0); sg_set_page(&sg[i], page, page_size, 0);
va += page_size; pa += page_size;
} }
return sg; return sg;
p2p_sg_err:
kfree(sg);
return NULL;
} }
/* Init p2p mappings required to access peerdev from scifdev */ /* Init p2p mappings required to access peerdev from scifdev */
@ -395,14 +390,14 @@ scif_init_p2p_info(struct scif_dev *scifdev, struct scif_dev *peerdev)
p2p = kzalloc(sizeof(*p2p), GFP_KERNEL); p2p = kzalloc(sizeof(*p2p), GFP_KERNEL);
if (!p2p) if (!p2p)
return NULL; return NULL;
p2p->ppi_sg[SCIF_PPI_MMIO] = scif_p2p_setsg(psdev->mmio->va, p2p->ppi_sg[SCIF_PPI_MMIO] = scif_p2p_setsg(psdev->mmio->pa,
PAGE_SIZE, num_mmio_pages); PAGE_SIZE, num_mmio_pages);
if (!p2p->ppi_sg[SCIF_PPI_MMIO]) if (!p2p->ppi_sg[SCIF_PPI_MMIO])
goto free_p2p; goto free_p2p;
p2p->sg_nentries[SCIF_PPI_MMIO] = num_mmio_pages; p2p->sg_nentries[SCIF_PPI_MMIO] = num_mmio_pages;
sg_page_shift = get_order(min(psdev->aper->len, (u64)(1 << 30))); sg_page_shift = get_order(min(psdev->aper->len, (u64)(1 << 30)));
num_aper_chunks = num_aper_pages >> (sg_page_shift - PAGE_SHIFT); num_aper_chunks = num_aper_pages >> (sg_page_shift - PAGE_SHIFT);
p2p->ppi_sg[SCIF_PPI_APER] = scif_p2p_setsg(psdev->aper->va, p2p->ppi_sg[SCIF_PPI_APER] = scif_p2p_setsg(psdev->aper->pa,
1 << sg_page_shift, 1 << sg_page_shift,
num_aper_chunks); num_aper_chunks);
p2p->sg_nentries[SCIF_PPI_APER] = num_aper_chunks; p2p->sg_nentries[SCIF_PPI_APER] = num_aper_chunks;