From patchwork Tue Aug 15 03:26:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13353479 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 E2201EB64DD for ; Tue, 15 Aug 2023 03:27:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E68190001A; Mon, 14 Aug 2023 23:27:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76EF090000B; Mon, 14 Aug 2023 23:27:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65DF190001A; Mon, 14 Aug 2023 23:27:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5BBB490000B for ; Mon, 14 Aug 2023 23:27:03 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2E41614025F for ; Tue, 15 Aug 2023 03:27:03 +0000 (UTC) X-FDA: 81124902726.08.7430D70 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id 84C3880002 for ; Tue, 15 Aug 2023 03:27:01 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XGGquuzk; dmarc=none; spf=none (imf30.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=1692070021; 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=9TGxu02Zdrue3buZphZr1o0ZlYN5TBIdyw14ApHva+w=; b=qftxC8Fzi6+pAibp/nw1p3VVswWWrfVnVpvp9gaMryi5Swxw1DYYMPK6MZH6Vtz6tV6gJg 6XlMWFKasUnNdvkKVQlXfuQLZ74xLa1PE4sCKNH0pvGhlfcU0Gi7s/voh0WwALed7u8ROE o8Dqaa5F0n0tUYCCMi2NI9NaxkJ6r3E= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XGGquuzk; dmarc=none; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692070021; a=rsa-sha256; cv=none; b=RgjeGH/0l5RvDHPIKA8GjLT+/voiam0BpOOQ96LWgKSmxMJ+BmhK+0iIfqlr6lCDd59rFr gdvyS7ExTe8cJTiHeS8BP0JAUUJ2eCz1c3DY9v2Jkc4ZjDBuTR/14HGrKqDtMvNz0Betjx SHcWzScvND+FvK5G0YpwZRRmgN2wND8= 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=9TGxu02Zdrue3buZphZr1o0ZlYN5TBIdyw14ApHva+w=; b=XGGquuzkKlPlaPg5Kj620RMtNL wJlRYlv2SOYquRt/UO44pwc0Kxd+sofv+wwr+9IY2kWMhuMuQjkOOnOs3mIHfU1zlzJDNWC/U7k9g gFLBcqCXKvz/SN3ggNZWOFB+FcA13nj6oogxs6K7R97+MWgJixPSB3EpF4PyGnu6RPZHEyAeKk6/7 Qg4Pcq+yJE+xsb3RLlA4qQrL0SS6kFwjlqx+xj8bFps/NhfGtdnUx9cOAxrbQM/s02adcHyoS+v6i vQ7PmanJpRAdAVFHN/x8eHflCkJLeBZETAceSujqZDGcsDaa4tFMSkdUf6GChrorsPCS4bDn8pBQm gFYqTYuw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qVkhm-005qaZ-I5; Tue, 15 Aug 2023 03:26:50 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , Jens Axboe , io-uring@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 5/9] mm: Remove free_compound_page() Date: Tue, 15 Aug 2023 04:26:41 +0100 Message-Id: <20230815032645.1393700-6-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230815032645.1393700-1-willy@infradead.org> References: <20230815032645.1393700-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 84C3880002 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: mu9gm5i7jc35ti658pz56u7iot8xscbq X-HE-Tag: 1692070021-399333 X-HE-Meta: U2FsdGVkX19VJftTH9H/Mcv3rgDWBC+GSRj4dEE2l1Zhlnt6Jgdzegatc56qyj1nU43ga1iwtKeThD86vcDlu0P0tLerFRo4gAOcgYuE6eKySSBCFAVL27fiXfSp44N/FWEjXjVYedOfAjfkZaHRY9f27PiYg50s2wVvH9nuMS1yeHkgDwLYjvr0oSorxH9Su2+gVnev+sfBNbGN3phYU1M/2NJwxRgGAae7L7saaEubPh/LVzOTq159PYDI+WleqnNnmqJBGQWkxLCPhC3jtc0cglALTnIhPJXCebJ9IhgOS+PC0mf9x+0FfV5Fe9swH60PJTzBc5Ul6B62cjKeJIlaqnjRFWGxTkwT9BF9xhcoPlKSDnO/DGcCI4Qpfth81fMMF+nlIgCZm+USOp2tftwQBLnn1OxXIjvOCCeUGSXR/dc08dH4d9DXaAgjK7lrac8OWvJRj0sd5ZnEDX9un8cJCZlDCBHcbPu46bd2W2Qd3l0Otn2byYziNCjLjiDkJmYVPmbNljQ/N69Ekm3+0BJGAOFsNkV8clCbdeouCAoYRzIOgUvVmX34bes73V0dU8lh1rCDU5cVoFupZeicYUmrf2VbGAWehYQthTPTuNvYdpKACBCMafnz8gAdBkiurRrC6Q+lS04/16HdFhybVXuZP2dEC9WwWjkqY5mjoNhe77GbVqkiXbNUVhysEIa1Dd9hIQIKY9l0CxBg/Aggw+n1fSUtI1q7CZOyPpPOoUZMn2sLDAzvDmhjO9yO/EC9maNbcJ4il0K511+hZf5bftMIFhUYCejnSVVVilqtyB44ZdPzi2dIfGbU+g2VHcd70UNZ6w8vbVkI43F2/KJhRfpxv3O09Y46YWLx7mGDzAXRUPN5XNCazbRpxhrRgR5tPhvkvtlcqf0SguITe/pVnfEP0zxqvAQ6psSyctzSwtvI7jeYaHj6EN8UU/wWu6GECiPqrdeX8FE6YYyqSKh 8udfk31O VBC5Ci8VuFZJnGBQeZPn0OZIJC/a90a9bUXxOBBJfO0Pz9rWo8cNN/pE3WGS0QfqRNWPMfoXZGxiRlYYFOaXFaVced5bQnw1vr50cgnU3pbyhf+a+/0cBgYgqupuhHM8qdb24TvRavjOWhiLrWD3x5mARpJnrThYEh8ZKGWmI2iDhQmFTgJT33NvhdA7rPoqJK15If8CNYqlEEezpqh7ENyjKe7qDqqzNqPff 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: Inline it into its one caller. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: David Hildenbrand --- mm/page_alloc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 804982faba4e..21af71aea6eb 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -589,12 +589,6 @@ static inline void free_the_page(struct page *page, unsigned int order) * This usage means that zero-order pages may not be compound. */ -static void free_compound_page(struct folio *folio) -{ - mem_cgroup_uncharge(folio); - free_the_page(&folio->page, folio_order(folio)); -} - void prep_compound_page(struct page *page, unsigned int order) { int i; @@ -618,7 +612,8 @@ void destroy_large_folio(struct folio *folio) if (folio_test_transhuge(folio) && dtor == TRANSHUGE_PAGE_DTOR) free_transhuge_folio(folio); - free_compound_page(folio); + mem_cgroup_uncharge(folio); + free_the_page(&folio->page, folio_order(folio)); } static inline void set_buddy_order(struct page *page, unsigned int order)