SCSI fixes for 6.6-rc4
Subsystems (5)
James Bottomley
maintainerThree fixes, all in drivers. The fnic one is the most extensive because the little used user initiated device reset path never tagged the command and adding a tag is rather involved. The other two fixes are smaller and more obvious.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Dinghao Liu (1):
scsi: zfcp: Fix a double put in zfcp_port_enqueue()
Junxiao Bi (1):
scsi: target: core: Fix deadlock due to recursive locking
Karan Tilak Kumar (1):
scsi: fnic: Fix sg_reset success path
And the diffstat:
drivers/s390/scsi/zfcp_aux.c | 9 +++--- drivers/scsi/fnic/fnic.h | 4 ++- drivers/scsi/fnic/fnic_io.h | 2 ++ drivers/scsi/fnic/fnic_main.c | 2 ++ drivers/scsi/fnic/fnic_scsi.c | 64 +++++++++++++++++++++++++++---------- drivers/target/target_core_device.c | 11 +++---- 6 files changed, 63 insertions(+), 29 deletions(-)
With full diff below.
James
---
drivers/s390/scsi/zfcp_aux.c +5 -4
@@ -518,12 +518,12 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,if (port) {put_device (&port->dev); retval = -EEXIST ; - goto err_out; + goto err_put; } port =kzalloc (sizeof (struct zfcp_port ),GFP_KERNEL );if (!port) - goto err_out; + goto err_put;rwlock_init (&port->unit_list_lock);INIT_LIST_HEAD (&port->unit_list);
@@ -546,7 +546,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,if (dev_set_name (&port->dev,"0x%016llx" , (unsigned long long )wwpn)) {kfree (port); - goto err_out; + goto err_put; } retval = -EINVAL ;
@@ -563,7 +563,8 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,return port; -err_out: +err_put:zfcp_ccw_adapter_put (adapter); +err_out:return ERR_PTR (retval); }
drivers/scsi/fnic/fnic.h +3 -1
@@ -27,7 +27,7 @@#define DRV_NAME "fnic"#define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.56" +#define DRV_VERSION "1.6.0.57"#define PFX DRV_NAME ": "#define DFX DRV_NAME "%d: "
@@ -237,6 +237,8 @@ struct fnic {unsigned int cq_count;struct mutex sgreset_mutex; +spinlock_t sgreset_lock;/* lock for sgreset */ +struct scsi_cmnd *sgreset_sc;struct dentry *fnic_stats_debugfs_host;struct dentry *fnic_stats_debugfs_file;struct dentry *fnic_reset_debugfs_file;
drivers/scsi/fnic/fnic_io.h +2 -0
@@ -52,6 +52,8 @@ struct fnic_io_req {unsigned long start_time;/* in jiffies */ struct completion *abts_done;/* completion for abts */ struct completion *dr_done;/* completion for device reset */ +unsigned int tag; +struct scsi_cmnd *sc;/* midlayer's cmd pointer */ };enum fnic_port_speeds {
drivers/scsi/fnic/fnic_main.c +2 -0
@@ -754,6 +754,8 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)for (i =0 ; i <FNIC_IO_LOCKS ; i++)spin_lock_init (&fnic->io_req_lock[i]); +spin_lock_init (&fnic->sgreset_lock); + err = -ENOMEM ; fnic->io_req_pool =mempool_create_slab_pool (2 , fnic_io_req_cache);if (!fnic->io_req_pool)
drivers/scsi/fnic/fnic_scsi.c +47 -17
133 lines not on this page · raw message
drivers/target/target_core_device.c +4 -7
@@ -843,7 +843,6 @@ sector_t target_to_linux_sector(struct se_device *dev, sector_t lb)EXPORT_SYMBOL (target_to_linux_sector);struct devices_idr_iter { -struct config_item *prev_item;int (*fn)(struct se_device *dev,void *data);void *data; };
@@ -853,11 +852,9 @@ static int target_devices_idr_iter(int id, void *p, void *data) {struct devices_idr_iter *iter = data;struct se_device *dev = p; +struct config_item *item;int ret; -config_item_put (iter->prev_item); - iter->prev_item =NULL ; -/* * We add the device early to the idr, so it can be used * by backend modules during configuration. We do not want
@@ -867,12 +864,13 @@ static int target_devices_idr_iter(int id, void *p, void *data)if (!target_dev_configured (dev))return 0 ; - iter->prev_item =config_item_get_unless_zero (&dev->dev_group.cg_item); -if (!iter->prev_item) + item =config_item_get_unless_zero (&dev->dev_group.cg_item); +if (!item)return 0 ;mutex_unlock (&device_mutex); ret = iter->fn (dev, iter->data); +config_item_put (item);mutex_lock (&device_mutex);return ret;
@@ -895,7 +893,6 @@ int target_for_each_device(int (*fn)(struct se_device *dev, void *data),mutex_lock (&device_mutex); ret =idr_for_each (&devices_idr, target_devices_idr_iter, &iter);mutex_unlock (&device_mutex); -config_item_put (iter.prev_item);return ret; }
The pull request you sent on Tue, 03 Oct 2023 09:43:56 -0400:
The pull request you sent on Tue, 03 Oct 2023 09:43:56 -0400:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5e62ed3b1c8a397185af53d6b94f04b9ff21ec7d
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html