diff options
authorDennis Dalessandro <>2016-10-10 06:14:45 -0700
committerGreg Kroah-Hartman <>2016-11-26 09:56:54 +0100
commit06eac15f11e014e471f1486fa47817d3a3697b4d (patch)
parentca720a2b11b4c90d1798b406d3c191cd5395b5e3 (diff)
IB/rdmavt: rdmavt can handle non aligned page maps
commit e1fafdcbe0e3e769c6a83317dd845bc99b4fe61d upstream. The initial code for rdmavt carried with it a restriction that was a vestige from the qib driver, that to dma map a page it had to be less than a page size. This is not the case on modern hardware, both qib and hfi1 will be just fine with unaligned map requests. This fixes a 4.8 regression where by an IPoIB transfer of > PAGE_SIZE will hang because the dma map page call always fails. This was introduced after commit 5faba5469522 ("IB/ipoib: Report SG feature regardless of HW UD CSUM capability") added the capability to use SG by default. Rather than override this, the HW supports it, so allow SG. Reviewed-by: Mike Marciniszyn <> Signed-off-by: Dennis Dalessandro <> Signed-off-by: Doug Ledford <> Signed-off-by: Greg Kroah-Hartman <>
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/infiniband/sw/rdmavt/dma.c b/drivers/infiniband/sw/rdmavt/dma.c
index 33076a5eee2f..04ebbb576385 100644
--- a/drivers/infiniband/sw/rdmavt/dma.c
+++ b/drivers/infiniband/sw/rdmavt/dma.c
@@ -90,9 +90,6 @@ static u64 rvt_dma_map_page(struct ib_device *dev, struct page *page,
if (WARN_ON(!valid_dma_direction(direction)))
- if (offset + size > PAGE_SIZE)
addr = (u64)page_address(page);
if (addr)
addr += offset;