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 DCDC1C636D3 for ; Mon, 6 Feb 2023 16:25:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 776F36B0072; Mon, 6 Feb 2023 11:25:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 727266B0073; Mon, 6 Feb 2023 11:25:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5EF9B6B0074; Mon, 6 Feb 2023 11:25:49 -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 4FAA36B0072 for ; Mon, 6 Feb 2023 11:25:49 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id EE44816091D for ; Mon, 6 Feb 2023 16:25:48 +0000 (UTC) X-FDA: 80437393176.04.4875D5E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id DACB41C001F for ; Mon, 6 Feb 2023 16:25:46 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=JE08NReq; spf=none (imf20.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=1675700747; 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:references:dkim-signature; bh=nF6VemGYIMnYuGIHOUFNbRptyFqb1wpSr8JOeBMchwA=; b=2nzerFhzlev7ejTx2hM+FOiuZEq4Llir9yRoQS8F+0AuTvHJcnA0QTgN2lL2Hty40LyTdo c2S/R9sT0vy5EEbI/chH+G6gty+NEFGsOH7TSExTneJNsKTJN9Feza3iCho0mMMfhDnCMa 6lw4EJWfWQeECpFLCNxzn8jjN/8KXvc= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=JE08NReq; spf=none (imf20.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=1675700747; a=rsa-sha256; cv=none; b=VeYOwIwuect7joH3n2aI5ARyjYJTH1qeamCQmZkR8DEuwqCCKBljvcumtpBsAnyrhuDWxn U2/8THZIxmhddvIzYgJHhzuNRzyWkz9eb7N8hjFPmQxyrZo20826IAC0xucx/YXImUn7rf w66SSzveklQMQUqpGpvRLA15qs54N8M= 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: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=nF6VemGYIMnYuGIHOUFNbRptyFqb1wpSr8JOeBMchwA=; b=JE08NReqM+L8JNrJTSlKV36WgV brl6e/hTgH3unVH/VHUnnBP+gnb2HnmY9YhCJjHxuSe+glqLFFsi4Czrmsid6uvwYUmhoGCLqBjZ7 bMsuY1FH+siGfDtQoY8o3sh766KqFqwc6MfJ6DRGlXlXz8gkpIlVxLAyStjcK3v6ayquUDkSXaFQx D1K8LzLDsOGz0IIJWpNq89Mz72tlhWFkT9+L03QegIsi10xF9o7qVJefZhxDG+zwcBlhlYwp0XuN+ JRF5DdVhRZDbdSQgEx0WEq6MldHmE0LLV5ThXMj8onAHSF0RyO029DIp3kugg4uqGBraOdSRLQoZS +GuwyxhA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pP4JG-00Gu8d-BT; 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 1/2] filemap: Add mapping_read_folio_gfp() Date: Mon, 6 Feb 2023 16:25:19 +0000 Message-Id: <20230206162520.4029022-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 9xo9j9y7y67m4nj7mgy3zykzkto9z3tb X-Rspam-User: X-Rspamd-Queue-Id: DACB41C001F X-Rspamd-Server: rspam06 X-HE-Tag: 1675700746-554274 X-HE-Meta: U2FsdGVkX18vHZgmEjokxezWJILkSPLzRhlkOnxS3jvxSXb18VbiygF4xgAHzHdFb/69/pRU3uAt8f42fda0xbavLOjfSsdKAnX8Aj41pqCAObvbH97orHOXnudFLXqE1b9P85k/65W+pyFxIFnaESNNrWZ6Xc04NxSvjjwSH+FgvVHqw6fylWt3cibdPh4iTTo0FgVkIqWTR//Cs3PWVmQseS3GKjKGc0aWHutVFlOQj/FOE995YWoiFuxD7Bw/zU/6q7hRh3Sldt1ulLtLoM/YFBTxt5UgkLjTg5UlzGX2/zmQ0hZ5X9io4tsH2xVCCUsgc8cewUEADgcRoc4o7Z43+0cXULEZSini7G0Dal7xDkblW74tlRoZIEqwdsCVykRB1tnr9Ek6cyRRmMlhZthzje/wGAXF8XKAHc0XJH0SwjwMMoD/IdC7OZjdl2F8okBenSwh6h3uaGw1zd9BfwiusK/Lcqa3yTT/OGpn3uGD1K47MwdvUj5z+16s8FC1rxR3GUMajW0VMzRSUM0fjls+aLLBS6cfu2I/FFWy5gaoUoiWYGpR8vWRIH6sKIL2khIiLiHgqknwo7bD4CMIGFCvQnEWLCA5GbyxvRrNTEUMykIbIv1NQfNzTF5dH89EKKoq7YbVdEQboVF2uM8VVo/R5yFnnvqfBEzySHrylTBYlC/Pk6I/atIZB6d/AyzO0FPhWzrPjfrJiKkr/jFE4eGUua2BHLVvajiYUjss4iWTZ+NfxjxZ6z4Z8Jzrv40vXnQJLha8Um1TUQXcdGIFj43HgezjjYRR2zdSK3qDoOk7cvsnenUy8mQLiDWBNlFTtRj80RPQtD31rHAa/FF8d6iJQuYZ9TZoIdA3AOOl/HHWENIXS+abiN3K5/0AIDmk0nMI2P+xW70jCU4/6nNqNPm9irIUhNAj+HHcFCba1Knh3zsk5Fyn6BTXlLA3Kt73EHCgPHZoRloUD4f9j7N b3g/FRTk 4uexV//egpACddqiHV/g5SCZ/HTRjGwjLq4MMwbldOhLpg0nTQ9Y8DytG9S5XxJEFVi1zMF8hLAeWl+QkOGjLDyizveVd9aS9gPg2TgWegNp3HQfhoHpxey+Eog4a831Zw0JSxPgTNgryUQDJbiz67DxVak4k43cLh5LfMj49WmORKoERR9dKJzXjqtjBNhj6Yx6Fn7yqqgK/gzcdi1gGphl13EwH1n9KM7TIVBXIh6R4cmL89gKfXwuFnA== 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: This is like read_cache_page_gfp() except it returns the folio instead of the precise page. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 2 ++ mm/filemap.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 47069662f4b8..cf0677419981 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -758,6 +758,8 @@ static inline struct page *grab_cache_page(struct address_space *mapping, struct folio *read_cache_folio(struct address_space *, pgoff_t index, filler_t *filler, struct file *file); +struct folio *mapping_read_folio_gfp(struct address_space *, pgoff_t index, + gfp_t flags); struct page *read_cache_page(struct address_space *, pgoff_t index, filler_t *filler, struct file *file); extern struct page * read_cache_page_gfp(struct address_space *mapping, diff --git a/mm/filemap.c b/mm/filemap.c index 992554c18f1f..2ebcf500871d 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3585,6 +3585,30 @@ struct folio *read_cache_folio(struct address_space *mapping, pgoff_t index, } EXPORT_SYMBOL(read_cache_folio); +/** + * mapping_read_folio_gfp - Read into page cache, using specified allocation flags. + * @mapping: The address_space for the folio. + * @index: The index that the allocated folio will contain. + * @gfp: The page allocator flags to use if allocating. + * + * This is the same as "read_cache_folio(mapping, index, NULL, NULL)", but with + * any new memory allocations done using the specified allocation flags. + * + * The most likely error from this function is EIO, but ENOMEM is + * possible and so is EINTR. If ->read_folio returns another error, + * that will be returned to the caller. + * + * The function expects mapping->invalidate_lock to be already held. + * + * Return: Uptodate folio on success, ERR_PTR() on failure. + */ +struct folio *mapping_read_folio_gfp(struct address_space *mapping, + pgoff_t index, gfp_t gfp) +{ + return do_read_cache_folio(mapping, index, NULL, NULL, gfp); +} +EXPORT_SYMBOL(mapping_read_folio_gfp); + static struct page *do_read_cache_page(struct address_space *mapping, pgoff_t index, filler_t *filler, struct file *file, gfp_t gfp) { -- 2.35.1