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=unavailable 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 DCF4DC4363A for ; Tue, 27 Oct 2020 00:28:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A2B2F216FD for ; Tue, 27 Oct 2020 00:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603758488; bh=CETs3Ol2tYhpXd6X39ECrE3Vb/usEuYgvpg+kHBIqgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YNl8C0sFBtz3d9J5LsLsBCDb+M0oDGOqCQZDha13i630S8yy9SxtrxawvVYq/emu4 ZQr3mT0l4SbXBer/RXsZJj0/ROK+ZArMNXCeTPH6PyaGfj/r2MhLJrmgGtETlBvGTu LKqEqQ8uCKwk8neyi0/dudU4dIy69sg83/cuHvU0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442568AbgJ0A05 (ORCPT ); Mon, 26 Oct 2020 20:26:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:58586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2410174AbgJZXxp (ORCPT ); Mon, 26 Oct 2020 19:53:45 -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 A651A21D7B; Mon, 26 Oct 2020 23:53:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756425; bh=CETs3Ol2tYhpXd6X39ECrE3Vb/usEuYgvpg+kHBIqgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uAAJUApOr7APh8QMP/ZYJYrTqyUSEkTGvN3BnjlOdGU6yZUL3+6P8HGQADp0Ni7DE dOovwRDywIY4Ow3ZB+EF0iiYYmwZIU7YndMNi4+oAmxQfVEG38sG1Cf8wrNpB8bCoC uv2cHfAt+DSwOBJ7uikcNTUMeuoXlnH8zxSlwdho= 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 5.8 081/132] dm: change max_io_len() to use blk_max_size_offset() Date: Mon, 26 Oct 2020 19:51:13 -0400 Message-Id: <20201026235205.1023962-81-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026235205.1023962-1-sashal@kernel.org> References: <20201026235205.1023962-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: linux-kernel@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 548ad06094e98..4cfd5c88113cb 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1051,22 +1051,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