Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp5669661pxb;
        Tue, 16 Feb 2021 04:47:20 -0800 (PST)
X-Google-Smtp-Source: ABdhPJxdONSLcCu3OSqOVdrrufwqTZ7hajl6CiDJ+WMpu0vOQOQqf+HTgaWgAsCmTHqLjvfWRfAl
X-Received: by 2002:a17:906:15cc:: with SMTP id l12mr14633094ejd.280.1613479639933;
        Tue, 16 Feb 2021 04:47:19 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1613479639; cv=none;
        d=google.com; s=arc-20160816;
        b=LINWan13Dvr3LrL5WASbD8TNoCNQ4oT1y06Pj3vUL2fwKtorsvXzPhUIo1gFjgZ/F6
         x/KN+pXYWUnMsVqX+gvaYfasG4gsESy9HzKDFcMZRRl88PJoG7UDtga06kwJb7Rm4CyO
         y7FfCi4Qic2IVDOKONEkymdlrhtH0nXQdK4xuvhUhKCbRhuv7RtAHtWa2fITy/SgV0bO
         JWC1brCRGCWdXqCcjKYRtgq5+mFd4la0XXO8tNA21uweHQH/o47KJYRPV2aYta0ybT0E
         Th0xKoM65DeUQ6H40S0yPnPDw8aIR8UaNqq3lVzElQSpu+JaAj5+ZJxW26G3ZKbGjDd2
         UuEA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:dkim-signature:user-agent:in-reply-to
         :content-disposition:mime-version:references:message-id:subject:cc
         :to:from:date;
        bh=pn18katiTd289rOY8eSREICZuvH54YRSbjQc8SMESig=;
        b=w6SBFHllwag7zJTeAneN4GV7gcCeyCUa1yjEM8oNPaIRPruVJyVC43y+pZra6TEdzx
         N1B5bkDwAGij4LQLHJFXAtD+LYeQeyR5eUcMTcc2h/aqITEMNNctHbYWffTRspSRtiIp
         HKn8K6T6WR3Rmy0Qes5BvJGwcUKi/O6OXtXZw9GzCubwC2MttaZqZIkMAQT9vtbmEbv/
         C2Ev98VUGYRU5P7S2WfM+bULpOVkFHHDI8uy9MsQgkyf9XYs2bSnaP/NzaEzyuLYqv9p
         wyvz7sLQGleNdfO69mXR7gXuj5M2awdtX4tWxdXFAKbuJV4M4GbGQF85TzDI0TpxH1dz
         OXRw==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=MtuqFeXx;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id g7si14561983edh.31.2021.02.16.04.46.57;
        Tue, 16 Feb 2021 04:47:19 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=MtuqFeXx;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229924AbhBPMq3 (ORCPT <rfc822;lowstz@gmail.com> + 99 others);
        Tue, 16 Feb 2021 07:46:29 -0500
Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:4012 "EHLO
        hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229744AbhBPMq1 (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 16 Feb 2021 07:46:27 -0500
Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, AES256-SHA)
        id <B602bbe7a0000>; Tue, 16 Feb 2021 04:45:46 -0800
Received: from mtl-vdi-166.wap.labs.mlnx (172.20.145.6) by
 HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id
 15.0.1497.2; Tue, 16 Feb 2021 12:45:43 +0000
Date:   Tue, 16 Feb 2021 14:45:40 +0200
From:   Eli Cohen <elic@nvidia.com>
To:     Leon Romanovsky <leon@kernel.org>
CC:     <mst@redhat.com>, <jasowang@redhat.com>,
        <linux-kernel@vger.kernel.org>,
        <virtualization@lists.linux-foundation.org>,
        <netdev@vger.kernel.org>, <si-wei.liu@oracle.com>
Subject: Re: [PATCH] vdpa/mlx5: Extract correct pointer from driver data
Message-ID: <20210216124540.GA94503@mtl-vdi-166.wap.labs.mlnx>
References: <20210216055022.25248-1-elic@nvidia.com>
 <20210216055022.25248-2-elic@nvidia.com>
 <YCtnxyTHJl9TU87L@unreal>
 <20210216064226.GA83717@mtl-vdi-166.wap.labs.mlnx>
 <YCt2PiMIZxbR15IA@unreal>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <YCt2PiMIZxbR15IA@unreal>
User-Agent: Mutt/1.9.5 (bf161cf53efb) (2018-04-13)
X-Originating-IP: [172.20.145.6]
X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To
 HQMAIL107.nvidia.com (172.20.187.13)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1613479546; bh=pn18katiTd289rOY8eSREICZuvH54YRSbjQc8SMESig=;
        h=Date:From:To:CC:Subject:Message-ID:References:MIME-Version:
         Content-Type:Content-Disposition:In-Reply-To:User-Agent:
         X-Originating-IP:X-ClientProxiedBy;
        b=MtuqFeXxtdhVlIMg+PhCn5eL63iSwWqucgE+j3OrOyXoQaQ3SXBBcJYU6wFq4lqi1
         jX3HwBMIj0BkDKlaGeySuZiAlqZ/sP/WHu+4t+8KIF373WhVqDUROtZUO43MMMjHXa
         RfiT9HNE7U5Av78o8gcFvg6FIEOvnVfd50iAg1tgml6DI4NLYUVR85IHmpejVs1lFh
         TxGSUQAU5eY8nBqVIhx4IxVIoOtvxidGXqpp3l2C59ryReLWaJmZ9JTe5LPWAVTOJM
         2nwYfMRT/S8eAKGW+brpSrpnbHRg5t5R2j+2c8Ti3SHcxdafF+8y414Q2u4U9SmElj
         QqHH5AOboJ2HA==
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Feb 16, 2021 at 09:37:34AM +0200, Leon Romanovsky wrote:
> On Tue, Feb 16, 2021 at 08:42:26AM +0200, Eli Cohen wrote:
> > On Tue, Feb 16, 2021 at 08:35:51AM +0200, Leon Romanovsky wrote:
> > > On Tue, Feb 16, 2021 at 07:50:22AM +0200, Eli Cohen wrote:
> > > > struct mlx5_vdpa_net pointer was stored in drvdata. Extract it as well
> > > > in mlx5v_remove().
> > > >
> > > > Fixes: 74c9729dd892 ("vdpa/mlx5: Connect mlx5_vdpa to auxiliary bus")
> > > > Signed-off-by: Eli Cohen <elic@nvidia.com>
> > > > ---
> > > >  drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
> > > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > > index 6b0a42183622..4103d3b64a2a 100644
> > > > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > > @@ -2036,9 +2036,9 @@ static int mlx5v_probe(struct auxiliary_device *adev,
> > > >
> > > >  static void mlx5v_remove(struct auxiliary_device *adev)
> > > >  {
> > > > -	struct mlx5_vdpa_dev *mvdev = dev_get_drvdata(&adev->dev);
> > > > +	struct mlx5_vdpa_net *ndev = dev_get_drvdata(&adev->dev);
> > > >
> > > > -	vdpa_unregister_device(&mvdev->vdev);
> > > > +	vdpa_unregister_device(&ndev->mvdev.vdev);
> > > >  }
> > >
> > > IMHO, The more correct solution is to fix dev_set_drvdata() call,
> > > because we are regustering/unregistering/allocating "struct mlx5_vdpa_dev".
> > >
> >
> > We're allocating "struct mlx5_vdpa_net". "struct mlx5_vdpa_dev" is just
> > a member field of "struct mlx5_vdpa_net".
> 
> I referred to these lines in the mlx5v_probe():
>   1986         err = mlx5_vdpa_alloc_resources(&ndev->mvdev);
>   1987         if (err)
>   1988                 goto err_mtu;
>   1989
>   1990         err = alloc_resources(ndev);
>   1991         if (err)
>   1992                 goto err_res;
>   1993
>   1994         err = vdpa_register_device(&mvdev->vdev);
> 
> So mlx5v_remove() is better to be symmetrical.
> 

It's "struct mlx5_vdpa_net" that is being allocated here so it makes
sense to set this pointer as the the driver data.

> Thanks
> 
> >
> > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > index 88dde3455bfd..079b8fe669af 100644
> > > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > @@ -1995,7 +1995,7 @@ static int mlx5v_probe(struct auxiliary_device *adev,
> > >  	if (err)
> > >  		goto err_reg;
> > >
> > > -	dev_set_drvdata(&adev->dev, ndev);
> > > +	dev_set_drvdata(&adev->dev, mvdev);
> > >  	return 0;
> > >
> > >  err_reg:
> > >
> > > >
> > > >  static const struct auxiliary_device_id mlx5v_id_table[] = {
> > >
> > > > --
> > > > 2.29.2
> > > >