From patchwork Tue Jun 25 11:44:12 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: 13710921 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 2A01AC2BBCA for ; Tue, 25 Jun 2024 11:44:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A695D6B02EA; Tue, 25 Jun 2024 07:44:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A17EA6B02EB; Tue, 25 Jun 2024 07:44:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81A2C6B02EC; Tue, 25 Jun 2024 07:44:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 61BB86B02EA for ; Tue, 25 Jun 2024 07:44:38 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CA7AF1A1562 for ; Tue, 25 Jun 2024 11:44:37 +0000 (UTC) X-FDA: 82269228594.05.0577026 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf27.hostedemail.com (Postfix) with ESMTP id 050BE40016 for ; Tue, 25 Jun 2024 11:44:35 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=toaP98b4; spf=pass (imf27.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=1719315868; 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=4YLF87QSX6js20i4xQuuldtKlYWhaWvZZz7QN4gKPUI=; b=uD9Q+uWwuFHLAJYiPoEK+Njels660CCgxLIUxBYvEiLPBWVdnoYMr9kaBYEsxOJGmbzo6y k6VtLfNIDhR6Ql34zyX4ttDarrW1FACB++Jdge1CE1R5DwNDSyCNNclrUNZCw+7LnWR1WH u36naHm8OpXU4mEHPed1NVPToYnJbCA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=toaP98b4; spf=pass (imf27.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719315868; a=rsa-sha256; cv=none; b=mEXOGu8I1E1sFAoTuluM6Wd4nZL9gMdryfGSJT218dmSF0MV6tvn7MJQl5cxdcWN4nEALR uZXM4kNABBFH1uJAaw0gKSNtDTwsOxqpH6jv3y820yy+VUuvrwEXjKaAf5cQttYXyeOD2q SeFbTWUI46qfCTXrBgjyt93fn81zA0U= Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::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-101.mailbox.org (Postfix) with ESMTPS id 4W7jfm6p42z9sqQ; Tue, 25 Jun 2024 13:44:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1719315873; 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=4YLF87QSX6js20i4xQuuldtKlYWhaWvZZz7QN4gKPUI=; b=toaP98b41Fak13ssMmY1Kynhd1esE1uDjnxwiBXPi3ixvvTb4HZEBkDJVthCDWzBqW1ov/ uc9wcBwwaA+xeo6oKM7j0NgbH+s/qwxrgzqoIGyZI5v9GumxkWXk6xZm6MoujS1geKjVFq ZREGbQvyyPTtQ4qPEVUkzM9cXpmPvsZV5Lboq/U6fPQZKOLTxzBezjC51DSpd0/BZbQafF nYxVrvpbZw6hMaN/ra0AIcAc67zBTlASbbdXtnbl5Vx2F6kzSqkS45u8IdM+pGAtskfpbI B8MTVcXgmBUlaHDu4VK4pV23ZVnCFycKYEfs+DUmbPQ3X0f4EdHpteLEZzbdHg== From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, willy@infradead.org, chandan.babu@oracle.com, djwong@kernel.org, brauner@kernel.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, linux-mm@kvack.org, john.g.garry@oracle.com, linux-fsdevel@vger.kernel.org, hare@suse.de, p.raghav@samsung.com, mcgrof@kernel.org, gost.dev@samsung.com, cl@os.amperecomputing.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, Zi Yan Subject: [PATCH v8 02/10] filemap: allocate mapping_min_order folios in the page cache Date: Tue, 25 Jun 2024 11:44:12 +0000 Message-ID: <20240625114420.719014-3-kernel@pankajraghav.com> In-Reply-To: <20240625114420.719014-1-kernel@pankajraghav.com> References: <20240625114420.719014-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 050BE40016 X-Stat-Signature: 9nao9yqyr7pghzebnccjopyqkirb9p5c X-Rspam-User: X-HE-Tag: 1719315875-222051 X-HE-Meta: U2FsdGVkX1+W5Ss6lgrG3WZDJCqHEr83iJQpe9HbWhtXm6Qo+yoxsYmWCec8msZYVE020GaSbfGhTOyZT6ftL7yLoYwSx640nCf+f+7F2S//mMFoOxGH4YHPbbazyCsD4njSckqFDiHgv94essAxqxpXOvjv77fevPdWXMZ2XXDfE+2KhNbaC6wVGhGpYDTlNxL3/78snTx1u2DIHTkRzLI8UJ30oXVhrAVd/TwVl2Qq3NR7lstz00RA2vRrgVqpCkw32Ew6n7XxERaZo7yW4vC1wLJ5URZxfH1YNrJjyt8B+8hQKqrMipSAU5TdqlmCnA1FAQdvBr0e8VfFRtSmXhGzQnBOkhlYOkKAaIvCmqcA/q5gOVuBzck8EpnkzRdVFOiKBLaVBCMuZJ7E40yIGXyyuIea4wT4fmAnOB5zCUQg29JA2omwIIwkdzr9I3GH4w0xoFNqmR1ZxpN6DzF6DNUn/YQ8GEwNTi4pgG/K/XiM/v1Q9MCqp5OJirwW6Ly0HVMBCrXChaID2evY+m6aWXgA8RK489U4vHSGfh188h8Tnv29oCsrka9zBYIBhkrOImQi7XbKYNnnfOe+lGoZzaTFhVOz5dWW9wNzmzyzHT0yZn/TawiJvyWXejf0yHRr1wQS5ltmwcsj37GA/I4RsICOLpLOe7W0UaSsDMmTD0letNLSCC/BkKcWCrvDwn2tFShrctKasoRdMYp05FZp8KBR6GBtFx3p57IRQnsA50VRrvsj0ftLTGPt1wnwCKMlQKXPjyQT+2MHfnEqfMGHr9GDpQJs8tswiJ2ugXKeoMfbyYKFbsrqD1X+G8P41JE1XUdb9ia8LmIiSf6XPhGsp63s+EbpzAPxSmFqchCmnWiEnneBwtp5TFF/5e4vm8JLt4zbfqxQx3Xl32L8BW27tx3HXQME1YLmt6iW+inCK/gMsHoYw4VW7jpn9jNRc92SDkUYqY+whwwQzJfgFEg h76GvMSX g8YRz45jfYZkdgglPnkQeCPqbTXyTQ2orJixYBUOS+7bf2GD2gC85ZV7e52C67VwMeWDP83+1G5Qbx1aCnjLE9VjnuF2RCr4BHn2ye+H1V8JfypCxTmEAAwyIObMhuxRwUNeCi/A0YTzlk9q8/MU0mxKVlWoEDYCMpolQzblabiUw3mwnt0jO4BG5U7TRYAiq6Nshut/4OiugiYtPTXk3NqaVM+Dqzg1jgd7mb+VLNl90f7KTpERxxjK/4GeXNuz8rPyfklSfzxG0nFaTmeTsjhgdpksCK8+WvPi7br080vWUV4PdiISW4MTKy0Dq88YL/JhqrPHXjIegcqrYVMn5icTD4ChGAwSTrXpegLpshadvc/nRfdj7gITaxg== 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 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. Supporting mapping_min_order implies that we guarantee each folio in the page cache has at least an order of 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. Co-developed-by: Luis Chamberlain Signed-off-by: Luis Chamberlain Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke Reviewed-by: Darrick J. Wong Reviewed-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 23 ++++++++++++++++++++++- mm/filemap.c | 24 ++++++++++++++++-------- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0c51154cdb57..7f1355abd8a2 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -439,6 +439,27 @@ unsigned int mapping_min_folio_order(const struct address_space *mapping) return (mapping->flags & AS_FOLIO_ORDER_MIN_MASK) >> AS_FOLIO_ORDER_MIN; } +static inline +unsigned long mapping_min_folio_nrpages(struct address_space *mapping) +{ + return 1UL << mapping_min_folio_order(mapping); +} + +/** + * mapping_align_index() - Align index based on the min + * folio order of the page cache. + * @mapping: The address_space. + * + * The index of a folio must be naturally aligned. If you are adding a + * new folio to the page cache and need to know what index to give it, + * call this function. + */ +static inline pgoff_t mapping_align_index(struct address_space *mapping, + pgoff_t index) +{ + return round_down(index, mapping_min_folio_nrpages(mapping)); +} + /* * Large folio support currently depends on THP. These dependencies are * being worked on but are not yet fixed. @@ -1165,7 +1186,7 @@ static inline vm_fault_t folio_lock_or_retry(struct folio *folio, void folio_wait_bit(struct folio *folio, int bit_nr); int folio_wait_bit_killable(struct folio *folio, int bit_nr); -/* +/* * Wait for a folio to be unlocked. * * This must be called with the caller "holding" the folio, diff --git a/mm/filemap.c b/mm/filemap.c index d617c9afca51..8eafbd4a4d0c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -859,6 +859,8 @@ noinline int __filemap_add_folio(struct address_space *mapping, VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_FOLIO(folio_test_swapbacked(folio), folio); + VM_BUG_ON_FOLIO(folio_order(folio) < mapping_min_folio_order(mapping), + folio); mapping_set_update(&xas, mapping); VM_BUG_ON_FOLIO(index & (folio_nr_pages(folio) - 1), folio); @@ -1919,8 +1921,10 @@ 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 min_order = mapping_min_folio_order(mapping); + unsigned int order = max(min_order, FGF_GET_ORDER(fgp_flags)); int err; + index = mapping_align_index(mapping, index); if ((fgp_flags & FGP_WRITE) && mapping_can_writeback(mapping)) gfp |= __GFP_WRITE; @@ -1943,7 +1947,7 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, gfp_t alloc_gfp = gfp; err = -ENOMEM; - if (order > 0) + if (order > min_order) alloc_gfp |= __GFP_NORETRY | __GFP_NOWARN; folio = filemap_alloc_folio(alloc_gfp, order); if (!folio) @@ -1958,7 +1962,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; @@ -2451,13 +2455,15 @@ static int filemap_update_page(struct kiocb *iocb, } static int filemap_create_folio(struct file *file, - struct address_space *mapping, pgoff_t index, + struct address_space *mapping, loff_t pos, struct folio_batch *fbatch) { struct folio *folio; int error; + unsigned int min_order = mapping_min_folio_order(mapping); + pgoff_t index; - folio = filemap_alloc_folio(mapping_gfp_mask(mapping), 0); + folio = filemap_alloc_folio(mapping_gfp_mask(mapping), min_order); if (!folio) return -ENOMEM; @@ -2475,6 +2481,7 @@ static int filemap_create_folio(struct file *file, * well to keep locking rules simple. */ filemap_invalidate_lock_shared(mapping); + index = (pos >> (PAGE_SHIFT + min_order)) << min_order; error = filemap_add_folio(mapping, folio, index, mapping_gfp_constraint(mapping, GFP_KERNEL)); if (error == -EEXIST) @@ -2535,8 +2542,7 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count, if (!folio_batch_count(fbatch)) { if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_WAITQ)) return -EAGAIN; - err = filemap_create_folio(filp, mapping, - iocb->ki_pos >> PAGE_SHIFT, fbatch); + err = filemap_create_folio(filp, mapping, iocb->ki_pos, fbatch); if (err == AOP_TRUNCATED_PAGE) goto retry; return err; @@ -3752,9 +3758,11 @@ 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); + index = mapping_align_index(mapping, index); err = filemap_add_folio(mapping, folio, index, gfp); if (unlikely(err)) { folio_put(folio);