Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
From:   Youling Tang <youling.tang@outlook.com>
To:     Matthew Wilcox <willy@infradead.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, tangyouling@kylinos.cn,
        youling.tang@outlook.com
Subject: [PATCH] readahead: Update the file_ra_state.ra_pages with each readahead operation
Date:   Mon, 30 Oct 2023 15:41:30 +0800
Message-ID: <MW4PR84MB3145AFD512F2C777635765B381A1A@MW4PR84MB3145.NAMPRD84.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: MW4PR84MB3145:EE_|DM3PR84MB3692:EE_
X-MS-Office365-Filtering-Correlation-Id: d886a587-3402-4e42-7b94-08dbd91bac6d
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: L5FiTsJSjQeJUpb+UeqnlN3BftMKa25dQOgqUBAeOCVGqhi53n94pl0WnEuT6JuxUV91RbU7G0Luk8OKAa5CWZpxE4t9LxScyGpKhsv4wuB1VUWd7g8N4TqSZ05b2Ps052QL1M12uwgj/Ns/g/fO/R1TM60+c6DB09Lujmp6mHQrLEFtyeAivvVcnVTDFXJmK0j8MEEqzaHClZ5ZO+R+oVuQ3PO4ilhNK7ytB39KDA6rmaGqkzmPwvIiN3k2cjzpREVUoMEvrzKVMcsvQFcMbD1Qex9Dm2CHV1MRTleJoxGO3lEM4e/rg0McL+duDiSKFUTWzk1CVUlg2UmCfa5Vg2R8SONaUFNajrTdXD9cQfrLvOFtXQsedg1WsXjnPOiTlYiiZINYBQRh1FI1GwYzhurQY6rH0qUuVLDg13V8PlKlGQYPaksIksGq99wpcrt9vURL9h9reMwhP2rLdgAoANPLXQwrFbSQCQ6jcVGyWDvPKCpOvfO1vxxIo1K9O/P1lXjOM4dQQvYm2gWg9C9CJrKSMOMJaXmATHRJxf2BwBeLettTxR4NroovE8DmIX0/FKKDoPL3nqepaIaLR0N5RvP+8M2dWq5kQBoLXnrFfrU4nlWj/F+KSz5HfpipiAh6
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jELSgBrRdf9KhZxmrIdeF1y+qCWQfRZT9zPsst3RikPAqYSVtSJtxwbTJcS6?=
 =?us-ascii?Q?wkEiBA60uLrV3JTPPMdaApoIVuUGDadiNhWtYGQEXn2xlhpR8WpgPWYP03Uf?=
 =?us-ascii?Q?ra8J2dIqPxx04KzUnEZdBI4TcUkI/ZL14pfUDqPqk9enbibXB5FNxgOBPNjY?=
 =?us-ascii?Q?9g7DxQxcDY9wU9rkzNXQVXmLHC2YpaprEKJVZTIqkBPIN9I+ucc8gRi7VsJ+?=
 =?us-ascii?Q?5ICn5AV6Dv7/DQt5c/353Cr//jwYGplJnFgahmJRSXSa/AKbX1/PryWeS0q+?=
 =?us-ascii?Q?8kja9ruAa3XD+Bl45lF7NEBEhR74JzScz82z0je2+ukj7+gqw7HWVfHA6U2X?=
 =?us-ascii?Q?wp6qzVrqR3Fdpe5ttW7YOjYqPU40vQPv67dQSFBUzCRVKfSps1+LJNaQ9Dak?=
 =?us-ascii?Q?pf4aQqP/qy59MGZOyE1YcP9GGG1auw4OiWjkOsuG+7Qc5wA8eXsxoDMPZ+Dk?=
 =?us-ascii?Q?myt5gpMGhQbjDjatecmLyn3gYGbr3u0LfEY27tk6NvR0Sv2r89QiXgSgorr5?=
 =?us-ascii?Q?lTsoX0Yz8G+GCGGCjUXy933RI06qKULacsMCZSj5o+YRAQrUNAsAuMbwOacQ?=
 =?us-ascii?Q?oGFla1NSD2/uxEHZA6mpBZaVC3sFk/TVphFsyx+Jj3RYdsqdZSZ5kWIHyqvQ?=
 =?us-ascii?Q?15Ni11RqHPfJ+pRSleMGzfp0dTsneSAL7ZAZC4kKoBEeLNi4KCkH05ojQuwi?=
 =?us-ascii?Q?/Zl1/L5jUsmvXQmCDUK7ykjWhupV7zqS4IagKAyObFNRQsjYn3iiwuHoG1Cx?=
 =?us-ascii?Q?OyP1CV4JQcEhzSuaBIbuMzZ3+ahl7GoQgjQpnRhrauzaL4erygNkHkOQlJgt?=
 =?us-ascii?Q?vfDbkRkjZUk8XhcnOi02Oo37LQRR3ks9ptEwRfN6NIbSN4ahgv1MtVpQmp1o?=
 =?us-ascii?Q?MMzmJpzmcCWgqIeUn27Fs6nLlY7rlwyc+D9G8+pwm2OQCeP4RtLnQkJ+qCQz?=
 =?us-ascii?Q?gp2yAT7ygEuEyEa+ZDJseDqbWXLJ1NkYYF9CeTSRHd0vJVbHYadLAVDLuYB6?=
 =?us-ascii?Q?NOthIS84kKh3qLV/w1lk9xZMDYupIgX6FjFcH3M7vdRJ1lKBEOpjSxl9Xpe7?=
 =?us-ascii?Q?QTWS2VtwxwU5rayjNZIVLZC6tYRUM0z2kyEp+AhpB8oxAxLmyKDSy6pTbG3p?=
 =?us-ascii?Q?BlCPM4Xrz83G1YK6TBGHQlAAu2/5652onWICz2hatHexf5elbuWXbTemulIx?=
 =?us-ascii?Q?bzAnq8V4pW1tIEAB81M0ukee8/ZP3Us8EA9QRDzr60LDnTYW3g31ElkCd1Q?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d886a587-3402-4e42-7b94-08dbd91bac6d
X-MS-Exchange-CrossTenant-AuthSource: MW4PR84MB3145.NAMPRD84.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 07:41:48.5400
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR84MB3692
X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 30 Oct 2023 00:42:11 -0700 (PDT)

From: Youling Tang <tangyouling@kylinos.cn>

Changing the read_ahead_kb value midway through a sequential read of a
large file found that the ra->ra_pages value remained unchanged (new
ra_pages can only be detected the next time the file is opened). Because
file_ra_state_init() is only called once in do_dentry_open() in most
cases.

In ondemand_readahead(), update bdi->ra_pages to ra->ra_pages to ensure
that the maximum pages that can be allocated by the readahead algorithm
are the same as (read_ahead_kb * 1024) / PAGE_SIZE after read_ahead_kb
is modified.

Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
---
 mm/readahead.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mm/readahead.c b/mm/readahead.c
index e815c114de21..3dbabf819187 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -554,12 +554,14 @@ static void ondemand_readahead(struct readahead_control *ractl,
 {
 	struct backing_dev_info *bdi = inode_to_bdi(ractl->mapping->host);
 	struct file_ra_state *ra = ractl->ra;
-	unsigned long max_pages = ra->ra_pages;
+	unsigned long max_pages;
 	unsigned long add_pages;
 	pgoff_t index = readahead_index(ractl);
 	pgoff_t expected, prev_index;
 	unsigned int order = folio ? folio_order(folio) : 0;
 
+	max_pages = ra->ra_pages = bdi->ra_pages;
+
 	/*
 	 * If the request exceeds the readahead window, allow the read to
 	 * be up to the optimal hardware IO size
-- 
2.25.1