From patchwork Fri Jun 7 14:58:55 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: 13690330 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 8257DC27C53 for ; Fri, 7 Jun 2024 14:59:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F9636B00A5; Fri, 7 Jun 2024 10:59:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0836F6B00A6; Fri, 7 Jun 2024 10:59:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E66106B00A7; Fri, 7 Jun 2024 10:59:33 -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 C6E536B00A5 for ; Fri, 7 Jun 2024 10:59:33 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 670D6A3903 for ; Fri, 7 Jun 2024 14:59:33 +0000 (UTC) X-FDA: 82204401426.21.4429154 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf20.hostedemail.com (Postfix) with ESMTP id 988C91C0017 for ; Fri, 7 Jun 2024 14:59:29 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=HNg2Zlay; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf20.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 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=1717772370; 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=gcGImSYw6myhhr+aFoG6zYcMMyebatE1gThNoSCMqDI=; b=o/WetUQazqMUtF+xzd5y32jvsG7UdifxslNNbULCOI4dVHSloG1wdozks+uRYn2PE4JCq+ YS0UOQManqii5Ls7ctktG/rYC29V2946olgDNXAqn0Mg4AJgfR12d2g2Yk9VnboeKhgr1C CzmlUPk2e+mCg8nFlTlwOKrUl94TWbA= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=HNg2Zlay; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf20.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717772370; a=rsa-sha256; cv=none; b=LQOLypI/iOoKkDnc0myrSUcN+7Vd9CQcaFBQT6xn8O8T+DwJkhECps5lBRmQ5wCVS443UK BSInC0gJGOkr2rPucO7DeuKfLsaJYVzZdlTAN8RrJOTQpHKStmNF/i1+2YxNTR+87aBATW r9zGmMMMTDwaHIQ6ubazoc08lG29B28= 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-101.mailbox.org (Postfix) with ESMTPS id 4Vwkqy3GMxz9smQ; Fri, 7 Jun 2024 16:59:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1717772366; 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=gcGImSYw6myhhr+aFoG6zYcMMyebatE1gThNoSCMqDI=; b=HNg2Zlay2Z+TJiNAAL/h42UPCFPyyjecycy9Rzn3UPRWBgUjnJgbsCSIjM4WoHM1JTXBMX hCfT1g6FDmQQYumow62hfgcTTyqWLaWigc8MLjlBgOs9U6Udn2Ufg9QXj3KCcR3HpLIQOn EzIjcnhiQRKvFbHJz8ZhAcXMXtn+kf3u7YBF9+W6zny1XIDPiilEMmKiSzCUBL2MDZ8V5O TZYFf27k5Kci3MKtZI63RCU84Fiw6g4YpkFOSs+k6O61zJw84mFhgXfNM3j2tCeWzGVWe5 gTVlByOdsdDkNx/NdTOKUzebiyJ03ma21W5BwlHvtkWZI9H2UZeReiue4sdvlg== From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, djwong@kernel.org, chandan.babu@oracle.com, brauner@kernel.org, akpm@linux-foundation.org, willy@infradead.org Cc: mcgrof@kernel.org, linux-mm@kvack.org, hare@suse.de, linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, Zi Yan , linux-xfs@vger.kernel.org, p.raghav@samsung.com, linux-fsdevel@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, gost.dev@samsung.com, cl@os.amperecomputing.com, john.g.garry@oracle.com Subject: [PATCH v7 04/11] readahead: allocate folios with mapping_min_order in readahead Date: Fri, 7 Jun 2024 14:58:55 +0000 Message-ID: <20240607145902.1137853-5-kernel@pankajraghav.com> In-Reply-To: <20240607145902.1137853-1-kernel@pankajraghav.com> References: <20240607145902.1137853-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 988C91C0017 X-Stat-Signature: pgi4tffditdzb3hxkw9ssqztfq4rio3z X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1717772369-302636 X-HE-Meta: U2FsdGVkX193lPOr8cu0EZCPj07MGg+TStxs6NFydVZSE7L4Aw/CoOjOrh9ArA48X/+HNcmDdcV0d+uPPOgbBsJCcoFRedU2BCq9b4ZJZ8949lsoUr0jFE9fg1wqtD/Ow5OkoIOBm7mq2QTyKvkUt20kvilOccKukjxPZOBgIRJQB5qcCkIzD1keqHKpeB7dhgNZL7DEQky60PKKhsasYb41cj6P6gBnHEqAACIieSMLTSuk4LJ+tT4y02YSaZxb+Y9O6pbZQUM9SL3bEBFcx7ARaJupPsHIh6qWFxCOl4h1+QGzRLwYALOBPMCNFaNrbP1kEbYu6uLIxl8E58LG73b2U0AXu76nXMutu2cnU3CqgJZjoL8BHb6HaozxK2ddSThdpOY7mvst6YaBBujX6xR313HDHJGL9JLZtbUvSHK6ikVMZLBDmlfmZkRpG0USW5mZWV01iNHDcxeAcfECBkVOFL5SU8O0Y9LFebufgbj45qzv+1Aj2BYlrYa+N941+fcb1hy9il7YM8Tz+XqN60zhyZCr/E5UiC5podgezfaVaqwd3fVjz2qwTxWXod/tNz/ePCkz7FsjeD/lplCGgiu6uKcgxq7yuLQlPD+EaR7TK1I2REu9IGAOEclQTbzpg+T/tY5i6NHb+OMmeMGAFvg9AlrKrL6Jk25ogjUxjmkcb4g6gC5ZQfzv3hfB9dKLxNY4r2UmSTHQROgpTEz4KpX9ymdUgQdWNKgqxnXhNOOsLNVrprO5pyjC5MKkndhiXzikTektnm5mKJSTttNcKItCPgpYRGNj6GU16F4cg7xnnTONA/Ahw2OV9AOaEQX+dHkU6usenCke+9A4iQwixINHJH/Kh3uQi9Qt+N9oeThncypXKs5M3kqrTuyIZFDsCYK2N6ER6xnehFuIKJCd3ZnMjfRMTdB30ZygQX1AiRATrLk++tJ5CP289lqodasyjxac9+0ViNI2bVPEpCD 9ESJB/2D ju10k6l8i8XNM9RQOzhMkeag94GypQ2ep+4BIZ+XSR0EVpjEdD8tfYPKmv0wxQ3o3uqux7v3rLx7S1dCbye8vfQW4L/HMPds91ivjK0zg3tmomRHpxNNHzgODLOfBE8/AgxojDK69WYp2Gv1y3fVcVQ+6lLKYdDyKSwH9slTRjnJuaz5TdyHLrIY42FjyMBE5lfGyN5KXCBsFQnKt6OosO5JqcQLb40IImCaKlbV00xFQbXv4boHieZLVQg== 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. When read_pages() is triggered and if a page is already present, check for truncation and move the ractl->_index by mapping_min_nrpages if that folio was truncated. This is done to ensure we keep the alignment requirement while adding a folio to the page cache. 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. Reviewed-by: Hannes Reinecke Signed-off-by: Pankaj Raghav --- mm/readahead.c | 85 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 14 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index da34b28da02c..389cd802da63 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 = 0; + unsigned long mark, i = 0; + unsigned int min_nrpages = mapping_min_folio_nrpages(mapping); /* * Partway through the readahead operation, we will have added @@ -223,6 +224,22 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, unsigned int nofs = memalloc_nofs_save(); filemap_invalidate_lock_shared(mapping); + index = mapping_align_start_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; + if (index != readahead_index(ractl)) { + nr_to_read += readahead_index(ractl) - index; + ractl->_index = index; + } + /* * Preallocate as many pages as we will need. */ @@ -230,7 +247,9 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, struct folio *folio = xa_load(&mapping->i_pages, index + i); int ret; + 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 @@ -240,12 +259,24 @@ 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; @@ -255,11 +286,11 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, if (ret == -ENOMEM) break; read_pages(ractl); - ractl->_index++; + 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 += folio_nr_pages(folio); @@ -493,13 +524,19 @@ 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; 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); @@ -508,11 +545,20 @@ void page_cache_ra_order(struct readahead_control *ractl, new_order += 2; 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_start_index(mapping, index); + index = readahead_index(ractl); + while (index <= limit) { unsigned int order = new_order; @@ -520,7 +566,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) @@ -784,8 +830,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) { @@ -795,9 +848,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_start_index(mapping, index); if (filemap_add_folio(mapping, folio, index, gfp_mask) < 0) { folio_put(folio); return; @@ -807,7 +862,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; } @@ -822,9 +877,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_start_index(mapping, index); if (filemap_add_folio(mapping, folio, index, gfp_mask) < 0) { folio_put(folio); return; @@ -834,10 +891,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; } } }