From patchwork Tue Apr 15 02:45:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 14051359 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 D05E6C369B4 for ; Tue, 15 Apr 2025 02:46:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 769CC280190; Mon, 14 Apr 2025 22:46:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 71B8F2800C2; Mon, 14 Apr 2025 22:46:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BCFD280190; Mon, 14 Apr 2025 22:46:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3F00B2800C2 for ; Mon, 14 Apr 2025 22:46:30 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CF90EC0B76 for ; Tue, 15 Apr 2025 02:46:30 +0000 (UTC) X-FDA: 83334739740.04.ED2D93C Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf22.hostedemail.com (Postfix) with ESMTP id 00715C0003 for ; Tue, 15 Apr 2025 02:46:28 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=JPGM+rRr; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf22.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744685189; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SVQwnJXLTzf5IbKZLnXsEzmufmqfYmZThSJSPJR5bRg=; b=DxGSvHAzNgupC2ouxek8re0dp4Q7O5pMf3V8ajv1ra085cyhiF8lloPQcfODNwgBnb/V/g XmMf5W/W2B6KGOXOqomnN3i05Ncv79dkdv3xiENEkwLSJj0C6bPcFofyUYuTBFgqRc/xz5 e/Zkm45NBrj8DTrxVyKubGwzvTCnIDg= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=JPGM+rRr; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf22.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744685189; a=rsa-sha256; cv=none; b=vM/iOK3f8NrPGvHdGCipMx9yrEh4cq0QlmTWYdSyedhenQ1v+B9UYi79sJl1lQni8XQr79 RPNY87w4F2pHV+AJNQyeCb6760UXrjhFFFZp+cvwZDblxJNS8iDX0mtdlAKl45t2KvDGTA zTLsvU9GBGNOZP3JZ6db9wdwVH4RQFo= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22435603572so46948265ad.1 for ; Mon, 14 Apr 2025 19:46:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1744685188; x=1745289988; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SVQwnJXLTzf5IbKZLnXsEzmufmqfYmZThSJSPJR5bRg=; b=JPGM+rRrfGLGnHCx+9yN4NgK/c0Ar7qWq+JCRbs3Tz1bU0R0ZuGAkw31SVklijxfAI IlB5DKuiremml3uDNt8lb2t+sU6ga/nmeFP+XmN8KJUnPeCgCtyboJ//tjAs4YF5qpw7 fVqSk+i8SELen5Z8+/w6eNd5j78Ad8W8TU4H9BJa6cdhpKwxWEAQAJOOsNUDWZ1pvHq1 2xda68xr4xgaFsYcsOqcfTdedHe491YB1QGwIUZXB91awJnhtpYSLmAY0k/S241iZxt8 l/0omgzsYiEKCmm0xkr4JAJZ+yIAorKi3lTf12NTaVhTDQBuQePUmKSh8ucdSqeinHHK qjLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744685188; x=1745289988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SVQwnJXLTzf5IbKZLnXsEzmufmqfYmZThSJSPJR5bRg=; b=W/YulNNxvyn72bR8Rb4kl6SGx8Tr8P1ZrHPakytMeXjvWTNSYJ8J47CX1L38yuDIU7 KW9XodIMyCq4JYNugKozkSxvTptp8Ha3dR7Nxnj/8Ws51BisDpiLw8/V+CzXPtQr2ml3 8UWvVHmlxNvW2XloxyMwmkcvlwnzRLaCgMQE9qBW0NLtQaVRaKz8V5KFwGfh3jKcMirj kNVOwDwsXdJj0pSKb343TPJ9cLa5h+h2OwPPGDXteD8xe+/EsVGt7X3eaqy4IldeEECk kuYaeLFnFGbmh56gAM112heZa9eN3ayfAZPm4MgG50iLLMQgnh9T7ry7eApCdSFSs15F WXcw== X-Forwarded-Encrypted: i=1; AJvYcCXpLtyFhzI5vzb3H1Q7TIstB/KOn6ebLJbmr4TLkJjKoFgMw4J6tWTY66VFsgAvzgDhjl/mEbuNzg==@kvack.org X-Gm-Message-State: AOJu0YwytmuiPis1TmMUiT6KLV2MTpST4euNX3WafDLJ/hP7hQcrYZIr D/20iUvW6TUSJIEXT0C3u2fx5eX1cFhOKhLa3r6YiJsCC+Im9Hf83uyCuvJRJG0= X-Gm-Gg: ASbGnctVBA+bgcpBpTBERw63PTr/tugdOVboLn03ymA5kH0j2F3n8pzPcWY84CL+5d7 xP18GKryN88F7B/kZOJwlHKwjlkIsmwbm9zwS9rJS7e+nmFCAm4o72J8IUh36EZZU/o2PtQ8brQ NVtWiQhpsZTlsXdAmxG7izBWqPfxE+MMi1jXTb3nw8MvJLmdP9ji7ojDKSJjY7VwfJ5DlU1wrul gjnzBpYQbd7f1FF8V9jo3SID+RD5Vnv/OS7Kpb+wEvjLiTQNj58LFyV4qbQr8eAle2vpBmkMGom PDmXDiK5qd+896CVi7YEfxtiOLn9qC1YxHoh4je3fSnJXJKoq1itSR1f5j9NXXPqVCzUybZT X-Google-Smtp-Source: AGHT+IH0uXKr0KJ6xOw01dclaGRwapxC+cZ57mqT8VHJVXzMXdBqWXQQ8E+M2n4/a2Vb6fIXE8woqw== X-Received: by 2002:a17:903:98b:b0:224:1781:a950 with SMTP id d9443c01a7336-22bea4aba54mr197670155ad.14.1744685187749; Mon, 14 Apr 2025 19:46:27 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.5]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccac49sm106681185ad.217.2025.04.14.19.46.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Apr 2025 19:46:27 -0700 (PDT) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, david@fromorbit.com, zhengqi.arch@bytedance.com, yosry.ahmed@linux.dev, nphamcs@gmail.com, chengming.zhou@linux.dev Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, hamzamahfooz@linux.microsoft.com, apais@linux.microsoft.com, Muchun Song Subject: [PATCH RFC 06/28] mm: thp: introduce folio_split_queue_lock and its variants Date: Tue, 15 Apr 2025 10:45:10 +0800 Message-Id: <20250415024532.26632-7-songmuchun@bytedance.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250415024532.26632-1-songmuchun@bytedance.com> References: <20250415024532.26632-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 00715C0003 X-Stat-Signature: 6u9kinxmr5kdddsp7juqwtnc1sxcbq1d X-Rspam-User: X-HE-Tag: 1744685188-141582 X-HE-Meta: U2FsdGVkX1+21nYTqFA/8jM/IMzcTamTDrC0t1LWujrm6LdT2dYfGC5Xsbb5ebZ+NWG2IQEvGxGRjMETGyUcRpgN5Xnu/3TTwziHlOn4QBsXv3qcVhEd2wo3uwPmdOjTpEVMNRRtqzrA9DmKswEeCkmfybIwNJAa++geiVQhG81nI/AEvNwRCH9a3ZFZaDsJ0QMlzhb2XCtJppy4tQH4dR3MOp/oclXlHaNb8ZrBjhULwMpm2dr6Yfgpxm0ARHSMRjZq/m/y3j7GrnVgiUeOcn+0JGtrClFsuzpBogLVc9d5HEdW+Mp8npLXAOwoMykPPUQb4i2mWa4rJTUsM7IYKk8ylM1iZJdVotm0FpNEG/5ccg7x7Vpe39Ivr92dpl4UbWEB0n4J8S2OILBIzWL/IhBCJMwsmzP9Kz9Vy83oX3kBBVeoe4vkBMnDKDRvZpD3uKgQgA6+5c15RrtuFyIfs5xV5qeml6p8OaRKfvMrBUdy/K4ekM+vxg965LcS0nUSJrYaZctXTvww9dpMbhidW15tnfjK9nyVe6JBe21qbMtyPdX/Z1KIEXlXGffPUUIp1hi1Kb7Gg+IJwpuEtvcJDuqIR4cX2WI9FkkrCQiR3wI65ODXKYl2HyrBrWk/PuDv9OQZNl5yy1PV2dAlTn36MXq2c/GY1mRPdNjgqx9O3uIAplDPb/iDNgONtoaaoTsqiJtSG0VZr6ypn0wFcGsWDclTs5wGHECbvG+4ONUgR8jl6lllY2qLZXYOTrssaL+4wTgT2qDfi7ON4GXVuMO8xKp0Vbgut1PKeElJjllA4aPtHaY7paiiR0qIUR+WpQYNJp/2wFfmGrzSswKRqyVnhagslkSt2cSeRQyLJXiS91NUdfNUwIS0EnnofwRjWEjzoor+iJ1C6ukQLcKL1MdhXO70zgtrexSJ6mDz63inIF0QFHPlEtQ5gvufE19F/r/9e+EcJJGRRfncZmc4kp9 1ZO3FwRw 4MmY7iSuZAsKjxdGuJ+zPBzhcOY5RAn3mdyAx6WCvIl5NgnqaC/M3T7vuaMw1q9qnLhzHC4CfkiztFBG8zPvEQBbnqCLVQHPvJov92EEpQtjvN3DO9+zVxdW9EcCRKCHgXg07grhx+AMxxuv5EBTn15N++Zef/ZiEFG5+Qp3uN8h2hNKWrqEnCZHTtAU7ZY7ofshd5fFYPJop21Zn8FP0nwkyJgQsrqd9bNcDvkEso43n7yK5WS9uJo3xeJpGbnr9wFjpMl9IOoVSRPLl0DzfcYpWNU/2u2eHk+OpovpI0HU4SJt0OU8zn7Z8n6mwrxzPXV4ln6TPFgRFmN7ZsdJMql7JsxbAlJqAtlo3v0Y0sGmU8rM= 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: List-Subscribe: List-Unsubscribe: In future memcg removal, the binding between a folio and a memcg may change, making the split lock within the memcg unstable when held. A new approach is required to reparent the split queue to its parent. This patch starts introducing a unified way to acquire the split lock for future work. It's a code-only refactoring with no functional changes. Signed-off-by: Muchun Song Acked-by: Johannes Weiner --- include/linux/memcontrol.h | 10 ++++ mm/huge_memory.c | 100 +++++++++++++++++++++++++++---------- 2 files changed, 83 insertions(+), 27 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index a045819bcf40..bb4f203733f3 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1639,6 +1639,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) { }; @@ -1652,6 +1657,11 @@ static inline void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id) { } + +static inline int shrinker_id(struct shrinker *shrinker) +{ + return -1; +} #endif #ifdef CONFIG_MEMCG diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a81e89987ca2..70820fa75c1f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1059,26 +1059,75 @@ pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) #ifdef CONFIG_MEMCG static inline -struct deferred_split *get_deferred_split_queue(struct folio *folio) +struct mem_cgroup *folio_split_queue_memcg(struct folio *folio, + struct deferred_split *queue) +{ + if (mem_cgroup_disabled()) + return NULL; + if (&NODE_DATA(folio_nid(folio))->deferred_split_queue == queue) + return NULL; + return container_of(queue, struct mem_cgroup, deferred_split_queue); +} + +static inline struct deferred_split *folio_memcg_split_queue(struct folio *folio) { struct mem_cgroup *memcg = folio_memcg(folio); - struct pglist_data *pgdat = NODE_DATA(folio_nid(folio)); - if (memcg) - return &memcg->deferred_split_queue; - else - return &pgdat->deferred_split_queue; + return memcg ? &memcg->deferred_split_queue : NULL; } #else static inline -struct deferred_split *get_deferred_split_queue(struct folio *folio) +struct mem_cgroup *folio_split_queue_memcg(struct folio *folio, + struct deferred_split *queue) { - struct pglist_data *pgdat = NODE_DATA(folio_nid(folio)); + return NULL; +} - return &pgdat->deferred_split_queue; +static inline struct deferred_split *folio_memcg_split_queue(struct folio *folio) +{ + return NULL; } #endif +static struct deferred_split *folio_split_queue(struct folio *folio) +{ + struct deferred_split *queue = 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 = 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 = 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); +} + static inline bool is_transparent_hugepage(const struct folio *folio) { if (!folio_test_large(folio)) @@ -3723,7 +3772,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, struct page *split_at, struct page *lock_at, struct list_head *list, bool uniform_split) { - struct deferred_split *ds_queue = get_deferred_split_queue(folio); + struct deferred_split *ds_queue; XA_STATE(xas, &folio->mapping->i_pages, folio->index); bool is_anon = folio_test_anon(folio); struct address_space *mapping = NULL; @@ -3857,7 +3906,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, } /* Prevent deferred_split_scan() touching ->_refcount */ - spin_lock(&ds_queue->split_queue_lock); + ds_queue = folio_split_queue_lock(folio); if (folio_ref_freeze(folio, 1 + extra_pins)) { if (folio_order(folio) > 1 && !list_empty(&folio->_deferred_list)) { @@ -3875,7 +3924,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, */ list_del_init(&folio->_deferred_list); } - spin_unlock(&ds_queue->split_queue_lock); + split_queue_unlock(ds_queue); if (mapping) { int nr = folio_nr_pages(folio); @@ -3896,7 +3945,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, split_at, lock_at, list, end, &xas, mapping, uniform_split); } else { - spin_unlock(&ds_queue->split_queue_lock); + split_queue_unlock(ds_queue); fail: if (mapping) xas_unlock(&xas); @@ -4050,8 +4099,7 @@ bool __folio_unqueue_deferred_split(struct folio *folio) WARN_ON_ONCE(folio_ref_count(folio)); WARN_ON_ONCE(!mem_cgroup_disabled() && !folio_memcg_charged(folio)); - ds_queue = get_deferred_split_queue(folio); - spin_lock_irqsave(&ds_queue->split_queue_lock, flags); + ds_queue = folio_split_queue_lock_irqsave(folio, &flags); if (!list_empty(&folio->_deferred_list)) { ds_queue->split_queue_len--; if (folio_test_partially_mapped(folio)) { @@ -4062,7 +4110,7 @@ bool __folio_unqueue_deferred_split(struct folio *folio) list_del_init(&folio->_deferred_list); unqueued = true; } - spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); + split_queue_unlock_irqrestore(ds_queue, flags); return unqueued; /* useful for debug warnings */ } @@ -4070,10 +4118,7 @@ bool __folio_unqueue_deferred_split(struct folio *folio) /* partially_mapped=false won't clear PG_partially_mapped folio flag */ void deferred_split_folio(struct folio *folio, bool partially_mapped) { - struct deferred_split *ds_queue = get_deferred_split_queue(folio); -#ifdef CONFIG_MEMCG - struct mem_cgroup *memcg = folio_memcg(folio); -#endif + struct deferred_split *ds_queue; unsigned long flags; /* @@ -4096,7 +4141,7 @@ void deferred_split_folio(struct folio *folio, bool partially_mapped) if (folio_test_swapcache(folio)) return; - spin_lock_irqsave(&ds_queue->split_queue_lock, flags); + ds_queue = folio_split_queue_lock_irqsave(folio, &flags); if (partially_mapped) { if (!folio_test_partially_mapped(folio)) { folio_set_partially_mapped(folio); @@ -4111,15 +4156,16 @@ void deferred_split_folio(struct folio *folio, bool partially_mapped) VM_WARN_ON_FOLIO(folio_test_partially_mapped(folio), folio); } if (list_empty(&folio->_deferred_list)) { + struct mem_cgroup *memcg; + + memcg = folio_split_queue_memcg(folio, ds_queue); list_add_tail(&folio->_deferred_list, &ds_queue->split_queue); ds_queue->split_queue_len++; -#ifdef CONFIG_MEMCG if (memcg) set_shrinker_bit(memcg, folio_nid(folio), - 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); } static unsigned long deferred_split_count(struct shrinker *shrink, @@ -4202,7 +4248,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink, if (!--sc->nr_to_scan) break; } - spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); + split_queue_unlock_irqrestore(ds_queue, flags); list_for_each_entry_safe(folio, next, &list, _deferred_list) { bool did_split = false; @@ -4251,7 +4297,7 @@ static unsigned long deferred_split_scan(struct shrinker *shrink, spin_lock_irqsave(&ds_queue->split_queue_lock, flags); list_splice_tail(&list, &ds_queue->split_queue); ds_queue->split_queue_len -= removed; - spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); + split_queue_unlock_irqrestore(ds_queue, flags); if (prev) folio_put(prev);