Commit a024ad0d authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: Optimize serialization of setup_xfer_req() calls 

Reduce the number of times the host lock is taken in the hot path.
Additionally, inline ufshcd_vops_setup_xfer_req() because that function is
too short to keep it.

Link: https://lore.kernel.org/r/20210722033439.26550-13-bvanassche@acm.org


Fixes: a45f9371 ("scsi: ufs: Optimize host lock on transfer requests send/compl paths")
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Stanley Chu <stanley.chu@mediatek.com>
Cc: Can Guo <cang@codeaurora.org>
Cc: Bean Huo <beanhuo@micron.com>
Cc: Asutosh Das <asutoshd@codeaurora.org>
Reviewed-by: default avatarDaejun Park <daejun7.park@samsung.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1f522c50

drivers/scsi/ufs/ufshcd.c

+2 −1
Original line number Diff line number Diff line
@@ -2092,12 +2092,13 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag) 


	lrbp->issue_time_stamp = ktime_get();

	lrbp->compl_time_stamp = ktime_set(0, 0);

	ufshcd_vops_setup_xfer_req(hba, task_tag, (lrbp->cmd ? true : false));

	ufshcd_add_command_trace(hba, task_tag, UFS_CMD_SEND);

	ufshcd_clk_scaling_start_busy(hba);

	if (unlikely(ufshcd_should_inform_monitor(hba, lrbp)))

		ufshcd_start_monitor(hba, lrbp);

	spin_lock_irqsave(hba->host->host_lock, flags);

	if (hba->vops && hba->vops->setup_xfer_req)

		hba->vops->setup_xfer_req(hba, task_tag, !!lrbp->cmd);

	set_bit(task_tag, &hba->outstanding_reqs);

	ufshcd_writel(hba, 1 << task_tag, REG_UTP_TRANSFER_REQ_DOOR_BELL);

	spin_unlock_irqrestore(hba->host->host_lock, flags);

drivers/scsi/ufs/ufshcd.h

+0 −12
Original line number Diff line number Diff line
@@ -1269,18 +1269,6 @@ static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba, 
	return -ENOTSUPP;

}



static inline void ufshcd_vops_setup_xfer_req(struct ufs_hba *hba, int tag,

					bool is_scsi_cmd)

{

	if (hba->vops && hba->vops->setup_xfer_req) {

		unsigned long flags;



		spin_lock_irqsave(hba->host->host_lock, flags);

		hba->vops->setup_xfer_req(hba, tag, is_scsi_cmd);

		spin_unlock_irqrestore(hba->host->host_lock, flags);

	}

}



static inline void ufshcd_vops_setup_task_mgmt(struct ufs_hba *hba,

					int tag, u8 tm_function)

{