Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756644AbbLDWHS (ORCPT ); Fri, 4 Dec 2015 17:07:18 -0500 Received: from smtp-outbound-2.vmware.com ([208.91.2.13]:33028 "EHLO smtp-outbound-2.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752974AbbLDWHQ convert rfc822-to-8bit (ORCPT ); Fri, 4 Dec 2015 17:07:16 -0500 From: Arvind Kumar To: Johannes Thumshirn , Josh Boyer , "James.Bottomley@hansenpartnership.com" , Thomas Hellstrom CC: "linux-scsi@vger.kernel.org" , "pv-drivers@vmware.com" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v2] VMW_PVSCSI: Fix the issue of DMA-API related warnings. Thread-Topic: [PATCH v2] VMW_PVSCSI: Fix the issue of DMA-API related warnings. Thread-Index: AQHRLc5w7fGMIOmi5EGCwPSr5U0haZ65yYeAgAGa4xY= Date: Fri, 4 Dec 2015 22:07:13 +0000 Message-ID: <1449266802382.21835@vmware.com> References: <20151203132758.GC19092@hansolo.redhat.com>,<1449149747.3311.13.camel@suse.de> In-Reply-To: <1449149747.3311.13.camel@suse.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.113.170.11] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6376 Lines: 161 Thanks Josh! The patch looks good to me. Thanks! Arvind ________________________________________ From: Johannes Thumshirn Sent: Thursday, December 3, 2015 5:35 AM To: Josh Boyer; James.Bottomley@hansenpartnership.com; Arvind Kumar; Thomas Hellstrom Cc: linux-scsi@vger.kernel.org; pv-drivers@vmware.com; linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] VMW_PVSCSI: Fix the issue of DMA-API related warnings. On Thu, 2015-12-03 at 08:27 -0500, Josh Boyer wrote: > The driver is missing calls to pci_dma_mapping_error() after > performing the DMA mapping, which caused DMA-API warning to > show up in dmesg's output. Though that happens only when > DMA_API_DEBUG option is enabled. This change fixes the issue > and makes pvscsi_map_buffers() function more robust. > > Signed-off-by: Arvind Kumar > Cc: Josh Boyer > Reviewed-by: Thomas Hellstrom > Signed-off-by: Josh Boyer > --- > > v2: Use -ENOMEM instead of -1 for the error return code as suggested by > Johannes Thumshirn > > drivers/scsi/vmw_pvscsi.c | 45 +++++++++++++++++++++++++++++++++++++++------ > drivers/scsi/vmw_pvscsi.h |??2 +- > 2 files changed, 40 insertions(+), 7 deletions(-) > > diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c > index 0f133c1817de..6164634aff18 100644 > --- a/drivers/scsi/vmw_pvscsi.c > +++ b/drivers/scsi/vmw_pvscsi.c > @@ -349,9 +349,9 @@ static void pvscsi_create_sg(struct pvscsi_ctx *ctx, > * Map all data buffers for a command into PCI space and > * setup the scatter/gather list if needed. > */ > -static void pvscsi_map_buffers(struct pvscsi_adapter *adapter, > - struct pvscsi_ctx *ctx, struct scsi_cmnd > *cmd, > - struct PVSCSIRingReqDesc *e) > +static int pvscsi_map_buffers(struct pvscsi_adapter *adapter, > + struct pvscsi_ctx *ctx, struct scsi_cmnd *cmd, > + struct PVSCSIRingReqDesc *e) > { > unsigned count; > unsigned bufflen = scsi_bufflen(cmd); > @@ -360,18 +360,30 @@ static void pvscsi_map_buffers(struct pvscsi_adapter > *adapter, > e->dataLen = bufflen; > e->dataAddr = 0; > if (bufflen == 0) > - return; > + return 0; > > sg = scsi_sglist(cmd); > count = scsi_sg_count(cmd); > if (count != 0) { > int segs = scsi_dma_map(cmd); > - if (segs > 1) { > + > + if (segs == -ENOMEM) { > + scmd_printk(KERN_ERR, cmd, > + "vmw_pvscsi: Failed to map cmd sglist > for DMA.\n"); > + return -ENOMEM; > + } else if (segs > 1) { > pvscsi_create_sg(ctx, sg, segs); > > e->flags |= PVSCSI_FLAG_CMD_WITH_SG_LIST; > ctx->sglPA = pci_map_single(adapter->dev, ctx->sgl, > SGL_SIZE, > PCI_DMA_TODEVICE); > + if (pci_dma_mapping_error(adapter->dev, ctx->sglPA)) > { > + scmd_printk(KERN_ERR, cmd, > + "vmw_pvscsi: Failed to map ctx > sglist for DMA.\n"); > + scsi_dma_unmap(cmd); > + ctx->sglPA = 0; > + return -ENOMEM; > + } > e->dataAddr = ctx->sglPA; > } else > e->dataAddr = sg_dma_address(sg); > @@ -382,8 +394,15 @@ static void pvscsi_map_buffers(struct pvscsi_adapter > *adapter, > */ > ctx->dataPA = pci_map_single(adapter->dev, sg, bufflen, > cmd->sc_data_direction); > + if (pci_dma_mapping_error(adapter->dev, ctx->dataPA)) { > + scmd_printk(KERN_ERR, cmd, > + "vmw_pvscsi: Failed to map direct data > buffer for DMA.\n"); > + return -ENOMEM; > + } > e->dataAddr = ctx->dataPA; > } > + > + return 0; > } > > static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter, > @@ -690,6 +709,12 @@ static int pvscsi_queue_ring(struct pvscsi_adapter > *adapter, > ctx->sensePA = pci_map_single(adapter->dev, cmd- > >sense_buffer, > SCSI_SENSE_BUFFERSIZE, > PCI_DMA_FROMDEVICE); > + if (pci_dma_mapping_error(adapter->dev, ctx->sensePA)) { > + scmd_printk(KERN_ERR, cmd, > + "vmw_pvscsi: Failed to map sense buffer > for DMA.\n"); > + ctx->sensePA = 0; > + return -ENOMEM; > + } > e->senseAddr = ctx->sensePA; > e->senseLen = SCSI_SENSE_BUFFERSIZE; > } else { > @@ -711,7 +736,15 @@ static int pvscsi_queue_ring(struct pvscsi_adapter > *adapter, > else > e->flags = 0; > > - pvscsi_map_buffers(adapter, ctx, cmd, e); > + if (pvscsi_map_buffers(adapter, ctx, cmd, e) != 0) { > + if (cmd->sense_buffer) { > + pci_unmap_single(adapter->dev, ctx->sensePA, > + SCSI_SENSE_BUFFERSIZE, > + PCI_DMA_FROMDEVICE); > + ctx->sensePA = 0; > + } > + return -ENOMEM; > + } > > e->context = pvscsi_map_context(adapter, ctx); > > diff --git a/drivers/scsi/vmw_pvscsi.h b/drivers/scsi/vmw_pvscsi.h > index ee16f0c5c47d..12712c92f37a 100644 > --- a/drivers/scsi/vmw_pvscsi.h > +++ b/drivers/scsi/vmw_pvscsi.h > @@ -26,7 +26,7 @@ > > #include > > -#define PVSCSI_DRIVER_VERSION_STRING "1.0.5.0-k" > +#define PVSCSI_DRIVER_VERSION_STRING "1.0.6.0-k" > > #define PVSCSI_MAX_NUM_SG_ENTRIES_PER_SEGMENT 128 > Reviewed-by: Johannes Thumshirn -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/