Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley: "Three fixes: the two fnic ones are a revert and a refix, which is why the diffstat is a bit big. The target one also extracts a function to add a check for configuration and so looks bigger than it is" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: fnic: Move fnic_fnic_flush_tx() to a work queue scsi: Revert "scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock" scsi: target: Fix unmap setup during configuration

Linus Torvalds committed 2 years ago

Commit c1ca10c2 parents 975b26a 379a58c6 files · +48 −33Browse files

Unified · Split

6 files

drivers/scsi/fcoe/fcoe_ctlr.c +8 −12
drivers/scsi/fnic/fnic.h +2 −1
drivers/scsi/fnic/fnic_fcs.c +3 −2
drivers/scsi/fnic/fnic_main.c +1 −0
drivers/scsi/fnic/fnic_scsi.c +2 −2
drivers/target/target_core_configfs.c +32 −16

drivers/scsi/fcoe/fcoe_ctlr.c+8−12

 {
 	struct fcoe_fcf *sel;
 	struct fcoe_fcf *fcf;
-	unsigned long flags;
 	mutex_lock(&fip->ctlr_mutex);
-	spin_lock_irqsave(&fip->ctlr_lock, flags);
+	spin_lock_bh(&fip->ctlr_lock);
 	kfree_skb(fip->flogi_req);
 	fip->flogi_req = NULL;
 	list_for_each_entry(fcf, &fip->fcfs, list)
 		fcf->flogi_sent = 0;
-	spin_unlock_irqrestore(&fip->ctlr_lock, flags);
+	spin_unlock_bh(&fip->ctlr_lock);
 	sel = fip->sel_fcf;
 	if (sel && ether_addr_equal(sel->fcf_mac, fip->dest_addr))
 {
 	struct fc_frame *fp;
 	struct fc_frame_header *fh;
-	unsigned long flags;
 	u16 old_xid;
 	u8 op;
 	u8 mac[ETH_ALEN];
 		op = FIP_DT_FLOGI;
 		if (fip->mode == FIP_MODE_VN2VN)
 			break;
-		spin_lock_irqsave(&fip->ctlr_lock, flags);
+		spin_lock_bh(&fip->ctlr_lock);
 		kfree_skb(fip->flogi_req);
 		fip->flogi_req = skb;
 		fip->flogi_req_send = 1;
-		spin_unlock_irqrestore(&fip->ctlr_lock, flags);
+		spin_unlock_bh(&fip->ctlr_lock);
 		schedule_work(&fip->timer_work);
 		return -EINPROGRESS;
 	case ELS_FDISC:
 static int fcoe_ctlr_flogi_retry(struct fcoe_ctlr *fip)
 {
 	struct fcoe_fcf *fcf;
-	unsigned long flags;
 	int error;
 	mutex_lock(&fip->ctlr_mutex);
-	spin_lock_irqsave(&fip->ctlr_lock, flags);
+	spin_lock_bh(&fip->ctlr_lock);
 	LIBFCOE_FIP_DBG(fip, "re-sending FLOGI - reselect\n");
 	fcf = fcoe_ctlr_select(fip);
 	if (!fcf || fcf->flogi_sent) {
 		fcoe_ctlr_solicit(fip, NULL);
 		error = fcoe_ctlr_flogi_send_locked(fip);
 	}
-	spin_unlock_irqrestore(&fip->ctlr_lock, flags);
+	spin_unlock_bh(&fip->ctlr_lock);
 	mutex_unlock(&fip->ctlr_mutex);
 	return error;
 }
 static void fcoe_ctlr_flogi_send(struct fcoe_ctlr *fip)
 {
 	struct fcoe_fcf *fcf;
-	unsigned long flags;
-	spin_lock_irqsave(&fip->ctlr_lock, flags);
+	spin_lock_bh(&fip->ctlr_lock);
 	fcf = fip->sel_fcf;
 	if (!fcf || !fip->flogi_req_send)
 		goto unlock;
 	} else /* XXX */
 		LIBFCOE_FIP_DBG(fip, "No FCF selected - defer send\n");
 unlock:
-	spin_unlock_irqrestore(&fip->ctlr_lock, flags);
+	spin_unlock_bh(&fip->ctlr_lock);
 }
 /**

drivers/scsi/fnic/fnic.h+2−1

 	unsigned int copy_wq_base;
 	struct work_struct link_work;
 	struct work_struct frame_work;
+	struct work_struct flush_work;
 	struct sk_buff_head frame_queue;
 	struct sk_buff_head tx_queue;
 int fnic_rq_cmpl_handler(struct fnic *fnic, int);
 int fnic_alloc_rq_frame(struct vnic_rq *rq);
 void fnic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf);
-void fnic_flush_tx(struct fnic *);
+void fnic_flush_tx(struct work_struct *work);
 void fnic_eth_send(struct fcoe_ctlr *, struct sk_buff *skb);
 void fnic_set_port_id(struct fc_lport *, u32, struct fc_frame *);
 void fnic_update_mac(struct fc_lport *, u8 *new);

drivers/scsi/fnic/fnic_fcs.c+3−2

 /**
  * fnic_flush_tx() - send queued frames.
- * @fnic: fnic device
+ * @work: pointer to work element
  *
  * Send frames that were waiting to go out in FC or Ethernet mode.
  * Whenever changing modes we purge queued frames, so these frames should
  *
  * Called without fnic_lock held.
  */
-void fnic_flush_tx(struct fnic *fnic)
+void fnic_flush_tx(struct work_struct *work)
 {
+	struct fnic *fnic = container_of(work, struct fnic, flush_work);
 	struct sk_buff *skb;
 	struct fc_frame *fp;

drivers/scsi/fnic/fnic_main.c+1−0

@@ -830,6 +830,7 @@ static int fnic_probe(struct pci_dev pdev, const struct pci_device_id ent) · 829 unmodified lines
830	spin_lock_init(&fnic->vlans_lock);	830	spin_lock_init(&fnic->vlans_lock);
831	INIT_WORK(&fnic->fip_frame_work, fnic_handle_fip_frame);	831	INIT_WORK(&fnic->fip_frame_work, fnic_handle_fip_frame);
832	INIT_WORK(&fnic->event_work, fnic_handle_event);	832	INIT_WORK(&fnic->event_work, fnic_handle_event);
		833	INIT_WORK(&fnic->flush_work, fnic_flush_tx);
833	skb_queue_head_init(&fnic->fip_frame_queue);	834	skb_queue_head_init(&fnic->fip_frame_queue);
834	INIT_LIST_HEAD(&fnic->evlist);	835	INIT_LIST_HEAD(&fnic->evlist);
835	INIT_LIST_HEAD(&fnic->vlans);	836	INIT_LIST_HEAD(&fnic->vlans);

drivers/scsi/fnic/fnic_scsi.c+2−2

@@ -680,7 +680,7 @@ static int fnic_fcpio_fw_reset_cmpl_handler(struct fnic *fnic, · 679 unmodified lines
680		680
681	spin_unlock_irqrestore(&fnic->fnic_lock, flags);	681	spin_unlock_irqrestore(&fnic->fnic_lock, flags);
682		682
683	fnic_flush_tx(fnic);	683	queue_work(fnic_event_queue, &fnic->flush_work);
684		684
685	reset_cmpl_handler_end:	685	reset_cmpl_handler_end:
686	fnic_clear_state_flags(fnic, FNIC_FLAGS_FWRESET);	686	fnic_clear_state_flags(fnic, FNIC_FLAGS_FWRESET);
@@ -736,7 +736,7 @@ static int fnic_fcpio_flogi_reg_cmpl_handler(struct fnic *fnic, · 49 unmodified lines
736	}	736	}
737	spin_unlock_irqrestore(&fnic->fnic_lock, flags);	737	spin_unlock_irqrestore(&fnic->fnic_lock, flags);
738		738
739	fnic_flush_tx(fnic);	739	queue_work(fnic_event_queue, &fnic->flush_work);
740	queue_work(fnic_event_queue, &fnic->frame_work);	740	queue_work(fnic_event_queue, &fnic->frame_work);
741	} else {	741	} else {
742	spin_unlock_irqrestore(&fnic->fnic_lock, flags);	742	spin_unlock_irqrestore(&fnic->fnic_lock, flags);

drivers/target/target_core_configfs.c+32−16

 	return count;
 }
+static int target_try_configure_unmap(struct se_device *dev,
+				      const char *config_opt)
+{
+	if (!dev->transport->configure_unmap) {
+		pr_err("Generic Block Discard not supported\n");
+		return -ENOSYS;
+	}
+	if (!target_dev_configured(dev)) {
+		pr_err("Generic Block Discard setup for %s requires device to be configured\n",
+		       config_opt);
+		return -ENODEV;
+	}
+	if (!dev->transport->configure_unmap(dev)) {
+		pr_err("Generic Block Discard setup for %s failed\n",
+		       config_opt);
+		return -ENOSYS;
+	}
+	return 0;
+}
 static ssize_t emulate_tpu_store(struct config_item *item,
 		const char *page, size_t count)
 {
 	 * Discard supported is detected iblock_create_virtdevice().
 	 */
 	if (flag && !da->max_unmap_block_desc_count) {
-		if (!dev->transport->configure_unmap ||
+		ret = target_try_configure_unmap(dev, "emulate_tpu");
-		    !dev->transport->configure_unmap(dev)) {
+		if (ret)
-			pr_err("Generic Block Discard not supported\n");
+			return ret;
-			return -ENOSYS;
-		}
 	}
 	da->emulate_tpu = flag;
 	 * Discard supported is detected iblock_create_virtdevice().
 	 */
 	if (flag && !da->max_unmap_block_desc_count) {
-		if (!dev->transport->configure_unmap ||
+		ret = target_try_configure_unmap(dev, "emulate_tpws");
-		    !dev->transport->configure_unmap(dev)) {
+		if (ret)
-			pr_err("Generic Block Discard not supported\n");
+			return ret;
-			return -ENOSYS;
-		}
 	}
 	da->emulate_tpws = flag;
 	 * Discard supported is detected iblock_configure_device().
 	 */
 	if (flag && !da->max_unmap_block_desc_count) {
-		if (!dev->transport->configure_unmap ||
+		ret = target_try_configure_unmap(dev, "unmap_zeroes_data");
-		    !dev->transport->configure_unmap(dev)) {
+		if (ret)
-			pr_err("dev[%p]: Thin Provisioning LBPRZ will not be set because max_unmap_block_desc_count is zero\n",
+			return ret;
-			       da->da_dev);
-			return -ENOSYS;
-		}
 	}
 	da->unmap_zeroes_data = flag;
 	pr_debug("dev[%p]: SE Device Thin Provisioning LBPRZ bit: %d\n",

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code