From patchwork Fri Mar 1 16:44:38 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: 209289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp844203dyc; Sun, 3 Mar 2024 01:50:35 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUqADk+aFDi5YTGo5ggWm5gYWrdEXBz6m83q7FfuqYQaVCCK56pg0V3wmhcMBNyxGltKfCS29Mrrd7KmZSYosQqxZ1ImA== X-Google-Smtp-Source: AGHT+IFfrv2dK0H6aIS9jqZ9RZlz1iWybxwbm7Mktwkqu3j3Iv+oNbqrBghwPiQF26XoAa74IONc X-Received: by 2002:a05:620a:5755:b0:788:21c3:be3a with SMTP id wj21-20020a05620a575500b0078821c3be3amr2503872qkn.16.1709459435552; Sun, 03 Mar 2024 01:50:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709459435; cv=pass; d=google.com; s=arc-20160816; b=RvCE1YVdVnDbBf2dpQvfekneINLh++vyNjq6HAgWnhmKL674MrAFmOx5gjw/nBnvvK UErmBEULuParrt9HgOXqtkA878SFUZSugnuD+3XJD1U93REAt3H5NC/ToDZpRIoQMvi/ 8fiEnHJwhYjPlyVIgjQEP0QLLrKZUtSb9lQG2KdiVN5+TVvbago4XPm6oEjre61gX8cF SMrO6b1BS3RxXLFU1IovcYezofi7nbPQcPl0X7Q18mmp139970KF304uGDdxtZe9pos8 gDnl1ffhF+zffM83Y6Q2lBevMS4BCt+pkats6isy/GqAZEMFh9ALU5zpOotxaTBZ4Roj HN9A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=467JnvYp6xZwSrqHVz6JwGG/B+XhREWQAJ9IMIxeQus=; fh=XNSrRUwVTzpEiSup2LruPjXnnBE4qDGoPoS5h6R7xQ4=; b=SonDGusmgsKAsZzlFtW8tVIY5Fvphb4P4WGrCxZD+vyNMxhde8ZckGbMaAj7BUrhlQ RG9P2BQtf7nVr4S/pAdQgNHuLwidTBdOTM+Zze3GrVwck89uB7XOnsHb/UwhRaRmh6oq PTE0/IPHoaTOSje8kKEPVrR831BD9/L4TM1sUPD5ZLRFkQLGnMtLGrTytWJs8q2lt6ia ptMDNLPNL3eSnQ6Yif2+fLubxVcUUJwULW965CfIsAGdZGahDatc14jQf8PvDb9ClD52 /bUWutUfIKoafKSvgqLV3eUUxrK2lAhAN5GiioIIpmXreL9A7OMySlJz1n0oCBfYS4Li JPsw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@pankajraghav.com header.s=MBO0001 header.b=VkAMxpfa; arc=pass (i=1 spf=pass spfdomain=pankajraghav.com dkim=pass dkdomain=pankajraghav.com dmarc=pass fromdomain=pankajraghav.com); spf=pass (google.com: domain of linux-kernel+bounces-88762-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88762-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=pankajraghav.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id l24-20020a05620a0c1800b00788214aea18si1552109qki.78.2024.03.03.01.50.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 01:50:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88762-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@pankajraghav.com header.s=MBO0001 header.b=VkAMxpfa; arc=pass (i=1 spf=pass spfdomain=pankajraghav.com dkim=pass dkdomain=pankajraghav.com dmarc=pass fromdomain=pankajraghav.com); spf=pass (google.com: domain of linux-kernel+bounces-88762-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88762-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=pankajraghav.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id ABEA41C24339 for ; Fri, 1 Mar 2024 16:53:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DED217317E; Fri, 1 Mar 2024 16:45:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="VkAMxpfa" Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (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 922133EA89; Fri, 1 Mar 2024 16:45:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709311518; cv=none; b=g1APcb90TJ0eEIwdJsvIs/huAYN8bn5hLkZf10SF2jpurPZcm0WYKQ9RBO1wkINuf68DO/3vlqqQKQN+d3IstOHshDgJetUKRaThYLDMcCLvFeGn9fArQFDrpbHmKzDSb+w9QtWZylwhQ2k+MWDqbxSx8iQVJheVqMcV36QjQiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709311518; c=relaxed/simple; bh=ZTzrN3PfzOk7uvp85ZEBavNp8FF3Rm3QXyiQCAXrJco=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EgHNvuUmvRDxYMqUmoYsX8lrV95XHIJwqwp1+VnzoOKEvKTj2mtS76zDAmTY/QaLfajgvkPJpy43CKmbQdz2rRCX4erLxKpqsYH9kBhssRxRjX7AvkCV0khsIqrPJ+4K4P30Y4MTJhNDKBsIqYEPR4Pk34Zw4qJjQeSeYJAlcwE= 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=VkAMxpfa; arc=none smtp.client-ip=80.241.56.172 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 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (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 4TmYqF1lVsz9tWG; Fri, 1 Mar 2024 17:45:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1709311513; 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=467JnvYp6xZwSrqHVz6JwGG/B+XhREWQAJ9IMIxeQus=; b=VkAMxpfaEVmgbBcyuWtw1txdyYcbaIt4sqlGeJGp4avK/yPIQcy8to9fJZZ3qScgjLTMG0 zZ9hNEFp/oojel/WDhiyAb0dUct7HpNi+jJfzLbKNIueuEmbxVJyZbUht4rQxyC5lh8sMS HT6uu3rN9e8yCRwtkb60yJuBlBx8yoAQTlAbKLMMQDdxFUhoa6mKOfD0v3iZ/6pYAYxmVe Lb60kYjxTwQ5MKjEw4kbxCiUHOFuNB1Ojc9L6Jm6wAx5rq7lhFCLV8t0rmZZF8lVDx9g6W 5GNu5Ozk7Sxh5HXX22l8nX0Ko7gEP5moqmlTnADLEs0uHQPFY4rDTa4vNBGg7A== From: "Pankaj Raghav (Samsung)" To: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Cc: djwong@kernel.org, mcgrof@kernel.org, linux-mm@kvack.org, hare@suse.de, david@fromorbit.com, akpm@linux-foundation.org, gost.dev@samsung.com, linux-kernel@vger.kernel.org, chandan.babu@oracle.com, willy@infradead.org, Pankaj Raghav Subject: [PATCH v2 07/13] readahead: rework loop in page_cache_ra_unbounded() Date: Fri, 1 Mar 2024 17:44:38 +0100 Message-ID: <20240301164444.3799288-8-kernel@pankajraghav.com> In-Reply-To: <20240301164444.3799288-1-kernel@pankajraghav.com> References: <20240301164444.3799288-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4TmYqF1lVsz9tWG X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792498137387362889 X-GMAIL-MSGID: 1792498137387362889 From: Hannes Reinecke Rework the loop in page_cache_ra_unbounded() to advance with the number of pages in a folio instead of just one page at a time. Signed-off-by: Hannes Reinecke Co-developed-by: Pankaj Raghav Signed-off-by: Pankaj Raghav Acked-by: Darrick J. Wong --- mm/readahead.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index 0197cb91cf85..65fbb9e78615 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -209,7 +209,7 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, struct address_space *mapping = ractl->mapping; unsigned long index = readahead_index(ractl); gfp_t gfp_mask = readahead_gfp_mask(mapping); - unsigned long i; + unsigned long i = 0; /* * Partway through the readahead operation, we will have added @@ -227,7 +227,7 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, /* * 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); if (folio && !xa_is_value(folio)) { @@ -240,8 +240,8 @@ 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 += folio_nr_pages(folio); + i = ractl->_index + ractl->_nr_pages - index; continue; } @@ -253,13 +253,14 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, folio_put(folio); read_pages(ractl); ractl->_index++; - i = ractl->_index + ractl->_nr_pages - index - 1; + i = ractl->_index + ractl->_nr_pages - index; continue; } if (i == nr_to_read - lookahead_size) folio_set_readahead(folio); ractl->_workingset |= folio_test_workingset(folio); - ractl->_nr_pages++; + ractl->_nr_pages += folio_nr_pages(folio); + i += folio_nr_pages(folio); } /* From patchwork Fri Mar 1 16:44:39 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: 209210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp398100dyc; Sat, 2 Mar 2024 01:49:55 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUOGZEMrsUD+gk0yblutvwXyeQEW36/oCtQT7iL+ADFS4rcJ/RGc/A9V5Ewh9qy54rts3Hr3dEEfT1Zvs5YCl6nq/SHUg== X-Google-Smtp-Source: AGHT+IFO8DxapsTPzxHmeptNrhleH0Ldyiw/6f9gUzdN3zxFf3yrcgLeW4giCeDtg4s9ssz7lkR0 X-Received: by 2002:aca:1318:0:b0:3c1:e1b2:7974 with SMTP id e24-20020aca1318000000b003c1e1b27974mr876309oii.26.1709372995331; Sat, 02 Mar 2024 01:49:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709372995; cv=pass; d=google.com; s=arc-20160816; b=v4faG8YCLPeee9nCvD1eMGM/Mw5D0ex8NVz6PGOkSwf7PO9Ma625nT89ZxrwirKPiS m133qVLlTORbrb0Y1TDyESdVX0ufMoCEBJdUA3SX/S3BUZV9G86/+rVvt62Fl9FFARmL 9rTfdvkqo6DuS4o2hRggZW89rQk79UnYvVidqu2pJPl6PNgWitqTmwmosylV0t2CQLNK Ql+hSsSdlCAcnX/ue+/WaIYSerxH+nnx1J2pEEqXNi9UC7y5DTvD7fWQTUN4leGYDqe4 2gN0/ksoSmiI6odf3TNT0bS8R7VUS3QLZSKZxOTdguj91ObkmRIZnCDSQnprQscWUGEn TrbA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=zvw2rzk11TxuiUv97J3TlgZt9xwdAbT4PmWWnU5r0+0=; fh=XNSrRUwVTzpEiSup2LruPjXnnBE4qDGoPoS5h6R7xQ4=; b=klzgR1KMv2tVA+fLq9YPvp/L1Qm58SuMPksSe6z1XI9drcfqY2zIDTxcx+BGfU2t1B cAU9yrGfaUq/fn4YWAIl9HyIVSlS9keWgPtXRUeo/bzB4o2R4I16b1VTBU97ui3qraPt ifE+wQclmJbgGecjLT6Erco+GaiC5Qt0LhdHZUEYtW4qIJMFbsmYeyAfriCneyPmxSwH UuKcozYUv9rXseFaYtgF/LKRAKBaRNKpv0RixCyRthw4qNC5bmnBXnts+FL3zchsjuhJ l4liQ02gxQDzVtfjjonTEO5E/oRQqU60e0r3bSm5A2J9z2g3J3tmtMM3dfI0OTPob3Ez 7ppw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@pankajraghav.com header.s=MBO0001 header.b=GTvMRiJf; arc=pass (i=1 spf=pass spfdomain=pankajraghav.com dkim=pass dkdomain=pankajraghav.com dmarc=pass fromdomain=pankajraghav.com); spf=pass (google.com: domain of linux-kernel+bounces-88763-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88763-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=pankajraghav.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id sj15-20020a17090b2d8f00b0029b0a24b98dsi5395706pjb.20.2024.03.02.01.49.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 01:49:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88763-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@pankajraghav.com header.s=MBO0001 header.b=GTvMRiJf; arc=pass (i=1 spf=pass spfdomain=pankajraghav.com dkim=pass dkdomain=pankajraghav.com dmarc=pass fromdomain=pankajraghav.com); spf=pass (google.com: domain of linux-kernel+bounces-88763-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88763-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=pankajraghav.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 07D3BB23A49 for ; Fri, 1 Mar 2024 16:53:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E5B0573F2D; Fri, 1 Mar 2024 16:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="GTvMRiJf" Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (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 8C1043FB1D; Fri, 1 Mar 2024 16:45:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709311521; cv=none; b=hs1aZWaJsth9d8I7hILBaetJ0kr2Xg6xT6qF1y8/c0Ph1B3d6qNZO/1EaxRZnd0JzsSm0Z0IBNqiYh8j6egDYL9t7JkXL0HOKUWxyBDl0bnzWfN47Ar1BDEXLgwP/kGRli3u28iO7zfDonS9igrqxQnU39MrB4i5HfsKARaWjeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709311521; c=relaxed/simple; bh=FMbtxZRjXXq41O8f7Gs/qtCnSgbVemzQiH8ZkpI8wCQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u8t1HrK3Y1Y/ZJfvcUbxRJZOtf5hMFUDnIFrMInHsgRODIwhsou8ap7oGOktPRp/sgwaq96EYmsrbsopTVFm3CcTrLxQ+LgbcsFHnbWovprK9HxQ5sftTYSjiq7Klgu2Vp7zu+Kx67fCPFaAqvyOorNH6jWGgyPbE5IGRawOHDM= 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=GTvMRiJf; arc=none smtp.client-ip=80.241.56.172 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 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (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 4TmYqJ1Kr0z9tWS; Fri, 1 Mar 2024 17:45:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1709311516; 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=zvw2rzk11TxuiUv97J3TlgZt9xwdAbT4PmWWnU5r0+0=; b=GTvMRiJfwP1CM9YGAN8fjl3pwLxOZk9Gjl/t9vwy8fr7jW+Wufva3/mOFVv/mPJ1wAqh/X 2XKnWTgFH/VlymrO7JqlRSExaN9oXj2IOFhR7Y6qPalDbQtLS6T/oWq4uXm3kHimID0E7i XfGjXVaUhu6kbuAvHHGrVKvfk7wBZiOMHKUB1jxvSNAGa6OxwxT5bmwHB/hjAmTZLipfiZ pkU2S8yLNWUOZ1HtCb5FiUBq/8oK4BURcysJPANZhPHgBabo3bLhcWu89AgRmDqb0SXsDb wKOCAZ1pTj+fuvYcuMhbu40x5DSNsukW4ZietZo/NSJfFBrXmRMcDA99zOCd2A== From: "Pankaj Raghav (Samsung)" To: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Cc: djwong@kernel.org, mcgrof@kernel.org, linux-mm@kvack.org, hare@suse.de, david@fromorbit.com, akpm@linux-foundation.org, gost.dev@samsung.com, linux-kernel@vger.kernel.org, chandan.babu@oracle.com, willy@infradead.org, Pankaj Raghav Subject: [PATCH v2 08/13] readahead: allocate folios with mapping_min_order in ra_(unbounded|order) Date: Fri, 1 Mar 2024 17:44:39 +0100 Message-ID: <20240301164444.3799288-9-kernel@pankajraghav.com> In-Reply-To: <20240301164444.3799288-1-kernel@pankajraghav.com> References: <20240301164444.3799288-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792407497697516524 X-GMAIL-MSGID: 1792407497697516524 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 Reviewed-by: Hannes Reinecke --- mm/readahead.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index 65fbb9e78615..4e3a6f763f5c 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -210,6 +210,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 @@ -231,6 +232,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 @@ -240,19 +243,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; } @@ -500,6 +515,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; @@ -526,8 +542,13 @@ 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--; + + 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;