From patchwork Sun Aug 4 03:59:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kaher X-Patchwork-Id: 11074593 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 3F3FB746 for ; Sat, 3 Aug 2019 19:58:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21D3128827 for ; Sat, 3 Aug 2019 19:58:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1084028880; Sat, 3 Aug 2019 19:58:53 +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 1597D28827 for ; Sat, 3 Aug 2019 19:58:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 692156B0003; Sat, 3 Aug 2019 15:58:50 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 66A326B0005; Sat, 3 Aug 2019 15:58:50 -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 557556B0006; Sat, 3 Aug 2019 15:58:50 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 1E4D26B0003 for ; Sat, 3 Aug 2019 15:58:50 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id m17so40802315pgh.21 for ; Sat, 03 Aug 2019 12:58:50 -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=UjGxG4hD7fLwMAW2M2wl+o6FUUFY9gLV3C8B43TsIPs=; b=HlDlE1+NShu1DU7rC0bGOzfEveE1ja3vQUITGQGszd8VBTudfezJhK1Qx8uaEHBmaJ rHaw6041wgVJQI9hmMcArv9lCG2uCw2aH8LJPPfJqlfxyOOyGNLW2vghDlw+tAplZIzQ 65wE/z2zlP7mlGMeojbAACqZOHpD1HzlG+jcJOYkw1qdj6khD64ZXtOQixyetMvSI6yK zPMvQ1oAXN4ORFcavrPAzF0WTzUZsHQrT2lglu+svPHnwtcnvunTo9MI2aXsz6C1P3hH KiSxtpjme1Px2XMowRKZkDD08YcEb+CE0sk4gVvC/udiLZxrJ7RjDxMmjo7Ld2M1DQwh gMEA== 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: APjAAAXnqsxzmKM9Efg2YXtyns74lLCkPnHtz0ZTdMG6+CSrEfwZRgfp 6sMd1sbPGVXeyrN4NXZIiralPlE2eMWKaZRk9Kok0tEd8mKcKRTUWdvkbi3iKjkpOR8y4CRVdFU 2Pon8Y68A1UP4kX15KFeu6304HS9EORuT6IESu0L7UFpNt2p+BCGu7LswQ4/KjBnUJA== X-Received: by 2002:a17:90a:fa18:: with SMTP id cm24mr10382901pjb.120.1564862329432; Sat, 03 Aug 2019 12:58:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqxZgiguynixnSxwILK1mq0TNpLBEAFltx2gYQxtBJfJ5eM9zrgwCl/ahmZ6+GBAtBAfmkKF X-Received: by 2002:a17:90a:fa18:: with SMTP id cm24mr10382836pjb.120.1564862327599; Sat, 03 Aug 2019 12:58:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564862327; cv=none; d=google.com; s=arc-20160816; b=h/jInhGSnmqJyv4BZ6uSe2b4KWFhSUQUKzb6fEeLepWJu0bnmp/sx0fAAktJmun2Xj 7XL+3YXEzSa3hrpRJYFrIw6bTE11yljkEzRF8t8MPQ0PZsMzhYfYKBRAdxOCklrlMm3t b8YrOogPP0zOOGGiOs2/hUUzRcU+ExDeBKuJzhYfyeRTANVKqVCA+hSqVcxFB/7tD4JU qGTu1LIddv/KT4Zx6n6W0ARz3zEsqKlKiKDmq8lMM6h+XDzqK+RBj811L96mldgAug55 zDyav1hWvsebOqbyveR+W2ossywWlPcs69zRFcQypl/RO6CsyXTrIyya889/xSDwSMSC UDww== 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=UjGxG4hD7fLwMAW2M2wl+o6FUUFY9gLV3C8B43TsIPs=; b=BNig3c6/m01ZWi3z+h3gqxSq21QolhaJCMtrpUBkhW6qeLQskdTdBbbHPCjfqL4Aig pJILJUdQaLynxmos1yqaXWRuYh7cm7iNRz+mVg1JcfiagfX6G/U4mDM4kn+W8ZW4KUpQ 1MqAdHN+MJk2xb9hY7NNsRj5CcqUtLkaoqLf9Hzfs5zRULnk61SNMNh06AL4vasf+7dd nYM8xbszegyxyUe2jzKVG6cbOFka6kwDQQn5ghJLHpUwm225ghM5L64pnU5NLy0kE95B IE6H2NstJyHRHGRWlAjFQRHn/3FKlo/Nx11v+BQWNKJeBAZ/PCiq9uezB4tc6++xtcly LBYA== 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 h33si575716pje.95.2019.08.03.12.58.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Aug 2019 12:58:47 -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-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Sat, 3 Aug 2019 12:58:40 -0700 Received: from akaher-lnx-dev.eng.vmware.com (unknown [10.110.19.203]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 5A791B26C6; Sat, 3 Aug 2019 15:58:39 -0400 (EDT) From: Ajay Kaher To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v6 1/3] [v4.9.y] coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping Date: Sun, 4 Aug 2019 09:29:25 +0530 Message-ID: <1564891168-30016-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 | 20 ++++++++++++++++++++ mm/mmap.c | 6 +++++- 5 files changed, 58 insertions(+), 1 deletion(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 29632a6..8056759 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 4784660..9b36cc5 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1192,6 +1192,26 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long address, unsigned long size, struct zap_details *); 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 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 Sun Aug 4 03:59:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kaher X-Patchwork-Id: 11074595 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 ACA95746 for ; Sat, 3 Aug 2019 19:59:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D85228827 for ; Sat, 3 Aug 2019 19:59:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F98728880; Sat, 3 Aug 2019 19:59:07 +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 0D35A28827 for ; Sat, 3 Aug 2019 19:59:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AF816B0006; Sat, 3 Aug 2019 15:59:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 187A46B0007; Sat, 3 Aug 2019 15:59:06 -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 09D096B0008; Sat, 3 Aug 2019 15:59:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id C68756B0006 for ; Sat, 3 Aug 2019 15:59:05 -0400 (EDT) Received: by mail-pl1-f199.google.com with SMTP id j12so43653752pll.14 for ; Sat, 03 Aug 2019 12:59:05 -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=SeFOC8oSNJmo4+yFNTjNKD1M40PDujesETPH+AYGQaRBYSBoUITg9U1ZjWa5fOE0Il WAf4ZYJadSD+CjFyAmxl+tIilS6plT5RLbRUcDMxbMdgZ9xdeQ5FDpsdvKbfFAzeJtdN b//ncTJ4Izf+5KamgIQaIB82FjtQz8OUf4/k/nMQTBj7cKL4goFYJ3E9MKHQk5lsORq9 XD+hcnwR0Frfjwf3sepJKVpdjCk7OdL+kO42w2XJtcdUOTBaLVc9xBfE4ne2swdn7xU+ KKARG+VK/vGNi9Du9eTpkYm4xOdl37mWnpqP3TFiUA9MZVbZYcptaoPqQGK6XhkrOtmr 7WUA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.190 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com X-Gm-Message-State: APjAAAW7ylFi5ZqBYBMFa1dijD8C942V2laX8pRA//LpS4huv1bFU9LJ ZUFjMSUpVKxDOScGAXK+Kn3KlujlCQ1l7DsI3jjVHAejSvme1kEWBIslG+LhIgSjHKP5kHcMb+2 hMb97Rw9Z+Lv9S55Ls5HG8cS4AzN9ssPNbG5x60E+FpkgttblZRCBQlPne+XAhnz09Q== X-Received: by 2002:a17:902:8689:: with SMTP id g9mr127932603plo.252.1564862345384; Sat, 03 Aug 2019 12:59:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqwe0wcVAxfEM6Esolnb/Alg4wA00TvLN0XOnD9w4nkDTAtqfuGoJvMCcUnyNmErdw0Q3Hl0 X-Received: by 2002:a17:902:8689:: with SMTP id g9mr127932564plo.252.1564862344263; Sat, 03 Aug 2019 12:59:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564862344; cv=none; d=google.com; s=arc-20160816; b=rPmmt5dLjX1Ns4yIlecasCqPSjTHz++joxRLlwVrlGkGCE4IBdd0+kontd6A7csedL uWkkqj8GmXIJPMp2PZYPeuRlrPUPKLQ1nC+DAvrBIZKPLcI74O3GJOktGuJ+JSNoYIEd vJRLGl1Yk1bJ/5MLngRSv3ZLxTvdaM4U6LAWKzPoFWjgpBZag6qKzmfrYxWmBI0eIxDU rY4Ldu56eD/SlQ6tjDZBZev6jfARD/aX+2ZqoQpAEBMmgd7i4QOdwnSsaN8s+Co+WV5X PrHfyV5zpMVwqURGYg0ObymEfURS20I8bXisH+fUu7xAlp/lDQkHdY7kJzwksv0lkCVC SY3g== 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=KV2XbFmAYWyQqfhfQqwcSb49QemY9kk6X6j5EM0XQ4/e/1XvcoXSCYOtOtTa6d3ez8 n58TnJ44qILiLqwGlJ2XfGWKtLu1spA7FBr8YSdfnKex+nIx66QfIRr6+pREGpMao8c9 OOQrvmIqWC++jbikYDUcbfj6o8I0sBsfUAgdtbc8ay1sHyDtu9s+81sNuau5EtOGVEHy Afe/Azvjt9Fs3att7GVHmYX3cnmgow/Pbfc3Y8Fo8HU0WOofKwGvM2ag1l0XFscvH9p1 sJ44MGLY+dtNE5JpBMYrCY3P0qCGjNruK+z47XxKpA2wv3p4W7+yRgbGX+41Q2ErEnzl yjUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.190 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-002.vmware.com (ex13-edg-ou-002.vmware.com. [208.91.0.190]) by mx.google.com with ESMTPS id p125si40279576pfp.35.2019.08.03.12.59.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Aug 2019 12:59:04 -0700 (PDT) Received-SPF: pass (google.com: domain of akaher@vmware.com designates 208.91.0.190 as permitted sender) client-ip=208.91.0.190; Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.190 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Sat, 3 Aug 2019 12:58:57 -0700 Received: from akaher-lnx-dev.eng.vmware.com (unknown [10.110.19.203]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 3A639B26C6; Sat, 3 Aug 2019 15:58:56 -0400 (EDT) From: Ajay Kaher To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v6 2/3][v4.9.y] infiniband: fix race condition between infiniband mlx4, mlx5 driver and core dumping Date: Sun, 4 Aug 2019 09:29:26 +0530 Message-ID: <1564891168-30016-2-git-send-email-akaher@vmware.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1564891168-30016-1-git-send-email-akaher@vmware.com> References: <1564891168-30016-1-git-send-email-akaher@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-002.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 Sun Aug 4 03:59:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kaher X-Patchwork-Id: 11074607 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 A41A41398 for ; Sat, 3 Aug 2019 19:59:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 910B72887B for ; Sat, 3 Aug 2019 19:59:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 823C52888C; Sat, 3 Aug 2019 19:59:19 +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 D556428827 for ; Sat, 3 Aug 2019 19:59:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D6076B0008; Sat, 3 Aug 2019 15:59:18 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 186D36B000A; Sat, 3 Aug 2019 15:59:18 -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 075AA6B000C; Sat, 3 Aug 2019 15:59:18 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id C4E306B0008 for ; Sat, 3 Aug 2019 15:59:17 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id 145so50575566pfw.16 for ; Sat, 03 Aug 2019 12:59:17 -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=QSnDbz6+OUf8DldxNejwz5sbcr+efBoA/b6Vyaznu8BtgK2PvvykFIheWf2kSH/tTs RQIwh87ml9zui59FEpb7KxtKAFbEhAu5gyZbNqkRUXcD8zdvUYoRfGLJbnKYjiiZvWov TtgklJKOvJHjpjO0Sbn2Se2flZJhh7M/qFqwC9woZZXQAU7GuwYvodmglLDuC1+bfkJP RdZ4dMsdXkpnBMGoCpoX/JCY0eBM5KJxmhGd3yvKmkMa/p1yN9mfT9z3Ak83sCFzPYXQ Y8wzZ3OGXnnxQ2zyXn9qNX92nkcUcgLb634jHQUsjUTsFKQAZiYe6SsjMa33DnJXmrHj sZxQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.190 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com X-Gm-Message-State: APjAAAW1u5yei4hcCah/yIAZkkGo/r6skJOmavLq4BBtoZ9mWU5S6woR L2lGStFCVNBVjs1ygT77FzXOC6IBfQVMTKetE8Wat5qZj721eS8CwEk8bEkKT9ugiW9xyUqzm53 +H4IRjAZdm6yGglcNuIybplLTfWWIKfT4neac784Q1iP84TnG6LyTqDs2jGpYUtr81A== X-Received: by 2002:a62:107:: with SMTP id 7mr66567805pfb.4.1564862357438; Sat, 03 Aug 2019 12:59:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLWs9BBTFDlAy+3K+A7U8epgBpi3xnQ9rcXI1bw4/HATeWDBYkG2cc7MZsJ+CoJ/6WmYWm X-Received: by 2002:a62:107:: with SMTP id 7mr66567767pfb.4.1564862356480; Sat, 03 Aug 2019 12:59:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564862356; cv=none; d=google.com; s=arc-20160816; b=Xe/FTW8PLNQbZYNHyXaTtzxoU7cBi5Q7lbIRtfHTMg3yXy+YdFaWa5Fm2fkG+LVtAZ vkWcRnln/zFD2voU+bXHCVWh6KQe8fE22c6Wvu88CnG4mcFVufTs1QqzXuRCWs2s7y+X 0g2A6Kyy+jLDZW80xTf4fqk0b/ATf/FoEZ7fAhgCdrjoPoymsjkj9woR53anUOh5adOr XoCk7cqHwYaHcSYsnY2mEM3SD7ARu12rrgssDz5xeNQ2t4kybf8xjkx5T1bIEq9RMZFf B1cASUEgqAZwBUiycHNjVKECnJ4GjID556WJ++hRPKRQA/OULw2nySTTTXat5hmu3Oe7 gstQ== 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=cLNUlyPHq98v+f/l07y+q220emdm2ip1a3MbFzNPlqLzeSJmTgFLyxbaNWOQ9dlWML eLGmm51cfbMldFu+tf+aBC35u9izHUu0UCECF5tASdOHiU5tFg3a9z3UpjxCtkvJOsZt CpgwAK/iXfXXu5/Sn7/bl9zgaiJsu/qlBJuv1YgIPM7IvGmmscjITZTqm4WlJz0bPJsr LDpvLi+VvJDr8MyjRwWOUgOtWiEKbPLEt1Y98JRBX1ryrN0l1wADbep87SvKaprGMs6s Rt2zi+hIGeksPG89Tl1r+GnRfIEnSqjAOak+M5e3xS/Fv82Ia9pIXc4dVqbuMPG3RtKO BJLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.190 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-002.vmware.com (ex13-edg-ou-002.vmware.com. [208.91.0.190]) by mx.google.com with ESMTPS id h36si38195442plb.199.2019.08.03.12.59.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Aug 2019 12:59:16 -0700 (PDT) Received-SPF: pass (google.com: domain of akaher@vmware.com designates 208.91.0.190 as permitted sender) client-ip=208.91.0.190; Authentication-Results: mx.google.com; spf=pass (google.com: domain of akaher@vmware.com designates 208.91.0.190 as permitted sender) smtp.mailfrom=akaher@vmware.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Sat, 3 Aug 2019 12:59:09 -0700 Received: from akaher-lnx-dev.eng.vmware.com (unknown [10.110.19.203]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id F3F59B26C6; Sat, 3 Aug 2019 15:59:07 -0400 (EDT) From: Ajay Kaher To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , Hugh Dickins , Mike Rapoport Subject: [PATCH v6 3/3] [v4.9.y] coredump: fix race condition between collapse_huge_page() and core dumping Date: Sun, 4 Aug 2019 09:29:27 +0530 Message-ID: <1564891168-30016-3-git-send-email-akaher@vmware.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1564891168-30016-1-git-send-email-akaher@vmware.com> References: <1564891168-30016-1-git-send-email-akaher@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-002.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;