leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpt3sas: Refcount fw_events and fix unsafe list usage

Browse Source 
The fw_event_work struct is concurrently referenced at shutdown. Add a
refcount to protect it and refactor the code to use it.

Additionally, refactor _scsih_fw_event_cleanup_queue() such that it no
longer iterates over the list without holding the lock since
_firmware_event_work() concurrently deletes items from the list.

This patch is ported from commit 008549f6e8 ("mpt2sas: Refcount
fw_events and fix unsafe list usage"). These changes are also required
for mpt3sas.

Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Sreekanth Reddy 2015-11-11 17:30:31 +05:30 committed by Martin K. Petersen
parent d1cb5e495e
commit 146b16c807
1 changed files with 94 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View File

@ -200,9 +200,37 @@ struct fw_event_work {
u8 VP_ID; u8 VP_ID;
u8 ignore; u8 ignore;
u16 event; u16 event;
struct kref refcount;
char event_data[0] __aligned(4); char event_data[0] __aligned(4);
}; };
static void fw_event_work_free(struct kref *r)
{
kfree(container_of(r, struct fw_event_work, refcount));
}
static void fw_event_work_get(struct fw_event_work *fw_work)
{
kref_get(&fw_work->refcount);
}
static void fw_event_work_put(struct fw_event_work *fw_work)
{
kref_put(&fw_work->refcount, fw_event_work_free);
}
static struct fw_event_work *alloc_fw_event_work(int len)
{
struct fw_event_work *fw_event;
fw_event = kzalloc(sizeof(*fw_event) + len, GFP_ATOMIC);
if (!fw_event)
return NULL;
kref_init(&fw_event->refcount);
return fw_event;
}
/** /**
* struct _scsi_io_transfer - scsi io transfer * struct _scsi_io_transfer - scsi io transfer
* @handle: sas device handle (assigned by firmware) * @handle: sas device handle (assigned by firmware)
@ -2598,32 +2626,36 @@ _scsih_fw_event_add(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event)
return; return;
spin_lock_irqsave(&ioc->fw_event_lock, flags); spin_lock_irqsave(&ioc->fw_event_lock, flags);
fw_event_work_get(fw_event);
INIT_LIST_HEAD(&fw_event->list); INIT_LIST_HEAD(&fw_event->list);
list_add_tail(&fw_event->list, &ioc->fw_event_list); list_add_tail(&fw_event->list, &ioc->fw_event_list);
INIT_WORK(&fw_event->work, _firmware_event_work); INIT_WORK(&fw_event->work, _firmware_event_work);
fw_event_work_get(fw_event);
queue_work(ioc->firmware_event_thread, &fw_event->work); queue_work(ioc->firmware_event_thread, &fw_event->work);
spin_unlock_irqrestore(&ioc->fw_event_lock, flags); spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
} }
/** /**
* _scsih_fw_event_free - delete fw_event * _scsih_fw_event_del_from_list - delete fw_event from the list
* @ioc: per adapter object * @ioc: per adapter object
* @fw_event: object describing the event * @fw_event: object describing the event
* Context: This function will acquire ioc->fw_event_lock. * Context: This function will acquire ioc->fw_event_lock.
* *
* This removes firmware event object from link list, frees associated memory. * If the fw_event is on the fw_event_list, remove it and do a put.
* *
* Return nothing. * Return nothing.
*/ */
static void static void
_scsih_fw_event_free(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work _scsih_fw_event_del_from_list(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work
*fw_event) *fw_event)
{ {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ioc->fw_event_lock, flags); spin_lock_irqsave(&ioc->fw_event_lock, flags);
list_del(&fw_event->list); if (!list_empty(&fw_event->list)) {
kfree(fw_event); list_del_init(&fw_event->list);
fw_event_work_put(fw_event);
}
spin_unlock_irqrestore(&ioc->fw_event_lock, flags); spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
} }
@ -2640,17 +2672,19 @@ mpt3sas_send_trigger_data_event(struct MPT3SAS_ADAPTER *ioc,
struct SL_WH_TRIGGERS_EVENT_DATA_T *event_data) struct SL_WH_TRIGGERS_EVENT_DATA_T *event_data)
{ {
struct fw_event_work *fw_event; struct fw_event_work *fw_event;
u16 sz;
if (ioc->is_driver_loading) if (ioc->is_driver_loading)
return; return;
fw_event = kzalloc(sizeof(*fw_event) + sizeof(*event_data), sz = sizeof(*event_data);
GFP_ATOMIC); fw_event = alloc_fw_event_work(sz);
if (!fw_event) if (!fw_event)
return; return;
fw_event->event = MPT3SAS_PROCESS_TRIGGER_DIAG; fw_event->event = MPT3SAS_PROCESS_TRIGGER_DIAG;
fw_event->ioc = ioc; fw_event->ioc = ioc;
memcpy(fw_event->event_data, event_data, sizeof(*event_data)); memcpy(fw_event->event_data, event_data, sizeof(*event_data));
_scsih_fw_event_add(ioc, fw_event); _scsih_fw_event_add(ioc, fw_event);
fw_event_work_put(fw_event);
} }
/** /**
@ -2666,12 +2700,13 @@ _scsih_error_recovery_delete_devices(struct MPT3SAS_ADAPTER *ioc)
if (ioc->is_driver_loading) if (ioc->is_driver_loading)
return; return;
fw_event = kzalloc(sizeof(struct fw_event_work), GFP_ATOMIC); fw_event = alloc_fw_event_work(0);
if (!fw_event) if (!fw_event)
return; return;
fw_event->event = MPT3SAS_REMOVE_UNRESPONDING_DEVICES; fw_event->event = MPT3SAS_REMOVE_UNRESPONDING_DEVICES;
fw_event->ioc = ioc; fw_event->ioc = ioc;
_scsih_fw_event_add(ioc, fw_event); _scsih_fw_event_add(ioc, fw_event);
fw_event_work_put(fw_event);
} }
/** /**
@ -2685,12 +2720,29 @@ mpt3sas_port_enable_complete(struct MPT3SAS_ADAPTER *ioc)
{ {
struct fw_event_work *fw_event; struct fw_event_work *fw_event;
fw_event = kzalloc(sizeof(struct fw_event_work), GFP_ATOMIC); fw_event = alloc_fw_event_work(0);
if (!fw_event) if (!fw_event)
return; return;
fw_event->event = MPT3SAS_PORT_ENABLE_COMPLETE; fw_event->event = MPT3SAS_PORT_ENABLE_COMPLETE;
fw_event->ioc = ioc; fw_event->ioc = ioc;
_scsih_fw_event_add(ioc, fw_event); _scsih_fw_event_add(ioc, fw_event);
fw_event_work_put(fw_event);
}
static struct fw_event_work *dequeue_next_fw_event(struct MPT3SAS_ADAPTER *ioc)
{
unsigned long flags;
struct fw_event_work *fw_event = NULL;
spin_lock_irqsave(&ioc->fw_event_lock, flags);
if (!list_empty(&ioc->fw_event_list)) {
fw_event = list_first_entry(&ioc->fw_event_list,
struct fw_event_work, list);
list_del_init(&fw_event->list);
}
spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
return fw_event;
} }
/** /**
@ -2705,17 +2757,25 @@ mpt3sas_port_enable_complete(struct MPT3SAS_ADAPTER *ioc)
static void static void
_scsih_fw_event_cleanup_queue(struct MPT3SAS_ADAPTER *ioc) _scsih_fw_event_cleanup_queue(struct MPT3SAS_ADAPTER *ioc)
{ {
struct fw_event_work *fw_event, *next; struct fw_event_work *fw_event;
if (list_empty(&ioc->fw_event_list) || if (list_empty(&ioc->fw_event_list) ||
!ioc->firmware_event_thread || in_interrupt()) !ioc->firmware_event_thread || in_interrupt())
return; return;
list_for_each_entry_safe(fw_event, next, &ioc->fw_event_list, list) { while ((fw_event = dequeue_next_fw_event(ioc))) {
if (cancel_delayed_work_sync(&fw_event->delayed_work)) { /*
_scsih_fw_event_free(ioc, fw_event); * Wait on the fw_event to complete. If this returns 1, then
continue; * the event was never executed, and we need a put for the
} * reference the delayed_work had on the fw_event.
*
* If it did execute, we wait for it to finish, and the put will
* happen from _firmware_event_work()
*/
if (cancel_delayed_work_sync(&fw_event->delayed_work))
fw_event_work_put(fw_event);
fw_event_work_put(fw_event);
} }
} }
@ -4242,13 +4302,14 @@ _scsih_send_event_to_turn_on_pfa_led(struct MPT3SAS_ADAPTER *ioc, u16 handle)
{ {
struct fw_event_work *fw_event; struct fw_event_work *fw_event;
fw_event = kzalloc(sizeof(struct fw_event_work), GFP_ATOMIC); fw_event = alloc_fw_event_work(0);
if (!fw_event) if (!fw_event)
return; return;
fw_event->event = MPT3SAS_TURN_ON_PFA_LED; fw_event->event = MPT3SAS_TURN_ON_PFA_LED;
fw_event->device_handle = handle; fw_event->device_handle = handle;
fw_event->ioc = ioc; fw_event->ioc = ioc;
_scsih_fw_event_add(ioc, fw_event); _scsih_fw_event_add(ioc, fw_event);
fw_event_work_put(fw_event);
} }
/** /**
@ -7498,10 +7559,11 @@ mpt3sas_scsih_reset_handler(struct MPT3SAS_ADAPTER *ioc, int reset_phase)
static void static void
_mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event) _mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event)
{ {
_scsih_fw_event_del_from_list(ioc, fw_event);
/* the queue is being flushed so ignore this event */ /* the queue is being flushed so ignore this event */
if (ioc->remove_host || if (ioc->remove_host || ioc->pci_error_recovery) {
ioc->pci_error_recovery) { fw_event_work_put(fw_event);
_scsih_fw_event_free(ioc, fw_event);
return; return;
} }
@ -7512,8 +7574,16 @@ _mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event)
fw_event->event_data); fw_event->event_data);
break; break;
case MPT3SAS_REMOVE_UNRESPONDING_DEVICES: case MPT3SAS_REMOVE_UNRESPONDING_DEVICES:
while (scsi_host_in_recovery(ioc->shost) || ioc->shost_recovery) while (scsi_host_in_recovery(ioc->shost) ||
ioc->shost_recovery) {
/*
* If we're unloading, bail. Otherwise, this can become
* an infinite loop.
*/
if (ioc->remove_host)
goto out;
ssleep(1); ssleep(1);
}
_scsih_remove_unresponding_sas_devices(ioc); _scsih_remove_unresponding_sas_devices(ioc);
_scsih_scan_for_devices_after_reset(ioc); _scsih_scan_for_devices_after_reset(ioc);
break; break;
@ -7558,7 +7628,8 @@ _mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event)
_scsih_sas_ir_operation_status_event(ioc, fw_event); _scsih_sas_ir_operation_status_event(ioc, fw_event);
break; break;
} }
_scsih_fw_event_free(ioc, fw_event); out:
fw_event_work_put(fw_event);
} }
/** /**
@ -7720,7 +7791,7 @@ mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index,
} }
sz = le16_to_cpu(mpi_reply->EventDataLength) * 4; sz = le16_to_cpu(mpi_reply->EventDataLength) * 4;
fw_event = kzalloc(sizeof(*fw_event) + sz, GFP_ATOMIC); fw_event = alloc_fw_event_work(sz);
if (!fw_event) { if (!fw_event) {
pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n", pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n",
ioc->name, __FILE__, __LINE__, __func__); ioc->name, __FILE__, __LINE__, __func__);
@ -7733,6 +7804,7 @@ mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index,
fw_event->VP_ID = mpi_reply->VP_ID; fw_event->VP_ID = mpi_reply->VP_ID;
fw_event->event = event; fw_event->event = event;
_scsih_fw_event_add(ioc, fw_event); _scsih_fw_event_add(ioc, fw_event);
fw_event_work_put(fw_event);
return 1; return 1;
} }