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 BF32DC433EF for ; Wed, 16 Feb 2022 11:52:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 539116B007E; Wed, 16 Feb 2022 06:52:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C13E6B0080; Wed, 16 Feb 2022 06:52:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3147D6B0081; Wed, 16 Feb 2022 06:52:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0032.hostedemail.com [216.40.44.32]) by kanga.kvack.org (Postfix) with ESMTP id 1DD896B007E for ; Wed, 16 Feb 2022 06:52:33 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D03259368A for ; Wed, 16 Feb 2022 11:52:32 +0000 (UTC) X-FDA: 79148480544.06.A679D52 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by imf01.hostedemail.com (Postfix) with ESMTP id 516AB40003 for ; Wed, 16 Feb 2022 11:52:32 +0000 (UTC) Received: by mail-pj1-f53.google.com with SMTP id a11-20020a17090a740b00b001b8b506c42fso6256334pjg.0 for ; Wed, 16 Feb 2022 03:52:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+OHUI0LuXts2LsG4yRGxisobTcDTSKLzuS/zKZo7W3Q=; b=Lgwd+Q96OsQ1DEpXUbv934D9GmDU94Z5BryaKZl67m2oDVtkC/jNkZgH36ybqaGCGu cfmb2VkcmChs2cmtT/MWLiWuVnpvm5VI6sJxDS5BNXeNCtVN2DXOkOJdPbqKEjj2P6kv HsDcne4g1b7zK23Hgc/QLbqGd7jIkgPpEDnBSc6BY6U7+AEF3A4nWov52cNAkjwTT5VF sACcm3aZcXUqy2Rb3clYXlSBhysE8/gjT1fJf2xaPrp4LWf8AdoL8rlIaBMrOhcshnZu xIqT7TidCgLnxvf9QHbNLDJMLO3nJl5jCqYV9Mu2PA1CS26I8fmjPwNfdwmD8UcsR4pL IjNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+OHUI0LuXts2LsG4yRGxisobTcDTSKLzuS/zKZo7W3Q=; b=tNL45muEOchEZU0SvXLVdAb6Qent7f/clpek+gT0wIFAPkUfvyTfkvd+jgYwPE+ohf Q+7ZR1gFDm8Rm6+2oTdqOuNg7aejnSjDP8G2MbeJ5c49Vfn/A6MnqaJITs69zg5kwItj +tt7fhxkkKKcGjZefHlASq0EaeBH3d4JT1Qx/ffFOPMcI5c6KE6f0Bcg7F0iwxGSyhMP wodCGeDNo78CPXj2b/tZOYSmgD7OBdXjxG5wWCD+7H51Ck5kQ0CIja8RtPyn+XFsVXkZ JJXTSlGPrpD+USXRW7rayEM9p9MYJiLDL1jJHhcofo5cmaXz14zy3LsseQZoEfoEM7yp PygQ== X-Gm-Message-State: AOAM533rh5etHXal/fX7InLBJqf3aWizn/ny8tqBVRKvcwSZ+wO84a7H ttqORkdSvm7miO0RFevm+TRGmQ== X-Google-Smtp-Source: ABdhPJxtacu2pAFR5HptfNWgZtslscJeuzVNQ9V1sEvA4zIaP3Tomtu3mjYgWPhlDFG9+bspXd4YHA== X-Received: by 2002:a17:902:9a41:b0:149:a13f:af62 with SMTP id x1-20020a1709029a4100b00149a13faf62mr2379246plv.147.1645012351385; Wed, 16 Feb 2022 03:52:31 -0800 (PST) Received: from FVFYT0MHHV2J.tiktokcdn.com ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id m16sm14790221pfc.156.2022.02.16.03.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Feb 2022 03:52:31 -0800 (PST) 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, alexs@kernel.org, smuchun@gmail.com, zhengqi.arch@bytedance.com, Muchun Song Subject: [PATCH v3 05/12] mm: thp: introduce folio_split_queue_lock{_irqsave}() Date: Wed, 16 Feb 2022 19:51:25 +0800 Message-Id: <20220216115132.52602-6-songmuchun@bytedance.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220216115132.52602-1-songmuchun@bytedance.com> References: <20220216115132.52602-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 516AB40003 X-Rspam-User: Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=Lgwd+Q96; spf=pass (imf01.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Stat-Signature: mhtn1j3w54cy9q13zyeoppzipaukwequ X-HE-Tag: 1645012352-368962 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 are reparented. Similar to folio_lruvec_lock{_irqsave, _irq}(), we introduce folio_split_queue_lock{_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 does) to make thp deferred split queue lock safe when the LRU pages reparented. Signed-off-by: Muchun Song --- include/linux/memcontrol.h | 10 +++++ mm/huge_memory.c | 97 +++++++++++++++++++++++++++++++++-------= ------ 2 files changed, 80 insertions(+), 27 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 961e9f9b6567..df607c9de500 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1633,6 +1633,11 @@ int alloc_shrinker_info(struct mem_cgroup *memcg); void free_shrinker_info(struct mem_cgroup *memcg); void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id= ); void reparent_shrinker_deferred(struct mem_cgroup *memcg); + +static inline int shrinker_id(struct shrinker *shrinker) +{ + return shrinker->id; +} #else #define mem_cgroup_sockets_enabled 0 static inline void mem_cgroup_sk_alloc(struct sock *sk) { }; @@ -1646,6 +1651,11 @@ static inline void set_shrinker_bit(struct mem_cgr= oup *memcg, int nid, int shrinker_id) { } + +static inline int shrinker_id(struct shrinker *shrinker) +{ + return -1; +} #endif =20 #ifdef CONFIG_MEMCG_KMEM diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 406a3c28c026..a227731988b3 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -499,25 +499,70 @@ 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_memcg(struct deferred_split= *queue) { - struct mem_cgroup *memcg =3D page_memcg(compound_head(page)); - struct pglist_data *pgdat =3D NODE_DATA(page_to_nid(page)); + if (mem_cgroup_disabled()) + return NULL; + return container_of(queue, struct mem_cgroup, deferred_split_queue); +} =20 - if (memcg) - return &memcg->deferred_split_queue; - else - return &pgdat->deferred_split_queue; +static inline struct deferred_split *folio_memcg_split_queue(struct foli= o *folio) +{ + struct mem_cgroup *memcg =3D folio_memcg(folio); + + return memcg ? &memcg->deferred_split_queue : NULL; } #else -static inline struct deferred_split *get_deferred_split_queue(struct pag= e *page) +static inline struct mem_cgroup *split_queue_memcg(struct deferred_split= *queue) { - struct pglist_data *pgdat =3D NODE_DATA(page_to_nid(page)); + return NULL; +} =20 - return &pgdat->deferred_split_queue; +static inline struct deferred_split *folio_memcg_split_queue(struct foli= o *folio) +{ + return NULL; } #endif =20 +static struct deferred_split *folio_split_queue(struct folio *folio) +{ + struct deferred_split *queue =3D folio_memcg_split_queue(folio); + + return queue ? : &NODE_DATA(folio_nid(folio))->deferred_split_queue; +} + +static struct deferred_split *folio_split_queue_lock(struct folio *folio= ) +{ + struct deferred_split *queue; + + queue =3D folio_split_queue(folio); + spin_lock(&queue->split_queue_lock); + + return queue; +} + +static struct deferred_split * +folio_split_queue_lock_irqsave(struct folio *folio, unsigned long *flags= ) +{ + struct deferred_split *queue; + + queue =3D folio_split_queue(folio); + spin_lock_irqsave(&queue->split_queue_lock, *flags); + + return queue; +} + +static inline void split_queue_unlock(struct deferred_split *queue) +{ + spin_unlock(&queue->split_queue_lock); +} + +static inline void split_queue_unlock_irqrestore(struct deferred_split *= queue, + unsigned long flags) +{ + spin_unlock_irqrestore(&queue->split_queue_lock, flags); +} + void prep_transhuge_page(struct page *page) { /* @@ -2602,8 +2647,9 @@ 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 folio *folio =3D page_folio(page); + struct page *head =3D &folio->page; + struct deferred_split *ds_queue; XA_STATE(xas, &head->mapping->i_pages, head->index); struct anon_vma *anon_vma =3D NULL; struct address_space *mapping =3D NULL; @@ -2690,13 +2736,13 @@ int split_huge_page_to_list(struct page *page, st= ruct list_head *list) } =20 /* Prevent deferred_split_scan() touching ->_refcount */ - spin_lock(&ds_queue->split_queue_lock); + ds_queue =3D folio_split_queue_lock(folio); if (page_ref_freeze(head, 1 + extra_pins)) { if (!list_empty(page_deferred_list(head))) { ds_queue->split_queue_len--; list_del(page_deferred_list(head)); } - spin_unlock(&ds_queue->split_queue_lock); + split_queue_unlock(ds_queue); if (mapping) { int nr =3D thp_nr_pages(head); =20 @@ -2714,7 +2760,7 @@ int split_huge_page_to_list(struct page *page, stru= ct list_head *list) __split_huge_page(page, list, end); ret =3D 0; } else { - spin_unlock(&ds_queue->split_queue_lock); + split_queue_unlock(ds_queue); fail: if (mapping) xas_unlock(&xas); @@ -2739,24 +2785,21 @@ int split_huge_page_to_list(struct page *page, st= ruct list_head *list) =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 folio_split_queue_lock_irqsave(page_folio(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); + split_queue_unlock_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); @@ -2774,18 +2817,18 @@ 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 folio_split_queue_lock_irqsave(page_folio(page), &flags); if (list_empty(page_deferred_list(page))) { + struct mem_cgroup *memcg =3D split_queue_memcg(ds_queue); + 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) set_shrinker_bit(memcg, page_to_nid(page), - deferred_split_shrinker.id); -#endif + shrinker_id(&deferred_split_shrinker)); } - spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); + split_queue_unlock_irqrestore(ds_queue, flags); } =20 static unsigned long deferred_split_count(struct shrinker *shrink, --=20 2.11.0