Received-SPF: pass (google.com: domain of linux-kernel+bounces-71363-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: 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-fsdevel@vger.kernel.org,
        tytso@mit.edu, jbongio@google.com, linux-scsi@vger.kernel.org,
        ojaswin@linux.ibm.com, linux-aio@kvack.org,
        linux-btrfs@vger.kernel.org, io-uring@vger.kernel.org,
        nilay@linux.ibm.com, ritesh.list@gmail.com,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH v4 01/11] block: Pass blk_queue_get_max_sectors() a request pointer
Date: Mon, 19 Feb 2024 13:00:59 +0000
Message-Id: <20240219130109.341523-2-john.g.garry@oracle.com>
In-Reply-To: <20240219130109.341523-1-john.g.garry@oracle.com>
References: <20240219130109.341523-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?PbphVVvFbrEgaGLOr3N8hye2OweAlS7usPsmMIRR6ONHfxHIOSR8l20LlXmS?=
 =?us-ascii?Q?lFblGkewy5mCsJbZuWzgbVCX69o9NtNKy9D8ubzfF3l4wnUXUX27xcK6pU8I?=
 =?us-ascii?Q?7bpYR1ftv3Fan0iXWfgMwvAz7fhrjXsSHDg9NBeDAH311nM0GEvQoAbHF/Zd?=
 =?us-ascii?Q?DVSG7dxtF5aG6YVECW+naQch3QOzb8SE60n/HD4cuRrDh6d7cII4vbxxOORz?=
 =?us-ascii?Q?LCGzQDXnYDqAYsa9pDtrspSU6gH8rh7PpI42Wo689hEekdqL59xErdVVIfeA?=
 =?us-ascii?Q?Svr0ZTGuWeEa6/l1b+xAXtZwu2QUv9Lf06mPAJPCdioKOU2JzbpW+mlUx+lg?=
 =?us-ascii?Q?FZyrXzJmecm2sr8uqWCn5PqZdTdHKqeh4NPnIqMVox6oO2Uc+7XX4jXgagPN?=
 =?us-ascii?Q?pD6/SxqUrSIzx6GZqn/+zg1q0YEvdLfitSS68RP52IQaggtoztbmHR+hNs6C?=
 =?us-ascii?Q?WnETE+ImBteyHtrFkzCH4VUjERINrcxLaC9rRuDBVHJjnM0X/6b3MaZxXavv?=
 =?us-ascii?Q?aWvmEvAMqVfobPnNmirfZtxbTtDUITIE8rcEA2Ga0IptNNo1rNRqC8YQ6U20?=
 =?us-ascii?Q?zh+xfKbLrGF6iQ52yW0Sq30Qja4nRhx+Y1ThiaTqmgU1j68XAo53NTvGGAql?=
 =?us-ascii?Q?aozNYhA7xMOa7I/pVpw/uG8QU2bU7/yZV88xahSEIuPzBilMAG3DNi4GYHX2?=
 =?us-ascii?Q?iMOxLwSPmbU3zhEyZH5yRnGlU1lXSQEbQSJEFsag/KfRHcFA7fHWoNoS8Lak?=
 =?us-ascii?Q?AryvTTVQmSsMOGVWr93qkHo2pvj3JIELfX8yYw4HZ7L5Gh8IkQtnOydczWjH?=
 =?us-ascii?Q?zSufainL7uUjVPZbJEinaktp6wXst8r96Jz1FN0TqHjz7AwcGnUOTb6vbxbZ?=
 =?us-ascii?Q?TqH44cAYofSrWzUahiXpNmY+dmMTKOeOH3FWxDJQyVmwYy3/cAtttzmC4UAV?=
 =?us-ascii?Q?v6bzON+GUmhXWcJewxZuwk6ER+p2EOOJq5JvHs7TbnDwxELINqvsVXmLS4iZ?=
 =?us-ascii?Q?NguxTuWQq1FBOmkEZT4sRcwj61A+Oeqytd12Qm7NfhFAe+bZkSKBBmxDYFuY?=
 =?us-ascii?Q?bjwGHQ9LztyY9Yj2inruPWxhHhlCijcD1Cqd1xZTvv6MQqnYrfx1RB1K00FD?=
 =?us-ascii?Q?TpKr4usligcGAg2uCRCaK4mIiSVtzwg7kz/UmhJTewOWC6pq+52RVCNwxRjp?=
 =?us-ascii?Q?KOx3Sr1XOLhhUkzZFHBTL8252bRTlaYawMlN/bFWRA3P6YOwb+GLk413Px0y?=
 =?us-ascii?Q?IMJi2BjNesJzW35s+H0ebEfYP591JVT2+dhIFk2EwKnG802DQfCwlygHRVeb?=
 =?us-ascii?Q?VZ8N7UkydD41bL1/dg9IVc3ipNfzSLY5MmSWTkEdWkw3kv8ShZIyZkpyQrqm?=
 =?us-ascii?Q?2QUgy5DZ6o/j3G8E+YZY5Jep5fye3iUO+6mZ79lyZwT+vJHIgY+ljcoMpPXf?=
 =?us-ascii?Q?vVyj/FNsH8VSPdWuKyJjpXhl2vBwq2F9bIHC0PZYshy82s76HNHF3AzNSBG5?=
 =?us-ascii?Q?Oj6T4RBjizJqf9LcDh2QdP1qH4VYzio+IUKxrt1pT4K/qF4UKhcTk+f5RMOV?=
 =?us-ascii?Q?bJCq9AwJEzeVGMZovMQdwmUuX78LeXP+tfLD0p08SjgjONzF/iFha+UvPfyK?=
 =?us-ascii?Q?1w=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	3uUizWB1+fLTcdZg21xgGuy7lmNfjaq15HIPD+QinP8HiA+Qm+9gvEZcIbTz/0cCes3lUsqwpDnBrfECe7lrAO0Wd4jLDvas0mJo9BE2q6i5oBwxOqI9nVxWRRZo9AN2Myde6sSHUik7/H0al5Av232ysPHJcUgmBr5yADNEYxQXm8v4UwRCfzqTIXOaGZSySIvaFgNSYLK7aLSje7Z+khJ8gL+xbTmV+Xce1oXPtTpeZJNSPNGrGI51o3gTyJdjALEhzsbpJTEt78GigWDch3cYy3/0cK0KRZXTssNuX6ENbLN/oXhlBpuHu2tCpjYdyn6CK7K+a9ZXNdUzw8SSU7uZxavDgb4rE1y9kkcKG+yvQBDSnx9ChjwN//H+pWyYNTf9NuZ3+ogDvDRZfDb0WYyQbACUlew3TbeDa2cS7GfL2wwv0yfbyQFTfnjAB974YOzqDhi7KTB4cgm/stNgM5qnu6MmpMDye4yewVaBx8ElB23PS6LMcCl39h7LfzKS33LCC0kMoPorgOSrx94tdRnjimg2FwYE8s7pJc/kE2x3GZl2iFCV5WHc90HdeNTIyklPDt3ZMHmkmMtwcDVx1owvKs+wy4ukBaqu+XN7GE8=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a95746ba-ea73-4d5b-27d6-08dc314ae648
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2024 13:01:34.1817
 (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: yBuOVX4t3PSoQvqgJx0VHa5whmkVvd/j96fcts0CLoc4CGk1Zi4dxXHrwCiN9EL1rf+RJBHC1opWv70aa14xrg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6894
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-02-19_09,2024-02-19_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0
 suspectscore=0 mlxscore=0 bulkscore=0 spamscore=0 mlxlogscore=999
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402190096
X-Proofpoint-GUID: 1kxUw0izmszh1idV_FVXpG3gSi8AhgJs
X-Proofpoint-ORIG-GUID: 1kxUw0izmszh1idV_FVXpG3gSi8AhgJs

Currently blk_queue_get_max_sectors() is passed a enum req_op. In future
the value returned from blk_queue_get_max_sectors() may depend on certain
request flags, so pass a request pointer.

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

Signed-off-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 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 2d470cf2173e..74e9e775f13d 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -592,7 +592,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 2dc01551e27c..0855f75bcad7 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3046,7 +3046,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 1ef920f72e0f..050696131329 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