| Message ID | 20210408091047.4269-1-elic@nvidia.com |
|---|---|
| Headers | show |
| Series | VDPA mlx5 fixes | expand |
On Thu, Apr 08, 2021 at 12:10:42PM +0300, Eli Cohen wrote: > Hi Michael, > > The following series contains fixes to mlx5 vdpa driver. Included first > is Siwei's fix to queried MTU was already reviewed a while ago and is > not in your tree. > > Patches 2 and 3 are required to allow mlx5_vdpa run on sub functions. > > This series contains patches that were included in Parav's series > http://lists.infradead.org/pipermail/linux-mtd/2016-January/064878.html > but that series will be sent again at a later time. > > Eli Cohen (4): > vdpa/mlx5: Use the correct dma device when registering memory > vdpa/mlx5: Retrieve BAR address suitable any function > vdpa/mlx5: Fix wrong use of bit numbers > vdpa/mlx5: Fix suspend/resume index restoration > > Si-Wei Liu (1): > vdpa/mlx5: should exclude header length and fcs from mtu > > drivers/vdpa/mlx5/core/mlx5_vdpa.h | 4 +++ > drivers/vdpa/mlx5/core/mr.c | 9 +++++-- > drivers/vdpa/mlx5/core/resources.c | 3 ++- > drivers/vdpa/mlx5/net/mlx5_vnet.c | 40 ++++++++++++++++++------------ > 4 files changed, 37 insertions(+), 19 deletions(-) > > -- > 2.30.1 > <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html for how to do this properly. </formletter>
在 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);
在 2021/4/8 下午5:10, Eli Cohen 写道: > VIRTIO_F_VERSION_1 is a bit number. Use BIT_ULL() with mask > conditionals. > > Also, in mlx5_vdpa_is_little_endian() use BIT_ULL for consistency with > the rest of the code. > > Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices") > Signed-off-by: Eli Cohen <elic@nvidia.com> Acked-by: Jason Wang <jasowang@redhat.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 a49ebb250253..6fe61fc57790 100644 > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > @@ -820,7 +820,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque > MLX5_SET(virtio_q, vq_ctx, event_qpn_or_msix, mvq->fwqp.mqp.qpn); > MLX5_SET(virtio_q, vq_ctx, queue_size, mvq->num_ent); > MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0, > - !!(ndev->mvdev.actual_features & VIRTIO_F_VERSION_1)); > + !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1))); > MLX5_SET64(virtio_q, vq_ctx, desc_addr, mvq->desc_addr); > MLX5_SET64(virtio_q, vq_ctx, used_addr, mvq->device_addr); > MLX5_SET64(virtio_q, vq_ctx, available_addr, mvq->driver_addr); > @@ -1554,7 +1554,7 @@ static void clear_virtqueues(struct mlx5_vdpa_net *ndev) > static inline bool mlx5_vdpa_is_little_endian(struct mlx5_vdpa_dev *mvdev) > { > return virtio_legacy_is_little_endian() || > - (mvdev->actual_features & (1ULL << VIRTIO_F_VERSION_1)); > + (mvdev->actual_features & BIT_ULL(VIRTIO_F_VERSION_1)); > } > > static __virtio16 cpu_to_mlx5vdpa16(struct mlx5_vdpa_dev *mvdev, u16 val)