Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
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,
        chandan.babu@oracle.com, dchinner@redhat.com
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-api@vger.kernel.org, John Garry <john.g.garry@oracle.com>
Subject: [PATCH 07/21] block: Limit atomic write IO size according to atomic_write_max_sectors
Date:   Fri, 29 Sep 2023 10:27:12 +0000
Message-Id: <20230929102726.2985188-8-john.g.garry@oracle.com>
In-Reply-To: <20230929102726.2985188-1-john.g.garry@oracle.com>
References: <20230929102726.2985188-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EhmaTwfPMi/+q6vSiDySN0uI9VDxbQkO+RUP/PrGK0MgL5NOByw+ovpWPULB?=
 =?us-ascii?Q?BWCnRyjdh9gJXODthrB4CBdczOB19B5WhMACKvWAm5GHEpy6iWggOR2X852y?=
 =?us-ascii?Q?Tv9keusxIwINHfRA/Qo38wHT7L9IniEikHQx+16LZwRALWcTD9pxDLPgOWpq?=
 =?us-ascii?Q?403VfQVnZ3d/xBEP0xxOu3DjFU3b3mjiyYK9btQsumyhTdEdjA0gdjKymnS1?=
 =?us-ascii?Q?f6UlVA9QTzkfVG2s43W9V36bvfJ6KkMbl35k4x+pNyH6jVejDfPJU2xnxl6X?=
 =?us-ascii?Q?ji0eZOVGcIZtw76SetR6mAoPd9D32e4tOSV1HrLzi25drof/m5syxisfvrv4?=
 =?us-ascii?Q?dqV5LFgiPUkKZ5HP5W5QSSj2mZsEDeAa6lUFzeUE6mkkycFcuoFRzSJ1zcGt?=
 =?us-ascii?Q?O572wC/5AVgt/czGhNiw69YZYGYWLEwQ6otQPUlqQQjas0RobdF8xvFI1hpX?=
 =?us-ascii?Q?TqeUu/t4By/e+x1yJLuRVe8iTXRKIJAC1SSluFK2HmZjxIJRpKxC/yaxSnUO?=
 =?us-ascii?Q?Cu42pr7/AyPrjvNSI7TrnamK04TLBvWAaPAd+d4h88lH7LQNXxQFQGPtC4bV?=
 =?us-ascii?Q?z8CRKhb7Zy+1qOGvM0+nZbpS8cvO52UQCqMU0YYKT4ViLWERGyjXeCtj4QY/?=
 =?us-ascii?Q?2XbjWHEwZWD/wQ/2l9GZ4qJefAwAXuzn0w01rYmEFiybjfHnJJRDlUpF0FHv?=
 =?us-ascii?Q?pPOxal9KzO8hSYp5YXdcWlLy5JAafaJ5a0ULZ/2sIyzDW2lWMNAFTfavcjHr?=
 =?us-ascii?Q?O402yr0jUpa1nP9GSWnfMIJ6yF7UwYwW4UCS9ZxJMm/XAv0dKZPyoM+qPtHu?=
 =?us-ascii?Q?4ipQif2azVMJ/9e9QCo0mjwuDWARTdN6/y9PXV+qxiNArXkUF7LaZ87P5LSc?=
 =?us-ascii?Q?jkaZhmhthmGedl7W1ZyKQIJJRBKP2eUjs1Rk8XdhoRroSelIPCOgl3Gkmh6s?=
 =?us-ascii?Q?rrX0xvqK4MEYwGjtiIP4aAcJSGqJ/DLmAGVqkkgQssLiNNpdW+2M5B7yi1zK?=
 =?us-ascii?Q?o18xxXSMJ/4NbQaZX76OxCjBDD+6UW4/e9D+smeaSqxgfuNM4xkIm9JkWAaZ?=
 =?us-ascii?Q?MPvTu6cGy/wqJ1MhEsK/1KNUIuPZT2ATy6q5Mgunnvj9kGIIBnQkuPY1QKW/?=
 =?us-ascii?Q?7q+mT8rwA1DYq+F8sLFkO+ye9xaAyCj8PIxINA8O4Buv1qkAq4QKBygqoN3+?=
 =?us-ascii?Q?hK5EkghPXw+TwedQSujNkatH//6QMhyeh1TzfnSVhNPTDRBy5zp0/jmPPgRf?=
 =?us-ascii?Q?O2Ypl/TU7CJGgqh7Pp7g/aFfxg9cajFTHFwt1R+b2lleAdH46aB/ypfYpO4D?=
 =?us-ascii?Q?0gSfzdGsMgQ9ENXL4LNUeOMj+B0QmzX3hX7sT6OVeAyirb+GCCxdwM+JTfB4?=
 =?us-ascii?Q?bxoxk92kpkgZxrZCTKzdjSqEQziS8PgzPU95tCuX8lxUVOeSm88WBBMCjUUa?=
 =?us-ascii?Q?KAh7YBt3134xNfpgFrNwPdKnMGSEpqHB960lsKF5XJpSAjZ3nkt3Zg8+h8F9?=
 =?us-ascii?Q?75U0/3qd7Aj3FuX6sRC1D7LjDpgTmqOo+3IjfikP/EAijudxw2NAjqlQIu/8?=
 =?us-ascii?Q?vIf8BQF/7Qq7a79ZWYisBr2uUQZ+uFwAd3Y7cXPzyF+Y1YrWIz7iCwOPKzUJ?=
 =?us-ascii?Q?IA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?JARnJnYzP1BwEsUFP7iV96gQdwx4w+qyffEb+lXadv9Lo/o/pR/IKy4IlCWr?=
 =?us-ascii?Q?21+oaH6VMb42fWveiueIWF4p9YqWyrF8R6CFt9XKDvo7Ulk2h0MW+QU8oD/R?=
 =?us-ascii?Q?R+94I9lrynnY9t4n5n7W9b8x3s9SZF4k2jmw0tXPlVqXKZz/NlPa7GYO6og1?=
 =?us-ascii?Q?Tfjyg2kZ0KP2T8/Ui+9ntg0zfAxyHUX4s72lQIwu+RtPcBytntDrXT0g3lYJ?=
 =?us-ascii?Q?qRqWMB3ltfsLLqD6CNeX9ND+O8p5cw1ae6Cneo2a0SsnMWqhcZBIQ5CEkYsf?=
 =?us-ascii?Q?Z7NezFMWUDc9Xat9dV4zPLNALx8enUVPfXcf6B6FglI+W9rVT94IHBawGGRJ?=
 =?us-ascii?Q?vHAd9fE+wTjtICfxgJ0fbf31cmXgkxioN0dSWpPJssmUMnGcqQD7rv8HJeL5?=
 =?us-ascii?Q?XOrc6sgTQDuZBOYSi2XzwMMtn/wZKyTrsGrWKkhKy5AWtmQDH+EZLl76MEyP?=
 =?us-ascii?Q?4L971ajEKoY13Gp7fkYEEDQqWSN/c7IkPOggsOusDKbnxFFaUNB/XsMbdRU7?=
 =?us-ascii?Q?tdfpYYaL0c8teHjH/h++0kWF6l6TlS12tCPuO3UFZPukT6db8dzCTWzlgXSt?=
 =?us-ascii?Q?T3rhE2WAb5gQ1OVHjDCEfgVC4SAPVJhFMySFL5OYakto+yn6MP7gPJYOmWlP?=
 =?us-ascii?Q?f1l2j/LlHPXI9qU9/yKKWw5P4qHtbLekIOTq+QieUnm5vnKed+686cVdimxX?=
 =?us-ascii?Q?+1Xe1DI+LDxLXnU66lEkmboWkNpbWo7jSkQK9HwrZvU3tZbq5f5B8+3921PE?=
 =?us-ascii?Q?wYjl6tuCnM7i3Jqu06r0nXyusTJpKhu/hSiZgv4Dj2o1Seye6I5eL6B0eZ1W?=
 =?us-ascii?Q?YzvYWbB3U8u3Rvy/rLx30QqgTLCsEPPpAshPC51BZUg28qqTDcFSEXTXjRPf?=
 =?us-ascii?Q?od+KUwGl86EFAHK+aQyAeAxQMsQVV8G1YNa6yVzNbZA81VZZZRYP0ORj52Kv?=
 =?us-ascii?Q?WFrR+gQnDutZzbOvfPjLAwYQ7Nvz8Y3oOHI80rL+eWOuSjfDZWaDbi16km84?=
 =?us-ascii?Q?Gf4DcKWRSElnnpwz9U0FpYHgFpuBOrhXiluF22y86O9fd3pYlfYnKSWW32zE?=
 =?us-ascii?Q?HL7RvRFthOSKpt20xTTaXbtEDsWTHA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d3dde887-7db9-403d-44d0-08dbc0d6c81b
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2023 10:28:11.7002
 (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: fgWKZOfdmunQGsQsmQsLhXZDFNxCoD8NbRHDAToBfWMj5l4CgxG450mr3+OqSIbQHBEDZTtdvBLVbXDuGuCFQA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6153
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-09-29_08,2023-09-28_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 mlxscore=0
 malwarescore=0 suspectscore=0 bulkscore=0 mlxlogscore=999 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000
 definitions=main-2309290089
X-Proofpoint-GUID: dafVnUl1F-EIX_RZaatTlGJI4LOmzBAH
X-Proofpoint-ORIG-GUID: dafVnUl1F-EIX_RZaatTlGJI4LOmzBAH
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 29 Sep 2023 03:29:21 -0700 (PDT)

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>
---
note: atomic_write_max_sectors should prob be limited to max_sectors,
      which it isn't
 block/blk-merge.c | 12 +++++++++++-
 block/blk.h       |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0ccc251e22ff..8d4de9253fe9 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -171,7 +171,17 @@ 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 bio->write_atomic_unit, 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 94e330e9c853..6f6cd5b1830a 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