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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0D25C433F5 for ; Tue, 12 Oct 2021 16:40:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C661461050 for ; Tue, 12 Oct 2021 16:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229809AbhJLQm0 (ORCPT ); Tue, 12 Oct 2021 12:42:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbhJLQm0 (ORCPT ); Tue, 12 Oct 2021 12:42:26 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88A12C061570 for ; Tue, 12 Oct 2021 09:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Py4hek3Yk4dcmRIBM6Zf9E5K3QQq1QgdZneAGDmto+Y=; b=D5B+pFxQKkdDtGTIxv0nGpZyEd q8B01hxGWB8tHzEFW0bQNHRVbPCVepI2cA7HGcooMyFmLaS2lqRIyummNSuw6ur/4TiwwhbDXHNnM af65LUg6H9s08zlNl7UO2561JGIRRt87Q3J6m/7k6ltwoo1IKJAxRUSUMy23LJKIT+4IDG2aBGwT4 7x5LDWssxtgQIaAD/ag2yjniQjsheGQ+5T9jCR7ra4x0JelEiXyf18qV30ALihC0IEA36ANQWJs9E q+tZyzK/sWFgInbBaH1r7AfxfgS22MM79ZMJbBwuda/AtpAiTy7PAA33XxjU9bpe6ceFfVYEYpvKw wLvjYq6w==; Received: from [2001:4bb8:199:73c5:f5ed:58c2:719f:d965] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1maKna-006euV-K8; Tue, 12 Oct 2021 16:39:16 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Mike Snitzer , linux-block@vger.kernel.org, dm-devel@redhat.com Subject: [PATCH 2/5] dm: open code blk_max_size_offset in max_io_len Date: Tue, 12 Oct 2021 18:36:10 +0200 Message-Id: <20211012163613.994933-3-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012163613.994933-1-hch@lst.de> References: <20211012163613.994933-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org max_io_len always passed in an explicit, non-zero chunk_sectors into blk_max_size_offset. That means much of blk_max_size_offset is not needed and open coding it simplifies the code. Signed-off-by: Christoph Hellwig --- drivers/md/dm.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index a011d09cb0fac..0b6dfe8667438 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -944,24 +944,18 @@ static inline sector_t max_io_len_target_boundary(struct dm_target *ti, static sector_t max_io_len(struct dm_target *ti, sector_t sector) { sector_t target_offset = dm_target_offset(ti, sector); - sector_t len = max_io_len_target_boundary(ti, target_offset); - sector_t max_len; + unsigned int len = max_io_len_target_boundary(ti, target_offset); /* * Does the target need to split IO even further? * - varied (per target) IO splitting is a tenet of DM; this * explains why stacked chunk_sectors based splitting via - * blk_max_size_offset() isn't possible here. So pass in - * ti->max_io_len to override stacked chunk_sectors. + * blk_queue_split() isn't possible here. */ - if (ti->max_io_len) { - max_len = blk_max_size_offset(ti->table->md->queue, - target_offset, ti->max_io_len); - if (len > max_len) - len = max_len; - } - - return len; + if (!ti->max_io_len) + return len; + return min3(len, ti->table->md->queue->limits.max_sectors, + chunk_size_left(target_offset, ti->max_io_len)); } int dm_set_target_max_io_len(struct dm_target *ti, sector_t len) -- 2.30.2 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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4E2FC433F5 for ; Tue, 12 Oct 2021 16:41:47 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D50961050 for ; Tue, 12 Oct 2021 16:41:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5D50961050 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-301-N9aNtQclPtmr3kjiIOba9A-1; Tue, 12 Oct 2021 12:41:43 -0400 X-MC-Unique: N9aNtQclPtmr3kjiIOba9A-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A960F91273; Tue, 12 Oct 2021 16:41:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8846A19C79; Tue, 12 Oct 2021 16:41:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6099E1806D01; Tue, 12 Oct 2021 16:41:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19CGeJS4025568 for ; Tue, 12 Oct 2021 12:40:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id EEC1E44042; Tue, 12 Oct 2021 16:40:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E96F444045 for ; Tue, 12 Oct 2021 16:40:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 82141800141 for ; Tue, 12 Oct 2021 16:40:14 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-554-_AZEYroDOiWsg809F7Bxuw-1; Tue, 12 Oct 2021 12:40:10 -0400 X-MC-Unique: _AZEYroDOiWsg809F7Bxuw-1 Received: from [2001:4bb8:199:73c5:f5ed:58c2:719f:d965] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1maKna-006euV-K8; Tue, 12 Oct 2021 16:39:16 +0000 From: Christoph Hellwig To: Jens Axboe Date: Tue, 12 Oct 2021 18:36:10 +0200 Message-Id: <20211012163613.994933-3-hch@lst.de> In-Reply-To: <20211012163613.994933-1-hch@lst.de> References: <20211012163613.994933-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: dm-devel@redhat.com Cc: linux-block@vger.kernel.org, dm-devel@redhat.com, Mike Snitzer Subject: [dm-devel] [PATCH 2/5] dm: open code blk_max_size_offset in max_io_len X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit max_io_len always passed in an explicit, non-zero chunk_sectors into blk_max_size_offset. That means much of blk_max_size_offset is not needed and open coding it simplifies the code. Signed-off-by: Christoph Hellwig --- drivers/md/dm.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index a011d09cb0fac..0b6dfe8667438 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -944,24 +944,18 @@ static inline sector_t max_io_len_target_boundary(struct dm_target *ti, static sector_t max_io_len(struct dm_target *ti, sector_t sector) { sector_t target_offset = dm_target_offset(ti, sector); - sector_t len = max_io_len_target_boundary(ti, target_offset); - sector_t max_len; + unsigned int len = max_io_len_target_boundary(ti, target_offset); /* * Does the target need to split IO even further? * - varied (per target) IO splitting is a tenet of DM; this * explains why stacked chunk_sectors based splitting via - * blk_max_size_offset() isn't possible here. So pass in - * ti->max_io_len to override stacked chunk_sectors. + * blk_queue_split() isn't possible here. */ - if (ti->max_io_len) { - max_len = blk_max_size_offset(ti->table->md->queue, - target_offset, ti->max_io_len); - if (len > max_len) - len = max_len; - } - - return len; + if (!ti->max_io_len) + return len; + return min3(len, ti->table->md->queue->limits.max_sectors, + chunk_size_left(target_offset, ti->max_io_len)); } int dm_set_target_max_io_len(struct dm_target *ti, sector_t len) -- 2.30.2 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel