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

Commit 8494bcf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block driver changes from Jens Axboe:
 "This contains:

   - The 4k/partition fixes for brd from Boaz/Matthew.

   - A few xen front/back block fixes from David Vrabel and Roger Pau
     Monne.

   - Floppy changes from Takashi, cleaning the device file creation.

   - Switching libata to use the new blk-mq tagging policy, removing
     code (and a suboptimal implementation) from libata.  This will
     throw you a merge conflict, since a bug in the original libata
     tagging code was fixed since this code was branched.  Trivial.
     From Shaohua.

   - Conversion of loop to blk-mq, from Ming Lei.

   - Cleanup of the io_schedule() handling in bsg from Peter Zijlstra.
     He claims it improves on unreadable code, which will cost him a
     beer.

   - Maintainer update or NDB, now handled by Markus Pargmann.

   - NVMe:
        - Optimization from me that avoids a kmalloc/kfree per IO for
          smaller (<= 8KB) IO. This cuts about 1% of high IOPS CPU
          overhead.
        - Removal of (now) dead RCU code, a relic from before NVMe was
          converted to blk-mq"

* 'for-3.20/drivers' of git://git.kernel.dk/linux-block:
  xen-blkback: default to X86_32 ABI on x86
  xen-blkfront: fix accounting of reqs when migrating
  xen-blkback,xen-blkfront: add myself as maintainer
  block: Simplify bsg complete all
  floppy: Avoid manual call of device_create_file()
  NVMe: avoid kmalloc/kfree for smaller IO
  MAINTAINERS: Update NBD maintainer
  libata: make sata_sil24 use fifo tag allocator
  libata: move sas ata tag allocation to libata-scsi.c
  libata: use blk taging
  NVMe: within nvme_free_queues(), delete RCU sychro/deferred free
  null_blk: suppress invalid partition info
  brd: Request from fdisk 4k alignment
  brd: Fix all partitions BUGs
  axonram: Fix bug in direct_access
  loop: add blk-mq.h include
  block: loop: don't handle REQ_FUA explicitly
  block: loop: introduce lo_discard() and lo_req_flush()
  block: loop: say goodby to bio
  block: loop: improve performance via blk-mq
parents 3e12cefb b042a3ca

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -6642,9 +6642,10 @@ F: include/uapi/linux/netrom.h 
F:	net/netrom/



NETWORK BLOCK DEVICE (NBD)

M:	Paul Clements <Paul.Clements@steeleye.com>

M:	Markus Pargmann <mpa@pengutronix.de>

S:	Maintained

L:	nbd-general@lists.sourceforge.net

T:	git git://git.pengutronix.de/git/mpa/linux-nbd.git

F:	Documentation/blockdev/nbd.txt

F:	drivers/block/nbd.c

F:	include/linux/nbd.h
@@ -10690,6 +10691,7 @@ F: drivers/pci/*xen* 


XEN BLOCK SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

M:	Roger Pau Monné <roger.pau@citrix.com>

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

S:	Supported

F:	drivers/block/xen-blkback/*

arch/powerpc/sysdev/axonram.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ axon_ram_direct_access(struct block_device *device, sector_t sector, 
	loff_t offset = (loff_t)sector << AXON_RAM_SECTOR_SHIFT;



	*kaddr = (void *)(bank->ph_addr + offset);

	*pfn = virt_to_phys(kaddr) >> PAGE_SHIFT;

	*pfn = virt_to_phys(*kaddr) >> PAGE_SHIFT;



	return bank->size - offset;

}

block/bsg.c

+25 −47
Original line number Diff line number Diff line
@@ -136,42 +136,6 @@ static inline struct hlist_head *bsg_dev_idx_hash(int index) 
	return &bsg_device_list[index & (BSG_LIST_ARRAY_SIZE - 1)];

}



static int bsg_io_schedule(struct bsg_device *bd)

{

	DEFINE_WAIT(wait);

	int ret = 0;



	spin_lock_irq(&bd->lock);



	BUG_ON(bd->done_cmds > bd->queued_cmds);



	/*

	 * -ENOSPC or -ENODATA?  I'm going for -ENODATA, meaning "I have no

	 * work to do", even though we return -ENOSPC after this same test

	 * during bsg_write() -- there, it means our buffer can't have more

	 * bsg_commands added to it, thus has no space left.

	 */

	if (bd->done_cmds == bd->queued_cmds) {

		ret = -ENODATA;

		goto unlock;

	}



	if (!test_bit(BSG_F_BLOCK, &bd->flags)) {

		ret = -EAGAIN;

		goto unlock;

	}



	prepare_to_wait(&bd->wq_done, &wait, TASK_UNINTERRUPTIBLE);

	spin_unlock_irq(&bd->lock);

	io_schedule();

	finish_wait(&bd->wq_done, &wait);



	return ret;

unlock:

	spin_unlock_irq(&bd->lock);

	return ret;

}



static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,

				struct sg_io_v4 *hdr, struct bsg_device *bd,

				fmode_t has_write_perm)
@@ -482,6 +446,30 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, 
	return ret;

}



static bool bsg_complete(struct bsg_device *bd)

{

	bool ret = false;

	bool spin;



	do {

		spin_lock_irq(&bd->lock);



		BUG_ON(bd->done_cmds > bd->queued_cmds);



		/*

		 * All commands consumed.

		 */

		if (bd->done_cmds == bd->queued_cmds)

			ret = true;



		spin = !test_bit(BSG_F_BLOCK, &bd->flags);



		spin_unlock_irq(&bd->lock);

	} while (!ret && spin);



	return ret;

}



static int bsg_complete_all_commands(struct bsg_device *bd)

{

	struct bsg_command *bc;
@@ -492,17 +480,7 @@ static int bsg_complete_all_commands(struct bsg_device *bd) 
	/*

	 * wait for all commands to complete

	 */

	ret = 0;

	do {

		ret = bsg_io_schedule(bd);

		/*

		 * look for -ENODATA specifically -- we'll sometimes get

		 * -ERESTARTSYS when we've taken a signal, but we can't

		 * return until we're done freeing the queue, so ignore

		 * it.  The signal will get handled when we're done freeing

		 * the bsg_device.

		 */

	} while (ret != -ENODATA);

	io_wait_event(bd->wq_done, bsg_complete(bd));



	/*

	 * discard done commands

drivers/ata/libata-core.c

+18 −52
Original line number Diff line number Diff line
@@ -1585,8 +1585,6 @@ unsigned ata_exec_internal_sg(struct ata_device *dev, 
	else

		tag = 0;



	if (test_and_set_bit(tag, &ap->qc_allocated))

		BUG();

	qc = __ata_qc_from_tag(ap, tag);



	qc->tag = tag;
@@ -4722,69 +4720,36 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) 
}



/**

 *	ata_qc_new - Request an available ATA command, for queueing

 *	@ap: target port

 *

 *	Some ATA host controllers may implement a queue depth which is less

 *	than ATA_MAX_QUEUE. So we shouldn't allocate a tag which is beyond

 *	the hardware limitation.

 *	ata_qc_new_init - Request an available ATA command, and initialize it

 *	@dev: Device from whom we request an available command structure

 *

 *	LOCKING:

 *	None.

 */



static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)

struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev, int tag)

{

	struct ata_queued_cmd *qc = NULL;

	unsigned int max_queue = ap->host->n_tags;

	unsigned int i, tag;

	struct ata_port *ap = dev->link->ap;

	struct ata_queued_cmd *qc;



	/* no command while frozen */

	if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))

		return NULL;



	for (i = 0, tag = ap->last_tag + 1; i < max_queue; i++, tag++) {

		if (ap->flags & ATA_FLAG_LOWTAG)

			tag = i;

		else

			tag = tag < max_queue ? tag : 0;



		/* the last tag is reserved for internal command. */

		if (tag == ATA_TAG_INTERNAL)

			continue;

	/* libsas case */

	if (!ap->scsi_host) {

		tag = ata_sas_allocate_tag(ap);

		if (tag < 0)

			return NULL;

	}



		if (!test_and_set_bit(tag, &ap->qc_allocated)) {

	qc = __ata_qc_from_tag(ap, tag);

	qc->tag = tag;

			ap->last_tag = tag;

			break;

		}

	}



	return qc;

}



/**

 *	ata_qc_new_init - Request an available ATA command, and initialize it

 *	@dev: Device from whom we request an available command structure

 *

 *	LOCKING:

 *	None.

 */



struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev)

{

	struct ata_port *ap = dev->link->ap;

	struct ata_queued_cmd *qc;



	qc = ata_qc_new(ap);

	if (qc) {

	qc->scsicmd = NULL;

	qc->ap = ap;

	qc->dev = dev;



	ata_qc_reinit(qc);

	}



	return qc;

}
@@ -4811,7 +4776,8 @@ void ata_qc_free(struct ata_queued_cmd *qc) 
	tag = qc->tag;

	if (likely(ata_tag_valid(tag))) {

		qc->tag = ATA_TAG_POISON;

		clear_bit(tag, &ap->qc_allocated);

		if (!ap->scsi_host)

			ata_sas_free_tag(tag, ap);

	}

}

drivers/ata/libata-scsi.c

+32 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev, 
{

	struct ata_queued_cmd *qc;



	qc = ata_qc_new_init(dev);

	qc = ata_qc_new_init(dev, cmd->request->tag);

	if (qc) {

		qc->scsicmd = cmd;

		qc->scsidone = cmd->scsi_done;
@@ -3668,6 +3668,9 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht) 
		 */

		shost->max_host_blocked = 1;



		if (scsi_init_shared_tag_map(shost, host->n_tags))

			goto err_add;



		rc = scsi_add_host_with_dma(ap->scsi_host,

						&ap->tdev, ap->host->dev);

		if (rc)
@@ -4230,3 +4233,31 @@ int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap) 
	return rc;

}

EXPORT_SYMBOL_GPL(ata_sas_queuecmd);



int ata_sas_allocate_tag(struct ata_port *ap)

{

	unsigned int max_queue = ap->host->n_tags;

	unsigned int i, tag;



	for (i = 0, tag = ap->sas_last_tag + 1; i < max_queue; i++, tag++) {

		if (ap->flags & ATA_FLAG_LOWTAG)

			tag = 1;

		else

			tag = tag < max_queue ? tag : 0;



		/* the last tag is reserved for internal command. */

		if (tag == ATA_TAG_INTERNAL)

			continue;



		if (!test_and_set_bit(tag, &ap->sas_tag_allocated)) {

			ap->sas_last_tag = tag;

			return tag;

		}

	}

	return -1;

}



void ata_sas_free_tag(unsigned int tag, struct ata_port *ap)

{

	clear_bit(tag, &ap->sas_tag_allocated);

}