From mboxrd@z Thu Jan 1 00:00:00 1970 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 5B631C48260 for ; Tue, 13 Feb 2024 16:38:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D3D1B6B0088; Tue, 13 Feb 2024 11:38:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CEC906B0089; Tue, 13 Feb 2024 11:38:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB4AE6B008A; Tue, 13 Feb 2024 11:38:33 -0500 (EST) 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 AA75F6B0088 for ; Tue, 13 Feb 2024 11:38:33 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 28176120C65 for ; Tue, 13 Feb 2024 16:38:33 +0000 (UTC) X-FDA: 81787338906.02.8532BAF Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id 7FB3C4001E for ; Tue, 13 Feb 2024 16:38:31 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SVd+B4Na; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707842311; a=rsa-sha256; cv=none; b=D5HPN8nsUpDGj7CDGqcsbnouZAaBBhSb5JdmGwK4FmKNMfySHXEFgUzd1uHzkRRu8bkDVz uGtLmvu/gZTG18zU7rhrGZ5D+dWBlJtGsqOLi6owl9JKriRMbH3xV06jLHJRDx6nrY9oGP AtNlnyul0aRfLrx29e2AiF5Moo9uHsA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SVd+B4Na; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707842311; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=89dmWCleWcqbs6uHjsD+OPeYdCOxeIbbpVEMSAspiek=; b=I3NehcQ+b8z94YlT6qB1JowHrW1fomiZE78sXNDNGO51LMl6idl84jpDAiQKon2hFf0uWL FiLCWJHk7fcgl8PjkJ8/JAdmTkNFKJuVIdf1X/rjK0rQpWOdTlrweVIOru3xpUelxTMXR1 jniRf6C75KF+PdaS8FbJi82pDXvOEhY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 87B626159D; Tue, 13 Feb 2024 16:38:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17282C433C7; Tue, 13 Feb 2024 16:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707842310; bh=tj+7TbENZG51WqSKyLxJxlrP3jkogejbHEm7mQelHao=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=SVd+B4NaowQbDyPchjA4D5BZ2fZXSB/eV8rxFnFB3SswALTWYWgzH5KEmwVCvK0D/ eA0cvi+/fgWFrqPJ5Zdy8MO4sQRU1TMSJcM3AJxeudTlYhJkN0CRW9WBLmQYWpg6K9 i9RpproerpQzgm296HmhVFNSY9AO3eSY6a4G6bg5o/BjhyaGTgnEmtToT9UQf+qt2a muBEzsGZjUb7NDtQ4ZuGwhBI6oNusHtYxlzP+ojZ7OKyWuc8ie6+fuNjNq4Pu7yzX1 +oFvewXLVKtunQ/90YrkIVyZYJ6OPO2S9l4/EQTkCuXh4AVIf2eyIwZY2ZbsE7IOk8 MMi8XP+hnZJFQ== Date: Tue, 13 Feb 2024 08:38:29 -0800 From: "Darrick J. Wong" To: "Pankaj Raghav (Samsung)" Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, mcgrof@kernel.org, gost.dev@samsung.com, akpm@linux-foundation.org, kbusch@kernel.org, chandan.babu@oracle.com, p.raghav@samsung.com, linux-kernel@vger.kernel.org, hare@suse.de, willy@infradead.org, linux-mm@kvack.org, david@fromorbit.com Subject: Re: [RFC v2 03/14] filemap: use mapping_min_order while allocating folios Message-ID: <20240213163829.GT6184@frogsfrogsfrogs> References: <20240213093713.1753368-1-kernel@pankajraghav.com> <20240213093713.1753368-4-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240213093713.1753368-4-kernel@pankajraghav.com> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7FB3C4001E X-Stat-Signature: 5t1qzamh8gaqgomnjes7bmu97bjw65g5 X-HE-Tag: 1707842311-410806 X-HE-Meta: U2FsdGVkX1/o+JDQ0DgIPyYcWn589FcogYbX2PJ4oS1EmUOdPBXlfLkBJkO1kPPPkB/Ldiwn5aOHAsfFG5qg6PyLnj7RYG7VBNZw5zzrMJxpZPsFxsUPC3TSpF8UoFLSGL0cTlmJPt+hgr2dtFu3R82Id4Uk53jS499wAnYdGgnVKLqX2QklpVq5cFNPOaGPfRHcL2J2ypVJaBMyeO+3rOdf0cNHo/R9C3dmUwGie9fLOVqYOQUwx0SAt5JirsA8Rap/omcuqwvNquU44RnfRMxdYKbYdgDciRFs2Hv1Jy63qBuszHR42gM5jdLW1obL2dSQHehqD/K/uHww6Yxes760XOYA+6MBtQbxIwsdG8ImH6OT3o16B8+sA9ooR4+IHKkM+aKsZZQH/MSDmJKcMazpHMFWO5+Kq7mvCbxV0ka2VyMAdg9oXn6DP1q1yxI9NFn9AMOVfzuWoAckH/dlt3239p3ri3+qJPXXw3/9Rpqsh5hinPQcubu93tlg3yFKLxsc972h5lF8P3qRHntQqzdv89TZi1xr6cprkamn2WBHA/lbtjZsk9h9rhNZo8QMbY6jvHhqC8DklqZImU4fU1/QNumU2UlO38IVhwsoNNIH5TIp0PFGlLN/o6ugcgqfah8cujES8sfQwvpuOe4NuiG7u1qmH2orhkk0sp7Ch8MUFOtwFEYqokL+MO06UDXgdtF656GdQDgV2nBYsij6DBTel00KZ3tCsQtlpIGep4REVUfoJsPfkcv8WMM8MYzmuvAQoNu7trCmLuDLEaGilIkLZ3zQfXS39N1B/fesJ5JBDz2fT3M5+juPnMUCzrSacZBgKEdNwL/cg8xpyqEC0iBkRM2blIXUrwM0IovJbQWDD2o1n+ZOybf5jfkZG09C+v59E4o3Gf5vBHxjq+WiY70covYNGcDA6YlixuIT3iNwJ6RAu6nsz7sculKlBaCn5OMkusVlBDKMccJL3D6 q6M7mSS+ v2R4Oi/gtyjcMQtmFjjcPk15FKovK0olUFPo08pQCqcrnV+ZcMpg6tPNmGI6BGZC7xfNPOfpV5LtGpKLSzQ5orUjxyNIR6gceG+ZGQv+l/0GwO1LJ0L8D0kC7tc2XtnyPgCIzkqtvifsA7MYCi+YSYvMTpI1emNY9zSIYmt/JoFR7Hm5VsItz/DvXttYIhv9HVlDu4EnnOItQhtdZSGvVeqEA6FVs8proiEmgvO4jJZqcSGbfjddRYXApcH+czzSABatZ3O6bOBlJuaWTlJ3z6y51AsBbEpKNk8DAjxGboKLNH9lMNebDrjPjx4OTyrZNMvG+ 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: On Tue, Feb 13, 2024 at 10:37:02AM +0100, Pankaj Raghav (Samsung) wrote: > From: Pankaj Raghav > > filemap_create_folio() and do_read_cache_folio() were always allocating > folio of order 0. __filemap_get_folio was trying to allocate higher > order folios when fgp_flags had higher order hint set but it will default > to order 0 folio if higher order memory allocation fails. > > As we bring the notion of mapping_min_order, make sure these functions > allocate at least folio of mapping_min_order as we need to guarantee it > in the page cache. > > Add some additional VM_BUG_ON() in page_cache_delete[batch] and > __filemap_add_folio to catch errors where we delete or add folios that > has order less than min_order. > > Signed-off-by: Pankaj Raghav > Signed-off-by: Luis Chamberlain Looks good to me, Acked-by: Darrick J. Wong --D > --- > mm/filemap.c | 25 +++++++++++++++++++++---- > 1 file changed, 21 insertions(+), 4 deletions(-) > > diff --git a/mm/filemap.c b/mm/filemap.c > index 323a8e169581..7a6e15c47150 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -127,6 +127,7 @@ > static void page_cache_delete(struct address_space *mapping, > struct folio *folio, void *shadow) > { > + unsigned int min_order = mapping_min_folio_order(mapping); > XA_STATE(xas, &mapping->i_pages, folio->index); > long nr = 1; > > @@ -135,6 +136,7 @@ static void page_cache_delete(struct address_space *mapping, > xas_set_order(&xas, folio->index, folio_order(folio)); > nr = folio_nr_pages(folio); > > + VM_BUG_ON_FOLIO(folio_order(folio) < min_order, folio); > VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); > > xas_store(&xas, shadow); > @@ -277,6 +279,7 @@ void filemap_remove_folio(struct folio *folio) > static void page_cache_delete_batch(struct address_space *mapping, > struct folio_batch *fbatch) > { > + unsigned int min_order = mapping_min_folio_order(mapping); > XA_STATE(xas, &mapping->i_pages, fbatch->folios[0]->index); > long total_pages = 0; > int i = 0; > @@ -305,6 +308,7 @@ static void page_cache_delete_batch(struct address_space *mapping, > > WARN_ON_ONCE(!folio_test_locked(folio)); > > + VM_BUG_ON_FOLIO(folio_order(folio) < min_order, folio); > folio->mapping = NULL; > /* Leave folio->index set: truncation lookup relies on it */ > > @@ -846,6 +850,7 @@ noinline int __filemap_add_folio(struct address_space *mapping, > int huge = folio_test_hugetlb(folio); > bool charged = false; > long nr = 1; > + unsigned int min_order = mapping_min_folio_order(mapping); > > VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); > VM_BUG_ON_FOLIO(folio_test_swapbacked(folio), folio); > @@ -896,6 +901,7 @@ noinline int __filemap_add_folio(struct address_space *mapping, > } > } > > + VM_BUG_ON_FOLIO(folio_order(folio) < min_order, folio); > xas_store(&xas, folio); > if (xas_error(&xas)) > goto unlock; > @@ -1847,6 +1853,10 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, > fgf_t fgp_flags, gfp_t gfp) > { > struct folio *folio; > + unsigned int min_order = mapping_min_folio_order(mapping); > + unsigned int min_nrpages = mapping_min_folio_nrpages(mapping); > + > + index = round_down(index, min_nrpages); > > repeat: > folio = filemap_get_entry(mapping, index); > @@ -1886,7 +1896,7 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, > folio_wait_stable(folio); > no_page: > if (!folio && (fgp_flags & FGP_CREAT)) { > - unsigned order = FGF_GET_ORDER(fgp_flags); > + unsigned int order = max(min_order, FGF_GET_ORDER(fgp_flags)); > int err; > > if ((fgp_flags & FGP_WRITE) && mapping_can_writeback(mapping)) > @@ -1914,8 +1924,13 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, > err = -ENOMEM; > if (order == 1) > order = 0; > + if (order < min_order) > + order = min_order; > if (order > 0) > alloc_gfp |= __GFP_NORETRY | __GFP_NOWARN; > + > + VM_BUG_ON(index & ((1UL << order) - 1)); > + > folio = filemap_alloc_folio(alloc_gfp, order); > if (!folio) > continue; > @@ -1929,7 +1944,7 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, > break; > folio_put(folio); > folio = NULL; > - } while (order-- > 0); > + } while (order-- > min_order); > > if (err == -EEXIST) > goto repeat; > @@ -2424,7 +2439,8 @@ static int filemap_create_folio(struct file *file, > struct folio *folio; > int error; > > - folio = filemap_alloc_folio(mapping_gfp_mask(mapping), 0); > + folio = filemap_alloc_folio(mapping_gfp_mask(mapping), > + mapping_min_folio_order(mapping)); > if (!folio) > return -ENOMEM; > > @@ -3682,7 +3698,8 @@ static struct folio *do_read_cache_folio(struct address_space *mapping, > repeat: > folio = filemap_get_folio(mapping, index); > if (IS_ERR(folio)) { > - folio = filemap_alloc_folio(gfp, 0); > + folio = filemap_alloc_folio(gfp, > + mapping_min_folio_order(mapping)); > if (!folio) > return ERR_PTR(-ENOMEM); > err = filemap_add_folio(mapping, folio, index, gfp); > -- > 2.43.0 > >