Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
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 06/21] block: Pass blk_queue_get_max_sectors() a request pointer
Date:   Fri, 29 Sep 2023 10:27:11 +0000
Message-Id: <20230929102726.2985188-7-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?ExUGDIH/EczFoc4lWrjlGLt6yKUu9fcBytJ03WDU54akgs1+J1lzD+Uy/B4s?=
 =?us-ascii?Q?+VKFUlHRKzIUF2fPWJ0RkODpNlJHIl4e0Teo2jpyQ7ApA37ymsgi8iOljfms?=
 =?us-ascii?Q?lOMF75PafQeHTwgnMVRZshn4yNBbiGfXBASpxsbWNrAR9zA+xNFToX0YLnWw?=
 =?us-ascii?Q?3zYsaErsAsMCyUYS+3wOvca+D+bSm0wtTZoYk8YbLkm3qnO3SyVfQouHF9dz?=
 =?us-ascii?Q?OTBhk2SZFgC0IhnfsWjbaMglMgYUJUiZwAuZ1Anf3xYsj+y4UH3oe5Ql6SsW?=
 =?us-ascii?Q?YfbxA+hdBGtiEZiqskA/rrqfGnphxzKFYdfKKyN4F43lkilkkP2rgO5KnEPQ?=
 =?us-ascii?Q?q98UpdbFPQ367cvygkD+HY/j019Sy5iwgNZY/gJ6SR9Ic8egnk7Et3OaG+1Z?=
 =?us-ascii?Q?CJvyWdOaIsqUZP0Vwgi4IdQwRFv5/BzrjWV+QOv7FJWc/77GkgvZskieIMxU?=
 =?us-ascii?Q?+b/AQeYvwPpoU6ZD92SKhXyBkkIBkHAX9dEPQibB4K+FFoOtXGCTGnfVL27p?=
 =?us-ascii?Q?cXEk4qoWvgmJhptvb/TckUsEqD+j7nxgv4wgMloeKgfZN+14J+3BWUOJ+ZhK?=
 =?us-ascii?Q?OaJrkXLT4DDEPREzdmMFZDiIm9DIMepr9KloKf1PW3Dwi2IFyKbN0yNdg70I?=
 =?us-ascii?Q?/uni2yBETn+qVaEpu2zlr0ivssFNinfKf83tqaeQqlk0OI3IYH958YzmRFn8?=
 =?us-ascii?Q?Z4GY2qCCGD/NMXIfZgGYf2I6iOcSJT2DcEQEduB+2RMPZAtAf0fLNVbRD2Uu?=
 =?us-ascii?Q?02eEuLm8ZdnmQhQVjFFZ5CRTXDIEwRiwi6hKIrGI9w8tW0JPkJBW/I1azE3c?=
 =?us-ascii?Q?7xlsTyqXucU/jhVR7kMvBmgT0Yg2sFDH6yeFwdUSyvgysKJX4ds240GsMpAf?=
 =?us-ascii?Q?d3akVn5iIjha8U4YAz9IW5zwrfkydPuS+L2Y+uwPndUX5ycqu/dyuBzQZase?=
 =?us-ascii?Q?2dZxxlV32YW3yt2TsZN1cTdIoe4ClDWVjQ/rTWEIICshx/7avfvGL8f6Hrkq?=
 =?us-ascii?Q?K0nLcVbWCWpID5+74yHTXcpFWS0RTFG4YPDbL9bo7wNqp6UQSSsdJ0PgUi9+?=
 =?us-ascii?Q?kZQNCXCEYzrVt3Ekz5N6gKWGp65k6hNCYz91pmS6baLVh5dHb2c6z3hytG8U?=
 =?us-ascii?Q?J3upb0Of+u8RKjYpaq5kr5fllo8YNgJOwP9EVXsZRJIL75/KaDSAV9LkpyvW?=
 =?us-ascii?Q?NwR6WgrjTvUp29xCfcZGhhDos3I9BEWNmcIr7G7AUtzdZ0PnqRVtb51pwynY?=
 =?us-ascii?Q?VX3wwbD/NZEKTEE4NuRmYUnegRonJYm3gK73nnxxe/0UzcDFnQg6cUWBPVVq?=
 =?us-ascii?Q?VrYSp20LEaF5vu4iMvynOqAFrTPJ7BSluioaLwmnFOeBocVFr6L2OJcHfo22?=
 =?us-ascii?Q?Z8KdpinGdWGb8zxVf/wdaqfObKAr9kpr0ksd29C5pUwLNkUpDKv1GBKnnt30?=
 =?us-ascii?Q?Rf8/EThzkjVZy4k0vgXy+uUbo+RbMQpI02DsJdBdz5RB/JA7pDDRkyfLq6ht?=
 =?us-ascii?Q?6xNNXT4zZkLvMmcecKuVlNXam+MZIvW+0JxPRi+1j+z6iS8phY+F2tWvDMmq?=
 =?us-ascii?Q?GtPwkP3Vc+T8ZN136+m6vjfcYDAVZSMDper2PP5nOqZrgfnx1qtZoun/WQo3?=
 =?us-ascii?Q?rw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?v4CRRh4k94ym5UGSOuJ1qR+KMZYInySTkpp6TOG9d2XE4+VR18z78T1E/6D0?=
 =?us-ascii?Q?HHcwsEaPxGYyAvvz0mXBAEg/DodABDBc8eDjlgV9Abjv0OnRN/fWyHgv7M0p?=
 =?us-ascii?Q?i+gGnvLYMAg/nxI1TJMxOhvMacZ+hsJhZUnrn6hFrMWQiORRBN55pal0DTKs?=
 =?us-ascii?Q?I62U8i5rfmfZxO89+8VUCvMA+K8JXOfJtXnewNzMK5g/Fbz2WcfptCjtr2VO?=
 =?us-ascii?Q?+b/so9aUN+Q7S61uz5og9vSQ1Ub68kMhtZNbPGKfK45M5ueCZ7s67QWic4+q?=
 =?us-ascii?Q?7vTsdmitNCdAJB3Duqqc87qjfaYrJmhIM9JPYOh2xG1U1ApLofOFaaeumTsc?=
 =?us-ascii?Q?fkjpGLSeUbfzgVOl2JPZfMaafgB1LMhIRh9ul7J54s53kvDFU9ktyWbEb0i8?=
 =?us-ascii?Q?JeFZuQpE203eUTJGWyJ7C6X3524p4oPSXJfp2pmPsm5V9ga0FaLxQV8nQxLz?=
 =?us-ascii?Q?2SWqLasbOzF5fgmmciyBeF8s+2nKHRWHAmYoeG/uN3MRwUnyK56bszQfIVAs?=
 =?us-ascii?Q?mKiT1PyTKltuCmeErZBINLgeT+VQlHkDgcz5G5uAL8Zq+5OBCmNM+QbJ6wm1?=
 =?us-ascii?Q?K4bCZEFRvo5buhBRWZXraq+mVK51XddcQ70rkP4wC761HORYvKvKiBKWYfCG?=
 =?us-ascii?Q?4+uN0W6xjQS8JaJBNR9Rjmb5Mgh5uBHJrW2sfpk2ZRhB9ieOZU+XMYhFLvqs?=
 =?us-ascii?Q?r1JolZp0iDGtzf4Sgl54s0id+/B4LoripvxC1kq2eORtzrTGyMsMbKbDM7KG?=
 =?us-ascii?Q?nx9Gfqrrf5/h3gpraWPdp4djXkK0DXuaWgssOl3SduhX9kO7re4O1ouylxbG?=
 =?us-ascii?Q?qg8C0h3xMvVr1Q1O0w/M2Qd6HrUlOwsy5fCEDNkOHdnrSKzu4SFg7sRxiZmx?=
 =?us-ascii?Q?krcMH0Oa9cHTR8PDE9RqT70C2WDr0nNSbMHDapKaTmjLF1if9eqvcGQryxsp?=
 =?us-ascii?Q?vZ74QdnLkfL4UK24IhhecRn0920O2e18DpzKCUd90QO9Nzck+RwhsMEYBngP?=
 =?us-ascii?Q?HO+mAx5dfZlZsDdPXTDurjVcB0l2epzfyD4O5CqwARDT8F6xrtlXqMxHscIX?=
 =?us-ascii?Q?r6zmgoCy89G9hRAXTiY9IpUR9Xw1lg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 85d98b4e-6d0e-4181-cc71-08dbc0d6c68a
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:09.3448
 (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: rug3f4/OgGNnTD+nnSYVuitwda7y9+0PW+8hmj8wdpe6KdU2PCf9ddB7o+u7lOVWb9d/YOiOyvQx7E6i0G5+xg==
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: l_TcCT6UQQkf77YA7LaM9UHM5Orn4nzT
X-Proofpoint-ORIG-GUID: l_TcCT6UQQkf77YA7LaM9UHM5Orn4nzT
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 pete.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 (pete.vger.email [0.0.0.0]); Fri, 29 Sep 2023 03:44:21 -0700 (PDT)

Currently blk_queue_get_max_sectors() is passed a enum req_op, which does
not work for atomic writes. This is because an atomic write has a different
max sectors values to a regular write, and we need the rq->cmd_flags
to know that we have an atomic write, so pass the request pointer, which
has all information available.

Also use rq->cmd_flags instead of rq->bio->bi_opf when possible.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 block/blk-merge.c | 3 ++-
 block/blk-mq.c    | 2 +-
 block/blk.h       | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 65e75efa9bd3..0ccc251e22ff 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -596,7 +596,8 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq,
 	if (blk_rq_is_passthrough(rq))
 		return q->limits.max_hw_sectors;
 
-	max_sectors = blk_queue_get_max_sectors(q, req_op(rq));
+	max_sectors = blk_queue_get_max_sectors(rq);
+
 	if (!q->limits.chunk_sectors ||
 	    req_op(rq) == REQ_OP_DISCARD ||
 	    req_op(rq) == REQ_OP_SECURE_ERASE)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 1fafd54dce3c..21661778bdf0 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3031,7 +3031,7 @@ void blk_mq_submit_bio(struct bio *bio)
 blk_status_t blk_insert_cloned_request(struct request *rq)
 {
 	struct request_queue *q = rq->q;
-	unsigned int max_sectors = blk_queue_get_max_sectors(q, req_op(rq));
+	unsigned int max_sectors = blk_queue_get_max_sectors(rq);
 	unsigned int max_segments = blk_rq_get_max_segments(rq);
 	blk_status_t ret;
 
diff --git a/block/blk.h b/block/blk.h
index 08a358bc0919..94e330e9c853 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -166,9 +166,11 @@ static inline unsigned int blk_rq_get_max_segments(struct request *rq)
 	return queue_max_segments(rq->q);
 }
 
-static inline unsigned int blk_queue_get_max_sectors(struct request_queue *q,
-						     enum req_op op)
+static inline unsigned int blk_queue_get_max_sectors(struct request *rq)
 {
+	struct request_queue *q = rq->q;
+	enum req_op op = req_op(rq);
+
 	if (unlikely(op == REQ_OP_DISCARD || op == REQ_OP_SECURE_ERASE))
 		return min(q->limits.max_discard_sectors,
 			   UINT_MAX >> SECTOR_SHIFT);
-- 
2.31.1