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 82D04C433EF for ; Fri, 17 Jun 2022 17:50:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 99BB06B0098; Fri, 17 Jun 2022 13:50:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CA906B0095; Fri, 17 Jun 2022 13:50:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDA476B0095; Fri, 17 Jun 2022 13:50:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D26696B0085 for ; Fri, 17 Jun 2022 13:50:27 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A642F602C3 for ; Fri, 17 Jun 2022 17:50:27 +0000 (UTC) X-FDA: 79588467294.18.55238BB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id 3E4A7180099 for ; Fri, 17 Jun 2022 17:50:27 +0000 (UTC) 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=KCvXn5LXaMUtjkwU4fUkEMyr7G7Ajcq9fewhWNlGyhE=; b=FAHDAvaHFKnsb6BiqWDBdM/+ij 7w9nXElWu8eekKFTFEoQMDQZM5oHtECMgw84ofEWf5hPzkdg6XrTPjCoR2mQTAfiszy46fJ9mip03 EsG7S2qSFDHj3JaqBCdg3WEXq0XGpBc+pQpsu9P08itybDKyeVVEVtkDUXi41dVd1oymRRZpuCTo2 RreswDpRUClmvq+xCPFIVXqqAeSZihIoJyHeXRb0O7hptAUWGm1diI0JrApflIQ2uQd+6ZYec+15H s/SZy/hU1w2E1Lb6b50UVNCvh5QWNy/vbPNHM1GbQzqH4n//4PCv5fxBe63WjY2rZfhjGroGXcJ0J LnQxpxkA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2G6z-0030bd-Pc; Fri, 17 Jun 2022 17:50:25 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 19/22] mm: Convert destroy_compound_page() to destroy_large_folio() Date: Fri, 17 Jun 2022 18:50:17 +0100 Message-Id: <20220617175020.717127-20-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220617175020.717127-1-willy@infradead.org> References: <20220617175020.717127-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=FAHDAvaH; dmarc=none; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655488227; 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=KCvXn5LXaMUtjkwU4fUkEMyr7G7Ajcq9fewhWNlGyhE=; b=AU3DsEcAPQWOEDHWIFSWWriJQbScNE5aOWvHgkZuRZ68yAE7l2BU9nEKe3gLV1HT+HOQ65 Ds/vMqm/39jbM4lpoaD2O8hsAam4czBgDptSKvZmQgCvGTll9OnEYTSl50vhF6VmVmnChv P85kXBfbc1NDedxpfBrPnSWyMeWrYNU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655488227; a=rsa-sha256; cv=none; b=ZQzoay+bIR5XMQakECPDe+jEaCiSDXvfx/+vQaHWLjmcEEVytJXvd8LERPE7h7wsTKihyw bjZYzd5uIp8bK7qSnBUuuZTY4We5kJlTu9vrggra05bIVCOoaqk3+OGk01MmlEaKHkSpSl zngl7MhHnJyFGto6JVY0FP1yc1lEWmg= X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 3E4A7180099 X-Rspam-User: Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=FAHDAvaH; dmarc=none; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Stat-Signature: ifgg4yqfr64x8gfupx81o7dka5xgdhjn X-HE-Tag: 1655488227-89747 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: All callers now have a folio, so push the folio->page conversion down to this function. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 8 +++++--- mm/swap.c | 2 +- mm/vmscan.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 764dc0fdae5e..f99e49c4d36a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -923,10 +923,12 @@ static inline void set_compound_page_dtor(struct page *page, page[1].compound_dtor = compound_dtor; } -static inline void destroy_compound_page(struct page *page) +static inline void destroy_large_folio(struct folio *folio) { - VM_BUG_ON_PAGE(page[1].compound_dtor >= NR_COMPOUND_DTORS, page); - compound_page_dtors[page[1].compound_dtor](page); + enum compound_dtor_id dtor = folio_page(folio, 1)->compound_dtor; + + VM_BUG_ON_FOLIO(dtor >= NR_COMPOUND_DTORS, folio); + compound_page_dtors[dtor](&folio->page); } static inline int head_compound_pincount(struct page *head) diff --git a/mm/swap.c b/mm/swap.c index f309694d9f84..9cee7f6a3809 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -115,7 +115,7 @@ static void __folio_put_large(struct folio *folio) */ if (!folio_test_hugetlb(folio)) __page_cache_release(folio); - destroy_compound_page(&folio->page); + destroy_large_folio(folio); } void __folio_put(struct folio *folio) diff --git a/mm/vmscan.c b/mm/vmscan.c index 6ba0fdf1dd0a..135f9306fe1e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1985,7 +1985,7 @@ static unsigned int shrink_page_list(struct list_head *page_list, * appear not as the counts should be low */ if (unlikely(folio_test_large(folio))) - destroy_compound_page(&folio->page); + destroy_large_folio(folio); else list_add(&folio->lru, &free_pages); continue; @@ -2354,7 +2354,7 @@ static unsigned int move_pages_to_lru(struct lruvec *lruvec, if (unlikely(folio_test_large(folio))) { spin_unlock_irq(&lruvec->lru_lock); - destroy_compound_page(&folio->page); + destroy_large_folio(folio); spin_lock_irq(&lruvec->lru_lock); } else list_add(&folio->lru, &folios_to_free); -- 2.35.1