From patchwork Thu Dec 15 10:09:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Hao X-Patchwork-Id: 33566 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp265030wrn; Thu, 15 Dec 2022 02:23:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf4MLwr+Dk2tEgMIbxe19xN+PjnbqqEByXV/jvHE47hy8u1E+1hMCgIc7Iu2apjTphlmHomU X-Received: by 2002:a17:902:ea11:b0:189:adf6:7713 with SMTP id s17-20020a170902ea1100b00189adf67713mr37835378plg.65.1671099825419; Thu, 15 Dec 2022 02:23:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671099825; cv=none; d=google.com; s=arc-20160816; b=CQ776Y8oyvQ4u2HoqFw5oBAfcDzvG6Loo62qTmhmLR8SkQNmMQDWP4e/vKYExcz0Sr TCgeSHbHmWeqUgdOvPG3l/GlGSgEDhBnm8psdFc43Xc2VQafSsdRmzLlwUk0ruRLwI9q IgsfG/GdumdewVcEcOSTHZNvhazAjHCU0JWDkW2PneeUkngliVE+X7GeFZrrZBLmyFN9 g/jvPv5FEnJ4ZINoV1i2PINoaveI8LaZvgAdsydWazb7lL4tbuIvk9C1xDrGOUFg9zvK 3yf8si9CGwJooxYm2DE57Y0wddSWz6vch0o9m++CRND6rx9qTL7WE4SU7NsaIs2Wvamu m1ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=mM4Gln/eDJ3jGjKGS2FsBNLX79OZPNjfNVdnTV5aTPI=; b=E1vC8CJeSnpSYEWcjsMuBtDLtiUJR/YvxwdVsfqLEMPr+NjFEms0MrTOUb6sNKw25M zKwBfFoMnq806rCs68LeHAd6I6n/7TVL7tmYbMnUlBXT/PDripac8RNrdCD0VCgEXax7 JR8GcU0aSDtSzakrVi5Hx28L6a6sFt3gUCPCAhC9SjRz3gJuK/UTkMaYqBhvcUPMPZEI 6Q5tmrrTdnJsWPxZLszefpyqKlO6zFmPW4kMY0aQxPBAIxnODkE3Sd8Dsac/yxZNWs0R 8k/Cw3JYjkuVUGREjg89gClpfSQ/aMvBubZqPE9OHKP38yLCBS4Wbr1910QaACWGSzhz jVQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s10-20020a170902988a00b001781e393237si4935469plp.443.2022.12.15.02.23.31; Thu, 15 Dec 2022 02:23:45 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230166AbiLOKKa (ORCPT + 99 others); Thu, 15 Dec 2022 05:10:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229797AbiLOKK2 (ORCPT ); Thu, 15 Dec 2022 05:10:28 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A31995F50; Thu, 15 Dec 2022 02:10:25 -0800 (PST) Received: from dggpemm500017.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NXnyW4GV6zmWb9; Thu, 15 Dec 2022 18:09:23 +0800 (CST) Received: from build.huawei.com (10.175.101.6) by dggpemm500017.china.huawei.com (7.185.36.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 15 Dec 2022 18:10:23 +0800 From: Wenchao Hao To: Damien Le Moal , , CC: , , Wenchao Hao Subject: [PATCH] ata:libata-eh:Cleanup ata_scsi_cmd_error_handler Date: Thu, 15 Dec 2022 18:09:59 +0800 Message-ID: <20221215100959.1926459-1-haowenchao@huawei.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500017.china.huawei.com (7.185.36.178) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752256034223626403?= X-GMAIL-MSGID: =?utf-8?q?1752275170311431030?= 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. Signed-off-by: Wenchao Hao --- drivers/ata/libata-eh.c | 96 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) 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 *host, struct ata_port *ap, { int i; unsigned long flags; + struct scsi_cmnd *scmd, *tmp; + int nr_timedout = 0; /* 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 *host, 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 = 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; - 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); - 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; - ata_qc_for_each_raw(ap, qc, i) { - if (qc->flags & ATA_QCFLAG_ACTIVE && - qc->scsicmd == scmd) - break; - } + ata_qc_for_each_raw(ap, qc, i) { + if (qc->flags & ATA_QCFLAG_ACTIVE && + qc->scsicmd == scmd) + break; + } - 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 |= AC_ERR_TIMEOUT; - qc->flags |= ATA_QCFLAG_FAILED; - nr_timedout++; - } - } else { - /* Normal completion occurred after - * SCSI timeout but before this point. - * Successfully complete it. - */ - scmd->retries = 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 |= AC_ERR_TIMEOUT; + qc->flags |= ATA_QCFLAG_FAILED; + nr_timedout++; } + } else { + /* Normal completion occurred after + * SCSI timeout but before this point. + * Successfully complete it. + */ + scmd->retries = scmd->allowed; + scsi_eh_finish_cmd(scmd, &ap->eh_done_q); } + } - /* 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); - /* initialize eh_tries */ - ap->eh_tries = ATA_EH_MAX_TRIES; - } + /* initialize eh_tries */ + ap->eh_tries = ATA_EH_MAX_TRIES; +out: spin_unlock_irqrestore(ap->lock, flags); }