* [PATCH] fnic: check pci_map_single() return value
@ 2015-08-12 9:20 Maurizio Lombardi
2015-08-12 11:42 ` Johannes Thumshirn
0 siblings, 1 reply; 3+ messages in thread
From: Maurizio Lombardi @ 2015-08-12 9:20 UTC (permalink / raw)
To: linux-scsi; +Cc: hiralpat, sramars, buchino, jbottomley
the kernel prints some warnings when compiled with CONFIG_DMA_API_DEBUG.
This is because the fnic driver doesn't check the return value of
pci_map_single().
[ 11.942770] scsi host12: fnic
[ 11.950811] ------------[ cut here ]------------
[ 11.950818] WARNING: at lib/dma-debug.c:937 check_unmap+0x47b/0x920()
[ 11.950821] fnic 0000:0c:00.0: DMA-API: device driver failed to check map error[device address=0x0000002020a30040] [size=44 bytes] [mapped as single]
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
---
drivers/scsi/fnic/fnic_fcs.c | 32 +++++++++++++++++++++++++++++---
drivers/scsi/fnic/fnic_scsi.c | 16 ++++++++++++++++
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index bf0bbd4..4adf9c3 100644
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -939,6 +939,7 @@ int fnic_alloc_rq_frame(struct vnic_rq *rq)
struct sk_buff *skb;
u16 len;
dma_addr_t pa;
+ int r;
len = FC_FRAME_HEADROOM + FC_MAX_FRAME + FC_FRAME_TAILROOM;
skb = dev_alloc_skb(len);
@@ -952,8 +953,17 @@ int fnic_alloc_rq_frame(struct vnic_rq *rq)
skb_reset_network_header(skb);
skb_put(skb, len);
pa = pci_map_single(fnic->pdev, skb->data, len, PCI_DMA_FROMDEVICE);
+
+ r = pci_dma_mapping_error(fnic->pdev, pa);
+ if (r) {
+ printk(KERN_ERR "PCI mapping failed with error %d\n", r);
+ kfree_skb(skb);
+ goto err;
+ }
+
fnic_queue_rq_desc(rq, skb, pa, len);
- return 0;
+err:
+ return r;
}
void fnic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)
@@ -981,6 +991,7 @@ void fnic_eth_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
struct ethhdr *eth_hdr;
struct vlan_ethhdr *vlan_hdr;
unsigned long flags;
+ int r;
if (!fnic->vlan_hw_insert) {
eth_hdr = (struct ethhdr *)skb_mac_header(skb);
@@ -1003,6 +1014,13 @@ void fnic_eth_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
pa = pci_map_single(fnic->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
+ r = pci_dma_mapping_error(fnic->pdev, pa);
+ if (r) {
+ printk(KERN_ERR "PCI mapping failed with error %d\n", r);
+ kfree_skb(skb);
+ return;
+ }
+
spin_lock_irqsave(&fnic->wq_lock[0], flags);
if (!vnic_wq_desc_avail(wq)) {
pci_unmap_single(fnic->pdev, pa, skb->len, PCI_DMA_TODEVICE);
@@ -1071,6 +1089,12 @@ static int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
pa = pci_map_single(fnic->pdev, eth_hdr, tot_len, PCI_DMA_TODEVICE);
+ ret = pci_dma_mapping_error(fnic->pdev, pa);
+ if (ret) {
+ printk(KERN_ERR "DMA map failed with error %d\n", ret);
+ goto err_mapping_error;
+ }
+
if ((fnic_fc_trace_set_data(fnic->lport->host->host_no, FNIC_FC_SEND,
(char *)eth_hdr, tot_len)) != 0) {
printk(KERN_ERR "fnic ctlr frame trace error!!!");
@@ -1082,15 +1106,17 @@ static int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
pci_unmap_single(fnic->pdev, pa,
tot_len, PCI_DMA_TODEVICE);
ret = -1;
- goto fnic_send_frame_end;
+ goto err_desc_avail;
}
fnic_queue_wq_desc(wq, skb, pa, tot_len, fr_eof(fp),
0 /* hw inserts cos value */,
fnic->vlan_id, 1, 1, 1);
-fnic_send_frame_end:
+
+err_desc_avail:
spin_unlock_irqrestore(&fnic->wq_lock[0], flags);
+err_mapping_error:
if (ret)
dev_kfree_skb_any(fp_skb(fp));
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 155b286..2949d17 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -330,6 +330,7 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
int flags;
u8 exch_flags;
struct scsi_lun fc_lun;
+ int r;
if (sg_count) {
/* For each SGE, create a device desc entry */
@@ -346,6 +347,12 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
io_req->sgl_list,
sizeof(io_req->sgl_list[0]) * sg_count,
PCI_DMA_TODEVICE);
+
+ r = pci_dma_mapping_error(fnic->pdev, io_req->sgl_list_pa);
+ if (r) {
+ printk(KERN_ERR "PCI mapping failed with error %d\n", r);
+ return SCSI_MLQUEUE_HOST_BUSY;
+ }
}
io_req->sense_buf_pa = pci_map_single(fnic->pdev,
@@ -353,6 +360,15 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
SCSI_SENSE_BUFFERSIZE,
PCI_DMA_FROMDEVICE);
+ r = pci_dma_mapping_error(fnic->pdev, io_req->sense_buf_pa);
+ if (r) {
+ pci_unmap_single(fnic->pdev, io_req->sgl_list_pa,
+ sizeof(io_req->sgl_list[0]) * sg_count,
+ PCI_DMA_TODEVICE);
+ printk(KERN_ERR "PCI mapping failed with error %d\n", r);
+ return SCSI_MLQUEUE_HOST_BUSY;
+ }
+
int_to_scsilun(sc->device->lun, &fc_lun);
/* Enqueue the descriptor in the Copy WQ */
--
Maurizio Lombardi
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] fnic: check pci_map_single() return value
2015-08-12 9:20 [PATCH] fnic: check pci_map_single() return value Maurizio Lombardi
@ 2015-08-12 11:42 ` Johannes Thumshirn
2015-08-12 11:56 ` Maurizio Lombardi
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Thumshirn @ 2015-08-12 11:42 UTC (permalink / raw)
To: Maurizio Lombardi; +Cc: linux-scsi, hiralpat, sramars, buchino, jbottomley
Hi Maurizio,
Maurizio Lombardi <mlombard@redhat.com> writes:
> the kernel prints some warnings when compiled with CONFIG_DMA_API_DEBUG.
> This is because the fnic driver doesn't check the return value of
> pci_map_single().
>
> [ 11.942770] scsi host12: fnic
> [ 11.950811] ------------[ cut here ]------------
> [ 11.950818] WARNING: at lib/dma-debug.c:937 check_unmap+0x47b/0x920()
> [ 11.950821] fnic 0000:0c:00.0: DMA-API: device driver failed to check map error[device address=0x0000002020a30040] [size=44 bytes] [mapped as single]
>
> Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
> ---
> drivers/scsi/fnic/fnic_fcs.c | 32 +++++++++++++++++++++++++++++---
> drivers/scsi/fnic/fnic_scsi.c | 16 ++++++++++++++++
> 2 files changed, 45 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
> index bf0bbd4..4adf9c3 100644
> --- a/drivers/scsi/fnic/fnic_fcs.c
> +++ b/drivers/scsi/fnic/fnic_fcs.c
> @@ -939,6 +939,7 @@ int fnic_alloc_rq_frame(struct vnic_rq *rq)
> struct sk_buff *skb;
> u16 len;
> dma_addr_t pa;
> + int r;
>
> len = FC_FRAME_HEADROOM + FC_MAX_FRAME + FC_FRAME_TAILROOM;
> skb = dev_alloc_skb(len);
> @@ -952,8 +953,17 @@ int fnic_alloc_rq_frame(struct vnic_rq *rq)
> skb_reset_network_header(skb);
> skb_put(skb, len);
> pa = pci_map_single(fnic->pdev, skb->data, len, PCI_DMA_FROMDEVICE);
> +
> + r = pci_dma_mapping_error(fnic->pdev, pa);
> + if (r) {
> + printk(KERN_ERR "PCI mapping failed with error %d\n", r);
> + kfree_skb(skb);
> + goto err;
hmmm, how about
goto free_skb;
> + }
> +
> fnic_queue_rq_desc(rq, skb, pa, len);
> - return 0;
> +err:
free_skb:
kfree_skb(skb);
> + return r;
> }
Although the return is near to the error handling, it's preferred to
have the labels named after the action that is taken there.
>
> void fnic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)
> @@ -981,6 +991,7 @@ void fnic_eth_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
> struct ethhdr *eth_hdr;
> struct vlan_ethhdr *vlan_hdr;
> unsigned long flags;
> + int r;
>
> if (!fnic->vlan_hw_insert) {
> eth_hdr = (struct ethhdr *)skb_mac_header(skb);
> @@ -1003,6 +1014,13 @@ void fnic_eth_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
>
> pa = pci_map_single(fnic->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
>
> + r = pci_dma_mapping_error(fnic->pdev, pa);
> + if (r) {
> + printk(KERN_ERR "PCI mapping failed with error %d\n", r);
> + kfree_skb(skb);
> + return;
> + }
> +
> spin_lock_irqsave(&fnic->wq_lock[0], flags);
> if (!vnic_wq_desc_avail(wq)) {
> pci_unmap_single(fnic->pdev, pa, skb->len, PCI_DMA_TODEVICE);
> @@ -1071,6 +1089,12 @@ static int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
>
> pa = pci_map_single(fnic->pdev, eth_hdr, tot_len, PCI_DMA_TODEVICE);
>
> + ret = pci_dma_mapping_error(fnic->pdev, pa);
> + if (ret) {
> + printk(KERN_ERR "DMA map failed with error %d\n", ret);
> + goto err_mapping_error;
> + }
> +
> if ((fnic_fc_trace_set_data(fnic->lport->host->host_no, FNIC_FC_SEND,
> (char *)eth_hdr, tot_len)) != 0) {
> printk(KERN_ERR "fnic ctlr frame trace error!!!");
> @@ -1082,15 +1106,17 @@ static int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
> pci_unmap_single(fnic->pdev, pa,
> tot_len, PCI_DMA_TODEVICE);
> ret = -1;
> - goto fnic_send_frame_end;
> + goto err_desc_avail;
> }
>
> fnic_queue_wq_desc(wq, skb, pa, tot_len, fr_eof(fp),
> 0 /* hw inserts cos value */,
> fnic->vlan_id, 1, 1, 1);
> -fnic_send_frame_end:
> +
> +err_desc_avail:
> spin_unlock_irqrestore(&fnic->wq_lock[0], flags);
Same here
>
> +err_mapping_error:
> if (ret)
> dev_kfree_skb_any(fp_skb(fp));
and here
>
> diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
> index 155b286..2949d17 100644
> --- a/drivers/scsi/fnic/fnic_scsi.c
> +++ b/drivers/scsi/fnic/fnic_scsi.c
> @@ -330,6 +330,7 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
> int flags;
> u8 exch_flags;
> struct scsi_lun fc_lun;
> + int r;
>
> if (sg_count) {
> /* For each SGE, create a device desc entry */
> @@ -346,6 +347,12 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
> io_req->sgl_list,
> sizeof(io_req->sgl_list[0]) * sg_count,
> PCI_DMA_TODEVICE);
> +
> + r = pci_dma_mapping_error(fnic->pdev, io_req->sgl_list_pa);
> + if (r) {
> + printk(KERN_ERR "PCI mapping failed with error %d\n", r);
> + return SCSI_MLQUEUE_HOST_BUSY;
> + }
> }
>
> io_req->sense_buf_pa = pci_map_single(fnic->pdev,
> @@ -353,6 +360,15 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
> SCSI_SENSE_BUFFERSIZE,
> PCI_DMA_FROMDEVICE);
>
> + r = pci_dma_mapping_error(fnic->pdev, io_req->sense_buf_pa);
> + if (r) {
> + pci_unmap_single(fnic->pdev, io_req->sgl_list_pa,
> + sizeof(io_req->sgl_list[0]) * sg_count,
> + PCI_DMA_TODEVICE);
> + printk(KERN_ERR "PCI mapping failed with error %d\n", r);
> + return SCSI_MLQUEUE_HOST_BUSY;
> + }
> +
> int_to_scsilun(sc->device->lun, &fc_lun);
>
> /* Enqueue the descriptor in the Copy WQ */
Thanks
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] fnic: check pci_map_single() return value
2015-08-12 11:42 ` Johannes Thumshirn
@ 2015-08-12 11:56 ` Maurizio Lombardi
0 siblings, 0 replies; 3+ messages in thread
From: Maurizio Lombardi @ 2015-08-12 11:56 UTC (permalink / raw)
To: Johannes Thumshirn; +Cc: linux-scsi, hiralpat, sramars, buchino, jbottomley
Hi Johannes,
On 08/12/2015 01:42 PM, Johannes Thumshirn wrote:
> hmmm, how about
>
> goto free_skb;
>> + }
>> +
>> fnic_queue_rq_desc(rq, skb, pa, len);
>> - return 0;
>> +err:
>
> free_skb:
> kfree_skb(skb);
>
>> + return r;
>> }
>
> Although the return is near to the error handling, it's preferred to
> have the labels named after the action that is taken there.
Ok, I'll post a V2 of this patch soon, thanks for the review.
Regards,
Maurizio Lombardi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-12 11:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-12 9:20 [PATCH] fnic: check pci_map_single() return value Maurizio Lombardi
2015-08-12 11:42 ` Johannes Thumshirn
2015-08-12 11:56 ` Maurizio Lombardi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).