* Re: [PATCH] vdpa/mlx5: Extract correct pointer from driver data [not found] ` <20210216055022.25248-2-elic@nvidia.com> @ 2021-02-16 6:35 ` Leon Romanovsky [not found] ` <20210216064226.GA83717@mtl-vdi-166.wap.labs.mlnx> 0 siblings, 1 reply; 4+ messages in thread From: Leon Romanovsky @ 2021-02-16 6:35 UTC (permalink / raw) To: Eli Cohen; +Cc: mst, netdev, linux-kernel, virtualization, si-wei.liu 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". 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 > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply related [flat|nested] 4+ messages in thread
[parent not found: <20210216064226.GA83717@mtl-vdi-166.wap.labs.mlnx>]
* Re: [PATCH] vdpa/mlx5: Extract correct pointer from driver data [not found] ` <20210216064226.GA83717@mtl-vdi-166.wap.labs.mlnx> @ 2021-02-16 7:37 ` Leon Romanovsky [not found] ` <20210216124540.GA94503@mtl-vdi-166.wap.labs.mlnx> 0 siblings, 1 reply; 4+ messages in thread From: Leon Romanovsky @ 2021-02-16 7:37 UTC (permalink / raw) To: Eli Cohen; +Cc: mst, netdev, linux-kernel, virtualization, si-wei.liu 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. 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 > > > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <20210216124540.GA94503@mtl-vdi-166.wap.labs.mlnx>]
* Re: [PATCH] vdpa/mlx5: Extract correct pointer from driver data [not found] ` <20210216124540.GA94503@mtl-vdi-166.wap.labs.mlnx> @ 2021-02-16 13:17 ` Leon Romanovsky 0 siblings, 0 replies; 4+ messages in thread From: Leon Romanovsky @ 2021-02-16 13:17 UTC (permalink / raw) To: Eli Cohen; +Cc: mst, netdev, linux-kernel, virtualization, si-wei.liu On Tue, Feb 16, 2021 at 02:45:40PM +0200, Eli Cohen wrote: > 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. Anyway, it doesn't important. Thanks, for the original patch. Reviewed-by: Leon Romanovsky <leonro@nvidia.com> _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] vdpa/mlx5: Extract correct pointer from driver data [not found] <20210216055022.25248-1-elic@nvidia.com> [not found] ` <20210216055022.25248-2-elic@nvidia.com> @ 2021-02-23 12:32 ` Michael S. Tsirkin 1 sibling, 0 replies; 4+ messages in thread From: Michael S. Tsirkin @ 2021-02-23 12:32 UTC (permalink / raw) To: Eli Cohen; +Cc: si-wei.liu, netdev, linux-kernel, virtualization On Tue, Feb 16, 2021 at 07:50:21AM +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> Sorry which tree this is for? Couldn't apply. > --- > 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); > } > > static const struct auxiliary_device_id mlx5v_id_table[] = { > -- > 2.29.2 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-23 12:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210216055022.25248-1-elic@nvidia.com>
[not found] ` <20210216055022.25248-2-elic@nvidia.com>
2021-02-16 6:35 ` [PATCH] vdpa/mlx5: Extract correct pointer from driver data Leon Romanovsky
[not found] ` <20210216064226.GA83717@mtl-vdi-166.wap.labs.mlnx>
2021-02-16 7:37 ` Leon Romanovsky
[not found] ` <20210216124540.GA94503@mtl-vdi-166.wap.labs.mlnx>
2021-02-16 13:17 ` Leon Romanovsky
2021-02-23 12:32 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).