From 79f778d85aea1cc081fc1776147d872e612d27e6 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Thu, 21 Oct 2021 14:01:29 -0700 Subject: [PATCH] Remove out of memory messages; kernel should print stack trace when allocation fails --- modules/mqnic/mqnic_cq.c | 5 +---- modules/mqnic/mqnic_eq.c | 5 +---- modules/mqnic/mqnic_main.c | 4 +--- modules/mqnic/mqnic_port.c | 4 +--- modules/mqnic/mqnic_rx.c | 6 +----- modules/mqnic/mqnic_tx.c | 6 +----- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/modules/mqnic/mqnic_cq.c b/modules/mqnic/mqnic_cq.c index 42d3e1ea3..10841c201 100644 --- a/modules/mqnic/mqnic_cq.c +++ b/modules/mqnic/mqnic_cq.c @@ -41,10 +41,8 @@ int mqnic_create_cq_ring(struct mqnic_priv *priv, struct mqnic_cq_ring **ring_pt int ret; ring = kzalloc(sizeof(*ring), GFP_KERNEL); - if (!ring) { - dev_err(dev, "Failed to allocate CQ ring"); + if (!ring) return -ENOMEM; - } ring->ndev = priv->ndev; @@ -56,7 +54,6 @@ int mqnic_create_cq_ring(struct mqnic_priv *priv, struct mqnic_cq_ring **ring_pt ring->buf = dma_alloc_coherent(dev, ring->buf_size, &ring->buf_dma_addr, GFP_KERNEL); if (!ring->buf) { - dev_err(dev, "Failed to allocate CQ ring DMA buffer"); ret = -ENOMEM; goto fail_ring; } diff --git a/modules/mqnic/mqnic_eq.c b/modules/mqnic/mqnic_eq.c index 90e4e0d14..a11323958 100644 --- a/modules/mqnic/mqnic_eq.c +++ b/modules/mqnic/mqnic_eq.c @@ -41,10 +41,8 @@ int mqnic_create_eq_ring(struct mqnic_priv *priv, struct mqnic_eq_ring **ring_pt int ret; ring = kzalloc(sizeof(*ring), GFP_KERNEL); - if (!ring) { - dev_err(dev, "Failed to allocate EQ ring"); + if (!ring) return -ENOMEM; - } ring->ndev = priv->ndev; @@ -56,7 +54,6 @@ int mqnic_create_eq_ring(struct mqnic_priv *priv, struct mqnic_eq_ring **ring_pt ring->buf = dma_alloc_coherent(dev, ring->buf_size, &ring->buf_dma_addr, GFP_KERNEL); if (!ring->buf) { - dev_err(dev, "Failed to allocate EQ ring DMA buffer"); ret = -ENOMEM; goto fail_ring; } diff --git a/modules/mqnic/mqnic_main.c b/modules/mqnic/mqnic_main.c index 735cdc831..9e92bd071 100644 --- a/modules/mqnic/mqnic_main.c +++ b/modules/mqnic/mqnic_main.c @@ -155,10 +155,8 @@ static int mqnic_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent #endif mqnic = devm_kzalloc(dev, sizeof(*mqnic), GFP_KERNEL); - if (!mqnic) { - dev_err(dev, "Failed to allocate memory"); + if (!mqnic) return -ENOMEM; - } mqnic->dev = dev; mqnic->pdev = pdev; diff --git a/modules/mqnic/mqnic_port.c b/modules/mqnic/mqnic_port.c index da9281528..5633d9f20 100644 --- a/modules/mqnic/mqnic_port.c +++ b/modules/mqnic/mqnic_port.c @@ -40,10 +40,8 @@ int mqnic_create_port(struct mqnic_priv *priv, struct mqnic_port **port_ptr, struct mqnic_port *port; port = kzalloc(sizeof(*port), GFP_KERNEL); - if (!port) { - dev_err(dev, "Failed to allocate port"); + if (!port) return -ENOMEM; - } *port_ptr = port; diff --git a/modules/mqnic/mqnic_rx.c b/modules/mqnic/mqnic_rx.c index 959f80581..75c37a22a 100644 --- a/modules/mqnic/mqnic_rx.c +++ b/modules/mqnic/mqnic_rx.c @@ -41,10 +41,8 @@ int mqnic_create_rx_ring(struct mqnic_priv *priv, struct mqnic_ring **ring_ptr, int ret; ring = kzalloc(sizeof(*ring), GFP_KERNEL); - if (!ring) { - dev_err(dev, "Failed to allocate RX ring"); + if (!ring) return -ENOMEM; - } ring->size = roundup_pow_of_two(size); ring->size_mask = ring->size - 1; @@ -56,7 +54,6 @@ int mqnic_create_rx_ring(struct mqnic_priv *priv, struct mqnic_ring **ring_ptr, ring->rx_info = kvzalloc(sizeof(*ring->rx_info) * ring->size, GFP_KERNEL); if (!ring->rx_info) { - dev_err(dev, "Failed to allocate rx_info"); ret = -ENOMEM; goto fail_ring; } @@ -65,7 +62,6 @@ int mqnic_create_rx_ring(struct mqnic_priv *priv, struct mqnic_ring **ring_ptr, ring->buf = dma_alloc_coherent(dev, ring->buf_size, &ring->buf_dma_addr, GFP_KERNEL); if (!ring->buf) { - dev_err(dev, "Failed to allocate RX ring DMA buffer"); ret = -ENOMEM; goto fail_info; } diff --git a/modules/mqnic/mqnic_tx.c b/modules/mqnic/mqnic_tx.c index 000babf9e..da8b59379 100644 --- a/modules/mqnic/mqnic_tx.c +++ b/modules/mqnic/mqnic_tx.c @@ -42,10 +42,8 @@ int mqnic_create_tx_ring(struct mqnic_priv *priv, struct mqnic_ring **ring_ptr, int ret; ring = kzalloc(sizeof(*ring), GFP_KERNEL); - if (!ring) { - dev_err(dev, "Failed to allocate TX ring"); + if (!ring) return -ENOMEM; - } ring->size = roundup_pow_of_two(size); ring->full_size = ring->size >> 1; @@ -58,7 +56,6 @@ int mqnic_create_tx_ring(struct mqnic_priv *priv, struct mqnic_ring **ring_ptr, ring->tx_info = kvzalloc(sizeof(*ring->tx_info) * ring->size, GFP_KERNEL); if (!ring->tx_info) { - dev_err(dev, "Failed to allocate tx_info"); ret = -ENOMEM; goto fail_ring; } @@ -67,7 +64,6 @@ int mqnic_create_tx_ring(struct mqnic_priv *priv, struct mqnic_ring **ring_ptr, ring->buf = dma_alloc_coherent(dev, ring->buf_size, &ring->buf_dma_addr, GFP_KERNEL); if (!ring->buf) { - dev_err(dev, "Failed to allocate TX ring DMA buffer"); ret = -ENOMEM; goto fail_info; }