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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 915FECE7AFC for ; Thu, 28 Sep 2023 18:00:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229870AbjI1SAG (ORCPT ); Thu, 28 Sep 2023 14:00:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230139AbjI1SAF (ORCPT ); Thu, 28 Sep 2023 14:00:05 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4648619D; Thu, 28 Sep 2023 11:00:04 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23BE2C433C8; Thu, 28 Sep 2023 18:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695924003; bh=1lv56bKtGw1pYnYpPtTxK1Jkak4VU5tZbqNoAxuBsmc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=iqDztv6tYQX35VFPb/By+mVjJrGOoyFOVPD0I5YYCgruSHmAYXCNtOXvbu/vj61/Y A3SESbsKVrGSMbckj1cPvT0e+OmhReQcU9hSrQRHu68hVdoZlAr/jVV4DeQD9HvgzI XkMkIQ/luLw8TUATz4TMDohiG9TAyLNEmqXwBglbLWL1elakCiCrXD51RihjRiGBvm H78CZo29Ak/VEHRgBLlCFw3UIWKapuSbJComxlsffkYIrBAnDLrbhAOoIGOfM3WPDt RShODiGdbLqEIUq44JzXYKtdYxKLrqHcB/nrAhERmYRJQo4noMsnmoQ4kN6jT+ez7t TrroPrZFKim4g== Date: Thu, 28 Sep 2023 20:59:59 +0300 From: Leon Romanovsky To: Niklas Schnelle Cc: Saeed Mahameed , Jason Gunthorpe , Matthew Rosato , Joerg Roedel , Robin Murphy , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shay Drory , Moshe Shemesh , Heiko Carstens , Alexander Gordeev , linux-s390@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net] net/mlx5: fix calling mlx5_cmd_init() before DMA mask is set Message-ID: <20230928175959.GU1642130@unreal> References: <20230928-mlx5_init_fix-v1-1-79749d45ce60@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230928-mlx5_init_fix-v1-1-79749d45ce60@linux.ibm.com> Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org On Thu, Sep 28, 2023 at 03:55:47PM +0200, Niklas Schnelle wrote: > Since commit 06cd555f73ca ("net/mlx5: split mlx5_cmd_init() to probe and > reload routines") mlx5_cmd_init() is called in mlx5_mdev_init() which is > called in probe_one() before mlx5_pci_init(). This is a problem because > mlx5_pci_init() is where the DMA and coherent mask is set but > mlx5_cmd_init() already does a dma_alloc_coherent(). Thus a DMA > allocation is done during probe before the correct mask is set. This > causes probe to fail initialization of the cmdif SW structs on s390x > after that is converted to the common dma-iommu code. This is because on > s390x DMA addresses below 4 GiB are reserved on current machines and > unlike the old s390x specific DMA API implementation common code > enforces DMA masks. Fix this by switching the order of the > mlx5_mdev_init() and mlx5_pci_init() in probe_one(). > > Link: https://lore.kernel.org/linux-iommu/cfc9e9128ed5571d2e36421e347301057662a09e.camel@linux.ibm.com/ > Fixes: 06cd555f73ca ("net/mlx5: split mlx5_cmd_init() to probe and reload routines") > Signed-off-by: Niklas Schnelle > --- > Note: I ran into this while testing the linked series for converting > s390x to use dma-iommu. The existing s390x specific DMA API > implementation doesn't respect DMA masks and is thus not affected > despite of course also only supporting DMA addresses above 4 GiB. > That said ConnectX VFs are the primary users of native PCI on s390x and > we'd really like to get the DMA API conversion into v6.7 so this has > high priority for us. > --- > drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c > index 15561965d2af..06744dedd928 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c > @@ -1908,10 +1908,6 @@ static int probe_one(struct pci_dev *pdev, const struct pci_device_id *id) > goto adev_init_err; > } > > - err = mlx5_mdev_init(dev, prof_sel); > - if (err) > - goto mdev_init_err; > - > err = mlx5_pci_init(dev, pdev, id); > if (err) { > mlx5_core_err(dev, "mlx5_pci_init failed with error code %d\n", > @@ -1919,6 +1915,10 @@ static int probe_one(struct pci_dev *pdev, const struct pci_device_id *id) > goto pci_init_err; > } > > + err = mlx5_mdev_init(dev, prof_sel); > + if (err) > + goto mdev_init_err; > + I had something different in mind as I'm worry that call to pci_enable_device() in mlx5_pci_init() before we finished FW command interface initialization is a bit premature. What about the following patch? diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 15561965d2af..31f1d701116a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -905,12 +905,6 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct pci_dev *pdev, pci_set_master(pdev); - err = set_dma_caps(pdev); - if (err) { - mlx5_core_err(dev, "Failed setting DMA capabilities mask, aborting\n"); - goto err_clr_master; - } - if (pci_enable_atomic_ops_to_root(pdev, PCI_EXP_DEVCAP2_ATOMIC_COMP32) && pci_enable_atomic_ops_to_root(pdev, PCI_EXP_DEVCAP2_ATOMIC_COMP64) && pci_enable_atomic_ops_to_root(pdev, PCI_EXP_DEVCAP2_ATOMIC_COMP128)) @@ -1908,9 +1902,15 @@ static int probe_one(struct pci_dev *pdev, const struct pci_device_id *id) goto adev_init_err; } + err = set_dma_caps(pdev); + if (err) { + mlx5_core_err(dev, "Failed setting DMA capabilities mask, aborting\n"); + goto dma_cap_err; + } + err = mlx5_mdev_init(dev, prof_sel); if (err) - goto mdev_init_err; + goto dma_cap_err; err = mlx5_pci_init(dev, pdev, id); if (err) { @@ -1942,7 +1942,7 @@ static int probe_one(struct pci_dev *pdev, const struct pci_device_id *id) mlx5_pci_close(dev); pci_init_err: mlx5_mdev_uninit(dev); -mdev_init_err: +dma_cap_err: mlx5_adev_idx_free(dev->priv.adev_idx); adev_init_err: mlx5_devlink_free(devlink); Thanks