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

4 files changed, 54 insertions, 54 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4b0d5e71858e..4c35f0822d06 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -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;
-
-                if (!test_and_set_bit(tag, &ap->qc_allocated)) {
-                        qc = __ata_qc_from_tag(ap, tag);
-                        qc->tag = tag;
-                        ap->last_tag = tag;
-                        break;
-                }
+        /* libsas case */
+        if (!ap->scsi_host) {
+                tag = ata_sas_allocate_tag(ap);
+                if (tag < 0)
+                        return NULL;
         }
 
-        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;
+        qc = __ata_qc_from_tag(ap, tag);
+        qc->tag = tag;
+        qc->scsicmd = NULL;
+        qc->ap = ap;
+        qc->dev = dev;
 
-                ata_qc_reinit(qc);
-        }
+        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);
         }
 }
 
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 280729325ebd..b061ba2c31d8 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -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);
+}
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 82ebe263d2f1..f840ca18a7c0 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -63,7 +63,7 @@ extern struct ata_link *ata_dev_phys_link(struct ata_device *dev);
 extern void ata_force_cbl(struct ata_port *ap);
 extern u64 ata_tf_to_lba(const struct ata_taskfile *tf);
 extern u64 ata_tf_to_lba48(const struct ata_taskfile *tf);
-extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev);
+extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev, int tag);
 extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
                            u64 block, u32 n_block, unsigned int tf_flags,
                            unsigned int tag);
@@ -144,6 +144,8 @@ extern void ata_scsi_dev_rescan(struct work_struct *work);
 extern int ata_bus_probe(struct ata_port *ap);
 extern int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,
                               unsigned int id, u64 lun);
+int ata_sas_allocate_tag(struct ata_port *ap);
+void ata_sas_free_tag(unsigned int tag, struct ata_port *ap);
 
 
 /* libata-eh.c */
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index ea655949023f..ba2667fa0528 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -388,6 +388,7 @@ static struct scsi_host_template sil24_sht = {
         .can_queue              = SIL24_MAX_CMDS,
         .sg_tablesize           = SIL24_MAX_SGE,
         .dma_boundary           = ATA_DMA_BOUNDARY,
+        .tag_alloc_policy       = BLK_TAG_ALLOC_FIFO,
 };
 
 static struct ata_port_operations sil24_ops = {