| Message ID | 1441090616-20640-1-git-send-email-haggaie@mellanox.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 9/1/2015 9:56 AM, Haggai Eran wrote: > The mlx5_ib_reg_user_mr() function will attempt to call clean_mr() in > its error flow even though there is never a case where the error flow > occurs with a valid MR pointer to destroy. > > Remove the clean_mr() call and the incorrect comment above it. > > Fixes: b4cfe447d47b ("IB/mlx5: Implement on demand paging by adding > support for MMU notifiers") > Cc: Eli Cohen <eli@mellanox.com> > Signed-off-by: Haggai Eran <haggaie@mellanox.com> > --- > A quick resend without spaces between the Fixes: line and the rest of the > signatures, per Or Gerlitz's request. > > drivers/infiniband/hw/mlx5/mr.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c > index 0dfd379b9bad..54a15b5d336d 100644 > --- a/drivers/infiniband/hw/mlx5/mr.c > +++ b/drivers/infiniband/hw/mlx5/mr.c > @@ -1114,19 +1114,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, > return &mr->ibmr; > > error: > - /* > - * Destroy the umem *before* destroying the MR, to ensure we > - * will not have any in-flight notifiers when destroying the > - * MR. > - * > - * As the MR is completely invalid to begin with, and this > - * error path is only taken if we can't push the mr entry into > - * the pagefault tree, this is safe. > - */ > - > ib_umem_release(umem); > - /* Kill the MR, and return an error code. */ > - clean_mr(mr); > return ERR_PTR(err); > } > > Looks good, Reviewed-by: Sagi Grimberg <sagig@mellanox.com> -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/01/2015 04:06 AM, Sagi Grimberg wrote: > On 9/1/2015 9:56 AM, Haggai Eran wrote: >> The mlx5_ib_reg_user_mr() function will attempt to call clean_mr() in >> its error flow even though there is never a case where the error flow >> occurs with a valid MR pointer to destroy. >> >> Remove the clean_mr() call and the incorrect comment above it. >> >> Fixes: b4cfe447d47b ("IB/mlx5: Implement on demand paging by adding >> support for MMU notifiers") >> Cc: Eli Cohen <eli@mellanox.com> >> Signed-off-by: Haggai Eran <haggaie@mellanox.com> Thanks, applied.
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 0dfd379b9bad..54a15b5d336d 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1114,19 +1114,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, return &mr->ibmr; error: - /* - * Destroy the umem *before* destroying the MR, to ensure we - * will not have any in-flight notifiers when destroying the - * MR. - * - * As the MR is completely invalid to begin with, and this - * error path is only taken if we can't push the mr entry into - * the pagefault tree, this is safe. - */ - ib_umem_release(umem); - /* Kill the MR, and return an error code. */ - clean_mr(mr); return ERR_PTR(err); }
The mlx5_ib_reg_user_mr() function will attempt to call clean_mr() in its error flow even though there is never a case where the error flow occurs with a valid MR pointer to destroy. Remove the clean_mr() call and the incorrect comment above it. Fixes: b4cfe447d47b ("IB/mlx5: Implement on demand paging by adding support for MMU notifiers") Cc: Eli Cohen <eli@mellanox.com> Signed-off-by: Haggai Eran <haggaie@mellanox.com> --- A quick resend without spaces between the Fixes: line and the rest of the signatures, per Or Gerlitz's request. drivers/infiniband/hw/mlx5/mr.c | 12 ------------ 1 file changed, 12 deletions(-)