From patchwork Mon Jul 1 18:32:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kaher X-Patchwork-Id: 11025473 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E0721890 for ; Mon, 1 Jul 2019 10:32:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02AEF2864F for ; Mon, 1 Jul 2019 10:32:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF18E28680; Mon, 1 Jul 2019 10:32:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E30942864F for ; Mon, 1 Jul 2019 10:32:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 230718E0005; Mon, 1 Jul 2019 06:32:04 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1E2618E0002; Mon, 1 Jul 2019 06:32:04 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D15B8E0005; Mon, 1 Jul 2019 06:32:04 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f205.google.com (mail-pf1-f205.google.com [209.85.210.205]) by kanga.kvack.org (Postfix) with ESMTP id C68218E0002 for ; Mon, 1 Jul 2019 06:32:03 -0400 (EDT) Received: by mail-pf1-f205.google.com with SMTP id j22so3176831pfe.11 for ; Mon, 01 Jul 2019 03:32:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:mime-version; bh=GFZ8ART2GUr7EQlHIa1kZ2XOUyUIJWq4ZmPLN/1O7sY=; b=bF15pgSSws4GGLaO+MkPG4YgdlAQlnTwsZJo5pkCeo81avNdsz2vFJ3a83ZZ/pkExH yIQJsXuejj8JLV1wk2RHG258Xaogf/0Vf7gntUu0OVZ9ty04WdmhPK4PpowXAj/OwL2o lRgOkDcKvcAuEPkp8/RFMjPHZTnG/8vjhcwyC+UbhTKRCUvE+LNjsVc7fSebhOY6n/6W bPnpv6OVckRj4CBCn+qGOZKvHUgtJ0+4BKPDU9eTgoMb4Fr7FinYl5AVZUh5ppNbyNOp AJ1YjcjP8cyPm5dTv/jZ18dE9r8on9CVO7/BQpvN3jyerpNGlGrStpIGdwXj++DThppa j0vw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com X-Gm-Message-State: APjAAAVEL/fIS8pHvEStkpJu5JZRalKq6goR+whIKABU7ht+ASWD9tq7 keT1/6ghB4s1d6GcKWISpOz1Tx7Z3Ikcj6yoKHVSkmZnb3BAyI7hfnE1eQcNDCuIwMLuWzrkBrK QqxN0bGKtXFGwQ61UxdrZMVWeIeCHA2hpO0F1FHFRwmVrFxb641eCkrji6qtXxpFOIw== X-Received: by 2002:a17:90a:3548:: with SMTP id q66mr30659898pjb.17.1561977123327; Mon, 01 Jul 2019 03:32:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqySStT0RhBX0aI+CgxxZi79xzdjAA3AKyTgCwE5DKSL19EbcKddslpMHiIACwlPosk45S2D X-Received: by 2002:a17:90a:3548:: with SMTP id q66mr30659753pjb.17.1561977121665; Mon, 01 Jul 2019 03:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561977121; cv=none; d=google.com; s=arc-20160816; b=GWcieDshSEx9kVhy/UucNs1vFghpRPjU9+Zz/5yQRx7mf1NcA1OOWg1PSmZ000+G+u MhXPFpLA8PsscpjXftjI+sjIH5hFpRDaBbcZdztBW0ERxSBg4clCz29IQRatQNgnk6np R4gC0yZPDS+NA9AGhj89sEFBD/ERFHP8C0XlDulFrPyyugZ/5MaC0TAC8ARORFsvKmcO FiUXrUjUkGIX153vwWms2RF7kPrGwkIdp1OALnGzdcMf2mOduH1fYBqYly2+x0a8Ys6M yPEofrtQv28pnPli4Voy5fDIO6Y1k3jGdWeBgLO7+p5qpJaIH4shYl+0paxfa/XnTH/m Q+PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from; bh=GFZ8ART2GUr7EQlHIa1kZ2XOUyUIJWq4ZmPLN/1O7sY=; b=NW+13B294aSz5E24hmZgkG/Lxcp3EYkEIh1A7ZXv8XpVfmhd04n0+KVO/aPOwdAsCF JIfUAs4lPgetxLU3MeHzX1lJaR/UW9LZ382SrfsqceEfVORMSuh9IDoERrD5gGlJEz98 Z8ao4+QHsuNaevXcAkGWradrnh5VZCxT6/b6gHCv/I6RbswfTZGgDWfqQuwoiTqvyoC/ NJ33fo96/g8n8rDZVxm2kYQXxgwX2unM8pCkbQdRBpdcgxQ+/TrcwiDM7OFoIVN0A+Q+ ZrsPK0kF8iV4FkQXMWK9nAFkgE0u1vAM/2qwrFLFLa8GjM78MgOQRF9OMgAijUFF73wu azcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com. [208.91.0.189]) by mx.google.com with ESMTPS id c11si8033347pjq.0.2019.07.01.03.32.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jul 2019 03:32:01 -0700 (PDT) Received-SPF: pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) client-ip=208.91.0.189; Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Mon, 1 Jul 2019 03:31:58 -0700 Received: from akaher-lnx-dev.eng.vmware.com (unknown [10.110.19.203]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 2AC4841253; Mon, 1 Jul 2019 03:31:53 -0700 (PDT) From: Ajay Kaher To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 1/3] [v4.9.y] coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping Date: Tue, 2 Jul 2019 00:02:05 +0530 Message-ID: <1562005928-1929-1-git-send-email-akaher@vmware.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-001.vmware.com: akaher@vmware.com does not designate permitted sender hosts) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Andrea Arcangeli commit 04f5866e41fb70690e28397487d8bd8eea7d712a upstream. The core dumping code has always run without holding the mmap_sem for writing, despite that is the only way to ensure that the entire vma layout will not change from under it. Only using some signal serialization on the processes belonging to the mm is not nearly enough. This was pointed out earlier. For example in Hugh's post from Jul 2017: https://lkml.kernel.org/r/alpine.LSU.2.11.1707191716030.2055@eggly.anvils "Not strictly relevant here, but a related note: I was very surprised to discover, only quite recently, how handle_mm_fault() may be called without down_read(mmap_sem) - when core dumping. That seems a misguided optimization to me, which would also be nice to correct" In particular because the growsdown and growsup can move the vm_start/vm_end the various loops the core dump does around the vma will not be consistent if page faults can happen concurrently. Pretty much all users calling mmget_not_zero()/get_task_mm() and then taking the mmap_sem had the potential to introduce unexpected side effects in the core dumping code. Adding mmap_sem for writing around the ->core_dump invocation is a viable long term fix, but it requires removing all copy user and page faults and to replace them with get_dump_page() for all binary formats which is not suitable as a short term fix. For the time being this solution manually covers the places that can confuse the core dump either by altering the vma layout or the vma flags while it runs. Once ->core_dump runs under mmap_sem for writing the function mmget_still_valid() can be dropped. Allowing mmap_sem protected sections to run in parallel with the coredump provides some minor parallelism advantage to the swapoff code (which seems to be safe enough by never mangling any vma field and can keep doing swapins in parallel to the core dumping) and to some other corner case. In order to facilitate the backporting I added "Fixes: 86039bd3b4e6" however the side effect of this same race condition in /proc/pid/mem should be reproducible since before 2.6.12-rc2 so I couldn't add any other "Fixes:" because there's no hash beyond the git genesis commit. Because find_extend_vma() is the only location outside of the process context that could modify the "mm" structures under mmap_sem for reading, by adding the mmget_still_valid() check to it, all other cases that take the mmap_sem for reading don't need the new check after mmget_not_zero()/get_task_mm(). The expand_stack() in page fault context also doesn't need the new check, because all tasks under core dumping are frozen. Link: http://lkml.kernel.org/r/20190325224949.11068-1-aarcange@redhat.com Fixes: 86039bd3b4e6 ("userfaultfd: add new syscall to provide memory externalization") Signed-off-by: Andrea Arcangeli Reported-by: Jann Horn Suggested-by: Oleg Nesterov Acked-by: Peter Xu Reviewed-by: Mike Rapoport Reviewed-by: Oleg Nesterov Reviewed-by: Jann Horn Acked-by: Jason Gunthorpe Acked-by: Michal Hocko Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman [akaher@vmware.com: stable 4.9 backport - handle binder_update_page_range - mhocko@suse.com] Signed-off-by: Ajay Kaher --- drivers/android/binder.c | 6 ++++++ fs/proc/task_mmu.c | 18 ++++++++++++++++++ fs/userfaultfd.c | 9 +++++++++ include/linux/mm.h | 21 +++++++++++++++++++++ mm/mmap.c | 6 +++++- 5 files changed, 59 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 80499f4..f05ab8f 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -581,6 +581,12 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate, if (mm) { down_write(&mm->mmap_sem); + if (!mmget_still_valid(mm)) { + if (allocate == 0) + goto free_range; + goto err_no_vma; + } + vma = proc->vma; if (vma && mm != proc->vma_vm_mm) { pr_err("%d: vma mm and task mm mismatch\n", diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 5138e78..4b207b1 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1057,6 +1057,24 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, count = -EINTR; goto out_mm; } + /* + * Avoid to modify vma->vm_flags + * without locked ops while the + * coredump reads the vm_flags. + */ + if (!mmget_still_valid(mm)) { + /* + * Silently return "count" + * like if get_task_mm() + * failed. FIXME: should this + * function have returned + * -ESRCH if get_task_mm() + * failed like if + * get_proc_task() fails? + */ + up_write(&mm->mmap_sem); + goto out_mm; + } for (vma = mm->mmap; vma; vma = vma->vm_next) { vma->vm_flags &= ~VM_SOFTDIRTY; vma_set_page_prot(vma); diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 784d667..8bf425a 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -479,6 +479,8 @@ static int userfaultfd_release(struct inode *inode, struct file *file) * taking the mmap_sem for writing. */ down_write(&mm->mmap_sem); + if (!mmget_still_valid(mm)) + goto skip_mm; prev = NULL; for (vma = mm->mmap; vma; vma = vma->vm_next) { cond_resched(); @@ -501,6 +503,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file) vma->vm_flags = new_flags; vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; } +skip_mm: up_write(&mm->mmap_sem); mmput(mm); wakeup: @@ -802,6 +805,9 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, goto out; down_write(&mm->mmap_sem); + if (!mmget_still_valid(mm)) + goto out_unlock; + vma = find_vma_prev(mm, start, &prev); if (!vma) goto out_unlock; @@ -947,6 +953,9 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, goto out; down_write(&mm->mmap_sem); + if (!mmget_still_valid(mm)) + goto out_unlock; + vma = find_vma_prev(mm, start, &prev); if (!vma) goto out_unlock; diff --git a/include/linux/mm.h b/include/linux/mm.h index e3c8d40..c239984 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1189,6 +1189,27 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long address, void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma, unsigned long start, unsigned long end); +/* + * This has to be called after a get_task_mm()/mmget_not_zero() + * followed by taking the mmap_sem for writing before modifying the + * vmas or anything the coredump pretends not to change from under it. + * + * NOTE: find_extend_vma() called from GUP context is the only place + * that can modify the "mm" (notably the vm_start/end) under mmap_sem + * for reading and outside the context of the process, so it is also + * the only case that holds the mmap_sem for reading that must call + * this function. Generally if the mmap_sem is hold for reading + * there's no need of this check after get_task_mm()/mmget_not_zero(). + * + * This function can be obsoleted and the check can be removed, after + * the coredump code will hold the mmap_sem for writing before + * invoking the ->core_dump methods. + */ +static inline bool mmget_still_valid(struct mm_struct *mm) +{ + return likely(!mm->core_state); +} + /** * mm_walk - callbacks for walk_page_range * @pmd_entry: if set, called for each non-empty PMD (3rd-level) entry diff --git a/mm/mmap.c b/mm/mmap.c index 3f2314a..19368fb 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2448,7 +2448,8 @@ find_extend_vma(struct mm_struct *mm, unsigned long addr) vma = find_vma_prev(mm, addr, &prev); if (vma && (vma->vm_start <= addr)) return vma; - if (!prev || expand_stack(prev, addr)) + /* don't alter vm_end if the coredump is running */ + if (!prev || !mmget_still_valid(mm) || expand_stack(prev, addr)) return NULL; if (prev->vm_flags & VM_LOCKED) populate_vma_page_range(prev, addr, prev->vm_end, NULL); @@ -2474,6 +2475,9 @@ find_extend_vma(struct mm_struct *mm, unsigned long addr) return vma; if (!(vma->vm_flags & VM_GROWSDOWN)) return NULL; + /* don't alter vm_start if the coredump is running */ + if (!mmget_still_valid(mm)) + return NULL; start = vma->vm_start; if (expand_stack(vma, addr)) return NULL; From patchwork Mon Jul 1 18:32:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kaher X-Patchwork-Id: 11025477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 183E213A4 for ; Mon, 1 Jul 2019 10:32:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09D372866D for ; Mon, 1 Jul 2019 10:32:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0E8228686; Mon, 1 Jul 2019 10:32:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAE1F2866D for ; Mon, 1 Jul 2019 10:32:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8BF68E0006; Mon, 1 Jul 2019 06:32:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E3E038E0002; Mon, 1 Jul 2019 06:32:26 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D04D28E0006; Mon, 1 Jul 2019 06:32:26 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f205.google.com (mail-pg1-f205.google.com [209.85.215.205]) by kanga.kvack.org (Postfix) with ESMTP id 984C98E0002 for ; Mon, 1 Jul 2019 06:32:26 -0400 (EDT) Received: by mail-pg1-f205.google.com with SMTP id s4so7410189pgr.3 for ; Mon, 01 Jul 2019 03:32:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version; bh=hAAPf9o3GFQ98ap/3N6Z0MHRNPvvF/o7ljIAlON1qEM=; b=OCZhtvOXNalHQDcFQxQndnu2dEXZvCTRITpxZ6eVy9bEEWEazLc2QF+w55F3Cko18D sO+hvMOVSOuhZ8g5StNYxfiQBqnK+RjPcG9GwFUKLfJvPjP3JEXs8HxbtUBuOpOsOTVn 2DeO4tI0e0NJ7ka3TsE4K/oENsppMAxdtU1rnCeehsQc032xeS1Wc6eCpqCqQMohMaNE TNiyOrsUXGIBQXkIbXJDc0P5dlppXVjI9VLo2Oujp8d8OXpwDfJY44rcGoeTb29RGG7R PGAQ5kfXsjQwyb0StW7Y3S972Jw/IuVUz8TxlKGk3cCP2prrmUpWPbQO7h9DQHzbEuM+ iaxg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com X-Gm-Message-State: APjAAAVj27URC1GFlMxX9lpt4AppEdo7tz7ACfhWixBVGxzzAYLYwVUE YjDNdQ94O/MY+4h97nYXObVo2355jFzHPtjCs2+vGlNVLnJMWiG8RhAvc/23St54GChzSxOP0TN uFfaKBVMwwKJp074zw2DW8BDDj3cGMqTPp2ULMYvsE5vXlOmvmYIWwB9fS4mWCwJwWw== X-Received: by 2002:a17:902:f64:: with SMTP id 91mr27500043ply.247.1561977146309; Mon, 01 Jul 2019 03:32:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqwTaFhz03hSCEQ+jhDfY9/UBMv0V3j7alzK8+KjOJyTkce71bBZvCwstQYMR44cAgeEDQba X-Received: by 2002:a17:902:f64:: with SMTP id 91mr27499958ply.247.1561977145275; Mon, 01 Jul 2019 03:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561977145; cv=none; d=google.com; s=arc-20160816; b=MvCYmA9R7v2A+KDnba8HVaQ+c6cn5f9qPecD/DSWcRBIAAFKZ9nTN0xhCli/3SmpN9 4mYrU6deO7LBiNi9Fe9Rb9YxrRU6NbxEmHyfLujZ2uh6fm52ri/K0PcXSqKMAJjd0o35 jg6meVcbADIIxq6mA6RwGMPAgrChWcZzKl5r0LA6RGbj6e2g4IBa2LjKAYsU4xzmkMSf 3lexXaJ4ylevGuYYGMajkb9hoOom8+GHOBOmkSHkQZvScRdgJZUISLHGADAg4ep4hzVZ YLJOE/C2NtUVfoxsxwt/RZcN52cY/DLu+rsmRA6ZuFt2bfdInLNxf04Zlg7NZ7cS8pR5 NzLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=hAAPf9o3GFQ98ap/3N6Z0MHRNPvvF/o7ljIAlON1qEM=; b=l0eeXUZFDUdvSwndvsVsHCgofqE+CZIkNdcab9TzaQsX4xnk5q1nJq5To03vY08v08 g8r8PN6aLyVP8z0ZqROezohLag5LEaaYOewfinxX98I98WgjCPA/O/XzzBmwFw19kTgr 7LqYqCQYkByrKCDCgDLIJmPMkevDhgiT5+iNQ6G/joIEftxvbGJVVvQMXpanzzxJDoG7 RhsStGD8z1bFWZz844MBrMRvED/SgpsLrj6059dRdr1WDthMuhFOLCOmdzxyzdMoBx6C M62c5dgXP+OIhvtYLbK5bT3EBDb4wlGOVXhDpyNLWc3pd9U6v1RnNOaiy9+P0nR4qsoN EqIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com. [208.91.0.189]) by mx.google.com with ESMTPS id z13si9925295pgj.205.2019.07.01.03.32.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jul 2019 03:32:25 -0700 (PDT) Received-SPF: pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) client-ip=208.91.0.189; Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Mon, 1 Jul 2019 03:32:22 -0700 Received: from akaher-lnx-dev.eng.vmware.com (unknown [10.110.19.203]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 03F3E40FF9; Mon, 1 Jul 2019 03:32:17 -0700 (PDT) From: Ajay Kaher To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 2/3][v4.9.y] infiniband: fix race condition between infiniband mlx4, mlx5 driver and core dumping Date: Tue, 2 Jul 2019 00:02:06 +0530 Message-ID: <1562005928-1929-2-git-send-email-akaher@vmware.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562005928-1929-1-git-send-email-akaher@vmware.com> References: <1562005928-1929-1-git-send-email-akaher@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-001.vmware.com: akaher@vmware.com does not designate permitted sender hosts) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Ajay Kaher Reviewed-by: Jason Gunthorpe --- drivers/infiniband/hw/mlx4/main.c | 4 +++- drivers/infiniband/hw/mlx5/main.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index 8d59a59..7ccf722 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c @@ -1172,6 +1172,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) @@ -1190,7 +1192,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); diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index b1daf5c..f94df0e 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -1307,6 +1307,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; list_for_each_entry_safe(vma_private, n, &context->vma_private_list, list) { vma = vma_private->vma; @@ -1321,6 +1323,7 @@ static void mlx5_ib_disassociate_ucontext(struct ib_ucontext *ibcontext) list_del(&vma_private->list); kfree(vma_private); } +skip_mm: up_write(&owning_mm->mmap_sem); mmput(owning_mm); put_task_struct(owning_process); From patchwork Mon Jul 1 18:32:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kaher X-Patchwork-Id: 11025483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2489D138B for ; Mon, 1 Jul 2019 10:32:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1512A28681 for ; Mon, 1 Jul 2019 10:32:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05E1528689; Mon, 1 Jul 2019 10:32:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 530D728681 for ; Mon, 1 Jul 2019 10:32:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EB318E0007; Mon, 1 Jul 2019 06:32:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6742F8E0002; Mon, 1 Jul 2019 06:32:44 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4EFDD8E0007; Mon, 1 Jul 2019 06:32:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f205.google.com (mail-pg1-f205.google.com [209.85.215.205]) by kanga.kvack.org (Postfix) with ESMTP id 11D6D8E0002 for ; Mon, 1 Jul 2019 06:32:44 -0400 (EDT) Received: by mail-pg1-f205.google.com with SMTP id o16so6213963pgk.18 for ; Mon, 01 Jul 2019 03:32:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version; bh=m2ABSez10NsjyZLoNHNYp82v2fZDDIVB7Dh3Iq8opcs=; b=eOEoUVS6H706D+zaQzerkdGxp0tIxudtxYHPy3kJnubuwvSm0RzohB826sPm+fAieX EWGtTrXbHkzQxhf/pcfNLQPJANxFtv90Irl8rhxvhj2Clykn1vGJq3Luq1zWqC7IamNp P/B7zVEURtxytu4q0T1toG6kSABtD6wY8G612WQKfELn3bClZ+clztzLztIe3a9aggf7 BRV4xBUsV1Si8tPNFto/F5NP4O2iMajJSzkIW0LuSpz2eHGoAHtEGC/uPRgufe0Y/paY IIi5pTgFKNoKRfag4UiZfGFIdfRrqlBsFTS0wHUIv3nJtfyfu+oip12caTN3jYlAZzR8 uNYw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com X-Gm-Message-State: APjAAAUwxrVT5Ib2PD6CqABzdZMt5VU69mWqtmHl4z/jFFwcOHOae7GC 2tSqNvjL/SKc4jj+IsqCegfMeQqvL1r0MocDkmGrH52ussvYXxB/KImZOqnTMxzJirzHY909WBo xz9hl3SIaeO9hUNQPQfaQUo2VKFuv11FvkLYstFK5hHhUwNxy8CB5qpLai0zMWCEfUQ== X-Received: by 2002:a17:902:2ba7:: with SMTP id l36mr27883322plb.334.1561977163722; Mon, 01 Jul 2019 03:32:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqzndquMPvSO6FWc8Ff3lCDkDnW9i2R0CSamHGqvtUyLoVN9fFHiWgETFhgmzW3G7PO8X7Y+ X-Received: by 2002:a17:902:2ba7:: with SMTP id l36mr27883251plb.334.1561977162918; Mon, 01 Jul 2019 03:32:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561977162; cv=none; d=google.com; s=arc-20160816; b=lWiIPAauUB0Jn3uCDxIkWVkM9s/nCZAB/CFMek0VgiR8jUtuzSTGVcjm6Bjzhb+DZr eNX8hVADJQAZmGRFliZ0xq+01WyFUNzzy91MoWokhqwlxAEEac2ptdXKEWpTld8t+NmI eHttB+j6JleuttAL8kUw4g6UPyHoiohFduw9up2pJMyL/JLUbcQft+JKGL+4WA1dmx+N W7+1crbZ+IntiSqe5BoTMdXwjEahSRvGYueESCxd2uVZCD45Xt1PMjvg0S3bH5SKszPU GZHMN+D675QzpRuinpAa2niDlDrOtiunHysfMAYawwUc4DlY0myNPTHbRyCye3FWTIEK owNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=m2ABSez10NsjyZLoNHNYp82v2fZDDIVB7Dh3Iq8opcs=; b=vbY6qHWgjKdiut+53imfusn/1GjhMPlAadSYEPp/IZvrM3vIfnRuacmRcKWTre9yJC s5nhHdV1vNVro+5LWwFmCaGlrKpOTELQtvURe95kqKx/JElfqYwCNe0+Ll4GIcMF1B57 isve76+mK43ZMSTt4q7pkBPBWZWXx6w0ucZ0ymzgwmuoa8nmSLjVD63UE++WDQk6bZdO 3hQAFm1ulxi7U03UfQw2HCgTYvPCYa0H1zHbMUcO10Tp7f6fAi2ytMOqbs/M/LCqVi84 UCyxn5EB2vXD2R/npSeQJznLP4QwMuCqeoZxo+MXzBBdPnPPmjOfV/9S+W2Iybz5JCEI VlxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com. [208.91.0.189]) by mx.google.com with ESMTPS id d7si3801228pfd.185.2019.07.01.03.32.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jul 2019 03:32:42 -0700 (PDT) Received-SPF: pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) client-ip=208.91.0.189; Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.189 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Mon, 1 Jul 2019 03:32:40 -0700 Received: from akaher-lnx-dev.eng.vmware.com (unknown [10.110.19.203]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 313D240FF2; Mon, 1 Jul 2019 03:32:34 -0700 (PDT) From: Ajay Kaher To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , Hugh Dickins , Mike Rapoport Subject: [PATCH v5 3/3] [v4.9.y] coredump: fix race condition between collapse_huge_page() and core dumping Date: Tue, 2 Jul 2019 00:02:07 +0530 Message-ID: <1562005928-1929-3-git-send-email-akaher@vmware.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562005928-1929-1-git-send-email-akaher@vmware.com> References: <1562005928-1929-1-git-send-email-akaher@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-001.vmware.com: akaher@vmware.com does not designate permitted sender hosts) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Andrea Arcangeli coredump: fix race condition between collapse_huge_page() and core dumping commit 59ea6d06cfa9247b586a695c21f94afa7183af74 upstream. When fixing the race conditions between the coredump and the mmap_sem holders outside the context of the process, we focused on mmget_not_zero()/get_task_mm() callers in 04f5866e41fb70 ("coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping"), but those aren't the only cases where the mmap_sem can be taken outside of the context of the process as Michal Hocko noticed while backporting that commit to older -stable kernels. If mmgrab() is called in the context of the process, but then the mm_count reference is transferred outside the context of the process, that can also be a problem if the mmap_sem has to be taken for writing through that mm_count reference. khugepaged registration calls mmgrab() in the context of the process, but the mmap_sem for writing is taken later in the context of the khugepaged kernel thread. collapse_huge_page() after taking the mmap_sem for writing doesn't modify any vma, so it's not obvious that it could cause a problem to the coredump, but it happens to modify the pmd in a way that breaks an invariant that pmd_trans_huge_lock() relies upon. collapse_huge_page() needs the mmap_sem for writing just to block concurrent page faults that call pmd_trans_huge_lock(). Specifically the invariant that "!pmd_trans_huge()" cannot become a "pmd_trans_huge()" doesn't hold while collapse_huge_page() runs. The coredump will call __get_user_pages() without mmap_sem for reading, which eventually can invoke a lockless page fault which will need a functional pmd_trans_huge_lock(). So collapse_huge_page() needs to use mmget_still_valid() to check it's not running concurrently with the coredump... as long as the coredump can invoke page faults without holding the mmap_sem for reading. This has "Fixes: khugepaged" to facilitate backporting, but in my view it's more a bug in the coredump code that will eventually have to be rewritten to stop invoking page faults without the mmap_sem for reading. So the long term plan is still to drop all mmget_still_valid(). Link: http://lkml.kernel.org/r/20190607161558.32104-1-aarcange@redhat.com Fixes: ba76149f47d8 ("thp: khugepaged") Signed-off-by: Andrea Arcangeli Reported-by: Michal Hocko Acked-by: Michal Hocko Acked-by: Kirill A. Shutemov Cc: Oleg Nesterov Cc: Jann Horn Cc: Hugh Dickins Cc: Mike Rapoport Cc: Mike Kravetz Cc: Peter Xu Cc: Jason Gunthorpe Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman [Ajay: Just adjusted to apply on v4.9] Signed-off-by: Ajay Kaher --- include/linux/mm.h | 4 ++++ mm/khugepaged.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index c239984..8852158 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1194,6 +1194,10 @@ void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma, * followed by taking the mmap_sem for writing before modifying the * vmas or anything the coredump pretends not to change from under it. * + * It also has to be called when mmgrab() is used in the context of + * the process, but then the mm_count refcount is transferred outside + * the context of the process to run down_write() on that pinned mm. + * * NOTE: find_extend_vma() called from GUP context is the only place * that can modify the "mm" (notably the vm_start/end) under mmap_sem * for reading and outside the context of the process, so it is also diff --git a/mm/khugepaged.c b/mm/khugepaged.c index e0cfc3a..8217ee5 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1004,6 +1004,9 @@ static void collapse_huge_page(struct mm_struct *mm, * handled by the anon_vma lock + PG_lock. */ down_write(&mm->mmap_sem); + result = SCAN_ANY_PROCESS; + if (!mmget_still_valid(mm)) + goto out; result = hugepage_vma_revalidate(mm, address, &vma); if (result) goto out;