infiniband: fix race condition between infiniband mlx4, mlx5 driver and core dumping
PATCH 1/1 infiniband: fix race condition between infiniband mlx4, mlx5 driver and core dumping
This patch is the extension of following upstream commit to fix the race condition between get_task_mm() and core dumping for IB->mlx4 and IB->mlx5 drivers:
commit 04f5866e41fb ("coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping")'
Thanks to Jason for pointing this.
--- drivers/infiniband/hw/mlx4/main.c | 4 +++- drivers/infiniband/hw/mlx5/main.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/infiniband/hw/mlx4/main.c +3 -1
@@ -1197,6 +1197,8 @@ static void mlx4_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)* mlx4_ib_vma_close(). */ down_write (&owning_mm->mmap_sem); +if (!mmget_still_valid (owning_mm)) + goto skip_mm;for (i =0 ; i <HW_BAR_COUNT ; i++) { vma = context->hw_bar_info[i].vma;if (!vma)
@@ -1215,7 +1217,7 @@ static void mlx4_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)/* context going to be destroyed, should not access ops any more */ context->hw_bar_info[i].vma->vm_ops =NULL ; } - +skip_mm:up_write (&owning_mm->mmap_sem);mmput (owning_mm);put_task_struct (owning_process);
drivers/infiniband/hw/mlx5/main.c +3 -0
@@ -1646,6 +1646,8 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)* mlx5_ib_vma_close. */ down_write (&owning_mm->mmap_sem); +if (!mmget_still_valid (owning_mm)) + goto skip_mm;mutex_lock (&context->vma_private_list_mutex);list_for_each_entry_safe (vma_private, n, &context->vma_private_list, list) {
@@ -1662,6 +1664,7 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)kfree (vma_private); }mutex_unlock (&context->vma_private_list_mutex); +skip_mm:up_write (&owning_mm->mmap_sem);mmput (owning_mm);put_task_struct (owning_process);
Signature · 1 line
2.7.4
Quoted 20 lines · Ajay Kaher
This patch is the extension of following upstream commit to fix the race condition between
get_task_mm()and core dumping forIB->mlx4andIB->mlx5drivers:commit
04f5866e41fb("coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping")'Thanks to Jason for pointing this.
Signed-off-by Ajay Kaher <[email protected]>--- drivers/infiniband/hw/mlx4/main.c | 4 +++- drivers/infiniband/hw/mlx5/main.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)drivers/infiniband/hw/mlx4/main.c +0
-0
drivers/infiniband/hw/mlx4/main.c static void mlx4_ib_disassociate_ucontext(struct ib_ucontext *ibcontext) · line 1204
Quoted 8 lines
drivers/infiniband/hw/mlx4/main.c +2
-0@@ -1197,6 +1197,8 @@ static void mlx4_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)* mlx4_ib_vma_close(). */ down_write (&owning_mm->mmap_sem); +if (!mmget_still_valid (owning_mm)) + goto skip_mm;for (i =0 ; i <HW_BAR_COUNT ; i++) { vma = context->hw_bar_info[i].vma;if (!vma)
I have missed this part in 4.4 stable backport. Thanks for catching it. I have updated my backport.
Quoted 9 lines
drivers/infiniband/hw/mlx4/main.c +1
-1@@ -1215,7 +1217,7 @@ static void mlx4_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)/* context going to be destroyed, should not access ops any more */ context->hw_bar_info[i].vma->vm_ops =NULL ; } - +skip_mm:up_write (&owning_mm->mmap_sem);mmput (owning_mm);put_task_struct (owning_process);
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 7 lines · Ajay Kaher
This patch is the extension of following upstream commit to fix the race condition between
get_task_mm()and core dumping forIB->mlx4andIB->mlx5drivers:commit
04f5866e41fb("coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping")'
Quoted 7 lines
Thanks to Jason for pointing this.
Signed-off-by Ajay Kaher <[email protected]>--- drivers/infiniband/hw/mlx4/main.c | 4 +++- drivers/infiniband/hw/mlx5/main.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
Jason
Quoted 11 lines · Ajay Kaher
This patch is the extension of following upstream commit to fix the race condition between
get_task_mm()and core dumping forIB->mlx4andIB->mlx5drivers:commit
04f5866e41fb("coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping")'Thanks to Jason for pointing this.
Signed-off-by Ajay Kaher <[email protected]>Acked-by Jason Gunthorpe <[email protected]>
Greg, I hope you would like to review and proceed further with this patch.
Quoted 50 lines
---
drivers/infiniband/hw/mlx4/main.c| 4 +++-drivers/infiniband/hw/mlx5/main.c| 3 +++2 files changed, 6 insertions(+), 1 deletion(-)drivers/infiniband/hw/mlx4/main.c +2
-0@@ -1197,6 +1197,8 @@ static void mlx4_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)* mlx4_ib_vma_close(). */ down_write (&owning_mm->mmap_sem); +if (!mmget_still_valid (owning_mm)) + goto skip_mm;for (i =0 ; i <HW_BAR_COUNT ; i++) { vma = context->hw_bar_info[i].vma;if (!vma)@@ -1215,7 +1217,7 @@ static void
mlx4_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)drivers/infiniband/hw/mlx4/main.c +1
-1/* context going to be destroyed, should not access ops any more */ context->hw_bar_info[i].vma->vm_ops =NULL ; } - +skip_mm:up_write(&owning_mm->mmap_sem); mmput(owning_mm); put_task_struct(owning_process);drivers/infiniband/hw/mlx5/main.c +3
-0@@ -1646,6 +1646,8 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)* mlx5_ib_vma_close. */ down_write (&owning_mm->mmap_sem); +if (!mmget_still_valid (owning_mm)) + goto skip_mm;mutex_lock (&context->vma_private_list_mutex);list_for_each_entry_safe (vma_private, n, &context->vma_private_list, list) {@@ -1662,6 +1664,7 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)kfree (vma_private); }mutex_unlock (&context->vma_private_list_mutex); +skip_mm:up_write (&owning_mm->mmap_sem);mmput (owning_mm);put_task_struct (owning_process);Signature · 1 line
2.7.4
Greg KH
maintainerQuoted 10 lines · Ajay Kaher
Quoted 7 lines · Ajay Kaher
This patch is the extension of following upstream commit to fix the race condition between
get_task_mm()and core dumping forIB->mlx4andIB->mlx5drivers:commit
04f5866e41fb("coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping")'
Quoted 6 lines
Quoted 4 lines
Thanks to Jason for pointing this.
Signed-off-by Ajay Kaher <[email protected]>Acked-by Jason Gunthorpe <[email protected]>Greg, I hope you would like to review and proceed further with this patch.
If this is all calmed down now, I'll look at it next week, thanks.
greg k-h