Received-SPF: pass (google.com: domain of linux-kernel+bounces-162792-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: John Garry <john.g.garry@oracle.com>
To: david@fromorbit.com, djwong@kernel.org, hch@lst.de,
        viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz,
        chandan.babu@oracle.com, willy@infradead.org
Cc: axboe@kernel.dk, martin.petersen@oracle.com, linux-kernel@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, tytso@mit.edu, jbongio@google.com,
        ojaswin@linux.ibm.com, ritesh.list@gmail.com, mcgrof@kernel.org,
        p.raghav@samsung.com, linux-xfs@vger.kernel.org,
        catherine.hoang@oracle.com, Dave Chinner <dchinner@redhat.com>,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH v3 07/21] fs: xfs: align args->minlen for forced allocation alignment
Date: Mon, 29 Apr 2024 17:47:32 +0000
Message-Id: <20240429174746.2132161-8-john.g.garry@oracle.com>
In-Reply-To: <20240429174746.2132161-1-john.g.garry@oracle.com>
References: <20240429174746.2132161-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?xpvBzAsBMysZ9hGw3MUB1wZAS/0WfCybnt39PgqMRgmEBLBGPilektonXDCp?=
 =?us-ascii?Q?mp0BS4hnZ1JGM7Ksrzt8Bdd5KWZy9wAdEegkbs/kftwGr54/dazg8HPD6Cwx?=
 =?us-ascii?Q?ob6JOUKAR36hl9Puy7/lQbK8N/aWqwiPtLP+i6hXAnFRnZBs+ah50iuhBrdV?=
 =?us-ascii?Q?2ZWaya2LX4nAExTKLHLm4Irjt9t2ylxymlxNMi03ftVNLOiMCS1b68+VPM2D?=
 =?us-ascii?Q?omJ4QXn66kOkVTRGpmNs25NaMTrG8G2XjIFABswS0vtS/KUVMenGOj2MgYuS?=
 =?us-ascii?Q?pM0fyMRIHWX7on+nWsc/BTx1V9hYgzgsLiTRin7/jL9W3FjlgjuQK/nr1+5D?=
 =?us-ascii?Q?LGLPBnvHoC78QojKl1f79/M4DxLpBG69/u0Zv+FL7OT4rYJSmKb/sNKt3S4c?=
 =?us-ascii?Q?QOHdDVvpM058J9bondRjv7xRhGcFngj7Pfa72fRLl3mMptZF6agYRtbZO5tt?=
 =?us-ascii?Q?ke9rrKj1JSp65NtWWHZbg9Ny3FmVvMqfYmNyQDGh0Mf1SCEYzmuvyzYETIWc?=
 =?us-ascii?Q?WIrBiMG4iVxggBkv96t0fGDzbyugkAETFHTUzMLqrsxSzhFOiCVExrcdPAXf?=
 =?us-ascii?Q?N5QUXhwWt5Ztr7gZOI26YXvlcYCN9oHJTK5o1UxrjXLvpTDLUok70PycLxk5?=
 =?us-ascii?Q?ZzZr0Ohrf75km+T8QP3CFkOeNs3R1VotbFgcJf3WsZsubOEHzfWOVTmqeoYF?=
 =?us-ascii?Q?AeBgCsUdw8y4Z2yYMOwHWsCQ/EiODl/fWYD6mYGd3qOusb3qUPmucgiEgQto?=
 =?us-ascii?Q?vwbbHxz3qzn2QMWIqA1MTACIOR5D/jwVGXSaLO4+nBULvK28jzs8+VFcbFiX?=
 =?us-ascii?Q?+W7+nh/l+Mmd3BsxFTxqED724qaLE3M8Bvv7S8/F7N1it+q1dgNugDWqUEas?=
 =?us-ascii?Q?bC7oxUbpk+ofF8C7s9sTu7o+0tsKyCi10Sq6ytr/o4ldOH+Jv9HbVssiDDro?=
 =?us-ascii?Q?uGGfsjJDzN2bCyrG5h25HKUMG6D9L0WRH/JGbzDW2H/ZJS1SeQVwKvMoPmfw?=
 =?us-ascii?Q?YGPk5jQ1jW8IXcxQgoDqBX+yAKXiwz95Ju+v2cYGEDTih9OWAqUXD7RELkkN?=
 =?us-ascii?Q?Jv2vydf018CpIBnOw3ZPjiB5ZVTjClAxtfnRDuXq3R3HLwdmJqsddOTWi3vf?=
 =?us-ascii?Q?9C9gxAO4XIMvojLuxyWGuFngoyDZ78fZjytxCGPf8XSaTLgQqdIPGZlf+m98?=
 =?us-ascii?Q?01s2jwUQxALP9gA6YyxWKXF/pKXlvELIO2nE+1jTr571yHg0WTF3qAtsrm9L?=
 =?us-ascii?Q?/P+m1+r6teywDetnNrfamz9Ax0LHFA63JWR/7+fhA9+ruGSPEEldCXNRlpWd?=
 =?us-ascii?Q?S+rvhGGRGKw61KnM+KYAInQgyiunOrVcIE5QdYZxDSITSXPEENIsnCQ9z/YZ?=
 =?us-ascii?Q?AO/TaS4kbJIIp6ji0mk1iizfe474Ik3FWZ1CWdCl6XA5sPjLt2KJM2v6UGPa?=
 =?us-ascii?Q?D1PcqFEqWsSpTXHrVmrL7HWBn9YPS2fRB5BMcgIfxJ5d8Hu2/C4IfCfjwjeZ?=
 =?us-ascii?Q?nbEj9jIYie+tWGDcYYiXfXGLhd3K5riUcuDDitGSExRMG8ErkxoSPJVql19n?=
 =?us-ascii?Q?R3uVweKfuuu+gqBiC7BcpQBacPshy94YwLKvX4xSpdXKT0x5UbOBAgT0U5Ho?=
 =?us-ascii?Q?cQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	h80BBX1JA59y475haG+QjYIo8g9CyMAMgHWMKtvaeMimwPLdYbNGCO/e60lApBF9x7hSbHwqVEaIMG5rbvJigu5F+EyE2OzItlkhxdqd2nLJwM5zwzSGkFV+zegz/1Cu9KNVXQgHGy3kBJVAadZ8rosgO/Da5MNAmLILfpU4ovfGP0MV2Q0kgkgD9hBYkAA3I2Hx9wcv/tBbs5+YDG7f9Vld1tCGE3Coo20YydFH4gpq9iZz8Dujfptudlmu+LSkIeLLAOVY2G+dbP63s0JFiNyecbHG29UrAheDqt/OfPxA6mCDGP72gS9U5Z0HDc+0oaWhQ7xEymG94q8vbrdKMoAA3wd7fILvt5FlOpcC5zDoZiz4e7mXnaf+d+/q8BF+OC3BmjCoCVvFAVYQeSA3rxLcFMlP85FQypqAt2HH6Ui2ScXOKc11t2WoZXXJGVSexcRsEK/9sj4p9sVs9nT5/ot0kahvy1fAF5RhDdwWUMHNalc5dR8Fy1UXSKXEOvz7Z97Qf3hE1GpID+9sNASdeIEdaP46CyHeqN/6ML/be/dngc5QiJ6YfPBTUa5VDEhqjv/eYi3+/4XJR+wOiu3gSSadCOeU9fHewP0ym6JY5G4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ecf9de87-da57-4292-4a13-08dc68748e9b
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 17:48:19.9236
 (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: lUCTNjwceTj9JKt9Pi1DDhWExQfzN6Un1LcGgwX0TV04rsmUiUJAf+IA3/Aa2+HaTChHiE1sO5FzgMmc3sDfpg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6389
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-04-29_15,2024-04-29_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 phishscore=0 bulkscore=0 malwarescore=0 spamscore=0 mlxscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2404010000 definitions=main-2404290115
X-Proofpoint-GUID: LiRcRaZnlLnuWjnpsNyfzO4hfB0S1M_4
X-Proofpoint-ORIG-GUID: LiRcRaZnlLnuWjnpsNyfzO4hfB0S1M_4

From: Dave Chinner <dchinner@redhat.com>

If args->minlen is not aligned to the constraints of forced
alignment, we may do minlen allocations that are not aligned when we
approach ENOSPC. Avoid this by always aligning args->minlen
appropriately. If alignment of minlen results in a value smaller
than the alignment constraint, fail the allocation immediately.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 fs/xfs/libxfs/xfs_bmap.c | 45 +++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 7a0ef0900097..4f39a43d78a7 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -3288,33 +3288,48 @@ xfs_bmap_longest_free_extent(
 	return 0;
 }
 
-static xfs_extlen_t
+static int
 xfs_bmap_select_minlen(
 	struct xfs_bmalloca	*ap,
 	struct xfs_alloc_arg	*args,
 	xfs_extlen_t		blen)
 {
-
 	/* Adjust best length for extent start alignment. */
 	if (blen > args->alignment)
 		blen -= args->alignment;
 
 	/*
 	 * Since we used XFS_ALLOC_FLAG_TRYLOCK in _longest_free_extent(), it is
-	 * possible that there is enough contiguous free space for this request.
+	 * possible that there is enough contiguous free space for this request
+	 * even if best length is less that the minimum length we need.
+	 *
+	 * If the best length won't satisfy the maximum length we requested,
+	 * then use it as the minimum length so we get as large an allocation
+	 * as possible.
 	 */
 	if (blen < ap->minlen)
-		return ap->minlen;
+		blen = ap->minlen;
+	else if (blen > args->maxlen)
+		blen = args->maxlen;
 
 	/*
-	 * If the best seen length is less than the request length,
-	 * use the best as the minimum, otherwise we've got the maxlen we
-	 * were asked for.
+	 * If we have alignment constraints, round the minlen down to match the
+	 * constraint so that alignment will be attempted. This may reduce the
+	 * allocation to smaller than was requested, so clamp the minimum to
+	 * ap->minlen to allow unaligned allocation to succeed. If we are forced
+	 * to align the allocation, return ENOSPC at this point because we don't
+	 * have enough contiguous free space to guarantee aligned allocation.
 	 */
-	if (blen < args->maxlen)
-		return blen;
-	return args->maxlen;
-
+	if (args->alignment > 1) {
+		blen = rounddown(blen, args->alignment);
+		if (blen < ap->minlen) {
+			if (args->datatype & XFS_ALLOC_FORCEALIGN)
+				return -ENOSPC;
+			blen = ap->minlen;
+		}
+	}
+	args->minlen = blen;
+	return 0;
 }
 
 static int
@@ -3350,8 +3365,7 @@ xfs_bmap_btalloc_select_lengths(
 	if (pag)
 		xfs_perag_rele(pag);
 
-	args->minlen = xfs_bmap_select_minlen(ap, args, blen);
-	return error;
+	return xfs_bmap_select_minlen(ap, args, blen);
 }
 
 /* Update all inode and quota accounting for the allocation we just did. */
@@ -3671,7 +3685,10 @@ xfs_bmap_btalloc_filestreams(
 		goto out_low_space;
 	}
 
-	args->minlen = xfs_bmap_select_minlen(ap, args, blen);
+	error = xfs_bmap_select_minlen(ap, args, blen);
+	if (error)
+		goto out_low_space;
+
 	if (ap->aeof && ap->offset)
 		error = xfs_bmap_btalloc_at_eof(ap, args);
 
-- 
2.31.1