From: John Garry <john.garry@huawei.com> To: Hannes Reinecke <hare@suse.de>, Christoph Hellwig <hch@lst.de> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>, James Bottomley <james.bottomley@hansenpartnership.com>, <linux-scsi@vger.kernel.org>, "Ewan Milne" <emilne@redhat.com>, <stable@vger.kernel.org>, Hannes Reinecke <hare@suse.com> Subject: Re: [PATCH 4/4] hisi_sas: fix calls to dma_set_mask_and_coherent() Date: Wed, 13 Feb 2019 11:51:23 +0000 [thread overview] Message-ID: <f94c768d-0890-d419-752e-a19019a9e09f@huawei.com> (raw) In-Reply-To: <20190213114234.67275-5-hare@suse.de> On 13/02/2019 11:42, Hannes Reinecke wrote: > The change to use dma_set_mask_and_coherent() incorrectly made a second > call with the 32 bit DMA mask value when the call with the 64 bit DMA > mask value succeeded. This resulted in FC connections failing due > to corrupted data buffers, and various other SCSI/FCP I/O errors. > > Fixes: e4db40e7a1a2 ("scsi: hisi_sas: use dma_set_mask_and_coherent") > Cc: <stable@vger.kernel.org> > Suggested-by: Ewan D. Milne <emilne@redhat.com> > Signed-off-by: Hannes Reinecke <hare@suse.com> > --- > drivers/scsi/hisi_sas/hisi_sas_main.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c > index eed7fc5b3389..bc17fa0d8375 100644 > --- a/drivers/scsi/hisi_sas/hisi_sas_main.c > +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c > @@ -2323,6 +2323,7 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, > struct Scsi_Host *shost; > struct hisi_hba *hisi_hba; > struct device *dev = &pdev->dev; > + int error; > > shost = scsi_host_alloc(hw->sht, sizeof(*hisi_hba)); > if (!shost) { > @@ -2343,8 +2344,11 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, > if (hisi_sas_get_fw_info(hisi_hba) < 0) > goto err_out; > > - if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) && > - dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) { Aren't we supposed to be fixing hisi_sas_v3_probe()? We have a path for platform device probe and a path for pci device probe. You're changing the platform device probe, which is currently ok. I meant to unify all this. Now would be a good time, as it's not a fix. Can do it later. Thanks, John > + error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); > + if (error) > + error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); > + > + if (error) { > dev_err(dev, "No usable DMA addressing method\n"); > goto err_out; > } >
WARNING: multiple messages have this Message-ID (diff)
From: John Garry <john.garry@huawei.com> To: Hannes Reinecke <hare@suse.de>, Christoph Hellwig <hch@lst.de> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>, James Bottomley <james.bottomley@hansenpartnership.com>, linux-scsi@vger.kernel.org, Ewan Milne <emilne@redhat.com>, stable@vger.kernel.org, Hannes Reinecke <hare@suse.com> Subject: Re: [PATCH 4/4] hisi_sas: fix calls to dma_set_mask_and_coherent() Date: Wed, 13 Feb 2019 11:51:23 +0000 [thread overview] Message-ID: <f94c768d-0890-d419-752e-a19019a9e09f@huawei.com> (raw) In-Reply-To: <20190213114234.67275-5-hare@suse.de> On 13/02/2019 11:42, Hannes Reinecke wrote: > The change to use dma_set_mask_and_coherent() incorrectly made a second > call with the 32 bit DMA mask value when the call with the 64 bit DMA > mask value succeeded. This resulted in FC connections failing due > to corrupted data buffers, and various other SCSI/FCP I/O errors. > > Fixes: e4db40e7a1a2 ("scsi: hisi_sas: use dma_set_mask_and_coherent") > Cc: <stable@vger.kernel.org> > Suggested-by: Ewan D. Milne <emilne@redhat.com> > Signed-off-by: Hannes Reinecke <hare@suse.com> > --- > drivers/scsi/hisi_sas/hisi_sas_main.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c > index eed7fc5b3389..bc17fa0d8375 100644 > --- a/drivers/scsi/hisi_sas/hisi_sas_main.c > +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c > @@ -2323,6 +2323,7 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, > struct Scsi_Host *shost; > struct hisi_hba *hisi_hba; > struct device *dev = &pdev->dev; > + int error; > > shost = scsi_host_alloc(hw->sht, sizeof(*hisi_hba)); > if (!shost) { > @@ -2343,8 +2344,11 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, > if (hisi_sas_get_fw_info(hisi_hba) < 0) > goto err_out; > > - if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) && > - dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) { Aren't we supposed to be fixing hisi_sas_v3_probe()? We have a path for platform device probe and a path for pci device probe. You're changing the platform device probe, which is currently ok. I meant to unify all this. Now would be a good time, as it's not a fix. Can do it later. Thanks, John > + error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); > + if (error) > + error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); > + > + if (error) { > dev_err(dev, "No usable DMA addressing method\n"); > goto err_out; > } >
next prev parent reply other threads:[~2019-02-13 11:51 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20190213114234.67275-1-hare@suse.de> 2019-02-13 11:42 ` [PATCH 1/4] lpfc: fix calls to dma_set_mask_and_coherent() Hannes Reinecke 2019-02-13 18:52 ` Ewan D. Milne 2019-02-13 11:42 ` [PATCH 2/4] hptiop: " Hannes Reinecke 2019-02-13 18:52 ` Ewan D. Milne 2019-02-13 11:42 ` [PATCH 3/4] bfa: " Hannes Reinecke 2019-02-13 18:52 ` Ewan D. Milne 2019-02-13 21:35 ` kbuild test robot 2019-02-13 21:35 ` kbuild test robot 2019-02-18 6:23 ` Dan Carpenter 2019-02-18 6:23 ` Dan Carpenter 2019-02-13 11:42 ` [PATCH 4/4] hisi_sas: " Hannes Reinecke 2019-02-13 11:51 ` John Garry [this message] 2019-02-13 11:51 ` John Garry 2019-02-13 18:52 ` Ewan D. Milne
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=f94c768d-0890-d419-752e-a19019a9e09f@huawei.com \ --to=john.garry@huawei.com \ --cc=emilne@redhat.com \ --cc=hare@suse.com \ --cc=hare@suse.de \ --cc=hch@lst.de \ --cc=james.bottomley@hansenpartnership.com \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=stable@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.