Skip to contentSkip to conversation

dm-multipath: push back requests instead of queueing

PATCH Superseded Hannes Reinecke 3 participants 13 messages Jan 17, 2014 – Jan 30, 2014 Device mapper

v2 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v2 cover dm-multipath: push back requests instead of queueing

Hi all,

dm-multipath still carries around it's own queueing framework for implementing 'queue_if_no_path'.
However, there is no real reason for this; we could as well push back the requests onto the request_queue.
In doing so we can also reduce the memory pressure during fail_if_no_path scenarios, as we don't have to allocate a context for each request when it need to be requeued.

This patchset is the reworked version from the original, including the review by Jun'ichi.

Hannes Reinecke (2):
dm-mpath: push back requests instead of queueing
dm-mpath: reduce memory pressure during requeuing

 drivers/md/dm-mpath.c         | 183 +++++++++++++-----------------------------
 drivers/md/dm.c               |  13 +++
 include/linux/device-mapper.h |   1 +
 3 files changed, 71 insertions(+), 126 deletions(-)
Signature · 1 line
1.7.12.4
#1 lore raw

PATCH v2 1/2 dm-multipath: push back requests instead of queueing

There is no reason why multipath needs to queue requests internally for queue_if_no_path or pg_init; we should rather push them back onto the request queue.

And while we're at it we can simplify the conditional statement in map_io() to make it easier to read.

Cc Mike Snitzer <[email protected]>
Cc Jun'ichi Nomura <[email protected]>
---
 drivers/md/dm-mpath.c         | 167 ++++++++++++++----------------------------
 drivers/md/dm.c               |  13 ++++
 include/linux/device-mapper.h |   1 +
 3 files changed, 67 insertions(+), 114 deletions(-)
drivers/md/dm-mpath.c +53 -114
index 6eb9dc9..71c6f2c 100644
@@ -93,10 +93,6 @@ struct multipath {
 	unsigned pg_init_count;		/* Number of times pg_init called */
 	unsigned pg_init_delay_msecs;	/* Number of msecs before pg_init retry */
 
-	unsigned queue_size;
-	struct work_struct process_queued_ios;
-	struct list_head queued_ios;
-
 	struct work_struct trigger_event;
 
 	/*
@@ -121,9 +117,9 @@ typedef int (*action_fn) (struct pgpath *pgpath);
 static struct kmem_cache *_mpio_cache;
 
 static struct workqueue_struct *kmultipathd, *kmpath_handlerd;
-static void process_queued_ios(struct work_struct *work);
 static void trigger_event(struct work_struct *work);
 static void activate_path(struct work_struct *work);
+static int __pgpath_busy(struct pgpath *pgpath);
 
 
 /*-----------------------------------------------
@@ -195,11 +191,9 @@ static struct multipath *alloc_multipath(struct dm_target *ti)
 	m = kzalloc(sizeof(*m), GFP_KERNEL);
 	if (m) {
 		INIT_LIST_HEAD(&m->priority_groups);
-		INIT_LIST_HEAD(&m->queued_ios);
 		spin_lock_init(&m->lock);
 		m->queue_io = 1;
 		m->pg_init_delay_msecs = DM_PG_INIT_DELAY_DEFAULT;
-		INIT_WORK(&m->process_queued_ios, process_queued_ios);
 		INIT_WORK(&m->trigger_event, trigger_event);
 		init_waitqueue_head(&m->pg_init_wait);
 		mutex_init(&m->work_mutex);
@@ -261,6 +255,9 @@ static void __pg_init_all_paths(struct multipath *m)
 	struct pgpath *pgpath;
 	unsigned long pg_init_delay = 0;
 
+	if (m->pg_init_in_progress || m->pg_init_disabled)
+		return;
+
 	m->pg_init_count++;
 	m->pg_init_required = 0;
 	if (m->pg_init_delay_retry)
@@ -365,12 +362,15 @@ failed:
  */
 static int __must_push_back(struct multipath *m)
 {
-	return (m->queue_if_no_path != m->saved_queue_if_no_path &&
-		dm_noflush_suspending(m->ti));
+	return (m->queue_if_no_path ||
+		(m->queue_if_no_path != m->saved_queue_if_no_path &&
+		 dm_noflush_suspending(m->ti)));
 }
 
+#define pg_ready(m) (!(m)->queue_io && !(m)->pg_init_required)
+
 static int map_io(struct multipath *m, struct request *clone,
-		  union map_info *map_context, unsigned was_queued)
+		  union map_info *map_context)
 {
 	int r = DM_MAPIO_REMAPPED;
 	size_t nr_bytes = blk_rq_bytes(clone);
@@ -388,37 +388,30 @@ static int map_io(struct multipath *m, struct request *clone,
 
 	pgpath = m->current_pgpath;
 
-	if (was_queued)
-		m->queue_size--;
-
-	if (m->pg_init_required) {
-		if (!m->pg_init_in_progress)
-			queue_work(kmultipathd, &m->process_queued_ios);
-		r = DM_MAPIO_REQUEUE;
-	} else if ((pgpath && m->queue_io) ||
-		   (!pgpath && m->queue_if_no_path)) {
-		/* Queue for the daemon to resubmit */
-		list_add_tail(&clone->queuelist, &m->queued_ios);
-		m->queue_size++;
-		if (!m->queue_io)
-			queue_work(kmultipathd, &m->process_queued_ios);
-		pgpath = NULL;
-		r = DM_MAPIO_SUBMITTED;
-	} else if (pgpath) {
-		bdev = pgpath->path.dev->bdev;
-		clone->q = bdev_get_queue(bdev);
-		clone->rq_disk = bdev->bd_disk;
-	} else if (__must_push_back(m))
-		r = DM_MAPIO_REQUEUE;
-	else
-		r = -EIO;	/* Failed */
-
-	mpio->pgpath = pgpath;
-	mpio->nr_bytes = nr_bytes;
-
-	if (r == DM_MAPIO_REMAPPED && pgpath->pg->ps.type->start_io)
-		pgpath->pg->ps.type->start_io(&pgpath->pg->ps, &pgpath->path,
-					      nr_bytes);
+	if (pgpath) {
+		if (__pgpath_busy(pgpath))
+			r = DM_MAPIO_REQUEUE;
+		else if (pg_ready(m)) {
+			bdev = pgpath->path.dev->bdev;
+			clone->q = bdev_get_queue(bdev);
+			clone->rq_disk = bdev->bd_disk;
+			mpio->pgpath = pgpath;
+			mpio->nr_bytes = nr_bytes;
+			if (pgpath->pg->ps.type->start_io)
+				pgpath->pg->ps.type->start_io(&pgpath->pg->ps,
+							      &pgpath->path,
+							      nr_bytes);
+		} else {
+			__pg_init_all_paths(m);
+			r = DM_MAPIO_REQUEUE;
+		}
+	} else {
+		/* No path */
+		if (__must_push_back(m))
+			r = DM_MAPIO_REQUEUE;
+		else
+			r = -EIO;	/* Failed */
+	}
 
 	spin_unlock_irqrestore(&m->lock, flags);
 
@@ -440,76 +433,14 @@ static int queue_if_no_path(struct multipath *m, unsigned queue_if_no_path,
 	else
 		m->saved_queue_if_no_path = queue_if_no_path;
 	m->queue_if_no_path = queue_if_no_path;
-	if (!m->queue_if_no_path && m->queue_size)
-		queue_work(kmultipathd, &m->process_queued_ios);
+	if (!m->queue_if_no_path)
+		dm_table_run_queue(m->ti->table);
 
 	spin_unlock_irqrestore(&m->lock, flags);
 
 	return 0;
 }
 
-/*-----------------------------------------------------------------
- * The multipath daemon is responsible for resubmitting queued ios.
- *---------------------------------------------------------------*/
-
-static void dispatch_queued_ios(struct multipath *m)
-{
-	int r;
-	unsigned long flags;
-	union map_info *info;
-	struct request *clone, *n;
-	LIST_HEAD(cl);
-
-	spin_lock_irqsave(&m->lock, flags);
-	list_splice_init(&m->queued_ios, &cl);
-	spin_unlock_irqrestore(&m->lock, flags);
-
-	list_for_each_entry_safe(clone, n, &cl, queuelist) {
-		list_del_init(&clone->queuelist);
-
-		info = dm_get_rq_mapinfo(clone);
-
-		r = map_io(m, clone, info, 1);
-		if (r < 0) {
-			clear_mapinfo(m, info);
-			dm_kill_unmapped_request(clone, r);
-		} else if (r == DM_MAPIO_REMAPPED)
-			dm_dispatch_request(clone);
-		else if (r == DM_MAPIO_REQUEUE) {
-			clear_mapinfo(m, info);
-			dm_requeue_unmapped_request(clone);
-		}
-	}
-}
-
-static void process_queued_ios(struct work_struct *work)
-{
-	struct multipath *m =
-		container_of(work, struct multipath, process_queued_ios);
-	struct pgpath *pgpath = NULL;
-	unsigned must_queue = 1;
-	unsigned long flags;
-
-	spin_lock_irqsave(&m->lock, flags);
-
-	if (!m->current_pgpath)
-		__choose_pgpath(m, 0);
-
-	pgpath = m->current_pgpath;
-
-	if ((pgpath && !m->queue_io) ||
-	    (!pgpath && !m->queue_if_no_path))
-		must_queue = 0;
-
-	if (m->pg_init_required && !m->pg_init_in_progress && pgpath &&
-	    !m->pg_init_disabled)
-		__pg_init_all_paths(m);
-
-	spin_unlock_irqrestore(&m->lock, flags);
-	if (!must_queue)
-		dispatch_queued_ios(m);
-}
-
 /*
  * An event is triggered whenever a path is taken out of use.
  * Includes path failure and PG bypass.
@@ -985,7 +916,7 @@ static int multipath_map(struct dm_target *ti, struct request *clone,
 		return DM_MAPIO_REQUEUE;
 
 	clone->cmd_flags |= REQ_FAILFAST_TRANSPORT;
-	r = map_io(m, clone, map_context, 0);
+	r = map_io(m, clone, map_context);
 	if (r < 0 || r == DM_MAPIO_REQUEUE)
 		clear_mapinfo(m, map_context);
 
@@ -1054,9 +985,8 @@ static int reinstate_path(struct pgpath *pgpath)
 
 	pgpath->is_active = 1;
 
-	if (!m->nr_valid_paths++ && m->queue_size) {
+	if (!m->nr_valid_paths++) {
 		m->current_pgpath = NULL;
-		queue_work(kmultipathd, &m->process_queued_ios);
 	} else if (m->hw_handler_name && (m->current_pg == pgpath->pg)) {
 		if (queue_work(kmpath_handlerd, &pgpath->activate_path.work))
 			m->pg_init_in_progress++;
@@ -1069,6 +999,8 @@ static int reinstate_path(struct pgpath *pgpath)
 
 out:
 	spin_unlock_irqrestore(&m->lock, flags);
+	if (!r)
+		dm_table_run_queue(m->ti->table);
 
 	return r;
 }
@@ -1256,7 +1188,8 @@ static void pg_init_done(void *data, int errors)
 		m->queue_io = 0;
 
 	m->pg_init_delay_retry = delay_retry;
-	queue_work(kmultipathd, &m->process_queued_ios);
+	if (!m->queue_io)
+		dm_table_run_queue(m->ti->table);
 
 	/*
 	 * Wake up any thread waiting to suspend.
@@ -1433,7 +1366,8 @@ static void multipath_status(struct dm_target *ti, status_type_t type,
 
 	/* Features */
 	if (type == STATUSTYPE_INFO)
-		DMEMIT("2 %u %u ", m->queue_size, m->pg_init_count);
+		DMEMIT("2 %u %u ", (m->queue_io << 1) + m->queue_if_no_path,
+		       m->pg_init_count);
 	else {
 		DMEMIT("%u ", m->queue_if_no_path +
 			      (m->pg_init_retries > 0) * 2 +
@@ -1606,7 +1540,7 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 
 	spin_lock_irqsave(&m->lock, flags);
 
-	if (!m->current_pgpath)
+	if (!m->current_pgpath || !m->queue_io)
 		__choose_pgpath(m, 0);
 
 	pgpath = m->current_pgpath;
@@ -1629,8 +1563,13 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 	if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT)
 		r = scsi_verify_blk_ioctl(NULL, cmd);
 
-	if (r == -ENOTCONN && !fatal_signal_pending(current))
-		queue_work(kmultipathd, &m->process_queued_ios);
+	if (r == -ENOTCONN && !fatal_signal_pending(current)) {
+		spin_lock_irqsave(&m->lock, flags);
+		if (m->current_pgpath && m->pg_init_required)
+			__pg_init_all_paths(m);
+		spin_unlock_irqrestore(&m->lock, flags);
+		dm_table_run_queue(m->ti->table);
+	}
 
 	return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);
 }
@@ -1681,7 +1620,7 @@ static int multipath_busy(struct dm_target *ti)
 	spin_lock_irqsave(&m->lock, flags);
 
 	/* pg_init in progress, requeue until done */
-	if (m->pg_init_in_progress) {
+	if (!pg_ready(m)) {
 		busy = 1;
 		goto out;
 	}
drivers/md/dm.c +13 -0
index 0704c52..291491b 100644
@@ -1912,6 +1912,19 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
 	return r;
 }
 
+void dm_table_run_queue(struct dm_table *t)
+{
+	struct mapped_device *md = dm_table_get_md(t);
+	unsigned long flags;
+
+	if (md->queue) {
+		spin_lock_irqsave(md->queue->queue_lock, flags);
+		blk_run_queue_async(md->queue);
+		spin_unlock_irqrestore(md->queue->queue_lock, flags);
+	}
+}
+EXPORT_SYMBOL_GPL(dm_table_run_queue);
+
 /*-----------------------------------------------------------------
  * An IDR is used to keep track of allocated minor numbers.
  *---------------------------------------------------------------*/
include/linux/device-mapper.h +1 -0
index ed419c6..a33653f 100644
@@ -604,5 +604,6 @@ void dm_dispatch_request(struct request *rq);
 void dm_requeue_unmapped_request(struct request *rq);
 void dm_kill_unmapped_request(struct request *rq, int error);
 int dm_underlying_device_busy(struct request_queue *q);
+void dm_table_run_queue(struct dm_table *t);
 
 #endif	/* _LINUX_DEVICE_MAPPER_H */
Signature · 1 line
1.7.12.4
#2 lore raw

drivers/md/dm-mpath.c static void pg_init_done(void *data, int errors) · line 1195

Quoted 10 lines · Hannes Reinecke
drivers/md/dm-mpath.c +2 -1
@@ -1256,7 +1188,8 @@ static void pg_init_done(void *data, int errors)
 		m->queue_io = 0;
 
 	m->pg_init_delay_retry = delay_retry;
-	queue_work(kmultipathd, &m->process_queued_ios);
+	if (!m->queue_io)
+		dm_table_run_queue(m->ti->table);
 
 	/*
 	 * Wake up any thread waiting to suspend.

Does pg_init retry still work with this change?

I suspect it doesn't. When a retry is requested in pg_init_done(), m->queue_io is still 0 and somebody has to kick pg_init.

Instead of replacing "process_queued_ios" work completely, how about keeping it around and just replacing dispatch_queued_ios() by dm_table_run_queue()?

drivers/md/dm-mpath.c static int multipath_ioctl(struct dm_target *ti, unsigned int cmd, · line 1546

Quoted 9 lines
drivers/md/dm-mpath.c +1 -1
@@ -1606,7 +1540,7 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 
 	spin_lock_irqsave(&m->lock, flags);
 
-	if (!m->current_pgpath)
+	if (!m->current_pgpath || !m->queue_io)
 		__choose_pgpath(m, 0);
 
 	pgpath = m->current_pgpath;

Why is !m->queue_io check added here?

Quoted 11 lines
drivers/md/dm.c +3 -0
index 0704c52..291491b 100644
@@ -1912,6 +1912,19 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
 	return r;
 }
 
+void dm_table_run_queue(struct dm_table *t)
+{
+	struct mapped_device *md = dm_table_get_md(t);

drivers/md/dm.c static int dm_any_congested(void *congested_data, int bdi_bits) · line 1927

Quoted 10 lines
drivers/md/dm.c +10 -0
+	unsigned long flags;
+
+	if (md->queue) {
+		spin_lock_irqsave(md->queue->queue_lock, flags);
+		blk_run_queue_async(md->queue);
+		spin_unlock_irqrestore(md->queue->queue_lock, flags);
+	}
+}
+EXPORT_SYMBOL_GPL(dm_table_run_queue);
+

I think this funcion fits better in dm-table.c.

Signature · 1 line
Jun'ichi Nomura, NEC Corporation
#3 lore raw
Quoted 14 lines · Junichi Nomura

drivers/md/dm-mpath.c static void pg_init_done(void *data, int errors) · line 1195

Quoted 10 lines · Hannes Reinecke
drivers/md/dm-mpath.c +2 -1
@@ -1256,7 +1188,8 @@ static void pg_init_done(void *data, int errors)
 		m->queue_io = 0;
 
 	m->pg_init_delay_retry = delay_retry;
-	queue_work(kmultipathd, &m->process_queued_ios);
+	if (!m->queue_io)
+		dm_table_run_queue(m->ti->table);
 
 	/*
 	 * Wake up any thread waiting to suspend.

Does pg_init retry still work with this change?

Quoted 7 lines

I suspect it doesn't. When a retry is requested in pg_init_done(), m->queue_io is still 0 and somebody has to kick pg_init.

Instead of replacing "process_queued_ios" work completely, how about keeping it around and just replacing dispatch_queued_ios() by dm_table_run_queue()?

I'd rather prefer to schedule the activate_path() workqueue item directly; no need to involve yet another workqueue here. And we already know which path to activate.

But yeah, it looks as if we need to reschedule activate_path() here.

Quoted 4 lines
Quoted 4 lines
drivers/md/dm-mpath.c +0 -0
@@ -1606,7 +1540,7 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 
 	spin_lock_irqsave(&m->lock, flags);
 
Quoted 8 lines

drivers/md/dm-mpath.c static int multipath_ioctl(struct dm_target *ti, unsigned int cmd, · line 1546

Quoted 5 lines
drivers/md/dm-mpath.c +1 -1
-	if (!m->current_pgpath)
+	if (!m->current_pgpath || !m->queue_io)
 		__choose_pgpath(m, 0);
 
 	pgpath = m->current_pgpath;

Why is !m->queue_io check added here?

You are right, this is a different patch.
I'll be splitting it up.

Quoted 8 lines
Quoted 8 lines
drivers/md/dm.c +0 -0
index 0704c52..291491b 100644
@@ -1912,6 +1912,19 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
 	return r;
 }
 
Quoted 16 lines

drivers/md/dm.c static int dm_any_congested(void *congested_data, int bdi_bits) · line 1927

Quoted 13 lines
drivers/md/dm.c +13 -0
+void dm_table_run_queue(struct dm_table *t)
+{
+	struct mapped_device *md = dm_table_get_md(t);
+	unsigned long flags;
+
+	if (md->queue) {
+		spin_lock_irqsave(md->queue->queue_lock, flags);
+		blk_run_queue_async(md->queue);
+		spin_unlock_irqrestore(md->queue->queue_lock, flags);
+	}
+}
+EXPORT_SYMBOL_GPL(dm_table_run_queue);
+

I think this funcion fits better in dm-table.c.

So I've thought, but struct mapped_device is internal to dm.c And having yet another wrapper just to circumvent the layering seemed a bit excessive.

But I do whatever deemed necessary by the powers that be ..

Cheers,

Hannes

Signature · 9 lines
Dr. Hannes Reinecke		      zSeries & Storage
[email protected]			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
#4 lore raw
Quoted 18 lines · Hannes Reinecke
Quoted 17 lines · Junichi Nomura

drivers/md/dm-mpath.c static void pg_init_done(void *data, int errors) · line 1195

Quoted 10 lines · Hannes Reinecke
drivers/md/dm-mpath.c +2 -1
@@ -1256,7 +1188,8 @@ static void pg_init_done(void *data, int errors)
 		m->queue_io = 0;
 
 	m->pg_init_delay_retry = delay_retry;
-	queue_work(kmultipathd, &m->process_queued_ios);
+	if (!m->queue_io)
+		dm_table_run_queue(m->ti->table);
 
 	/*
 	 * Wake up any thread waiting to suspend.

Does pg_init retry still work with this change?

I suspect it doesn't. When a retry is requested in pg_init_done(), m->queue_io is still 0 and somebody has to kick pg_init.

Quoted 6 lines
Quoted 4 lines

Instead of replacing "process_queued_ios" work completely, how about keeping it around and just replacing dispatch_queued_ios() by dm_table_run_queue()?

I'd rather prefer to schedule the activate_path() workqueue item directly; no need to involve yet another workqueue here.

I would prefer it, too.
I thought it would make review easier if you could split this patch in 2; one for removing the internal queue, the other for optimizing process_queued_ios work.

Quoted 3 lines

And we already know which path to activate.

But yeah, it looks as if we need to reschedule activate_path() here.

Signature · 1 line
Jun'ichi Nomura, NEC Corporation
#5 lore raw
Quoted 23 lines · Junichi Nomura
Quoted 22 lines · Hannes Reinecke
Quoted 21 lines · Junichi Nomura

drivers/md/dm-mpath.c static void pg_init_done(void *data, int errors) · line 1195

Quoted 10 lines · Hannes Reinecke
drivers/md/dm-mpath.c +2 -1
@@ -1256,7 +1188,8 @@ static void pg_init_done(void *data, int errors)
 		m->queue_io = 0;
 
 	m->pg_init_delay_retry = delay_retry;
-	queue_work(kmultipathd, &m->process_queued_ios);
+	if (!m->queue_io)
+		dm_table_run_queue(m->ti->table);
 
 	/*
 	 * Wake up any thread waiting to suspend.

Does pg_init retry still work with this change?

I suspect it doesn't. When a retry is requested in pg_init_done(), m->queue_io is still 0 and somebody has to kick pg_init.

Instead of replacing "process_queued_ios" work completely, how about keeping it around and just replacing dispatch_queued_ios() by dm_table_run_queue()?

Quoted 7 lines
Quoted 2 lines

I'd rather prefer to schedule the activate_path() workqueue item directly; no need to involve yet another workqueue here.

I would prefer it, too.
I thought it would make review easier if you could split this patch in 2; one for removing the internal queue, the other for optimizing process_queued_ios work.

I think this is a good suggestion. Best to split it up.

#6 lore raw

PATCH v2 2/2 dm-multipath: reduce memory pressure during requeuing

In reply to Hannes Reinecke

When multipath needs to requeue I/O in the block layer the per-request context shouldn't be allocated, as it will be freed immediately afterwards anyway.
Avoiding this memory allocation will reduce memory pressure during requeuing.

Cc Mike Snitzer <[email protected]>
Cc Jun'ichi Nomura <[email protected]>
---
 drivers/md/dm-mpath.c | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)
drivers/md/dm-mpath.c +16 -24
index 71c6f2c..46f8a04 100644
@@ -372,12 +372,12 @@ static int __must_push_back(struct multipath *m)
 static int map_io(struct multipath *m, struct request *clone,
 		  union map_info *map_context)
 {
-	int r = DM_MAPIO_REMAPPED;
+	int r = DM_MAPIO_REQUEUE;
 	size_t nr_bytes = blk_rq_bytes(clone);
 	unsigned long flags;
 	struct pgpath *pgpath;
 	struct block_device *bdev;
-	struct dm_mpath_io *mpio = map_context->ptr;
+	struct dm_mpath_io *mpio;
 
 	spin_lock_irqsave(&m->lock, flags);
 
@@ -390,29 +390,31 @@ static int map_io(struct multipath *m, struct request *clone,
 
 	if (pgpath) {
 		if (__pgpath_busy(pgpath))
-			r = DM_MAPIO_REQUEUE;
-		else if (pg_ready(m)) {
+			goto out_unlock;
+
+		if (pg_ready(m)) {
+			if (set_mapinfo(m, map_context) < 0)
+				goto out_unlock;
+
 			bdev = pgpath->path.dev->bdev;
 			clone->q = bdev_get_queue(bdev);
 			clone->rq_disk = bdev->bd_disk;
+			clone->cmd_flags |= REQ_FAILFAST_TRANSPORT;
+			mpio = map_context->ptr;
 			mpio->pgpath = pgpath;
 			mpio->nr_bytes = nr_bytes;
 			if (pgpath->pg->ps.type->start_io)
 				pgpath->pg->ps.type->start_io(&pgpath->pg->ps,
 							      &pgpath->path,
 							      nr_bytes);
-		} else {
-			__pg_init_all_paths(m);
-			r = DM_MAPIO_REQUEUE;
+			r = DM_MAPIO_REMAPPED;
+			goto out_unlock;
 		}
-	} else {
-		/* No path */
-		if (__must_push_back(m))
-			r = DM_MAPIO_REQUEUE;
-		else
+		__pg_init_all_paths(m);
+	} else if (!__must_push_back(m))
 			r = -EIO;	/* Failed */
-	}
 
+out_unlock:
 	spin_unlock_irqrestore(&m->lock, flags);
 
 	return r;
@@ -908,19 +910,9 @@ static void multipath_dtr(struct dm_target *ti)
 static int multipath_map(struct dm_target *ti, struct request *clone,
 			 union map_info *map_context)
 {
-	int r;
 	struct multipath *m = (struct multipath *) ti->private;
 
-	if (set_mapinfo(m, map_context) < 0)
-		/* ENOMEM, requeue */
-		return DM_MAPIO_REQUEUE;
-
-	clone->cmd_flags |= REQ_FAILFAST_TRANSPORT;
-	r = map_io(m, clone, map_context);
-	if (r < 0 || r == DM_MAPIO_REQUEUE)
-		clear_mapinfo(m, map_context);
-
-	return r;
+	return map_io(m, clone, map_context);
 }
 
 /*
Signature · 1 line
1.7.12.4
#7 lore raw

Re: [PATCH 2/2] dm-multipath: reduce memory pressure during requeuing

Quoted 9 lines · Hannes Reinecke
drivers/md/dm-mpath.c +0 -3
@@ -908,19 +910,9 @@ static void multipath_dtr(struct dm_target *ti)
 static int multipath_map(struct dm_target *ti, struct request *clone,
 			 union map_info *map_context)
 {
-	int r;
 	struct multipath *m = (struct multipath *) ti->private;
 
-	if (set_mapinfo(m, map_context) < 0)
-		/* ENOMEM, requeue */

drivers/md/dm-mpath.c static void multipath_dtr(struct dm_target *ti) · line 916

Quoted 10 lines
drivers/md/dm-mpath.c +1 -8
-		return DM_MAPIO_REQUEUE;
-
-	clone->cmd_flags |= REQ_FAILFAST_TRANSPORT;
-	r = map_io(m, clone, map_context);
-	if (r < 0 || r == DM_MAPIO_REQUEUE)
-		clear_mapinfo(m, map_context);
-
-	return r;
+	return map_io(m, clone, map_context);
 }

Now multipath_map() is the only caller of map_io() and most part of multipath_map() is moved to map_io(), there is no reason to separate those functions. You could fold map_io() into multipath_map().

Signature · 1 line
Jun'ichi Nomura, NEC Corporation
#8 lore raw

Re: [PATCH 2/2] dm-multipath: reduce memory pressure during requeuing

Quoted 17 lines · Junichi Nomura
Quoted 16 lines · Hannes Reinecke
drivers/md/dm-mpath.c +0 -10
@@ -908,19 +910,9 @@ static void multipath_dtr(struct dm_target *ti)
 static int multipath_map(struct dm_target *ti, struct request *clone,
 			 union map_info *map_context)
 {
-	int r;
 	struct multipath *m = (struct multipath *) ti->private;
 
-	if (set_mapinfo(m, map_context) < 0)
-		/* ENOMEM, requeue */
-		return DM_MAPIO_REQUEUE;
-
-	clone->cmd_flags |= REQ_FAILFAST_TRANSPORT;
-	r = map_io(m, clone, map_context);
-	if (r < 0 || r == DM_MAPIO_REQUEUE)
-		clear_mapinfo(m, map_context);
-
Quoted 9 lines

drivers/md/dm-mpath.c static void multipath_dtr(struct dm_target *ti) · line 916

Quoted 3 lines
drivers/md/dm-mpath.c +1 -1
-	return r;
+	return map_io(m, clone, map_context);
 }

Now multipath_map() is the only caller of map_io() and most part of multipath_map() is moved to map_io(), there is no reason to separate those functions. You could fold map_io() into multipath_map().

Yes, I could.

However, I didn't do so (for this patchset)
as this would make reviewing harder.

But yeah, it should be merged.

Cheers,

Hannes

Signature · 9 lines
Dr. Hannes Reinecke		      zSeries & Storage
[email protected]			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
#9 lore raw

Re: [PATCH 2/2] dm-multipath: reduce memory pressure during requeuing

Quoted 27 lines · Hannes Reinecke
Quoted 17 lines · Junichi Nomura
Quoted 16 lines · Hannes Reinecke
drivers/md/dm-mpath.c +0 -10
@@ -908,19 +910,9 @@ static void multipath_dtr(struct dm_target *ti)
 static int multipath_map(struct dm_target *ti, struct request *clone,
 			 union map_info *map_context)
 {
-	int r;
 	struct multipath *m = (struct multipath *) ti->private;
 
-	if (set_mapinfo(m, map_context) < 0)
-		/* ENOMEM, requeue */
-		return DM_MAPIO_REQUEUE;
-
-	clone->cmd_flags |= REQ_FAILFAST_TRANSPORT;
-	r = map_io(m, clone, map_context);
-	if (r < 0 || r == DM_MAPIO_REQUEUE)
-		clear_mapinfo(m, map_context);
-
Quoted 9 lines

drivers/md/dm-mpath.c static void multipath_dtr(struct dm_target *ti) · line 916

Quoted 3 lines
drivers/md/dm-mpath.c +1 -1
-	return r;
+	return map_io(m, clone, map_context);
 }

Now multipath_map() is the only caller of map_io() and most part of multipath_map() is moved to map_io(), there is no reason to separate those functions. You could fold map_io() into multipath_map().

Quoted 6 lines

Yes, I could.

However, I didn't do so (for this patchset)
as this would make reviewing harder.

But yeah, it should be merged.

Really not that hard to review. I'd be in favor of folding it in a revised patch.

#10 lore raw
In reply to Hannes Reinecke
Quoted 10 lines · Hannes Reinecke

Hi all,

dm-multipath still carries around it's own queueing framework for implementing 'queue_if_no_path'.
However, there is no real reason for this; we could as well push back the requests onto the request_queue.
In doing so we can also reduce the memory pressure during fail_if_no_path scenarios, as we don't have to allocate a context for each request when it need to be requeued.

Quoted 2 lines

This patchset is the reworked version from the original, including the review by Jun'ichi.

Much appreciated. But unfortunately it is too late for 3.14.

These will be my immediate priority once I transition to 3.15 development (likely by end of next week).

Once I get these staged I'll look much closer at your "accept failed paths" patch: https://patchwork.kernel.org/patch/3368381/

#11 lore raw
Quoted 13 lines · Mike Snitzer
Quoted 10 lines · Hannes Reinecke

Hi all,

dm-multipath still carries around it's own queueing framework for implementing 'queue_if_no_path'.
However, there is no real reason for this; we could as well push back the requests onto the request_queue.
In doing so we can also reduce the memory pressure during fail_if_no_path scenarios, as we don't have to allocate a context for each request when it need to be requeued.

Quoted 7 lines
Quoted 2 lines

This patchset is the reworked version from the original, including the review by Jun'ichi.

Much appreciated. But unfortunately it is too late for 3.14.

These will be my immediate priority once I transition to 3.15 development (likely by end of next week).

Hi Hannes,

Do you have a new patchset for this work based on the review Junichi provided? I'd like to review/stage your latest once you have it.

Let me know, thanks.
Mike

#12 lore raw
Quoted 21 lines · Mike Snitzer
Quoted 18 lines · Mike Snitzer
Quoted 10 lines · Hannes Reinecke

Hi all,

dm-multipath still carries around it's own queueing framework for implementing 'queue_if_no_path'.
However, there is no real reason for this; we could as well push back the requests onto the request_queue.
In doing so we can also reduce the memory pressure during fail_if_no_path scenarios, as we don't have to allocate a context for each request when it need to be requeued.

Quoted 2 lines

This patchset is the reworked version from the original, including the review by Jun'ichi.

Much appreciated. But unfortunately it is too late for 3.14.

Quoted 8 lines
Quoted 2 lines

These will be my immediate priority once I transition to 3.15 development (likely by end of next week).

Hi Hannes,

Do you have a new patchset for this work based on the review Junichi provided? I'd like to review/stage your latest once you have it.

Hmm, the patchset should include the review.

But I'll check.

Cheers,

Hannes

Signature · 4 lines
Dr. Hannes Reinecke		      zSeries & Storage
[email protected]			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)