From patchwork Sat Oct 10 22:16:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hedi Berriche X-Patchwork-Id: 11830349 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 460B416C1 for ; Sat, 10 Oct 2020 22:52:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 129B02083B for ; Sat, 10 Oct 2020 22:52:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=hpe.com header.i=@hpe.com header.b="ZC0j+TY6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730667AbgJJWvi (ORCPT ); Sat, 10 Oct 2020 18:51:38 -0400 Received: from mx0b-002e3701.pphosted.com ([148.163.143.35]:3182 "EHLO mx0b-002e3701.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730327AbgJJWvQ (ORCPT ); Sat, 10 Oct 2020 18:51:16 -0400 Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09AMGas7000639; Sat, 10 Oct 2020 22:17:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=wSRn6DStJQfrwSTDj+DfXKvQUD8C1Q/aQBRYMzWuv7I=; b=ZC0j+TY6SR3d9IWNkIYCeIwiq3JGaGNyfOYPLiCK29kLsC4llj6tnYK8tsFQF4e+4RmV 6SDLM1kEKvyRDUjVF5iILf7QBH+J59DaAyFrdDtUV1iILeqfGtLEAVWgNdbfeGvAg8OP S1zhjTHuFTw+IbLOfseC1fH8UagAwTh+jgGHg58uWpMWFr6V7rIV8DzVRJzmodJ+gZn5 Yu+CbMeHPM73Hf2OwSru7GZtOIAJFRLTYCAQAv7X+XAm2a7rJVPbJQSQ0rPd1eH5ylYv otjcCWsx4ssLydxq59+37kmmTBrxuKbic8vy1LgbvfWaQN1WFsXRts1fHYyEBnGQh/xa HQ== Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) by mx0b-002e3701.pphosted.com with ESMTP id 34342ukybj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 10 Oct 2020 22:17:08 +0000 Received: from sarge.linuxathome.me (unknown [16.29.167.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by g9t5008.houston.hpe.com (Postfix) with ESMTPS id 173FD4F; Sat, 10 Oct 2020 22:17:05 +0000 (UTC) From: Hedi Berriche To: sathyanarayanan.kuppuswamy@linux.intel.com Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Hedi Berriche , Russ Anderson , Bjorn Helgaas , Ashok Raj , Joerg Roedel , stable@kernel.org Subject: [RESEND PATCH v3 1/1] PCI/ERR: don't clobber status after reset_link() Date: Sat, 10 Oct 2020 23:16:53 +0100 Message-Id: <20201010221653.2782993-2-hedi.berriche@hpe.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201010221653.2782993-1-hedi.berriche@hpe.com> References: <20201010221653.2782993-1-hedi.berriche@hpe.com> MIME-Version: 1.0 X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-10-10_07:2020-10-09,2020-10-10 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=999 clxscore=1015 mlxscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 suspectscore=1 spamscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010100210 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Commit 6d2c89441571 ("PCI/ERR: Update error status after reset_link()") broke pcie_do_recovery(): updating status after reset_link() has the ill side effect of causing recovery to fail if the error status is PCI_ERS_RESULT_CAN_RECOVER or PCI_ERS_RESULT_NEED_RESET as the following code will *never* run in the case of a successful reset_link() 177 if (status == PCI_ERS_RESULT_CAN_RECOVER) { ... 181 } 183 if (status == PCI_ERS_RESULT_NEED_RESET) { ... 192 } For instance in the case of PCI_ERS_RESULT_NEED_RESET we end up not calling ->slot_reset() (because we skip report_slot_reset()) thus breaking driver (re)initialisation. Don't clobber status with the return value of reset_link(); set status to PCI_ERS_RESULT_RECOVERED, in case of successful link reset, if and only if the initial value of error status is PCI_ERS_RESULT_DISCONNECT or PCI_ERS_RESULT_NO_AER_DRIVER. Fixes: 6d2c89441571 ("PCI/ERR: Update error status after reset_link()") Signed-off-by: Hedi Berriche Cc: Russ Anderson Cc: Kuppuswamy Sathyanarayanan Cc: Bjorn Helgaas Cc: Ashok Raj Cc: Joerg Roedel Cc: stable@kernel.org # v5.7+ Reviewed-by: Sinan Kaya --- drivers/pci/pcie/err.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c index c543f419d8f9..2730826cfd8a 100644 --- a/drivers/pci/pcie/err.c +++ b/drivers/pci/pcie/err.c @@ -165,10 +165,13 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, pci_dbg(dev, "broadcast error_detected message\n"); if (state == pci_channel_io_frozen) { pci_walk_bus(bus, report_frozen_detected, &status); - status = reset_link(dev); - if (status != PCI_ERS_RESULT_RECOVERED) { + if (reset_link(dev) != PCI_ERS_RESULT_RECOVERED) { pci_warn(dev, "link reset failed\n"); goto failed; + } else { + if (status == PCI_ERS_RESULT_DISCONNECT || + status == PCI_ERS_RESULT_NO_AER_DRIVER) + status = PCI_ERS_RESULT_RECOVERED; } } else { pci_walk_bus(bus, report_normal_detected, &status);