From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2BC0C282CE for ; Wed, 13 Feb 2019 18:52:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C29A120811 for ; Wed, 13 Feb 2019 18:52:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388733AbfBMSwc (ORCPT ); Wed, 13 Feb 2019 13:52:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48756 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388014AbfBMSwb (ORCPT ); Wed, 13 Feb 2019 13:52:31 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0F7110F98; Wed, 13 Feb 2019 18:52:31 +0000 (UTC) Received: from emilne (unknown [10.18.25.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCB515D6AA; Wed, 13 Feb 2019 18:52:30 +0000 (UTC) Message-ID: Subject: Re: [PATCH 3/4] bfa: fix calls to dma_set_mask_and_coherent() From: "Ewan D. Milne" To: Hannes Reinecke , Christoph Hellwig Cc: "Martin K. Petersen" , James Bottomley , linux-scsi@vger.kernel.org, stable@vger.kernel.org, Hannes Reinecke Date: Wed, 13 Feb 2019 13:52:30 -0500 In-Reply-To: <20190213114234.67275-4-hare@suse.de> References: <20190213114234.67275-1-hare@suse.de> <20190213114234.67275-4-hare@suse.de> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 13 Feb 2019 18:52:31 +0000 (UTC) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org See below. Also see comment re: the patch description. -Ewan On Wed, 2019-02-13 at 12:42 +0100, 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. ----------------------------------------------------------------- The last sentence should be removed from the patch description. > > Fixes: a69b080025ea ("scsi: bfa: use dma_set_mask_and_coherent") > Cc: > Suggested-by: Ewan D. Milne > Signed-off-by: Hannes Reinecke > --- > drivers/scsi/bfa/bfad.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c > index 42a0caf6740d..2ffbe36f5860 100644 > --- a/drivers/scsi/bfa/bfad.c > +++ b/drivers/scsi/bfa/bfad.c > @@ -727,7 +727,7 @@ bfad_init_timer(struct bfad_s *bfad) > int > bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) > { > - int rc = -ENODEV; > + int rc; There are error paths from the calls to pci_enable_device() and pci_request_regions() that will return an undefined value if this initializer is removed. Leave it in place? > > if (pci_enable_device(pdev)) { > printk(KERN_ERR "pci_enable_device fail %p\n", pdev); > @@ -739,11 +739,15 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) > > pci_set_master(pdev); > > - if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) || > - dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) { > + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); > + if (rc) > + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); > + > + if (rc) { > printk(KERN_ERR "dma_set_mask_and_coherent fail %p\n", pdev); > goto out_release_region; > } > + rc = -ENODEV; > > /* Enable PCIE Advanced Error Recovery (AER) if kernel supports */ > pci_enable_pcie_error_reporting(pdev);