block: mtip32xx: Fix usage of dma_map_sg()
PATCH 1/1 block: mtip32xx: Fix usage of dma_map_sg()
The dma_map_sg() can fail and, in case of failure, returns 0. If it fails, mtip_hw_submit_io() returns an error.
The dma_unmap_sg() requires the nents parameter to be the same as the one passed to dma_map_sg(). This patch saves the nents in command->scatter_ents.
--- drivers/block/mtip32xx/mtip32xx.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/block/mtip32xx/mtip32xx.c +17 -10
@@ -2040,11 +2040,12 @@ static int mtip_hw_ioctl(struct driver_data *dd, unsigned int cmd,* @dir Direction (read or write) * * return value -* None +* 0 The IO completed successfully. +* -ENOMEM The DMA mapping failed. */ -static void mtip_hw_submit_io (struct driver_data *dd,struct request *rq, -struct mtip_cmd *command, -struct blk_mq_hw_ctx *hctx) +static int mtip_hw_submit_io (struct driver_data *dd,struct request *rq, +struct mtip_cmd *command, +struct blk_mq_hw_ctx *hctx) {struct mtip_cmd_hdr *hdr = dd->port->command_list +sizeof (struct mtip_cmd_hdr ) * rq->tag;
@@ -2056,12 +2057,14 @@ static void mtip_hw_submit_io(struct driver_data *dd, struct request *rq,unsigned int nents;/* Map the scatter list for DMA access */ - nents =blk_rq_map_sg (rq, command->sg); - nents =dma_map_sg (&dd->pdev->dev, command->sg, nents, dma_dir); + command->scatter_ents =blk_rq_map_sg (rq, command->sg); + nents =dma_map_sg (&dd->pdev->dev, command->sg, + command->scatter_ents, dma_dir); +if (!nents) +return -ENOMEM ; -prefetch (&port->flags); - command->scatter_ents = nents; +prefetch (&port->flags);/* * The number of retries for this command before it is
@@ -2112,11 +2115,13 @@ static void mtip_hw_submit_io(struct driver_data *dd, struct request *rq,if (unlikely (port->flags &MTIP_PF_PAUSE_IO )) {set_bit (rq->tag, port->cmds_to_issue);set_bit (MTIP_PF_ISSUE_CMDS_BIT , &port->flags); -return ; +return 0 ; }/* Issue the command to the hardware */ mtip_issue_ncq_command (port, rq->tag); + +return 0 ; }/*
@@ -3315,7 +3320,9 @@ static blk_status_t mtip_queue_rq(struct blk_mq_hw_ctx *hctx,blk_mq_start_request (rq); -mtip_hw_submit_io (dd, rq, cmd, hctx); +if (mtip_hw_submit_io (dd, rq, cmd, hctx)) +return BLK_STS_IOERR ; +return BLK_STS_OK ; }
Signature · 1 line
2.43.0
Quoted 6 lines · Thomas Fourier
The
dma_map_sg()can fail and, in case of failure, returns 0. If it fails,mtip_hw_submit_io()returns an error.The
dma_unmap_sg()requires the nents parameter to be the same as the one passed todma_map_sg(). This patch saves the nents incommand->scatter_ents.
I don't know why I'm in Cc list here, but FWIW,
with a caveat that I am not an expert at all in these areas. Code just look okay and doing sane things.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 8 lines · Thomas Fourier
The
dma_map_sg()can fail and, in case of failure, returns 0. If it fails,mtip_hw_submit_io()returns an error.The
dma_unmap_sg()requires the nents parameter to be the same as the one passed todma_map_sg(). This patch saves the nents incommand->scatter_ents.[...]
Applied, thanks!
[1/1] block: mtip32xx: Fix usage of dma_map_sg()
commit: 8e1fab9cccc7b806b0cffdceabb09b310b83b553
Best regards,
Signature · 1 line
Jens Axboe