* [PATCH linux-next v4] mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures
@ 2015-04-15 6:21 Honggang Li
2015-04-15 7:11 ` Or Gerlitz
0 siblings, 1 reply; 4+ messages in thread
From: Honggang Li @ 2015-04-15 6:21 UTC (permalink / raw)
To: eli, netdev, linux-rdma, linux-kernel; +Cc: Honggang Li
If CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for x86 systems and physical
memory is more than 4GB, dma_map_page may return a valid memory
address which greater than 0xffffffff. As a result, the mlx5 device page
allocator RB tree will be initialized with valid addresses greater than
0xfffffff.
However, (addr & PAGE_MASK) set the high four bytes to zeros. So, it's
impossible for the function, free_4k, to release the pages whose
addresses greater than 4GB. Memory leaks. And mlx5_ib module can't
release the pages when user try to remove the module, as a result,
system hang.
[root@rdma05 root]# dmesg | grep addr | head
addr = 3fe384000
addr & PAGE_MASK = fe384000
[root@rdma05 root]# rmmod mlx5_ib <---- hang on
---------------------- cosnole log -----------------
mlx5_ib 0000:04:00.0: irq 138 for MSI/MSI-X
alloc irq_desc for 139 on node -1
alloc kstat_irqs on node -1
mlx5_ib 0000:04:00.0: irq 139 for MSI/MSI-X
0000:04:00.0:free_4k:221:(pid 1519): page not found
0000:04:00.0:free_4k:221:(pid 1519): page not found
0000:04:00.0:free_4k:221:(pid 1519): page not found
0000:04:00.0:free_4k:221:(pid 1519): page not found
---------------------- cosnole log -----------------
Fixes: bf0bf77f6519 ('mlx5: Support communicating arbitrary host page size to firmware')
Signed-off-by: Honggang Li <honli@redhat.com>
---
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index df22383..8a64542 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -211,26 +211,28 @@ static int alloc_4k(struct mlx5_core_dev *dev, u64 *addr)
return 0;
}
+#define MLX5_U64_4K_PAGE_MASK ((~(u64)0U) << PAGE_SHIFT)
+
static void free_4k(struct mlx5_core_dev *dev, u64 addr)
{
struct fw_page *fwp;
int n;
- fwp = find_fw_page(dev, addr & PAGE_MASK);
+ fwp = find_fw_page(dev, addr & MLX5_U64_4K_PAGE_MASK);
if (!fwp) {
mlx5_core_warn(dev, "page not found\n");
return;
}
- n = (addr & ~PAGE_MASK) >> MLX5_ADAPTER_PAGE_SHIFT;
+ n = (addr & ~MLX5_U64_4K_PAGE_MASK) >> MLX5_ADAPTER_PAGE_SHIFT;
fwp->free_count++;
set_bit(n, &fwp->bitmask);
if (fwp->free_count == MLX5_NUM_4K_IN_PAGE) {
rb_erase(&fwp->rb_node, &dev->priv.page_root);
if (fwp->free_count != 1)
list_del(&fwp->list);
- dma_unmap_page(&dev->pdev->dev, addr & PAGE_MASK, PAGE_SIZE,
- DMA_BIDIRECTIONAL);
+ dma_unmap_page(&dev->pdev->dev, addr & MLX5_U64_4K_PAGE_MASK,
+ PAGE_SIZE, DMA_BIDIRECTIONAL);
__free_page(fwp->page);
kfree(fwp);
} else if (fwp->free_count == 1) {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH linux-next v4] mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures
2015-04-15 6:21 [PATCH linux-next v4] mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures Honggang Li
@ 2015-04-15 7:11 ` Or Gerlitz
0 siblings, 0 replies; 4+ messages in thread
From: Or Gerlitz @ 2015-04-15 7:11 UTC (permalink / raw)
To: Honggang Li, eli, netdev, linux-rdma
On 4/15/2015 9:21 AM, Honggang Li wrote:
> Fixes: bf0bf77f6519 ('mlx5: Support communicating arbitrary host page size to firmware')
>
> Signed-off-by: Honggang Li<honli@redhat.com>
ain't over... avoid the blank line between the Fixes tag to your SOB
> ---
> drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH linux-next v4] mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures
@ 2015-04-15 7:11 ` Or Gerlitz
0 siblings, 0 replies; 4+ messages in thread
From: Or Gerlitz @ 2015-04-15 7:11 UTC (permalink / raw)
To: Honggang Li, eli, netdev, linux-rdma
On 4/15/2015 9:21 AM, Honggang Li wrote:
> Fixes: bf0bf77f6519 ('mlx5: Support communicating arbitrary host page size to firmware')
>
> Signed-off-by: Honggang Li<honli@redhat.com>
ain't over... avoid the blank line between the Fixes tag to your SOB
> ---
> drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH linux-next v4] mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures
[not found] ` <552E0F37.2080509-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
@ 2015-04-15 8:34 ` Honggang LI
0 siblings, 0 replies; 4+ messages in thread
From: Honggang LI @ 2015-04-15 8:34 UTC (permalink / raw)
To: Or Gerlitz
Cc: eli-VPRAkNaXOzVWk0Htik3J/w, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Wed, Apr 15, 2015 at 10:11:51AM +0300, Or Gerlitz wrote:
> On 4/15/2015 9:21 AM, Honggang Li wrote:
> >Fixes: bf0bf77f6519 ('mlx5: Support communicating arbitrary host page size to firmware')
> >
> >Signed-off-by: Honggang Li<honli-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ain't over... avoid the blank line between the Fixes tag to your SOB
Removed the blank line. New patch (v5) has been send out. Really hope it
is the finial one.
thanks
> >---
> > drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 10 ++++++----
> > 1 file changed, 6 insertions(+), 4 deletions(-)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-15 8:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-15 6:21 [PATCH linux-next v4] mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures Honggang Li
2015-04-15 7:11 ` Or Gerlitz
2015-04-15 7:11 ` Or Gerlitz
[not found] ` <552E0F37.2080509-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2015-04-15 8:34 ` Honggang LI
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.