From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3CEDC4363A for ; Tue, 27 Oct 2020 00:05:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C3B820754 for ; Tue, 27 Oct 2020 00:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757156; bh=HptbN3TP/J/XnFtW9+fTiG+a6nfsFA0MuQIXf8C2grM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IzaunKV1qmrRXTxc/2A3zqDFenVNHGg7t+1M74w8wdvveKUz0cPvblqijYlmoxWRZ QL3gwewZb4D8tOoTrR6oHy4jgyX/l+oYPXEUGwqXB3m6PcQV6w5+1a9A2CJZMbukYN fV4YuZXIILGFJudRAa/EnbF6PPAhNulun/4RBa/4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389264AbgJ0AFy (ORCPT ); Mon, 26 Oct 2020 20:05:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:53852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438059AbgJ0AFA (ORCPT ); Mon, 26 Oct 2020 20:05:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3663720791; Tue, 27 Oct 2020 00:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757099; bh=HptbN3TP/J/XnFtW9+fTiG+a6nfsFA0MuQIXf8C2grM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KwWvka5ctQQl+72jvFXdhkehRgofwIVSNjskELb28CfBMeGmd7nuL1vdeU8RFhonL cpKkhrl/JbA8+XXSUiSQRna22Hj9ioKnb0dQIEgVwKexxhwtoVeYGr3cxQOgPyQZxK kUJ5h4Hfy2GeSZkSqixMOJq4tmc4xP3WJSzxU1xY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mike Snitzer , Sasha Levin , dm-devel@redhat.com Subject: [PATCH AUTOSEL 4.19 37/60] dm: change max_io_len() to use blk_max_size_offset() Date: Mon, 26 Oct 2020 20:03:52 -0400 Message-Id: <20201027000415.1026364-37-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201027000415.1026364-1-sashal@kernel.org> References: <20201027000415.1026364-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mike Snitzer [ Upstream commit 5091cdec56faeaefa79de4b6cb3c3c55e50d1ac3 ] Using blk_max_size_offset() enables DM core's splitting to impose ti->max_io_len (via q->limits.chunk_sectors) and also fallback to respecting q->limits.max_sectors if chunk_sectors isn't set. Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 874bd542a7445..571d1cb2f6221 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -992,22 +992,18 @@ static sector_t max_io_len_target_boundary(sector_t sector, struct dm_target *ti static sector_t max_io_len(sector_t sector, struct dm_target *ti) { sector_t len = max_io_len_target_boundary(sector, ti); - sector_t offset, max_len; + sector_t max_len; /* * Does the target need to split even further? + * - q->limits.chunk_sectors reflects ti->max_io_len so + * blk_max_size_offset() provides required splitting. + * - blk_max_size_offset() also respects q->limits.max_sectors */ - if (ti->max_io_len) { - offset = dm_target_offset(ti, sector); - if (unlikely(ti->max_io_len & (ti->max_io_len - 1))) - max_len = sector_div(offset, ti->max_io_len); - else - max_len = offset & (ti->max_io_len - 1); - max_len = ti->max_io_len - max_len; - - if (len > max_len) - len = max_len; - } + max_len = blk_max_size_offset(dm_table_get_md(ti->table)->queue, + dm_target_offset(ti, sector)); + if (len > max_len) + len = max_len; return len; } -- 2.25.1