Skip to content

Commit ead83fc

Browse files
Karan Kumarjohnmeneghini
authored andcommitted
scsi: fnic: Remove unnecessary spinlock locking and unlocking
JIRA: https://issues.redhat.com/browse/RHEL-72902 Remove unnecessary locking and unlocking of spinlock in fdls_schedule_oxid_free_retry_work(). This will shorten the time in the critical section. Suggested-by: Dan Carpenter <dan.carpenter@linaro.org> Fixes: a63e78e ("scsi: fnic: Add support for fabric based solicited requests and responses") Reviewed-by: Sesidhar Baddela <sebaddel@cisco.com> Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com> Reviewed-by: Gian Carlo Boffa <gcboffa@cisco.com> Reviewed-by: Arun Easi <aeasi@cisco.com> Tested-by: Karan Tilak Kumar <kartilak@cisco.com> Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com> Link: https://lore.kernel.org/r/20250301013712.3115-2-kartilak@cisco.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> (cherry picked from commit f421692) Signed-off-by: Karan Kumar <karkumar@redhat.com>
1 parent 4db1ec5 commit ead83fc

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

drivers/scsi/fnic/fdls_disc.c

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -311,36 +311,26 @@ void fdls_schedule_oxid_free_retry_work(struct work_struct *work)
311311
unsigned long flags;
312312
int idx;
313313

314-
spin_lock_irqsave(&fnic->fnic_lock, flags);
315-
316314
for_each_set_bit(idx, oxid_pool->pending_schedule_free, FNIC_OXID_POOL_SZ) {
317315

318316
FNIC_FCS_DBG(KERN_INFO, fnic->host, fnic->fnic_num,
319317
"Schedule oxid free. oxid idx: %d\n", idx);
320318

321-
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
322319
reclaim_entry = kzalloc(sizeof(*reclaim_entry), GFP_KERNEL);
323-
spin_lock_irqsave(&fnic->fnic_lock, flags);
324-
325320
if (!reclaim_entry) {
326321
schedule_delayed_work(&oxid_pool->schedule_oxid_free_retry,
327322
msecs_to_jiffies(SCHEDULE_OXID_FREE_RETRY_TIME));
328-
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
329323
return;
330324
}
331325

332-
if (test_and_clear_bit(idx, oxid_pool->pending_schedule_free)) {
333-
reclaim_entry->oxid_idx = idx;
334-
reclaim_entry->expires = round_jiffies(jiffies + delay_j);
335-
list_add_tail(&reclaim_entry->links, &oxid_pool->oxid_reclaim_list);
336-
schedule_delayed_work(&oxid_pool->oxid_reclaim_work, delay_j);
337-
} else {
338-
/* unlikely scenario, free the allocated memory and continue */
339-
kfree(reclaim_entry);
340-
}
326+
clear_bit(idx, oxid_pool->pending_schedule_free);
327+
reclaim_entry->oxid_idx = idx;
328+
reclaim_entry->expires = round_jiffies(jiffies + delay_j);
329+
spin_lock_irqsave(&fnic->fnic_lock, flags);
330+
list_add_tail(&reclaim_entry->links, &oxid_pool->oxid_reclaim_list);
331+
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
332+
schedule_delayed_work(&oxid_pool->oxid_reclaim_work, delay_j);
341333
}
342-
343-
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
344334
}
345335

346336
static bool fdls_is_oxid_fabric_req(uint16_t oxid)

0 commit comments

Comments
 (0)