Received-SPF: pass (google.com: domain of linux-kernel+bounces-162782-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
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, John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC v3 11/21] xfs: Unmap blocks according to forcealign
Date: Mon, 29 Apr 2024 17:47:36 +0000
Message-Id: <20240429174746.2132161-12-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?qnUUv9ywoAOiBuQkDexybCyRK1h1H2vuU4aBL3PEZ0c58hOKD0cYLaSfKeOg?=
 =?us-ascii?Q?xczLtmRWI98A+Q1gbXXNEjXqnRX+ybUoW+v+r/1K96ShjsWwVZfvqXRk8c5K?=
 =?us-ascii?Q?+CjQqDt4VHQ44qLVXp11A6h62C48hrXV3do+9JsoIfR1+OP4IQLII0sqzDft?=
 =?us-ascii?Q?hw+eZHC7YoONSYKsU2XSX3R54KQSCTaLLVNPtgDyBfArsvgua2c2DwH6YFgf?=
 =?us-ascii?Q?zn5aF8sP5jD9fjqgdY41zSlkkZYKEQlgX1j2wVOZ7cuEsPK3J9YrTncnaGTR?=
 =?us-ascii?Q?PPXxLpi/+9Zfe4NjZMCrXKvCKMLNL14parvoKTZwB3L54f7/kmSbvigU3fyr?=
 =?us-ascii?Q?f9puiCO4foiKPfUEhDDUr4ASvg17cUEuPjRJfJSDW8mvdrWFHuyfEHm7ot58?=
 =?us-ascii?Q?07cwScKWavIeZ22eDRrtYyVw8GC1mnIMXw4thwJR98k+g44cYBxapL7Oz+2o?=
 =?us-ascii?Q?XHmtIba4mGhJ/4W9bsbDYtOzB9oo8m/JdN9IIDd5f2anIaXeN/eajyZZqdyQ?=
 =?us-ascii?Q?S5VfPpjwL6xFuJU0GXzN4tqVqKFnkyiUpOuHBFpKtwKa44h1JAl/CpoEVk3M?=
 =?us-ascii?Q?WEj3nZjdEMg1PAGo8+jFoDlcXXlyuydd7mG/EaTK6bciprUU75vt7jDR1k/h?=
 =?us-ascii?Q?DvQdJAjrmDMUCNW8gBwvooQr8MjaM5ZJTSSjXtquqAALTrnD8lq1mKIu1mv/?=
 =?us-ascii?Q?yidxVOZCmU04G8ONfdSKkKR2dhgJdbFXUT5ZDDqzCVGi7k7bI1nzFT9lUu14?=
 =?us-ascii?Q?7ZwbjwJL9jTlU3yqsercUK+Cg2dCLuevQXF7L/U2muS3NtzMISVCoiRf6Dca?=
 =?us-ascii?Q?/wBDP3u3N0YO/Q6lztvocyI2MN/Jnj6STw/RVFPuVdo2O/nzpO1mEYfwSImU?=
 =?us-ascii?Q?5sDbONy8UK7vboek3Psz8/N6hJeydHvbQ1DkTkj+m0M4JUR6rDUyJgZ/sMLI?=
 =?us-ascii?Q?UgYnYzYftglF1hh8jVESIwa4/YW/FG9FtANOKMyl4WfYUnxtYDXdMwB+R4HJ?=
 =?us-ascii?Q?Qzx+cgCoLTVYSS5tHrE5pbaEPyWc19k3FxNcWge5/wMlX533YHNWS8oPNGJ8?=
 =?us-ascii?Q?nAz6jo1p0uM0+3thJe1FQmv+Fa0Hza13EFQ+Yfva8nvqHQeTkWGQSg1/Y+Vu?=
 =?us-ascii?Q?a3HudMWKTDAFY6evuFS6D/9XMya+EhUV3o85zIQKxBhS1COGuNjRjOuxA8Is?=
 =?us-ascii?Q?Gn6+WOvd+39jnx+TVz9kbt0mnewuPKLT2C2GdWgcjuq3pQugqNsYxV/cP6rq?=
 =?us-ascii?Q?NUfMTYTC6CQLNu1L2rDoj5RrsA9eTQ8x5ik0SdUkvWp4oTwtCtMxUsxBCuTs?=
 =?us-ascii?Q?+ljLhDv9UvCDdzmD5nr4S3z/skMWVk76zdeYZwb9Ng03QGPVxCAjbVaIBqj8?=
 =?us-ascii?Q?qZKbrhEb7B0WqAQC7pkSfUw5bAt4UDXzF6lL2jFeQMFZUSooxGDBqfwbte/v?=
 =?us-ascii?Q?AtOviumVVv0QL/sz9M1RXc4fEU2jHgsriiBqOQuuEP403ltWIEDU4q+xLohO?=
 =?us-ascii?Q?+pu2aOF9f9xz7atBfFnHglmhxzTmxsrfJ/2g/VuLMoTXA9Eono2OQuvOiDPz?=
 =?us-ascii?Q?rKnbS3C4O6u4vw1nTRLhS1DENRe+bi07fLHYW4Vcu9h6DZURf/Fi4B5atoJB?=
 =?us-ascii?Q?Ew=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	HTRfjn3giintsNfyN5PIZdhEPoaip9/qKpVDbzSzMy+/UvSZvazy+FuqFmPkKDY5WHWymmTKQl67GzOvC4smMN4UTaLN9GGFNmavwoTpRgZW5CfFRNMFhoV1FoDL7at2FHTl3+jSWi7RGOlTGUwHHgcr6Fy60O2TtMRrJZiOePCwBHr/nPCyh6Rxf8odEksgVRSsTLD5Oyl0tFPGrp1uT9FIBEY8aSSykdypReRAcxjFAHbKMNw3jm4Aa2Gq1xBkVRifGkpU3DFSuN1Y/UvorE4UQiLzrEV4AuN7iYBRNO8lA5zbHwNbGTg+w81ojxtDQaAjmVYJ2lZHQoi/LLwvBEjvCuPluQ/mollrbJWyJRdZJl3WHXMOn/EDdyd+ywsk9+QqE1R/Vlzpf0TjA08PCZ05OIRdDwDpeqng4rcFj3A4O+mnn90jd8X1jx79BtmqbWS16EgH8N7yXzh9N+5AsF1Olb7o1ebHuS3cd/7tkZkiawSz5FtSXZf1Zt5vmMOos1Zw71g6y7Ltw7dq0QA5aTlaNe9GONe79yEwa2av3+FFnNhsV6rxVzvx94igjPe4mLaFs4y2clv8vmrctIy9E1fuxeV9W/iRRAxtfy6j7rw=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3affdcbc-7577-4cf5-9c1d-08dc68749420
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:29.1676
 (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: AH2DmNqHluUsvPB1X2ma1SSBQkG5WjmJ+qb849QjLKIDqHHOrXFae6UH2xyFaIzb/hyP+aWbjLW3ofY4bbeFuQ==
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-ORIG-GUID: UQsdTb0sNUBlD5dv5_bmf5HrNoiyv2xm
X-Proofpoint-GUID: UQsdTb0sNUBlD5dv5_bmf5HrNoiyv2xm

For when forcealign is enabled, blocks in an inode need to be unmapped
according to extent alignment, like what is already done for rtvol.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 fs/xfs/libxfs/xfs_bmap.c | 39 +++++++++++++++++++++++++++++++++------
 fs/xfs/xfs_inode.h       |  5 +++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 4f39a43d78a7..4a78ab193753 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -5339,6 +5339,15 @@ xfs_bmap_del_extent_real(
 	return 0;
 }
 
+/* Return the offset of an block number within an extent for forcealign. */
+static xfs_extlen_t
+xfs_forcealign_extent_offset(
+	struct xfs_inode	*ip,
+	xfs_fsblock_t		bno)
+{
+	return bno & (ip->i_extsize - 1);
+}
+
 /*
  * Unmap (remove) blocks from a file.
  * If nexts is nonzero then the number of extents to remove is limited to
@@ -5361,6 +5370,7 @@ __xfs_bunmapi(
 	struct xfs_bmbt_irec	got;		/* current extent record */
 	struct xfs_ifork	*ifp;		/* inode fork pointer */
 	int			isrt;		/* freeing in rt area */
+	int			isforcealign;	/* freeing for file inode with forcealign */
 	int			logflags;	/* transaction logging flags */
 	xfs_extlen_t		mod;		/* rt extent offset */
 	struct xfs_mount	*mp = ip->i_mount;
@@ -5397,7 +5407,10 @@ __xfs_bunmapi(
 		return 0;
 	}
 	XFS_STATS_INC(mp, xs_blk_unmap);
-	isrt = xfs_ifork_is_realtime(ip, whichfork);
+	isrt = (whichfork == XFS_DATA_FORK) && XFS_IS_REALTIME_INODE(ip);
+	isforcealign = (whichfork == XFS_DATA_FORK) &&
+			xfs_inode_has_forcealign(ip) &&
+			xfs_inode_has_extsize(ip) && ip->i_extsize > 1;
 	end = start + len;
 
 	if (!xfs_iext_lookup_extent_before(ip, ifp, &end, &icur, &got)) {
@@ -5459,11 +5472,15 @@ __xfs_bunmapi(
 		if (del.br_startoff + del.br_blockcount > end + 1)
 			del.br_blockcount = end + 1 - del.br_startoff;
 
-		if (!isrt || (flags & XFS_BMAPI_REMAP))
+		if ((!isrt && !isforcealign) || (flags & XFS_BMAPI_REMAP))
 			goto delete;
 
-		mod = xfs_rtb_to_rtxoff(mp,
-				del.br_startblock + del.br_blockcount);
+		if (isrt)
+			mod = xfs_rtb_to_rtxoff(mp,
+					del.br_startblock + del.br_blockcount);
+		else if (isforcealign)
+			mod = xfs_forcealign_extent_offset(ip,
+					del.br_startblock + del.br_blockcount);
 		if (mod) {
 			/*
 			 * Realtime extent not lined up at the end.
@@ -5511,9 +5528,19 @@ __xfs_bunmapi(
 			goto nodelete;
 		}
 
-		mod = xfs_rtb_to_rtxoff(mp, del.br_startblock);
+		if (isrt)
+			mod = xfs_rtb_to_rtxoff(mp, del.br_startblock);
+		else if (isforcealign)
+			mod = xfs_forcealign_extent_offset(ip,
+					del.br_startblock);
+
 		if (mod) {
-			xfs_extlen_t off = mp->m_sb.sb_rextsize - mod;
+			xfs_extlen_t off;
+
+			if (isrt)
+				off = mp->m_sb.sb_rextsize - mod;
+			else if (isforcealign)
+				off = ip->i_extsize - mod;
 
 			/*
 			 * Realtime extent is lined up at the end but not
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 065028789473..3f13943ab3a3 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -316,6 +316,11 @@ static inline bool xfs_inode_has_forcealign(struct xfs_inode *ip)
 	return ip->i_diflags2 & XFS_DIFLAG2_FORCEALIGN;
 }
 
+static inline bool xfs_inode_has_extsize(struct xfs_inode *ip)
+{
+	return ip->i_diflags & XFS_DIFLAG_EXTSIZE;
+}
+
 /*
  * Return the buftarg used for data allocations on a given inode.
  */
-- 
2.31.1