|
Nicolas Morey |
4de26a |
From c874ad879c2f29ebe040a34b974389875c0d81eb Mon Sep 17 00:00:00 2001
|
|
Nicolas Morey |
4de26a |
From: Kang Chen <void0red@gmail.com>
|
|
Nicolas Morey |
4de26a |
Date: Mon, 27 Feb 2023 18:02:12 +0800
|
|
Nicolas Morey |
4de26a |
Subject: [PATCH 1/1] IB/hifi1: add a null check of kzalloc_node in
|
|
Nicolas Morey |
4de26a |
hfi1_ipoib_txreq_init
|
|
Nicolas Morey |
4de26a |
Git-commit: c874ad879c2f29ebe040a34b974389875c0d81eb
|
|
Nicolas Morey |
4de26a |
Patch-mainline: v6.4-rc1
|
|
Nicolas Morey |
4de26a |
References: git-fixes
|
|
Nicolas Morey |
4de26a |
|
|
Nicolas Morey |
4de26a |
kzalloc_node may fails, check it and do the cleanup.
|
|
Nicolas Morey |
4de26a |
|
|
Nicolas Morey |
4de26a |
Fixes: b1151b74ff68 ("IB/hfi1: Fix alloc failure with larger txqueuelen")
|
|
Nicolas Morey |
4de26a |
Signed-off-by: Kang Chen <void0red@gmail.com>
|
|
Nicolas Morey |
4de26a |
Link: https://lore.kernel.org/r/20230227100212.910820-1-void0red@gmail.com
|
|
Nicolas Morey |
4de26a |
Signed-off-by: Leon Romanovsky <leon@kernel.org>
|
|
Nicolas Morey |
4de26a |
Acked-by: Nicolas Morey <nmorey@suse.com>
|
|
Nicolas Morey |
4de26a |
---
|
|
Nicolas Morey |
4de26a |
drivers/infiniband/hw/hfi1/ipoib_tx.c | 5 ++++-
|
|
Nicolas Morey |
4de26a |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
Nicolas Morey |
4de26a |
|
|
Nicolas Morey |
4de26a |
diff --git a/drivers/infiniband/hw/hfi1/ipoib_tx.c b/drivers/infiniband/hw/hfi1/ipoib_tx.c
|
|
Nicolas Morey |
4de26a |
index 5d9a7b09ca37..349eb4139136 100644
|
|
Nicolas Morey |
4de26a |
--- a/drivers/infiniband/hw/hfi1/ipoib_tx.c
|
|
Nicolas Morey |
4de26a |
+++ b/drivers/infiniband/hw/hfi1/ipoib_tx.c
|
|
Nicolas Morey |
4de26a |
@@ -737,10 +737,13 @@ int hfi1_ipoib_txreq_init(struct hfi1_ipoib_dev_priv *priv)
|
|
Nicolas Morey |
4de26a |
txq->tx_ring.shift = ilog2(tx_item_size);
|
|
Nicolas Morey |
4de26a |
txq->tx_ring.avail = hfi1_ipoib_ring_hwat(txq);
|
|
Nicolas Morey |
4de26a |
tx_ring = &txq->tx_ring;
|
|
Nicolas Morey |
4de26a |
- for (j = 0; j < tx_ring_size; j++)
|
|
Nicolas Morey |
4de26a |
+ for (j = 0; j < tx_ring_size; j++) {
|
|
Nicolas Morey |
4de26a |
hfi1_txreq_from_idx(tx_ring, j)->sdma_hdr =
|
|
Nicolas Morey |
4de26a |
kzalloc_node(sizeof(*tx->sdma_hdr),
|
|
Nicolas Morey |
4de26a |
GFP_KERNEL, priv->dd->node);
|
|
Nicolas Morey |
4de26a |
+ if (!hfi1_txreq_from_idx(tx_ring, j)->sdma_hdr)
|
|
Nicolas Morey |
4de26a |
+ goto free_txqs;
|
|
Nicolas Morey |
4de26a |
+ }
|
|
Nicolas Morey |
4de26a |
|
|
Nicolas Morey |
4de26a |
netif_tx_napi_add(dev, &txq->napi,
|
|
Nicolas Morey |
4de26a |
hfi1_ipoib_poll_tx_ring,
|
|
Nicolas Morey |
4de26a |
--
|
|
Nicolas Morey |
4de26a |
2.39.1.1.gbe015eda0162
|
|
Nicolas Morey |
4de26a |
|