From mboxrd@z Thu Jan 1 00:00:00 1970 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 C4365C433F5 for ; Tue, 8 Mar 2022 00:03:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 005D18D0002; Mon, 7 Mar 2022 19:03:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EF7938D0001; Mon, 7 Mar 2022 19:03:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBEF68D0002; Mon, 7 Mar 2022 19:03:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id CD1FA8D0001 for ; Mon, 7 Mar 2022 19:03:26 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8651422F0F for ; Tue, 8 Mar 2022 00:03:26 +0000 (UTC) X-FDA: 79219269612.15.FAA711A Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf18.hostedemail.com (Postfix) with ESMTP id EA4EB1C0002 for ; Tue, 8 Mar 2022 00:03:25 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id z3so7025053plg.8 for ; Mon, 07 Mar 2022 16:03:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=D9wbXIRTldTtmuQubha8O7jdPMIdPkNXtDtnMlsvwSo=; b=D87M53alQtZEnb5Nxh9tl58QMmIVaYCGTYKkPrxRZrPG7KU8lZ6S7NFZEl9Y5UlqQ3 wfqcXLvzegMv2kSU1R73uRWogrDub/0B5FB3xfcj4XZl24WzcaJGozDjnQOrQSU0dOrI XeE5XP3DU6bLdgmupoAm88xQDEkS/q41h1LGnJbHMM5x4rphyxpKec6Fj0PTuuEDB5qW 8LFuKEQ46MF66Ww926o4sZrhjDoCGFIzN1a4SqMy67RhBfIzIKRsggz7l1JAABjWV6+6 7i+ldoimjRVb0IE69i0V4Ijg9pD7Tec6ErcALewNunmmvEOSlnPwBUf4wzvS7Gdc1Wuk wJCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=D9wbXIRTldTtmuQubha8O7jdPMIdPkNXtDtnMlsvwSo=; b=v3xU9g8VuN/S6xpvyaupUpSauU/8AT9Zkdmj1KCrT36ZuyVIzUbPyV2SSsAUPwh6Sw BflEgzvkuhEpIrcHtfwbSBiAP7F5RCkdYss6/zuu++86PSRqa4YiLoN6NhDdr+YrjIk5 +txOIyyJOWQoblMLXhmxR0fdaFbfI+KleVH0F0Bdrdy6fhkgu2v21JGd4e16eKtFAYP/ +mOsDumL/aZFZwoXPLUurfnDV0GSJra6oojXvLTXy/VYyZLDo1yQUQgGt/aUwER0HUhT isX7ZjjJQ6tBl1v99Z0s87ss865J8vjhGRzaz1JkM/dFiRfXZMYY123s2p040lADbXb6 GYVA== X-Gm-Message-State: AOAM5309itBcpW3qcuzPHMUs1k61ucivHMKX5cmKD4DcsGLHmauKmjGy kAo3GEhU/6rPC6z7xxdpa7S/ChAhnWSvi2Wfbco= X-Google-Smtp-Source: ABdhPJw/ms+120QdyjSh1B6KKPoO7l8dAlw76td2jm1Ksw2GuzOkn4+GvrlwOyuHDgFV+kszD03ayeW6jrc0Uqmn35E= X-Received: by 2002:a17:903:124a:b0:151:99fe:1a10 with SMTP id u10-20020a170903124a00b0015199fe1a10mr14660065plh.87.1646697804764; Mon, 07 Mar 2022 16:03:24 -0800 (PST) MIME-Version: 1.0 References: <20220303222014.517033-1-shy828301@gmail.com> <13ad4ba1-2a88-9459-3995-70af36aba33e@redhat.com> <20220306180718.6d4e6233130b94fdad98df88@linux-foundation.org> <84a6c9c1-d18f-6955-2666-0a2d7bce6094@redhat.com> <20220307154326.6494f7fca7def491a23e5df1@linux-foundation.org> In-Reply-To: <20220307154326.6494f7fca7def491a23e5df1@linux-foundation.org> From: Yang Shi Date: Mon, 7 Mar 2022 16:03:12 -0800 Message-ID: Subject: Re: [PATCH] mm: thp: don't have to lock page anymore when splitting PMD To: Andrew Morton Cc: David Hildenbrand , Andrea Arcangeli , Hugh Dickins , "Kirill A. Shutemov" , Linux Kernel Mailing List , Linux MM , Matthew Wilcox Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: EA4EB1C0002 X-Rspam-User: Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=D87M53al; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf18.hostedemail.com: domain of shy828301@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=shy828301@gmail.com X-Stat-Signature: 5bdzzqrzzzrbfytic3cewyzsj5q9erxq X-HE-Tag: 1646697805-457096 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: On Mon, Mar 7, 2022 at 3:43 PM Andrew Morton wrote: > > On Mon, 7 Mar 2022 09:24:58 +0100 David Hildenbrand wrote: > > > On 07.03.22 03:07, Andrew Morton wrote: > > > On Fri, 4 Mar 2022 19:50:08 +0100 David Hildenbrand wrote: > > > > > >> @Andrew, the last mail I received was > > >> > > >> + mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd.patch > > >> added to -mm tree > > >> > > >> The patch shows up in mmotm as > > >> > > >> #[merged]mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd.patch > > >> > > >> ... which shouldn't be true. > > > > > > I guess I mislabelled the reason for dropping it. Should have been to-be-updated, > > > due to https://lkml.kernel.org/r/CAHbLzkpbnQyHRckoRtbZoaLvANu92MY4kEsbKudaQ8MDUA3nVg@mail.gmail.com > > > > > > > Let me clarify. > > > > 1. I sent [1] (9 patches) > > > > 2. You queued the 9 patches > > > > E.g., in "mmotm 2022-02-15-20-22 uploaded" > > > > * mm-optimize-do_wp_page-for-exclusive-pages-in-the-swapcache.patch > > * mm-optimize-do_wp_page-for-fresh-pages-in-local-lru-pagevecs.patch > > * mm-slightly-clarify-ksm-logic-in-do_swap_page.patch > > * mm-streamline-cow-logic-in-do_swap_page.patch > > * mm-huge_memory-streamline-cow-logic-in-do_huge_pmd_wp_page.patch > > * mm-khugepaged-remove-reuse_swap_page-usage.patch > > * mm-swapfile-remove-stale-reuse_swap_page.patch > > * mm-huge_memory-remove-stale-page_trans_huge_mapcount.patch > > * mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd.patch > > > > 3. The last patch in the series was dropped. What remains are 8 patches. > > > > E.g., in "mmotm 2022-02-24-22-38 uploaded" > > > > * mm-optimize-do_wp_page-for-exclusive-pages-in-the-swapcache.patch > > * mm-optimize-do_wp_page-for-fresh-pages-in-local-lru-pagevecs.patch > > * mm-slightly-clarify-ksm-logic-in-do_swap_page.patch > > * mm-streamline-cow-logic-in-do_swap_page.patch > > * mm-huge_memory-streamline-cow-logic-in-do_huge_pmd_wp_page.patch > > * mm-khugepaged-remove-reuse_swap_page-usage.patch > > * mm-swapfile-remove-stale-reuse_swap_page.patch > > * mm-huge_memory-remove-stale-page_trans_huge_mapcount.patch > > > > 4. Yang Shi sent his patch (the one we're replying to) > > > > 5. You picked his patch and dropped it again due to [2] > > > > > > I'm wondering why 3 happened and why > > https://www.ozlabs.org/~akpm/mmotm/series contains: > > > > > > mm-optimize-do_wp_page-for-exclusive-pages-in-the-swapcache.patch > > mm-optimize-do_wp_page-for-fresh-pages-in-local-lru-pagevecs.patch > > mm-slightly-clarify-ksm-logic-in-do_swap_page.patch > > mm-streamline-cow-logic-in-do_swap_page.patch > > mm-huge_memory-streamline-cow-logic-in-do_huge_pmd_wp_page.patch > > mm-khugepaged-remove-reuse_swap_page-usage.patch > > mm-swapfile-remove-stale-reuse_swap_page.patch > > mm-huge_memory-remove-stale-page_trans_huge_mapcount.patch > > ... > > #[merged]mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd.patch > > OK, thanks. I guess it was me seeing 100% rejects when merging onto > the folio changes then incorrectly deciding the patch was now in > linux-next via some other tree. > > I restored it and fixed things up. Please check. Thanks, Andrew. I think we could clean it up a little bit further. > > > --- a/mm/huge_memory.c~mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd > +++ a/mm/huge_memory.c > @@ -2133,8 +2133,6 @@ void __split_huge_pmd(struct vm_area_str > { > spinlock_t *ptl; > struct mmu_notifier_range range; > - bool do_unlock_folio = false; > - pmd_t _pmd; > > mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm, > address & HPAGE_PMD_MASK, > @@ -2153,42 +2151,14 @@ void __split_huge_pmd(struct vm_area_str > goto out; > } > > -repeat: > if (pmd_trans_huge(*pmd)) { > - if (!folio) { > + if (!folio) > folio = page_folio(pmd_page(*pmd)); We could remove the "if (pmd_trans_huge(*pmd))" section since folio is actually not used afterward at all. > - /* > - * An anonymous page must be locked, to ensure that a > - * concurrent reuse_swap_page() sees stable mapcount; > - * but reuse_swap_page() is not used on shmem or file, > - * and page lock must not be taken when zap_pmd_range() > - * calls __split_huge_pmd() while i_mmap_lock is held. > - */ > - if (folio_test_anon(folio)) { > - if (unlikely(!folio_trylock(folio))) { > - folio_get(folio); > - _pmd = *pmd; > - spin_unlock(ptl); > - folio_lock(folio); > - spin_lock(ptl); > - if (unlikely(!pmd_same(*pmd, _pmd))) { > - folio_unlock(folio); > - folio_put(folio); > - folio = NULL; > - goto repeat; > - } > - folio_put(folio); > - } > - do_unlock_folio = true; > - } > - } > } else if (!(pmd_devmap(*pmd) || is_pmd_migration_entry(*pmd))) > goto out; > __split_huge_pmd_locked(vma, pmd, range.start, freeze); With the above if removed, this could be changed to: if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || is_pmd_migration_entry(*pmd)) __split_huge_pmd_locked(vma, pmd, range.start, freeze); > out: > spin_unlock(ptl); > - if (do_unlock_folio) > - folio_unlock(folio); > /* > * No need to double call mmu_notifier->invalidate_range() callback. > * They are 3 cases to consider inside __split_huge_pmd_locked(): > _ >