From: Dave Jiang <dave.jiang@intel.com>
To: Pan Bian <bianpan2016@163.com>,
"Williams, Dan J" <dan.j.williams@intel.com>,
"Koul, Vinod" <vinod.koul@intel.com>,
Julia Lawall <Julia.Lawall@lip6.fr>
Cc: "dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] dma: ioat: fix improper return value on failures
Date: Thu, 1 Dec 2016 09:46:41 -0700 [thread overview]
Message-ID: <9db614ac-8740-51f0-1d72-a1e08a6c70f3@intel.com> (raw)
In-Reply-To: <1480577529-30981-1-git-send-email-bianpan2016@163.com>
On 12/01/2016 12:32 AM, Pan Bian wrote:
> Fix bug https://bugzilla.kernel.org/show_bug.cgi?id=188601. This patch
> is based on "0001-dma-ioat-set-error-code-on-failures.patch". In this
> patch, assign error code -ENOMEM to return variable err as long as the
> call to dma_mapping_error() fails.
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
Acked-by: Dave Jiang <dave.jiang@intel.com>
> ---
> drivers/dma/ioat/init.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
> index 32383ef..3d589f4 100644
> --- a/drivers/dma/ioat/init.c
> +++ b/drivers/dma/ioat/init.c
> @@ -829,16 +829,20 @@ static int ioat_xor_val_self_test(struct ioatdma_device *ioat_dma)
> op = IOAT_OP_XOR;
>
> dest_dma = dma_map_page(dev, dest, 0, PAGE_SIZE, DMA_FROM_DEVICE);
> - if (dma_mapping_error(dev, dest_dma))
> + if (dma_mapping_error(dev, dest_dma)) {
> + err = -ENOMEM;
> goto free_resources;
> + }
>
> for (i = 0; i < IOAT_NUM_SRC_TEST; i++)
> dma_srcs[i] = DMA_ERROR_CODE;
> for (i = 0; i < IOAT_NUM_SRC_TEST; i++) {
> dma_srcs[i] = dma_map_page(dev, xor_srcs[i], 0, PAGE_SIZE,
> DMA_TO_DEVICE);
> - if (dma_mapping_error(dev, dma_srcs[i]))
> + if (dma_mapping_error(dev, dma_srcs[i])) {
> + err = -ENOMEM;
> goto dma_unmap;
> + }
> }
> tx = dma->device_prep_dma_xor(dma_chan, dest_dma, dma_srcs,
> IOAT_NUM_SRC_TEST, PAGE_SIZE,
> @@ -906,8 +910,10 @@ static int ioat_xor_val_self_test(struct ioatdma_device *ioat_dma)
> for (i = 0; i < IOAT_NUM_SRC_TEST + 1; i++) {
> dma_srcs[i] = dma_map_page(dev, xor_val_srcs[i], 0, PAGE_SIZE,
> DMA_TO_DEVICE);
> - if (dma_mapping_error(dev, dma_srcs[i]))
> + if (dma_mapping_error(dev, dma_srcs[i])) {
> + err = -ENOMEM;
> goto dma_unmap;
> + }
> }
> tx = dma->device_prep_dma_xor_val(dma_chan, dma_srcs,
> IOAT_NUM_SRC_TEST + 1, PAGE_SIZE,
> @@ -959,8 +965,10 @@ static int ioat_xor_val_self_test(struct ioatdma_device *ioat_dma)
> for (i = 0; i < IOAT_NUM_SRC_TEST + 1; i++) {
> dma_srcs[i] = dma_map_page(dev, xor_val_srcs[i], 0, PAGE_SIZE,
> DMA_TO_DEVICE);
> - if (dma_mapping_error(dev, dma_srcs[i]))
> + if (dma_mapping_error(dev, dma_srcs[i])) {
> + err = -ENOMEM;
> goto dma_unmap;
> + }
> }
> tx = dma->device_prep_dma_xor_val(dma_chan, dma_srcs,
> IOAT_NUM_SRC_TEST + 1, PAGE_SIZE,
>
next prev parent reply other threads:[~2016-12-01 16:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 7:32 Pan Bian
2016-12-01 16:46 ` Dave Jiang [this message]
2016-12-02 10:32 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9db614ac-8740-51f0-1d72-a1e08a6c70f3@intel.com \
--to=dave.jiang@intel.com \
--cc=Julia.Lawall@lip6.fr \
--cc=bianpan2016@163.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®