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 09AD9C52D7D for ; Thu, 15 Aug 2024 09:09:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92D176B00A6; Thu, 15 Aug 2024 05:09:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8DC836B00A7; Thu, 15 Aug 2024 05:09:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 77D166B00A8; Thu, 15 Aug 2024 05:09:24 -0400 (EDT) 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 578296B00A6 for ; Thu, 15 Aug 2024 05:09:24 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D265412141C for ; Thu, 15 Aug 2024 09:09:23 +0000 (UTC) X-FDA: 82453906206.03.106F473 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by imf07.hostedemail.com (Postfix) with ESMTP id 15B684000F for ; Thu, 15 Aug 2024 09:09:21 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=QXBQrA3P; spf=pass (imf07.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.172 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723712905; 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=+r0q1aMOVXTo8fjQ8nnAWfzQgFhULOwQhra2cgoZxE8=; b=WDAjNQPLdTVA9OVdz1JrJsTSteMPaQ1doY95LfK1OKzrAg9chGqj9YAix7P4xfB+yEL9Ib TvAxKtpCx1X5dcGh8dohQ8PMbx7HKuHcMj7EZNQl+y1rB4rHMcIGuUJzkQaaC2IuQL7TfS JweTQyye7UIX4YDvy20gHg9tkGLc/5o= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=QXBQrA3P; spf=pass (imf07.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.172 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723712905; a=rsa-sha256; cv=none; b=NSBwEc3QVqdQ7+thdAC5PiUF6aZCaSC+9op1lzpLvBrJ7E38IV/JAoK26N3vMKFmkXHiiI zH7WEA7EeXUl5b4J0WH84S3no1eMJsX2yhCc+LvLiNkr7Az6KmS8MSRzBjJHs/IfUfwfDn RSmjdmxAGGL8eZuimExyu2K9cHEVlyo= Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-202.mailbox.org (Postfix) with ESMTPS id 4Wkzp65kdfz9sRJ; Thu, 15 Aug 2024 11:09:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1723712958; 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=+r0q1aMOVXTo8fjQ8nnAWfzQgFhULOwQhra2cgoZxE8=; b=QXBQrA3PvzJe5fSY+q2g2T+sBJO6QUTu2eBgXVzjWIVNmz1XlU26ZlNead8Yr1GDkHXqpO ZFQ50RwpE4sDUC/YLKKvMcPoo8qa7LO4bgCl3OCIV/k/TtOgumrsjw0KDmSY2U2B6Sbf4m F6EeNpHCYzmZDvB5pPckw2AALW2VGYAjSVdqw9N2rZbmywUjvNMItrIvHADus2d+79aSQT WQf7Ke6c2yT4wYMrVCYwZSFEIaUDbSDXkOBwSAoFXj3iE7cHavnXv6Nn0WchGL4BZuLd2k gHGBV7PBFdZfRPFBl1xwqWbBNVPAA2OKBQZDMHm0hBENGQnlj4uK0bjM7WJDnQ== 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 Subject: [PATCH v12 03/10] readahead: allocate folios with mapping_min_order in readahead Date: Thu, 15 Aug 2024 11:08:42 +0200 Message-ID: <20240815090849.972355-4-kernel@pankajraghav.com> In-Reply-To: <20240815090849.972355-1-kernel@pankajraghav.com> References: <20240815090849.972355-1-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: z6dgfrs1yzu37hycg5b54q17zgra96uj X-Rspam-User: X-Rspamd-Queue-Id: 15B684000F X-Rspamd-Server: rspam02 X-HE-Tag: 1723712961-445206 X-HE-Meta: U2FsdGVkX18Vom4pa9xWH31uNH2rZqiu9TcXy/nf8h585hBpJEPFI50DprXDwJS1ODu1O5G+nj6bioPBhm/6aVIckww0lEsRBLAF8ztZHbfI6IMz5FMSbmHZK/BQ57bWAdcCx/zj8lcdfb23lfYvQDFbiU3NfQyjVj9TFrAGWY+zri2ttlkL4JUb5aZmNMsMSg2Rf5btJW7sVGkJts/kACFnWcNc1jJ/j724VdpfIgn/wpNrnLOA+BMHGnG7GHaV/PcRvDMCieofLo3DRSKgNsI9S0y1UFV8mmYIkrVTb3mEBmTmzDvh0KYGy41PkkWHYcqJNvbyMCZBE9iaQ3y8f4jkpHIFCb0IrKylsF03kgL273QnAohPmhivk3xLzcVpkqbJVxHpQBit31ficcQ3jY9x4NgTcICY1xDc/UMbxz3MJ66WRffi2xwrm7ZhRk2CcGeU6ppRvTVXBULv5GmKfjb7Qfv+kj9J1MB2trXPUY8FRLJ2YcCWo7eb4LIldXuMgBkmhk6oRiRTckQBGfNqvQVxI2jc8mmlUANEvZpwf54W7T38Nw6zvuccgveryqmKaFD4KiKKvOX6QLw58117NxVEokus6h9zXEqmJXBZP6kS/n8cnX917p8NxaRHlHN9FPwA6ebYN3HMe2gqHUu3KHf09vog9wOmQFZ1F0ZAFiKjBqcNlNJBrTWYa5aFBIKvi9GcNi+h+mHAn7xJMpRpn1dt6R5PcjQXHNz5O0499VY0RbioWu0Z81WnNc5SFY1FDBoUQthH6Cd9S3OvFo2uTmmMN875GHKx/v9HxHUnanoR8gF5WpqQ8sxi4GKdHt/W/uIyBZWZoT+5cRKsaEHDSX+CoZwjBu8EFdMAl0VDszkyk8LXnG4LEMPVq/0jipR1PLTjV4g530XoYfamKgvfAfTwOvQdvtAm1+8jSSzT8hwEnwGgzQn8RTtse9+ulnC8dvO8QNIuKYh7tOeZUls NHs1MzpF tDRs5LoPWlmLJ3chHqx0SRTbpyroo58Hgpt3DY1eEBF/u+0LFtgMGSmtu994wDG23I0TCjS96+MMVUl8jT8mEArpN4DrithCo10oAnngZZtB6igmXeRAIp97yWElAMXxDkjXPTBXlDCHVgC665lNY/qWxKfv3iQwdVghtF0xYV3DmGJFxO32YHw9HligS80lb7aUboKAptoXOdgSzizz5hnzI8zPyeGilqa10Y/71woUU+xKAPWUaUGav1Mvk3I9m+Pmgp7O4shrpEW4zRmWUMO9vDQngxhHQhkVjjpxO0vbcyOq4B3yMUbwpU2/Q19XHhUMY83l4bn6rzZRcYIlDm/cSRr6xTz9802jgUSJY1xis7DtvB2OcjRH/oQ== 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 --- mm/readahead.c | 79 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index 3e5239e9e1777..2078c42777a62 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; } } } -- 2.44.1