From: Jason Wang <jasowang@redhat.com> To: Eli Cohen <elic@nvidia.com>, mst@redhat.com, parav@nvidia.com, si-wei.liu@oracle.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Cc: stable@vger.kernel.org Subject: Re: [PATCH 2/5] vdpa/mlx5: Use the correct dma device when registering memory Date: Thu, 8 Apr 2021 17:44:47 +0800 [thread overview] Message-ID: <37f7982a-d065-1c2e-abcf-00e9fbc5732a@redhat.com> (raw) In-Reply-To: <20210408091047.4269-3-elic@nvidia.com> 在 2021/4/8 下午5:10, Eli Cohen 写道: > In cases where the vdpa instance uses a SF (sub function), the DMA > device is the parent device. Use a function to retrieve the correct DMA > device. > > Fixes: 1958fc2f0712 ("net/mlx5: SF, Add auxiliary device driver") > Signed-off-by: Eli Cohen <elic@nvidia.com> > Reviewed-by: Parav Pandit <parav@nvidia.com> Acked-by: Jason Wang <jasowang@redhat.com> > --- > drivers/vdpa/mlx5/core/mr.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c > index d300f799efcd..3908ff28eec0 100644 > --- a/drivers/vdpa/mlx5/core/mr.c > +++ b/drivers/vdpa/mlx5/core/mr.c > @@ -219,6 +219,11 @@ static void destroy_indirect_key(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_m > mlx5_vdpa_destroy_mkey(mvdev, &mkey->mkey); > } > > +static struct device *get_dma_device(struct mlx5_vdpa_dev *mvdev) > +{ > + return &mvdev->mdev->pdev->dev; > +} > + > static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr, > struct vhost_iotlb *iotlb) > { > @@ -234,7 +239,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr > u64 pa; > u64 paend; > struct scatterlist *sg; > - struct device *dma = mvdev->mdev->device; > + struct device *dma = get_dma_device(mvdev); > > for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1); > map; map = vhost_iotlb_itree_next(map, start, mr->end - 1)) { > @@ -291,7 +296,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr > > static void unmap_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr) > { > - struct device *dma = mvdev->mdev->device; > + struct device *dma = get_dma_device(mvdev); > > destroy_direct_mr(mvdev, mr); > dma_unmap_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);
WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com> To: Eli Cohen <elic@nvidia.com>, mst@redhat.com, parav@nvidia.com, si-wei.liu@oracle.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Cc: stable@vger.kernel.org Subject: Re: [PATCH 2/5] vdpa/mlx5: Use the correct dma device when registering memory Date: Thu, 8 Apr 2021 17:44:47 +0800 [thread overview] Message-ID: <37f7982a-d065-1c2e-abcf-00e9fbc5732a@redhat.com> (raw) In-Reply-To: <20210408091047.4269-3-elic@nvidia.com> 在 2021/4/8 下午5:10, Eli Cohen 写道: > In cases where the vdpa instance uses a SF (sub function), the DMA > device is the parent device. Use a function to retrieve the correct DMA > device. > > Fixes: 1958fc2f0712 ("net/mlx5: SF, Add auxiliary device driver") > Signed-off-by: Eli Cohen <elic@nvidia.com> > Reviewed-by: Parav Pandit <parav@nvidia.com> Acked-by: Jason Wang <jasowang@redhat.com> > --- > drivers/vdpa/mlx5/core/mr.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c > index d300f799efcd..3908ff28eec0 100644 > --- a/drivers/vdpa/mlx5/core/mr.c > +++ b/drivers/vdpa/mlx5/core/mr.c > @@ -219,6 +219,11 @@ static void destroy_indirect_key(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_m > mlx5_vdpa_destroy_mkey(mvdev, &mkey->mkey); > } > > +static struct device *get_dma_device(struct mlx5_vdpa_dev *mvdev) > +{ > + return &mvdev->mdev->pdev->dev; > +} > + > static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr, > struct vhost_iotlb *iotlb) > { > @@ -234,7 +239,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr > u64 pa; > u64 paend; > struct scatterlist *sg; > - struct device *dma = mvdev->mdev->device; > + struct device *dma = get_dma_device(mvdev); > > for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1); > map; map = vhost_iotlb_itree_next(map, start, mr->end - 1)) { > @@ -291,7 +296,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr > > static void unmap_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr) > { > - struct device *dma = mvdev->mdev->device; > + struct device *dma = get_dma_device(mvdev); > > destroy_direct_mr(mvdev, mr); > dma_unmap_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0); _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2021-04-08 9:45 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-08 9:10 [PATCH 0/5] VDPA mlx5 fixes Eli Cohen 2021-04-08 9:10 ` [PATCH 1/5] vdpa/mlx5: should exclude header length and fcs from mtu Eli Cohen 2021-04-08 9:10 ` [PATCH 2/5] vdpa/mlx5: Use the correct dma device when registering memory Eli Cohen 2021-04-08 9:44 ` Jason Wang [this message] 2021-04-08 9:44 ` Jason Wang 2021-04-08 9:10 ` [PATCH 3/5] vdpa/mlx5: Retrieve BAR address suitable any function Eli Cohen 2021-04-08 9:45 ` Jason Wang 2021-04-08 9:45 ` Jason Wang 2021-04-08 9:10 ` [PATCH 4/5] vdpa/mlx5: Fix wrong use of bit numbers Eli Cohen 2021-04-08 9:46 ` Jason Wang 2021-04-08 9:46 ` Jason Wang 2021-04-08 9:10 ` [PATCH 5/5] vdpa/mlx5: Fix suspend/resume index restoration Eli Cohen 2021-04-08 9:45 ` Jason Wang 2021-04-08 9:45 ` Jason Wang 2021-04-08 9:17 ` [PATCH 0/5] VDPA mlx5 fixes Greg KH 2021-04-08 9:17 ` Greg KH
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=37f7982a-d065-1c2e-abcf-00e9fbc5732a@redhat.com \ --to=jasowang@redhat.com \ --cc=elic@nvidia.com \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=parav@nvidia.com \ --cc=si-wei.liu@oracle.com \ --cc=stable@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.