Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@suse.com>2019-04-20 14:56:03 +0200
committerDenis Kirjanov <dkirjanov@suse.com>2019-04-20 14:56:03 +0200
commitab1de4bdffba86d97e4140969f55468af3cff0f9 (patch)
tree8e7037a577757556ce4f29f6e6b10c3a02ec2ed9
parent04606202a1c2fee9217b797a3c9e130dbee4cb02 (diff)
RDMA/iw_cxgb4: Drop __GFP_NOFAIL (bsc#1127371).
-rw-r--r--patches.fixes/0001-RDMA-iw_cxgb4-Drop-__GFP_NOFAIL.patch34
-rw-r--r--series.conf1
2 files changed, 35 insertions, 0 deletions
diff --git a/patches.fixes/0001-RDMA-iw_cxgb4-Drop-__GFP_NOFAIL.patch b/patches.fixes/0001-RDMA-iw_cxgb4-Drop-__GFP_NOFAIL.patch
new file mode 100644
index 0000000000..12e0cbd62b
--- /dev/null
+++ b/patches.fixes/0001-RDMA-iw_cxgb4-Drop-__GFP_NOFAIL.patch
@@ -0,0 +1,34 @@
+From: Jason Gunthorpe <jgg@mellanox.com>
+Subject: RDMA/iw_cxgb4: Drop __GFP_NOFAIL
+Patch-mainline: v5.1-rc1
+Git-commit: 8ba0ddd09406e35782259f2ac18187ec77d8c093
+References: bsc#1127371
+
+There is no reason for this __GFP_NOFAIL, none of the other routines in
+this file use it, and there is an error unwind here. NOFAIL should be
+reserved for special cases, not used by network drivers.
+
+Fixes: 6a0b6174d35a ("rdma/cxgb4: Add support for kernel mode SRQ's")
+Reported-by: Nicholas Mc Guire <hofrat@osadl.org>
+Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+Acked-by: Denis Kirjanov <dkirjanov@suse.com>
+---
+ drivers/infiniband/hw/cxgb4/qp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
+index 03f4c66c2659..c00a41144126 100644
+--- a/drivers/infiniband/hw/cxgb4/qp.c
++++ b/drivers/infiniband/hw/cxgb4/qp.c
+@@ -2597,7 +2597,7 @@ static int alloc_srq_queue(struct c4iw_srq *srq, struct c4iw_dev_ucontext *uctx,
+ /* build fw_ri_res_wr */
+ wr_len = sizeof(*res_wr) + sizeof(*res);
+
+- skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
++ skb = alloc_skb(wr_len, GFP_KERNEL);
+ if (!skb)
+ goto err_free_queue;
+ set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
+--
+2.12.3
+
diff --git a/series.conf b/series.conf
index 1ad4f7d346..b1d83f58fc 100644
--- a/series.conf
+++ b/series.conf
@@ -21155,6 +21155,7 @@
patches.drivers/PCI-PME-Fix-hotplug-sysfs-remove-deadlock-in-pcie_pm.patch
patches.drivers/pci-qcom-don-t-deassert-reset-gpio-during-probe
patches.drivers/PCI-endpoint-functions-Use-memcpy_fromio-memcpy_toio.patch
+ patches.fixes/0001-RDMA-iw_cxgb4-Drop-__GFP_NOFAIL.patch
patches.drivers/IB-core-Destroy-QP-if-XRC-QP-fails.patch
patches.drivers/RDMA-vmw_pvrdma-Support-upto-64-bit-PFNs.patch
patches.drivers/IB-core-Unregister-notifier-before-freeing-MAD-secur.patch