Received-SPF: pass (google.com: domain of linux-kernel+bounces-90601-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: John Garry <john.g.garry@oracle.com>
To: djwong@kernel.org, hch@lst.de, viro@zeniv.linux.org.uk, brauner@kernel.org,
        jack@suse.cz, chandan.babu@oracle.com, david@fromorbit.com,
        axboe@kernel.dk
Cc: martin.petersen@oracle.com, linux-kernel@vger.kernel.org,
        linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        tytso@mit.edu, jbongio@google.com, ojaswin@linux.ibm.com,
        ritesh.list@gmail.com, linux-block@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH v2 01/14] block: Add blk_validate_atomic_write_op_size()
Date: Mon,  4 Mar 2024 13:04:15 +0000
Message-Id: <20240304130428.13026-2-john.g.garry@oracle.com>
In-Reply-To: <20240304130428.13026-1-john.g.garry@oracle.com>
References: <20240304130428.13026-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?qmRdVzB5+GTiuwQAbu1kl7iQcBP6yTryBKebuWRt5RgJ0p3RqHDcrSeoaA1P?=
 =?us-ascii?Q?riwaPVM3GvrkOp07QA2d34qNvEcLPJsGJUW85gbvY2Ej89N1unZ7Im4kvKNJ?=
 =?us-ascii?Q?suXKrmk2UXXyVCFHLgJLFzATuVvJpEn4sVStRoUtopEIBhkcNrz6V/J8cA+E?=
 =?us-ascii?Q?F7WnH9LVpf8P1Z8nvcR9oGI0cKIXu9pHR0sObsQiYSP/Urwp1OxNnv8f4+nx?=
 =?us-ascii?Q?PtisGVasrMm1G6Cqc+eVh9VmRvJLMqbH1Jl8/xD7oEBDcWVy1KvpqydMn4nn?=
 =?us-ascii?Q?elWLwnt+qw3UCXNjwy/u4VpfyEB1MrVHsmUaX5UcMZwhHs0XvV2XXKUH/p6F?=
 =?us-ascii?Q?qCV8iJvSLhAv6feGK1qKJado4pB013SuxphvCElmxMN0t1gBSey3fLLXoCMp?=
 =?us-ascii?Q?YGBSANP7YVHFnLtbplWvYa0PtPFXpgymiUF3Yxcz1KJtMbhKtVaqiNxB9ArQ?=
 =?us-ascii?Q?M5ohMWgDqWD8jHgJRhPrK3v+YG/H08rZu2bYUc+Hdr0bk9DzpXoxG4gCe7m3?=
 =?us-ascii?Q?PlWY7fM1GElW7E+qL0O45JeMSNE9pUgsNSEsbOVEwvZgNIp+mz6R+3B84M1H?=
 =?us-ascii?Q?HPc7SjOnTL7tW6i8Mb16aL6C8E09pnKG1MmhpknhLUWi7FRWHfgCkx9a7uCH?=
 =?us-ascii?Q?SapA4S5muMMVCIpxvAgs5901MHdEsQQXwKldSEjVWKnfTKNciBj8tB9OGgZh?=
 =?us-ascii?Q?pXOm4bfetI0MauiXvnU7S7nwvmy7hmHkqkG1W0ZuxkfYl6mqpJONisP2ai2e?=
 =?us-ascii?Q?9keV0uATsPun30TafupPenNPQcK7Nb56Ee2VwDaI5VmaN9w6Bod9jCNyMc3n?=
 =?us-ascii?Q?3ouFTDgfRHDgfSnIfBfZcB4SG/JvRxPo8V6Kc0AxiF/sZYhiL0z+PhPUvZBd?=
 =?us-ascii?Q?18Yq0uG6LznSYv3weOnSIBvVoiTjkQOkj5SdKgl/o5CGHN6WDS3Ww63EXZSi?=
 =?us-ascii?Q?6uslzGm1LdDtCDIyodh7ivvyGQdjuZxyxNLl+Yr1Kmgbh1JTJGIADD1gwFYi?=
 =?us-ascii?Q?a3CW7I0vP2l0s4w2b1Vm9gTNk+eBWBtsMyVhv9TisNIe8U8h9/4iQEUzsW+h?=
 =?us-ascii?Q?nCFFBNLyYlwBQjyB6xG/8uvoPWLKJtPl2E6u93IzocoC1LUzr3mFbL/u0Pnf?=
 =?us-ascii?Q?j77zVABmnRiwG6GUBUcqPVVNyNMw4RdhQssck5lJQq6gsNv6mAWwUMs6Gh+r?=
 =?us-ascii?Q?KhrTndWKzfew/2+JQoneE6SyTFlcWt8LwDiYO8TgcTeVr1RRNo748+2nr5Qc?=
 =?us-ascii?Q?S3kalLhEv4ghyFrfz2iIscQLI/f51GWHe/uem8+ZJJsuzjcgN6KY0jyQ0+L4?=
 =?us-ascii?Q?l8aHNGr7V5E20Jrj9vdf2du/zMqxzXYF0RBMoPT+r5daOu/WzPvwor5czEI3?=
 =?us-ascii?Q?tKb6CEH3iqctxlqdWi9ziCsDNSeYV3f+JMsBjCu7mRAeZmMcKaE7++LbQDh0?=
 =?us-ascii?Q?DO3qgXL7CLJnbKzsEsPgwA7dE6Ucjk6VJ0wrJmwfFOlEu5P1sL/jZS9lLMrt?=
 =?us-ascii?Q?OzIT8vF8Py7sBPShhpEtOqSMksxrXE9lfwQJv0fjHCloh6qPZikpBBIqKzfb?=
 =?us-ascii?Q?XoXyy6Y1CTtHfqY2/IJ3CoSbIdVbdd6O3aiP9tuAWuzhyx+GpaV/scL4jIGj?=
 =?us-ascii?Q?zA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	1KsM/pfoMMQ1YAU5HrIgJEgXWgZvySZahXpYR/5eFA4htoSkskrFhW8x6LdIX4YgVg7DIv04NW3QSAD557TxZ6tFy0szcJihsv1HuSnbD7bsuZxq4L3k8YtfLGEIua721oZmDVY8JwRxBmayeRbOhc914SCje19kX10hHUs18ES9eQ6C0ouTwzFeR5XuIFDQ0WDG4iSKJTyPiIN+MitAkyPPSp4RyBpk6MoPjlSp6457rI6SctCGeP3SSCeF3jYR3TOEEDeubKA5n9dbNxCidwp9DAguYEZ6JczQvjucrnQyCt6DaW17vlR6qRuWnKr83HyK2rMAyRbZaK11/rgMEb9oxEZ6BUEyEZ2YCz8WLvv/bqzKBFXsDspb/WL5ao1ne8Ff1rHeFXlyP4kun/iMVFtX9PDH/sfL6g4VsxHhyvFliPQ3DAT6ToUab2Z/WNCAuuz0/MHXIXb/v61dFPR94hsw4K7yviyBskiPM+cH7bbJX35vpUCpox/UPh3sPuc2x/tA5hUjQBdjnDmkTIP3ZuSgOa8YQsdh/lcI2xsTmGhykSMyOv7hcn8ykZkTYEYQyvJOFeeaqdyDKvpDlG918kH/yZJb3ZFBkIZrj8Jb0Ac=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d0336fd0-8520-42c8-abfc-08dc3c4bb23b
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 13:04:59.1439
 (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: AWRKpbeK4miKi8zBCzSe8nI0bM3qXune/iB8rVnVFN3dzuCHSy3ZfSgyzytWBlR2c/oCkIbFqi2zQihTzxuLOQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7805
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-03-04_09,2024-03-04_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999
 spamscore=0 phishscore=0 mlxscore=0 malwarescore=0 bulkscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2403040098
X-Proofpoint-ORIG-GUID: uTh6u7jxwOYZ-1FznCV6dr2E4lXq1BD1
X-Proofpoint-GUID: uTh6u7jxwOYZ-1FznCV6dr2E4lXq1BD1

FSes will not check if the BIO submitted for an atomic write adheres to the
request_queue limits, so check in the BIO submission path.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
We really should return -EINVAL to userspce, so can be have BLK_STS_INVAL
or similar?
 block/blk-core.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/block/blk-core.c b/block/blk-core.c
index de771093b526..a1b095a68498 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -718,6 +718,18 @@ void submit_bio_noacct_nocheck(struct bio *bio)
 		__submit_bio_noacct(bio);
 }
 
+static blk_status_t blk_validate_atomic_write_op_size(struct request_queue *q,
+						 struct bio *bio)
+{
+	if (bio->bi_iter.bi_size > queue_atomic_write_unit_max_bytes(q))
+		return BLK_STS_IOERR;
+
+	if (bio->bi_iter.bi_size % queue_atomic_write_unit_min_bytes(q))
+		return BLK_STS_IOERR;
+
+	return BLK_STS_OK;
+}
+
 /**
  * submit_bio_noacct - re-submit a bio to the block device layer for I/O
  * @bio:  The bio describing the location in memory and on the device.
@@ -775,6 +787,11 @@ void submit_bio_noacct(struct bio *bio)
 	switch (bio_op(bio)) {
 	case REQ_OP_READ:
 	case REQ_OP_WRITE:
+		if (bio->bi_opf & REQ_ATOMIC) {
+			status = blk_validate_atomic_write_op_size(q, bio);
+			if (status != BLK_STS_OK)
+				goto end_io;
+		}
 		break;
 	case REQ_OP_FLUSH:
 		/*
-- 
2.31.1