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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7812BC433B4 for ; Wed, 21 Apr 2021 07:01:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1DAFE613B2 for ; Wed, 21 Apr 2021 07:01:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DAFE613B2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AEF286B0074; Wed, 21 Apr 2021 03:01:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AC6D56B0075; Wed, 21 Apr 2021 03:01:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93F906B0078; Wed, 21 Apr 2021 03:01:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0078.hostedemail.com [216.40.44.78]) by kanga.kvack.org (Postfix) with ESMTP id 755CA6B0074 for ; Wed, 21 Apr 2021 03:01:47 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 3E7A445D8 for ; Wed, 21 Apr 2021 07:01:47 +0000 (UTC) X-FDA: 78055479054.35.7B0151E Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf27.hostedemail.com (Postfix) with ESMTP id 8313F80192D8 for ; Wed, 21 Apr 2021 07:01:30 +0000 (UTC) Received: by mail-pg1-f176.google.com with SMTP id 31so13369809pgn.13 for ; Wed, 21 Apr 2021 00:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DOcPgu6D5oEEgx7D2wD/VCzFGRTojx6iJbpWydghicw=; b=XlQkbgcbPWI6jkTWC3u5TrT3nH5vwuPPyVriG5daT7w8f1BQpiguK5hwLSevehvH6F HmVsv3eKQn9CrshzJZG3FQUH7YOeJrC5bO/oqyzSqEISLW8vbWBQ8kLi4Ai1rqe34QHL YquQb3k7hQTTcFPOvAuLkf4HQrOnGThHWdfQ6yvfeno7MtCxKnBXDxTbjTXiYt0NPqdl QAu4OVf8RgyC5PwJk/MfVrripCBfAuqKRaZfXGZGvDOVNkjJNqP8R9iwHatl9P/R4AI9 MGoWSGiURj5w3okyfXuJfh2G5Wq4UgCJ4hx7N0Co6qUX2AIUQrapkjOQx56bxcSIRxcN JB8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DOcPgu6D5oEEgx7D2wD/VCzFGRTojx6iJbpWydghicw=; b=I2ql20skyeDN0leRMbT+Q9J6jhUdRRe3wfB51pAHr3L5SCw4ihGeI1NpPBuLZqMdRN 5hKqj+8VjNFGUdv8+lTGmX65TXWke8F9/afIe2+K4+3ZJrNNGhNr/iczCKPhGgQ8oxDN zeroJN+vsRB0OlOAYr7eZpxbVaUSxKT0FPeLoXRU57caAKQnY9jesdKeytLeVooeXDvD UJYtLU7e9UZKfSqYDmZhTrdkjdRPGUgv94AY28MVDahJ6zwoPRHnhxstZFBzIKPyMhfj hzvxAamqnE4Q5KwO291umgeA4+DUvZfjw8Ftc9W1oG6ktTgRK898GYs8A4yj0XKBk7o0 bmOg== X-Gm-Message-State: AOAM533/mSSspZtV8tOO2pfmKYw47IbEbOnCTxUenApwC/aresn48RHS TdEMAKfv7x54aRxLetVqIwMwbw== X-Google-Smtp-Source: ABdhPJyH4vKQChhJuWmIgWUOpefy4hsKuplUSNaZMj0jf5qZs8hysAcRoPo3hhI26/mDtMC3EVjSfQ== X-Received: by 2002:aa7:9837:0:b029:264:b19e:acce with SMTP id q23-20020aa798370000b0290264b19eaccemr4918194pfl.79.1618988506150; Wed, 21 Apr 2021 00:01:46 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id c4sm929842pfb.94.2021.04.21.00.01.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Apr 2021 00:01:45 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, fam.zheng@bytedance.com, bsingharora@gmail.com, shy828301@gmail.com, alex.shi@linux.alibaba.com, Muchun Song Subject: [RFC PATCH v3 05/12] mm: thp: introduce lock/unlock_split_queue{_irqsave}() Date: Wed, 21 Apr 2021 15:00:52 +0800 Message-Id: <20210421070059.69361-6-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210421070059.69361-1-songmuchun@bytedance.com> References: <20210421070059.69361-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 8313F80192D8 X-Stat-Signature: 5pm9mu89pqbeuuc494wqhqgsx75pydan Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf27; identity=mailfrom; envelope-from=""; helo=mail-pg1-f176.google.com; client-ip=209.85.215.176 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618988490-125334 Content-Transfer-Encoding: quoted-printable 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: We should make thp deferred split queue lock safe when LRU pages reparented. Similar to lock_page_lruvec{_irqsave, _irq}(), we introduce lock/unlock_split_queue{_irqsave}() to make the deferred split queue lock easier to be reparented. And in the next patch, we can use a similar approach (just like lruvec lock did) to make thp deferred split queue lock safe when the LRU pages reparented. Signed-off-by: Muchun Song --- mm/huge_memory.c | 96 +++++++++++++++++++++++++++++++++++++++++++-------= ------ 1 file changed, 74 insertions(+), 22 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 63ed6b25deaa..05ef9e8f9af5 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -487,25 +487,76 @@ pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_s= truct *vma) } =20 #ifdef CONFIG_MEMCG -static inline struct deferred_split *get_deferred_split_queue(struct pag= e *page) +static inline struct mem_cgroup *split_queue_to_memcg(struct deferred_sp= lit *queue) { - struct mem_cgroup *memcg =3D page_memcg(compound_head(page)); - struct pglist_data *pgdat =3D NODE_DATA(page_to_nid(page)); + return container_of(queue, struct mem_cgroup, deferred_split_queue); +} + +static struct deferred_split *lock_split_queue(struct page *page) +{ + struct deferred_split *queue; + struct mem_cgroup *memcg; + + memcg =3D page_memcg(compound_head(page)); + if (memcg) + queue =3D &memcg->deferred_split_queue; + else + queue =3D &NODE_DATA(page_to_nid(page))->deferred_split_queue; + spin_lock(&queue->split_queue_lock); + + return queue; +} =20 +static struct deferred_split *lock_split_queue_irqsave(struct page *page= , + unsigned long *flags) +{ + struct deferred_split *queue; + struct mem_cgroup *memcg; + + memcg =3D page_memcg(compound_head(page)); if (memcg) - return &memcg->deferred_split_queue; + queue =3D &memcg->deferred_split_queue; else - return &pgdat->deferred_split_queue; + queue =3D &NODE_DATA(page_to_nid(page))->deferred_split_queue; + spin_lock_irqsave(&queue->split_queue_lock, *flags); + + return queue; } #else -static inline struct deferred_split *get_deferred_split_queue(struct pag= e *page) +static struct deferred_split *lock_split_queue(struct page *page) +{ + struct deferred_split *queue; + + queue =3D &NODE_DATA(page_to_nid(page))->deferred_split_queue; + spin_lock(&queue->split_queue_lock); + + return queue; +} + +static struct deferred_split *lock_split_queue_irqsave(struct page *page= , + unsigned long *flags) + { - struct pglist_data *pgdat =3D NODE_DATA(page_to_nid(page)); + struct deferred_split *queue; + + queue =3D &NODE_DATA(page_to_nid(page))->deferred_split_queue; + spin_lock_irqsave(&queue->split_queue_lock, *flags); =20 - return &pgdat->deferred_split_queue; + return queue; } #endif =20 +static inline void unlock_split_queue(struct deferred_split *queue) +{ + spin_unlock(&queue->split_queue_lock); +} + +static inline void unlock_split_queue_irqrestore(struct deferred_split *= queue, + unsigned long flags) +{ + spin_unlock_irqrestore(&queue->split_queue_lock, flags); +} + void prep_transhuge_page(struct page *page) { /* @@ -2656,7 +2707,7 @@ bool can_split_huge_page(struct page *page, int *pe= xtra_pins) int split_huge_page_to_list(struct page *page, struct list_head *list) { struct page *head =3D compound_head(page); - struct deferred_split *ds_queue =3D get_deferred_split_queue(head); + struct deferred_split *ds_queue; struct anon_vma *anon_vma =3D NULL; struct address_space *mapping =3D NULL; int count, mapcount, extra_pins, ret; @@ -2735,7 +2786,7 @@ int split_huge_page_to_list(struct page *page, stru= ct list_head *list) } =20 /* Prevent deferred_split_scan() touching ->_refcount */ - spin_lock(&ds_queue->split_queue_lock); + ds_queue =3D lock_split_queue(head); count =3D page_count(head); mapcount =3D total_mapcount(head); if (!mapcount && page_ref_freeze(head, 1 + extra_pins)) { @@ -2743,7 +2794,7 @@ int split_huge_page_to_list(struct page *page, stru= ct list_head *list) ds_queue->split_queue_len--; list_del(page_deferred_list(head)); } - spin_unlock(&ds_queue->split_queue_lock); + unlock_split_queue(ds_queue); if (mapping) { int nr =3D thp_nr_pages(head); =20 @@ -2766,7 +2817,7 @@ int split_huge_page_to_list(struct page *page, stru= ct list_head *list) dump_page(page, "total_mapcount(head) > 0"); BUG(); } - spin_unlock(&ds_queue->split_queue_lock); + unlock_split_queue(ds_queue); fail: if (mapping) xa_unlock(&mapping->i_pages); local_irq_enable(); @@ -2788,24 +2839,21 @@ fail: if (mapping) =20 void free_transhuge_page(struct page *page) { - struct deferred_split *ds_queue =3D get_deferred_split_queue(page); + struct deferred_split *ds_queue; unsigned long flags; =20 - spin_lock_irqsave(&ds_queue->split_queue_lock, flags); + ds_queue =3D lock_split_queue_irqsave(page, &flags); if (!list_empty(page_deferred_list(page))) { ds_queue->split_queue_len--; list_del(page_deferred_list(page)); } - spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); + unlock_split_queue_irqrestore(ds_queue, flags); free_compound_page(page); } =20 void deferred_split_huge_page(struct page *page) { - struct deferred_split *ds_queue =3D get_deferred_split_queue(page); -#ifdef CONFIG_MEMCG - struct mem_cgroup *memcg =3D page_memcg(compound_head(page)); -#endif + struct deferred_split *ds_queue; unsigned long flags; =20 VM_BUG_ON_PAGE(!PageTransHuge(page), page); @@ -2823,18 +2871,22 @@ void deferred_split_huge_page(struct page *page) if (PageSwapCache(page)) return; =20 - spin_lock_irqsave(&ds_queue->split_queue_lock, flags); + ds_queue =3D lock_split_queue_irqsave(page, &flags); if (list_empty(page_deferred_list(page))) { count_vm_event(THP_DEFERRED_SPLIT_PAGE); list_add_tail(page_deferred_list(page), &ds_queue->split_queue); ds_queue->split_queue_len++; #ifdef CONFIG_MEMCG - if (memcg) + if (page_memcg(page)) { + struct mem_cgroup *memcg; + + memcg =3D split_queue_to_memcg(ds_queue); set_shrinker_bit(memcg, page_to_nid(page), deferred_split_shrinker.id); + } #endif } - spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); + unlock_split_queue_irqrestore(ds_queue, flags); } =20 static unsigned long deferred_split_count(struct shrinker *shrink, --=20 2.11.0