Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp659828ybi; Fri, 21 Jun 2019 06:08:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDYU5JiaTiWeDt1IjuzatHxyif+PDXZvRokpbV5rPh7Gkdhw/tJlBhCrKqDrqunO/0KWDU X-Received: by 2002:a17:902:5c5:: with SMTP id f63mr130865333plf.176.1561122492542; Fri, 21 Jun 2019 06:08:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561122492; cv=none; d=google.com; s=arc-20160816; b=rno4N6tm1u/qSfyt/z+r1/sCuE01K6RK0WH0F/fFEfKXK9sl/Lf2oh4VeAwAdNR0Zc 7MMT+WwufA3DzL5nNTzzFJNlbnITIYukunD3uHPjz/irURESjPlTtHY2Jt21uW0PZhbN FPHoVA6cCByKvYd7WFPaFHs+8i761LBs3xsm4C5jkcUg4fR216cuMeMve1X3hV+omnt3 wW8Ko+Hra8JS3OmrbhClaKxLhtybPoeUuu01WU18pOq9qHZd23HNRPhT01+iPpauSsJA wVMCh4fG+wwbPY/6IAj8TKY4mzpvKtD+1xXku7kT4eowy3Ww1Vh/ewWOtK12LaijgiEH 9e2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KIxiEPjPFTJ+1vxbl5yjwf7laBnZVBburPM3Qsvxjsc=; b=z7/mYYP/Xsatzq6bhV3jUyZkdTL9sX/VAUJjxwfkLx7tMRFzAQuMh1CQca/6giWaQ/ F+qW4zsZueNCTnLDCRQs52a1w0oAJALGuBms7xODMng1vfSOdayrS+XpXXK9vTCkszhN t2yU5GIEhAwPmp9NCYn1rCfUJ9dad0gCEwxettsz2eIkxP7jNrtIh/9BFlQzuLXA9isa rIc9jXmgYRO5Kw8bmHIGYHeeY5qTZrYDNQ9mVlSQT95oeJGKTDQUfMd46mukdWyAUZgX SpdbtN6x/MAv0ALt60trVdT/npOaB6ZYcqM6sGGWfpC8vwZpHkw0pOuL8Cy6Hhbea4wr sSgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lightnvm-io.20150623.gappssmtp.com header.s=20150623 header.b=jAkjttrk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g6si2609027plm.94.2019.06.21.06.07.56; Fri, 21 Jun 2019 06:08:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@lightnvm-io.20150623.gappssmtp.com header.s=20150623 header.b=jAkjttrk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726944AbfFUNHk (ORCPT + 99 others); Fri, 21 Jun 2019 09:07:40 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:35102 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726881AbfFUNHf (ORCPT ); Fri, 21 Jun 2019 09:07:35 -0400 Received: by mail-lj1-f193.google.com with SMTP id x25so5921179ljh.2 for ; Fri, 21 Jun 2019 06:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KIxiEPjPFTJ+1vxbl5yjwf7laBnZVBburPM3Qsvxjsc=; b=jAkjttrkDBc5StTWyglwMWmrFO5xfZMZEC4/aXMujoVsmJjiVumNp87/zZAkoldEE8 owN6HkrMnD9li+fb0BQuGz+pdNmonPApcLo2UC5s/As+WvpPXm6Ae4a9KqIRojiU04cX KKYXnVSTkkmIUcdOIY1IwzqKt9bIBvIOjMfEsmvnNiPEMhQkCWDAIHC7oGmqIM0MfWSx 2lMX0vWAOdnCAFaWuQgX4llUeqNe/dWyQT5F9eirTWV3QTSeiK0Lg0x+5IvLmbg9jxqa GVVr15lFJs3acP1kyx5aRviZYeEn7le4EWriJvOYYdS3MhRmRuUdX0X5C2NNu1pVZlZ/ FMlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KIxiEPjPFTJ+1vxbl5yjwf7laBnZVBburPM3Qsvxjsc=; b=lumdhDDeKQkp5E9HakinPplrWzxLjk4GKXtd1PVy+Swh4iSDCGHRKZEOiUCQOFIG4o eAGdyHNmWfK68h3TnhXmhwXmD06uWrZCcgJGsymc9FY7mx0tpuTrlhfKwrO3fLNDIYJS eahtPvgl9IjiYnZecB2rsjgG2mrb+/WZCe79jxYqRMF7V4v5zXfoN9GmZAPJ6xz76AMs 5GzfJljNQqYoPqucXsLfUJM2ZlFsGJJYOJ9PpjZGsAsWJFEV8rSzEooIcKuLtGJ1E6UK JkOBJhju1vJawpfjtHLBMMAU1YghCAZCAWC0T8rPyDv5uNHnsCrKqTdKCesNh8OyJ1tI nzCg== X-Gm-Message-State: APjAAAUVGIAx9OZIZuO6UQyqkNHV0KY3JdHS2c9Jh6yGMpYnABqu5ktw 5ThVkgA0Yg7gd5XQ6jFI3OmSPg== X-Received: by 2002:a2e:8847:: with SMTP id z7mr10590901ljj.51.1561122453679; Fri, 21 Jun 2019 06:07:33 -0700 (PDT) Received: from skyninja.webspeed.dk (2-111-91-225-cable.dk.customer.tdc.net. [2.111.91.225]) by smtp.gmail.com with ESMTPSA id r2sm387100lfi.51.2019.06.21.06.07.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 21 Jun 2019 06:07:33 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: axboe@fb.com, hch@lst.de, damien.lemoal@wdc.com, chaitanya.kulkarni@wdc.com, dmitry.fomichev@wdc.com, ajay.joshi@wdc.com, aravind.ramesh@wdc.com, martin.petersen@oracle.com, James.Bottomley@HansenPartnership.com, agk@redhat.com, snitzer@redhat.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, dm-devel@redhat.com Subject: [PATCH 4/4] dm: add zone open, close and finish support Date: Fri, 21 Jun 2019 15:07:11 +0200 Message-Id: <20190621130711.21986-5-mb@lightnvm.io> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190621130711.21986-1-mb@lightnvm.io> References: <20190621130711.21986-1-mb@lightnvm.io> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ajay Joshi Implement REQ_OP_ZONE_OPEN, REQ_OP_ZONE_CLOSE and REQ_OP_ZONE_FINISH support to allow explicit control of zone states. Signed-off-by: Ajay Joshi --- drivers/md/dm-flakey.c | 7 +++---- drivers/md/dm-linear.c | 2 +- drivers/md/dm.c | 5 +++-- include/linux/blk_types.h | 8 ++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c index a9bc518156f2..fff529c0732c 100644 --- a/drivers/md/dm-flakey.c +++ b/drivers/md/dm-flakey.c @@ -280,7 +280,7 @@ static void flakey_map_bio(struct dm_target *ti, struct bio *bio) struct flakey_c *fc = ti->private; bio_set_dev(bio, fc->dev->bdev); - if (bio_sectors(bio) || bio_op(bio) == REQ_OP_ZONE_RESET) + if (bio_sectors(bio) || bio_is_zone_mgmt_op(bio)) bio->bi_iter.bi_sector = flakey_map_sector(ti, bio->bi_iter.bi_sector); } @@ -322,8 +322,7 @@ static int flakey_map(struct dm_target *ti, struct bio *bio) struct per_bio_data *pb = dm_per_bio_data(bio, sizeof(struct per_bio_data)); pb->bio_submitted = false; - /* Do not fail reset zone */ - if (bio_op(bio) == REQ_OP_ZONE_RESET) + if (bio_is_zone_mgmt_op(bio)) goto map_bio; /* Are we alive ? */ @@ -384,7 +383,7 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio, struct flakey_c *fc = ti->private; struct per_bio_data *pb = dm_per_bio_data(bio, sizeof(struct per_bio_data)); - if (bio_op(bio) == REQ_OP_ZONE_RESET) + if (bio_is_zone_mgmt_op(bio)) return DM_ENDIO_DONE; if (!*error && pb->bio_submitted && (bio_data_dir(bio) == READ)) { diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c index ad980a38fb1e..217a1dee8197 100644 --- a/drivers/md/dm-linear.c +++ b/drivers/md/dm-linear.c @@ -90,7 +90,7 @@ static void linear_map_bio(struct dm_target *ti, struct bio *bio) struct linear_c *lc = ti->private; bio_set_dev(bio, lc->dev->bdev); - if (bio_sectors(bio) || bio_op(bio) == REQ_OP_ZONE_RESET) + if (bio_sectors(bio) || bio_is_zone_mgmt_op(bio)) bio->bi_iter.bi_sector = linear_map_sector(ti, bio->bi_iter.bi_sector); } diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 5475081dcbd6..f4507ec20a57 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1176,7 +1176,8 @@ static size_t dm_dax_copy_to_iter(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 and REQ_OP_ZONE_RESET. + * 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. * * 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 @@ -1629,7 +1630,7 @@ static blk_qc_t __split_and_process_bio(struct mapped_device *md, ci.sector_count = 0; error = __send_empty_flush(&ci); /* dec_pending submits any data associated with flush */ - } else if (bio_op(bio) == REQ_OP_ZONE_RESET) { + } else if (bio_is_zone_mgmt_op(bio)) { ci.bio = bio; ci.sector_count = 0; error = __split_and_process_non_flush(&ci); diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 067ef9242275..fd2458cd1a49 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -398,6 +398,14 @@ static inline bool op_is_zone_mgmt_op(enum req_opf op) } } +/* + * Check if the bio is zoned operation. + */ +static inline bool bio_is_zone_mgmt_op(struct bio *bio) +{ + return op_is_zone_mgmt_op(bio_op(bio)); +} + static inline bool op_is_write(unsigned int op) { return (op & 1); -- 2.19.1