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 41678C46467 for ; Mon, 16 Jan 2023 19:39:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D65F96B007D; Mon, 16 Jan 2023 14:39:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CEDDD6B007E; Mon, 16 Jan 2023 14:39:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B8F826B0080; Mon, 16 Jan 2023 14:39:42 -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 A596F6B007D for ; Mon, 16 Jan 2023 14:39:42 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 868D7120147 for ; Mon, 16 Jan 2023 19:39:42 +0000 (UTC) X-FDA: 80361677004.05.8DD9264 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 0F46180012 for ; Mon, 16 Jan 2023 19:39:40 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=UXEKrcXb; dmarc=none; spf=none (imf02.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=1673897981; 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=HiN0YNe+znluR1269CImH1XlG1nnRL1homAmxF2BJLg=; b=qp2rm157HdZE1x3cTEyqhRgPAdRteh/+hQukMuGZawdeTwqngch1Bq18uuVvVyZ0nI709H RpyKXRksfO+NCWiPNhpCUdCh3tKHit8vEq0xqkuLWMWdaJUMlPnUl1YhVDj2q/BB0ugNRe 1zlOkT9i+5LBdjPglYZvSPWYFaL/yEo= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=UXEKrcXb; dmarc=none; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673897981; a=rsa-sha256; cv=none; b=yKu+N34vvSFILfSfMKEikYnecvNiajtt3MlyGbkKeDrgfSASfnlTTUgt+0jcwsQK6F/FNT 3NFaP7yUrzXZs+4h1kjosmNj78MiieY6Ey4KUgrn2sVnubum1fr7Ah7I4UWejEOWjb5to2 vy7xduXCOeyOTIJAVmoQAz2iuQ9S9oI= 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=HiN0YNe+znluR1269CImH1XlG1nnRL1homAmxF2BJLg=; b=UXEKrcXbXxCSKA6IgPtZLKHaMx ZV3lpOghDjJbw1isWUD2HHAiqFYYj6NLCHCLQypJp+2KymFwEHDOk0d8cIma+HyBmJtDEYXjYxWyR w+pzj8s6ZKgic0J09RQljYnWfUbPVWHg59doqwrtIcO7iHBcAhjVj65IsWtQsS7QWSRK2qy7/ybD1 rqzN/Hjd7Guhbb5iHpXnX85AchJvWjYeoCibhIPTTjEr5p0iXOo/gdKJqJjgr8QIERRyRlXdprfrM sMU6vhqEc3m6lW8dWdPaF5xnyx6ZI7oB6nNmTqUMRpcg0oflVySYKtfahvXyuPg3KvaIQ3AJ1LKM8 bLw1kVtQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHVKZ-0090vy-HZ; Mon, 16 Jan 2023 19:39:43 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 3/3] readahead: Convert readahead_expand() to use a folio Date: Mon, 16 Jan 2023 19:39:41 +0000 Message-Id: <20230116193941.2148487-4-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230116193941.2148487-1-willy@infradead.org> References: <20230116193941.2148487-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0F46180012 X-Stat-Signature: 8iyzca3ywf5hjtdf7yrsh9ztm3t7fw3z X-HE-Tag: 1673897980-151613 X-HE-Meta: U2FsdGVkX18bx1D5xZKDH4LJun3uScggpgDdI/lnDTO0GKXCD53fzVrMlxuHf4ssLau1okC9fxrYE0fM6qoi0m+L/Fgg2g1HrEpMHP9wSqsAEKRJMk+i8+7kLq8js4r2F7Al06f1wvAb7xm8e9g/0BL7TuQMeviZd5tPi6aAl9uGASNNtP5BvhSuDucyR2tHL2wvf1ofz/scBsxXi4d/s0/GNv9/qtocutY7O+AqDbDA6f3fh57IDBpd8bDv9e5kInQN3xC6LIQJRkWZGNRsuSIwyIs34RF6yB105D6gnY88+z9MxEpl0LXnsHztvaHoNg+hLItMdluZQNmn5AAAQQmFPMgJVgGMixehUkcQyY+CwY+JDLJEDqTefqwngc83OZk2VCwP62mvnTSot6c67nekPX3uf4iCKexyfoOi+ThbvdHJFlhRNoO2St+Czja9QtJWue+cNlgzkqAdgKekY02fS4wyQcy9V2d1+zu1o4zPchFOTLiB5Uj6avCC+xYbbZdjifdGTdm4hbrR418efgMcQ8Me6qcsL4GrpLS7iAO2UFR1DZ3prx02gMgWNNv0+C3YRDMIcAp75IE0YmW+PC6BzQssAk1U8/gjtt1gltGG4iqfxT3JEj/EMqjQTvEAysp5oj+ykEs7XA7otsISmfq6qm4Ti4FAzyqnJlbHix1UhvC/QfvAH5xCAhsZFIbF0yRNqYu9TXW2PTq3ltttwnnU09DUU5p1RWqF49JZlNccw9JguBVgwIBJG7FwvyJ/yAlZi7ehmfXqoUNzWLgOYfDRkobl32JZ/fhBoSdEisCK9wm2FyvZNgMqm+Sy9OkHpU89Z2hYQVdeC4a9eWDqhSjmpXn4VSP3r1qfw7lSv9IIEGjLrhsPTvDuciyDdzAhRzG8luyv8Va8I7K2R2kUtmYmgpkBxP09LAaWeuySpYmeburtiv6dAg== 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: Replace the uses of page with a folio. Also add a missing test for workingset in the leading edge expansion. Signed-off-by: Matthew Wilcox (Oracle) --- mm/readahead.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index b10f0cf81d80..47afbca1d122 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -801,21 +801,25 @@ void readahead_expand(struct readahead_control *ractl, /* Expand the leading edge downwards */ while (ractl->_index > new_index) { unsigned long index = ractl->_index - 1; - struct page *page = xa_load(&mapping->i_pages, index); + struct folio *folio = xa_load(&mapping->i_pages, index); - if (page && !xa_is_value(page)) - return; /* Page apparently present */ + if (folio && !xa_is_value(folio)) + return; /* Folio apparently present */ - page = __page_cache_alloc(gfp_mask); - if (!page) + folio = filemap_alloc_folio(gfp_mask, 0); + if (!folio) return; - if (add_to_page_cache_lru(page, mapping, index, gfp_mask) < 0) { - put_page(page); + if (filemap_add_folio(mapping, folio, index, gfp_mask) < 0) { + folio_put(folio); return; } - + if (unlikely(folio_test_workingset(folio)) && + !ractl->_workingset) { + ractl->_workingset = true; + psi_memstall_enter(&ractl->_pflags); + } ractl->_nr_pages++; - ractl->_index = page->index; + ractl->_index = folio->index; } new_len += new_start - readahead_pos(ractl); @@ -824,19 +828,20 @@ void readahead_expand(struct readahead_control *ractl, /* Expand the trailing edge upwards */ while (ractl->_nr_pages < new_nr_pages) { unsigned long index = ractl->_index + ractl->_nr_pages; - struct page *page = xa_load(&mapping->i_pages, index); + struct folio *folio = xa_load(&mapping->i_pages, index); - if (page && !xa_is_value(page)) - return; /* Page apparently present */ + if (folio && !xa_is_value(folio)) + return; /* Folio apparently present */ - page = __page_cache_alloc(gfp_mask); - if (!page) + folio = filemap_alloc_folio(gfp_mask, 0); + if (!folio) return; - if (add_to_page_cache_lru(page, mapping, index, gfp_mask) < 0) { - put_page(page); + if (filemap_add_folio(mapping, folio, index, gfp_mask) < 0) { + folio_put(folio); return; } - if (unlikely(PageWorkingset(page)) && !ractl->_workingset) { + if (unlikely(folio_test_workingset(folio)) && + !ractl->_workingset) { ractl->_workingset = true; psi_memstall_enter(&ractl->_pflags); } -- 2.35.1