| From foo@baz Thu Mar 22 14:57:33 CET 2018 |
| From: Artemy Kovalyov <artemyko@mellanox.com> |
| Date: Tue, 14 Nov 2017 14:51:59 +0200 |
| Subject: IB/umem: Fix use of npages/nmap fields |
| |
| From: Artemy Kovalyov <artemyko@mellanox.com> |
| |
| |
| [ Upstream commit edf1a84fe37c51290e2c88154ecaf48dadff3d27 ] |
| |
| In ib_umem structure npages holds original number of sg entries, while |
| nmap is number of DMA blocks returned by dma_map_sg. |
| |
| Fixes: c5d76f130b28 ('IB/core: Add umem function to read data from user-space') |
| Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com> |
| Signed-off-by: Leon Romanovsky <leon@kernel.org> |
| Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/infiniband/core/umem.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/infiniband/core/umem.c |
| +++ b/drivers/infiniband/core/umem.c |
| @@ -354,7 +354,7 @@ int ib_umem_copy_from(void *dst, struct |
| return -EINVAL; |
| } |
| |
| - ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->nmap, dst, length, |
| + ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->npages, dst, length, |
| offset + ib_umem_offset(umem)); |
| |
| if (ret < 0) |
