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] ata:libata-eh:Cleanup ata_scsi_cmd_error_handler
Thread-Topic: [PATCH] ata:libata-eh:Cleanup ata_scsi_cmd_error_handler
Thread-Index: AQHZEGLKxzwmAL362kO3nq+8VWbQAA==
Date:   Thu, 15 Dec 2022 08:54:07 +0000
Message-ID: <Y5rgrhJuX6xCDEa3@x1-carbon>
References: <20221215050416.1891113-1-haowenchao@huawei.com>
In-Reply-To: <20221215050416.1891113-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?fnj7CQVSjljsVUDdfJnSO6z0ejgH9ZAfkK1L96ZYck5DERuvfRGV0Ar/+ROK?=
 =?us-ascii?Q?lLA6RhaYCEhP7fBzqhX/CMZVggQtgWyVjj4izFAU7YwV66aQhYhY0ovfxHAy?=
 =?us-ascii?Q?sj88svYuLNbAr+E/71haatuZknqdvVewmTvXN4nnFCy3O/woI0d61qp47Wll?=
 =?us-ascii?Q?PDseN63mXuTDdyaVvlAO1s4QxUoHQKK2cCLzFIJquHV5IANpDt3H87eEwA0U?=
 =?us-ascii?Q?DoZ1JjqQWOsOoTVBOnkAwUQ32vitt+jcbTAKYz//5ildTPLDByEQWXpTjTDm?=
 =?us-ascii?Q?ZNOiDqp3rTwKlAP+7IFA8yI+IdnKRrg8KpIgbOVOHqT0jCxHd6qJgiTakEFV?=
 =?us-ascii?Q?22QAdXwwvEJVrR9yHqN2vzkRCSec2ZyAVKwDwKRZJ+fZosBmSCrFJ8ul5mCd?=
 =?us-ascii?Q?d8Q6Jd61piMRtNmkaJNdul5ojg00J9VF6f5a1mToXghUiQGTJ/L+nZQb1ELH?=
 =?us-ascii?Q?NfL5DtOWpLcWR2kr/IJab0QictVUWHOZPJcLggqjQt2wSgN8Bum1SnvcBK0C?=
 =?us-ascii?Q?1DZ6MMcHySrpiTsEgt2wsw6qQ/cfftKE6o5XXTctX40Ka9Q6+GKkT+zGAvyA?=
 =?us-ascii?Q?VGuNGXauRYwYB4ZKLJXhw0ayQdtbVz9DzwPLibXKxzybEKnQhMhKxP61Ia34?=
 =?us-ascii?Q?XLjlp8BInWt/fyJrMw7DQ4qZfpYEeyjLP3aBUnuzwXD8gt8QvojX5olMDSsC?=
 =?us-ascii?Q?qCIoZmsqQ+RL4sk71bU1+oe9N9RoxSWlOLtX3uJxl8K3DX03gNj4bL++UHFY?=
 =?us-ascii?Q?YM4VAJe54aC8IA49kqyY2iGxR6ZTM/WchFAVe6B8O6Ajq7USfzqozhW2sdrE?=
 =?us-ascii?Q?UOg1nIxcEOtFF6hG7v3Jv8ihMymogdHrDoTr9SYPauWFUlRrl86cPvVNzeAQ?=
 =?us-ascii?Q?xDTWncbSrYzxEeAJt/HIKLrmfDyvZ2hG1pueXnqsuVPR8zFjRgy0lzLR+PzF?=
 =?us-ascii?Q?4hmcpOUmZKZLCfwCU+54S1zLKG0z5PyhAmC8pPnOA10Q5PoAgz4+cBd/SgN+?=
 =?us-ascii?Q?21qkx9fLNidUzqIq2Qm397UJb+OwQMEKpJAUH1X0uyrJmQgFFGoIqq0hboEO?=
 =?us-ascii?Q?8gXS0xLb3rw0CAEvNBOSB6S4x0oqbKaw1wu5hMhh4pDz5j1CpSUSHk6aUc3H?=
 =?us-ascii?Q?eC0hxf6ps97xXR1a5wT4dqyWmIAXIeg/sFtDAkg/BhAc+rnnAL3OROkhyFa1?=
 =?us-ascii?Q?gbDM/DjZ3PC/ninA5mA8PEF0nWfskU9GS4Zjt2lUgUsuqs7I1qCKw4tQ04t/?=
 =?us-ascii?Q?b0Ge/tyrX7vTkNHn1/vBkGC/Qs+a43lpLlukKolXxbTVxLoTwQZHjrlyBh2T?=
 =?us-ascii?Q?8dmjdCrKM/ErKtKORO8qIangT2F4relCIbghKF7sF8cIxENCP/q+GBakPss5?=
 =?us-ascii?Q?geB8hYLZqhqwlD6CO/58g75Zgu300JlPQJ2OeYgP8eTfrIA7ydzpJeSZJGSe?=
 =?us-ascii?Q?tLlvSzxk/bgNJHeBInbk9VKhcJrOL84h9wq58cV7/mVp54xnhIEjo0jEDajz?=
 =?us-ascii?Q?9loQvkLA84CaSgQy86H0Et7gEusRsbUB7xaEC2TRzngFky7PXSXmDE74C89y?=
 =?us-ascii?Q?dKhsMLlWagyzxFJE4I/t269ai+Upj0q3ETm0Cvei284ZPOTpDi/AYVCZ7/oT?=
 =?us-ascii?Q?iA=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <DFCB4A0900E0E042945B5546A62B6588@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: 18b836fd-a919-4a1d-c78c-08dade79ed10
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2022 08:54:07.5430
 (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: wifEh/kGRHC98rRumHUl89WQf6uksP2XAXl80VGu9pUJRPKbgVyltxp28V9j0yaEn5pVH+fK8oj0dZz8zx9LUQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB5848
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 01:04:16PM +0800, Wenchao Hao wrote:
> If ap->ops->error_handler is NULL, just go out and release the
> spinlock. This patch is just a cleanup, which would not change
> the origin error handle logic.
>=20
> Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
> ---
>  drivers/ata/libata-eh.c | 96 ++++++++++++++++++++---------------------
>  1 file changed, 48 insertions(+), 48 deletions(-)
>=20
> diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
> index 34303ce67c14..66ca3ac7cd58 100644
> --- a/drivers/ata/libata-eh.c
> +++ b/drivers/ata/libata-eh.c
> @@ -565,6 +565,8 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *hos=
t, 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);
> @@ -584,62 +586,60 @@ 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.
> -
> -		   We then fall into the error recovery code which will treat
> -		   this as if normal completion won the race */
> +	if (!ap->ops->error_handler)
> +		goto out;

Nice cleanup!

However, I don't think there is any point in taking the spin lock if there =
is
no error_handler.

So I think that you can do similar to the skip_eh label in ata_port_detach(=
):
https://github.com/torvalds/linux/blob/master/drivers/ata/libata-core.c#L59=
04


Kind regards,
Niklas

> =20
> -		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;
> +out:
>  	spin_unlock_irqrestore(ap->lock, flags);
> =20
>  }
> --=20
> 2.32.0
> =