| Message ID | 20210411083646.910546-1-elic@nvidia.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
在 2021/4/11 下午4:36, Eli Cohen 写道: > Set err = -ENOMEM if dma_map_sg_attrs() fails so the function reutrns > error. > > Fixes: 94abbccdf291 ("vdpa/mlx5: Add shared memory registration code") > Signed-off-by: Eli Cohen <elic@nvidia.com> > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/vdpa/mlx5/core/mr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c > index 3908ff28eec0..800cfd1967ad 100644 > --- a/drivers/vdpa/mlx5/core/mr.c > +++ b/drivers/vdpa/mlx5/core/mr.c > @@ -278,8 +278,10 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr > mr->log_size = log_entity_size; > mr->nsg = nsg; > mr->nent = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0); > - if (!mr->nent) > + if (!mr->nent) { > + err = -ENOMEM; > goto err_map; > + } > > err = create_direct_mr(mvdev, mr); > if (err) Acked-by: Jason Wang <jasowang@redhat.com>
On Sun, Apr 11, 2021 at 11:36:46AM +0300, Eli Cohen wrote: >Set err = -ENOMEM if dma_map_sg_attrs() fails so the function reutrns >error. > >Fixes: 94abbccdf291 ("vdpa/mlx5: Add shared memory registration code") >Signed-off-by: Eli Cohen <elic@nvidia.com> >Reported-by: kernel test robot <lkp@intel.com> >Reported-by: Dan Carpenter <dan.carpenter@oracle.com> >--- > drivers/vdpa/mlx5/core/mr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > >diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c >index 3908ff28eec0..800cfd1967ad 100644 >--- a/drivers/vdpa/mlx5/core/mr.c >+++ b/drivers/vdpa/mlx5/core/mr.c >@@ -278,8 +278,10 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr > mr->log_size = log_entity_size; > mr->nsg = nsg; > mr->nent = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0); >- if (!mr->nent) >+ if (!mr->nent) { >+ err = -ENOMEM; > goto err_map; >+ } > > err = create_direct_mr(mvdev, mr); > if (err) >-- >2.30.1 > Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c index 3908ff28eec0..800cfd1967ad 100644 --- a/drivers/vdpa/mlx5/core/mr.c +++ b/drivers/vdpa/mlx5/core/mr.c @@ -278,8 +278,10 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr mr->log_size = log_entity_size; mr->nsg = nsg; mr->nent = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0); - if (!mr->nent) + if (!mr->nent) { + err = -ENOMEM; goto err_map; + } err = create_direct_mr(mvdev, mr); if (err)
Set err = -ENOMEM if dma_map_sg_attrs() fails so the function reutrns error. Fixes: 94abbccdf291 ("vdpa/mlx5: Add shared memory registration code") Signed-off-by: Eli Cohen <elic@nvidia.com> Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/vdpa/mlx5/core/mr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)