From patchwork Wed Dec 8 21:22:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 12665267 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11C2BC433F5 for ; Wed, 8 Dec 2021 21:22:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 85FA36B0071; Wed, 8 Dec 2021 16:22:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 80DEC6B0073; Wed, 8 Dec 2021 16:22:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6AE4C6B0074; Wed, 8 Dec 2021 16:22:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0055.hostedemail.com [216.40.44.55]) by kanga.kvack.org (Postfix) with ESMTP id 5C1DD6B0071 for ; Wed, 8 Dec 2021 16:22:26 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 1B8BF89958 for ; Wed, 8 Dec 2021 21:22:16 +0000 (UTC) X-FDA: 78895900272.21.687F20D Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf11.hostedemail.com (Postfix) with ESMTP id C1822F0000B8 for ; Wed, 8 Dec 2021 21:22:15 +0000 (UTC) Received: by mail-yb1-f201.google.com with SMTP id s189-20020a252cc6000000b005c1f206d91eso6641766ybs.14 for ; Wed, 08 Dec 2021 13:22:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=7AiB4xZKo9CfYCzdKVvxaPbZztKFTU9MCKhfSBvngDw=; b=ZD3pyDq6HyIQAbnb53r5xYWhonZl7vzKyzJ/RpgDlART3fRWEPaYJOszMUK/NaeNTT EVAq6D6jiUM399ZJA0aFUGReV+gBgR9N6DvGUa8HmyUGYASfD7+6a1KqGS2s0TgEDB1t DMcQYFXXQrCpaF07o3JwjWPBEfRI4PBDpxDMkzeinyIdSW7Lhyp0u1iVuHAyMe0sEYL0 YLMVvjmDEqUctw2SoylPZb2RNh1pfdi8qj0bOtWj31gTfQUaZXDg7+GD7PrcyQEDp0q/ C5hiVh2hOE971kb4gPu8fEH2H3+SXcP/m8QTTVY4l1sgUbWwtNcHt6kaC6oxm8YpyOve COnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=7AiB4xZKo9CfYCzdKVvxaPbZztKFTU9MCKhfSBvngDw=; b=EbM0yHehSmAL8b0uXyqotkR3nOG3EtWoUB41Z/ugMSxp4vqXj/DTQu1Kxr56egxSdG ODbhk1Xle6dGmWSxgf9bspNMvhH4nS+vkff4igd6PpUHz1S6kVmAc9EYaxR7IP7w1C/3 XsHzkQgDvjVVsh5AFQInAmvuThk26ZhvjmtuAUZSPT9Hs+8+5wdbGw8iwswRFqxm+ZuK 7eM6LHGXPEaUJcMImQJDjrJagOrx69SgF4h5uZ7YXIKatOC7Qoxk8mTgBBsFXBfsTmQh hL2Zk/L1tYHoDMcyGOyLnv5s6O4dpdyyeKYs/2gKLj3bYF7waK4iHusANNbs1oLmtToA U3aA== X-Gm-Message-State: AOAM532Sz5Hig7woMzYmOdok/nveSn5LyRLcx+7wZTuaQCFIdgLkyEIt D0TE33O5ei5qSpJyLLjU3NoNhy2eT0c= X-Google-Smtp-Source: ABdhPJwmX5ycLZWEvpUwxbN+kx4ZMInSe8TpJ7lAq5TIrjBzoLpXy0BMW3REJ9kApX0vManDCrABDX8hUP0= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:4efa:9eac:2174:103c]) (user=surenb job=sendgmr) by 2002:a25:ac23:: with SMTP id w35mr1497904ybi.341.1638998534911; Wed, 08 Dec 2021 13:22:14 -0800 (PST) Date: Wed, 8 Dec 2021 13:22:09 -0800 Message-Id: <20211208212211.2860249-1-surenb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.400.ga245620fadb-goog Subject: [PATCH v4 1/3] mm: protect free_pgtables with mmap_lock write lock in exit_mmap From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: mhocko@kernel.org, mhocko@suse.com, rientjes@google.com, willy@infradead.org, hannes@cmpxchg.org, guro@fb.com, riel@surriel.com, minchan@kernel.org, kirill@shutemov.name, aarcange@redhat.com, christian@brauner.io, hch@infradead.org, oleg@redhat.com, david@redhat.com, jannh@google.com, shakeelb@google.com, luto@kernel.org, christian.brauner@ubuntu.com, fweimer@redhat.com, jengelh@inai.de, timmurray@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@android.com, surenb@google.com X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C1822F0000B8 X-Stat-Signature: jk5ehfbrp7o1w946hmk55ztdba6yjq4t Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=ZD3pyDq6; spf=pass (imf11.hostedemail.com: domain of 3BiKxYQYKCCMRTQDMAFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3BiKxYQYKCCMRTQDMAFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1638998535-488740 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: oom-reaper and process_mrelease system call should protect against races with exit_mmap which can destroy page tables while they walk the VMA tree. oom-reaper protects from that race by setting MMF_OOM_VICTIM and by relying on exit_mmap to set MMF_OOM_SKIP before taking and releasing mmap_write_lock. process_mrelease has to elevate mm->mm_users to prevent such race. Both oom-reaper and process_mrelease hold mmap_read_lock when walking the VMA tree. The locking rules and mechanisms could be simpler if exit_mmap takes mmap_write_lock while executing destructive operations such as free_pgtables. Change exit_mmap to hold the mmap_write_lock when calling free_pgtables and remove_vma. Operations like unmap_vmas and unlock_range are not destructive and could run under mmap_read_lock but for simplicity we take one mmap_write_lock during almost the entire operation. Note also that because oom-reaper checks VM_LOCKED flag, unlock_range() should not be allowed to race with it. Before this patch, remove_vma used to be called with no locks held, however with fput being executed asynchronously and vm_ops->close not being allowed to hold mmap_lock (it is called from __split_vma with mmap_sem held for write), changing that should be fine. In most cases this lock should be uncontended. Previously, Kirill reported ~4% regression caused by a similar change [1]. We reran the same test and although the individual results are quite noisy, the percentiles show lower regression with 1.6% being the worst case [2]. The change allows oom-reaper and process_mrelease to execute safely under mmap_read_lock without worries that exit_mmap might destroy page tables from under them. [1] https://lore.kernel.org/all/20170725141723.ivukwhddk2voyhuc@node.shutemov.name/ [2] https://lore.kernel.org/all/CAJuCfpGC9-c9P40x7oy=jy5SphMcd0o0G_6U1-+JAziGKG6dGA@mail.gmail.com/ Signed-off-by: Suren Baghdasaryan Acked-by: Michal Hocko --- changes in v4 - Separated comments describing vm_operations_struct::close locking requirements into a separate patch, per Matthew Wilcox mm/mmap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index bfb0ea164a90..f4e09d390a07 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3142,25 +3142,27 @@ void exit_mmap(struct mm_struct *mm) * to mmu_notifier_release(mm) ensures mmu notifier callbacks in * __oom_reap_task_mm() will not block. * - * This needs to be done before calling munlock_vma_pages_all(), + * This needs to be done before calling unlock_range(), * which clears VM_LOCKED, otherwise the oom reaper cannot * reliably test it. */ (void)__oom_reap_task_mm(mm); set_bit(MMF_OOM_SKIP, &mm->flags); - mmap_write_lock(mm); - mmap_write_unlock(mm); } + mmap_write_lock(mm); if (mm->locked_vm) unlock_range(mm->mmap, ULONG_MAX); arch_exit_mmap(mm); vma = mm->mmap; - if (!vma) /* Can happen if dup_mmap() received an OOM */ + if (!vma) { + /* Can happen if dup_mmap() received an OOM */ + mmap_write_unlock(mm); return; + } lru_add_drain(); flush_cache_mm(mm); @@ -3171,16 +3173,14 @@ void exit_mmap(struct mm_struct *mm) free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, USER_PGTABLES_CEILING); tlb_finish_mmu(&tlb); - /* - * Walk the list again, actually closing and freeing it, - * with preemption enabled, without holding any MM locks. - */ + /* Walk the list again, actually closing and freeing it. */ while (vma) { if (vma->vm_flags & VM_ACCOUNT) nr_accounted += vma_pages(vma); vma = remove_vma(vma); cond_resched(); } + mmap_write_unlock(mm); vm_unacct_memory(nr_accounted); }