Skip to contentSkip to conversation

VMW_PVSCSI: Fix the issue of DMA-API related warnings.

PATCH In review Arvind Kumar 4 participants 7 messages Mar 21, 2014 – Jul 7, 2015

Subsystems (2)
SCSI VMware pvscsi driver
lore
Share & tools
lore

Arvind Kumar

author
#0 lore raw

PATCH 1/1 VMW_PVSCSI: Fix the issue of DMA-API related warnings.

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 <[email protected]>
Cc Josh Boyer <[email protected]>
---
 drivers/scsi/vmw_pvscsi.c |   45 +++++++++++++++++++++++++++++++++++++++------
 drivers/scsi/vmw_pvscsi.h |    2 +-
 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/scsi/vmw_pvscsi.c +39 -6
index c88e146..9478a00 100644
@@ -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 -1;
+		} 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 -1;
+			}
 			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 -1;
+		}
 		e->dataAddr = ctx->dataPA;
 	}
+
+	return 0;
 }
 
 static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,

@@ -712,6 +731,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 -1;
+		}
 		e->senseAddr = ctx->sensePA;
 		e->senseLen = SCSI_SENSE_BUFFERSIZE;
 	} else {

@@ -737,7 +762,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 -1;
+	}
 
 	e->context = pvscsi_map_context(adapter, ctx);
drivers/scsi/vmw_pvscsi.h +1 -1
index ce45888..fe3b759 100644
@@ -26,7 +26,7 @@
 
 #include <linux/types.h>
 
-#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
Signature · 1 line
1.7.9.5
author
#1 lore raw

Hi James,

Could you please help getting this in?

Thanks!
Arvind

----- Original Message -----
From: "Arvind Kumar" <[email protected]>
To: [email protected], [email protected]
Cc: [email protected], "Josh Boyer" <[email protected]>
Sent: Friday, March 21, 2014 11:08:32 AM
Subject: [Pv-drivers] [PATCH] VMW_PVSCSI: Fix the issue of DMA-API related warnings.

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 <[email protected]>
Cc Josh Boyer <[email protected]>
---
 drivers/scsi/vmw_pvscsi.c |   45 +++++++++++++++++++++++++++++++++++++++------
 drivers/scsi/vmw_pvscsi.h |    2 +-
 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/scsi/vmw_pvscsi.c +39 -6
index c88e146..9478a00 100644
@@ -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 -1;
+		} 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 -1;
+			}
 			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 -1;
+		}
 		e->dataAddr = ctx->dataPA;
 	}
+
+	return 0;
 }
 
 static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,

@@ -712,6 +731,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 -1;
+		}
 		e->senseAddr = ctx->sensePA;
 		e->senseLen = SCSI_SENSE_BUFFERSIZE;
 	} else {

@@ -737,7 +762,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 -1;
+	}
 
 	e->context = pvscsi_map_context(adapter, ctx);
drivers/scsi/vmw_pvscsi.h +1 -1
index ce45888..fe3b759 100644
@@ -26,7 +26,7 @@
 
 #include <linux/types.h>
 
-#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
Signature · 8 lines
1.7.9.5



_______________________________________________
Pv-drivers mailing list
[email protected]
http://mailman2.vmware.com/mailman/listinfo/pv-drivers
author
#2 lore raw

Hi James,

I was wondering if you got time to get to this one. It would be great if you could please help out with getting this patch in.

Thanks!
Arvind

Quoted 136 lines · Arvind Kumar

Hi James,

Could you please help getting this in?

Thanks!
Arvind

----- Original Message -----
From: "Arvind Kumar" <[email protected]>
To: [email protected], [email protected]
Cc: [email protected], "Josh Boyer" <[email protected]>
Sent: Friday, March 21, 2014 11:08:32 AM
Subject: [Pv-drivers] [PATCH] VMW_PVSCSI: Fix the issue of DMA-API related warnings.

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 <[email protected]>
Cc Josh Boyer <[email protected]>
---
 drivers/scsi/vmw_pvscsi.c |   45 +++++++++++++++++++++++++++++++++++++++------
 drivers/scsi/vmw_pvscsi.h |    2 +-
 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/scsi/vmw_pvscsi.c +39 -6
index c88e146..9478a00 100644
@@ -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 -1;
+		} 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 -1;
+			}
 			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 -1;
+		}
 		e->dataAddr = ctx->dataPA;
 	}
+
+	return 0;
 }
 
 static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,

@@ -712,6 +731,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 -1;
+		}
 		e->senseAddr = ctx->sensePA;
 		e->senseLen = SCSI_SENSE_BUFFERSIZE;
 	} else {

@@ -737,7 +762,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 -1;
+	}
 
 	e->context = pvscsi_map_context(adapter, ctx);
drivers/scsi/vmw_pvscsi.h +1 -1
index ce45888..fe3b759 100644
@@ -26,7 +26,7 @@
 
 #include <linux/types.h>
 
-#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
#3 lore raw
In reply to Arvind Kumar
Quoted 8 lines · Arvind Kumar

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 <[email protected]>
Cc Josh Boyer <[email protected]>

This patch has been sent and pinged for 3 months now. It's gotten no comments at all. Should we send it to Linus so it actually gets picked up?

josh

Quoted 119 lines
---
 drivers/scsi/vmw_pvscsi.c |   45 +++++++++++++++++++++++++++++++++++++++------
 drivers/scsi/vmw_pvscsi.h |    2 +-
 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/scsi/vmw_pvscsi.c +39 -6
index c88e146..9478a00 100644
@@ -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 -1;
+               } 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 -1;
+                       }
                        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 -1;
+               }
                e->dataAddr = ctx->dataPA;
        }
+
+       return 0;
 }
 
 static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,

@@ -712,6 +731,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 -1;
+               }
                e->senseAddr = ctx->sensePA;
                e->senseLen = SCSI_SENSE_BUFFERSIZE;
        } else {

@@ -737,7 +762,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 -1;
+       }
 
        e->context = pvscsi_map_context(adapter, ctx);
drivers/scsi/vmw_pvscsi.h +1 -2
index ce45888..fe3b759 100644
@@ -26,7 +26,7 @@
 
 #include <linux/types.h>
 
-#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
 
--

1.7.9.5

maintainer
#4 lore raw
Quoted 7 lines · Josh Boyer
Quoted 6 lines · Arvind Kumar

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.

Quoted 6 lines
Quoted 2 lines
Signed-off-by Arvind Kumar <[email protected]>
Cc Josh Boyer <[email protected]>

This patch has been sent and pinged for 3 months now. It's gotten no comments at all. Should we send it to Linus so it actually gets picked up?

It's waiting for someone to review it. If you're interested in it, have you reviewed it? In which case just add your reviewed by and we're ready to go.

James

Reviewed-by
#5 lore raw
In reply to Josh Boyer
Quoted 7 lines · Josh Boyer
Quoted 6 lines · Arvind Kumar

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.

Quoted 7 lines
Quoted 2 lines
Signed-off-by Arvind Kumar <[email protected]>
Cc Josh Boyer <[email protected]>

This patch has been sent and pinged for 3 months now. It's gotten no comments at all. Should we send it to Linus so it actually gets picked up?

josh

Reviewed-by Thomas Hellstrom <[email protected]>
Quoted 124 lines
Quoted 116 lines
---
 drivers/scsi/vmw_pvscsi.c |   45 +++++++++++++++++++++++++++++++++++++++------
 drivers/scsi/vmw_pvscsi.h |    2 +-
 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/scsi/vmw_pvscsi.c +39 -6
index c88e146..9478a00 100644
@@ -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 -1;
+               } 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 -1;
+                       }
                        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 -1;
+               }
                e->dataAddr = ctx->dataPA;
        }
+
+       return 0;
 }
 
 static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,

@@ -712,6 +731,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 -1;
+               }
                e->senseAddr = ctx->sensePA;
                e->senseLen = SCSI_SENSE_BUFFERSIZE;
        } else {

@@ -737,7 +762,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 -1;
+       }
 
        e->context = pvscsi_map_context(adapter, ctx);
drivers/scsi/vmw_pvscsi.h +1 -2
index ce45888..fe3b759 100644
@@ -26,7 +26,7 @@
 
 #include <linux/types.h>
 
-#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
 
--
Quoted 4 lines

1.7.9.5

_______________________________________________
Pv-drivers mailing list
[email protected]
http://mailman2.vmware.com/mailman/listinfo/pv-drivers

author Reviewed-by Thomas Hellstrom
#6 lore raw

Hi James,

Can you help get this patch in now as it has got a review?

Thanks!
Arvind
________________________________________
From: Thomas Hellstrom
Sent: Thursday, June 11, 2015 11:11 AM
To: Josh Boyer; Arvind Kumar; James Bottomley
Cc: VMware PV-Drivers; Linus Torvalds; [email protected]
Subject: Re: [Pv-drivers] [PATCH] VMW_PVSCSI: Fix the issue of DMA-API related warnings.

Quoted 7 lines · Josh Boyer
Quoted 6 lines · Arvind Kumar

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.

Quoted 7 lines
Quoted 2 lines
Signed-off-by Arvind Kumar <[email protected]>
Cc Josh Boyer <[email protected]>

This patch has been sent and pinged for 3 months now. It's gotten no comments at all. Should we send it to Linus so it actually gets picked up?

josh

Reviewed-by Thomas Hellstrom <[email protected]>
Quoted 124 lines
Quoted 116 lines
---
 drivers/scsi/vmw_pvscsi.c |   45 +++++++++++++++++++++++++++++++++++++++------
 drivers/scsi/vmw_pvscsi.h |    2 +-
 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/scsi/vmw_pvscsi.c +39 -6
index c88e146..9478a00 100644
@@ -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 -1;
+               } 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 -1;
+                       }
                        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 -1;
+               }
                e->dataAddr = ctx->dataPA;
        }
+
+       return 0;
 }
 
 static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,

@@ -712,6 +731,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 -1;
+               }
                e->senseAddr = ctx->sensePA;
                e->senseLen = SCSI_SENSE_BUFFERSIZE;
        } else {

@@ -737,7 +762,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 -1;
+       }
 
        e->context = pvscsi_map_context(adapter, ctx);
drivers/scsi/vmw_pvscsi.h +1 -2
index ce45888..fe3b759 100644
@@ -26,7 +26,7 @@
 
 #include <linux/types.h>
 
-#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
 
--
Quoted 4 lines

1.7.9.5

_______________________________________________
Pv-drivers mailing list
[email protected]
http://mailman2.vmware.com/mailman/listinfo/pv-drivers