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 040A9C54EBC for ; Wed, 11 Jan 2023 14:29:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5A0D8E000A; Wed, 11 Jan 2023 09:29:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 865E88E000D; 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 3599590000E; Wed, 11 Jan 2023 09:29:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A3C458E000C for ; Wed, 11 Jan 2023 09:29:10 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7E93BAB1FD for ; Wed, 11 Jan 2023 14:29:10 +0000 (UTC) X-FDA: 80342750460.19.485D430 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id EF053140010 for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TGPHDiu2; spf=none (imf26.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=I/SUW+Vky3ytrcAhb/+OOcmZgAYmQ4Sl7yFqNgJxV7k=; b=J7lQtTEQQ2KasCx0h1Ru8zIqGcIECPEGz0Uhr/EF25M+9+C1NUt6Ah+wMezIaiABTZ2ARB Sr0sv1OTM7pdCBndDpu2WvXM78dUsKnq/cZQ/FRlefVRAW2k932i2zhnMqXsCjqvQNScw3 NFsXetSdnrRreT3CYouMs+sDdLwf0dU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TGPHDiu2; spf=none (imf26.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=pVjthFI8vpqF0hnqXWDRk0zr6s/ou9F+1Gu+4h/It1eYMDuFllhOwmxpc87osjNGjN9wEK 01Rns5rLSLMLS2AfeD4rhI1Pe3vo9srr2jpiqCuNYYzdcDJQ4A6mK+W1tVKdBFaxPQZzLO LJSWYVilJyOV2+OBsAj75svGlWXzLiE= 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=I/SUW+Vky3ytrcAhb/+OOcmZgAYmQ4Sl7yFqNgJxV7k=; b=TGPHDiu2RSYyqTWCW8qSbEYl3q drAwklNUvzPRIYcm0w/iXQOUSRnYlLEjJKojESLxhVY2viWaIv4EgqW5oTDSm1rr+1mDTOQeXf7bn AgejqPYyrQHwmFpNGjBO81TV7LiMqBWTTJ7LWOhkPiOT8uSpJ2wP94UKlDdd83hsThYSSUCsjfoHU AM4/mJEKAjXfVLvpQT9CV8ZNGb6JQcEHvvoaWq2Ooc0+glNb9m1+cOacK8mgn4rvLRWS+lZ+XWZ0o JbySQwIyoYgB38GGGs00P21FC/R5xtLuGaUF2HVNOZoZHV3bleGPPf33VVjovzQif6U4BDU5Bn4cR rkNhOwtg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6S-004Car-3H; 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 25/28] mm/huge_memory: Remove page_deferred_list() Date: Wed, 11 Jan 2023 14:29:11 +0000 Message-Id: <20230111142915.1001531-26-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 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: EF053140010 X-Stat-Signature: iwgosw35g14fofhm6qo36d5pt9hake4g X-Rspam-User: X-HE-Tag: 1673447348-556507 X-HE-Meta: U2FsdGVkX1+pm5Jq45TyQNC5BaM4slhgAxqsFLE8ndoLIWCdxhLiQtltKRwnvyEGxaHgBrDrR01+gzAmBvJFFIUvl8DRn9RM0sRjGUiXI0vmezQvFgg1CZAXYa/wllSVk0xgckkVKNe2EMEf3G6rY6jk9sZO8zda372bRWhtePh0iNCSWGzZ3y410IDI3Togbx3oTAzpK6AAD0qJcxS0UFA6Hrd4HzDC9so9UPdm6wfUaLPnpqsFs5WVfd6cCnEKblIHdq0ymwcqQifvGcgF0Qa62fKFsti840hOKV/6TSSbqWNmKKIta6txVUx2P22aYBDFrCCInviMLCbd0motm68C7H4A9GRGLLYUzXo5O4zt/JZuni+Dci+LPobQ8kbr8t5d3CKPgMLO87BRUV/92nzeT1yWjqTzbc/M3cLFTZHbMZ4lswTHkwlOdxAeaCVl8WDUvij2ac8lZIFWdVUZOLcCaIBMfGFmTlvJ2lkHkptVtlHwMRgSHZO2eVqm4TZ75r5R1HzHUkXfzXpN2AaiKGEDZteTLDPMe8ly1K8IURvXElDqWSiCR5h8O1JwA6i45nfnCQtbkdTaBb7San+UBt2v7kxiBFhXNYkXDbHPTpUtS+aKXcKwNmByr3lFnT1ockQmpM5PQR1QB609FrLbA8rFTaF6KBo/25fPjJ1U4qZ6p6BYiPmRn0vdTFdTrbcwAp2VG1xUMeJ+ozlP7BbLrttbJpcDu3p0nBg5xdZurQEKRq1t06q0K0LWTQQrI3NEb02J1akcs2YxT4AeL+C+mq3ORLndHxHhllkyp6jdjhbRXVQUyX+A/BCbLT+8bmf+KpHN1V60rgElAXQtxrhQFsT1Y73hC59bEQhBvMYgtf9agwoK6BYMnQzvAczOUjhzFa/Hjf4FGogOwW/eX9zMn2pbfwTRd/JlFQFUHtCRwO7cwFqJXdpLrg== 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: Use folio->_deferred_list directly. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/huge_mm.h | 8 -------- mm/huge_memory.c | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index aacfcb02606f..b9978978a160 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -293,14 +293,6 @@ static inline bool thp_migration_supported(void) return IS_ENABLED(CONFIG_ARCH_ENABLE_THP_MIGRATION); } -static inline struct list_head *page_deferred_list(struct page *page) -{ - struct folio *folio = (struct folio *)page; - - VM_BUG_ON_FOLIO(folio_order(folio) < 2, folio); - return &folio->_deferred_list; -} - #else /* CONFIG_TRANSPARENT_HUGEPAGE */ #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) #define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; }) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a4138daaa0b8..7aedfe7cf5df 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -580,12 +580,10 @@ static inline struct deferred_split *get_deferred_split_queue(struct page *page) void prep_transhuge_page(struct page *page) { - /* - * we use page->mapping and page->index in second tail page - * as list_head: assuming THP order >= 2 - */ + struct folio *folio = (struct folio *)page; - INIT_LIST_HEAD(page_deferred_list(page)); + VM_BUG_ON_FOLIO(folio_order(folio) < 2, folio); + INIT_LIST_HEAD(&folio->_deferred_list); set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR); } @@ -2802,13 +2800,14 @@ 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); unsigned long flags; spin_lock_irqsave(&ds_queue->split_queue_lock, flags); - if (!list_empty(page_deferred_list(page))) { + if (!list_empty(&folio->_deferred_list)) { ds_queue->split_queue_len--; - list_del(page_deferred_list(page)); + list_del(&folio->_deferred_list); } spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); free_compound_page(page); @@ -2816,38 +2815,39 @@ 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); #ifdef CONFIG_MEMCG - struct mem_cgroup *memcg = page_memcg(compound_head(page)); + struct mem_cgroup *memcg = folio_memcg(folio); #endif unsigned long flags; - VM_BUG_ON_PAGE(!PageTransHuge(page), page); + VM_BUG_ON_FOLIO(folio_order(folio) < 2, folio); /* * The try_to_unmap() in page reclaim path might reach here too, * this may cause a race condition to corrupt deferred split queue. - * And, if page reclaim is already handling the same page, it is + * And, if page reclaim is already handling the same folio, it is * unnecessary to handle it again in shrinker. * - * Check PageSwapCache to determine if the page is being - * handled by page reclaim since THP swap would add the page into + * Check the swapcache flag to determine if the folio is being + * handled by page reclaim since THP swap would add the folio into * swap cache before calling try_to_unmap(). */ - if (PageSwapCache(page)) + if (folio_test_swapcache(folio)) return; - if (!list_empty(page_deferred_list(page))) + if (!list_empty(&folio->_deferred_list)) return; spin_lock_irqsave(&ds_queue->split_queue_lock, flags); - if (list_empty(page_deferred_list(page))) { + if (list_empty(&folio->_deferred_list)) { count_vm_event(THP_DEFERRED_SPLIT_PAGE); - list_add_tail(page_deferred_list(page), &ds_queue->split_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, page_to_nid(page), + set_shrinker_bit(memcg, folio_nid(folio), deferred_split_shrinker.id); #endif } -- 2.35.1