From patchwork Wed Jan 11 14:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13096766 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 70C50C54EBC for ; Wed, 11 Jan 2023 14:29:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E645900007; Wed, 11 Jan 2023 09:29:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B4B518E0001; Wed, 11 Jan 2023 09:29:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A556900005; Wed, 11 Jan 2023 09:29:11 -0500 (EST) 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 D47568E000D for ; Wed, 11 Jan 2023 09:29:10 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A79AEAB2D6 for ; Wed, 11 Jan 2023 14:29:10 +0000 (UTC) X-FDA: 80342750460.23.6196F3F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf22.hostedemail.com (Postfix) with ESMTP id 167F0C0015 for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LICi0enL; spf=none (imf22.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673447349; 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=5k3fLVMrEcfOJt6mTA73s8CScy7I3GVBSY1UgeCs/nY=; b=D55WYPy2ZdmngZ+t6VVMAIeSwoj2dgTMHVUu+rDl+4fj8Ru15XK4hEjTkJAJPaa1FFV4iH iRENsbZ8hI67qnzV4IWJnVaM/HWX8lt3osQHI8y8sUVrZ8NmACrYyOXtQMloLjm24ORuPc dAfR/IMdxog+1fEjidUOVVNC+gRJDwA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LICi0enL; spf=none (imf22.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673447349; a=rsa-sha256; cv=none; b=mD9n3Kyd+iZ6eyLdxYY2iwEUHiMyNbamQ1qUUy/dKFM8zYhBzbGYAU8CGUeRZ8KeOj8Usl QQHNisy7l1j0XzbPXks9bv6OLwsQtJ/sjmy2jLaYBix27/xSTc5n1svLzjSHrXShIzPRbx lNmhhB+CfKDgdZwAp5I/M3S2DXbkODM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=5k3fLVMrEcfOJt6mTA73s8CScy7I3GVBSY1UgeCs/nY=; b=LICi0enLFLtWvn+cjnYivQiNcQ x7RUB64ZXuQ6JNOJgzo2UJdiIwv9rUfzH6F9R+gZz57vmHhjgzUuDPffZo1xElXTGKlAtO5zCJwcy BcFxvYfx2d2ltaXwbDO8IW9gDuuxwdOQU4ot3/VlXf9hi1mg4pXMwZJFhAAsC+8IgIKrXCyxgk6a5 WyNrtmNTqbApHcvgaOgg2K1b+iYNETh426pPI+esEbChm+yy4VBVYMZjW3PE1sxo/PCpvdlZ1iMMI j6JrZ43tjitky5Iue5SfnZ0ISuivp4aEKEl2a52ijJ/0EYzbE/jssOYgmpmqSKPEGl7D//WMoSaez UVkDJ+sA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6S-004Cb2-8y; Wed, 11 Jan 2023 14:29:20 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 26/28] mm/huge_memory: Convert get_deferred_split_queue() to take a folio Date: Wed, 11 Jan 2023 14:29:12 +0000 Message-Id: <20230111142915.1001531-27-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111142915.1001531-1-willy@infradead.org> References: <20230111142915.1001531-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 167F0C0015 X-Stat-Signature: rqzd441hokqy17pqu1ky84h7usmmcj1k X-HE-Tag: 1673447348-506580 X-HE-Meta: U2FsdGVkX18TmswNNcEOCetCX2E04kg320e1LpBl633bbAjJC5VAtslBTooTJOsj/Ksryl1W74qooNjUY3ssJr2LbRI28AGDPix9xgUIzxCSh6w32o/ZdgQ2ee3wxO8JSMsC7SjM6TIpDpcfh8Z3/0U2L9mvvOAorOdy80D8A4JMSDoXHW6z6GMBqbYi0zs8Kwl36vIvr+EsvSW42RRcbxXrpdDD4yq5qQG5DHXEetcJ0+7iBdN4v7pNp8wcP0pyp/muzeiyLbw6jpM7tfVkTBEjRYpRoyJQMJPuedAs2v0q7AEX00aVHVuR5ZufKGdqq5UuiYOP9Zv/LYBge29mEMytfIBsOms03YxmSNpbH+f6hk4omJbKi2zFOnuFc3XMwQB/g+9znNRUfNpJoEMdy14GjtnxV73r6aQeZKaUs2S/llEqetfgiQfIw1rg/EGpFkHlEp0wzcGhB9btznuWo0K35WmnrV2bH5mt9WUPMAZE3SI6AZ1LXJsYOzdWGp9K7G4H3JqOjoavHyzR3UH7ItRlJ+yrljCqV/cGKHIETLpaz5Dchm/BLjdaMJzaAsvFAK4B9WOcicuyxaGSj8e1zx75V1gTV2w37vYQzuQuk0zZXgMiXEsbJGS+0gslcYLMNER49DTD+3aMjefqRhAYH5ujgIfWIVkySvnFBrc04xQXBszel2xhTfbIPit5DG8Rlyfk2ZfE5q3g+RN5xitxkg4AsHUy6VAbSRMJ5veF0Qwoin73mg1Kg0wDQJUQUpSVhost0AJSTVoGHTqQEeby54T7CTbIBr5QONf1Fz0rRcRqm19D2HnjzG8NQ1eXZL9Cb+qu8VY+WBASLV9DYxZkW22OZv62ki47cEZzoSJeAlxfSM1brph55SMfKyzj9vqGr5JFN/VpswZuXy3dKZFUF3dVbOLxT1WwQyniq9svVzFEBU5O5qsrew== 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: Removes a few calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/huge_memory.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 7aedfe7cf5df..c23b0e01734b 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -559,10 +559,11 @@ 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 page *page) +static inline +struct deferred_split *get_deferred_split_queue(struct folio *folio) { - struct mem_cgroup *memcg = page_memcg(compound_head(page)); - struct pglist_data *pgdat = NODE_DATA(page_to_nid(page)); + struct mem_cgroup *memcg = folio_memcg(folio); + struct pglist_data *pgdat = NODE_DATA(folio_nid(folio)); if (memcg) return &memcg->deferred_split_queue; @@ -570,9 +571,10 @@ static inline struct deferred_split *get_deferred_split_queue(struct page *page) return &pgdat->deferred_split_queue; } #else -static inline struct deferred_split *get_deferred_split_queue(struct page *page) +static inline +struct deferred_split *get_deferred_split_queue(struct folio *folio) { - struct pglist_data *pgdat = NODE_DATA(page_to_nid(page)); + struct pglist_data *pgdat = NODE_DATA(folio_nid(folio)); return &pgdat->deferred_split_queue; } @@ -2650,7 +2652,7 @@ bool can_split_folio(struct folio *folio, int *pextra_pins) int split_huge_page_to_list(struct page *page, struct list_head *list) { struct folio *folio = page_folio(page); - struct deferred_split *ds_queue = get_deferred_split_queue(&folio->page); + struct deferred_split *ds_queue = get_deferred_split_queue(folio); XA_STATE(xas, &folio->mapping->i_pages, folio->index); struct anon_vma *anon_vma = NULL; struct address_space *mapping = NULL; @@ -2801,7 +2803,7 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) void free_transhuge_page(struct page *page) { struct folio *folio = (struct folio *)page; - struct deferred_split *ds_queue = get_deferred_split_queue(page); + struct deferred_split *ds_queue = get_deferred_split_queue(folio); unsigned long flags; spin_lock_irqsave(&ds_queue->split_queue_lock, flags); @@ -2816,7 +2818,7 @@ void free_transhuge_page(struct page *page) void deferred_split_huge_page(struct page *page) { struct folio *folio = page_folio(page); - struct deferred_split *ds_queue = get_deferred_split_queue(page); + struct deferred_split *ds_queue = get_deferred_split_queue(folio); #ifdef CONFIG_MEMCG struct mem_cgroup *memcg = folio_memcg(folio); #endif