From patchwork Thu Aug 22 13:50:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pankaj Raghav (Samsung)" X-Patchwork-Id: 13773524 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 29D4AC52D7C for ; Thu, 22 Aug 2024 13:50:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B05976B0257; Thu, 22 Aug 2024 09:50:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A8DD36B0258; Thu, 22 Aug 2024 09:50:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E0716B025A; Thu, 22 Aug 2024 09:50:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 696926B0257 for ; Thu, 22 Aug 2024 09:50:52 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 18D221A16B8 for ; Thu, 22 Aug 2024 13:50:52 +0000 (UTC) X-FDA: 82480017144.14.336476C Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by imf25.hostedemail.com (Postfix) with ESMTP id 4DC23A0019 for ; Thu, 22 Aug 2024 13:50:50 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=SNYmq8LI; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf25.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724334560; 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=V6ym79zqALc1EhwazXO34Dqur4lAVM3opZ9BwKTibbA=; b=XFqwvf2HHBgGUOs4ZfianRL1f2Iu27czx4jOX08lkuKacGWJ2T0b3HugPnA8+wT7K0xLhO L8QL3Cj0TB61UHktXJOmEdC/V2Q4ZKd+D6wEMhjJmZ24DjURQBp/LbpqbLnYMSD4ttWQi7 +cxVsCO7RzY4tE9cWjm8aDg1F+4pLac= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724334560; a=rsa-sha256; cv=none; b=PwiJxkHYCPkrI0uX87Rn0ifH/4R1pbHd9MI0vprq547j0VhehqxzmpuGv9XDCEjzU8L0gI 2zefpCB39I0Mzyb770qiJpY7Njb0fq1p0xr3RWmItVk5VQp9rqFXsncVGZHaR/99JRbhgf aihK1xtjdNF9XKxiMC6NWsft34Z2yWI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=SNYmq8LI; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf25.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4WqPjg19HWz9tFG; Thu, 22 Aug 2024 15:50:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V6ym79zqALc1EhwazXO34Dqur4lAVM3opZ9BwKTibbA=; b=SNYmq8LI47jO+MaSttCE92UjzwAUPmkZ3jgf0lMrm5qryjIfkW5AWKKdIuYVKjYPywWgwO IGanu2IUQAdOwh+9ThqTcC9Zk8JO003EmdeRy+FEF+7W+grLX08znRCGtgXSOtu9Wi4aMH 31TR2CMFjHfD7hUkJ79kxN+q1fiWAcBMOSfnJDdkExAm788JpOTXep8bbKVGRZrTiC8u8a fKvSM40D8sV+NnZIgJxQzua7JpKUz+xOreGn69Us/+pAk1a7sC11KxMzAbBQVOpWKEyHSa uH2R2/n7hApb6wJq/fYcpWxGe/Ywvs2pX2CWoYTlvSaYF2G5Fjhbhe2ugmeB9Q== From: "Pankaj Raghav (Samsung)" To: brauner@kernel.org, akpm@linux-foundation.org Cc: chandan.babu@oracle.com, linux-fsdevel@vger.kernel.org, djwong@kernel.org, hare@suse.de, gost.dev@samsung.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, david@fromorbit.com, Zi Yan , yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, willy@infradead.org, john.g.garry@oracle.com, cl@os.amperecomputing.com, p.raghav@samsung.com, mcgrof@kernel.org, ryan.roberts@arm.com, David Howells Subject: [PATCH v13 03/10] readahead: allocate folios with mapping_min_order in readahead Date: Thu, 22 Aug 2024 15:50:11 +0200 Message-ID: <20240822135018.1931258-4-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4DC23A0019 X-Stat-Signature: fe87kgmb85t95dtqx1e97dyzofoccqnh X-Rspam-User: X-HE-Tag: 1724334650-301368 X-HE-Meta: U2FsdGVkX18vgCw506HlxeJAPdKWjLoWqkcAu4XxhGaBY+z7n7x3pd9um5AOeRT4vhnXpHHmcmDGMHiqTYXM6Ci7IWyFdc6jdnFWBcVvY9eq3+kXhFvXAI8H4km5nAX5tD6AKJ4WavZZfEuyo7JDzoIEn0xV1bfeOV9jdPocFl52Q3rs1893I4msmFXv+wsV5shug7ugTsRbzpdbJOesyCaK61dQnVcjAbHvxZOfzFR5HjPNfEimCLIqSOSipt1DsHp+39tiv/V3KX9aU5Z7tq5vW3YXBsLceMETy08n9DxrrwTr3ZmEhxM2qsIKwUkPf95JtgZC57hgsBCBVsYBkRGoxi1P5pa7t7oKAOi3KmJJcUvhjGcJJgwrRO2CJFA1W7KW9CcYHfu1Jwn3X04jI+abAPvmMzAz2fnbn00aSPc10ke3/cloNKkM/Fa6O63K43uavh7bw2KRcpP6vVDVMxvrGF9qHmyrZz4NmyJExOQd4tdHvzC+24b6p0rg3dcrrRjKjIaANQ1QQjrZZHKdFz1UqCl086udjkuS66QYt1UDrWK4qUDq/96eW5b8Kk99ay/yEf5+Hq+HP8nmx+qOZK7hffUCLn5kXvjHBYOrfihLBavnA/F4aQabVA4kJnXsJzzTZbC15OW3moaC45bxsvhRQi3HrfVccPaJ/g9vjuY1MrvBzUlxPyDjxh7D3sT7Hkk9OfowWaUCWhQg1gTH3qSKjdYjuSJL9uSJH1xgd25sacQ5N4pdNK/JDdg/e2XlOq3x1ao+CF+pjpnBBX+4TNfx3FDKpTCMeCKkDxDadjXxRJPzhSms9xo0KTxFaqc2m8/2qXw0RRmn4QjkVCPjJmtult/ycX1rewj7TsOy3xm8h7IvCfnRSvLUPHmFaHfqpfOdTGau+uygbJptrN6xBW5OXktdyfpzADHYxCvHExmxZnG3W9MaPu3R/qagEkB5F8ak2RIDhgp0FU8oQGO yQlH38Af 7mpfmEqDUC8ZDnmPq4sSgxJP/hmZTQvSK0egtbSU3eH3vTT+NojjwNor+VexMJbYCJmDNHOt9t6+XUhWnxfl01+kDvG77+1loJaka36lq2hJlFm3UVccbm/jZt9TMjlXlXG9iPTxscgPEoCZ8jAVtGnwFf7034mxTWuzNgrVU/2sC1Gn+0PWK38uSlSFnq5PJuXNkmjJYrvs58YhOAlLqhTNoXET6UoEiwhZA/OoGvqex/Vqt4ulZdbvHDGsa1Sfox7XzGx241WgiYkZryga3PVDl88uHiXLEsgoQzu2xn0CEI8KXyfxvAQYOlW1JnmoaTMyH8Ja182ztR67b/1ZqE2fs4DiGOg9tr1N0RbWsJHmbrNTzfzc6PuTt+w== 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: From: Pankaj Raghav page_cache_ra_unbounded() was allocating single pages (0 order folios) if there was no folio found in an index. Allocate mapping_min_order folios as we need to guarantee the minimum order if it is set. page_cache_ra_order() tries to allocate folio to the page cache with a higher order if the index aligns with that order. Modify it so that the order does not go below the mapping_min_order requirement of the page cache. This function will do the right thing even if the new_order passed is less than the mapping_min_order. When adding new folios to the page cache we must also ensure the index used is aligned to the mapping_min_order as the page cache requires the index to be aligned to the order of the folio. readahead_expand() is called from readahead aops to extend the range of the readahead so this function can assume ractl->_index to be aligned with min_order. Signed-off-by: Pankaj Raghav Co-developed-by: Hannes Reinecke Signed-off-by: Hannes Reinecke Acked-by: Darrick J. Wong Tested-by: David Howells --- mm/readahead.c | 79 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index e0cf3bfd2b2b3..3dc6c7a128dd3 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -206,9 +206,10 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, unsigned long nr_to_read, unsigned long lookahead_size) { struct address_space *mapping = ractl->mapping; - unsigned long index = readahead_index(ractl); + unsigned long ra_folio_index, index = readahead_index(ractl); gfp_t gfp_mask = readahead_gfp_mask(mapping); - unsigned long i; + unsigned long mark, i = 0; + unsigned int min_nrpages = mapping_min_folio_nrpages(mapping); /* * Partway through the readahead operation, we will have added @@ -223,10 +224,24 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, unsigned int nofs = memalloc_nofs_save(); filemap_invalidate_lock_shared(mapping); + index = mapping_align_index(mapping, index); + + /* + * As iterator `i` is aligned to min_nrpages, round_up the + * difference between nr_to_read and lookahead_size to mark the + * index that only has lookahead or "async_region" to set the + * readahead flag. + */ + ra_folio_index = round_up(readahead_index(ractl) + nr_to_read - lookahead_size, + min_nrpages); + mark = ra_folio_index - index; + nr_to_read += readahead_index(ractl) - index; + ractl->_index = index; + /* * Preallocate as many pages as we will need. */ - for (i = 0; i < nr_to_read; i++) { + while (i < nr_to_read) { struct folio *folio = xa_load(&mapping->i_pages, index + i); int ret; @@ -240,12 +255,13 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, * not worth getting one just for that. */ read_pages(ractl); - ractl->_index++; - i = ractl->_index + ractl->_nr_pages - index - 1; + ractl->_index += min_nrpages; + 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; @@ -255,14 +271,15 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, if (ret == -ENOMEM) break; read_pages(ractl); - ractl->_index++; - i = ractl->_index + ractl->_nr_pages - index - 1; + ractl->_index += min_nrpages; + i = ractl->_index + ractl->_nr_pages - index; continue; } - if (i == nr_to_read - lookahead_size) + if (i == mark) folio_set_readahead(folio); ractl->_workingset |= folio_test_workingset(folio); - ractl->_nr_pages++; + ractl->_nr_pages += min_nrpages; + i += min_nrpages; } /* @@ -438,13 +455,19 @@ void page_cache_ra_order(struct readahead_control *ractl, struct address_space *mapping = ractl->mapping; pgoff_t start = readahead_index(ractl); pgoff_t index = start; + 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; unsigned int nofs; int err = 0; gfp_t gfp = readahead_gfp_mask(mapping); + unsigned int min_ra_size = max(4, mapping_min_folio_nrpages(mapping)); - if (!mapping_large_folio_support(mapping) || ra->size < 4) + /* + * Fallback when size < min_nrpages as each folio should be + * at least min_nrpages anyway. + */ + if (!mapping_large_folio_support(mapping) || ra->size < min_ra_size) goto fallback; limit = min(limit, index + ra->size - 1); @@ -454,10 +477,19 @@ void page_cache_ra_order(struct readahead_control *ractl, new_order = min(mapping_max_folio_order(mapping), new_order); new_order = min_t(unsigned int, new_order, ilog2(ra->size)); + new_order = max(new_order, min_order); /* See comment in page_cache_ra_unbounded() */ nofs = memalloc_nofs_save(); filemap_invalidate_lock_shared(mapping); + /* + * If the new_order is greater than min_order and index is + * already aligned to new_order, then this will be noop as index + * aligned to new_order should also be aligned to min_order. + */ + ractl->_index = mapping_align_index(mapping, index); + index = readahead_index(ractl); + while (index <= limit) { unsigned int order = new_order; @@ -465,7 +497,7 @@ 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--; err = ra_alloc_folio(ractl, index, mark, order, gfp); if (err) @@ -703,8 +735,15 @@ void readahead_expand(struct readahead_control *ractl, struct file_ra_state *ra = ractl->ra; pgoff_t new_index, new_nr_pages; gfp_t gfp_mask = readahead_gfp_mask(mapping); + unsigned long min_nrpages = mapping_min_folio_nrpages(mapping); + unsigned int min_order = mapping_min_folio_order(mapping); new_index = new_start / PAGE_SIZE; + /* + * Readahead code should have aligned the ractl->_index to + * min_nrpages before calling readahead aops. + */ + VM_BUG_ON(!IS_ALIGNED(ractl->_index, min_nrpages)); /* Expand the leading edge downwards */ while (ractl->_index > new_index) { @@ -714,9 +753,11 @@ void readahead_expand(struct readahead_control *ractl, if (folio && !xa_is_value(folio)) return; /* Folio apparently present */ - folio = filemap_alloc_folio(gfp_mask, 0); + folio = filemap_alloc_folio(gfp_mask, min_order); if (!folio) return; + + index = mapping_align_index(mapping, index); if (filemap_add_folio(mapping, folio, index, gfp_mask) < 0) { folio_put(folio); return; @@ -726,7 +767,7 @@ void readahead_expand(struct readahead_control *ractl, ractl->_workingset = true; psi_memstall_enter(&ractl->_pflags); } - ractl->_nr_pages++; + ractl->_nr_pages += min_nrpages; ractl->_index = folio->index; } @@ -741,9 +782,11 @@ void readahead_expand(struct readahead_control *ractl, if (folio && !xa_is_value(folio)) return; /* Folio apparently present */ - folio = filemap_alloc_folio(gfp_mask, 0); + folio = filemap_alloc_folio(gfp_mask, min_order); if (!folio) return; + + index = mapping_align_index(mapping, index); if (filemap_add_folio(mapping, folio, index, gfp_mask) < 0) { folio_put(folio); return; @@ -753,10 +796,10 @@ void readahead_expand(struct readahead_control *ractl, ractl->_workingset = true; psi_memstall_enter(&ractl->_pflags); } - ractl->_nr_pages++; + ractl->_nr_pages += min_nrpages; if (ra) { - ra->size++; - ra->async_size++; + ra->size += min_nrpages; + ra->async_size += min_nrpages; } } }