mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Julia Cartwright <julia@ni.com>
To: linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Steven Rostedt <rostedt@goodmis.org>,
	Carsten Emde <C.Emde@osadl.org>,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	John Kacur <jkacur@redhat.com>,
	Paul Gortmaker <paul.gortmaker@windriver.com>,
	Daniel Wagner <daniel.wagner@siemens.com>,
	tom.zanussi@linux.intel.com, stable-rt@vger.kernel.org
Subject: [PATCH RT 15/22] Revert "block: blk-mq: Use swait"
Date: Mon,  6 Aug 2018 04:17:31 -0500	[thread overview]
Message-ID: <8ef3b21d6eae4978b052c3384bc205f355cc92c2.1533540554.git.julia@ni.com> (raw)
In-Reply-To: <cover.1533540554.git.julia@ni.com>

From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

4.9.115-rt94-rc1 stable review patch.
If you have any objection to the inclusion of this patch, let me know.

--- 8< --- 8< --- 8< ---
This reverts commit "block: blk-mq: Use swait". The issue remains but
will be fixed differently.

Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
(cherry-picked from ca3fd6cf836739fd59eac2f7a9b0261365e818bb)
Signed-off-by: Julia Cartwright <julia@ni.com>
---
 block/blk-core.c       | 10 +++++-----
 block/blk-mq.c         |  6 +++---
 include/linux/blkdev.h |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index e4ac43392875..87d3e0a503e5 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -662,9 +662,9 @@ int blk_queue_enter(struct request_queue *q, bool nowait)
 		if (nowait)
 			return -EBUSY;
 
-		swait_event(q->mq_freeze_wq,
-			    !atomic_read(&q->mq_freeze_depth) ||
-			    blk_queue_dying(q));
+		wait_event(q->mq_freeze_wq,
+			   !atomic_read(&q->mq_freeze_depth) ||
+			   blk_queue_dying(q));
 		if (blk_queue_dying(q))
 			return -ENODEV;
 	}
@@ -680,7 +680,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
 	struct request_queue *q =
 		container_of(ref, struct request_queue, q_usage_counter);
 
-	swake_up_all(&q->mq_freeze_wq);
+	wake_up_all(&q->mq_freeze_wq);
 }
 
 static void blk_rq_timed_out_timer(unsigned long data)
@@ -750,7 +750,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 	q->bypass_depth = 1;
 	__set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
 
-	init_swait_queue_head(&q->mq_freeze_wq);
+	init_waitqueue_head(&q->mq_freeze_wq);
 
 	/*
 	 * Init percpu_ref in atomic mode so that it's faster to shutdown.
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e0a804ab5420..3a49552974ec 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -72,7 +72,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start);
 
 static void blk_mq_freeze_queue_wait(struct request_queue *q)
 {
-	swait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
+	wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
 }
 
 /*
@@ -110,7 +110,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q)
 	WARN_ON_ONCE(freeze_depth < 0);
 	if (!freeze_depth) {
 		percpu_ref_reinit(&q->q_usage_counter);
-		swake_up_all(&q->mq_freeze_wq);
+		wake_up_all(&q->mq_freeze_wq);
 	}
 }
 EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);
@@ -129,7 +129,7 @@ void blk_mq_wake_waiters(struct request_queue *q)
 	 * dying, we need to ensure that processes currently waiting on
 	 * the queue are notified as well.
 	 */
-	swake_up_all(&q->mq_freeze_wq);
+	wake_up_all(&q->mq_freeze_wq);
 }
 
 bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 34fd1ed9845e..fdb449fe3ff7 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -468,7 +468,7 @@ struct request_queue {
 	struct throtl_data *td;
 #endif
 	struct rcu_head		rcu_head;
-	struct swait_queue_head	mq_freeze_wq;
+	wait_queue_head_t	mq_freeze_wq;
 	struct percpu_ref	q_usage_counter;
 	struct list_head	all_q_node;
 
-- 
2.18.0


  parent reply	other threads:[~2018-08-06  9:18 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-06  9:17 [PATCH RT 00/22] Linux 4.9.115-rt94-rc1 Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 01/22] futex: Fix pi_state->owner serialization Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 02/22] futex: Fix more put_pi_state() vs. exit_pi_state_list() races Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 03/22] futex: Avoid violating the 10th rule of futex Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 04/22] futex: Fix OWNER_DEAD fixup Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 05/22] rtmutex: Make rt_mutex_futex_unlock() safe for irq-off callsites Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 06/22] rcu: Do not include rtmutex_common.h unconditionally Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 07/22] rcu: Suppress lockdep false-positive ->boost_mtx complaints Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 08/22] sched, tracing: Fix trace_sched_pi_setprio() for deboosting Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 09/22] crypto: limit more FPU-enabled sections Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 10/22] arm*: disable NEON in kernel mode Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 11/22] mm/slub: close possible memory-leak in kmem_cache_alloc_bulk() Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 12/22] locking: add types.h Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 13/22] net: use task_struct instead of CPU number as the queue owner on -RT Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 14/22] Revert "rt,ntp: Move call to schedule_delayed_work() to helper thread" Julia Cartwright
2018-08-06  9:17 ` Julia Cartwright [this message]
2018-08-06  9:17 ` [PATCH RT 16/22] block: blk-mq: move blk_queue_usage_counter_release() into process context Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 17/22] alarmtimer: Prevent live lock in alarm_cancel() Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 18/22] posix-timers: move the rcu head out of the union Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 19/22] locallock: provide {get,put}_locked_ptr() variants Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 20/22] squashfs: make use of local lock in multi_cpu decompressor Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 21/22] seqlock: provide the same ordering semantics as mainline Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 22/22] Linux 4.9.115-rt94-rc1 Julia Cartwright

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=8ef3b21d6eae4978b052c3384bc205f355cc92c2.1533540554.git.julia@ni.com \
    --to=julia@ni.com \
    --cc=C.Emde@osadl.org \
    --cc=bigeasy@linutronix.de \
    --cc=daniel.wagner@siemens.com \
    --cc=jkacur@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    --cc=rostedt@goodmis.org \
    --cc=stable-rt@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=tom.zanussi@linux.intel.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®