Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Niklas Cassel <Niklas.Cassel@wdc.com>
To:     Wenchao Hao <haowenchao@huawei.com>
CC:     Damien Le Moal <damien.lemoal@opensource.wdc.com>,
        "linux-ide@vger.kernel.org" <linux-ide@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "liuzhiqiang26@huawei.com" <liuzhiqiang26@huawei.com>,
        "linfeilong@huawei.com" <linfeilong@huawei.com>
Subject: Re: [PATCH v3] ata: libata-eh: Cleanup ata_scsi_cmd_error_handler()
Thread-Topic: [PATCH v3] ata: libata-eh: Cleanup ata_scsi_cmd_error_handler()
Thread-Index: AQHZHBuXdr32pQ38V0SEMJIDkYJ+Iw==
Date:   Fri, 30 Dec 2022 06:54:42 +0000
Message-ID: <Y66LMf2O/QFkRtkW@x1-carbon>
References: <20221215153749.1947570-1-haowenchao@huawei.com>
In-Reply-To: <20221215153749.1947570-1-haowenchao@huawei.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?6fkMH/YBwYRYtzH3JXe8+tPegf/LVaiYA6dbbaWO+q0qEOUGl/QnE9J4ufM5?=
 =?us-ascii?Q?6F67gjCmjweEzwby3XyqBbiACHbJfbaxfgTiTf+8GT3k4FpF/sOsB0QqEUgg?=
 =?us-ascii?Q?e9hL2CTL3vcmxBbAbTV+5nXPXU6Y89ji4eN7EQufVONPsTSq4cm06KnpzK2k?=
 =?us-ascii?Q?viDlPPZ2r+66Zw7IIICm3oV6jTRcPyBnvjGgqUFCH4vtbJWgHLqhd4Dx3BPW?=
 =?us-ascii?Q?zwYZBZhBeMHbpvDyPxALBIr+dUcKTitmFJopLHMPZXgcrupcGCGgMmj3FyJL?=
 =?us-ascii?Q?ztghpVrc4Mtb6wwc9xASsx+RDWaVQJkt2l+eb/Q1/zBurVw7XJ+GMOqM5KfN?=
 =?us-ascii?Q?ylLbdVhO5FFfkmn7O1zdTdeBm8npQjAWlWq67WXY5OkDvy0crT+ydCAcNujz?=
 =?us-ascii?Q?c7xfdxb9NuDFehHEciFoeaGhQCzM0m4HZIhhZpy34nm396pXdLbeNeZ7bS+x?=
 =?us-ascii?Q?Yv0fdrueIp0Zd8gMEba1u1qk33WGbpfnF0k2nSzTuQIRqkh8trnQW3rTUImx?=
 =?us-ascii?Q?KCS6czAkeMqsVftlpD/KLwhnYCxgEyIrdae7+Il7VbrKPw6IzDFn12HPs1IL?=
 =?us-ascii?Q?qH5gIEItb1+1vEhAkKvAtUGU0nc4+UWGgjQo1HfUbppHKnJjpigKHw/wbk6T?=
 =?us-ascii?Q?7u86ThD/7maBKxDxboDes7ixTkMZgU7BhDFA+4+ZgGIEY9gDcZr35fwlmHhj?=
 =?us-ascii?Q?53rcGrDibdcpEBYQ3YsqCJdpb/iqqX7/GsQD/igYE6YmOUVeHxfPsDVh73ED?=
 =?us-ascii?Q?+taycjjtEW986IW7AajBD+AkjlaoSbhzUCDTjaOLOiFZW+I/IezyY3QqE303?=
 =?us-ascii?Q?pLZCo/SUcmiukbh1LLVishTgOCPnPNeE0Mzrwk8L1WiOwFOmxMiKRpFbR02g?=
 =?us-ascii?Q?5JqLxysMfgFYKR9zse6rIizxrPWbzRqcPZJyDPNQ0v+QnuDXPQpZjEdNeqvR?=
 =?us-ascii?Q?RH4U5PXYd+cHEWFjJdmVnwmduxBMIC19CbGVyEVK2nb0mIAxFsFyLzCiwlV7?=
 =?us-ascii?Q?MzPxKyVfpk/57WsPgHW5wZGtNxBDCDEQmB1nUpMzotVd0dqirKAIqm4fwDke?=
 =?us-ascii?Q?KOtmhmmFpCqDIFdJasVwiPubGsZpJwlP+LA8LqRbQxOTGpABLqHczKlp/vGi?=
 =?us-ascii?Q?Qzm6WSAHYIcGObg/ahm9vfmJGiOhleIJRoxENbHvoYr4HBSZBgWGqg/ikeyb?=
 =?us-ascii?Q?RTfeHR4vz/brQaOvedpWAdAUT2VpvYrCtPBdHNC69ydRfBwbYtBb1WdWjvzA?=
 =?us-ascii?Q?lYRzHLMIXduOQw6ePY8ZVFlYr0VRFDLXdALlBqzmfDUl7ySgI9dHa5GQ7g08?=
 =?us-ascii?Q?Z6FGpg7t+T45zruhp57FiNTgtKqjz3gTeYrr+DCGbJOKpzOBO63LtANeBenZ?=
 =?us-ascii?Q?nokKR1sN+fWv0wFWiFyoXyYntNkSEDWKmcw2Ml8DInVY8aQm6j4vkbRxq5xO?=
 =?us-ascii?Q?ztSc9HCtTiUQaumRh8NexMDDIEg7fgNbfnS/UXdErAEOAYBjfQblZDqi3Uer?=
 =?us-ascii?Q?dLQhFwUJq37t+iwwlo48QdMUYAsdVg0+LF+4TgLSqt1sSuwXtB3u4evauUq3?=
 =?us-ascii?Q?nuwzoXaAQwkg6qU5VTXTKy8sDc2HhxKtVrcoOJlvqDGFQEc6Knifopn8rRIU?=
 =?us-ascii?Q?BQ=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <248B5DA427BB584D89F0A04ED7E4F0B5@namprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB6272.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c84f673a-55fd-4483-b5f4-08daea32ba7f
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Dec 2022 06:54:42.4230
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: +iaYVv56DocdsyOp1gVohdlht/swWNhV5P/53GfmpEnCRwlO7NeY75pPSsCuImuQwDMq9jV/IwJSzP96pn6CBw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR04MB7704
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,
        SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Dec 15, 2022 at 11:37:49PM +0800, Wenchao Hao wrote:
> If ap->ops->error_handler is NULL just return. This patch also
> fixes some comment style issue.
>=20
> ---
> v3:
> - Start with a "/*" empty line for multi-line comments.
> - Correct the commit subject
>=20
> v2:
> - Check ap->ops->error_handler without taking the spin lock
>=20
> Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
> ---
>  drivers/ata/libata-eh.c | 101 +++++++++++++++++++++-------------------
>  1 file changed, 52 insertions(+), 49 deletions(-)
>=20
> diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
> index 34303ce67c14..56820b8e953a 100644
> --- a/drivers/ata/libata-eh.c
> +++ b/drivers/ata/libata-eh.c
> @@ -565,13 +565,19 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *h=
ost, struct ata_port *ap,
>  {
>  	int i;
>  	unsigned long flags;
> +	struct scsi_cmnd *scmd, *tmp;
> +	int nr_timedout =3D 0;
> =20
>  	/* make sure sff pio task is not running */
>  	ata_sff_flush_pio_task(ap);
> =20
> +	if (!ap->ops->error_handler)
> +		return;
> +
>  	/* synchronize with host lock and sort out timeouts */
> =20
> -	/* For new EH, all qcs are finished in one of three ways -
> +	/*
> +	 * For new EH, all qcs are finished in one of three ways -
>  	 * normal completion, error completion, and SCSI timeout.
>  	 * Both completions can race against SCSI timeout.  When normal
>  	 * completion wins, the qc never reaches EH.  When error
> @@ -584,62 +590,59 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *h=
ost, struct ata_port *ap,
>  	 * timed out iff its associated qc is active and not failed.
>  	 */
>  	spin_lock_irqsave(ap->lock, flags);
> -	if (ap->ops->error_handler) {
> -		struct scsi_cmnd *scmd, *tmp;
> -		int nr_timedout =3D 0;
> -
> -		/* This must occur under the ap->lock as we don't want
> -		   a polled recovery to race the real interrupt handler
> -
> -		   The lost_interrupt handler checks for any completed but
> -		   non-notified command and completes much like an IRQ handler.
> =20
> -		   We then fall into the error recovery code which will treat
> -		   this as if normal completion won the race */
> -
> -		if (ap->ops->lost_interrupt)
> -			ap->ops->lost_interrupt(ap);
> +	/*
> +	 * This must occur under the ap->lock as we don't want
> +	 * a polled recovery to race the real interrupt handler
> +	 *
> +	 * The lost_interrupt handler checks for any completed but
> +	 * non-notified command and completes much like an IRQ handler.
> +	 *
> +	 * We then fall into the error recovery code which will treat
> +	 * this as if normal completion won the race
> +	 */
> +	if (ap->ops->lost_interrupt)
> +		ap->ops->lost_interrupt(ap);
> =20
> -		list_for_each_entry_safe(scmd, tmp, eh_work_q, eh_entry) {
> -			struct ata_queued_cmd *qc;
> +	list_for_each_entry_safe(scmd, tmp, eh_work_q, eh_entry) {
> +		struct ata_queued_cmd *qc;
> =20
> -			ata_qc_for_each_raw(ap, qc, i) {
> -				if (qc->flags & ATA_QCFLAG_ACTIVE &&
> -				    qc->scsicmd =3D=3D scmd)
> -					break;
> -			}
> +		ata_qc_for_each_raw(ap, qc, i) {
> +			if (qc->flags & ATA_QCFLAG_ACTIVE &&
> +			    qc->scsicmd =3D=3D scmd)
> +				break;
> +		}
> =20
> -			if (i < ATA_MAX_QUEUE) {
> -				/* the scmd has an associated qc */
> -				if (!(qc->flags & ATA_QCFLAG_FAILED)) {
> -					/* which hasn't failed yet, timeout */
> -					qc->err_mask |=3D AC_ERR_TIMEOUT;
> -					qc->flags |=3D ATA_QCFLAG_FAILED;
> -					nr_timedout++;
> -				}
> -			} else {
> -				/* Normal completion occurred after
> -				 * SCSI timeout but before this point.
> -				 * Successfully complete it.
> -				 */
> -				scmd->retries =3D scmd->allowed;
> -				scsi_eh_finish_cmd(scmd, &ap->eh_done_q);
> +		if (i < ATA_MAX_QUEUE) {
> +			/* the scmd has an associated qc */
> +			if (!(qc->flags & ATA_QCFLAG_FAILED)) {
> +				/* which hasn't failed yet, timeout */
> +				qc->err_mask |=3D AC_ERR_TIMEOUT;
> +				qc->flags |=3D ATA_QCFLAG_FAILED;
> +				nr_timedout++;
>  			}
> +		} else {
> +			/* Normal completion occurred after
> +			 * SCSI timeout but before this point.
> +			 * Successfully complete it.
> +			 */
> +			scmd->retries =3D scmd->allowed;
> +			scsi_eh_finish_cmd(scmd, &ap->eh_done_q);
>  		}
> +	}
> =20
> -		/* If we have timed out qcs.  They belong to EH from
> -		 * this point but the state of the controller is
> -		 * unknown.  Freeze the port to make sure the IRQ
> -		 * handler doesn't diddle with those qcs.  This must
> -		 * be done atomically w.r.t. setting QCFLAG_FAILED.
> -		 */
> -		if (nr_timedout)
> -			__ata_port_freeze(ap);
> -
> +	/*
> +	 * If we have timed out qcs.  They belong to EH from
> +	 * this point but the state of the controller is
> +	 * unknown.  Freeze the port to make sure the IRQ
> +	 * handler doesn't diddle with those qcs.  This must
> +	 * be done atomically w.r.t. setting QCFLAG_FAILED.
> +	 */
> +	if (nr_timedout)
> +		__ata_port_freeze(ap);
> =20
> -		/* initialize eh_tries */
> -		ap->eh_tries =3D ATA_EH_MAX_TRIES;
> -	}
> +	/* initialize eh_tries */
> +	ap->eh_tries =3D ATA_EH_MAX_TRIES;

Personally, I would prefer a newline between the spin_unlock_irqrestore()
and ap->eh_tries =3D ATA_EH_MAX_TRIES;

>  	spin_unlock_irqrestore(ap->lock, flags);
> =20

You could also drop this superfluous newline.

>  }
> --=20
> 2.32.0
>=20

With or without the above nits fixed:
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>=