leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RDMA/hns: Get rid of page operation after dma_alloc_coherent

Browse Source 
In general, dma_alloc_coherent() returns a CPU virtual address and
a DMA address, and we have no guarantee that the underlying memory
even has an associated struct page at all.

This patch gets rid of the page operation after dma_alloc_coherent,
and records the VA returned form dma_alloc_coherent in the struct
of hem in hns RoCE driver.

Fixes: 9a44353("IB/hns: Add driver files for hns RoCE driver")
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Shaobo Xu <xushaobo2@huawei.com>
Signed-off-by: Lijun Ou <oulijun@huawei.com>
Signed-off-by: Yixian Liu <liuyixian@huawei.com>
Signed-off-by: Xiping Zhang (Francis) <zhangxiping3@huawei.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Wei Hu\(Xavier\) 2017-11-28 15:10:28 +08:00 committed by Jason Gunthorpe
parent b1c1583509
commit 378efe798e
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/infiniband/hw/hns/hns_roce_hem.c
View File

@ -224,6 +224,7 @@ static struct hns_roce_hem *hns_roce_alloc_hem(struct hns_roce_dev *hr_dev,
sg_init_table(chunk->mem, HNS_ROCE_HEM_CHUNK_LEN); sg_init_table(chunk->mem, HNS_ROCE_HEM_CHUNK_LEN);
chunk->npages = 0; chunk->npages = 0;
chunk->nsg = 0; chunk->nsg = 0;
memset(chunk->buf, 0, sizeof(chunk->buf));
list_add_tail(&chunk->list, &hem->chunk_list); list_add_tail(&chunk->list, &hem->chunk_list);
} }
@ -240,8 +241,7 @@ static struct hns_roce_hem *hns_roce_alloc_hem(struct hns_roce_dev *hr_dev,
if (!buf) if (!buf)
goto fail; goto fail;
sg_set_buf(mem, buf, PAGE_SIZE << order); chunk->buf[chunk->npages] = buf;
WARN_ON(mem->offset);
sg_dma_len(mem) = PAGE_SIZE << order; sg_dma_len(mem) = PAGE_SIZE << order;
++chunk->npages; ++chunk->npages;
@ -267,8 +267,8 @@ void hns_roce_free_hem(struct hns_roce_dev *hr_dev, struct hns_roce_hem *hem)
list_for_each_entry_safe(chunk, tmp, &hem->chunk_list, list) { list_for_each_entry_safe(chunk, tmp, &hem->chunk_list, list) {
for (i = 0; i < chunk->npages; ++i) for (i = 0; i < chunk->npages; ++i)
dma_free_coherent(hr_dev->dev, dma_free_coherent(hr_dev->dev,
chunk->mem[i].length, sg_dma_len(&chunk->mem[i]),
lowmem_page_address(sg_page(&chunk->mem[i])), chunk->buf[i],
sg_dma_address(&chunk->mem[i])); sg_dma_address(&chunk->mem[i]));
kfree(chunk); kfree(chunk);
} }
@ -722,11 +722,12 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev,
struct hns_roce_hem_chunk *chunk; struct hns_roce_hem_chunk *chunk;
struct hns_roce_hem_mhop mhop; struct hns_roce_hem_mhop mhop;
struct hns_roce_hem *hem; struct hns_roce_hem *hem;
struct page *page = NULL; void *addr = NULL;
unsigned long mhop_obj = obj; unsigned long mhop_obj = obj;
unsigned long obj_per_chunk; unsigned long obj_per_chunk;
unsigned long idx_offset; unsigned long idx_offset;
int offset, dma_offset; int offset, dma_offset;
int length;
int i, j; int i, j;
u32 hem_idx = 0; u32 hem_idx = 0;
@ -763,25 +764,25 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev,
list_for_each_entry(chunk, &hem->chunk_list, list) { list_for_each_entry(chunk, &hem->chunk_list, list) {
for (i = 0; i < chunk->npages; ++i) { for (i = 0; i < chunk->npages; ++i) {
length = sg_dma_len(&chunk->mem[i]);
if (dma_handle && dma_offset >= 0) { if (dma_handle && dma_offset >= 0) {
if (sg_dma_len(&chunk->mem[i]) > if (length > (u32)dma_offset)
(u32)dma_offset)
*dma_handle = sg_dma_address( *dma_handle = sg_dma_address(
&chunk->mem[i]) + dma_offset; &chunk->mem[i]) + dma_offset;
dma_offset -= sg_dma_len(&chunk->mem[i]); dma_offset -= length;
} }
if (chunk->mem[i].length > (u32)offset) { if (length > (u32)offset) {
page = sg_page(&chunk->mem[i]); addr = chunk->buf[i] + offset;
goto out; goto out;
} }
offset -= chunk->mem[i].length; offset -= length;
} }
} }
out: out:
mutex_unlock(&table->mutex); mutex_unlock(&table->mutex);
return page ? lowmem_page_address(page) + offset : NULL; return addr;
} }
EXPORT_SYMBOL_GPL(hns_roce_table_find); EXPORT_SYMBOL_GPL(hns_roce_table_find);

1
drivers/infiniband/hw/hns/hns_roce_hem.h
View File

@ -78,6 +78,7 @@ struct hns_roce_hem_chunk {
int npages; int npages;
int nsg; int nsg;
struct scatterlist mem[HNS_ROCE_HEM_CHUNK_LEN]; struct scatterlist mem[HNS_ROCE_HEM_CHUNK_LEN];
void *buf[HNS_ROCE_HEM_CHUNK_LEN];
}; };
struct hns_roce_hem { struct hns_roce_hem {