On 04/16/2015 03:48 PM, Don Brace wrote:
> From: Webb Scales <webbnh@xxxxxx>
>
> Increase the request size for ioaccel2 path.
>
> The error, if any, returned by hpsa_allocate_ioaccel2_sg_chain_blocks
> to hpsa_alloc_ioaccel2_cmd_and_bft should be returned upstream rather
> than assumed to be -ENOMEM.
>
> This differs slightly from hpsa_alloc_ioaccel1_cmd_and_bft,
> which does not call another hpsa_allocate function and only
> has -ENOMEM to return from some kmalloc calls.
>
> Reviewed-by: Scott Teel <scott.teel@xxxxxxxx>
> Reviewed-by: Kevin Barnett <kevin.barnett@xxxxxxxx>
> Signed-off-by: Robert Elliott <elliott@xxxxxx>
> Signed-off-by: Don Brace <don.brace@xxxxxxxx>
> ---
> drivers/scsi/hpsa.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++----
> drivers/scsi/hpsa.h | 1
> 2 files changed, 116 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index c9c42e9..1839761 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -1704,6 +1704,46 @@ static void hpsa_slave_destroy(struct scsi_device *sdev)
> /* nothing to do. */
> }
>
> +static void hpsa_free_ioaccel2_sg_chain_blocks(struct ctlr_info *h)
> +{
> + int i;
> +
> + if (!h->ioaccel2_cmd_sg_list)
> + return;
> + for (i = 0; i < h->nr_cmds; i++) {
> + kfree(h->ioaccel2_cmd_sg_list[i]);
> + h->ioaccel2_cmd_sg_list[i] = NULL;
> + }
> + kfree(h->ioaccel2_cmd_sg_list);
> + h->ioaccel2_cmd_sg_list = NULL;
> +}
> +
> +static int hpsa_allocate_ioaccel2_sg_chain_blocks(struct ctlr_info *h)
> +{
> + int i;
> +
> + if (h->chainsize <= 0)
> + return 0;
> +
> + h->ioaccel2_cmd_sg_list =
> + kzalloc(sizeof(*h->ioaccel2_cmd_sg_list) * h->nr_cmds,
> + GFP_KERNEL);
> + if (!h->ioaccel2_cmd_sg_list)
> + return -ENOMEM;
> + for (i = 0; i < h->nr_cmds; i++) {
> + h->ioaccel2_cmd_sg_list[i] =
> + kmalloc(sizeof(*h->ioaccel2_cmd_sg_list[i]) *
> + h->maxsgentries, GFP_KERNEL);
> + if (!h->ioaccel2_cmd_sg_list[i])
> + goto clean;
> + }
> + return 0;
> +
> +clean:
> + hpsa_free_ioaccel2_sg_chain_blocks(h);
> + return -ENOMEM;
> +}
> +
> static void hpsa_free_sg_chain_blocks(struct ctlr_info *h)
> {
> int i;
Any reason why you didn't use mempools here?
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@xxxxxxx +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
