Simplify multiple create*_workqueue() invocations
Subsystems (22)
Bart Van Assche
reviewerv3 cover Simplify multiple create*_workqueue() invocations
Hi Martin,
Multiple SCSI drivers use snprintf() to format a workqueue name before invoking one of the create*_workqueue() macros. This patch series simplifies such code by passing the format string and arguments to alloc_workqueue(). Additionally, the structure members that are only used as a temporary buffer for formatting workqueue names are removed. Please consider this patch series for the next merge window.
Thanks,
Bart.
Changes compared to v2:
- Added more Reviewed-by tags.
Changes compared to v1:
- Added several Reviewed-by tags.
Bart Van Assche (18):
scsi: Expand all create*_workqueue() invocations
scsi: mptfusion: Simplify the alloc*_workqueue() invocations
scsi: be2iscsi: Simplify an alloc_workqueue() invocation
scsi: bfa: Simplify an alloc_ordered_workqueue() invocation
scsi: esas2r: Simplify an alloc_ordered_workqueue() invocation
scsi: fcoe: Simplify alloc_ordered_workqueue() invocations
scsi: ibmvscsi_tgt: Simplify an alloc_workqueue() invocation
scsi: mpi3mr: Simplify an alloc_ordered_workqueue() invocation
scsi: mpt3sas: Simplify an alloc_ordered_workqueue() invocation
scsi: myrb: Simplify an alloc_ordered_workqueue() invocation
scsi: myrs: Simplify an alloc_ordered_workqueue() invocation
scsi: qedf: Simplify alloc_workqueue() invocations
scsi: qedi: Simplify an alloc_workqueue() invocation
scsi: snic: Simplify alloc_workqueue() invocations
scsi: scsi_transport_fc: Simplify alloc_workqueue() invocations
scsi: stex: Simplify an alloc_ordered_workqueue() invocation
scsi: ufs: Simplify alloc*_workqueue() invocation
scsi: core: Simplify an alloc_workqueue() invocation
drivers/message/fusion/mptbase.c | 10 +++------- drivers/message/fusion/mptbase.h | 3 --- drivers/message/fusion/mptfc.c | 7 ++----- drivers/scsi/be2iscsi/be_main.c | 6 ++---- drivers/scsi/bfa/bfad_im.c | 5 ++--- drivers/scsi/bfa/bfad_im.h | 1 - drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 ++-- drivers/scsi/device_handler/scsi_dh_rdac.c | 3 ++- drivers/scsi/elx/efct/efct_lio.c | 3 ++- drivers/scsi/esas2r/esas2r.h | 1 - drivers/scsi/esas2r/esas2r_init.c | 5 ++--- drivers/scsi/fcoe/fcoe_sysfs.c | 18 +++++------------ drivers/scsi/fnic/fnic_main.c | 6 ++++-- drivers/scsi/hisi_sas/hisi_sas_main.c | 3 ++- drivers/scsi/hosts.c | 9 ++++----- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 ++--- drivers/scsi/libfc/fc_exch.c | 3 ++- drivers/scsi/libfc/fc_rport.c | 3 ++- drivers/scsi/libsas/sas_init.c | 4 ++-- drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 ++-- drivers/scsi/mpi3mr/mpi3mr.h | 2 -- drivers/scsi/mpi3mr/mpi3mr_fw.c | 4 ++-- drivers/scsi/mpi3mr/mpi3mr_os.c | 4 +--- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 ++-- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +--- drivers/scsi/myrb.c | 5 ++--- drivers/scsi/myrb.h | 1 - drivers/scsi/myrs.c | 5 ++--- drivers/scsi/myrs.h | 1 - drivers/scsi/qedf/qedf_main.c | 20 +++++++++---------- drivers/scsi/qedi/qedi_main.c | 8 +++++--- drivers/scsi/qla2xxx/qla_os.c | 6 ++++-- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/scsi_transport_fc.c | 11 +++-------- drivers/scsi/snic/snic_main.c | 8 ++++---- drivers/scsi/stex.c | 6 ++---- drivers/scsi/vmw_pvscsi.c | 3 ++- drivers/ufs/core/ufshcd.c | 22 +++++++-------------- include/scsi/fcoe_sysfs.h | 2 -- include/scsi/scsi_host.h | 1 - include/scsi/scsi_transport_fc.h | 6 ------ 42 files changed, 90 insertions(+), 142 deletions(-)
Bart Van Assche
reviewerPATCH v3 1/18 scsi: Expand all create*_workqueue() invocations
The workqueue maintainer wants to remove the create*_workqueue() macros because these macros always set the WQ_MEM_RECLAIM flag and because these only support literal workqueue names. Hence this patch that replaces the create*_workqueue() invocations with the definition of this macro. The WQ_MEM_RECLAIM flag has been retained because I think that flag is necessary for workqueues created by storage drivers. This patch has been generated by running spatch and git clang-format. spatch has been invoked as follows:
spatch --in-place --sp-file expand-create-workqueue.spatch $(git grep -lEw 'create_(freezable_|singlethread_|)workqueue' */scsi */ufs)
The contents of the expand-create-workqueue.spatch file is as follows:
@@
expression name;
@@
-create_workqueue(name)
+alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, name)
@@
expression name;
@@
-create_freezable_workqueue(name)
+alloc_workqueue("%s", WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, 1, name) @@
expression name;
@@
-create_singlethread_workqueue(name) +alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM, name)
--- drivers/scsi/bfa/bfad_im.c | 3 ++- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 ++-- drivers/scsi/device_handler/scsi_dh_rdac.c | 3 ++- drivers/scsi/elx/efct/efct_lio.c | 3 ++- drivers/scsi/esas2r/esas2r_init.c | 3 ++- drivers/scsi/fcoe/fcoe_sysfs.c | 8 ++++---- drivers/scsi/fnic/fnic_main.c | 6 ++++-- drivers/scsi/hisi_sas/hisi_sas_main.c | 3 ++- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- drivers/scsi/libfc/fc_exch.c | 3 ++- drivers/scsi/libfc/fc_rport.c | 3 ++- drivers/scsi/libsas/sas_init.c | 4 ++-- drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 ++-- drivers/scsi/mpi3mr/mpi3mr_fw.c | 4 ++-- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 ++-- drivers/scsi/myrb.c | 3 ++- drivers/scsi/myrs.c | 3 ++- drivers/scsi/qedf/qedf_main.c | 13 +++++++------ drivers/scsi/qedi/qedi_main.c | 6 ++++-- drivers/scsi/qla2xxx/qla_os.c | 6 ++++-- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/snic/snic_main.c | 6 ++++-- drivers/scsi/stex.c | 3 ++- drivers/scsi/vmw_pvscsi.c | 3 ++- drivers/ufs/core/ufshcd.c | 5 +++-- 25 files changed, 64 insertions(+), 43 deletions(-)
drivers/scsi/bfa/bfad_im.c +2 -1
@@ -768,7 +768,8 @@ bfad_thread_workq(struct bfad_s *bfad)bfa_trc (bfad,0 );snprintf (im->drv_workq_name,KOBJ_NAME_LEN ,"bfad_wq_%d" , bfad->inst_no); - im->drv_workq =create_singlethread_workqueue (im->drv_workq_name); + im->drv_workq =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , + im->drv_workq_name);if (!im->drv_workq)return BFA_STATUS_FAILED ;
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +2 -2
@@ -2363,8 +2363,8 @@ static int _bnx2fc_create(struct net_device *netdev, interface->vlan_id = vlan_id; interface->tm_timeout =BNX2FC_TM_TIMEOUT ; - interface->timer_work_queue = -create_singlethread_workqueue ("bnx2fc_timer_wq" ); + interface->timer_work_queue =alloc_ordered_workqueue ( +"%s" ,WQ_MEM_RECLAIM ,"bnx2fc_timer_wq" );if (!interface->timer_work_queue) { printk(KERN_ERR PFX "ulp_init could not create timer_wq\n"); rc = -EINVAL ;
drivers/scsi/device_handler/scsi_dh_rdac.c +2 -1
@@ -822,7 +822,8 @@ static int __init rdac_init(void)/* * Create workqueue to handle mode selects for rdac */ - kmpath_rdacd =create_singlethread_workqueue ("kmpath_rdacd" ); + kmpath_rdacd = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM ,"kmpath_rdacd" );if (!kmpath_rdacd) {scsi_unregister_device_handler (&rdac_dh);printk (KERN_ERR "kmpath_rdacd creation failed.\n" );
drivers/scsi/elx/efct/efct_lio.c +2 -1
@@ -1114,7 +1114,8 @@ int efct_scsi_tgt_new_device(struct efct *efct)atomic_set (&efct->tgt_efct.watermark_hit,0 );atomic_set (&efct->tgt_efct.initiator_count,0 ); - lio_wq =create_singlethread_workqueue ("efct_lio_worker" ); + lio_wq =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , +"efct_lio_worker" );if (!lio_wq) {efc_log_err (efct,"workqueue create failed\n" );return -EIO ;
drivers/scsi/esas2r/esas2r_init.c +2 -1
@@ -313,7 +313,8 @@ int esas2r_init_adapter(struct Scsi_Host *host, struct pci_dev *pcid,esas2r_fw_event_off (a);snprintf (a->fw_event_q_name,ESAS2R_KOBJ_NAME_LEN ,"esas2r/%d" , a->index); - a->fw_event_q =create_singlethread_workqueue (a->fw_event_q_name); + a->fw_event_q =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , + a->fw_event_q_name);init_waitqueue_head (&a->buffered_ioctl_waiter);init_waitqueue_head (&a->nvram_waiter);
drivers/scsi/fcoe/fcoe_sysfs.c +4 -4
@@ -799,16 +799,16 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,snprintf (ctlr->work_q_name,sizeof (ctlr->work_q_name),"ctlr_wq_%d" , ctlr->id); - ctlr->work_q =create_singlethread_workqueue ( - ctlr->work_q_name); + ctlr->work_q =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , + ctlr->work_q_name);if (!ctlr->work_q) goto out_del;snprintf (ctlr->devloss_work_q_name,sizeof (ctlr->devloss_work_q_name),"ctlr_dl_wq_%d" , ctlr->id); - ctlr->devloss_work_q =create_singlethread_workqueue ( - ctlr->devloss_work_q_name); + ctlr->devloss_work_q =alloc_ordered_workqueue ( +"%s" ,WQ_MEM_RECLAIM , ctlr->devloss_work_q_name);if (!ctlr->devloss_work_q) goto out_del_q;
drivers/scsi/fnic/fnic_main.c +4 -2
@@ -1161,14 +1161,16 @@ static int __init fnic_init_module(void) goto err_create_fnic_ioreq_slab; } - fnic_event_queue =create_singlethread_workqueue ("fnic_event_wq" ); + fnic_event_queue = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM ,"fnic_event_wq" );if (!fnic_event_queue) { printk(KERN_ERR PFX "fnic work queue create failed\n"); err = -ENOMEM ; goto err_create_fnic_workq; } - fnic_fip_queue =create_singlethread_workqueue ("fnic_fip_q" ); + fnic_fip_queue = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM ,"fnic_fip_q" );if (!fnic_fip_queue) { printk(KERN_ERR PFX "fnic FIP work queue create failed\n"); err = -ENOMEM ;
drivers/scsi/hisi_sas/hisi_sas_main.c +2 -1
@@ -2302,7 +2302,8 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba) hisi_hba->last_slot_index =0 ; - hisi_hba->wq =create_singlethread_workqueue (dev_name (dev)); + hisi_hba->wq = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM ,dev_name (dev));if (!hisi_hba->wq) {dev_err (dev,"sas_alloc: failed to create workqueue\n" ); goto err_out;
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +1 -1
@@ -3537,7 +3537,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev,init_completion (&vscsi->unconfig);snprintf (wq_name,24 ,"ibmvscsis%s" ,dev_name (&vdev->dev)); - vscsi->work_q =create_workqueue (wq_name); + vscsi->work_q =alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , wq_name);if (!vscsi->work_q) { rc = -ENOMEM ;dev_err (&vscsi->dev,"create_workqueue failed\n" );
drivers/scsi/libfc/fc_exch.c +2 -1
@@ -2693,7 +2693,8 @@ int fc_setup_exch_mgr(void) fc_cpu_order =ilog2 (roundup_pow_of_two (nr_cpu_ids)); fc_cpu_mask = (1 << fc_cpu_order) -1 ; - fc_exch_workqueue =create_singlethread_workqueue ("fc_exch_workqueue" ); + fc_exch_workqueue =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , +"fc_exch_workqueue" );if (!fc_exch_workqueue) goto err;return 0 ;
drivers/scsi/libfc/fc_rport.c +2 -1
@@ -2263,7 +2263,8 @@ struct fc4_prov fc_rport_t0_prov = {*/ int fc_setup_rport (void ) { - rport_event_queue =create_singlethread_workqueue ("fc_rport_eq" ); + rport_event_queue = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM ,"fc_rport_eq" );if (!rport_event_queue)return -ENOMEM ;return 0 ;
drivers/scsi/libsas/sas_init.c +2 -2
@@ -122,12 +122,12 @@ int sas_register_ha(struct sas_ha_struct *sas_ha) error = -ENOMEM ;snprintf (name,sizeof (name),"%s_event_q" ,dev_name (sas_ha->dev)); - sas_ha->event_q =create_singlethread_workqueue (name); + sas_ha->event_q =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , name);if (!sas_ha->event_q) goto Undo_ports;snprintf (name,sizeof (name),"%s_disco_q" ,dev_name (sas_ha->dev)); - sas_ha->disco_q =create_singlethread_workqueue (name); + sas_ha->disco_q =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , name);if (!sas_ha->disco_q) goto Undo_event_q;
drivers/scsi/megaraid/megaraid_sas_fusion.c +2 -2
@@ -1988,8 +1988,8 @@ megasas_fusion_start_watchdog(struct megasas_instance *instance)sizeof (instance->fault_handler_work_q_name), "poll_megasas%d_status", instance->host->host_no); - instance->fw_fault_work_q = -create_singlethread_workqueue (instance->fault_handler_work_q_name); + instance->fw_fault_work_q =alloc_ordered_workqueue ( +"%s" ,WQ_MEM_RECLAIM , instance->fault_handler_work_q_name);if (!instance->fw_fault_work_q) {dev_err (&instance->pdev->dev,"Failed from %s %d\n" , __func__, __LINE__);
drivers/scsi/mpi3mr/mpi3mr_fw.c +2 -2
@@ -2760,8 +2760,8 @@ void mpi3mr_start_watchdog(struct mpi3mr_ioc *mrioc)snprintf (mrioc->watchdog_work_q_name,sizeof (mrioc->watchdog_work_q_name),"watchdog_%s%d" , mrioc->name, mrioc->id); - mrioc->watchdog_work_q = -create_singlethread_workqueue (mrioc->watchdog_work_q_name); + mrioc->watchdog_work_q =alloc_ordered_workqueue ( +"%s" ,WQ_MEM_RECLAIM , mrioc->watchdog_work_q_name);if (!mrioc->watchdog_work_q) {ioc_err (mrioc,"%s: failed (line=%d)\n" , __func__, __LINE__);return ;
drivers/scsi/mpt3sas/mpt3sas_base.c +2 -2
@@ -846,8 +846,8 @@ mpt3sas_base_start_watchdog(struct MPT3SAS_ADAPTER *ioc)snprintf (ioc->fault_reset_work_q_name,sizeof (ioc->fault_reset_work_q_name),"poll_%s%d_status" , ioc->driver_name, ioc->id); - ioc->fault_reset_work_q = -create_singlethread_workqueue (ioc->fault_reset_work_q_name); + ioc->fault_reset_work_q =alloc_ordered_workqueue ( +"%s" ,WQ_MEM_RECLAIM , ioc->fault_reset_work_q_name);if (!ioc->fault_reset_work_q) {ioc_err (ioc,"%s: failed (line=%d)\n" , __func__, __LINE__);return ;
drivers/scsi/myrb.c +2 -1
@@ -114,7 +114,8 @@ static bool myrb_create_mempools(struct pci_dev *pdev, struct myrb_hba *cb)snprintf (cb->work_q_name,sizeof (cb->work_q_name),"myrb_wq_%d" , cb->host->host_no); - cb->work_q =create_singlethread_workqueue (cb->work_q_name); + cb->work_q = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , cb->work_q_name);if (!cb->work_q) {dma_pool_destroy (cb->dcdb_pool); cb->dcdb_pool =NULL ;
drivers/scsi/myrs.c +2 -1
@@ -2208,7 +2208,8 @@ static bool myrs_create_mempools(struct pci_dev *pdev, struct myrs_hba *cs)snprintf (cs->work_q_name,sizeof (cs->work_q_name),"myrs_wq_%d" , shost->host_no); - cs->work_q =create_singlethread_workqueue (cs->work_q_name); + cs->work_q = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , cs->work_q_name);if (!cs->work_q) {dma_pool_destroy (cs->dcdb_pool); cs->dcdb_pool =NULL ;
drivers/scsi/qedf/qedf_main.c +7 -6
@@ -3374,7 +3374,8 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)sprintf (host_buf,"qedf_%u_link" , qedf->lport->host->host_no); - qedf->link_update_wq =create_workqueue (host_buf); + qedf->link_update_wq = +alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf);INIT_DELAYED_WORK (&qedf->link_update, qedf_handle_link_update);INIT_DELAYED_WORK (&qedf->link_recovery, qedf_link_recovery);INIT_DELAYED_WORK (&qedf->grcdump_work, qedf_wq_grcdump);
@@ -3585,8 +3586,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)/* Start LL2 processing thread */ snprintf (host_buf,20 ,"qedf_%d_ll2" , host->host_no); - qedf->ll2_recv_wq = -create_workqueue (host_buf); + qedf->ll2_recv_wq =alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf);if (!qedf->ll2_recv_wq) {QEDF_ERR (&(qedf->dbg_ctx),"Failed to LL2 workqueue.\n" ); rc = -ENOMEM ;
@@ -3629,7 +3629,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)sprintf (host_buf,"qedf_%u_timer" , qedf->lport->host->host_no); qedf->timer_work_queue = -create_workqueue (host_buf); +alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf);if (!qedf->timer_work_queue) {QEDF_ERR (&(qedf->dbg_ctx),"Failed to start timer " "workqueue.\n" );
@@ -3641,7 +3641,8 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)if (mode !=QEDF_MODE_RECOVERY ) {sprintf (host_buf,"qedf_%u_dpc" , qedf->lport->host->host_no); - qedf->dpc_wq =create_workqueue (host_buf); + qedf->dpc_wq = +alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf); }INIT_DELAYED_WORK (&qedf->recovery_work, qedf_recovery_handler);
@@ -4182,7 +4183,7 @@ static int __init qedf_init(void) goto err3; } - qedf_io_wq =create_workqueue ("qedf_io_wq" ); + qedf_io_wq =alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 ,"qedf_io_wq" );if (!qedf_io_wq) {QEDF_ERR (NULL ,"Could not create qedf_io_wq.\n" ); goto err4;
drivers/scsi/qedi/qedi_main.c +4 -2
@@ -2767,7 +2767,8 @@ static int __qedi_probe(struct pci_dev *pdev, int mode) }sprintf (host_buf,"host_%d" , qedi->shost->host_no); - qedi->tmf_thread =create_singlethread_workqueue (host_buf); + qedi->tmf_thread = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , host_buf);if (!qedi->tmf_thread) {QEDI_ERR (&qedi->dbg_ctx,"Unable to start tmf thread!\n" );
@@ -2776,7 +2777,8 @@ static int __qedi_probe(struct pci_dev *pdev, int mode) }sprintf (host_buf,"qedi_ofld%d" , qedi->shost->host_no); - qedi->offload_thread =create_workqueue (host_buf); + qedi->offload_thread = +alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf);if (!qedi->offload_thread) {QEDI_ERR (&qedi->dbg_ctx,"Unable to start offload thread!\n" );
drivers/scsi/qla2xxx/qla_os.c +4 -2
@@ -3501,11 +3501,13 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)if (IS_QLA8031 (ha) ||IS_MCTP_CAPABLE (ha)) {sprintf (wq_name,"qla2xxx_%lu_dpc_lp_wq" , base_vha->host_no); - ha->dpc_lp_wq =create_singlethread_workqueue (wq_name); + ha->dpc_lp_wq = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , wq_name);INIT_WORK (&ha->idc_aen, qla83xx_service_idc_aen);sprintf (wq_name,"qla2xxx_%lu_dpc_hp_wq" , base_vha->host_no); - ha->dpc_hp_wq =create_singlethread_workqueue (wq_name); + ha->dpc_hp_wq = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , wq_name);INIT_WORK (&ha->nic_core_reset, qla83xx_nic_core_reset_work);INIT_WORK (&ha->idc_state_handler, qla83xx_idc_state_handler_work);
drivers/scsi/qla4xxx/ql4_os.c +1 -1
@@ -8806,7 +8806,7 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev,DEBUG2 (printk ("scsi: %s: Starting kernel thread for " "qla4xxx_dpc\n" , __func__));sprintf (buf,"qla4xxx_%lu_dpc" , ha->host_no); - ha->dpc_thread =create_singlethread_workqueue (buf); + ha->dpc_thread =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , buf);if (!ha->dpc_thread) {ql4_printk (KERN_WARNING , ha,"Unable to start DPC thread!\n" ); ret = -ENODEV ;
drivers/scsi/snic/snic_main.c +4 -2
@@ -302,7 +302,8 @@ snic_add_host(struct Scsi_Host *shost, struct pci_dev *pdev)SNIC_BUG_ON (shost->work_q !=NULL );snprintf (shost->work_q_name,sizeof (shost->work_q_name),"scsi_wq_%d" , shost->host_no); - shost->work_q =create_singlethread_workqueue (shost->work_q_name); + shost->work_q =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , + shost->work_q_name);if (!shost->work_q) {SNIC_HOST_ERR (shost,"Failed to Create ScsiHost wq.\n" );
@@ -884,7 +885,8 @@ snic_global_data_init(void) snic_glob->req_cache[SNIC_REQ_TM_CACHE ] = cachep;/* snic_event queue */ - snic_glob->event_q =create_singlethread_workqueue ("snic_event_wq" ); + snic_glob->event_q = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM ,"snic_event_wq" );if (!snic_glob->event_q) {SNIC_ERR ("snic event queue create failed\n" ); ret = -ENOMEM ;
drivers/scsi/stex.c +2 -1
@@ -1797,7 +1797,8 @@ static int stex_probe(struct pci_dev *pdev, const struct pci_device_id *id)snprintf (hba->work_q_name,sizeof (hba->work_q_name),"stex_wq_%d" , host->host_no); - hba->work_q =create_singlethread_workqueue (hba->work_q_name); + hba->work_q = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , hba->work_q_name);if (!hba->work_q) { printk(KERN_ERR DRV_NAME "(%s): create workqueue failed\n", pci_name(pdev));
drivers/scsi/vmw_pvscsi.c +2 -1
@@ -1137,7 +1137,8 @@ static int pvscsi_setup_msg_workqueue(struct pvscsi_adapter *adapter)snprintf (name,sizeof (name),"vmw_pvscsi_wq_%u" , adapter->host->host_no); - adapter->workqueue =create_singlethread_workqueue (name); + adapter->workqueue = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , name);if (!adapter->workqueue) {printk (KERN_ERR "vmw_pvscsi: failed to create work queue\n" );return 0 ;
drivers/ufs/core/ufshcd.c +3 -2
@@ -1819,7 +1819,8 @@ static void ufshcd_init_clk_scaling(struct ufs_hba *hba)snprintf (wq_name,sizeof (wq_name),"ufs_clkscaling_%d" , hba->host->host_no); - hba->clk_scaling.workq =create_singlethread_workqueue (wq_name); + hba->clk_scaling.workq = +alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , wq_name); hba->clk_scaling.is_initialized = true; }
@@ -10463,7 +10464,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)/* Initialize work queues */ snprintf (eh_wq_name,sizeof (eh_wq_name),"ufs_eh_wq_%d" , hba->host->host_no); - hba->eh_wq =create_singlethread_workqueue (eh_wq_name); + hba->eh_wq =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , eh_wq_name);if (!hba->eh_wq) {dev_err (hba->dev,"%s: failed to create eh workqueue\n" , __func__);
Bart Van Assche
reviewerPATCH v3 2/18 scsi: mptfusion: Simplify the alloc*_workqueue() invocations
In reply to Bart Van AsscheLet alloc*_workqueue() format the workqueue names instead of calling snprintf() explicitly.
--- drivers/message/fusion/mptbase.c | 10 +++------- drivers/message/fusion/mptbase.h | 3 --- drivers/message/fusion/mptfc.c | 7 ++----- 3 files changed, 5 insertions(+), 15 deletions(-)
drivers/message/fusion/mptbase.c +3 -7
@@ -1856,10 +1856,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)/* Initialize workqueue */ INIT_DELAYED_WORK (&ioc->fault_reset_work, mpt_fault_reset_work); -snprintf (ioc->reset_work_q_name,MPT_KOBJ_NAME_LEN , -"mpt_poll_%d" , ioc->id); - ioc->reset_work_q =alloc_workqueue (ioc->reset_work_q_name, -WQ_MEM_RECLAIM ,0 ); + ioc->reset_work_q = +alloc_workqueue ("mpt_poll_%d" ,WQ_MEM_RECLAIM ,0 , ioc->id);if (!ioc->reset_work_q) {printk (MYIOC_s_ERR_FMT"Insufficient memory to add adapter!\n" , ioc->name);
@@ -1986,9 +1984,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)INIT_LIST_HEAD (&ioc->fw_event_list);spin_lock_init (&ioc->fw_event_lock); -snprintf (ioc->fw_event_q_name,MPT_KOBJ_NAME_LEN ,"mpt/%d" , ioc->id); - ioc->fw_event_q =alloc_workqueue (ioc->fw_event_q_name, -WQ_MEM_RECLAIM ,0 ); + ioc->fw_event_q =alloc_workqueue ("mpt/%d" ,WQ_MEM_RECLAIM ,0 , ioc->id);if (!ioc->fw_event_q) {printk (MYIOC_s_ERR_FMT"Insufficient memory to add adapter!\n" , ioc->name);
drivers/message/fusion/mptbase.h +0 -3
@@ -729,7 +729,6 @@ typedef struct _MPT_ADAPTERstruct list_head fw_event_list;spinlock_t fw_event_lock;u8 fw_events_off;/* if '1', then ignore events */ -char fw_event_q_name[MPT_KOBJ_NAME_LEN ];struct mutex sas_discovery_mutex;u8 sas_discovery_runtime;
@@ -764,7 +763,6 @@ typedef struct _MPT_ADAPTERu8 fc_link_speed[2 ];spinlock_t fc_rescan_work_lock;struct work_struct fc_rescan_work; -char fc_rescan_work_q_name[MPT_KOBJ_NAME_LEN ];struct workqueue_struct *fc_rescan_work_q;/* driver forced bus resets count */
@@ -778,7 +776,6 @@ typedef struct _MPT_ADAPTERspinlock_t scsi_lookup_lock;u64 dma_mask;u32 broadcast_aen_busy; -char reset_work_q_name[MPT_KOBJ_NAME_LEN ];struct workqueue_struct *reset_work_q;struct delayed_work fault_reset_work;
drivers/message/fusion/mptfc.c +2 -5
@@ -1349,11 +1349,8 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)/* initialize workqueue */ -snprintf (ioc->fc_rescan_work_q_name,sizeof (ioc->fc_rescan_work_q_name), -"mptfc_wq_%d" , sh->host_no); - ioc->fc_rescan_work_q = -alloc_ordered_workqueue (ioc->fc_rescan_work_q_name, -WQ_MEM_RECLAIM ); + ioc->fc_rescan_work_q =alloc_ordered_workqueue ( +"mptfc_wq_%d" ,WQ_MEM_RECLAIM , sh->host_no);if (!ioc->fc_rescan_work_q) { error = -ENOMEM ; goto out_mptfc_host;
Bart Van Assche
reviewerPATCH v3 3/18 scsi: be2iscsi: Simplify an alloc_workqueue() invocation
In reply to Bart Van AsscheLet alloc_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/be2iscsi/be_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/be2iscsi/be_main.c +2 -4
@@ -5528,7 +5528,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,struct beiscsi_hba *phba =NULL ;struct be_eq_obj *pbe_eq;unsigned int s_handle; -char wq_name[20 ];int ret, i; ret =beiscsi_enable_pci (pcidev);
@@ -5634,9 +5633,8 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, phba->ctrl.mcc_alloc_index = phba->ctrl.mcc_free_index =0 ; -snprintf (wq_name,sizeof (wq_name),"beiscsi_%02x_wq" , - phba->shost->host_no); - phba->wq =alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , wq_name); + phba->wq =alloc_workqueue ("beiscsi_%02x_wq" ,WQ_MEM_RECLAIM ,1 , + phba->shost->host_no);if (!phba->wq) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , "BM_%d : beiscsi_dev_probe-"
Bart Van Assche
reviewerPATCH v3 4/18 scsi: bfa: Simplify an alloc_ordered_workqueue() invocation
In reply to Bart Van AsscheLet alloc_ordered_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/bfa/bfad_im.c | 6 ++---- drivers/scsi/bfa/bfad_im.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/bfa/bfad_im.c +2 -4
@@ -766,10 +766,8 @@ bfad_thread_workq(struct bfad_s *bfad)struct bfad_im_s *im = bfad->im;bfa_trc (bfad,0 ); -snprintf (im->drv_workq_name,KOBJ_NAME_LEN ,"bfad_wq_%d" , - bfad->inst_no); - im->drv_workq =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , - im->drv_workq_name); + im->drv_workq =alloc_ordered_workqueue ("bfad_wq_%d" ,WQ_MEM_RECLAIM , + bfad->inst_no);if (!im->drv_workq)return BFA_STATUS_FAILED ;
drivers/scsi/bfa/bfad_im.h +0 -1
@@ -134,7 +134,6 @@ struct bfad_fcp_binding {struct bfad_im_s {struct bfad_s *bfad;struct workqueue_struct *drv_workq; -char drv_workq_name[KOBJ_NAME_LEN ];struct work_struct aen_im_notify_work; };
Bart Van Assche
reviewerPATCH v3 5/18 scsi: esas2r: Simplify an alloc_ordered_workqueue() invocation
In reply to Bart Van AsscheLet alloc_ordered_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/esas2r/esas2r.h | 1 - drivers/scsi/esas2r/esas2r_init.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/esas2r/esas2r.h +0 -1
@@ -929,7 +929,6 @@ struct esas2r_adapter {struct list_head fw_event_list;spinlock_t fw_event_lock;u8 fw_events_off;/* if '1', then ignore events */ -char fw_event_q_name[ESAS2R_KOBJ_NAME_LEN ];/* * intr_mode stores the interrupt mode currently being used by this * adapter. it is based on the interrupt_mode module parameter, but
drivers/scsi/esas2r/esas2r_init.c +2 -4
@@ -311,10 +311,8 @@ int esas2r_init_adapter(struct Scsi_Host *host, struct pci_dev *pcid,sema_init (&a->nvram_semaphore,1 );esas2r_fw_event_off (a); -snprintf (a->fw_event_q_name,ESAS2R_KOBJ_NAME_LEN ,"esas2r/%d" , - a->index); - a->fw_event_q =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , - a->fw_event_q_name); + a->fw_event_q = +alloc_ordered_workqueue ("esas2r/%d" ,WQ_MEM_RECLAIM , a->index);init_waitqueue_head (&a->buffered_ioctl_waiter);init_waitqueue_head (&a->nvram_waiter);
Bart Van Assche
reviewerPATCH v3 6/18 scsi: fcoe: Simplify alloc_ordered_workqueue() invocations
In reply to Bart Van AsscheLet alloc_ordered_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/fcoe/fcoe_sysfs.c | 18 +++++------------- include/scsi/fcoe_sysfs.h | 2 -- 2 files changed, 5 insertions(+), 15 deletions(-)
drivers/scsi/fcoe/fcoe_sysfs.c +5 -13
@@ -45,12 +45,8 @@ MODULE_PARM_DESC(fcf_dev_loss_tmo,*/ #define fcoe_ctlr_id (x) \ ((x)->id) -#define fcoe_ctlr_work_q_name (x) \ - ((x)->work_q_name)#define fcoe_ctlr_work_q (x) \ ((x)->work_q) -#define fcoe_ctlr_devloss_work_q_name (x) \ - ((x)->devloss_work_q_name)#define fcoe_ctlr_devloss_work_q (x) \ ((x)->devloss_work_q)#define fcoe_ctlr_mode (x) \
@@ -797,18 +793,14 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent, ctlr->fcf_dev_loss_tmo = fcoe_fcf_dev_loss_tmo; -snprintf (ctlr->work_q_name,sizeof (ctlr->work_q_name), -"ctlr_wq_%d" , ctlr->id); - ctlr->work_q =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , - ctlr->work_q_name); + ctlr->work_q =alloc_ordered_workqueue ("ctlr_wq_%d" ,WQ_MEM_RECLAIM , + ctlr->id);if (!ctlr->work_q) goto out_del; -snprintf (ctlr->devloss_work_q_name, -sizeof (ctlr->devloss_work_q_name), -"ctlr_dl_wq_%d" , ctlr->id); - ctlr->devloss_work_q =alloc_ordered_workqueue ( -"%s" ,WQ_MEM_RECLAIM , ctlr->devloss_work_q_name); + ctlr->devloss_work_q =alloc_ordered_workqueue ("ctlr_dl_wq_%d" , +WQ_MEM_RECLAIM , + ctlr->id);if (!ctlr->devloss_work_q) goto out_del_q;
include/scsi/fcoe_sysfs.h +0 -2
@@ -50,9 +50,7 @@ struct fcoe_ctlr_device {struct fcoe_sysfs_function_template *f;struct list_head fcfs; -char work_q_name[20 ];struct workqueue_struct *work_q; -char devloss_work_q_name[20 ];struct workqueue_struct *devloss_work_q;struct mutex lock;
Bart Van Assche
reviewerPATCH v3 7/18 scsi: ibmvscsi_tgt: Simplify an alloc_workqueue() invocation
In reply to Bart Van AsscheLet alloc_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +2 -3
@@ -3425,7 +3425,6 @@ static int ibmvscsis_probe(struct vio_dev *vdev,struct scsi_info *vscsi;int rc =0 ;long hrc =0 ; -char wq_name[24 ]; vscsi =kzalloc (sizeof (*vscsi),GFP_KERNEL );if (!vscsi) {
@@ -3536,8 +3535,8 @@ static int ibmvscsis_probe(struct vio_dev *vdev,init_completion (&vscsi->wait_idle);init_completion (&vscsi->unconfig); -snprintf (wq_name,24 ,"ibmvscsis%s" ,dev_name (&vdev->dev)); - vscsi->work_q =alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , wq_name); + vscsi->work_q =alloc_workqueue ("ibmvscsis%s" ,WQ_MEM_RECLAIM ,1 , +dev_name (&vdev->dev));if (!vscsi->work_q) { rc = -ENOMEM ;dev_err (&vscsi->dev,"create_workqueue failed\n" );
Bart Van Assche
reviewerPATCH v3 8/18 scsi: mpi3mr: Simplify an alloc_ordered_workqueue() invocation
In reply to Bart Van AsscheLet alloc_ordered_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/mpi3mr/mpi3mr.h | 2 -- drivers/scsi/mpi3mr/mpi3mr_os.c | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-)
drivers/scsi/mpi3mr/mpi3mr.h +0 -2
@@ -1060,7 +1060,6 @@ struct scmd_priv {* @sbq_lock: Sense buffer queue lock * @sbq_host_index: Sense buffer queuehost index * @event_masks: Event mask bitmap -* @fwevt_worker_name: Firmware event worker thread name * @fwevt_worker_thread: Firmware event worker thread * @fwevt_lock: Firmware event lock * @fwevt_list: Firmware event list
@@ -1241,7 +1240,6 @@ struct mpi3mr_ioc {u32 sbq_host_index;u32 event_masks[MPI3_EVENT_NOTIFY_EVENTMASK_WORDS ]; -char fwevt_worker_name[MPI3MR_NAME_LENGTH ];struct workqueue_struct *fwevt_worker_thread;spinlock_t fwevt_lock;struct list_head fwevt_list;
drivers/scsi/mpi3mr/mpi3mr_os.c +1 -3
@@ -5305,10 +5305,8 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id)else scsi_host_set_guard (shost,SHOST_DIX_GUARD_CRC ); -snprintf (mrioc->fwevt_worker_name,sizeof (mrioc->fwevt_worker_name), -"%s%d_fwevt_wrkr" , mrioc->driver_name, mrioc->id); mrioc->fwevt_worker_thread =alloc_ordered_workqueue ( - mrioc->fwevt_worker_name,0 ); +"%s%d_fwevt_wrkr" ,0 , mrioc->driver_name, mrioc->id);if (!mrioc->fwevt_worker_thread) {ioc_err (mrioc,"failure at %s:%d/%s()!\n" , __FILE__, __LINE__, __func__);
Bart Van Assche
reviewerPATCH v3 9/18 scsi: mpt3sas: Simplify an alloc_ordered_workqueue() invocation
In reply to Bart Van AsscheLet alloc_ordered_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.h +1 -3
@@ -1162,8 +1162,7 @@ typedef void (*MPT3SAS_FLUSH_RUNNING_CMDS)(struct MPT3SAS_ADAPTER *ioc);* @fault_reset_work_q_name: fw fault work queue * @fault_reset_work_q: "" * @fault_reset_work: "" -* @firmware_event_name: fw event work queue -* @firmware_event_thread: "" +* @firmware_event_thread: fw event work queue * @fw_event_lock: * @fw_event_list: list of fw events * @current_evet: current processing firmware event
@@ -1351,7 +1350,6 @@ struct MPT3SAS_ADAPTER {struct delayed_work fault_reset_work;/* fw event handler */ -char firmware_event_name[20 ];struct workqueue_struct *firmware_event_thread;spinlock_t fw_event_lock;struct list_head fw_event_list;
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -3
@@ -12301,10 +12301,8 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)scsi_host_set_guard (shost,SHOST_DIX_GUARD_CRC );/* event thread */ -snprintf (ioc->firmware_event_name,sizeof (ioc->firmware_event_name), -"fw_event_%s%d" , ioc->driver_name, ioc->id); ioc->firmware_event_thread =alloc_ordered_workqueue ( - ioc->firmware_event_name,0 ); +"fw_event_%s%d" ,0 , ioc->driver_name, ioc->id);if (!ioc->firmware_event_thread) {ioc_err (ioc,"failure at %s:%d/%s()!\n" , __FILE__, __LINE__, __func__);
Bart Van Assche
reviewerPATCH v3 10/18 scsi: myrb: Simplify an alloc_ordered_workqueue() invocation
In reply to Bart Van AsscheLet alloc_ordered_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/myrb.c | 6 ++---- drivers/scsi/myrb.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/myrb.c +2 -4
@@ -112,10 +112,8 @@ static bool myrb_create_mempools(struct pci_dev *pdev, struct myrb_hba *cb)return false; } -snprintf (cb->work_q_name,sizeof (cb->work_q_name), -"myrb_wq_%d" , cb->host->host_no); - cb->work_q = -alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , cb->work_q_name); + cb->work_q =alloc_ordered_workqueue ("myrb_wq_%d" ,WQ_MEM_RECLAIM , + cb->host->host_no);if (!cb->work_q) {dma_pool_destroy (cb->dcdb_pool); cb->dcdb_pool =NULL ;
drivers/scsi/myrb.h +0 -1
@@ -712,7 +712,6 @@ struct myrb_hba {struct Scsi_Host *host;struct workqueue_struct *work_q; -char work_q_name[20 ];struct delayed_work monitor_work;unsigned long primary_monitor_time;unsigned long secondary_monitor_time;
Bart Van Assche
reviewerPATCH v3 11/18 scsi: myrs: Simplify an alloc_ordered_workqueue() invocation
In reply to Bart Van AsscheLet alloc_ordered_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/myrs.c | 6 ++---- drivers/scsi/myrs.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/myrs.c +2 -4
@@ -2206,10 +2206,8 @@ static bool myrs_create_mempools(struct pci_dev *pdev, struct myrs_hba *cs)return false; } -snprintf (cs->work_q_name,sizeof (cs->work_q_name), -"myrs_wq_%d" , shost->host_no); - cs->work_q = -alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , cs->work_q_name); + cs->work_q =alloc_ordered_workqueue ("myrs_wq_%d" ,WQ_MEM_RECLAIM , + shost->host_no);if (!cs->work_q) {dma_pool_destroy (cs->dcdb_pool); cs->dcdb_pool =NULL ;
drivers/scsi/myrs.h +0 -1
@@ -904,7 +904,6 @@ struct myrs_hba {bool disable_enc_msg;struct workqueue_struct *work_q; -char work_q_name[20 ];struct delayed_work monitor_work;unsigned long primary_monitor_time;unsigned long secondary_monitor_time;
Bart Van Assche
reviewerPATCH v3 12/18 scsi: qedf: Simplify alloc_workqueue() invocations
In reply to Bart Van AsscheLet alloc_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/qedf/qedf_main.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/scsi/qedf/qedf_main.c +6 -9
@@ -3372,10 +3372,8 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)QEDF_INFO (&(qedf->dbg_ctx),QEDF_LOG_INFO ,"qedf->io_mempool=%p.\n" , qedf->io_mempool); -sprintf (host_buf,"qedf_%u_link" , - qedf->lport->host->host_no); - qedf->link_update_wq = -alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf); + qedf->link_update_wq =alloc_workqueue ("qedf_%u_link" ,WQ_MEM_RECLAIM , +1 , qedf->lport->host->host_no);INIT_DELAYED_WORK (&qedf->link_update, qedf_handle_link_update);INIT_DELAYED_WORK (&qedf->link_recovery, qedf_link_recovery);INIT_DELAYED_WORK (&qedf->grcdump_work, qedf_wq_grcdump);
@@ -3585,8 +3583,8 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)ether_addr_copy (params.ll2_mac_address, qedf->mac);/* Start LL2 processing thread */ -snprintf (host_buf,20 ,"qedf_%d_ll2" , host->host_no); - qedf->ll2_recv_wq =alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf); + qedf->ll2_recv_wq =alloc_workqueue ("qedf_%d_ll2" ,WQ_MEM_RECLAIM ,1 , + host->host_no);if (!qedf->ll2_recv_wq) {QEDF_ERR (&(qedf->dbg_ctx),"Failed to LL2 workqueue.\n" ); rc = -ENOMEM ;
@@ -3627,9 +3625,8 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) } } -sprintf (host_buf,"qedf_%u_timer" , qedf->lport->host->host_no); - qedf->timer_work_queue = -alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf); + qedf->timer_work_queue =alloc_workqueue ("qedf_%u_timer" , +WQ_MEM_RECLAIM ,1 , qedf->lport->host->host_no);if (!qedf->timer_work_queue) {QEDF_ERR (&(qedf->dbg_ctx),"Failed to start timer " "workqueue.\n" );
Bart Van Assche
reviewerPATCH v3 13/18 scsi: qedi: Simplify an alloc_workqueue() invocation
In reply to Bart Van AsscheLet alloc_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/qedi/qedi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/qedi/qedi_main.c +3 -3
@@ -2776,9 +2776,9 @@ static int __qedi_probe(struct pci_dev *pdev, int mode) goto free_cid_que; } -sprintf (host_buf,"qedi_ofld%d" , qedi->shost->host_no); - qedi->offload_thread = -alloc_workqueue ("%s" ,WQ_MEM_RECLAIM ,1 , host_buf); + qedi->offload_thread =alloc_workqueue ("qedi_ofld%d" , +WQ_MEM_RECLAIM , +1 , qedi->shost->host_no);if (!qedi->offload_thread) {QEDI_ERR (&qedi->dbg_ctx,"Unable to start offload thread!\n" );
Bart Van Assche
reviewerPATCH v3 14/18 scsi: snic: Simplify alloc_workqueue() invocations
In reply to Bart Van AsscheLet alloc_workqueue() format the workqueue name instead of calling snprintf() explicitly. Not setting shost->work_q_name is safe because there is no code that reads the value set by the removed code.
--- drivers/scsi/snic/snic_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/snic/snic_main.c +2 -4
@@ -300,10 +300,8 @@ snic_add_host(struct Scsi_Host *shost, struct pci_dev *pdev) }SNIC_BUG_ON (shost->work_q !=NULL ); -snprintf (shost->work_q_name,sizeof (shost->work_q_name),"scsi_wq_%d" , - shost->host_no); - shost->work_q =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , - shost->work_q_name); + shost->work_q =alloc_ordered_workqueue ("scsi_wq_%d" ,WQ_MEM_RECLAIM , + shost->host_no);if (!shost->work_q) {SNIC_HOST_ERR (shost,"Failed to Create ScsiHost wq.\n" );
Bart Van Assche
reviewerPATCH v3 15/18 scsi: scsi_transport_fc: Simplify alloc_workqueue() invocations
In reply to Bart Van AsscheLet alloc_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/scsi_transport_fc.c | 11 +++-------- include/scsi/scsi_transport_fc.h | 6 ------ 2 files changed, 3 insertions(+), 14 deletions(-)
drivers/scsi/scsi_transport_fc.c +3 -8
@@ -441,18 +441,13 @@ static int fc_host_setup(struct transport_container *tc, struct device *dev, fc_host->next_vport_number =0 ; fc_host->npiv_vports_inuse =0 ; -snprintf (fc_host->work_q_name,sizeof (fc_host->work_q_name), -"fc_wq_%d" , shost->host_no); - fc_host->work_q =alloc_workqueue ("%s" ,0 ,0 , fc_host->work_q_name); + fc_host->work_q =alloc_workqueue ("fc_wq_%d" ,0 ,0 , shost->host_no);if (!fc_host->work_q)return -ENOMEM ; fc_host->dev_loss_tmo = fc_dev_loss_tmo; -snprintf (fc_host->devloss_work_q_name, -sizeof (fc_host->devloss_work_q_name), -"fc_dl_%d" , shost->host_no); - fc_host->devloss_work_q =alloc_workqueue ("%s" ,0 ,0 , - fc_host->devloss_work_q_name); + fc_host->devloss_work_q =alloc_workqueue ("fc_dl_%d" ,0 ,0 , + shost->host_no);if (!fc_host->devloss_work_q) {destroy_workqueue (fc_host->work_q); fc_host->work_q =NULL ;
include/scsi/scsi_transport_fc.h +0 -6
@@ -575,9 +575,7 @@ struct fc_host_attrs {u16 npiv_vports_inuse;/* work queues for rport state manipulation */ -char work_q_name[20 ];struct workqueue_struct *work_q; -char devloss_work_q_name[20 ];struct workqueue_struct *devloss_work_q;/* bsg support */
@@ -654,12 +652,8 @@ struct fc_host_attrs { (((struct fc_host_attrs *)(x)->shost_data)->next_vport_number)#define fc_host_npiv_vports_inuse (x) \ (((struct fc_host_attrs *)(x)->shost_data)->npiv_vports_inuse) -#define fc_host_work_q_name (x) \ - (((struct fc_host_attrs *)(x)->shost_data)->work_q_name)#define fc_host_work_q (x) \ (((struct fc_host_attrs *)(x)->shost_data)->work_q) -#define fc_host_devloss_work_q_name (x) \ - (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q_name)#define fc_host_devloss_work_q (x) \ (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q)#define fc_host_dev_loss_tmo (x) \
Bart Van Assche
reviewerPATCH v3 16/18 scsi: stex: Simplify an alloc_ordered_workqueue() invocation
In reply to Bart Van AsscheLet alloc_ordered_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/scsi/stex.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/stex.c +2 -5
@@ -334,7 +334,6 @@ struct st_hba {struct st_ccb *wait_ccb;__le32 *scratch; -char work_q_name[20 ];struct workqueue_struct *work_q;struct work_struct reset_work;wait_queue_head_t reset_waitq;
@@ -1795,10 +1794,8 @@ static int stex_probe(struct pci_dev *pdev, const struct pci_device_id *id) hba->pdev = pdev;init_waitqueue_head (&hba->reset_waitq); -snprintf (hba->work_q_name,sizeof (hba->work_q_name), -"stex_wq_%d" , host->host_no); - hba->work_q = -alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , hba->work_q_name); + hba->work_q =alloc_ordered_workqueue ("stex_wq_%d" ,WQ_MEM_RECLAIM , + host->host_no);if (!hba->work_q) { printk(KERN_ERR DRV_NAME "(%s): create workqueue failed\n", pci_name(pdev));
Bart Van Assche
reviewerPATCH v3 17/18 scsi: ufs: Simplify alloc*_workqueue() invocation
In reply to Bart Van AsscheLet alloc*_workqueue() format the workqueue name instead of calling snprintf() explicitly.
--- drivers/ufs/core/ufshcd.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/ufs/core/ufshcd.c +7 -16
@@ -1804,8 +1804,6 @@ static void ufshcd_remove_clk_scaling_sysfs(struct ufs_hba *hba)static void ufshcd_init_clk_scaling (struct ufs_hba *hba) { -char wq_name[sizeof ("ufs_clkscaling_00" )]; -if (!ufshcd_is_clkscaling_supported (hba))return ;
@@ -1817,10 +1815,8 @@ static void ufshcd_init_clk_scaling(struct ufs_hba *hba)INIT_WORK (&hba->clk_scaling.resume_work, ufshcd_clk_scaling_resume_work); -snprintf (wq_name,sizeof (wq_name),"ufs_clkscaling_%d" , - hba->host->host_no); - hba->clk_scaling.workq = -alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , wq_name); + hba->clk_scaling.workq =alloc_ordered_workqueue ( +"ufs_clkscaling_%d" ,WQ_MEM_RECLAIM , hba->host->host_no); hba->clk_scaling.is_initialized = true; }
@@ -2144,8 +2140,6 @@ static void ufshcd_remove_clk_gating_sysfs(struct ufs_hba *hba)static void ufshcd_init_clk_gating (struct ufs_hba *hba) { -char wq_name[sizeof ("ufs_clk_gating_00" )]; -if (!ufshcd_is_clkgating_allowed (hba))return ;
@@ -2155,10 +2149,9 @@ static void ufshcd_init_clk_gating(struct ufs_hba *hba)INIT_DELAYED_WORK (&hba->clk_gating.gate_work, ufshcd_gate_work);INIT_WORK (&hba->clk_gating.ungate_work, ufshcd_ungate_work); -snprintf (wq_name,ARRAY_SIZE (wq_name),"ufs_clk_gating_%d" , - hba->host->host_no); - hba->clk_gating.clk_gating_workq =alloc_ordered_workqueue (wq_name, -WQ_MEM_RECLAIM |WQ_HIGHPRI ); + hba->clk_gating.clk_gating_workq =alloc_ordered_workqueue ( +"ufs_clk_gating_%d" ,WQ_MEM_RECLAIM |WQ_HIGHPRI , + hba->host->host_no);ufshcd_init_clk_gating_sysfs (hba);
@@ -10395,7 +10388,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)int err;struct Scsi_Host *host = hba->host;struct device *dev = hba->dev; -char eh_wq_name[sizeof ("ufs_eh_wq_00" )];/* * dev_set_drvdata() must be called before any callbacks are registered
@@ -10462,9 +10454,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) hba->max_pwr_info.is_valid = false;/* Initialize work queues */ -snprintf (eh_wq_name,sizeof (eh_wq_name),"ufs_eh_wq_%d" , - hba->host->host_no); - hba->eh_wq =alloc_ordered_workqueue ("%s" ,WQ_MEM_RECLAIM , eh_wq_name); + hba->eh_wq =alloc_ordered_workqueue ("ufs_eh_wq_%d" ,WQ_MEM_RECLAIM , + hba->host->host_no);if (!hba->eh_wq) {dev_err (hba->dev,"%s: failed to create eh workqueue\n" , __func__);
Bart Van Assche
reviewerPATCH v3 18/18 scsi: core: Simplify an alloc_workqueue() invocation
In reply to Bart Van AsscheLet alloc_workqueue() format the workqueue name. Remove the work_q_name[] member from struct Scsi_Host because it is no longer used by any SCSI driver nor by the SCSI core.
--- drivers/scsi/hosts.c | 9 ++++----- include/scsi/scsi_host.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/scsi/hosts.c +4 -5
@@ -292,11 +292,10 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, }if (shost->transportt->create_work_queue) { -snprintf (shost->work_q_name,sizeof (shost->work_q_name), -"scsi_wq_%d" , shost->host_no); - shost->work_q =alloc_workqueue ("%s" , -WQ_SYSFS | __WQ_LEGACY |WQ_MEM_RECLAIM |WQ_UNBOUND , -1 , shost->work_q_name); + shost->work_q =alloc_workqueue ( +"scsi_wq_%d" , +WQ_SYSFS | __WQ_LEGACY |WQ_MEM_RECLAIM |WQ_UNBOUND ,1 , + shost->host_no);if (!shost->work_q) { error = -EINVAL ;
include/scsi/scsi_host.h +0 -1
@@ -677,7 +677,6 @@ struct Scsi_Host {/* * Optional work queue to be utilized by the transport */ -char work_q_name[20 ];struct workqueue_struct *work_q;/*
Martin K. Petersen
AppliedBart,
Quoted 6 lines
Multiple SCSI drivers use
snprintf()to format a workqueue name before invoking one of the create*_workqueue() macros. This patch series simplifies such code by passing the format string and arguments toalloc_workqueue(). Additionally, the structure members that are only used as a temporary buffer for formatting workqueue names are removed. Please consider this patch series for the next merge window.
Applied to 6.12/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 8 lines · Bart Van Assche
Multiple SCSI drivers use
snprintf()to format a workqueue name before invoking one of the create*_workqueue() macros. This patch series simplifies such code by passing the format string and arguments toalloc_workqueue(). Additionally, the structure members that are only used as a temporary buffer for formatting workqueue names are removed. Please consider this patch series for the next merge window.[...]
Applied to 6.12/scsi-queue, thanks!
[01/18] scsi: Expand all create*_workqueue() invocations
https://git.kernel.org/mkp/scsi/c/b97c0741c7dc [02/18] scsi: mptfusion: Simplify the alloc*_workqueue() invocations https://git.kernel.org/mkp/scsi/c/dec523975b85 [03/18] scsi: be2iscsi: Simplify an alloc_workqueue() invocation https://git.kernel.org/mkp/scsi/c/66088e7b9182 [04/18] scsi: bfa: Simplify an alloc_ordered_workqueue() invocation https://git.kernel.org/mkp/scsi/c/70fbb7c11507 [05/18] scsi: esas2r: Simplify an alloc_ordered_workqueue() invocation https://git.kernel.org/mkp/scsi/c/4cb1b41a5ee4 [06/18] scsi: fcoe: Simplify alloc_ordered_workqueue() invocations https://git.kernel.org/mkp/scsi/c/d77381c2f62a [07/18] scsi: ibmvscsi_tgt: Simplify an alloc_workqueue() invocation https://git.kernel.org/mkp/scsi/c/5615cfb3cbad [08/18] scsi: mpi3mr: Simplify an alloc_ordered_workqueue() invocation https://git.kernel.org/mkp/scsi/c/1bd289620e42 [09/18] scsi: mpt3sas: Simplify an alloc_ordered_workqueue() invocation https://git.kernel.org/mkp/scsi/c/b3b359ac7267 [10/18] scsi: myrb: Simplify an alloc_ordered_workqueue() invocation https://git.kernel.org/mkp/scsi/c/c57a617fd53f [11/18] scsi: myrs: Simplify an alloc_ordered_workqueue() invocation https://git.kernel.org/mkp/scsi/c/f30679166255 [12/18] scsi: qedf: Simplify alloc_workqueue() invocations https://git.kernel.org/mkp/scsi/c/8bbe60bbd43d [13/18] scsi: qedi: Simplify an alloc_workqueue() invocation https://git.kernel.org/mkp/scsi/c/19d7cda1c630 [14/18] scsi: snic: Simplify alloc_workqueue() invocations https://git.kernel.org/mkp/scsi/c/6411307b6328 [15/18] scsi: scsi_transport_fc: Simplify alloc_workqueue() invocations https://git.kernel.org/mkp/scsi/c/06d53789761c [16/18] scsi: stex: Simplify an alloc_ordered_workqueue() invocation https://git.kernel.org/mkp/scsi/c/0ef9b0186dae [17/18] scsi: ufs: Simplify alloc*_workqueue() invocation https://git.kernel.org/mkp/scsi/c/1aa992cbc272 [18/18] scsi: core: Simplify an alloc_workqueue() invocation https://git.kernel.org/mkp/scsi/c/ba52850cb6b4
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering