* [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages
@ 2015-10-10 4:45 Alison Schofield
2015-10-10 5:53 ` [Outreachy kernel] " Julia Lawall
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alison Schofield @ 2015-10-10 4:45 UTC (permalink / raw)
To: outreachy-kernel
'Out of memory' messages are unnecssary in the drivers as they are
reported by memory management.
Addresses checkpatch.pl: WARNING: Possible unnecessary 'out of memory' message
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
---
drivers/staging/rdma/hfi1/chip.c | 1 -
drivers/staging/rdma/hfi1/init.c | 11 ++---------
drivers/staging/rdma/hfi1/pio.c | 7 +------
drivers/staging/rdma/hfi1/user_sdma.c | 27 +++++++--------------------
4 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index aa58e59..1152359 100644
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -8991,7 +8991,6 @@ static int set_up_interrupts(struct hfi1_devdata *dd)
entries = kcalloc(total, sizeof(*entries), GFP_KERNEL);
if (!entries) {
- dd_dev_err(dd, "cannot allocate msix table\n");
ret = -ENOMEM;
goto fail;
}
diff --git a/drivers/staging/rdma/hfi1/init.c b/drivers/staging/rdma/hfi1/init.c
index a877eda..1fe20ff 100644
--- a/drivers/staging/rdma/hfi1/init.c
+++ b/drivers/staging/rdma/hfi1/init.c
@@ -134,11 +134,8 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd)
dd->assigned_node_id = local_node_id;
dd->rcd = kcalloc(dd->num_rcv_contexts, sizeof(*dd->rcd), GFP_KERNEL);
- if (!dd->rcd) {
- dd_dev_err(dd,
- "Unable to allocate receive context array, failing\n");
+ if (!dd->rcd)
goto nomem;
- }
/* create one or more kernel contexts */
for (i = 0; i < dd->first_user_ctxt; ++i) {
@@ -318,12 +315,8 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt)
if (ctxt < dd->first_user_ctxt) { /* N/A for PSM contexts */
rcd->opstats = kzalloc(sizeof(*rcd->opstats),
GFP_KERNEL);
- if (!rcd->opstats) {
- dd_dev_err(dd,
- "ctxt%u: Unable to allocate per ctxt stats buffer\n",
- rcd->ctxt);
+ if (!rcd->opstats)
goto bail;
- }
}
}
return rcd;
diff --git a/drivers/staging/rdma/hfi1/pio.c b/drivers/staging/rdma/hfi1/pio.c
index 9991814..67dd93a 100644
--- a/drivers/staging/rdma/hfi1/pio.c
+++ b/drivers/staging/rdma/hfi1/pio.c
@@ -435,7 +435,6 @@ int init_send_contexts(struct hfi1_devdata *dd)
sizeof(struct send_context_info),
GFP_KERNEL);
if (!dd->send_contexts || !dd->hw_to_sw) {
- dd_dev_err(dd, "Unable to allocate send context arrays\n");
kfree(dd->hw_to_sw);
kfree(dd->send_contexts);
free_credit_return(dd);
@@ -684,10 +683,8 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
return NULL;
sc = kzalloc_node(sizeof(struct send_context), GFP_KERNEL, numa);
- if (!sc) {
- dd_dev_err(dd, "Cannot allocate send context structure\n");
+ if (!sc)
return NULL;
- }
spin_lock_irqsave(&dd->sc_lock, flags);
ret = sc_hw_alloc(dd, type, &sw_index, &hw_context);
@@ -813,8 +810,6 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
sc->sr = kzalloc_node(sizeof(union pio_shadow_ring) *
sc->sr_size, GFP_KERNEL, numa);
if (!sc->sr) {
- dd_dev_err(dd,
- "Cannot allocate send context shadow ring structure\n");
sc_free(sc);
return NULL;
}
diff --git a/drivers/staging/rdma/hfi1/user_sdma.c b/drivers/staging/rdma/hfi1/user_sdma.c
index 6620262..b20cbb9 100644
--- a/drivers/staging/rdma/hfi1/user_sdma.c
+++ b/drivers/staging/rdma/hfi1/user_sdma.c
@@ -378,20 +378,14 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
dd = uctxt->dd;
pq = kzalloc(sizeof(*pq), GFP_KERNEL);
- if (!pq) {
- dd_dev_err(dd,
- "[%u:%u] Failed to allocate SDMA request struct\n",
- uctxt->ctxt, subctxt_fp(fp));
+ if (!pq)
goto pq_nomem;
- }
+
memsize = sizeof(*pq->reqs) * hfi1_sdma_comp_ring_size;
pq->reqs = kmalloc(memsize, GFP_KERNEL);
- if (!pq->reqs) {
- dd_dev_err(dd,
- "[%u:%u] Failed to allocate SDMA request queue (%u)\n",
- uctxt->ctxt, subctxt_fp(fp), memsize);
+ if (!pq->reqs)
goto pq_reqs_nomem;
- }
+
INIT_LIST_HEAD(&pq->list);
pq->dd = dd;
pq->ctxt = uctxt->ctxt;
@@ -417,22 +411,15 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
}
user_sdma_pkt_fp(fp) = pq;
cq = kzalloc(sizeof(*cq), GFP_KERNEL);
- if (!cq) {
- dd_dev_err(dd,
- "[%u:%u] Failed to allocate SDMA completion queue\n",
- uctxt->ctxt, subctxt_fp(fp));
+ if (!cq)
goto cq_nomem;
- }
memsize = ALIGN(sizeof(*cq->comps) * hfi1_sdma_comp_ring_size,
PAGE_SIZE);
cq->comps = vmalloc_user(memsize);
- if (!cq->comps) {
- dd_dev_err(dd,
- "[%u:%u] Failed to allocate SDMA completion queue entries\n",
- uctxt->ctxt, subctxt_fp(fp));
+ if (!cq->comps)
goto cq_comps_nomem;
- }
+
cq->nentries = hfi1_sdma_comp_ring_size;
user_sdma_comp_fp(fp) = cq;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages
2015-10-10 4:45 [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages Alison Schofield
@ 2015-10-10 5:53 ` Julia Lawall
2015-10-10 17:13 ` Alison Schofield
2015-10-10 8:22 ` Sudip Mukherjee
2015-10-12 21:28 ` [PATCH v2] staging: rdma: hfi1: remove unnecessary out of memory messages Alison Schofield
2 siblings, 1 reply; 6+ messages in thread
From: Julia Lawall @ 2015-10-10 5:53 UTC (permalink / raw)
To: Alison Schofield; +Cc: outreachy-kernel
On Fri, 9 Oct 2015, Alison Schofield wrote:
> 'Out of memory' messages are unnecssary in the drivers as they are
> reported by memory management.
>
> Addresses checkpatch.pl: WARNING: Possible unnecessary 'out of memory' message
>
> Signed-off-by: Alison Schofield <amsfield22@gmail.com>
> ---
> drivers/staging/rdma/hfi1/chip.c | 1 -
> drivers/staging/rdma/hfi1/init.c | 11 ++---------
> drivers/staging/rdma/hfi1/pio.c | 7 +------
> drivers/staging/rdma/hfi1/user_sdma.c | 27 +++++++--------------------
> 4 files changed, 10 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
> index aa58e59..1152359 100644
> --- a/drivers/staging/rdma/hfi1/chip.c
> +++ b/drivers/staging/rdma/hfi1/chip.c
> @@ -8991,7 +8991,6 @@ static int set_up_interrupts(struct hfi1_devdata *dd)
>
> entries = kcalloc(total, sizeof(*entries), GFP_KERNEL);
> if (!entries) {
> - dd_dev_err(dd, "cannot allocate msix table\n");
Unrelatedly, dd_dev_err is not a standard kernel error reporting function.
Maybe you can replace it with a standard one (I guess dev_err) in the
cases where it is still used.
julia
> ret = -ENOMEM;
> goto fail;
> }
> diff --git a/drivers/staging/rdma/hfi1/init.c b/drivers/staging/rdma/hfi1/init.c
> index a877eda..1fe20ff 100644
> --- a/drivers/staging/rdma/hfi1/init.c
> +++ b/drivers/staging/rdma/hfi1/init.c
> @@ -134,11 +134,8 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd)
> dd->assigned_node_id = local_node_id;
>
> dd->rcd = kcalloc(dd->num_rcv_contexts, sizeof(*dd->rcd), GFP_KERNEL);
> - if (!dd->rcd) {
> - dd_dev_err(dd,
> - "Unable to allocate receive context array, failing\n");
> + if (!dd->rcd)
> goto nomem;
> - }
>
> /* create one or more kernel contexts */
> for (i = 0; i < dd->first_user_ctxt; ++i) {
> @@ -318,12 +315,8 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt)
> if (ctxt < dd->first_user_ctxt) { /* N/A for PSM contexts */
> rcd->opstats = kzalloc(sizeof(*rcd->opstats),
> GFP_KERNEL);
> - if (!rcd->opstats) {
> - dd_dev_err(dd,
> - "ctxt%u: Unable to allocate per ctxt stats buffer\n",
> - rcd->ctxt);
> + if (!rcd->opstats)
> goto bail;
> - }
> }
> }
> return rcd;
> diff --git a/drivers/staging/rdma/hfi1/pio.c b/drivers/staging/rdma/hfi1/pio.c
> index 9991814..67dd93a 100644
> --- a/drivers/staging/rdma/hfi1/pio.c
> +++ b/drivers/staging/rdma/hfi1/pio.c
> @@ -435,7 +435,6 @@ int init_send_contexts(struct hfi1_devdata *dd)
> sizeof(struct send_context_info),
> GFP_KERNEL);
> if (!dd->send_contexts || !dd->hw_to_sw) {
> - dd_dev_err(dd, "Unable to allocate send context arrays\n");
> kfree(dd->hw_to_sw);
> kfree(dd->send_contexts);
> free_credit_return(dd);
> @@ -684,10 +683,8 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
> return NULL;
>
> sc = kzalloc_node(sizeof(struct send_context), GFP_KERNEL, numa);
> - if (!sc) {
> - dd_dev_err(dd, "Cannot allocate send context structure\n");
> + if (!sc)
> return NULL;
> - }
>
> spin_lock_irqsave(&dd->sc_lock, flags);
> ret = sc_hw_alloc(dd, type, &sw_index, &hw_context);
> @@ -813,8 +810,6 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
> sc->sr = kzalloc_node(sizeof(union pio_shadow_ring) *
> sc->sr_size, GFP_KERNEL, numa);
> if (!sc->sr) {
> - dd_dev_err(dd,
> - "Cannot allocate send context shadow ring structure\n");
> sc_free(sc);
> return NULL;
> }
> diff --git a/drivers/staging/rdma/hfi1/user_sdma.c b/drivers/staging/rdma/hfi1/user_sdma.c
> index 6620262..b20cbb9 100644
> --- a/drivers/staging/rdma/hfi1/user_sdma.c
> +++ b/drivers/staging/rdma/hfi1/user_sdma.c
> @@ -378,20 +378,14 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
> dd = uctxt->dd;
>
> pq = kzalloc(sizeof(*pq), GFP_KERNEL);
> - if (!pq) {
> - dd_dev_err(dd,
> - "[%u:%u] Failed to allocate SDMA request struct\n",
> - uctxt->ctxt, subctxt_fp(fp));
> + if (!pq)
> goto pq_nomem;
> - }
> +
> memsize = sizeof(*pq->reqs) * hfi1_sdma_comp_ring_size;
> pq->reqs = kmalloc(memsize, GFP_KERNEL);
> - if (!pq->reqs) {
> - dd_dev_err(dd,
> - "[%u:%u] Failed to allocate SDMA request queue (%u)\n",
> - uctxt->ctxt, subctxt_fp(fp), memsize);
> + if (!pq->reqs)
> goto pq_reqs_nomem;
> - }
> +
> INIT_LIST_HEAD(&pq->list);
> pq->dd = dd;
> pq->ctxt = uctxt->ctxt;
> @@ -417,22 +411,15 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
> }
> user_sdma_pkt_fp(fp) = pq;
> cq = kzalloc(sizeof(*cq), GFP_KERNEL);
> - if (!cq) {
> - dd_dev_err(dd,
> - "[%u:%u] Failed to allocate SDMA completion queue\n",
> - uctxt->ctxt, subctxt_fp(fp));
> + if (!cq)
> goto cq_nomem;
> - }
>
> memsize = ALIGN(sizeof(*cq->comps) * hfi1_sdma_comp_ring_size,
> PAGE_SIZE);
> cq->comps = vmalloc_user(memsize);
> - if (!cq->comps) {
> - dd_dev_err(dd,
> - "[%u:%u] Failed to allocate SDMA completion queue entries\n",
> - uctxt->ctxt, subctxt_fp(fp));
> + if (!cq->comps)
> goto cq_comps_nomem;
> - }
> +
> cq->nentries = hfi1_sdma_comp_ring_size;
> user_sdma_comp_fp(fp) = cq;
>
> --
> 2.1.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151010044521.GA27086%40Ubuntu-D830.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages
2015-10-10 4:45 [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages Alison Schofield
2015-10-10 5:53 ` [Outreachy kernel] " Julia Lawall
@ 2015-10-10 8:22 ` Sudip Mukherjee
2015-10-12 21:28 ` [PATCH v2] staging: rdma: hfi1: remove unnecessary out of memory messages Alison Schofield
2 siblings, 0 replies; 6+ messages in thread
From: Sudip Mukherjee @ 2015-10-10 8:22 UTC (permalink / raw)
To: Alison Schofield; +Cc: outreachy-kernel
On Fri, Oct 09, 2015 at 09:45:34PM -0700, Alison Schofield wrote:
> 'Out of memory' messages are unnecssary in the drivers as they are
> reported by memory management.
>
> Addresses checkpatch.pl: WARNING: Possible unnecessary 'out of memory' message
>
> Signed-off-by: Alison Schofield <amsfield22@gmail.com>
> ---
<snip>
> diff --git a/drivers/staging/rdma/hfi1/user_sdma.c b/drivers/staging/rdma/hfi1/user_sdma.c
> index 6620262..b20cbb9 100644
> --- a/drivers/staging/rdma/hfi1/user_sdma.c
> +++ b/drivers/staging/rdma/hfi1/user_sdma.c
> @@ -378,20 +378,14 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
> dd = uctxt->dd;
>
> pq = kzalloc(sizeof(*pq), GFP_KERNEL);
> - if (!pq) {
> - dd_dev_err(dd,
> - "[%u:%u] Failed to allocate SDMA request struct\n",
> - uctxt->ctxt, subctxt_fp(fp));
> + if (!pq)
> goto pq_nomem;
> - }
> +
> memsize = sizeof(*pq->reqs) * hfi1_sdma_comp_ring_size;
> pq->reqs = kmalloc(memsize, GFP_KERNEL);
> - if (!pq->reqs) {
> - dd_dev_err(dd,
> - "[%u:%u] Failed to allocate SDMA request queue (%u)\n",
> - uctxt->ctxt, subctxt_fp(fp), memsize);
> + if (!pq->reqs)
trailing whitespace error here.
regards
sudip
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages
2015-10-10 5:53 ` [Outreachy kernel] " Julia Lawall
@ 2015-10-10 17:13 ` Alison Schofield
2015-10-10 17:31 ` Julia Lawall
0 siblings, 1 reply; 6+ messages in thread
From: Alison Schofield @ 2015-10-10 17:13 UTC (permalink / raw)
To: Julia Lawall; +Cc: outreachy-kernel
On Sat, Oct 10, 2015 at 07:53:50AM +0200, Julia Lawall wrote:
> On Fri, 9 Oct 2015, Alison Schofield wrote:
>
> > 'Out of memory' messages are unnecssary in the drivers as they are
> > reported by memory management.
> >
> > Addresses checkpatch.pl: WARNING: Possible unnecessary 'out of memory' message
> >
> > Signed-off-by: Alison Schofield <amsfield22@gmail.com>
> > ---
> > drivers/staging/rdma/hfi1/chip.c | 1 -
> > drivers/staging/rdma/hfi1/init.c | 11 ++---------
> > drivers/staging/rdma/hfi1/pio.c | 7 +------
> > drivers/staging/rdma/hfi1/user_sdma.c | 27 +++++++--------------------
> > 4 files changed, 10 insertions(+), 36 deletions(-)
> >
> > diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
> > index aa58e59..1152359 100644
> > --- a/drivers/staging/rdma/hfi1/chip.c
> > +++ b/drivers/staging/rdma/hfi1/chip.c
> > @@ -8991,7 +8991,6 @@ static int set_up_interrupts(struct hfi1_devdata *dd)
> >
> > entries = kcalloc(total, sizeof(*entries), GFP_KERNEL);
> > if (!entries) {
> > - dd_dev_err(dd, "cannot allocate msix table\n");
>
> Unrelatedly, dd_dev_err is not a standard kernel error reporting function.
> Maybe you can replace it with a standard one (I guess dev_err) in the
> cases where it is still used.
>
> julia
The header file defines dd_dev_err to load params to dev_err. (It does
this similarly for all types of dev_* messages.)
hfi1.h:
#define dd_dev_err(dd, fmt, ...) \
dev_err(&(dd)->pcidev->dev, "%s: " fmt, \
get_unit_name((dd)->unit), ##__VA_ARGS__)
Simplifies calls in *.c and improves readabilty (249 instances in hfi1)
Leave it alone - right?
alison
>
> > ret = -ENOMEM;
> > goto fail;
> > }
> > diff --git a/drivers/staging/rdma/hfi1/init.c b/drivers/staging/rdma/hfi1/init.c
> > index a877eda..1fe20ff 100644
> > --- a/drivers/staging/rdma/hfi1/init.c
> > +++ b/drivers/staging/rdma/hfi1/init.c
> > @@ -134,11 +134,8 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd)
> > dd->assigned_node_id = local_node_id;
> >
> > dd->rcd = kcalloc(dd->num_rcv_contexts, sizeof(*dd->rcd), GFP_KERNEL);
> > - if (!dd->rcd) {
> > - dd_dev_err(dd,
> > - "Unable to allocate receive context array, failing\n");
> > + if (!dd->rcd)
> > goto nomem;
> > - }
> >
> > /* create one or more kernel contexts */
> > for (i = 0; i < dd->first_user_ctxt; ++i) {
> > @@ -318,12 +315,8 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt)
> > if (ctxt < dd->first_user_ctxt) { /* N/A for PSM contexts */
> > rcd->opstats = kzalloc(sizeof(*rcd->opstats),
> > GFP_KERNEL);
> > - if (!rcd->opstats) {
> > - dd_dev_err(dd,
> > - "ctxt%u: Unable to allocate per ctxt stats buffer\n",
> > - rcd->ctxt);
> > + if (!rcd->opstats)
> > goto bail;
> > - }
> > }
> > }
> > return rcd;
> > diff --git a/drivers/staging/rdma/hfi1/pio.c b/drivers/staging/rdma/hfi1/pio.c
> > index 9991814..67dd93a 100644
> > --- a/drivers/staging/rdma/hfi1/pio.c
> > +++ b/drivers/staging/rdma/hfi1/pio.c
> > @@ -435,7 +435,6 @@ int init_send_contexts(struct hfi1_devdata *dd)
> > sizeof(struct send_context_info),
> > GFP_KERNEL);
> > if (!dd->send_contexts || !dd->hw_to_sw) {
> > - dd_dev_err(dd, "Unable to allocate send context arrays\n");
> > kfree(dd->hw_to_sw);
> > kfree(dd->send_contexts);
> > free_credit_return(dd);
> > @@ -684,10 +683,8 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
> > return NULL;
> >
> > sc = kzalloc_node(sizeof(struct send_context), GFP_KERNEL, numa);
> > - if (!sc) {
> > - dd_dev_err(dd, "Cannot allocate send context structure\n");
> > + if (!sc)
> > return NULL;
> > - }
> >
> > spin_lock_irqsave(&dd->sc_lock, flags);
> > ret = sc_hw_alloc(dd, type, &sw_index, &hw_context);
> > @@ -813,8 +810,6 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
> > sc->sr = kzalloc_node(sizeof(union pio_shadow_ring) *
> > sc->sr_size, GFP_KERNEL, numa);
> > if (!sc->sr) {
> > - dd_dev_err(dd,
> > - "Cannot allocate send context shadow ring structure\n");
> > sc_free(sc);
> > return NULL;
> > }
> > diff --git a/drivers/staging/rdma/hfi1/user_sdma.c b/drivers/staging/rdma/hfi1/user_sdma.c
> > index 6620262..b20cbb9 100644
> > --- a/drivers/staging/rdma/hfi1/user_sdma.c
> > +++ b/drivers/staging/rdma/hfi1/user_sdma.c
> > @@ -378,20 +378,14 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
> > dd = uctxt->dd;
> >
> > pq = kzalloc(sizeof(*pq), GFP_KERNEL);
> > - if (!pq) {
> > - dd_dev_err(dd,
> > - "[%u:%u] Failed to allocate SDMA request struct\n",
> > - uctxt->ctxt, subctxt_fp(fp));
> > + if (!pq)
> > goto pq_nomem;
> > - }
> > +
> > memsize = sizeof(*pq->reqs) * hfi1_sdma_comp_ring_size;
> > pq->reqs = kmalloc(memsize, GFP_KERNEL);
> > - if (!pq->reqs) {
> > - dd_dev_err(dd,
> > - "[%u:%u] Failed to allocate SDMA request queue (%u)\n",
> > - uctxt->ctxt, subctxt_fp(fp), memsize);
> > + if (!pq->reqs)
> > goto pq_reqs_nomem;
> > - }
> > +
> > INIT_LIST_HEAD(&pq->list);
> > pq->dd = dd;
> > pq->ctxt = uctxt->ctxt;
> > @@ -417,22 +411,15 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
> > }
> > user_sdma_pkt_fp(fp) = pq;
> > cq = kzalloc(sizeof(*cq), GFP_KERNEL);
> > - if (!cq) {
> > - dd_dev_err(dd,
> > - "[%u:%u] Failed to allocate SDMA completion queue\n",
> > - uctxt->ctxt, subctxt_fp(fp));
> > + if (!cq)
> > goto cq_nomem;
> > - }
> >
> > memsize = ALIGN(sizeof(*cq->comps) * hfi1_sdma_comp_ring_size,
> > PAGE_SIZE);
> > cq->comps = vmalloc_user(memsize);
> > - if (!cq->comps) {
> > - dd_dev_err(dd,
> > - "[%u:%u] Failed to allocate SDMA completion queue entries\n",
> > - uctxt->ctxt, subctxt_fp(fp));
> > + if (!cq->comps)
> > goto cq_comps_nomem;
> > - }
> > +
> > cq->nentries = hfi1_sdma_comp_ring_size;
> > user_sdma_comp_fp(fp) = cq;
> >
> > --
> > 2.1.4
> >
> > --
> > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151010044521.GA27086%40Ubuntu-D830.
> > For more options, visit https://groups.google.com/d/optout.
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages
2015-10-10 17:13 ` Alison Schofield
@ 2015-10-10 17:31 ` Julia Lawall
0 siblings, 0 replies; 6+ messages in thread
From: Julia Lawall @ 2015-10-10 17:31 UTC (permalink / raw)
To: Alison Schofield; +Cc: outreachy-kernel
On Sat, 10 Oct 2015, Alison Schofield wrote:
> On Sat, Oct 10, 2015 at 07:53:50AM +0200, Julia Lawall wrote:
> > On Fri, 9 Oct 2015, Alison Schofield wrote:
> >
> > > 'Out of memory' messages are unnecssary in the drivers as they are
> > > reported by memory management.
> > >
> > > Addresses checkpatch.pl: WARNING: Possible unnecessary 'out of memory' message
> > >
> > > Signed-off-by: Alison Schofield <amsfield22@gmail.com>
> > > ---
> > > drivers/staging/rdma/hfi1/chip.c | 1 -
> > > drivers/staging/rdma/hfi1/init.c | 11 ++---------
> > > drivers/staging/rdma/hfi1/pio.c | 7 +------
> > > drivers/staging/rdma/hfi1/user_sdma.c | 27 +++++++--------------------
> > > 4 files changed, 10 insertions(+), 36 deletions(-)
> > >
> > > diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
> > > index aa58e59..1152359 100644
> > > --- a/drivers/staging/rdma/hfi1/chip.c
> > > +++ b/drivers/staging/rdma/hfi1/chip.c
> > > @@ -8991,7 +8991,6 @@ static int set_up_interrupts(struct hfi1_devdata *dd)
> > >
> > > entries = kcalloc(total, sizeof(*entries), GFP_KERNEL);
> > > if (!entries) {
> > > - dd_dev_err(dd, "cannot allocate msix table\n");
> >
> > Unrelatedly, dd_dev_err is not a standard kernel error reporting function.
> > Maybe you can replace it with a standard one (I guess dev_err) in the
> > cases where it is still used.
> >
> > julia
>
> The header file defines dd_dev_err to load params to dev_err. (It does
> this similarly for all types of dev_* messages.)
>
> hfi1.h:
> #define dd_dev_err(dd, fmt, ...) \
> dev_err(&(dd)->pcidev->dev, "%s: " fmt, \
> get_unit_name((dd)->unit), ##__VA_ARGS__)
>
> Simplifies calls in *.c and improves readabilty (249 instances in hfi1)
>
> Leave it alone - right?
It would be nice if standard functions could be used, as done in the rest
of the kernel. But perhaps it is a complicated change to make. One has
the impression that there are a lot of nested structures, and information
that should be asily accessible is not.
julia
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] staging: rdma: hfi1: remove unnecessary out of memory messages
2015-10-10 4:45 [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages Alison Schofield
2015-10-10 5:53 ` [Outreachy kernel] " Julia Lawall
2015-10-10 8:22 ` Sudip Mukherjee
@ 2015-10-12 21:28 ` Alison Schofield
2 siblings, 0 replies; 6+ messages in thread
From: Alison Schofield @ 2015-10-12 21:28 UTC (permalink / raw)
To: outreachy-kernel
Out of memory messages are unnecssary in the drivers as they are
reported by memory management.
Addresses checkpatch.pl: WARNING: Possible unnecessary 'out of memory' message
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
---
Change in v2: remove trailing whitespace
drivers/staging/rdma/hfi1/chip.c | 1 -
drivers/staging/rdma/hfi1/init.c | 11 ++---------
drivers/staging/rdma/hfi1/pio.c | 7 +------
drivers/staging/rdma/hfi1/user_sdma.c | 27 +++++++--------------------
4 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index aa58e59..1152359 100644
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -8991,7 +8991,6 @@ static int set_up_interrupts(struct hfi1_devdata *dd)
entries = kcalloc(total, sizeof(*entries), GFP_KERNEL);
if (!entries) {
- dd_dev_err(dd, "cannot allocate msix table\n");
ret = -ENOMEM;
goto fail;
}
diff --git a/drivers/staging/rdma/hfi1/init.c b/drivers/staging/rdma/hfi1/init.c
index a877eda..1fe20ff 100644
--- a/drivers/staging/rdma/hfi1/init.c
+++ b/drivers/staging/rdma/hfi1/init.c
@@ -134,11 +134,8 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd)
dd->assigned_node_id = local_node_id;
dd->rcd = kcalloc(dd->num_rcv_contexts, sizeof(*dd->rcd), GFP_KERNEL);
- if (!dd->rcd) {
- dd_dev_err(dd,
- "Unable to allocate receive context array, failing\n");
+ if (!dd->rcd)
goto nomem;
- }
/* create one or more kernel contexts */
for (i = 0; i < dd->first_user_ctxt; ++i) {
@@ -318,12 +315,8 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt)
if (ctxt < dd->first_user_ctxt) { /* N/A for PSM contexts */
rcd->opstats = kzalloc(sizeof(*rcd->opstats),
GFP_KERNEL);
- if (!rcd->opstats) {
- dd_dev_err(dd,
- "ctxt%u: Unable to allocate per ctxt stats buffer\n",
- rcd->ctxt);
+ if (!rcd->opstats)
goto bail;
- }
}
}
return rcd;
diff --git a/drivers/staging/rdma/hfi1/pio.c b/drivers/staging/rdma/hfi1/pio.c
index 9991814..67dd93a 100644
--- a/drivers/staging/rdma/hfi1/pio.c
+++ b/drivers/staging/rdma/hfi1/pio.c
@@ -435,7 +435,6 @@ int init_send_contexts(struct hfi1_devdata *dd)
sizeof(struct send_context_info),
GFP_KERNEL);
if (!dd->send_contexts || !dd->hw_to_sw) {
- dd_dev_err(dd, "Unable to allocate send context arrays\n");
kfree(dd->hw_to_sw);
kfree(dd->send_contexts);
free_credit_return(dd);
@@ -684,10 +683,8 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
return NULL;
sc = kzalloc_node(sizeof(struct send_context), GFP_KERNEL, numa);
- if (!sc) {
- dd_dev_err(dd, "Cannot allocate send context structure\n");
+ if (!sc)
return NULL;
- }
spin_lock_irqsave(&dd->sc_lock, flags);
ret = sc_hw_alloc(dd, type, &sw_index, &hw_context);
@@ -813,8 +810,6 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
sc->sr = kzalloc_node(sizeof(union pio_shadow_ring) *
sc->sr_size, GFP_KERNEL, numa);
if (!sc->sr) {
- dd_dev_err(dd,
- "Cannot allocate send context shadow ring structure\n");
sc_free(sc);
return NULL;
}
diff --git a/drivers/staging/rdma/hfi1/user_sdma.c b/drivers/staging/rdma/hfi1/user_sdma.c
index 6620262..e59a52e 100644
--- a/drivers/staging/rdma/hfi1/user_sdma.c
+++ b/drivers/staging/rdma/hfi1/user_sdma.c
@@ -378,20 +378,14 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
dd = uctxt->dd;
pq = kzalloc(sizeof(*pq), GFP_KERNEL);
- if (!pq) {
- dd_dev_err(dd,
- "[%u:%u] Failed to allocate SDMA request struct\n",
- uctxt->ctxt, subctxt_fp(fp));
+ if (!pq)
goto pq_nomem;
- }
+
memsize = sizeof(*pq->reqs) * hfi1_sdma_comp_ring_size;
pq->reqs = kmalloc(memsize, GFP_KERNEL);
- if (!pq->reqs) {
- dd_dev_err(dd,
- "[%u:%u] Failed to allocate SDMA request queue (%u)\n",
- uctxt->ctxt, subctxt_fp(fp), memsize);
+ if (!pq->reqs)
goto pq_reqs_nomem;
- }
+
INIT_LIST_HEAD(&pq->list);
pq->dd = dd;
pq->ctxt = uctxt->ctxt;
@@ -417,22 +411,15 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp)
}
user_sdma_pkt_fp(fp) = pq;
cq = kzalloc(sizeof(*cq), GFP_KERNEL);
- if (!cq) {
- dd_dev_err(dd,
- "[%u:%u] Failed to allocate SDMA completion queue\n",
- uctxt->ctxt, subctxt_fp(fp));
+ if (!cq)
goto cq_nomem;
- }
memsize = ALIGN(sizeof(*cq->comps) * hfi1_sdma_comp_ring_size,
PAGE_SIZE);
cq->comps = vmalloc_user(memsize);
- if (!cq->comps) {
- dd_dev_err(dd,
- "[%u:%u] Failed to allocate SDMA completion queue entries\n",
- uctxt->ctxt, subctxt_fp(fp));
+ if (!cq->comps)
goto cq_comps_nomem;
- }
+
cq->nentries = hfi1_sdma_comp_ring_size;
user_sdma_comp_fp(fp) = cq;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-12 21:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-10 4:45 [PATCH] staging: rdma: hfi1: remove unnecessary 'out of memory' messages Alison Schofield
2015-10-10 5:53 ` [Outreachy kernel] " Julia Lawall
2015-10-10 17:13 ` Alison Schofield
2015-10-10 17:31 ` Julia Lawall
2015-10-10 8:22 ` Sudip Mukherjee
2015-10-12 21:28 ` [PATCH v2] staging: rdma: hfi1: remove unnecessary out of memory messages Alison Schofield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.