Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3da2c69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-block 

Pull block bits from Jens Axboe:
 "As vacation is coming up, thought I'd better get rid of my pending
  changes in my for-linus branch for this iteration.  It contains:

   - Two patches for mtip32xx.  Killing a non-compliant sysfs interface
     and moving it to debugfs, where it belongs.

   - A few patches from Asias.  Two legit bug fixes, and one killing an
     interface that is no longer in use.

   - A patch from Jan, making the annoying partition ioctl warning a bit
     less annoying, by restricting it to !CAP_SYS_RAWIO only.

   - Three bug fixes for drbd from Lars Ellenberg.

   - A fix for an old regression for umem, it hasn't really worked since
     the plugging scheme was changed in 3.0.

   - A few fixes from Tejun.

   - A splice fix from Eric Dumazet, fixing an issue with pipe
     resizing."

* 'for-linus' of git://git.kernel.dk/linux-block:
  scsi: Silence unnecessary warnings about ioctl to partition
  block: Drop dead function blk_abort_queue()
  block: Mitigate lock unbalance caused by lock switching
  block: Avoid missed wakeup in request waitqueue
  umem: fix up unplugging
  splice: fix racy pipe->buffers uses
  drbd: fix null pointer dereference with on-congestion policy when diskless
  drbd: fix list corruption by failing but already aborted reads
  drbd: fix access of unallocated pages and kernel panic
  xen/blkfront: Add WARN to deal with misbehaving backends.
  blkcg: drop local variable @q from blkg_destroy()
  mtip32xx: Create debugfs entries for troubleshooting
  mtip32xx: Remove 'registers' and 'flags' from sysfs
  blkcg: fix blkg_alloc() failure path
  block: blkcg_policy_cfq shouldn't be used if !CONFIG_CFQ_GROUP_IOSCHED
  block: fix return value on cfq_init() failure
  mtip32xx: Remove version.h header file inclusion
  xen/blkback: Copy id field when doing BLKIF_DISCARD.
parents ff826b2b 6d935928

Documentation/ABI/testing/sysfs-block-rssd

+0 −21
Original line number Diff line number Diff line 
What:           /sys/block/rssd*/registers

Date:           March 2012

KernelVersion:  3.3

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Dumps below driver information and

                hardware registers.

                    - S ACTive

                    - Command Issue

                    - Completed

                    - PORT IRQ STAT

                    - HOST IRQ STAT

                    - Allocated

                    - Commands in Q



What:           /sys/block/rssd*/status

Date:           April 2012

KernelVersion:  3.4

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Indicates the status of the device.
 


What:           /sys/block/rssd*/flags

Date:           May 2012

KernelVersion:  3.5

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Dumps the flags in port and driver

                data structure

block/blk-cgroup.c

+2 −7
Original line number Diff line number Diff line
@@ -125,12 +125,8 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q) 


		blkg->pd[i] = pd;

		pd->blkg = blkg;

	}



		/* invoke per-policy init */

	for (i = 0; i < BLKCG_MAX_POLS; i++) {

		struct blkcg_policy *pol = blkcg_policy[i];



		if (blkcg_policy_enabled(blkg->q, pol))

			pol->pd_init_fn(blkg);

	}
@@ -245,10 +241,9 @@ EXPORT_SYMBOL_GPL(blkg_lookup_create); 


static void blkg_destroy(struct blkcg_gq *blkg)

{

	struct request_queue *q = blkg->q;

	struct blkcg *blkcg = blkg->blkcg;



	lockdep_assert_held(q->queue_lock);

	lockdep_assert_held(blkg->q->queue_lock);

	lockdep_assert_held(&blkcg->lock);



	/* Something wrong if we are trying to remove same group twice */

block/blk-core.c

+19 −6
Original line number Diff line number Diff line
@@ -361,9 +361,10 @@ EXPORT_SYMBOL(blk_put_queue); 
 */

void blk_drain_queue(struct request_queue *q, bool drain_all)

{

	int i;



	while (true) {

		bool drain = false;

		int i;



		spin_lock_irq(q->queue_lock);
@@ -408,6 +409,18 @@ void blk_drain_queue(struct request_queue *q, bool drain_all) 
			break;

		msleep(10);

	}



	/*

	 * With queue marked dead, any woken up waiter will fail the

	 * allocation path, so the wakeup chaining is lost and we're

	 * left with hung waiters. We need to wake up those waiters.

	 */

	if (q->request_fn) {

		spin_lock_irq(q->queue_lock);

		for (i = 0; i < ARRAY_SIZE(q->rq.wait); i++)

			wake_up_all(&q->rq.wait[i]);

		spin_unlock_irq(q->queue_lock);

	}

}



/**
@@ -467,7 +480,6 @@ void blk_cleanup_queue(struct request_queue *q) 
	/* mark @q DEAD, no new request or merges will be allowed afterwards */

	mutex_lock(&q->sysfs_lock);

	queue_flag_set_unlocked(QUEUE_FLAG_DEAD, q);



	spin_lock_irq(lock);



	/*
@@ -485,10 +497,6 @@ void blk_cleanup_queue(struct request_queue *q) 
	queue_flag_set(QUEUE_FLAG_NOMERGES, q);

	queue_flag_set(QUEUE_FLAG_NOXMERGES, q);

	queue_flag_set(QUEUE_FLAG_DEAD, q);



	if (q->queue_lock != &q->__queue_lock)

		q->queue_lock = &q->__queue_lock;



	spin_unlock_irq(lock);

	mutex_unlock(&q->sysfs_lock);
@@ -499,6 +507,11 @@ void blk_cleanup_queue(struct request_queue *q) 
	del_timer_sync(&q->backing_dev_info.laptop_mode_wb_timer);

	blk_sync_queue(q);



	spin_lock_irq(lock);

	if (q->queue_lock != &q->__queue_lock)

		q->queue_lock = &q->__queue_lock;

	spin_unlock_irq(lock);



	/* @q is and will stay empty, shutdown and put */

	blk_put_queue(q);

}

block/blk-timeout.c

+0 −41
Original line number Diff line number Diff line
@@ -197,44 +197,3 @@ void blk_add_timer(struct request *req) 
		mod_timer(&q->timeout, expiry);

}

/**

 * blk_abort_queue -- Abort all request on given queue

 * @queue:	pointer to queue

 *

 */

void blk_abort_queue(struct request_queue *q)

{

	unsigned long flags;

	struct request *rq, *tmp;

	LIST_HEAD(list);



	/*

	 * Not a request based block device, nothing to abort

	 */

	if (!q->request_fn)

		return;



	spin_lock_irqsave(q->queue_lock, flags);



	elv_abort_queue(q);



	/*

	 * Splice entries to local list, to avoid deadlocking if entries

	 * get readded to the timeout list by error handling

	 */

	list_splice_init(&q->timeout_list, &list);



	list_for_each_entry_safe(rq, tmp, &list, timeout_list)

		blk_abort_request(rq);



	/*

	 * Occasionally, blk_abort_request() will return without

	 * deleting the element from the list. Make sure we add those back

	 * instead of leaving them on the local stack list.

	 */

	list_splice(&list, &q->timeout_list);



	spin_unlock_irqrestore(q->queue_lock, flags);



}

EXPORT_SYMBOL_GPL(blk_abort_queue);

block/cfq-iosched.c

+18 −12
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
#include "blk.h"

#include "blk-cgroup.h"



static struct blkcg_policy blkcg_policy_cfq __maybe_unused;



/*

 * tunables

 */
@@ -418,11 +416,6 @@ static inline struct cfq_group *pd_to_cfqg(struct blkg_policy_data *pd) 
	return pd ? container_of(pd, struct cfq_group, pd) : NULL;

}



static inline struct cfq_group *blkg_to_cfqg(struct blkcg_gq *blkg)

{

	return pd_to_cfqg(blkg_to_pd(blkg, &blkcg_policy_cfq));

}



static inline struct blkcg_gq *cfqg_to_blkg(struct cfq_group *cfqg)

{

	return pd_to_blkg(&cfqg->pd);
@@ -572,6 +565,13 @@ static inline void cfqg_stats_update_avg_queue_size(struct cfq_group *cfqg) { } 


#ifdef CONFIG_CFQ_GROUP_IOSCHED



static struct blkcg_policy blkcg_policy_cfq;



static inline struct cfq_group *blkg_to_cfqg(struct blkcg_gq *blkg)

{

	return pd_to_cfqg(blkg_to_pd(blkg, &blkcg_policy_cfq));

}



static inline void cfqg_get(struct cfq_group *cfqg)

{

	return blkg_get(cfqg_to_blkg(cfqg));
@@ -3951,10 +3951,11 @@ static void cfq_exit_queue(struct elevator_queue *e) 


	cfq_shutdown_timer_wq(cfqd);



#ifndef CONFIG_CFQ_GROUP_IOSCHED

#ifdef CONFIG_CFQ_GROUP_IOSCHED

	blkcg_deactivate_policy(q, &blkcg_policy_cfq);

#else

	kfree(cfqd->root_group);

#endif

	blkcg_deactivate_policy(q, &blkcg_policy_cfq);

	kfree(cfqd);

}
@@ -4194,14 +4195,15 @@ static int __init cfq_init(void) 
#ifdef CONFIG_CFQ_GROUP_IOSCHED

	if (!cfq_group_idle)

		cfq_group_idle = 1;

#else

		cfq_group_idle = 0;

#endif



	ret = blkcg_policy_register(&blkcg_policy_cfq);

	if (ret)

		return ret;

#else

	cfq_group_idle = 0;

#endif



	ret = -ENOMEM;

	cfq_pool = KMEM_CACHE(cfq_queue, 0);

	if (!cfq_pool)

		goto err_pol_unreg;
@@ -4215,13 +4217,17 @@ static int __init cfq_init(void) 
err_free_pool:

	kmem_cache_destroy(cfq_pool);

err_pol_unreg:

#ifdef CONFIG_CFQ_GROUP_IOSCHED

	blkcg_policy_unregister(&blkcg_policy_cfq);

#endif

	return ret;

}



static void __exit cfq_exit(void)

{

#ifdef CONFIG_CFQ_GROUP_IOSCHED

	blkcg_policy_unregister(&blkcg_policy_cfq);

#endif

	elv_unregister(&iosched_cfq);

	kmem_cache_destroy(cfq_pool);

}