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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28554C43141 for ; Fri, 22 Nov 2019 05:52:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D0F6A20721 for ; Fri, 22 Nov 2019 05:52:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="szSHzuqW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0F6A20721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7B1646B04A2; Fri, 22 Nov 2019 00:52:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 712476B04A3; Fri, 22 Nov 2019 00:52:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6066F6B04A4; Fri, 22 Nov 2019 00:52:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id 3CB5A6B04A2 for ; Fri, 22 Nov 2019 00:52:10 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id BEA46180AD81F for ; Fri, 22 Nov 2019 05:52:09 +0000 (UTC) X-FDA: 76182842778.23.curve05_873ce2a23384a X-HE-Tag: curve05_873ce2a23384a X-Filterd-Recvd-Size: 4807 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 22 Nov 2019 05:52:09 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 115272071B; Fri, 22 Nov 2019 05:52:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401928; bh=KG6ooScHarpxP6/uZ0p1fKUiCMRXaGr7NhSoKbbuXzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=szSHzuqWymcR5A0LWClU6i1hforFTJVWo2mSPgnEVVqj1SBPUaX55tcX9gbf8zCiX rZEFKmq0uSUVfVA+/lDNYdi2NTJa9VM0cCexN7AcrY7lLPaVHwKayIoEi+wVmGh0B0 vH5hWD4pn0hTCUzf0ckHvopmVLrE4jhSOVeJ+OpU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aaron Lu , Vlastimil Babka , Alexander Duyck , Ilias Apalodimas , Jesper Dangaard Brouer , Mel Gorman , Pankaj gupta , Pawel Staszewski , Tariq Toukan , Andrew Morton , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 4.19 155/219] mm/page_alloc.c: use a single function to free page Date: Fri, 22 Nov 2019 00:48:07 -0500 Message-Id: <20191122054911.1750-148-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable 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: From: Aaron Lu [ Upstream commit 742aa7fb52c56fb3b307e704f93e67b698959cc2 ] There are multiple places of freeing a page, they all do the same things so a common function can be used to reduce code duplicate. It also avoids bug fixed in one function but left in another. Link: http://lkml.kernel.org/r/20181119134834.17765-3-aaron.lu@intel.com Signed-off-by: Aaron Lu Acked-by: Vlastimil Babka Cc: Alexander Duyck Cc: Ilias Apalodimas Cc: Jesper Dangaard Brouer Cc: Mel Gorman Cc: Pankaj gupta Cc: Pawel Staszewski Cc: Tariq Toukan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/page_alloc.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index dcc46d955df2e..74fb5c338e8fb 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4451,16 +4451,19 @@ unsigned long get_zeroed_page(gfp_t gfp_mask) } EXPORT_SYMBOL(get_zeroed_page); =20 -void __free_pages(struct page *page, unsigned int order) +static inline void free_the_page(struct page *page, unsigned int order) { - if (put_page_testzero(page)) { - if (order =3D=3D 0) - free_unref_page(page); - else - __free_pages_ok(page, order); - } + if (order =3D=3D 0) /* Via pcp? */ + free_unref_page(page); + else + __free_pages_ok(page, order); } =20 +void __free_pages(struct page *page, unsigned int order) +{ + if (put_page_testzero(page)) + free_the_page(page, order); +} EXPORT_SYMBOL(__free_pages); =20 void free_pages(unsigned long addr, unsigned int order) @@ -4509,14 +4512,8 @@ void __page_frag_cache_drain(struct page *page, un= signed int count) { VM_BUG_ON_PAGE(page_ref_count(page) =3D=3D 0, page); =20 - if (page_ref_sub_and_test(page, count)) { - unsigned int order =3D compound_order(page); - - if (order =3D=3D 0) - free_unref_page(page); - else - __free_pages_ok(page, order); - } + if (page_ref_sub_and_test(page, count)) + free_the_page(page, compound_order(page)); } EXPORT_SYMBOL(__page_frag_cache_drain); =20 @@ -4581,14 +4578,8 @@ void page_frag_free(void *addr) { struct page *page =3D virt_to_head_page(addr); =20 - if (unlikely(put_page_testzero(page))) { - unsigned int order =3D compound_order(page); - - if (order =3D=3D 0) /* Via pcp? */ - free_unref_page(page); - else - __free_pages_ok(page, order); - } + if (unlikely(put_page_testzero(page))) + free_the_page(page, compound_order(page)); } EXPORT_SYMBOL(page_frag_free); =20 --=20 2.20.1