From patchwork Thu Apr 25 11:37:36 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: 13643178 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 53545C19F4F for ; Thu, 25 Apr 2024 11:38:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C790F6B0083; Thu, 25 Apr 2024 07:38:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C28B36B0085; Thu, 25 Apr 2024 07:38:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC9776B0087; Thu, 25 Apr 2024 07:38:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 92D8D6B0083 for ; Thu, 25 Apr 2024 07:38:01 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 39611161149 for ; Thu, 25 Apr 2024 11:38:01 +0000 (UTC) X-FDA: 82047855162.03.F17FF15 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf06.hostedemail.com (Postfix) with ESMTP id 90360180024 for ; Thu, 25 Apr 2024 11:37:59 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=cQcJGDBL; spf=pass (imf06.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 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=1714045079; 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=fe/EkxT/4tbsQ0E/aktsfNPPVKoCmEm9S5NSTYBj3tk=; b=j91Y+5ZE3bk7HM4zo6XYWLDTIGLpyXJWSLok7vB01iY/k9PVHRjzs4XCyAhTzAj+2mgCQD mb1WzGx24d1bxXN4HB+nXGI28LhC+YO3hb8fgXHwjYJ1xbubCdYEQhUqHge5uxhNAwi7fJ d3ja15MFkZ+Tc1wVMyruuiDyDyTPvP4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714045079; a=rsa-sha256; cv=none; b=LqQcG4qxd/j2jrC1l/nz11AkWg11Ho+XnZA3OFlQPkxWt2T2FVgzyhu/SDP7aZ9U8NJHmP zfCOLrsukCg+eBokw1K7pxGI2XQ5upv654Q6a5e7dnAFpbuVZU0At8mpk15FcL+zP5e8xs 3MBzzpixTLGWbLQ8sDDe9poZnXDsTiw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=cQcJGDBL; spf=pass (imf06.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (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 4VQDPJ23mVz9sPv; Thu, 25 Apr 2024 13:37:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1714045076; 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=fe/EkxT/4tbsQ0E/aktsfNPPVKoCmEm9S5NSTYBj3tk=; b=cQcJGDBLAl1dtJxy2kvDsF3al40H5eNmF+KJhBHUl9EJFN42VOJQ+eT0kKwRT7JcFsKb93 X650sGma4M8zKkqAEZvRZSU/z8fEza1NcUiq8h6r+Lw2TlOS/Al7Uxk92R+ziwxPd8KTFr 8GwuqK1plMMpyev89NoAiITarFI/PiKOaT5bsa4J8u4QrCVuK/6Db1KadTwqtE7ZGCU69j SEkRtAo4DoUk3WNvBQgnHOsP+o/CSH7V/HAZ1szftyz1TLk8iQuaVgBdm524Lhsrr4fBuD hDmfrjD8Lai7/Ufz7ZtNtkaGft4Ejr4EMY/v2vMTfonhZKN0sPYlHF5tSw8ctg== From: "Pankaj Raghav (Samsung)" To: willy@infradead.org, djwong@kernel.org, brauner@kernel.org, david@fromorbit.com, chandan.babu@oracle.com, akpm@linux-foundation.org Cc: linux-fsdevel@vger.kernel.org, hare@suse.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-xfs@vger.kernel.org, mcgrof@kernel.org, gost.dev@samsung.com, p.raghav@samsung.com Subject: [PATCH v4 01/11] readahead: rework loop in page_cache_ra_unbounded() Date: Thu, 25 Apr 2024 13:37:36 +0200 Message-Id: <20240425113746.335530-2-kernel@pankajraghav.com> In-Reply-To: <20240425113746.335530-1-kernel@pankajraghav.com> References: <20240425113746.335530-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 90360180024 X-Stat-Signature: pd61pqeprf1nxtkwj9u9n18of4yrtwqh X-HE-Tag: 1714045079-807621 X-HE-Meta: U2FsdGVkX18A+x6OJCefEGOPh+D1ES1VP/CXxTZCjrF9RQe0yCvRxWAb0WX59TrEJXgBTqXS5gByzjlmLcKQJeazzIUEHdI13S/2TePWgYonxranBaAReRFjArlASrxfKEPKxpImFyxv1AoOmakmrXrx4oC2irPpkI+/ZhUdroytvXN1/bAKXVMasQ1Wjlz3Pw9dPA/G6TcJKt1YQEa3G/3NiYq5qOAZ4WBwToPjU1o/NrokUtYQQ7oprIYNJWtA3LWbwekc23Nrr8OHaD5euMTHYtwR/FpFMqlKB4+ePml5fGZwCamHDjzA8PivyH/7YSLuVsUul0/+AiHTV1NKQJy6+MYP1ffdLaM3Y3SBUVww+81ajcOYndMIHQri0AW7S7oDjoZiaKLVreb2+tEByG3RS9Mx4+Tng6UDX9v3ed16wUjgFveqis4/kKdg5kDO+a4K6I9pzXcbOqU4CP71k8WwAsEvJdE3h0ajwCLw6VHABTc7sE8SkUVsIFmYnKUJTPMN3VgrRIPe/k4dtDSaBlO2ZOAauHdS0GAyOgA9XW3aBY2rHvk3i9fD7BlnCoCBPFnT89rcQq64qS1bsdH/7ITRIstL1ZHIgmnGsXuCxsRmBgbz99NNL6FE71AfRy1knrW1H3UY2bvztBF70HV547o6nwSDtUQMOYgSO+fOqEooD6PXUwelPy56V9+ftgMtmqxlBdg8TFch3SMFj7cZktjzu0GZicR8m/YWUmophv2qOHzE0c+M8WLU5t602/mw7WIJGUrUigw94qR+Z4zbFKc2oewNWgToMj/xT2N3ulEjSxui9+t2B9rx5qeK2bnwndnZPWjhbvwYIMQe2EOQo1KsEVp63bctbbJJ2xSPnnBvrW0oDhjiiDcJZWs4sfoinKen+sAEXtbhQcSLJHv0/nUnT6k08TYfdGAfbGKK/GcZ5UFquk6zdO8QFyAZMYkrhQSOqlc3ohWilWHtKyA ubWvbg+n k3RE9RQx0vRqnpJB194eZoYQ+WAJ6UwMZ11YCgkBuiswe1NrNvr+CnejeNoP65QHnkmUd2X+oNY2TjAh+9D90bb7xdAuAh+I5QwcPy64zU46PoZ/nZ216jAuytItxQhwnSBwgOMN3Y/qkfjz7r6DoEdd6wOCtAviPi8t337zMxndT/MaTVgaFCY4NJC9ul7rcvZEg35GavH4vg3wHCDRtuDpue1RynwUAtEcNDMCSkLS8mlBt+xULZHFU9oeoRNQA2TPyprKIlz2Ybybi3qQKFK/o/T/AZb1h/Y9ANOGNQrjOHpkbnCZdgufBaw== 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: 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. Note that the index is incremented by 1 if filemap_add_folio() fails because the size of the folio we are trying to add is 1 (order 0). 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 130c0e7df99f..2361634a84fd 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -208,7 +208,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 @@ -226,7 +226,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)) { @@ -239,8 +239,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; } @@ -252,13 +252,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); } /*