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 105F7C41513 for ; Thu, 25 Apr 2024 11:38:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BFB76B008C; Thu, 25 Apr 2024 07:38:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76F996B0092; Thu, 25 Apr 2024 07:38:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6191A6B0093; Thu, 25 Apr 2024 07:38:09 -0400 (EDT) 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 3F8966B008C for ; Thu, 25 Apr 2024 07:38:09 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 536B3C110B for ; Thu, 25 Apr 2024 11:38:08 +0000 (UTC) X-FDA: 82047855456.27.0802BC7 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by imf12.hostedemail.com (Postfix) with ESMTP id 8215440020 for ; Thu, 25 Apr 2024 11:38:06 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=IbZsSndT; spf=pass (imf12.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.171 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=1714045086; 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=T9CNQJJ+RDd4FbmtOqOiANGvF7RbcOwG9CdTM2mS7kM=; b=4/LOTd3xg+j2SASGckN8FVpcLYmkOLkQOaRc4jUsSw3m+eVeAobAaVLPnCaGgxNDq91/jE YiLr+S4Yrj3wCs+FhSQLxWE558X1l5rLsoiA4IlC7LyUx7+FziVcaNXylGmq22ZtcXj+GO qHJ8L4Q8dyqgdz8NNxaVXY7di7iihbY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714045086; a=rsa-sha256; cv=none; b=1dMxmAfirzmJe2Igh222e5w7G2QfstW9LXfnhLxY0gvBqqsgNAIDPQq4lwpOS5iLDogO2U sj1L6pdRQyL9sg1EBeuvvfLNw19Ixk2o2NZfbjW/nsOGnYCLqjXfrsPUNSP045B1/BVczh Knf//L1UlRrhW4FVvDBmaCryveYpDeg= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=IbZsSndT; spf=pass (imf12.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=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-201.mailbox.org (Postfix) with ESMTPS id 4VQDPQ5Ddmz9sq8; Thu, 25 Apr 2024 13:38:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1714045082; 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=T9CNQJJ+RDd4FbmtOqOiANGvF7RbcOwG9CdTM2mS7kM=; b=IbZsSndTyjSN9Xvee5cogqDuOzoH7J5rrFIQ6UKdtFgvT8kfUaS4NCsKR6pdUflcFhY+IL rdR3OapoPksLXIHK3tNiyZpOyqiEqtWGnbaswUp+WAiMm1rFPbaE5zURR9DfVAMKc++bDw 4o57Fmk7KHpUiaO2T2bLAqVgmEzDdPoI8pL2hJvt5q/tGrx7uunvyav8xgHW4Vg4WuF/e0 qTjTR04yN8FJACQx/f2zQahXWeVheOqgl5as1hKzkWgJEk7b07HGDk5I35ENUwaKwIW5fK 3jrQnR4geUlY588+NJV3eRUG/y67FNc5roYN3PobZqp1uroWXTQQySDk+MEHyA== 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 03/11] filemap: allocate mapping_min_order folios in the page cache Date: Thu, 25 Apr 2024 13:37:38 +0200 Message-Id: <20240425113746.335530-4-kernel@pankajraghav.com> In-Reply-To: <20240425113746.335530-1-kernel@pankajraghav.com> References: <20240425113746.335530-1-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8215440020 X-Rspam-User: X-Stat-Signature: heopefeph1kksu3dihg9yhddcmy4gn84 X-HE-Tag: 1714045086-456603 X-HE-Meta: U2FsdGVkX1/UAq3YvZuH2dsizh4Ws7DZSxamAPiUvsJYUzTLzYYkgFRp8hMAd9Biq2DaJPIx4k2sPjK6M8ZvL13/K2MYTA1KYiwGITnT+XIK4/GeSMf+NksoS73gp+CeHiknVaUOlr/uFirkQCYgrLcQPLJd1ZgS//8l9+5yC0N1oL5Z9o2WVrUyIao1tR3LRNJw5jRVL8x5X0YdfD99n07f7kgC5lTh4qcnN2Inl2UR/aqFtZmm3seIimu8F9M/dxlOzWcOuwKvYhAoM1WB3FKg4DYsOkRdmY2cHPAjV4ptKxYYQnErvQzvNMzPi8ErzfoLi/p+ok79QYrmZcS/OCg9bQL9Azwin7VqIuWbjSh8S9YLhy3VO92Q/+c8nJ0AI+bNAOhbMR744dI+PL4s+437IqGIWeVFXDTyiEYKI9buMjm8PrvsxJih8mJYnpzxC4LitUeUD8DtLmOT9KNR80FFXR8nWY8rPlD/OtAVa9ONR6k+yozQRNiky2BCoeft0hhlb3zFbJ5vGfTjbYDMW6PZic6ofn6tOGsWLOJSbbxzvtvXT2ITyvuESRKtCM7YNpT8zCJ/JHfXDbYYLA21iW4fgHXakQlcj8+m7yuigq2rIkB+s8iymZi92lWnpxuBWk9JdmjRashVONNSeZB5hffNaWCZfKQJ95/KFuUX1Si2qjcSk0rGHXBjgjgt5uQCUrzuRdfW0AZvaFMNIauxAzQ9Wn4rBFKD7bzbV6+o9fyUe19oW984M15OHKor2+rNlHUct+KdT/lG5+EDTtKzJ15/BbBBdbXAF/8xp1DQ8aeqUW0uSUg9FJpeR2QimFdMG5accWdIesD6eaLprIafMJS/6zAlCNKJP8InyFfpb01++K7vDJeKRxylDDJugQW6bCt78b8RYYB3sjuPjoxXulO6oXKHleRlmXOEZVo6E8scnJUyap1q5xE4wNPGxHN1kI0LzWZqIFjxw+fVrZp rB+1ljSh VC4x7C++Ez4RNNVeg2mJ+safm9QnJdGCbUtFWMnl/95YyL3nnYJB+xm4wPXkW+L6Wz0Moyn8lmBolwf4kLbQ1dLpZEStio7TL4jFKHDlMXgS3Bj4bpOLjNKpdQD+tIYkj5hI/hR73SLSxs2n7kgqd2OQoFcBud4fHJsp/n/j5/P1PL9eYqVNsUin0pumwhdSSJ4d8ct9geYvd3J8pM4zTHvXQhBdWDdKgy+xIyqye0unUO2P9A7Z9/eEvZshoQcm5wNwRf0gtPp+FJY7nQTZuBYXokSg6pDVjfVi7rFeuSHEYcM/oNEHycNA4tg== 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: Luis Chamberlain 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. Signed-off-by: Luis Chamberlain Co-developed-by: Pankaj Raghav Signed-off-by: Pankaj Raghav --- mm/filemap.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 30de18c4fd28..f0c0cfbbd134 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -858,6 +858,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); if (!huge) { @@ -1895,8 +1897,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_start_index(mapping, index); if ((fgp_flags & FGP_WRITE) && mapping_can_writeback(mapping)) gfp |= __GFP_WRITE; @@ -1936,7 +1940,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; @@ -2425,13 +2429,16 @@ 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; @@ -2449,6 +2456,8 @@ static int filemap_create_folio(struct file *file, * well to keep locking rules simple. */ filemap_invalidate_lock_shared(mapping); + /* index in PAGE units but aligned to min_order number of pages. */ + index = (pos >> (PAGE_SHIFT + min_order)) << min_order; error = filemap_add_folio(mapping, folio, index, mapping_gfp_constraint(mapping, GFP_KERNEL)); if (error == -EEXIST) @@ -2509,8 +2518,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; @@ -3708,9 +3716,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_start_index(mapping, index); err = filemap_add_folio(mapping, folio, index, gfp); if (unlikely(err)) { folio_put(folio); -- 2.34.1