Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Message-ID: <1acfaaf12d1d24aa255a4da80882f8e0e98d2046.camel@linux.ibm.com>
Subject: Re: [PATCH net v2] net/mlx5: fix calling mlx5_cmd_init() before DMA
 mask is set
From:   Niklas Schnelle <schnelle@linux.ibm.com>
To:     Leon Romanovsky <leon@kernel.org>, Joerg Roedel <joro@8bytes.org>
Cc:     Saeed Mahameed <saeedm@nvidia.com>, Jason Gunthorpe <jgg@ziepe.ca>,
        Matthew Rosato <mjrosato@linux.ibm.com>,
        Robin Murphy <robin.murphy@arm.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Shay Drory <shayd@nvidia.com>,
        Moshe Shemesh <moshe@nvidia.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Alexander Gordeev <agordeev@linux.ibm.com>,
        linux-s390@vger.kernel.org, netdev@vger.kernel.org,
        linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Wed, 04 Oct 2023 14:40:49 +0200
In-Reply-To: <20230930073633.GC1296942@unreal>
References: <20230929-mlx5_init_fix-v2-1-51ed2094c9d8@linux.ibm.com>
         <20230930073633.GC1296942@unreal>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) 
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Precedence: bulk

On Sat, 2023-09-30 at 10:36 +0300, Leon Romanovsky wrote:
> On Fri, Sep 29, 2023 at 02:15:49PM +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.
> >=20
> > Fix this by moving set_dma_caps() out of mlx5_pci_init() and into
> > probe_one() before mlx5_mdev_init(). To match the overall naming scheme
> > rename it to mlx5_dma_init().
> >=20
> > Link: https://lore.kernel.org/linux-iommu/cfc9e9128ed5571d2e36421e34730=
1057662a09e.camel@linux.ibm.com/
> > Fixes: 06cd555f73ca ("net/mlx5: split mlx5_cmd_init() to probe and relo=
ad routines")
> > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
> > ---
> > 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.
> > ---
> > Changes in v2:
> > - Instead of moving the whole mlx5_pci_init() only move the
> >   set_dma_caps() call so as to keep pci_enable_device() after the FW
> >   command interface initialization (Leon)
> > - Link to v1: https://lore.kernel.org/r/20230928-mlx5_init_fix-v1-1-797=
49d45ce60@linux.ibm.com
> > ---
> >  drivers/net/ethernet/mellanox/mlx5/core/main.c | 18 +++++++++---------
> >  1 file changed, 9 insertions(+), 9 deletions(-)
> >=20
>=20
> Thanks,
> Reviewed-by: Leon Romanovsky <leonro@nvidia.com>

Thank you for the review. Assuming the mlx5 tree is included in linux-
next I think it would be easiest if this goes via that tree thereby
unbreaking linux-next for s390. Or do you prefer Joerg to take this via
the IOMMU tree or even some other tree?

Thanks,
Niklas