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 275D0C4829A for ; Tue, 13 Feb 2024 16:47:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AAE778D0012; Tue, 13 Feb 2024 11:47:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A36598D000E; Tue, 13 Feb 2024 11:47:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 88A0C8D0012; Tue, 13 Feb 2024 11:47:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 734888D000E for ; Tue, 13 Feb 2024 11:47:16 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4D069140C16 for ; Tue, 13 Feb 2024 16:47:16 +0000 (UTC) X-FDA: 81787360872.11.7B5372C Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf11.hostedemail.com (Postfix) with ESMTP id F075B4001B for ; Tue, 13 Feb 2024 16:47:13 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CUApaTHR; spf=pass (imf11.hostedemail.com: domain of djwong@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707842834; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4U3t3GfxBLGpCFrpg7mr5mkR5ecagEStHCfZwcOb/bE=; b=3S2e7kJNSTms3N1JHlrpN4J+6an/6cn92n0C0mR2vZiVvV9sbaP0bEcarI3LcgNl0c5GOd rvsqAB0ozV181AGH0krD7UbsrSfP8qs+ygt6pLVAlA4vypY4ITf38q6Kua9h/3LCGodmqs SjHVBswMKYo/gsiHis1EM+sqARZsUis= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707842834; a=rsa-sha256; cv=none; b=JShqSKO6Q45wBayJ2B2yXk72G4sZSakjWRvJ0dSyoa+GS1pfb3FCs0Ly6NP13reAb1pNKY SLcD5eIZB8FQt1IW1OUnZEvr8gMg3ndZ3LF80m0ZLVPpkb9OnD5QKqq8KHXbLM8O6RUe30 SSWmKN8XgSrM1SfO1vhvpT2aojgyI9s= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CUApaTHR; spf=pass (imf11.hostedemail.com: domain of djwong@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 3FF58CE1D46; Tue, 13 Feb 2024 16:47:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77242C43390; Tue, 13 Feb 2024 16:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707842830; bh=NdN2Ja2ehPSCmCWIF4zS46W/wsgKmR+1NTmC15pVJ8c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CUApaTHRZ0VkLxXsU9EbaadXGfH4cZRNqlvBKVrBHBONMQnNXHhqxJpRC7PXBAS/R 1M9er3q+mjyku1+kZeG/gf2P880C3CSsn3Yn9CQVOFsyzCL7sRaQjYjh/QHL6KHYIF tBntToqk82c7PZIv6pRfB2WUkzqufyUjtO/0LvbE4rkSQ/hv0vlM7OHdAYkbcnAWTH 57FK0CURnw3ApKQpXcDCKBrGNZHtnnFsoWHXZhCY6JW4eFxkLGNcKxD5ji556ClaiK c5sVK8TFANHXkysJkJ268QrC770HE+w7pe2EtWi3gJw/03PJLELkGHtxKtcv001d0X 97t1xaLOnIo1w== Date: Tue, 13 Feb 2024 08:47:10 -0800 From: "Darrick J. Wong" To: "Pankaj Raghav (Samsung)" Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, mcgrof@kernel.org, gost.dev@samsung.com, akpm@linux-foundation.org, kbusch@kernel.org, chandan.babu@oracle.com, p.raghav@samsung.com, linux-kernel@vger.kernel.org, hare@suse.de, willy@infradead.org, linux-mm@kvack.org, david@fromorbit.com Subject: Re: [RFC v2 07/14] readahead: allocate folios with mapping_min_order in ra_(unbounded|order) Message-ID: <20240213164710.GY6184@frogsfrogsfrogs> References: <20240213093713.1753368-1-kernel@pankajraghav.com> <20240213093713.1753368-8-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240213093713.1753368-8-kernel@pankajraghav.com> X-Rspamd-Queue-Id: F075B4001B X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: n8t3be3n1dw7ry7cmtim9n8ejyzjy6uz X-HE-Tag: 1707842833-1043 X-HE-Meta: U2FsdGVkX19Slw3WHGZRkhrx9uYm2IfV7VdIcnFhRfO07QDdvYeohJJSD0FAHtj3t+xAEMdtOoSI7534tg6Ngb2J8xlOCZlOWg4L+akc+qJaYFjhxGeQxlbKgoQs7iwEaVQcuwiCrZcHo5Br6eHOUopd3r8HyL/5CCYRU44ygnE49QKiWaTXEaNhwTc6ByS5DaI3Vin7envkAtcZIILpqX5b55XelC767mIZfTCSj/hMzWAF8c5sDEGNFOlzcD+1ErThzyymOSStByWHGqULOtWe/oq5Hj1+oIVe9ByhjxfewetJK7OvNJ7oocItq8agGTcS8qwSjWhywCuxboiTcl1sM/RjIRm/5/9I7Bf6hV5j2Z4QZbJtr6vVvMDGH9BLpH3/pJiRJpoLdc4PXE9Z8B0Y2cA4HJcwo/OxNiOxTsKVxfAQ9MBWARKVockaOddqx4aYR8B0TQ3BDs+uujhns5rsJngyS5uNp8QT1hZ41gjPMVyffL3cEUPV/H1BtuTj6acdqOogFbU4tmI5o0AnE3DR7JptFQIW+CNCuty1F4hfW5H79GI7z98xDMxi+rH3TBz0K8hATvPTtVZ/t6QkSVLdn3M8qoGRM8J3jqqPGc8xZv0FthRwkDcFCcHuKETnKW9Ko0x+C0PRxBGZ8NezxmYK1yBAUxXvE1zUxDroZ6QJ8QVDWvjuHvWuEsjJxssAYbddYQZPFy/1+d1+Vxk8e8X3scNaXva8HjA4o+K3iXm8QNdztSSAOQ20l1W3mxW8Q1uAq5NRhUJ7zrw8pf8fDJvC1Dx5QID3XRUdeAfg61IdJlO5gYz5v8km+69MDqxYdDoiwyVigW+7ijM3PeXmBdm7dbDE7CRer+woDLuvcvGn8D3azU0Pq5HO+bTqaQIq/h6+fXHHVi9LYKkdaE31SfIt/ONWntQPCexZgct8AHc6FjO/o+ITw9ElDkRLMr2OQn4E104mxrMXd9Uhe4F 0pcCr54M FkMbFhAalSEj5/WJTiD9dpvfVGmUCvjJAAaWaJfTGlGpCtHrNLW9kaviT7V79QQqlVRcNYqr21VLiEPwXCq0pDvPCFWrCXrUGin0MvfAtCAPJFNwbNclBoA8Vaic5asP2VL9T7TIW5ZReFRQtipc4yfhVUXZ3J8Xq9Y+BdLQjVQFAeB19/BKTKFmVlTmy/mNQDdp1aRfPDoR7IMFTxoN3v5oaQxh2BZzuR28Pr6HPIJ8jX8xBsUXASgMPIlc9tXu7FjxeJKREDHU6orAkyrm2beVnnJbIKLh5PvYfChC7sx30twYHox7pNr3yGjgVZGueKi94 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: List-Subscribe: List-Unsubscribe: On Tue, Feb 13, 2024 at 10:37:06AM +0100, Pankaj Raghav (Samsung) wrote: > From: Pankaj Raghav > > Allocate folios with at least mapping_min_order in > page_cache_ra_unbounded() and page_cache_ra_order() as we need to > guarantee a minimum order in the page cache. > > Signed-off-by: Pankaj Raghav > Signed-off-by: Luis Chamberlain Acked-by: Darrick J. Wong --D > --- > mm/readahead.c | 30 ++++++++++++++++++++++++++---- > 1 file changed, 26 insertions(+), 4 deletions(-) > > diff --git a/mm/readahead.c b/mm/readahead.c > index 13b62cbd3b79..a361fba18674 100644 > --- a/mm/readahead.c > +++ b/mm/readahead.c > @@ -214,6 +214,7 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, > unsigned long index = readahead_index(ractl); > gfp_t gfp_mask = readahead_gfp_mask(mapping); > unsigned long i = 0; > + unsigned int min_nrpages = mapping_min_folio_nrpages(mapping); > > /* > * Partway through the readahead operation, we will have added > @@ -235,6 +236,8 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, > struct folio *folio = xa_load(&mapping->i_pages, index + i); > > if (folio && !xa_is_value(folio)) { > + long nr_pages = folio_nr_pages(folio); > + > /* > * Page already present? Kick off the current batch > * of contiguous pages before continuing with the > @@ -244,19 +247,31 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, > * not worth getting one just for that. > */ > read_pages(ractl); > - ractl->_index += folio_nr_pages(folio); > + > + /* > + * Move the ractl->_index by at least min_pages > + * if the folio got truncated to respect the > + * alignment constraint in the page cache. > + * > + */ > + if (mapping != folio->mapping) > + nr_pages = min_nrpages; > + > + VM_BUG_ON_FOLIO(nr_pages < min_nrpages, folio); > + ractl->_index += nr_pages; > i = ractl->_index + ractl->_nr_pages - index; > continue; > } > > - folio = filemap_alloc_folio(gfp_mask, 0); > + folio = filemap_alloc_folio(gfp_mask, > + mapping_min_folio_order(mapping)); > if (!folio) > break; > if (filemap_add_folio(mapping, folio, index + i, > gfp_mask) < 0) { > folio_put(folio); > read_pages(ractl); > - ractl->_index++; > + ractl->_index += min_nrpages; > i = ractl->_index + ractl->_nr_pages - index; > continue; > } > @@ -516,6 +531,7 @@ void page_cache_ra_order(struct readahead_control *ractl, > { > struct address_space *mapping = ractl->mapping; > pgoff_t index = readahead_index(ractl); > + unsigned int min_order = mapping_min_folio_order(mapping); > pgoff_t limit = (i_size_read(mapping->host) - 1) >> PAGE_SHIFT; > pgoff_t mark = index + ra->size - ra->async_size; > int err = 0; > @@ -542,11 +558,17 @@ void page_cache_ra_order(struct readahead_control *ractl, > if (index & ((1UL << order) - 1)) > order = __ffs(index); > /* Don't allocate pages past EOF */ > - while (index + (1UL << order) - 1 > limit) > + while (order > min_order && index + (1UL << order) - 1 > limit) > order--; > /* THP machinery does not support order-1 */ > if (order == 1) > order = 0; > + > + if (order < min_order) > + order = min_order; > + > + VM_BUG_ON(index & ((1UL << order) - 1)); > + > err = ra_alloc_folio(ractl, index, mark, order, gfp); > if (err) > break; > -- > 2.43.0 > >