From patchwork Sat Oct 9 09:37:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 12547403 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FF50C433EF for ; Sat, 9 Oct 2021 09:39:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A5A5C610E5 for ; Sat, 9 Oct 2021 09:39:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A5A5C610E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 061416B0072; Sat, 9 Oct 2021 05:39:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 011056B0071; Sat, 9 Oct 2021 05:39:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA5C96B0074; Sat, 9 Oct 2021 05:39:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0204.hostedemail.com [216.40.44.204]) by kanga.kvack.org (Postfix) with ESMTP id C808D6B0071 for ; Sat, 9 Oct 2021 05:39:12 -0400 (EDT) Received: from smtpin37.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 788113A2D8 for ; Sat, 9 Oct 2021 09:39:12 +0000 (UTC) X-FDA: 78676400544.37.04C2787 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf15.hostedemail.com (Postfix) with ESMTP id 48209D0020EE for ; Sat, 9 Oct 2021 09:39:11 +0000 (UTC) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4HRKjB4krKzWjdh; Sat, 9 Oct 2021 17:37:34 +0800 (CST) Received: from dggpemm500005.china.huawei.com (7.185.36.74) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Sat, 9 Oct 2021 17:39:06 +0800 Received: from localhost.localdomain (10.69.192.56) by dggpemm500005.china.huawei.com (7.185.36.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Sat, 9 Oct 2021 17:39:06 +0800 From: Yunsheng Lin To: , CC: , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH net-next -v5 3/4] mm: introduce __get_page() and __put_page() Date: Sat, 9 Oct 2021 17:37:23 +0800 Message-ID: <20211009093724.10539-4-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009093724.10539-1-linyunsheng@huawei.com> References: <20211009093724.10539-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500005.china.huawei.com (7.185.36.74) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 48209D0020EE X-Stat-Signature: po4959h6nzcg1ikewtp9jz9biw8rqa9m Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=huawei.com; spf=pass (imf15.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com X-HE-Tag: 1633772351-17632 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: Introduce __get_page() and __put_page() to operate on the base page or head of a compound page for the cases when a page is known to be a base page or head of a compound page. Signed-off-by: Yunsheng Lin --- include/linux/mm.h | 21 ++++++++++++++------- mm/swap.c | 6 +++--- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 73a52aba448f..5683313c3e9d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -902,7 +902,7 @@ static inline struct page *virt_to_head_page(const void *x) return compound_head(page); } -void __put_page(struct page *page); +void __put_single_or_compound_page(struct page *page); void put_pages_list(struct list_head *pages); @@ -1203,9 +1203,8 @@ static inline bool is_pci_p2pdma_page(const struct page *page) #define page_ref_zero_or_close_to_overflow(page) \ ((unsigned int) page_ref_count(page) + 127u <= 127u) -static inline void get_page(struct page *page) +static inline void __get_page(struct page *page) { - page = compound_head(page); /* * Getting a normal page or the head of a compound page * requires to already have an elevated page->_refcount. @@ -1214,6 +1213,11 @@ static inline void get_page(struct page *page) page_ref_inc(page); } +static inline void get_page(struct page *page) +{ + __get_page(compound_head(page)); +} + bool __must_check try_grab_page(struct page *page, unsigned int flags); struct page *try_grab_compound_head(struct page *page, int refs, unsigned int flags); @@ -1228,10 +1232,8 @@ static inline __must_check bool try_get_page(struct page *page) return true; } -static inline void put_page(struct page *page) +static inline void __put_page(struct page *page) { - page = compound_head(page); - /* * For devmap managed pages we need to catch refcount transition from * 2 to 1, when refcount reach one it means the page is free and we @@ -1244,7 +1246,12 @@ static inline void put_page(struct page *page) } if (put_page_testzero(page)) - __put_page(page); + __put_single_or_compound_page(page); +} + +static inline void put_page(struct page *page) +{ + __put_page(compound_head(page)); } /* diff --git a/mm/swap.c b/mm/swap.c index af3cad4e5378..565cbde1caea 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -111,7 +111,7 @@ static void __put_compound_page(struct page *page) destroy_compound_page(page); } -void __put_page(struct page *page) +void __put_single_or_compound_page(struct page *page) { if (is_zone_device_page(page)) { put_dev_pagemap(page->pgmap); @@ -128,7 +128,7 @@ void __put_page(struct page *page) else __put_single_page(page); } -EXPORT_SYMBOL(__put_page); +EXPORT_SYMBOL(__put_single_or_compound_page); /** * put_pages_list() - release a list of pages @@ -1153,7 +1153,7 @@ void put_devmap_managed_page(struct page *page) if (count == 1) free_devmap_managed_page(page); else if (!count) - __put_page(page); + __put_single_or_compound_page(page); } EXPORT_SYMBOL(put_devmap_managed_page); #endif