From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 922AF42E406 for ; Mon, 24 Aug 2026 14:16:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787581000; cv=none; b=AXL+mW25P41oY6gQWXUh7NEsMzvWxGT7PySTG7XvERSkvYwO4KVcMLwrThfbNIjuyg2rbS0vk5GnkiauuOKd+1Me5hggCbBYmTNGsOfvbQdSVEUJRyNavhkJqKRnuMI24uzm0aGhLdyM6zGqCEfGdowTGczI5yDuwyna/3H2lMg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787581000; c=relaxed/simple; bh=QniatQlrXg10kLiLZvm0JWLrvxMekaoyIeWxGsqqyx4=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References: MIME-Version:Content-Type; b=VUiVHiHNmjMDnuzSbBAOkw9ZPafePuGnyS6BR36JDziGu8VhVLYCHgItyQXSZ7rhdFCLxhnkp0D8W+d8z/OIX0y0Mo4QnHiDwsepYTe4kd9VVRf3lWwJCMECG3/JZusSVZ6TME++zAzEmXC/cBNRidyex0aUtNAEEMOQSYJORNE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HZdUIPxT; arc=none smtp.client-ip=209.85.128.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HZdUIPxT" Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-81dfdbd86d1so45215807b3.1 for ; Mon, 24 Aug 2026 07:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1787580997; x=1788185797; darn=vger.kernel.org; h=content-type:mime-version:references:message-id:in-reply-to:subject :cc:to:from:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=vRQTGUT/r/6sjQRYrNEkhtszeIpWm9eC3zYKRwiMzSE=; b=HZdUIPxTkwxFQa4RpZvCl6gyLZYQw97I5pgVbLbpwnIz9HUpD78bFxBcdtU2Ou7v/a inh9csPo7IuQeVlDn9VnkQe1hsxTf19J0cz3fYhQinK4rkS6aXHMi4GZo9co5DeM7lDU 19HSW/qV/duNgmO3lz5+xtDnTR1t8WLBcAEklnG3q/ujAsJnhHuWRbIkgNF8njMbQ+kv /3N8u1a1otYGBD8t7LnYA2sYGWhDUJKE9poajleKk0YUgT8isZH5R8wZUR8KzxWglbGO dvDtg1S/Z75k/M/PZY922QTXl1FomDedf/vp57R8ltaKEz+Hadzi5SEuZmyP9MZePq// AEbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787580997; x=1788185797; h=content-type:mime-version:references:message-id:in-reply-to:subject :cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vRQTGUT/r/6sjQRYrNEkhtszeIpWm9eC3zYKRwiMzSE=; b=RIFGfEUFQu3ESEXdVR/YNfUWUsYyvSzwOuBAVFu/x95SmOqy4Rqu2nI4XChShu9dPq u8NoQ78zMIl3+YwrYdCxW7sK870EfpXBa/+RInNrO7YdhMUJ7ufEHTfW7LY7N9poKNiI LMtz5gO0PVKXebgzbMWKWu/uPDGzjKTs2CI0JoZfa4vganSxYHvYUMGF4sECgnvWhZGK LIS5ggwLemdTlThvP4uQElyVK689hjAPLEsH7gtK+VQW+ns69V5gPftbC4eKNWL+VFZg YH/rAuyp81S+KAGSk7lSJwj2N7E5wTCPlKFP85DnPTTaJK/4JgB6N8DlJSorGFEFaARU uArA== X-Forwarded-Encrypted: i=1; AHgh+RpCCbUL0LRSD+I2p3e3IsvIDR3BfqvZ5Kti+kgLf/sssZBtuzK1zgHBQ6Y4F4CxYYwPEkwdr7GyfxGbFa8=@vger.kernel.org X-Gm-Message-State: AFuF++nj0Gz1TBS9DbNi26GrTLE/4Rjb5a/En9AAHma4Di6DPCEBKP7Z jMcKMTRzSJP/+0biBvVARnubH7JKS9mlL05IU0fSpEVOs5lPg/uugyoML26LSyWxIA== X-Gm-Gg: AR+sD13qQ0epBjnhm0VKD2w+ZzcBcu9e6z76cuuLZjz54VQBZ4XnRJ66xnwY4k6VzVF tmbf+cfCcc9wZQwMcAJIKkoTYYkiieInma850DHjzXVF2lcqsRfooeWbNCDmKTzXeSPD1R/5qjJ aVkq0OOQNd5JOr2kb2YlAu9IdJetfBujsJvnONoXBn6VheUHQqfynpxpaNEuIBeEd6P+nGXHxHb 3kxCSrt7tNHsW49Ek12aaeWS32B/uIi93RiAocq0FvVD7+o3Gwn4P+iY/U6Wjq5CIpwpC+7StSb 6IBrPDfyjdnfF/Ek9+qNyJcq3grcjH2F9ezmBccxiA8wBhHAL+04hBdsBgnLk+J8VTyM+xOJFT3 8v0Oqd4wVJabQFPVMW2ajF4P4iMwIgwaQ2Owwsp+Ry7SerEvjnm29HGB5OgFFncMThIhadCfFj/ UJYY7oYas6KiVxoEoXIHq0aKzwsyqgJatYJqSFvA09S6NCv/2RZ4INdszlsE3U6PLZhUIkYjrk/ z2Ri5zIFqcgD7xk5io/EyOtcwmt5GWjHlBEF6/FO3XoC9C4 X-Received: by 2002:a05:690c:568a:20b0:844:9f61:92d9 with SMTP id 00721157ae682-849f67acaa8mr75561237b3.17.1787580996861; Mon, 24 Aug 2026 07:16:36 -0700 (PDT) Received: from darker.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id 00721157ae682-851e1419e0bsm11879757b3.26.2026.08.24.07.16.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2026 07:16:35 -0700 (PDT) Date: Mon, 24 Aug 2026 07:16:30 -0700 (PDT) From: Hugh Dickins To: Andrew Morton cc: Ackerley Tng , Alexander Viro , Baolin Wang , Barry Song , Binbin Wu , Christian Brauner , Christoph Hellwig , Christoph Lameter , Claudio Imbrenda , David Hildenbrand , JP Kobryn , Jan Kara , Jens Axboe , Johannes Weiner , Kairui Song , Kiryl Shutsemau , Lance Yang , Leonardo Bras , Lorenzo Stoakes , Marcelo Tosatti , Matthew Wilcox , Mel Gorman , Miaohe Lin , Michal Hocko , Minchan Kim , Muchun Song , Oscar Salvador , Peter Zijlstra , Qi Zheng , Rik van Riel , Sebastian Andrzej Siewior , Shakeel Butt , Suren Baghdasaryan , Vlastimil Babka , Yang Shi , Yu Zhao , Zach O'Keefe , Zi Yan , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 10/25] mm/fbatch: remove several uses of mlock_drain_local() In-Reply-To: <14a16945-529b-8bc0-ab38-3ea97e54e223@google.com> Message-ID: References: <14a16945-529b-8bc0-ab38-3ea97e54e223@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Remove several uses of mlock_drain_local(): they were workarounds for when that sequence of operations tended to leave folios in mlock_fbatch with debilitating raised refcount (and no good if the task changed CPU). Signed-off-by: Hugh Dickins --- mm/huge_memory.c | 2 -- mm/migrate.c | 2 -- mm/rmap.c | 4 ---- 3 files changed, 8 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index c7bd99592195..df6bf69a066b 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3568,8 +3568,6 @@ static bool __discard_anon_folio_pmd_locked(struct vm_area_struct *vma, folio_remove_rmap_pmd(folio, pmd_page(orig_pmd), vma); zap_deposited_table(mm, pmdp); add_mm_counter(mm, MM_ANONPAGES, -HPAGE_PMD_NR); - if (vma->vm_flags & VM_LOCKED) - mlock_drain_local(); folio_put(folio); return true; diff --git a/mm/migrate.c b/mm/migrate.c index 8aaafcea7bc1..6b71b2415d00 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -448,8 +448,6 @@ static bool remove_migration_pte(struct folio *folio, folio_add_file_rmap_pte(folio, new, vma); set_pte_at(vma->vm_mm, pvmw.address, pvmw.pte, pte); } - if (READ_ONCE(vma->vm_flags) & VM_LOCKED) - mlock_drain_local(); trace_remove_migration_pte(pvmw.address, pte_val(pte), compound_order(new)); diff --git a/mm/rmap.c b/mm/rmap.c index 1f72d279ba68..e76823ec4d5e 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2390,8 +2390,6 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, } finish_unmap: folio_remove_rmap_ptes(folio, page, nr_pages, vma); - if (vma->vm_flags & VM_LOCKED) - mlock_drain_local(); folio_put_refs(folio, nr_pages); /* @@ -2765,8 +2763,6 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, hugetlb_remove_rmap(folio); else folio_remove_rmap_pte(folio, subpage, vma); - if (vma->vm_flags & VM_LOCKED) - mlock_drain_local(); folio_put(folio); } -- 2.51.0