Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target updates from Nicholas Bellinger:
 "The highlights this round include:

  - add support for SCSI Referrals (Hannes)
  - add support for T10 DIF into target core (nab + mkp)
  - add support for T10 DIF emulation in FILEIO + RAMDISK backends (Sagi + nab)
  - add support for T10 DIF -> bio_integrity passthrough in IBLOCK backend (nab)
  - prep changes to iser-target for >= v3.15 T10 DIF support (Sagi)
  - add support for qla2xxx N_Port ID Virtualization - NPIV (Saurav + Quinn)
  - allow percpu_ida_alloc() to receive task state bitmask (Kent)
  - fix >= v3.12 iscsi-target session reset hung task regression (nab)
  - fix >= v3.13 percpu_ref se_lun->lun_ref_active race (nab)
  - fix a long-standing network portal creation race (Andy)"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (51 commits)
  target: Fix percpu_ref_put race in transport_lun_remove_cmd
  target/iscsi: Fix network portal creation race
  target: Report bad sector in sense data for DIF errors
  iscsi-target: Convert gfp_t parameter to task state bitmask
  iscsi-target: Fix connection reset hang with percpu_ida_alloc
  percpu_ida: Make percpu_ida_alloc + callers accept task state bitmask
  iscsi-target: Pre-allocate more tags to avoid ack starvation
  qla2xxx: Configure NPIV fc_vport via tcm_qla2xxx_npiv_make_lport
  qla2xxx: Enhancements to enable NPIV support for QLOGIC ISPs with TCM/LIO.
  qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure
  IB/isert: pass scatterlist instead of cmd to fast_reg_mr routine
  IB/isert: Move fastreg descriptor creation to a function
  IB/isert: Avoid frwr notation, user fastreg
  IB/isert: seperate connection protection domains and dma MRs
  tcm_loop: Enable DIF/DIX modes in SCSI host LLD
  target/rd: Add DIF protection into rd_execute_rw
  target/rd: Add support for protection SGL setup + release
  target/rd: Refactor rd_build_device_space + rd_release_device_space
  target/file: Add DIF protection support to fd_execute_rw
  target/file: Add DIF protection init/format support
  ...

1 files changed, 90 insertions, 3 deletions

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 2d29356d0c85..554d4f75a75a 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -91,6 +91,7 @@ static int iblock_configure_device(struct se_device *dev)
         struct iblock_dev *ib_dev = IBLOCK_DEV(dev);
         struct request_queue *q;
         struct block_device *bd = NULL;
+        struct blk_integrity *bi;
         fmode_t mode;
         int ret = -ENOMEM;
 
@@ -155,8 +156,40 @@ static int iblock_configure_device(struct se_device *dev)
         if (blk_queue_nonrot(q))
                 dev->dev_attrib.is_nonrot = 1;
 
+        bi = bdev_get_integrity(bd);
+        if (bi) {
+                struct bio_set *bs = ib_dev->ibd_bio_set;
+
+                if (!strcmp(bi->name, "T10-DIF-TYPE3-IP") ||
+                    !strcmp(bi->name, "T10-DIF-TYPE1-IP")) {
+                        pr_err("IBLOCK export of blk_integrity: %s not"
+                               " supported\n", bi->name);
+                        ret = -ENOSYS;
+                        goto out_blkdev_put;
+                }
+
+                if (!strcmp(bi->name, "T10-DIF-TYPE3-CRC")) {
+                        dev->dev_attrib.pi_prot_type = TARGET_DIF_TYPE3_PROT;
+                } else if (!strcmp(bi->name, "T10-DIF-TYPE1-CRC")) {
+                        dev->dev_attrib.pi_prot_type = TARGET_DIF_TYPE1_PROT;
+                }
+
+                if (dev->dev_attrib.pi_prot_type) {
+                        if (bioset_integrity_create(bs, IBLOCK_BIO_POOL_SIZE) < 0) {
+                                pr_err("Unable to allocate bioset for PI\n");
+                                ret = -ENOMEM;
+                                goto out_blkdev_put;
+                        }
+                        pr_debug("IBLOCK setup BIP bs->bio_integrity_pool: %p\n",
+                                 bs->bio_integrity_pool);
+                }
+                dev->dev_attrib.hw_pi_prot_type = dev->dev_attrib.pi_prot_type;
+        }
+
         return 0;
 
+out_blkdev_put:
+        blkdev_put(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
 out_free_bioset:
         bioset_free(ib_dev->ibd_bio_set);
         ib_dev->ibd_bio_set = NULL;
@@ -170,8 +203,10 @@ static void iblock_free_device(struct se_device *dev)
 
         if (ib_dev->ibd_bd != NULL)
                 blkdev_put(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
-        if (ib_dev->ibd_bio_set != NULL)
+        if (ib_dev->ibd_bio_set != NULL) {
+                bioset_integrity_free(ib_dev->ibd_bio_set);
                 bioset_free(ib_dev->ibd_bio_set);
+        }
         kfree(ib_dev);
 }
 
@@ -586,13 +621,58 @@ static ssize_t iblock_show_configfs_dev_params(struct se_device *dev, char *b)
         return bl;
 }
 
+static int
+iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct blk_integrity *bi;
+        struct bio_integrity_payload *bip;
+        struct iblock_dev *ib_dev = IBLOCK_DEV(dev);
+        struct scatterlist *sg;
+        int i, rc;
+
+        bi = bdev_get_integrity(ib_dev->ibd_bd);
+        if (!bi) {
+                pr_err("Unable to locate bio_integrity\n");
+                return -ENODEV;
+        }
+
+        bip = bio_integrity_alloc(bio, GFP_NOIO, cmd->t_prot_nents);
+        if (!bip) {
+                pr_err("Unable to allocate bio_integrity_payload\n");
+                return -ENOMEM;
+        }
+
+        bip->bip_iter.bi_size = (cmd->data_length / dev->dev_attrib.block_size) *
+                         dev->prot_length;
+        bip->bip_iter.bi_sector = bio->bi_iter.bi_sector;
+
+        pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_iter.bi_size,
+                 (unsigned long long)bip->bip_iter.bi_sector);
+
+        for_each_sg(cmd->t_prot_sg, sg, cmd->t_prot_nents, i) {
+
+                rc = bio_integrity_add_page(bio, sg_page(sg), sg->length,
+                                            sg->offset);
+                if (rc != sg->length) {
+                        pr_err("bio_integrity_add_page() failed; %d\n", rc);
+                        return -ENOMEM;
+                }
+
+                pr_debug("Added bio integrity page: %p length: %d offset; %d\n",
+                         sg_page(sg), sg->length, sg->offset);
+        }
+
+        return 0;
+}
+
 static sense_reason_t
 iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
                   enum dma_data_direction data_direction)
 {
         struct se_device *dev = cmd->se_dev;
         struct iblock_req *ibr;
-        struct bio *bio;
+        struct bio *bio, *bio_start;
         struct bio_list list;
         struct scatterlist *sg;
         u32 sg_num = sgl_nents;
@@ -655,6 +735,7 @@ iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
         if (!bio)
                 goto fail_free_ibr;
 
+        bio_start = bio;
         bio_list_init(&list);
         bio_list_add(&list, bio);
 
@@ -688,6 +769,12 @@ iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
                 sg_num--;
         }
 
+        if (cmd->prot_type) {
+                int rc = iblock_alloc_bip(cmd, bio_start);
+                if (rc)
+                        goto fail_put_bios;
+        }
+
         iblock_submit_bios(&list, rw);
         iblock_complete_cmd(cmd);
         return 0;
@@ -763,7 +850,7 @@ iblock_parse_cdb(struct se_cmd *cmd)
         return sbc_parse_cdb(cmd, &iblock_sbc_ops);
 }
 
-bool iblock_get_write_cache(struct se_device *dev)
+static bool iblock_get_write_cache(struct se_device *dev)
 {
         struct iblock_dev *ib_dev = IBLOCK_DEV(dev);
         struct block_device *bd = ib_dev->ibd_bd;