From nobody Thu Sep 19 16:45:51 2024 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB4A01CCB23; Thu, 22 Aug 2024 13:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334652; cv=none; b=u51izsr305sLoL5izD0GJSafUCQixZSb0fvzZUe83r6B2l4P/bI3zVZKmgRio78G+Dkjm/+8KXO4purSMvnC24f68T4ByTJ1Kp65eR9f4reKKA2UyfqyQxMnz54StF8PX8vLdB9Goi/63D0JRwnhLLIsM5WAZZ0zYqAxEWW6CCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334652; c=relaxed/simple; bh=dPFeV3Mey129E3wN8+n/Uwka3Ayz7FiOCPAA5+5vae8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K+aNvEjWv2yHnRILGfvoWEwluEsFN2U06xpIojQht3fQNbsLExN61voiBbv/ViRHZttCad8Z8vQQEpMCs233wK6gyXD2ng6om03VqARMxUWptt0TGJDcNla6GXYpwC3ncQffmmOngFgBT7pbZ4MZt/xPnaVcQzU8OIY6qlL8CxI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=SNYmq8LI; arc=none smtp.client-ip=80.241.56.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="SNYmq8LI" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D ractl->mapping; - unsigned long index =3D readahead_index(ractl); + unsigned long ra_folio_index, index =3D readahead_index(ractl); gfp_t gfp_mask =3D readahead_gfp_mask(mapping); - unsigned long i; + unsigned long mark, i =3D 0; + unsigned int min_nrpages =3D mapping_min_folio_nrpages(mapping); =20 /* * 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 =3D memalloc_nofs_save(); =20 filemap_invalidate_lock_shared(mapping); + index =3D 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 =3D round_up(readahead_index(ractl) + nr_to_read - lookahe= ad_size, + min_nrpages); + mark =3D ra_folio_index - index; + nr_to_read +=3D readahead_index(ractl) - index; + ractl->_index =3D index; + /* * Preallocate as many pages as we will need. */ - for (i =3D 0; i < nr_to_read; i++) { + while (i < nr_to_read) { struct folio *folio =3D xa_load(&mapping->i_pages, index + i); int ret; =20 @@ -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 =3D ractl->_index + ractl->_nr_pages - index - 1; + ractl->_index +=3D min_nrpages; + i =3D ractl->_index + ractl->_nr_pages - index; continue; } =20 - folio =3D filemap_alloc_folio(gfp_mask, 0); + folio =3D filemap_alloc_folio(gfp_mask, + mapping_min_folio_order(mapping)); if (!folio) break; =20 @@ -255,14 +271,15 @@ void page_cache_ra_unbounded(struct readahead_control= *ractl, if (ret =3D=3D -ENOMEM) break; read_pages(ractl); - ractl->_index++; - i =3D ractl->_index + ractl->_nr_pages - index - 1; + ractl->_index +=3D min_nrpages; + i =3D ractl->_index + ractl->_nr_pages - index; continue; } - if (i =3D=3D nr_to_read - lookahead_size) + if (i =3D=3D mark) folio_set_readahead(folio); ractl->_workingset |=3D folio_test_workingset(folio); - ractl->_nr_pages++; + ractl->_nr_pages +=3D min_nrpages; + i +=3D min_nrpages; } =20 /* @@ -438,13 +455,19 @@ void page_cache_ra_order(struct readahead_control *ra= ctl, struct address_space *mapping =3D ractl->mapping; pgoff_t start =3D readahead_index(ractl); pgoff_t index =3D start; + unsigned int min_order =3D mapping_min_folio_order(mapping); pgoff_t limit =3D (i_size_read(mapping->host) - 1) >> PAGE_SHIFT; pgoff_t mark =3D index + ra->size - ra->async_size; unsigned int nofs; int err =3D 0; gfp_t gfp =3D readahead_gfp_mask(mapping); + unsigned int min_ra_size =3D max(4, mapping_min_folio_nrpages(mapping)); =20 - 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; =20 limit =3D min(limit, index + ra->size - 1); @@ -454,10 +477,19 @@ void page_cache_ra_order(struct readahead_control *ra= ctl, =20 new_order =3D min(mapping_max_folio_order(mapping), new_order); new_order =3D min_t(unsigned int, new_order, ilog2(ra->size)); + new_order =3D max(new_order, min_order); =20 /* See comment in page_cache_ra_unbounded() */ nofs =3D 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 =3D mapping_align_index(mapping, index); + index =3D readahead_index(ractl); + while (index <=3D limit) { unsigned int order =3D new_order; =20 @@ -465,7 +497,7 @@ void page_cache_ra_order(struct readahead_control *ract= l, if (index & ((1UL << order) - 1)) order =3D __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 =3D 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 =3D ractl->ra; pgoff_t new_index, new_nr_pages; gfp_t gfp_mask =3D readahead_gfp_mask(mapping); + unsigned long min_nrpages =3D mapping_min_folio_nrpages(mapping); + unsigned int min_order =3D mapping_min_folio_order(mapping); =20 new_index =3D 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)); =20 /* 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 */ =20 - folio =3D filemap_alloc_folio(gfp_mask, 0); + folio =3D filemap_alloc_folio(gfp_mask, min_order); if (!folio) return; + + index =3D 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 =3D true; psi_memstall_enter(&ractl->_pflags); } - ractl->_nr_pages++; + ractl->_nr_pages +=3D min_nrpages; ractl->_index =3D folio->index; } =20 @@ -741,9 +782,11 @@ void readahead_expand(struct readahead_control *ractl, if (folio && !xa_is_value(folio)) return; /* Folio apparently present */ =20 - folio =3D filemap_alloc_folio(gfp_mask, 0); + folio =3D filemap_alloc_folio(gfp_mask, min_order); if (!folio) return; + + index =3D 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 =3D true; psi_memstall_enter(&ractl->_pflags); } - ractl->_nr_pages++; + ractl->_nr_pages +=3D min_nrpages; if (ra) { - ra->size++; - ra->async_size++; + ra->size +=3D min_nrpages; + ra->async_size +=3D min_nrpages; } } } --=20 2.44.1