IB/ipoib: Restore MM behavior in case of tx_ring allocation failure

Yuval Shaia · jgunthorpe · commit 9d98e19ba08f · 2017-12-13T10:31:57.000-07:00
memalloc_noio_save modifies the behavior of MM, we must restore it after we are done. Fixes: d83187d ("IB/IPoIB: Convert IPoIB to memalloc_noio_* calls") Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1145,6 +1145,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
 	noio_flag = memalloc_noio_save();
 	p->tx_ring = vzalloc(ipoib_sendq_size * sizeof(*p->tx_ring));
 	if (!p->tx_ring) {
+		memalloc_noio_restore(noio_flag);
 		ret = -ENOMEM;
 		goto err_tx;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1145,6 +1145,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,`
`1145`	`1145`	`noio_flag = memalloc_noio_save();`
`1146`	`1146`	`p->tx_ring = vzalloc(ipoib_sendq_size * sizeof(*p->tx_ring));`
`1147`	`1147`	`if (!p->tx_ring) {`
	`1148`	`+ memalloc_noio_restore(noio_flag);`
`1148`	`1149`	`ret = -ENOMEM;`
`1149`	`1150`	`goto err_tx;`
`1150`	`1151`	`}`