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 8FBCDC433EF for ; Fri, 17 Jun 2022 17:50:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F5D66B009C; Fri, 17 Jun 2022 13:50:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C97C6B009B; Fri, 17 Jun 2022 13:50:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45DCF6B0095; Fri, 17 Jun 2022 13:50:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5BDE06B0096 for ; Fri, 17 Jun 2022 13:50:27 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 2968B12065C for ; Fri, 17 Jun 2022 17:50:27 +0000 (UTC) X-FDA: 79588467294.26.F6CD24C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id 93D62A008F for ; Fri, 17 Jun 2022 17:50:26 +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=1tFnj/Yioy6j8BdWSry13hKx7D9DV1kQ27VR/It3ihY=; b=ILK2lSieSr6aJJkpNDEeObBbGc T48EbrUZZgfO/BUH1FcJnD7F4NlSJHX4nX0csB7o/1hKqUH4L8AT1C3NF7ImVwAjKStG10vuAoim/ rn7V/4A4t5e/Km36nS4Y97EZpP0HTb7l4IBR5g0RTm4vaqxC78kVs+FI7HqWcFPPW2sOm8p0vN6Mo ykSWZMt+/kdfe9RPEuNZC5WEJqaHBn6PjNj0QCrJIRl1RIo6fN8nr2uyNzWVV91nFGXZAFR+WMh3y /TK+1HFtqlmARiDEwwXzNWPJz1Nt+Z/c2VBDce7AC7b7JXdwg/2ICN/yN743+oEy5is01VuKDkFcL YLDpHFFA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2G6z-0030b7-4s; 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 15/22] mm/swap: Convert __put_page() to __folio_put() Date: Fri, 17 Jun 2022 18:50:13 +0100 Message-Id: <20220617175020.717127-16-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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655488226; a=rsa-sha256; cv=none; b=Pvr8t+a2ZBbN15lDFBcw271qRGr2AEzS+k+8wRt7oE6NKQZdDd66NomkZ3SrjCMfXo8Ezl WWoDrEZ0QTDMbHjR+EqlBqzl+kQLPwJrprwcYx//ffg1Kx8O4gE2oDuAvCMLpGqqgraYOL /1e9quBSQaSo3p0mTNe4OgSgAm6BAqo= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ILK2lSie; dmarc=none; spf=none (imf15.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=1655488226; 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=1tFnj/Yioy6j8BdWSry13hKx7D9DV1kQ27VR/It3ihY=; b=OYRGT84UZyRuk3VWAizHVSszBXhhtMLC8CV1lXT28x9emeXUJDKZLZIf6EZHEqzfo20eJN JS+LlxP3Y6dsn/SfKprGdEEQPQ1V+97WbvjAYclco36X1ifdHAA5gjLRamv8UdX6xhB2ah qIVvu4bQVTZqCRD0MZ9wuZKFIxShD9c= Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ILK2lSie; dmarc=none; spf=none (imf15.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: squc6p58yerqthi67patybuzzzwwzzk8 X-Rspamd-Queue-Id: 93D62A008F X-Rspamd-Server: rspam08 X-HE-Tag: 1655488226-670646 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: Saves 11 bytes of text by removing a check of PageTail. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 6 +++--- mm/swap.c | 14 +++++++------- net/core/page_pool.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 07a1998c3621..764dc0fdae5e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -886,7 +886,7 @@ static inline struct folio *virt_to_folio(const void *x) return page_folio(page); } -void __put_page(struct page *page); +void __folio_put(struct folio *folio); void put_pages_list(struct list_head *pages); @@ -1228,7 +1228,7 @@ static inline __must_check bool try_get_page(struct page *page) static inline void folio_put(struct folio *folio) { if (folio_put_testzero(folio)) - __put_page(&folio->page); + __folio_put(folio); } /** @@ -1248,7 +1248,7 @@ static inline void folio_put(struct folio *folio) static inline void folio_put_refs(struct folio *folio, int refs) { if (folio_ref_sub_and_test(folio, refs)) - __put_page(&folio->page); + __folio_put(folio); } void release_pages(struct page **pages, int nr); diff --git a/mm/swap.c b/mm/swap.c index 3696dfbff136..0ab7a032a766 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -119,16 +119,16 @@ static void __put_compound_page(struct page *page) destroy_compound_page(page); } -void __put_page(struct page *page) +void __folio_put(struct folio *folio) { - if (unlikely(is_zone_device_page(page))) - free_zone_device_page(page); - else if (unlikely(PageCompound(page))) - __put_compound_page(page); + if (unlikely(folio_is_zone_device(folio))) + free_zone_device_page(&folio->page); + else if (unlikely(folio_test_large(folio))) + __put_compound_page(&folio->page); else - __put_single_page(page); + __put_single_page(&folio->page); } -EXPORT_SYMBOL(__put_page); +EXPORT_SYMBOL(__folio_put); /** * put_pages_list() - release a list of pages diff --git a/net/core/page_pool.c b/net/core/page_pool.c index f18e6e771993..db70e94c8df2 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -16,7 +16,7 @@ #include #include #include -#include /* for __put_page() */ +#include /* for put_page() */ #include #include -- 2.35.1