RDMA/cxgb4: Remove dependency on __GFP_NOFAIL
The alloc_skb() in various allocations are failable, so remove __GFP_NOFAIL from their masks. Signed-off-by: David Rientjes <rientjes@google.com> Acked-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
ba6d39256b
commit
d3c814e8b2
3 changed files with 6 additions and 6 deletions
|
@ -43,7 +43,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
wr_len = sizeof *res_wr + sizeof *res;
|
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)
|
if (!skb)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
||||||
|
@ -118,7 +118,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
|
||||||
/* build fw_ri_res_wr */
|
/* build fw_ri_res_wr */
|
||||||
wr_len = sizeof *res_wr + sizeof *res;
|
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) {
|
if (!skb) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto err4;
|
goto err4;
|
||||||
|
|
|
@ -59,7 +59,7 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
|
||||||
wr_len = roundup(sizeof *req + sizeof *sc +
|
wr_len = roundup(sizeof *req + sizeof *sc +
|
||||||
roundup(copy_len, T4_ULPTX_MIN_IO), 16);
|
roundup(copy_len, T4_ULPTX_MIN_IO), 16);
|
||||||
|
|
||||||
skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
|
skb = alloc_skb(wr_len, GFP_KERNEL);
|
||||||
if (!skb)
|
if (!skb)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
||||||
|
|
|
@ -130,7 +130,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
|
||||||
/* build fw_ri_res_wr */
|
/* build fw_ri_res_wr */
|
||||||
wr_len = sizeof *res_wr + 2 * sizeof *res;
|
wr_len = sizeof *res_wr + 2 * sizeof *res;
|
||||||
|
|
||||||
skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
|
skb = alloc_skb(wr_len, GFP_KERNEL);
|
||||||
if (!skb) {
|
if (!skb) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto err7;
|
goto err7;
|
||||||
|
@ -961,7 +961,7 @@ static int rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
|
||||||
PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
|
PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
|
||||||
qhp->ep->hwtid);
|
qhp->ep->hwtid);
|
||||||
|
|
||||||
skb = alloc_skb(sizeof *wqe, GFP_KERNEL | __GFP_NOFAIL);
|
skb = alloc_skb(sizeof *wqe, GFP_KERNEL);
|
||||||
if (!skb)
|
if (!skb)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
|
set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
|
||||||
|
@ -1035,7 +1035,7 @@ static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
|
||||||
PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
|
PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
|
||||||
qhp->ep->hwtid);
|
qhp->ep->hwtid);
|
||||||
|
|
||||||
skb = alloc_skb(sizeof *wqe, GFP_KERNEL | __GFP_NOFAIL);
|
skb = alloc_skb(sizeof *wqe, GFP_KERNEL);
|
||||||
if (!skb)
|
if (!skb)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
|
set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
|
||||||
|
|
Reference in a new issue