Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760585AbcLAQqp (ORCPT ); Thu, 1 Dec 2016 11:46:45 -0500 Received: from mga11.intel.com ([192.55.52.93]:4955 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758AbcLAQqn (ORCPT ); Thu, 1 Dec 2016 11:46:43 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,282,1477983600"; d="scan'208";a="1066707693" Subject: Re: [PATCH 2/2] dma: ioat: fix improper return value on failures To: Pan Bian , "Williams, Dan J" , "Koul, Vinod" , Julia Lawall References: <1480577529-30981-1-git-send-email-bianpan2016@163.com> Cc: "dmaengine@vger.kernel.org" , "linux-kernel@vger.kernel.org" From: Dave Jiang Message-ID: <9db614ac-8740-51f0-1d72-a1e08a6c70f3@intel.com> Date: Thu, 1 Dec 2016 09:46:41 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1480577529-30981-1-git-send-email-bianpan2016@163.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2443 Lines: 66 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 Acked-by: Dave Jiang > --- > 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, >