net/mlx4_en: Fix pages never dma unmapped on rx
authorAmir Vadai <amirv@mellanox.com>
Mon, 7 Oct 2013 11:38:13 +0000 (13:38 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Oct 2013 20:09:50 +0000 (16:09 -0400)
This patch fixes a bug introduced by commit 51151a16 (mlx4: allow
order-0 memory allocations in RX path).

dma_unmap_page never reached because condition to detect last fragment
in page is wrong. offset+frag_stride can't be greater than size, need to
make sure no additional frag will fit in page => compare offset +
frag_stride + next_frag_size instead.
next_frag_size is the same as the current one, since page is shared only
with frags of the same size.

CC: Eric Dumazet <edumazet@google.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx4/en_rx.c

index 066fc2747854416e02f543b75bdc337893708b1a..afe2efa69c8683647766a8d5dc7d561f3f76c2df 100644 (file)
@@ -135,9 +135,10 @@ static void mlx4_en_free_frag(struct mlx4_en_priv *priv,
                              int i)
 {
        const struct mlx4_en_frag_info *frag_info = &priv->frag_info[i];
+       u32 next_frag_end = frags[i].page_offset + 2 * frag_info->frag_stride;
 
-       if (frags[i].page_offset + frag_info->frag_stride >
-           frags[i].page_size)
+
+       if (next_frag_end > frags[i].page_size)
                dma_unmap_page(priv->ddev, frags[i].dma, frags[i].page_size,
                               PCI_DMA_FROMDEVICE);