Received-SPF: pass (google.com: domain of linux-kernel+bounces-36884-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: John Garry <john.g.garry@oracle.com>
To: axboe@kernel.dk, kbusch@kernel.org, hch@lst.de, sagi@grimberg.me,
        jejb@linux.ibm.com, martin.petersen@oracle.com, djwong@kernel.org,
        viro@zeniv.linux.org.uk, brauner@kernel.org, dchinner@redhat.com,
        jack@suse.cz
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-nvme@lists.infradead.org, linux-xfs@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, tytso@mit.edu, jbongio@google.com,
        linux-scsi@vger.kernel.org, ming.lei@redhat.com, ojaswin@linux.ibm.com,
        bvanassche@acm.org, John Garry <john.g.garry@oracle.com>
Subject: [PATCH v3 07/15] block: Limit atomic write IO size according to atomic_write_max_sectors
Date: Wed, 24 Jan 2024 11:38:33 +0000
Message-Id: <20240124113841.31824-8-john.g.garry@oracle.com>
In-Reply-To: <20240124113841.31824-1-john.g.garry@oracle.com>
References: <20240124113841.31824-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?qBG4G761nKkuu250+h8+6YZKN0yOI4RhhO4t/qcnaQZaqyBQsUwfzJx2DJHd?=
 =?us-ascii?Q?o6YHFxGDH0fWLfojYQY2cxPXaslXm13pTCj3Q1I3vdFYTeoA+lQ0EP4LTLiZ?=
 =?us-ascii?Q?SMuWj8c8nK/Rk9T3ZaEvrAgE7UMbABAM79LqhMI25D2WOxdK5ZA9jtFx7hWU?=
 =?us-ascii?Q?0V6k3luh14gOfVr/cJ0QjWnIhtwqnOJED5iYn0x1P5CXpVAIHBZdsuUq+LEe?=
 =?us-ascii?Q?AKw8DMAb2xipcdEhNiyDiOPdUYGihkzyTUHV9c3wOkLKB81slVjSgF4duYL7?=
 =?us-ascii?Q?0wZWRKHECd4hiP7qA/QM8uy+cTzUky2thUTMwB+51KPNF8ems6Q1pZv4fDn+?=
 =?us-ascii?Q?UlV5QzFgvSgWHf51Jv/bPgrBP4AXnEYLAjzFbIEpy9ioQ0FAKiiEdGux6PCO?=
 =?us-ascii?Q?+p8Fs160/ab63FmsOWBIO+M9hlu20VecXgiqgFaq/IoWBnx/SviUKZt1bXsj?=
 =?us-ascii?Q?JuE0vysNrwmJZpgDixlw93JBju7NjDjKS9gmwUz5XMx9gQ1xANCHfMouOhcT?=
 =?us-ascii?Q?TRIKf7Mab4JhXHp7wVnis0CeyPcxoca2KIQXmXsXUpcPlfJfQ/VLA9nCqVLj?=
 =?us-ascii?Q?kgPI42qRptUdBbeeT6BouemZFrtbdCAfcOKRNHnUMLAtNtmn7lyg7dMocYqX?=
 =?us-ascii?Q?AmJl/rV9sIXr4AIag5MSmVSfSvAqC2Zx17FV9ZVlr7rEzRaByfliA5ZSspLp?=
 =?us-ascii?Q?JiFYZaW/r2JwLkPV3Mc7hYwpxNf0YwPEbLinWibHgeRXvWo2vZvq1A7EKw/Z?=
 =?us-ascii?Q?1yHjl6LHgdH7FBPLPjil7EOh+KaAOn4dhG3752nzNRuC4wPBla/WCsTNUcyo?=
 =?us-ascii?Q?lESlm3V1lEFX5d0YK6wUrU9Hb3jyVtoxNNQU5lsdTzs2RLyUfW+av0fBA5k8?=
 =?us-ascii?Q?VSh9lRZZcMRUoqNJLe8heVQzelVEl8KVNx74DrxRPqLWw9/vtx3es5yC1ud9?=
 =?us-ascii?Q?MPb26ISMIqd/2yav/sKz480Pouxyhg2EI1DfhS/DIKhFGulX53ylxZK6ljX+?=
 =?us-ascii?Q?2rqzZQHavb9dCwE51BpKr8fzPVfzdRerorMiMftSzmPLo+lplwgfwlt5X3zp?=
 =?us-ascii?Q?xg9k7IrOk/BqYFJR1Z6xtDSvL259ewtI263OJPQSPtVBLwfjCYgGWPnBHn+d?=
 =?us-ascii?Q?jpCFXf8ViotTTBu7ukcm+6fG5J1dUX3ntNUgG+BjImd8Dmcky+YRk/OsSgSa?=
 =?us-ascii?Q?onktH21EKvYLqmEA8gXk1SV11DwzUGF97oYCw0at07QksCVvRfyAV7yYRQxV?=
 =?us-ascii?Q?RB14TiRr86k7HDex0gi7pubxlnLjSQIzqfFxEKgYZj4+0jNgJeBn5MOouC6+?=
 =?us-ascii?Q?anYjKwXrSkj4vQE7M4lQY2xHw/oqOjJrJOkoSRNv80F0+OskqZRw1Z6ZziOv?=
 =?us-ascii?Q?Wdd5rZFF10fXlWMwXsDDWpVKQcz+VgBf+B2k5HbCWMTMpytoY9Fnsj55pNrY?=
 =?us-ascii?Q?Tn15036hBZ5Zb+NX0IRGRDZZLu1gSmtPrujidIq27XLxyCNIoCB5OmTFkRMm?=
 =?us-ascii?Q?Nt1Bdpc0zgHN/Ad8UI3RgOfNppYBUkqkaY329MvJFqMPp9nK30BU0M9L9nKj?=
 =?us-ascii?Q?YD7h7kSXDytRJTPDKMkN7TuE9G0LwoZvYOqdkZ3hrkxxk3aO3yd6xZlQG8fi?=
 =?us-ascii?Q?Qw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	/p3jgv6XJrzMroCzzl5I8OM9wBx0vDjPeCw972aLH28J5Dqmil0l1ncsN2v+M8J2JjtadzkDdky5VZYk75Qe8hHRIdcOd9yM6jxSEkHBT2gVnUfz+LQ2EpODtRoGfm7EyYFx9tW/geMP4MPRUBUhoMreRnMctPciyENph52NoBWj+Lrga0/vwi0cNDmt+JzQN+9EHpegP9jifrzd2od72T4DsTd7gFAd5eDw9/jNBqXL/dRLXR3WK3N6Si2HLmSIXVEyPnuV6YFp08bK3NA50by5fCHuwMW7iWA6iBn8w3JM1lDRJkjnu/kYJhkWNEUzMc1OPWO3ZZRncTNR5BLSN7NK1fkxYoY3xCRI9iw/0PRE83Y12WZzsPMYL7jrUfnWRgze4WwfZ4ie5SqEjEJrGUuQq5efaM9pe+8+ApW/wdPWL0sSd3f2m80cODYpjIPrDLb3f87i7mK6RCb1lRbtnIjxK7DszYC+SJVzBVf+dxsSJr2goym76+HTht0k6RVDM5AI2tq/dQa6C6WKeCwrBVrp+vuUN6Y6v6DOt6Go5WeZ0OFcMlbVXWNlNH3+0MHALctVFmCjpXtUA6OVioBT3f4C13LRvrRxDwC2+0Ai1rE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5ecb720a-414c-4eea-32d6-08dc1cd1185a
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 11:39:16.3109
 (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: spDsIh70PpUyxLasiNJfzKwPNvTR48aygKz5jzZEPsk2pgJaKpfTShujl5um/Q0E2rshwlpsZ9/Kg02qsruhXQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR10MB7041
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-01-24_06,2024-01-24_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 malwarescore=0
 mlxlogscore=999 suspectscore=0 bulkscore=0 adultscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2401240083
X-Proofpoint-ORIG-GUID: bGYZ67zP7H4c9MJFATq6ujeDp06I_uBu
X-Proofpoint-GUID: bGYZ67zP7H4c9MJFATq6ujeDp06I_uBu

Currently an IO size is limited to the request_queue limits max_sectors.
Limit the size for an atomic write to queue limit atomic_write_max_sectors
value.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 block/blk-merge.c | 11 ++++++++++-
 block/blk.h       |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 74e9e775f13d..6306a2c82354 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -167,7 +167,16 @@ static inline unsigned get_max_io_size(struct bio *bio,
 {
 	unsigned pbs = lim->physical_block_size >> SECTOR_SHIFT;
 	unsigned lbs = lim->logical_block_size >> SECTOR_SHIFT;
-	unsigned max_sectors = lim->max_sectors, start, end;
+	unsigned max_sectors, start, end;
+
+	/*
+	 * We ignore lim->max_sectors for atomic writes simply because
+	 * it may less than the bio size, which we cannot tolerate.
+	 */
+	if (bio->bi_opf & REQ_ATOMIC)
+		max_sectors = lim->atomic_write_max_sectors;
+	else
+		max_sectors = lim->max_sectors;
 
 	if (lim->chunk_sectors) {
 		max_sectors = min(max_sectors,
diff --git a/block/blk.h b/block/blk.h
index 050696131329..6ba8333fcf26 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -178,6 +178,9 @@ static inline unsigned int blk_queue_get_max_sectors(struct request *rq)
 	if (unlikely(op == REQ_OP_WRITE_ZEROES))
 		return q->limits.max_write_zeroes_sectors;
 
+	if (rq->cmd_flags & REQ_ATOMIC)
+		return q->limits.atomic_write_max_sectors;
+
 	return q->limits.max_sectors;
 }
 
-- 
2.31.1