net/mlx4_en: tx_info allocated with kmalloc() instead of vmalloc()

Try to allocate using kmalloc_node() first, only on failure use
vmalloc()

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 322cda32ef808c3d896841943619d87ea87ebeb0..14479068001f49d6618079019fca4f3cff0c35e8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -68,7 +68,7 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
        ring->inline_thold = priv->prof->inline_thold;
 
        tmp = size * sizeof(struct mlx4_en_tx_info);
-       ring->tx_info = vmalloc_node(tmp, node);
+       ring->tx_info = kmalloc_node(tmp, GFP_KERNEL | __GFP_NOWARN, node);
        if (!ring->tx_info) {
                ring->tx_info = vmalloc(tmp);
                if (!ring->tx_info) {
@@ -151,7 +151,7 @@ err_bounce:
        kfree(ring->bounce_buf);
        ring->bounce_buf = NULL;
 err_info:
-       vfree(ring->tx_info);
+       kvfree(ring->tx_info);
        ring->tx_info = NULL;
 err_ring:
        kfree(ring);
@@ -174,7 +174,7 @@ void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv,
        mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
        kfree(ring->bounce_buf);
        ring->bounce_buf = NULL;
-       vfree(ring->tx_info);
+       kvfree(ring->tx_info);
        ring->tx_info = NULL;
        kfree(ring);
        *pring = NULL;