Received-SPF: pass (google.com: domain of linux-kernel+bounces-153570-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: John Garry <john.g.garry@oracle.com>
To: axboe@kernel.dk, brauner@kernel.org, djwong@kernel.org,
        viro@zeniv.linux.org.uk, jack@suse.cz, akpm@linux-foundation.org,
        willy@infradead.org, dchinner@redhat.com, tytso@mit.edu, hch@lst.de,
        martin.petersen@oracle.com, nilay@linux.ibm.com, ritesh.list@gmail.com,
        mcgrof@kernel.org
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        linux-mm@kvack.org, ojaswin@linux.ibm.com, p.raghav@samsung.com,
        jbongio@google.com, okiselev@amazon.com,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC 2/7] filemap: Change mapping_set_folio_min_order() -> mapping_set_folio_orders()
Date: Mon, 22 Apr 2024 14:39:18 +0000
Message-Id: <20240422143923.3927601-3-john.g.garry@oracle.com>
In-Reply-To: <20240422143923.3927601-1-john.g.garry@oracle.com>
References: <20240422143923.3927601-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?PyLHnOJ6D8Fq+4GiQZRAmZTEc8KeLLYMnevYl9z13ck2eidLMQKW2dqW4Og1?=
 =?us-ascii?Q?AqkO7Wkl59vNG4u7k3c35Yjs0YTihb3skka5IIwUKjCb3qtOEo4uEDly1dBA?=
 =?us-ascii?Q?vZF4PuXN7xlWIcQiHBM+Y6rWzN/wW2kcnss7CriEm0QVwX1QR56etD/KYx5W?=
 =?us-ascii?Q?v0HYZU8q5gLYvL3gqg88mIUQ+pZkm+3mG21SgEZn/1mxFpAiG5DSwRUr1bd/?=
 =?us-ascii?Q?Xy3AEZxreEWGSEtVspS46vKmLSyxTW8rxj1Ozo86KJoawZ9EXeXD60GTnWiA?=
 =?us-ascii?Q?4OS/6lg7A3/A3jYSLQGXgOzctn45KK8AoNpmKjQav4qiyzmT1HnkR+59VVCv?=
 =?us-ascii?Q?IpfLycNhS+snavIOAsUxoH7O7/5tY8F/bygd4q1IO9nxrw5fSfKH+gtYPD/s?=
 =?us-ascii?Q?ovMYcAkSxdmULzJYS9gy5Lbj3rO6hNmVzR7MNaSi6UzL+Fk+CC3zx6bxk6Pr?=
 =?us-ascii?Q?nkqfBz8Uoay8Hb0+MOTs4UxEceii6XswSrdeq7vzdhAMirXU/RyiF0LLqTtT?=
 =?us-ascii?Q?zg1u6KWdUsVPOJKFC6PKye/5ZluAVIORgMu2e/3GxpTsLBlRzq6qfnDiP4MV?=
 =?us-ascii?Q?1xAeUWP1FI1liRLPId+aNP4E9WULSLa1jRDofmiBuCNNO2eGQ9pqzbsbYOrh?=
 =?us-ascii?Q?RadSaa93TGe5oIwkJTUnvvE01BnhWFB/yukn//IOcqt6YNsQZFOrVK3B4TwW?=
 =?us-ascii?Q?1DNp08vgjH1ZMhirV7GGmAzDctzFa/ozENxWwHNtF2BRI3FLB5uJm37cMTOc?=
 =?us-ascii?Q?/Qwy4oabvJjx8ydzKN90UakznEo4fdy6DSSKj2Ue/Zgo4ICqykIRcoLWivQY?=
 =?us-ascii?Q?1sxZTn6u9naqLWaMu11FIfq8rGoZ2ukt9Cj0+Sdwp6vBy3GpnJ2MHFnsbzUX?=
 =?us-ascii?Q?huLWwRFSWw21/Hx73zPgxtVPEWY+B2RPN3+P5/WacqyBjQBrKHPGdT2hXSos?=
 =?us-ascii?Q?3K/IKnuAyWmWi0GH2MfooHAz/cjSrm6KXZauRl/BACyAONObt7K9RnNBkNio?=
 =?us-ascii?Q?/UXCtBbPEQF6QOUlCftlQ5ui5ILx0C9w+F5zlu02Shq5oEv0BRUBx91IJqtJ?=
 =?us-ascii?Q?YHH3dX6d+oOCxZ0qq6Eqe5FBIcHjHHl2PvzAxFdXEB25Dc5I6rY7T9lwyJii?=
 =?us-ascii?Q?COKzg/Pg69Dx3nJBNGLFpG0kSBoEKvEmH6FV9YjJGnDhbbDOkKCGvu9o4R0u?=
 =?us-ascii?Q?o/U2YEOYM5JZENccSt+EnAzPu732ypieYur0yXGxSJgDXnxImsJKDzdQqGFf?=
 =?us-ascii?Q?S6gKIF14sYjDMAP3fpa6QhNqEi6tY48ogm4sEHM69xeTvnjFYezTiCluH4Yj?=
 =?us-ascii?Q?oCPLtAMuvUsyhS/H65ZRy0y01+0ggnB8ySWxjSuM82rtUn7q7Bsbbzs5BaQY?=
 =?us-ascii?Q?5Ju7R3gCtmIT2mLLVxIeo73saR6OO550X5iGOFuhfp1B3QfQ1hBTIMXfANFb?=
 =?us-ascii?Q?mHM4r0Dn5xAxjt2NJFVHUe3E1w5ie5t8IzH/L5xa1AIcCP2MqVQBD2mehSOX?=
 =?us-ascii?Q?XIchly5toekjM/0rFs2bL5tebhyLHq441Almw9U04kKxeZbwGDCy9Dzh7HFi?=
 =?us-ascii?Q?10nyPs+Ke6njL6BmSSQx84L08zjWwEQDaUzdOMwir39c6IponjFKN8GSSP36?=
 =?us-ascii?Q?MQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	pXJby91Cr/XZ1zSVpDgbxDPU7hOig02/ZEAI6CZ1wTthpbZK6EvsqXygsFIN5LSOnJaV32UzFPcY83EUzRLU9YN18GXPVx3/BPMi5OXH39y0it9nm6gIEal6z+5xEkJzEosGTJx3wThT6Ji9bk38vOMh8ellnj7ECuGy4eJlCTCLhCEsltNTAr+fhgH1mNVwlalZwOtBloCGvxNSuRmMVhhjHh1XC/wO2kOOVL7W5T4b9W/rqa8ilTnwdZ36OUSaFvUJ83GAL6cmdwLvNPyphHf1scH5ibUHiXPuO7E1tzpEr/87QpjkviT66dOfTTfGZkxA9dRByKN8JQaRXyIhJdbB0UfAbFE9EL/jF4OxZkyR8QMAaqI1pkPX2ujRqx/ok/VL/ZwZ+zzgYh/iR80WX8S1ln5ZGhzMBx8v8N6s8t6yCjeYDMgbO6MV8xIe298Goa6ehgIZSqAPCerzXubqFCZ8oVf2m/yNur6CgM2kT0hPGaU0Dtblm8iznRHw0bSuiK7HBYv1AKq3QjU3RDylsdhxBuq+2Z8UBACovVZozghORQA3XpZUwwGSwblPYK8MlJqpGU7pLZXoen5MI7HdV2SNxQl3dAxe/4G/02WEOeI=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4e76b849-5a74-4017-07f1-08dc62da2121
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2024 14:40:17.9314
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ML4EbKXfKp4HiekFkBo2oJzs1royAEBnQSPMJqDeHqaOLeinDfgfOgy2qhyyOLiH/45jXX+K0+q9/vUdO5muYQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5039
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-04-22_09,2024-04-22_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 spamscore=0
 bulkscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000
 definitions=main-2404220063
X-Proofpoint-GUID: kzUEw02_L7fTn2fN7F-S2VY4mSS_MU6l
X-Proofpoint-ORIG-GUID: kzUEw02_L7fTn2fN7F-S2VY4mSS_MU6l

Borrowed from:

https://lore.kernel.org/linux-fsdevel/20240213093713.1753368-2-kernel@pankajraghav.com/
(credit given in due course)

We will need to be able to only use a single folio order for buffered
atomic writes, so allow the mapping folio order min and max be set.

We still have the restriction of not being able to support order-1
folios - it will be required to lift this limit at some stage.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 fs/xfs/xfs_icache.c     | 10 ++++++----
 include/linux/pagemap.h | 20 +++++++++++++-------
 mm/filemap.c            |  8 +++++++-
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 8fb5cf0f5a09..6186887bd6ff 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -89,8 +89,9 @@ xfs_inode_alloc(
 	/* VFS doesn't initialise i_mode or i_state! */
 	VFS_I(ip)->i_mode = 0;
 	VFS_I(ip)->i_state = 0;
-	mapping_set_folio_min_order(VFS_I(ip)->i_mapping,
-				    M_IGEO(mp)->min_folio_order);
+	mapping_set_folio_orders(VFS_I(ip)->i_mapping,
+				    M_IGEO(mp)->min_folio_order,
+				    MAX_PAGECACHE_ORDER);
 
 	XFS_STATS_INC(mp, vn_active);
 	ASSERT(atomic_read(&ip->i_pincount) == 0);
@@ -325,8 +326,9 @@ xfs_reinit_inode(
 	inode->i_rdev = dev;
 	inode->i_uid = uid;
 	inode->i_gid = gid;
-	mapping_set_folio_min_order(inode->i_mapping,
-				    M_IGEO(mp)->min_folio_order);
+	mapping_set_folio_orders(inode->i_mapping,
+				    M_IGEO(mp)->min_folio_order,
+				    MAX_PAGECACHE_ORDER);
 	return error;
 }
 
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index fc8eb9c94e9c..c22455fa28a1 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -363,9 +363,10 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)
 #endif
 
 /*
- * mapping_set_folio_min_order() - Set the minimum folio order
+ * mapping_set_folio_orders() - Set the minimum and max folio order
  * @mapping: The address_space.
  * @min: Minimum folio order (between 0-MAX_PAGECACHE_ORDER inclusive).
+ * @max: Maximum folio order (between 0-MAX_PAGECACHE_ORDER inclusive).
  *
  * The filesystem should call this function in its inode constructor to
  * indicate which base size of folio the VFS can use to cache the contents
@@ -376,15 +377,20 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)
  * Context: This should not be called while the inode is active as it
  * is non-atomic.
  */
-static inline void mapping_set_folio_min_order(struct address_space *mapping,
-					       unsigned int min)
+
+static inline void mapping_set_folio_orders(struct address_space *mapping,
+					    unsigned int min, unsigned int max)
 {
-	if (min > MAX_PAGECACHE_ORDER)
-		min = MAX_PAGECACHE_ORDER;
+	if (min == 1)
+		min = 2;
+	if (max < min)
+		max = min;
+	if (max > MAX_PAGECACHE_ORDER)
+		max = MAX_PAGECACHE_ORDER;
 
 	mapping->flags = (mapping->flags & ~AS_FOLIO_ORDER_MASK) |
 			 (min << AS_FOLIO_ORDER_MIN) |
-			 (MAX_PAGECACHE_ORDER << AS_FOLIO_ORDER_MAX);
+			 (max << AS_FOLIO_ORDER_MAX);
 }
 
 /**
@@ -400,7 +406,7 @@ static inline void mapping_set_folio_min_order(struct address_space *mapping,
  */
 static inline void mapping_set_large_folios(struct address_space *mapping)
 {
-	mapping_set_folio_min_order(mapping, 0);
+	mapping_set_folio_orders(mapping, 0, MAX_PAGECACHE_ORDER);
 }
 
 static inline unsigned int mapping_max_folio_order(struct address_space *mapping)
diff --git a/mm/filemap.c b/mm/filemap.c
index d81530b0aac0..d5effe50ddcb 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1898,9 +1898,15 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index,
 no_page:
 	if (!folio && (fgp_flags & FGP_CREAT)) {
 		unsigned int min_order = mapping_min_folio_order(mapping);
-		unsigned int order = max(min_order, FGF_GET_ORDER(fgp_flags));
+		unsigned int max_order = mapping_max_folio_order(mapping);
+		unsigned int order = FGF_GET_ORDER(fgp_flags);
 		int err;
 
+		if (order > max_order)
+			order = max_order;
+		else if (order < min_order)
+			order = max_order;
+
 		index = mapping_align_start_index(mapping, index);
 
 		if ((fgp_flags & FGP_WRITE) && mapping_can_writeback(mapping))
-- 
2.31.1