Re: [PATCH v2 31/44] mvumi: Stop using the SCSI pointer

[Hannes Reinecke <hare@xxxxxxx>]

On 2/8/22 18:25, Bart Van Assche wrote:
> Set .cmd_size in the SCSI host template instead of using the SCSI pointer
> from struct scsi_cmnd. This patch prepares for removal of the SCSI pointer
> from struct scsi_cmnd.
>
> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@xxxxxxx>
> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
> ---
>   drivers/scsi/mvumi.c | 9 +++++----
>   drivers/scsi/mvumi.h | 9 +++++++++
>   2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
> index 904de62c974c..05d3ce9b72db 100644
> --- a/drivers/scsi/mvumi.c
> +++ b/drivers/scsi/mvumi.c
> @@ -1302,7 +1302,7 @@ static void mvumi_complete_cmd(struct mvumi_hba *mhba, struct mvumi_cmd *cmd,
>   {
>   	struct scsi_cmnd *scmd = cmd->scmd;
>   
> -	cmd->scmd->SCp.ptr = NULL;
> +	mvumi_priv(cmd->scmd)->cmd_priv = NULL;
>   	scmd->result = ob_frame->req_status;
>   
>   	switch (ob_frame->req_status) {
> @@ -2097,7 +2097,7 @@ static int mvumi_queue_command(struct Scsi_Host *shost,
>   		goto out_return_cmd;
>   
>   	cmd->scmd = scmd;
> -	scmd->SCp.ptr = (char *) cmd;
> +	mvumi_priv(scmd)->cmd_priv = cmd;
>   	mhba->instancet->fire_cmd(mhba, cmd);
>   	spin_unlock_irqrestore(shost->host_lock, irq_flags);
>   	return 0;
> @@ -2111,7 +2111,7 @@ static int mvumi_queue_command(struct Scsi_Host *shost,
>   
>   static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd)
>   {
> -	struct mvumi_cmd *cmd = (struct mvumi_cmd *) scmd->SCp.ptr;
> +	struct mvumi_cmd *cmd = mvumi_priv(scmd)->cmd_priv;
>   	struct Scsi_Host *host = scmd->device->host;
>   	struct mvumi_hba *mhba = shost_priv(host);
>   	unsigned long flags;
> @@ -2128,7 +2128,7 @@ static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd)
>   		atomic_dec(&mhba->fw_outstanding);
>   
>   	scmd->result = (DID_ABORT << 16);
> -	scmd->SCp.ptr = NULL;
> +	mvumi_priv(scmd)->cmd_priv = NULL;
>   	if (scsi_bufflen(scmd)) {
>   		dma_unmap_sg(&mhba->pdev->dev, scsi_sglist(scmd),
>   			     scsi_sg_count(scmd),
> @@ -2179,6 +2179,7 @@ static struct scsi_host_template mvumi_template = {
>   	.bios_param = mvumi_bios_param,
>   	.dma_boundary = PAGE_SIZE - 1,
>   	.this_id = -1,
> +	.cmd_size = sizeof(struct mvumi_cmd_priv),
>   };
>   
>   static int mvumi_cfg_hw_reg(struct mvumi_hba *mhba)
> diff --git a/drivers/scsi/mvumi.h b/drivers/scsi/mvumi.h
> index 60d5691fc4ab..a88c58787b68 100644
> --- a/drivers/scsi/mvumi.h
> +++ b/drivers/scsi/mvumi.h
> @@ -254,6 +254,15 @@ struct mvumi_cmd {
>   	unsigned char cmd_status;
>   };
>   
> +struct mvumi_cmd_priv {
> +	struct mvumi_cmd *cmd_priv;
> +};
> +
> +static inline struct mvumi_cmd_priv *mvumi_priv(struct scsi_cmnd *cmd)
> +{
> +	return scsi_cmd_priv(cmd);
> +}
> +
>   /*
>    * the function type of the in bound frame
>    */

Reviewed-by: Hannes Reinecke <hare@xxxxxxx>

Cheers,

Hannes
--
Dr. Hannes Reinecke                Kernel Storage Architect
hare@xxxxxxx                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer