From patchwork Wed Sep 26 18:10:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 10616497 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 DC232112B for ; Wed, 26 Sep 2018 18:10:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC01C2B703 for ; Wed, 26 Sep 2018 18:10:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9E272B71B; Wed, 26 Sep 2018 18:10:56 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,UNPARSEABLE_RELAY 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 28B8F2B730 for ; Wed, 26 Sep 2018 18:10:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BBAF98E0004; Wed, 26 Sep 2018 14:10:50 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B6A488E0001; Wed, 26 Sep 2018 14:10: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 994C68E0004; Wed, 26 Sep 2018 14:10:50 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 5B6F68E0001 for ; Wed, 26 Sep 2018 14:10:50 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id c16-v6so719148pfi.6 for ; Wed, 26 Sep 2018 11:10: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:in-reply-to:references; bh=OX5gl5ayLYvSjn/S6X9oBgrH/2HMLuBIngGB+Iinwps=; b=d0PdI1jYmHnQtNzLnjI7Rg0DZmPyx598yUfeDAaybRbOC5tLT7B9Zzp2558j70dyKU Sh0r6EoSNV17qx8VgcuS2mICTo7Cf8SLE95oa6aKJsUa80EVcojVpLxZ71a9O2egqoZn Bkmpfxu9IG3yiYYb5dwe6ASMerlqbj9pOl95Cg0kchx0hxiZa94Tn26OiGM0gWL8Zy6L 1ukKU0K4kfnmfL0zxpBJAifA+4ZktHI/E8XtuhL3EXCCOytrMpCFFl6z2utN0kr604M/ Vz9ytz4HzdqU7BAelG2roRsv6HDPGxBYdT/LhoAA+BM2/920RtfInrTwnt+CiNA5UG6G wdaQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yang.shi@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=yang.shi@linux.alibaba.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alibaba.com X-Gm-Message-State: ABuFfog/JoKhzNy5/oys+6IsmbqtirwAy6Tu9Ukb3b9rWifrjNBP8l2b dqD4fgvgl+ymroaMvARtbR4rknv2dO/AIbR+wsWK5tYYbtQxM4r/U5DZjLtNroy1vJUHg/O2wkT XXWbuN5g5fq/vUKtb2/2Jl3egsbaKBzp0DW78tygeOB8qgQjOFXV3/tMGWpCodABQPQ== X-Received: by 2002:a63:f14a:: with SMTP id o10-v6mr6613515pgk.339.1537985450006; Wed, 26 Sep 2018 11:10:50 -0700 (PDT) X-Google-Smtp-Source: ACcGV637w1LOlwSfJXVqKDyqKDtzmw44vevLX2LtE3R9xcEaOMVPNVv2cRYetfjKVmKRdP218zQc X-Received: by 2002:a63:f14a:: with SMTP id o10-v6mr6613434pgk.339.1537985448223; Wed, 26 Sep 2018 11:10:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537985448; cv=none; d=google.com; s=arc-20160816; b=i6pDVBJ1Ho1+k98C6pjkcAQFw5Dw3STentGd1DuRa1CxfLvAPpmfxM9SaVqFzQ6nZY 1Ya0uxfylLdOY72/TC0Q2AxWfo5VoGWjWbFOF0GNox0z61m1ZuwX3anQXXrGbYcB/CE4 KIZ/p6Y5G+NqXrwdq9DMWOzt7PAuPRsQFv+Mmp8RnMULb4sku3tqmy2nBksBzpHhusOC hD+UbGvsZH1zjXRACUTncA9Mpl4S9kEJEqDHEeFA6NbPhdztIPr0AsNF/7AUzcaYtSAU xDncqJwFQkgxWk+jld8XHyu0m7Iy9vjgHLDJxSjt+7+09+eXqL0saFhlBvztbkEdPe5d vWUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=OX5gl5ayLYvSjn/S6X9oBgrH/2HMLuBIngGB+Iinwps=; b=ikxxmuMWtgyAFujOBgyK3NGc0RQuYqBxOnpiqx3KD++3EwKxxMIM2UfTvZzCKio35E 8GiK0/Cis+o7WFh0PhSk9/AziO3g5KVd8oPlw43u1TIEfiQH19RCu57r4MG5w/9YeuHY SlH9iUxvkI0nB1sP3uxLYZBlD8o/KbPayLdaVcDg4ArwyMzrpK1C0rF5+Tm2t+XaeGe1 HUzpB79iuAz/pE3Y26ZQBqvHH1acBKIsMBbeQykGXqZPPyBCu+EakRT9kzUVJ4VIvj06 GYuX5UdS+xjFmdATGRLGh+T8sWQiJVGgAiWhyN8tUWb2oVeHI9kX+rAq+gceM/MyHaR4 U44w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yang.shi@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=yang.shi@linux.alibaba.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com. [115.124.30.130]) by mx.google.com with ESMTPS id v61-v6si6018136plb.448.2018.09.26.11.10.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 11:10:48 -0700 (PDT) Received-SPF: pass (google.com: domain of yang.shi@linux.alibaba.com designates 115.124.30.130 as permitted sender) client-ip=115.124.30.130; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yang.shi@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=yang.shi@linux.alibaba.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alibaba.com X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04400;MF=yang.shi@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0T9Vumj3_1537985434; Received: from e19h19392.et15sqa.tbsite.net(mailfrom:yang.shi@linux.alibaba.com fp:SMTPD_---0T9Vumj3_1537985434) by smtp.aliyun-inc.com(127.0.0.1); Thu, 27 Sep 2018 02:10:43 +0800 From: Yang Shi To: mhocko@kernel.org, kirill@shutemov.name, willy@infradead.org, ldufour@linux.vnet.ibm.com, vbabka@suse.cz, akpm@linux-foundation.org Cc: yang.shi@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [v2 PATCH 2/2 -mm] mm: brk: dwongrade mmap_sem to read when shrinking Date: Thu, 27 Sep 2018 02:10:34 +0800 Message-Id: <1537985434-22655-2-git-send-email-yang.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1537985434-22655-1-git-send-email-yang.shi@linux.alibaba.com> References: <1537985434-22655-1-git-send-email-yang.shi@linux.alibaba.com> 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 brk might be used to shinrk memory mapping too other than munmap(). So, it may hold write mmap_sem for long time when shrinking large mapping, as what commit ("mm: mmap: zap pages with read mmap_sem in munmap") described. The brk() will not manipulate vmas anymore after __do_munmap() call for the mapping shrink use case. But, it may set mm->brk after __do_munmap(), which needs hold write mmap_sem. However, a simple trick can workaround this by setting mm->brk before __do_munmap(). Then restore the original value if __do_munmap() fails. With this trick, it is safe to downgrade to read mmap_sem. So, the same optimization, which downgrades mmap_sem to read for zapping pages, is also feasible and reasonable to this case. The period of holding exclusive mmap_sem for shrinking large mapping would be reduced significantly with this optimization. Cc: Michal Hocko Cc: Kirill A. Shutemov Cc: Matthew Wilcox Cc: Laurent Dufour Cc: Vlastimil Babka Cc: Andrew Morton Signed-off-by: Yang Shi Acked-by: Vlastimil Babka --- v2: Rephrase the commit per Michal mm/mmap.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 017bcfa..0d2fae1 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -193,9 +193,11 @@ static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long unsigned long retval; unsigned long newbrk, oldbrk; struct mm_struct *mm = current->mm; + unsigned long origbrk = mm->brk; struct vm_area_struct *next; unsigned long min_brk; bool populate; + bool downgrade = false; LIST_HEAD(uf); if (down_write_killable(&mm->mmap_sem)) @@ -229,14 +231,29 @@ static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long newbrk = PAGE_ALIGN(brk); oldbrk = PAGE_ALIGN(mm->brk); - if (oldbrk == newbrk) - goto set_brk; + if (oldbrk == newbrk) { + mm->brk = brk; + goto success; + } - /* Always allow shrinking brk. */ + /* + * Always allow shrinking brk. + * __do_munmap() may downgrade mmap_sem to read. + */ if (brk <= mm->brk) { - if (!do_munmap(mm, newbrk, oldbrk-newbrk, &uf)) - goto set_brk; - goto out; + /* + * mm->brk need to be protected by write mmap_sem, update it + * before downgrading mmap_sem. + * When __do_munmap fail, it will be restored from origbrk. + */ + mm->brk = brk; + retval = __do_munmap(mm, newbrk, oldbrk-newbrk, &uf, true); + if (retval < 0) { + mm->brk = origbrk; + goto out; + } else if (retval == 1) + downgrade = true; + goto success; } /* Check against existing mmap mappings. */ @@ -247,18 +264,21 @@ static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long /* Ok, looks good - let it rip. */ if (do_brk_flags(oldbrk, newbrk-oldbrk, 0, &uf) < 0) goto out; - -set_brk: mm->brk = brk; + +success: populate = newbrk > oldbrk && (mm->def_flags & VM_LOCKED) != 0; - up_write(&mm->mmap_sem); + if (downgrade) + up_read(&mm->mmap_sem); + else + up_write(&mm->mmap_sem); userfaultfd_unmap_complete(mm, &uf); if (populate) mm_populate(oldbrk, newbrk - oldbrk); return brk; out: - retval = mm->brk; + retval = origbrk; up_write(&mm->mmap_sem); return retval; }