[PATCH 19/20] block: shortcut __submit_bio_noacct for blk-mq drivers

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org,
	linux-m68k@lists.linux-m68k.org, linux-xtensa@linux-xtensa.org,
	drbd-dev@lists.linbit.com, linuxppc-dev@lists.ozlabs.org,
	linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org,
	linux-nvdimm@lists.01.org, linux-nvme@lists.infradead.org,
	linux-s390@vger.kernel.org
Subject: [PATCH 19/20] block: shortcut __submit_bio_noacct for blk-mq drivers
Date: Wed,  1 Jul 2020 10:59:46 +0200	[thread overview]
Message-ID: <20200701085947.3354405-20-hch@lst.de> (raw)
In-Reply-To: <20200701085947.3354405-1-hch@lst.de>

For blk-mq drivers bios can only be inserted for the same queue.  So
bypass the complicated sorting logic in __submit_bio_noacct with
a blk-mq simpler submission helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-core.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/block/blk-core.c b/block/blk-core.c
index 57b5dc00d44cb1..2ff166f0d24ee3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1152,6 +1152,34 @@ static blk_qc_t __submit_bio_noacct(struct bio *bio)
 	return ret;
 }
 
+static blk_qc_t __submit_bio_noacct_mq(struct bio *bio)
+{
+	struct gendisk *disk = bio->bi_disk;
+	struct bio_list bio_list;
+	blk_qc_t ret = BLK_QC_T_NONE;
+
+	bio_list_init(&bio_list);
+	current->bio_list = &bio_list;
+
+	do {
+		WARN_ON_ONCE(bio->bi_disk != disk);
+
+		if (unlikely(bio_queue_enter(bio) != 0))
+			continue;
+
+		if (!blk_crypto_bio_prep(&bio)) {
+			blk_queue_exit(disk->queue);
+			ret = BLK_QC_T_NONE;
+			continue;
+		}
+
+		ret = blk_mq_submit_bio(bio);
+	} while ((bio = bio_list_pop(&bio_list)));
+
+	current->bio_list = NULL;
+	return ret;
+}
+
 /**
  * submit_bio_noacct - re-submit a bio to the block device layer for I/O
  * @bio:  The bio describing the location in memory and on the device.
@@ -1177,6 +1205,8 @@ blk_qc_t submit_bio_noacct(struct bio *bio)
 		return BLK_QC_T_NONE;
 	}
 
+	if (!bio->bi_disk->fops->submit_bio)
+		return __submit_bio_noacct_mq(bio);
 	return __submit_bio_noacct(bio);
 }
 EXPORT_SYMBOL(submit_bio_noacct);
-- 
2.26.2
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org

WARNING: multiple messages have this Message-ID (diff)

From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org,
	linux-m68k@lists.linux-m68k.org, linux-xtensa@linux-xtensa.org,
	drbd-dev@lists.linbit.com, linuxppc-dev@lists.ozlabs.org,
	linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org,
	linux-nvdimm@lists.01.org, linux-nvme@lists.infradead.org,
	linux-s390@vger.kernel.org
Subject: [PATCH 19/20] block: shortcut __submit_bio_noacct for blk-mq drivers
Date: Wed,  1 Jul 2020 10:59:46 +0200	[thread overview]
Message-ID: <20200701085947.3354405-20-hch@lst.de> (raw)
In-Reply-To: <20200701085947.3354405-1-hch@lst.de>

For blk-mq drivers bios can only be inserted for the same queue.  So
bypass the complicated sorting logic in __submit_bio_noacct with
a blk-mq simpler submission helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-core.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/block/blk-core.c b/block/blk-core.c
index 57b5dc00d44cb1..2ff166f0d24ee3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1152,6 +1152,34 @@ static blk_qc_t __submit_bio_noacct(struct bio *bio)
 	return ret;
 }
 
+static blk_qc_t __submit_bio_noacct_mq(struct bio *bio)
+{
+	struct gendisk *disk = bio->bi_disk;
+	struct bio_list bio_list;
+	blk_qc_t ret = BLK_QC_T_NONE;
+
+	bio_list_init(&bio_list);
+	current->bio_list = &bio_list;
+
+	do {
+		WARN_ON_ONCE(bio->bi_disk != disk);
+
+		if (unlikely(bio_queue_enter(bio) != 0))
+			continue;
+
+		if (!blk_crypto_bio_prep(&bio)) {
+			blk_queue_exit(disk->queue);
+			ret = BLK_QC_T_NONE;
+			continue;
+		}
+
+		ret = blk_mq_submit_bio(bio);
+	} while ((bio = bio_list_pop(&bio_list)));
+
+	current->bio_list = NULL;
+	return ret;
+}
+
 /**
  * submit_bio_noacct - re-submit a bio to the block device layer for I/O
  * @bio:  The bio describing the location in memory and on the device.
@@ -1177,6 +1205,8 @@ blk_qc_t submit_bio_noacct(struct bio *bio)
 		return BLK_QC_T_NONE;
 	}
 
+	if (!bio->bi_disk->fops->submit_bio)
+		return __submit_bio_noacct_mq(bio);
 	return __submit_bio_noacct(bio);
 }
 EXPORT_SYMBOL(submit_bio_noacct);
-- 
2.26.2

WARNING: multiple messages have this Message-ID (diff)

From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-bcache@vger.kernel.org, linux-xtensa@linux-xtensa.org,
	linux-nvdimm@lists.01.org, linux-s390@vger.kernel.org,
	dm-devel@redhat.com, linux-nvme@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
	linux-m68k@lists.linux-m68k.org, linuxppc-dev@lists.ozlabs.org,
	drbd-dev@lists.linbit.com
Subject: [PATCH 19/20] block: shortcut __submit_bio_noacct for blk-mq drivers
Date: Wed,  1 Jul 2020 10:59:46 +0200	[thread overview]
Message-ID: <20200701085947.3354405-20-hch@lst.de> (raw)
In-Reply-To: <20200701085947.3354405-1-hch@lst.de>

For blk-mq drivers bios can only be inserted for the same queue.  So
bypass the complicated sorting logic in __submit_bio_noacct with
a blk-mq simpler submission helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-core.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/block/blk-core.c b/block/blk-core.c
index 57b5dc00d44cb1..2ff166f0d24ee3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1152,6 +1152,34 @@ static blk_qc_t __submit_bio_noacct(struct bio *bio)
 	return ret;
 }
 
+static blk_qc_t __submit_bio_noacct_mq(struct bio *bio)
+{
+	struct gendisk *disk = bio->bi_disk;
+	struct bio_list bio_list;
+	blk_qc_t ret = BLK_QC_T_NONE;
+
+	bio_list_init(&bio_list);
+	current->bio_list = &bio_list;
+
+	do {
+		WARN_ON_ONCE(bio->bi_disk != disk);
+
+		if (unlikely(bio_queue_enter(bio) != 0))
+			continue;
+
+		if (!blk_crypto_bio_prep(&bio)) {
+			blk_queue_exit(disk->queue);
+			ret = BLK_QC_T_NONE;
+			continue;
+		}
+
+		ret = blk_mq_submit_bio(bio);
+	} while ((bio = bio_list_pop(&bio_list)));
+
+	current->bio_list = NULL;
+	return ret;
+}
+
 /**
  * submit_bio_noacct - re-submit a bio to the block device layer for I/O
  * @bio:  The bio describing the location in memory and on the device.
@@ -1177,6 +1205,8 @@ blk_qc_t submit_bio_noacct(struct bio *bio)
 		return BLK_QC_T_NONE;
 	}
 
+	if (!bio->bi_disk->fops->submit_bio)
+		return __submit_bio_noacct_mq(bio);
 	return __submit_bio_noacct(bio);
 }
 EXPORT_SYMBOL(submit_bio_noacct);
-- 
2.26.2


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

WARNING: multiple messages have this Message-ID (diff)

From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-bcache@vger.kernel.org, linux-xtensa@linux-xtensa.org,
	linux-nvdimm@lists.01.org, linux-s390@vger.kernel.org,
	dm-devel@redhat.com, linux-nvme@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
	linux-m68k@lists.linux-m68k.org, linuxppc-dev@lists.ozlabs.org,
	drbd-dev@lists.linbit.com
Subject: [PATCH 19/20] block: shortcut __submit_bio_noacct for blk-mq drivers
Date: Wed,  1 Jul 2020 10:59:46 +0200	[thread overview]
Message-ID: <20200701085947.3354405-20-hch@lst.de> (raw)
In-Reply-To: <20200701085947.3354405-1-hch@lst.de>

For blk-mq drivers bios can only be inserted for the same queue.  So
bypass the complicated sorting logic in __submit_bio_noacct with
a blk-mq simpler submission helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-core.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/block/blk-core.c b/block/blk-core.c
index 57b5dc00d44cb1..2ff166f0d24ee3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1152,6 +1152,34 @@ static blk_qc_t __submit_bio_noacct(struct bio *bio)
 	return ret;
 }
 
+static blk_qc_t __submit_bio_noacct_mq(struct bio *bio)
+{
+	struct gendisk *disk = bio->bi_disk;
+	struct bio_list bio_list;
+	blk_qc_t ret = BLK_QC_T_NONE;
+
+	bio_list_init(&bio_list);
+	current->bio_list = &bio_list;
+
+	do {
+		WARN_ON_ONCE(bio->bi_disk != disk);
+
+		if (unlikely(bio_queue_enter(bio) != 0))
+			continue;
+
+		if (!blk_crypto_bio_prep(&bio)) {
+			blk_queue_exit(disk->queue);
+			ret = BLK_QC_T_NONE;
+			continue;
+		}
+
+		ret = blk_mq_submit_bio(bio);
+	} while ((bio = bio_list_pop(&bio_list)));
+
+	current->bio_list = NULL;
+	return ret;
+}
+
 /**
  * submit_bio_noacct - re-submit a bio to the block device layer for I/O
  * @bio:  The bio describing the location in memory and on the device.
@@ -1177,6 +1205,8 @@ blk_qc_t submit_bio_noacct(struct bio *bio)
 		return BLK_QC_T_NONE;
 	}
 
+	if (!bio->bi_disk->fops->submit_bio)
+		return __submit_bio_noacct_mq(bio);
 	return __submit_bio_noacct(bio);
 }
 EXPORT_SYMBOL(submit_bio_noacct);
-- 
2.26.2

next prev parent reply	other threads:[~2020-07-01  9:00 UTC|newest]

Thread overview: 121+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-01  8:59 rename ->make_request_fn and move it to the block_device_operations v2 Christoph Hellwig
2020-07-01  8:59 ` Christoph Hellwig
2020-07-01  8:59 ` Christoph Hellwig
2020-07-01  8:59 ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 01/20] nfblock: stop using ->queuedata Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 02/20] simdisk: " Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 03/20] drbd: " Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 04/20] null_blk: stop using ->queuedata for bio mode Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 05/20] ps3vram: stop using ->queuedata Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 06/20] rsxx: " Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 07/20] umem: " Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 08/20] zram: " Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 09/20] bcache: stop setting ->queuedata Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-02 14:47   ` Coly Li
2020-07-02 14:47     ` Coly Li
2020-07-02 14:47     ` Coly Li
2020-07-02 14:47     ` Coly Li
2020-07-01  8:59 ` [PATCH 10/20] dm: stop using ->queuedata Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01 17:24   ` Mike Snitzer
2020-07-01 17:24     ` Mike Snitzer
2020-07-01 17:24     ` Mike Snitzer
2020-07-01 17:24     ` Mike Snitzer
2020-07-01  8:59 ` [PATCH 11/20] fs: remove a weird comment in submit_bh_wbc Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 12/20] block: remove the request_queue argument from blk_queue_split Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-02  6:14   ` Song Liu
2020-07-02  6:14     ` Song Liu
2020-07-02  6:14     ` Song Liu
2020-07-02  6:14     ` Song Liu
2020-07-01  8:59 ` [PATCH 13/20] block: tidy up a warning in bio_check_ro Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 14/20] block: remove the NULL queue check in generic_make_request_checks Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 15/20] block: remove the nr_sectors variable " Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 16/20] block: move ->make_request_fn to struct block_device_operations Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01 16:08   ` Dan Williams
2020-07-01 16:08     ` Dan Williams
2020-07-01 16:08     ` Dan Williams
2020-07-01 16:08     ` Dan Williams
2020-07-01 16:08     ` Dan Williams
2020-07-02 14:48   ` Coly Li
2020-07-02 14:48     ` Coly Li
2020-07-02 14:48     ` Coly Li
2020-07-02 14:48     ` Coly Li
2020-07-01  8:59 ` [PATCH 17/20] block: rename generic_make_request to submit_bio_noacct Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-02 14:51   ` Coly Li
2020-07-02 14:51     ` Coly Li
2020-07-02 14:51     ` Coly Li
2020-07-02 14:51     ` Coly Li
2020-07-02 18:22   ` Song Liu
2020-07-02 18:22     ` Song Liu
2020-07-02 18:22     ` Song Liu
2020-07-02 18:22     ` Song Liu
2020-07-01  8:59 ` [PATCH 18/20] block: refator submit_bio_noacct Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` Christoph Hellwig [this message]
2020-07-01  8:59   ` [PATCH 19/20] block: shortcut __submit_bio_noacct for blk-mq drivers Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59 ` [PATCH 20/20] block: remove direct_make_request Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01  8:59   ` Christoph Hellwig
2020-07-01 13:43 ` rename ->make_request_fn and move it to the block_device_operations v2 Jens Axboe
2020-07-01 13:43   ` Jens Axboe
2020-07-01 13:43   ` Jens Axboe
2020-07-01 13:43   ` Jens Axboe
  -- strict thread matches above, loose matches on Subject: below --
2020-06-29 19:39 rename ->make_request_fn and move it to the block_device_operations Christoph Hellwig
2020-06-29 19:39 ` [PATCH 19/20] block: shortcut __submit_bio_noacct for blk-mq drivers Christoph Hellwig
2020-06-29 19:39   ` Christoph Hellwig
2020-06-29 19:39   ` Christoph Hellwig
2020-06-29 19:39   ` Christoph Hellwig

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:57b5dc00d44cb dfblob:57b5dc00d44cb dfblob:57b5dc00d44cb
dfblob:57b5dc00d44cb dfblob:2ff166f0d24ee dfblob:2ff166f0d24ee
dfblob:2ff166f0d24ee dfblob:2ff166f0d24ee
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200701085947.3354405-20-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=dm-devel@redhat.com \
    --cc=drbd-dev@lists.linbit.com \
    --cc=linux-bcache@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-xtensa@linux-xtensa.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.