From patchwork Tue May 25 02:25:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 12277615 X-Patchwork-Delegate: snitzer@redhat.com 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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 6B083C47084 for ; Tue, 25 May 2021 02:26:16 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 0D2A26141E for ; Tue, 25 May 2021 02:26:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D2A26141E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@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-454-t5rgYBs5OEaT8h2A9nFi2Q-1; Mon, 24 May 2021 22:26:12 -0400 X-MC-Unique: t5rgYBs5OEaT8h2A9nFi2Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E883107ACE4; Tue, 25 May 2021 02:26:08 +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 425395D9D7; Tue, 25 May 2021 02:26:08 +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 10E72180B465; Tue, 25 May 2021 02:26:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14P2Pp7D027680 for ; Mon, 24 May 2021 22:25:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5D5AF1009157; Tue, 25 May 2021 02:25:51 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5900010FFE6A for ; Tue, 25 May 2021 02:25:51 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 41D0C857D08 for ; Tue, 25 May 2021 02:25:51 +0000 (UTC) Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-231-yLnowHrcMGWzxsccbhgZpA-1; Mon, 24 May 2021 22:25:47 -0400 X-MC-Unique: yLnowHrcMGWzxsccbhgZpA-1 IronPort-SDR: bjFeE4zTJXp1sd2cGovJB6eGb7fQBS8CTiTN69D8Phys+xNDvyg0Jjn00myTB5Jiopf5u6V53K ReOPPP15k0iVz6Tyz+SpeddggUz0skEyKqwlnnsMftRPMFhiObs+nKD6X4RlMKLeoWi8/5Rl7t wglaRNtOpMZLmhjixIIjws7g9N+kUWHCAQ3BnH2avy8XX9tIuGnJoEofcaj+cAH3b4sjyDA9sg CEjeeFk1OJVkWr8Z7F3Y7qbW913PC5odPgGS5o6Ga0faMgs9tTtHEpdIDebrjJiiUjaFVkKzJt j74= X-IronPort-AV: E=Sophos;i="5.82,327,1613404800"; d="scan'208";a="273213780" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 25 May 2021 10:26:44 +0800 IronPort-SDR: lbhzU/FeVZTw7gujZ5XkFjfVHiYrRb2WAtOlZ01uKSXQCkr/lgDetdBjiGHlo6u9SdKPgjBxSy R6ja03hPYU6UHFOppniRrFZiR4yz5sA7xEMK4X/3bSjDNBmMuwdoCaxJmIkQGPUmC11bg86vpL Q4w/GXtGV0wlDcLqieWi4h6Z52WkjVeWNnax/e72I7oMQtk+8NGZ4fKPnA+UACqNnLDZP2rb+J 38Bu7N+0wI7FfF1JMlCu6Lh1hnOM0gZ3Eh9PlSCe0VPUf/HECcSuGGQR4CmWBOUtiJzTsaD3lT ooCjegCBdZgdiHZrI1K50Rq9 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2021 19:04:00 -0700 IronPort-SDR: evLdklyIR/hm0PKVBfQN9LdyjlkgpnJ++Xlv8VYAWW9hGyUaDBFyLua/fX5LfD5lLW9bbd/0jP Ht6qUNZ2rEj1YsKoqesMRSoRbjVfhXDFCyuWURAMLnxcsUESk8WCQrZyzlTjLvaKulWjn8V1zk nUfrAwFQW3CubkAhG0Y6HWpIFHKd3HFWnbgwkS4yJmyxblTKkmcM8mS1kXWUr06i3rbaoayNJ5 J3uaBnLFjQq10k4bqIpslfAKcuH4TTcVzOYjQTNWRgvqODnA5TcgKTo+Igi6NDb57IcOsu6Ce5 bT0= WDCIronportException: Internal Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 24 May 2021 19:25:44 -0700 From: Damien Le Moal To: dm-devel@redhat.com, Mike Snitzer , linux-block@vger.kernel.org, Jens Axboe Date: Tue, 25 May 2021 11:25:32 +0900 Message-Id: <20210525022539.119661-5-damien.lemoal@wdc.com> In-Reply-To: <20210525022539.119661-1-damien.lemoal@wdc.com> References: <20210525022539.119661-1-damien.lemoal@wdc.com> MIME-Version: 1.0 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.78 on 10.11.54.3 X-loop: dm-devel@redhat.com Subject: [dm-devel] [PATCH v4 04/11] dm: Fix dm_accept_partial_bio() 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.79 on 10.5.11.14 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 Fix dm_accept_partial_bio() to actually check that zone management commands are not passed as explained in the function documentation comment. Also, since a zone append operation cannot be split, add REQ_OP_ZONE_APPEND as a forbidden command. White lines are added around the group of BUG_ON() calls to make the code more legible. Signed-off-by: Damien Le Moal Reviewed-by: Johannes Thumshirn Reviewed-by: Hannes Reinecke Reviewed-by: Himanshu Madhani --- drivers/md/dm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index ca2aedd8ee7d..a9211575bfed 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1237,8 +1237,9 @@ static int dm_dax_zero_page_range(struct dax_device *dax_dev, pgoff_t pgoff, /* * A target may call dm_accept_partial_bio only from the map routine. It is - * allowed for all bio types except REQ_PREFLUSH, REQ_OP_ZONE_RESET, - * REQ_OP_ZONE_OPEN, REQ_OP_ZONE_CLOSE and REQ_OP_ZONE_FINISH. + * allowed for all bio types except REQ_PREFLUSH, zone management operations + * (REQ_OP_ZONE_RESET, REQ_OP_ZONE_OPEN, REQ_OP_ZONE_CLOSE and + * REQ_OP_ZONE_FINISH) and zone append writes. * * dm_accept_partial_bio informs the dm that the target only wants to process * additional n_sectors sectors of the bio and the rest of the data should be @@ -1268,9 +1269,13 @@ void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors) { struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone); unsigned bi_size = bio->bi_iter.bi_size >> SECTOR_SHIFT; + BUG_ON(bio->bi_opf & REQ_PREFLUSH); + BUG_ON(op_is_zone_mgmt(bio_op(bio))); + BUG_ON(bio_op(bio) == REQ_OP_ZONE_APPEND); BUG_ON(bi_size > *tio->len_ptr); BUG_ON(n_sectors > bi_size); + *tio->len_ptr -= bi_size - n_sectors; bio->bi_iter.bi_size = n_sectors << SECTOR_SHIFT; }