From 6f0ce7b9cd490e1efd0b39cbc74e7881327eff77 Mon Sep 17 00:00:00 2001 From: Jijiang Liu Date: Tue, 3 Jun 2014 20:59:33 +0800 Subject: [PATCH] xen: fix for contiguous region API in kernel 3.13 Since Linux kernel version 3.13.0, the xen_create/destroy_contiguous_region() API has been changed, and the first parameter is physical address in the API. Signed-off-by: Jijiang Liu Acked-by: Huawei Xie Tested-by: Heng Ding --- .../linuxapp/xen_dom0/dom0_mm_misc.c | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c index c25430081e..03efb4ffc6 100644 --- a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c +++ b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c @@ -64,6 +64,7 @@ #include #include #include +#include #include #include @@ -262,6 +263,7 @@ dom0_memory_free(uint32_t rsv_size) for (i = 0; i < dom0_dev.num_bigblock * 2; i += 2) { vstart = rsv_mm_info[i].vir_addr; if (vstart) { + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) if (rsv_mm_info[i].exchange_flag) xen_destroy_contiguous_region(vstart, DOM0_CONTIG_NUM_ORDER); @@ -269,6 +271,17 @@ dom0_memory_free(uint32_t rsv_size) xen_destroy_contiguous_region(vstart + DOM0_MEMBLOCK_SIZE, DOM0_CONTIG_NUM_ORDER); + #else + if (rsv_mm_info[i].exchange_flag) + xen_destroy_contiguous_region(rsv_mm_info[i].pfn + * PAGE_SIZE, + DOM0_CONTIG_NUM_ORDER); + if (rsv_mm_info[i + 1].exchange_flag) + xen_destroy_contiguous_region(rsv_mm_info[i].pfn + * PAGE_SIZE + DOM0_MEMBLOCK_SIZE, + DOM0_CONTIG_NUM_ORDER); + #endif + size = DOM0_MEMBLOCK_SIZE * 2; vaddr = vstart; while (size > 0) { @@ -381,6 +394,10 @@ dom0_memory_reserve(uint32_t rsv_size) uint64_t pfn, vstart, vaddr; uint32_t i, num_block, size, allocated_size = 0; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) + dma_addr_t dma_handle; +#endif + /* 2M as memory block */ num_block = rsv_size / SIZE_PER_BLOCK; @@ -452,8 +469,13 @@ dom0_memory_reserve(uint32_t rsv_size) * This API is used to exchage MFN for getting a block of * contiguous physical addresses, its maximum size is 2M. */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) if (xen_create_contiguous_region(rsv_mm_info[i].vir_addr, - DOM0_CONTIG_NUM_ORDER, 0) == 0) { + DOM0_CONTIG_NUM_ORDER, 0) == 0) { + #else + if (xen_create_contiguous_region(rsv_mm_info[i].pfn * PAGE_SIZE, + DOM0_CONTIG_NUM_ORDER, 0, &dma_handle) == 0) { + #endif rsv_mm_info[i].exchange_flag = 1; rsv_mm_info[i].mfn = pfn_to_mfn(rsv_mm_info[i].pfn); -- 2.20.1