From patchwork Mon Feb 14 07:17:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 12745066 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 DC1FCC433F5 for ; Mon, 14 Feb 2022 07:17:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D7736B0072; Mon, 14 Feb 2022 02:17:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3869F6B0073; Mon, 14 Feb 2022 02:17:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 226AD6B0078; Mon, 14 Feb 2022 02:17:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.28]) by kanga.kvack.org (Postfix) with ESMTP id 0F1086B0072 for ; Mon, 14 Feb 2022 02:17:56 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C346F64E for ; Mon, 14 Feb 2022 07:17:55 +0000 (UTC) X-FDA: 79140530910.01.DA5AAA9 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by imf02.hostedemail.com (Postfix) with ESMTP id 5BF9980005 for ; Mon, 14 Feb 2022 07:17:55 +0000 (UTC) Received: by mail-qv1-f44.google.com with SMTP id a19so14109123qvm.4 for ; Sun, 13 Feb 2022 23:17:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:in-reply-to:message-id:references :mime-version; bh=7RY/qhKlJPQeH1IwAyGGlnES1Mny5ocT5QtyB/fayZE=; b=VzHkAYMDY/HdX+dsw6NCrXxZNHuj/JmwC6wfDXY856bPWsyrZGDwKxWUbh+5fltduz GgqnA6zOXtDiABDP4mpEIa9EWec0IWNBR+s2DhUBQE6ySH3ojeItvuzQWwZUWcB7EgEd GW51aBMXNbU/JLRdIl0G7IbRDZn6K0pF9L7v90SUfQBOzRh9HbWx9ta8bjwGx/gRG000 E2p+IV6RDhwBQMZj7sjM5yaOH0O94DPvVcUFuzZXhT6McR+b98r8KpXKaIh8CrVhpkRc ssJIjNQ1LJRCxNwuq356EHuwERotOggGTGu+SpkBdwaVSTj1sWLNrPWbyLTer/50nfVh RToA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=7RY/qhKlJPQeH1IwAyGGlnES1Mny5ocT5QtyB/fayZE=; b=MnAeWYJHM6/1wsZVV/fwIk+dkU4BWamueNrtzMi7zbSnb2lXCBNYtqeNxKxlKVeOxv wSNjaG4y2Ir/a7qVA2QCkLL6LbNOXOGETWX/2pZ2L9inBEndeFs1QbEK5kTnrhpFqY4T w75Fw3fpqgo9RVWOgNnGx9QT50wwriPUG/WfOHNFYprOdqLZ+JlI1P93oT69YpMVpJ1r n6iuWOu3LZn4ixKfKADMUgRoXiKtAYiX5N4+kb0GWawXzAPKBGJAPHzIqT8T0o8Sak+d rW13XjXgiQLVeK7qf5rVLGydx5sEH8LTw2EKk0Fo8/6iWWzcN+xAgvDkgDgtAY+HLaaq HVPw== X-Gm-Message-State: AOAM533WxUAs9fsdYv4A8iE601TIm4zuYUZz22HJhRk0s+43xihHHCOA 30TPoNVP+l4uyTMhI80yRO9jfw== X-Google-Smtp-Source: ABdhPJwGwX68z0qBHohS57F18pqVnq/mKw8WHUjx6KtfBL80xG8cXkQqofjGkCTSjuQrcuBY6S4Xcw== X-Received: by 2002:a05:6214:62e:: with SMTP id a14mr699015qvx.9.1644823074534; Sun, 13 Feb 2022 23:17:54 -0800 (PST) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id j14sm16202816qko.10.2022.02.13.23.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 23:17:53 -0800 (PST) Date: Sun, 13 Feb 2022 23:17:51 -0800 (PST) From: Hugh Dickins X-X-Sender: hugh@ripple.anvils To: Andrew Morton cc: Hugh Dickins , Vlastimil Babka , Michal Hocko , "Kirill A. Shutemov" , Matthew Wilcox , David Hildenbrand , Alistair Popple , Johannes Weiner , Rik van Riel , Suren Baghdasaryan , Yu Zhao , Greg Thelen , Shakeel Butt , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 11/13] mm/munlock: page migration needs mlock pagevec drained In-Reply-To: Message-ID: <27b835d-6fee-e62-ca32-266eb1b5544e@google.com> References: <8e4356d-9622-a7f0-b2c-f116b5f2efea@google.com> <90c8962-d188-8687-dc70-628293316343@google.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 5BF9980005 X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=VzHkAYMD; spf=pass (imf02.hostedemail.com: domain of hughd@google.com designates 209.85.219.44 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com X-Stat-Signature: iiwgdtm7b76sqn3rdze3h8aosajanft5 X-Rspamd-Server: rspam03 X-HE-Tag: 1644823075-135230 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: Page migration of a VM_LOCKED page tends to fail, because when the old page is unmapped, it is put on the mlock pagevec with raised refcount, which then fails the freeze. At first I thought this would be fixed by a local mlock_page_drain() at the upper rmap_walk() level - which would have nicely batched all the munlocks of that page; but tests show that the task can too easily move to another cpu, leaving pagevec residue behind which fails the migration. So try_to_migrate_one() drain the local pagevec after page_remove_rmap() from a VM_LOCKED vma; and do the same in try_to_unmap_one(), whose TTU_IGNORE_MLOCK users would want the same treatment; and do the same in remove_migration_pte() - not important when successfully inserting a new page, but necessary when hoping to retry after failure. Any new pagevec runs the risk of adding a new way of stranding, and we might discover other corners where mlock_page_drain() or lru_add_drain() would now help. Signed-off-by: Hugh Dickins Acked-by: Vlastimil Babka --- v2: Delete suggestion of sysctl from changelog, per Vlastimil. mm/migrate.c | 2 ++ mm/rmap.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/mm/migrate.c b/mm/migrate.c index f4bcf1541b62..e7d0b68d5dcb 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -251,6 +251,8 @@ static bool remove_migration_pte(struct page *page, struct vm_area_struct *vma, page_add_file_rmap(new, vma, false); set_pte_at(vma->vm_mm, pvmw.address, pvmw.pte, pte); } + if (vma->vm_flags & VM_LOCKED) + mlock_page_drain(smp_processor_id()); /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, pvmw.address, pvmw.pte); diff --git a/mm/rmap.c b/mm/rmap.c index 5442a5c97a85..714bfdc72c7b 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1656,6 +1656,8 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma, * See Documentation/vm/mmu_notifier.rst */ page_remove_rmap(subpage, vma, PageHuge(page)); + if (vma->vm_flags & VM_LOCKED) + mlock_page_drain(smp_processor_id()); put_page(page); } @@ -1930,6 +1932,8 @@ static bool try_to_migrate_one(struct page *page, struct vm_area_struct *vma, * See Documentation/vm/mmu_notifier.rst */ page_remove_rmap(subpage, vma, PageHuge(page)); + if (vma->vm_flags & VM_LOCKED) + mlock_page_drain(smp_processor_id()); put_page(page); }