From: Bart Van Assche <bart.vanassche@sandisk.com> To: Jens Axboe <axboe@fb.com> Cc: Christoph Hellwig <hch@lst.de>, James Bottomley <jejb@linux.vnet.ibm.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Mike Snitzer <snitzer@redhat.com>, Doug Ledford <dledford@redhat.com>, Keith Busch <keith.busch@intel.com>, Ming Lin <ming.l@ssi.samsung.com>, Laurence Oberman <loberman@redhat.com>, "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>, "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>, "linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>, "linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org> Subject: [PATCH v3 06/11] dm: Use BLK_MQ_S_STOPPED instead of QUEUE_FLAG_STOPPED in blk-mq code Date: Tue, 18 Oct 2016 14:51:33 -0700 [thread overview] Message-ID: <e5facfd0-82d5-10cb-712b-13d7950b78b8@sandisk.com> (raw) In-Reply-To: <b39eb0e7-1007-eb63-8e7f-9a7f08508379@sandisk.com> Instead of manipulating both QUEUE_FLAG_STOPPED and BLK_MQ_S_STOPPED in the dm start and stop queue functions, only manipulate the latter flag. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Mike Snitzer <snitzer@redhat.com> --- drivers/md/dm-rq.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index d5cec26..9c34606 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -75,12 +75,6 @@ static void dm_old_start_queue(struct request_queue *q) static void dm_mq_start_queue(struct request_queue *q) { - unsigned long flags; - - spin_lock_irqsave(q->queue_lock, flags); - queue_flag_clear(QUEUE_FLAG_STOPPED, q); - spin_unlock_irqrestore(q->queue_lock, flags); - blk_mq_start_stopped_hw_queues(q, true); blk_mq_kick_requeue_list(q); } @@ -105,16 +99,8 @@ static void dm_old_stop_queue(struct request_queue *q) static void dm_mq_stop_queue(struct request_queue *q) { - unsigned long flags; - - spin_lock_irqsave(q->queue_lock, flags); - if (blk_queue_stopped(q)) { - spin_unlock_irqrestore(q->queue_lock, flags); + if (blk_mq_queue_stopped(q)) return; - } - - queue_flag_set(QUEUE_FLAG_STOPPED, q); - spin_unlock_irqrestore(q->queue_lock, flags); /* Avoid that requeuing could restart the queue. */ blk_mq_cancel_requeue_work(q); @@ -341,7 +327,7 @@ static void __dm_mq_kick_requeue_list(struct request_queue *q, unsigned long mse unsigned long flags; spin_lock_irqsave(q->queue_lock, flags); - if (!blk_queue_stopped(q)) + if (!blk_mq_queue_stopped(q)) blk_mq_delay_kick_requeue_list(q, msecs); spin_unlock_irqrestore(q->queue_lock, flags); } -- 2.10.1
WARNING: multiple messages have this Message-ID (diff)
From: bart.vanassche@sandisk.com (Bart Van Assche) Subject: [PATCH v3 06/11] dm: Use BLK_MQ_S_STOPPED instead of QUEUE_FLAG_STOPPED in blk-mq code Date: Tue, 18 Oct 2016 14:51:33 -0700 [thread overview] Message-ID: <e5facfd0-82d5-10cb-712b-13d7950b78b8@sandisk.com> (raw) In-Reply-To: <b39eb0e7-1007-eb63-8e7f-9a7f08508379@sandisk.com> Instead of manipulating both QUEUE_FLAG_STOPPED and BLK_MQ_S_STOPPED in the dm start and stop queue functions, only manipulate the latter flag. Signed-off-by: Bart Van Assche <bart.vanassche at sandisk.com> Cc: Mike Snitzer <snitzer at redhat.com> --- drivers/md/dm-rq.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index d5cec26..9c34606 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -75,12 +75,6 @@ static void dm_old_start_queue(struct request_queue *q) static void dm_mq_start_queue(struct request_queue *q) { - unsigned long flags; - - spin_lock_irqsave(q->queue_lock, flags); - queue_flag_clear(QUEUE_FLAG_STOPPED, q); - spin_unlock_irqrestore(q->queue_lock, flags); - blk_mq_start_stopped_hw_queues(q, true); blk_mq_kick_requeue_list(q); } @@ -105,16 +99,8 @@ static void dm_old_stop_queue(struct request_queue *q) static void dm_mq_stop_queue(struct request_queue *q) { - unsigned long flags; - - spin_lock_irqsave(q->queue_lock, flags); - if (blk_queue_stopped(q)) { - spin_unlock_irqrestore(q->queue_lock, flags); + if (blk_mq_queue_stopped(q)) return; - } - - queue_flag_set(QUEUE_FLAG_STOPPED, q); - spin_unlock_irqrestore(q->queue_lock, flags); /* Avoid that requeuing could restart the queue. */ blk_mq_cancel_requeue_work(q); @@ -341,7 +327,7 @@ static void __dm_mq_kick_requeue_list(struct request_queue *q, unsigned long mse unsigned long flags; spin_lock_irqsave(q->queue_lock, flags); - if (!blk_queue_stopped(q)) + if (!blk_mq_queue_stopped(q)) blk_mq_delay_kick_requeue_list(q, msecs); spin_unlock_irqrestore(q->queue_lock, flags); } -- 2.10.1
next prev parent reply other threads:[~2016-10-18 21:51 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-18 21:48 [PATCH v3 0/11] Fix race conditions related to stopping block layer queues Bart Van Assche 2016-10-18 21:48 ` Bart Van Assche 2016-10-18 21:48 ` [PATCH v3 01/11] blk-mq: Do not invoke .queue_rq() for a stopped queue Bart Van Assche 2016-10-18 21:48 ` Bart Van Assche 2016-10-19 13:17 ` Christoph Hellwig 2016-10-19 13:17 ` Christoph Hellwig 2016-10-19 13:17 ` Christoph Hellwig 2016-10-19 23:48 ` Ming Lei 2016-10-19 23:48 ` Ming Lei 2016-10-19 23:48 ` Ming Lei 2016-10-18 21:49 ` [PATCH v3 02/11] blk-mq: Introduce blk_mq_hctx_stopped() Bart Van Assche 2016-10-18 21:49 ` Bart Van Assche 2016-10-19 13:19 ` Christoph Hellwig 2016-10-19 13:19 ` Christoph Hellwig 2016-10-19 13:19 ` Christoph Hellwig 2016-10-19 15:58 ` Bart Van Assche 2016-10-19 15:58 ` Bart Van Assche 2016-10-18 21:49 ` [PATCH v3 03/11] blk-mq: Introduce blk_mq_queue_stopped() Bart Van Assche 2016-10-18 21:49 ` Bart Van Assche 2016-10-19 13:19 ` Christoph Hellwig 2016-10-19 13:19 ` Christoph Hellwig 2016-10-19 13:19 ` Christoph Hellwig 2016-10-18 21:50 ` [PATCH v3 04/11] blk-mq: Introduce blk_mq_quiesce_queue() Bart Van Assche 2016-10-18 21:50 ` Bart Van Assche 2016-10-19 13:23 ` Christoph Hellwig 2016-10-19 13:23 ` Christoph Hellwig 2016-10-19 13:23 ` Christoph Hellwig 2016-10-19 16:13 ` Bart Van Assche 2016-10-19 16:13 ` Bart Van Assche 2016-10-19 21:04 ` Bart Van Assche 2016-10-19 21:04 ` Bart Van Assche 2016-10-19 23:47 ` Ming Lei 2016-10-19 23:47 ` Ming Lei 2016-10-18 21:51 ` [PATCH v3 05/11] blk-mq: Add a kick_requeue_list argument to blk_mq_requeue_request() Bart Van Assche 2016-10-18 21:51 ` Bart Van Assche 2016-10-18 21:51 ` Bart Van Assche 2016-10-19 13:23 ` Christoph Hellwig 2016-10-19 13:23 ` Christoph Hellwig 2016-10-19 13:23 ` Christoph Hellwig 2016-10-18 21:51 ` Bart Van Assche [this message] 2016-10-18 21:51 ` [PATCH v3 06/11] dm: Use BLK_MQ_S_STOPPED instead of QUEUE_FLAG_STOPPED in blk-mq code Bart Van Assche 2016-10-19 13:28 ` Christoph Hellwig 2016-10-19 13:28 ` Christoph Hellwig 2016-10-19 13:28 ` Christoph Hellwig 2016-10-18 21:52 ` [PATCH v3 07/11] dm: Fix a race condition related to stopping and starting queues Bart Van Assche 2016-10-18 21:52 ` Bart Van Assche 2016-10-19 13:30 ` Christoph Hellwig 2016-10-19 13:30 ` Christoph Hellwig 2016-10-19 13:30 ` Christoph Hellwig 2016-10-18 21:52 ` [PATCH v3 08/11] SRP transport: Move queuecommand() wait code to SCSI core Bart Van Assche 2016-10-18 21:52 ` Bart Van Assche 2016-10-19 13:38 ` Christoph Hellwig 2016-10-19 13:38 ` Christoph Hellwig 2016-10-19 13:38 ` Christoph Hellwig 2016-10-18 21:52 ` [PATCH v3 09/11] SRP transport, scsi-mq: Wait for .queue_rq() if necessary Bart Van Assche 2016-10-18 21:52 ` Bart Van Assche 2016-10-19 13:39 ` Christoph Hellwig 2016-10-19 13:39 ` Christoph Hellwig 2016-10-19 13:39 ` Christoph Hellwig 2016-10-18 21:53 ` [PATCH v3 10/11] nvme: Use BLK_MQ_S_STOPPED instead of QUEUE_FLAG_STOPPED in blk-mq code Bart Van Assche 2016-10-18 21:53 ` Bart Van Assche 2016-10-19 13:39 ` Christoph Hellwig 2016-10-19 13:39 ` Christoph Hellwig 2016-10-19 13:39 ` Christoph Hellwig 2016-10-18 21:53 ` [PATCH v3 11/11] nvme: Fix a race condition Bart Van Assche 2016-10-18 21:53 ` Bart Van Assche 2016-10-19 13:41 ` Christoph Hellwig 2016-10-19 13:41 ` Christoph Hellwig 2016-10-19 13:41 ` Christoph Hellwig 2016-10-18 21:56 ` [PATCH v3 0/11] Fix race conditions related to stopping block layer queues Bart Van Assche 2016-10-18 21:56 ` Bart Van Assche 2016-10-18 21:56 ` Bart Van Assche 2016-10-19 22:24 ` Keith Busch 2016-10-19 22:24 ` Keith Busch 2016-10-19 23:51 ` Bart Van Assche 2016-10-19 23:51 ` Bart Van Assche 2016-10-20 14:52 ` Keith Busch 2016-10-20 14:52 ` Keith Busch 2016-10-20 15:35 ` Bart Van Assche 2016-10-20 15:35 ` Bart Van Assche
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=e5facfd0-82d5-10cb-712b-13d7950b78b8@sandisk.com \ --to=bart.vanassche@sandisk.com \ --cc=axboe@fb.com \ --cc=dledford@redhat.com \ --cc=hch@lst.de \ --cc=jejb@linux.vnet.ibm.com \ --cc=keith.busch@intel.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-rdma@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=loberman@redhat.com \ --cc=martin.petersen@oracle.com \ --cc=ming.l@ssi.samsung.com \ --cc=snitzer@redhat.com \ /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: linkBe 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.