Received-SPF: pass (google.com: domain of linux-kernel+bounces-162784-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::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 v3 10/21] xfs: Update xfs_is_falloc_aligned() mask for forcealign
Date: Mon, 29 Apr 2024 17:47:35 +0000
Message-Id: <20240429174746.2132161-11-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?zKtJGjhPdlPNA9WJi6Xbo5222SIqK7Ge5L0U6NOf8zuaijjxEMBPG6HifL6N?=
 =?us-ascii?Q?JMg0v/XngcIW2fpBTfc+imvQKiO/vOw7HI1qQS+jYNp2++mE/kHleOTxkdjR?=
 =?us-ascii?Q?M/y/Q0xa4pyA0Qp9A8eSAoPDCSlQYi3vrtwvxBaEvaBhJm+O5h0ukHlsuiQF?=
 =?us-ascii?Q?zw3e7wmUineCcWoQLZPOZ0yDzmt9ha23TKe03wrM8JdUe5xMzs2Tl0pKtM7+?=
 =?us-ascii?Q?h3s8cUXaDEZnfZh9LUbHCxYz1pqbU61vvYj7H5gWjZJ2DbOFR7V+jml4Xt/c?=
 =?us-ascii?Q?1UC+G7rADonHCTts0u7Nf9uB71We4jkO+oFh+F7BNJEXGu10jxGriuoC+YO9?=
 =?us-ascii?Q?OCchkrtHCOqVUltgNbr0lrEx0DC0CWzDIE8J9Odl9EPvzn20rps4tPeYd/5P?=
 =?us-ascii?Q?fifERJfOl8e4D0stPkIxdPFBPGdZwXYQ05Qbike9srpldr/KCKwYaBOhvmAS?=
 =?us-ascii?Q?+XK7d+T37ZI7I/NCVD25Na56bN9fnDDJfAeeMV4d2p1dCrLdXGh61j2xIfyU?=
 =?us-ascii?Q?LRp8I62Bn93BNG9N/g23SJjgH1nOVMTHL5nRgaEG2UTAEKANa5EChmXn2TLY?=
 =?us-ascii?Q?/DD4UKUUd3VpFf0vJRrouW0qnq1xLUFNw1Z1+VNSq2LX7iA5qs+MX+MJVIt1?=
 =?us-ascii?Q?HoMWng1/F2QhwjVaxzlBrymMoDAhCfpenuBLA/z8ZZuDl0l3DGl2s1mY9QwC?=
 =?us-ascii?Q?JfLvUhIxjFD7enw5eI3bP0yj+FQvLuhGZPJYs6xro6bFKdyNUE9RNeI9jNl5?=
 =?us-ascii?Q?6KTWWGECdCNX4X0KEYWNkc4zKsYhhGN4ucBXueNxjaYFj9UN60eIWpHz/HnL?=
 =?us-ascii?Q?kCM60rfA9KTehXf0jfl4c3aQxNDfdEzbVGesBunMwScuKjRKrtCJ80JzFrwE?=
 =?us-ascii?Q?wYpY1FXQpwCWCnYMQ+IkNvuO52WxIIfcGJXqJEk3KXRGKLWnWrufQt8lpaeN?=
 =?us-ascii?Q?67H1Yar2OtmnwiCS7ucHrPBmoYZ4NWlQcKl33QwX+Ua1GTU1MfN/egBEr4zw?=
 =?us-ascii?Q?JskWC1BuO7AAGXy+6eug9bIgPmiSxu5j/c0ooWSIAT9N72RRiqeY4yr7i8aY?=
 =?us-ascii?Q?n1t3a5zJDfAdnYe7XBPR5xKp8+IXxUzZduqkLXSdp6d2NrfGuGfFBF0EzP5f?=
 =?us-ascii?Q?iXsv4Jn6sbilK3tv7SED3BJvVAxCE0mj1TXYVS1tpdfVetFFnU3aLMsX3aS3?=
 =?us-ascii?Q?OSzIerl836j0ax5JXu1x4FKz7ihpqNokodUl3WwvKn2wmoshn2D5Y/1UXa2/?=
 =?us-ascii?Q?KRKaJyn4NxRypiUGW74BU8SVrLUTz+Dv28G48q3fe9fs2f3ZRrfhMvFaEmh1?=
 =?us-ascii?Q?85/hMhK5WMEb3Df3p8mr/smS1HsWLMAEhQLb/dtSESaH9VLcYcljCRzDGBZ3?=
 =?us-ascii?Q?Jd2RrIOt4wMferPwxPnmsbzjt7TnD2imToR0bTkmJX/dbJZhOX45XWREH6YD?=
 =?us-ascii?Q?UX0OKXXmC7tKauK5Z6itURPELGOK2NDfs0Z19DFJ58rExDtEkPX+n6iJJC+w?=
 =?us-ascii?Q?hDhmrw/ui8RxaXlof8WsErr+j29VIZlbnjakR5sdYPnuhakiBBZxLTtHLS6p?=
 =?us-ascii?Q?q1/oY9mOQm+qm57MTw8Lfc1ifp1DNsjzhhaqp6DtHjuzQUvW0BoKDn9xy3Pm?=
 =?us-ascii?Q?Dg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	owZQdcu3/KCHYSw/tDDMAKTtiHXLX9SIJ5X8yUUa6ywWgzILBajSO5QJonm0mB4i25H+EkxM1GRd4Zl1n5F2+aAn1f/m94IGnnb61G6yQ0QebKVXKdwgDzhPD8ACaMP8sX187/s1xrG8ydLsbNnj6QR3Kqve9rY8F/f3i7dIujKmirUm18DtgB2VptP79b9nF5VXxjjLv6dQzsJObvE2gjEA097Wor/sA+8eDHox6vu3j5+yPhwNTH2QncfX6FH76l9vxW63UeDpv4zwuhHqNUnq8zyyBgxam4Lv7IFEgEcZMuXdYoUBafk2omlbwRNQeP3Yxfkb3BmzXyatmFZ0zilYWlr9PqSVZPwuYERotcS0AZtZJmtZtYXDzeS8egrLTeTEiMaDEbGEa7/tS9qmx/32FwhmOrZm+hVQXD538WGV8VZWWgu/sigM5kx26WFvv7/5hNAxuhTBtzQWOUz+O4d/cPgR1xUm9zZL8XNOGjdgoExI8pi+ca364wnKMegb+JBSdXYpHfXEI8TjeXFfWd9ZGhjDuOLHy3Ai85Cjx6cQ7VXOgUwdFlG47SSe7p5qjK7J7ZvBpPb983D3/Bl5VrixiJcwR6mv6LHKP/DX+ow=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: be02b222-bbb1-4d11-7e88-08dc687492c8
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:26.8911
 (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: ohnPUBShgN3AEPpy5CrtrhhqsoUe3npAnJbpRwCJ1GEoKFthyWDNQM6ftN9GO1X4QhLgNs3vGtKMUR5bVz0L8A==
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: buFI0N80llPZ2RrX2aF-lQ16QFipq0dp
X-Proofpoint-GUID: buFI0N80llPZ2RrX2aF-lQ16QFipq0dp

For when forcealign is enabled, we want the alignment mask to cover an
aligned extent, similar to rtvol.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 fs/xfs/xfs_file.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 632653e00906..e81e01e6b22b 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -61,7 +61,10 @@ xfs_is_falloc_aligned(
 		}
 		mask = XFS_FSB_TO_B(mp, mp->m_sb.sb_rextsize) - 1;
 	} else {
-		mask = mp->m_sb.sb_blocksize - 1;
+		if (xfs_inode_has_forcealign(ip) && ip->i_extsize > 1)
+			mask = (mp->m_sb.sb_blocksize * ip->i_extsize) - 1;
+		else
+			mask = mp->m_sb.sb_blocksize - 1;
 	}
 
 	return !((pos | len) & mask);
-- 
2.31.1