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 36F97C05027 for ; Mon, 6 Feb 2023 16:25:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C59626B0073; Mon, 6 Feb 2023 11:25:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BE1E56B0074; Mon, 6 Feb 2023 11:25:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAA0F6B0075; Mon, 6 Feb 2023 11:25:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9D13A6B0073 for ; Mon, 6 Feb 2023 11:25:52 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 70E85A081B for ; Mon, 6 Feb 2023 16:25:52 +0000 (UTC) X-FDA: 80437393344.05.D727FCB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id C371040004 for ; Mon, 6 Feb 2023 16:25:50 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=E3MDzH1w; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675700750; 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=EmvsNc/fNNCqQFlmART0Ciul5K1EvPWXNpRv8kY4JJ8=; b=xhIeDfS9TP+n0/EZc9ohOah+DnarPddc6h79ZoEXZMF2pE6IAKAeRYtc5LsUtLIOesfq7Y KcxVbfCdC0RmEchfTHXPWy0d2uBflEB/1wQhjfZ74hks7EERhKzSdslFjeojTtF3I8v8eo krEdio5GPQNevgkRhdQYKNpSekCu8+c= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=E3MDzH1w; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675700750; a=rsa-sha256; cv=none; b=RaIya0xnZE0PpKmoHKo1gJiqn0wUkbX3flSl7s/l6ewok6q7EJKDp7rw1DCxwiqEbUtPmA nYFYv7mcRB3H/th4dVa9vF3VQFiksIwYgqbhQvQ0xWzDOU9CVVRRTWuj5ujW6Y0nxe8ofG cOF6Mf3ChUnWyJqk7+1M1HL/DGJM5v4= 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=EmvsNc/fNNCqQFlmART0Ciul5K1EvPWXNpRv8kY4JJ8=; b=E3MDzH1w/xhETRMs+vkPf24prX meYolBlytktHBxGoiWbdWLqJyceli3AZQPEJdg0PxCBAc3MgKTNBUKpK4updO+wuvtWK5XOvIdAvA Y9yw9DDO3WuDVR9rfKTYAXLjteZ/OsnV1pN296p4UE2vmRrdy9ggpNtOqCtxelV1HSpss7mR56ZnM SZqQk46Dxmg2RNBc/mT+363viD6EhgdifvCgyWfWrMfXOIRuD5tsc75XRurDeJOsn1nH9p4QFGlS7 6Okrr57eXr/mGbh03r3P/GnY1hj6SEyscBkYmy7hw77nl9hGIxFNqVht5PjCNw102kvvYmo7QSUik 1aLCQVOg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pP4JG-00Gu8f-EM; Mon, 06 Feb 2023 16:25:38 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linux-foundation.org, hughd@google.com, willy@infradead.org, markhemm@googlemail.com, rientjes@google.com, surenb@google.com, shakeelb@google.com, mhocko@suse.com, vbabka@suse.cz, quic_pkondeti@quicinc.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Charan Teja Kalla Subject: [PATCH 2/2] shmem: Add shmem_read_folio() and shmem_read_folio_gfp() Date: Mon, 6 Feb 2023 16:25:20 +0000 Message-Id: <20230206162520.4029022-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230206162520.4029022-1-willy@infradead.org> References: <20230206162520.4029022-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: C371040004 X-Stat-Signature: cwqx67mg1ss1kykiyr63dik1h5byg9sx X-HE-Tag: 1675700750-564989 X-HE-Meta: U2FsdGVkX1+dseuzL5oa4wsf22x3hnxx+0SM3I1ptrwrqBetnWgTFg8IyFwvJnPDF02m0zIRzAorg4h+xo0lTR/Xig6UjNIlAu66OyVmzpzP3XOKzrDmWO/3ojLW3k4lPXw4ITiB4zsHBWcb95r37hEozTs36SV0vFOgiwRM66mnftBBK5VSaAzTnP2Pllqmq1p0hzX8FqnYl7QeDZq6pk7w6N+cIsE7BDMd2N4tgCHdFiK6qV44cA0Ud/QpUzc8SR0ArkKiDEd4N0EqPBf/AZ8Vdxq3pppsEvyHzorTKEDrkbtaNunWQ3xb6ZcR2suo2yyULhCyqMA42h7dcQ7vcq4ea4SJZg1HJznIwoH35NI3iZiACQkfyJyKqZYlPjzxMH0F2/eLJ7NlwwSHIsL7uliP3MI7Mu9S/H6Cwj1Q249V48Oz6qzGbx4I56mY6/GJLCzrnhSdcexE6pk9y/y+PatSs3OaZpv7IOZzhcymKRqGUSYoRr4/PhtJXCLWyvqZD+a1lj2FNivhpohNjkqoiM30W5u/p0ZWfAjo1f+kSxUIv8cvrADMCe10htqqw2HMd5BTKbj7Ifb2I0PQ+BEg+63/oDv8egh0XkYIThvQM4XmRfA7VBaL5sR7KyFOioR0krw085NIFKgcGyqTP9eeTQBX2yqQWl2S3+RWVyUcdFkywTmGJCuxwEalDICSqFHpS5nhSs66TEeUrmAhCQLt/1Uo33tNEHwUlkwSPLQmWe/ZFe8Zy6Es26wmUwtZ67wNN0ZvyEhuJ2ntddBdar0QqWjzEKPa+ifmKtvrLUnBQeQ8qm0etfZdn7s16P4fdPam8blmZxurYxtKeMRwEkZRD4lItoGBHYzw9aPELLF+DZAsRNH+d3PRsQgWYfb3KtngZbgU/AOYabXn2LRb1gy2mSir8wnuNmOfb9yrgFlJum7UVkpgbLiqnEEE7almEfVt2TcL6RMS1f3o6mOZNHE O1eLyWjE FHXECbmoxviME/KMQSHaC2B5FfmK4+9WsroHALgbDI9plRebLdmbhHbCjiJSerPUld4dH3FAPWKgEfRUiVD7/p/0gMBaR1u+Bmm5LfBK6LEon9pSLkef9AMBRvu5VxWJWjktHoR2/sygpqoDHSsZsIlzg+5vRyqSyDe6AEvT2mrfujTRf/niV7kJlgFRDJY9UX4ZNaV6cOaqK8nHSXSO0IyBkINuwj/6Uw3dvmylDxJk2c9RoR148SFYErw== 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: These are the folio replacements for shmem_read_mapping_page() and shmem_read_mapping_page_gfp(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/shmem_fs.h | 8 ++++++++ mm/shmem.c | 34 +++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index d09d54be4ffd..103d1000a5a2 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -109,6 +109,14 @@ enum sgp_type { int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop, enum sgp_type sgp); +struct folio *shmem_read_folio_gfp(struct address_space *mapping, + pgoff_t index, gfp_t gfp); + +static inline struct folio *shmem_read_folio(struct address_space *mapping, + pgoff_t index) +{ + return shmem_read_folio_gfp(mapping, index, mapping_gfp_mask(mapping)); +} static inline struct page *shmem_read_mapping_page( struct address_space *mapping, pgoff_t index) diff --git a/mm/shmem.c b/mm/shmem.c index 28f3c699c8ce..d333deddc2b9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -4320,9 +4320,9 @@ int shmem_zero_setup(struct vm_area_struct *vma) } /** - * shmem_read_mapping_page_gfp - read into page cache, using specified page allocation flags. - * @mapping: the page's address_space - * @index: the page index + * shmem_read_folio_gfp - read into page cache, using specified page allocation flags. + * @mapping: the folio's address_space + * @index: the folio index * @gfp: the page allocator flags to use if allocating * * This behaves as a tmpfs "read_cache_page_gfp(mapping, index, gfp)", @@ -4334,13 +4334,12 @@ int shmem_zero_setup(struct vm_area_struct *vma) * i915_gem_object_get_pages_gtt() mixes __GFP_NORETRY | __GFP_NOWARN in * with the mapping_gfp_mask(), to avoid OOMing the machine unnecessarily. */ -struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, - pgoff_t index, gfp_t gfp) +struct folio *shmem_read_folio_gfp(struct address_space *mapping, + pgoff_t index, gfp_t gfp) { #ifdef CONFIG_SHMEM struct inode *inode = mapping->host; struct folio *folio; - struct page *page; int error; BUG_ON(!shmem_mapping(mapping)); @@ -4350,18 +4349,27 @@ struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, return ERR_PTR(error); folio_unlock(folio); - page = folio_file_page(folio, index); + return folio; +#else + /* + * The tiny !SHMEM case uses ramfs without swap + */ + return mapping_read_folio_gfp(mapping, index, gfp); +#endif +} +EXPORT_SYMBOL_GPL(shmem_read_folio_gfp); + +struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, + pgoff_t index, gfp_t gfp) +{ + struct folio *folio = shmem_read_folio_gfp(mapping, index, gfp); + struct page *page = folio_file_page(folio, index); + if (PageHWPoison(page)) { folio_put(folio); return ERR_PTR(-EIO); } return page; -#else - /* - * The tiny !SHMEM case uses ramfs without swap - */ - return read_cache_page_gfp(mapping, index, gfp); -#endif } EXPORT_SYMBOL_GPL(shmem_read_mapping_page_gfp); -- 2.35.1