From patchwork Wed Dec 13 01:59:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 121705 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4889906qgn; Tue, 12 Dec 2017 18:06:18 -0800 (PST) X-Google-Smtp-Source: ACJfBovHarCRhNmp3kVwixpmA8O7qCALd3HTqdnkZBRfCVL/vdzWPY35SEOGAkFBsOOsw1rRA+bl X-Received: by 10.84.240.193 with SMTP id l1mr4269621plt.240.1513130778466; Tue, 12 Dec 2017 18:06:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513130778; cv=none; d=google.com; s=arc-20160816; b=sLWYgTuc/uQkO8wALDE8P6RBoJoJ2/kOwXUtX1XITweYt2tVBTfqKmPy70s+8xJgFa pR+BN+MT568x3evdTC2xlcgzbGsDXxmiHOWzZ3XDoeLAv7Z4ov9fGhqbLQ8ucB5ad6cf CJBdikRneg1ZyTrgZTpSDEFXUlzfQDBvFsgwyeiHghnRtadf9E6BvIfPeXh5wP7hV8GQ WuKfuLfS8XpbGOLbvBKue/ev06pzONb06TpbJHtvXml/at9INBEm6Kc7anFDVhw7F3x6 s9NCXWyjLZXWU0eRqugQMjOyEFeVQOnSWQAuApKBPSUSq4z/2NrAbTzWqFbdHl4h1Gi7 tiHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:to:cc:from:dkim-signature :dkim-signature:dkim-signature:arc-authentication-results; bh=aTyJXBTHWAPp5Plk1j+41zIkHj2/dmFZMIHj/5K/VTA=; b=SsoMWxfAqUKpbKe2FIJSO2ILHJTtyvQ7k8lIZxDZ3qjeiZB+LECKOtrjvGGB+UVJFm BDivCbERWeYaz73AnjD/1wYpgG0IF6odBGy2urJ6GY78SX9eP1C6xLKnLByDijj+qpLW 9+UbKg+WPnrUqawK/to149VJxNDGUnKgn46U5LndFP0Fr9Nsm1RWHjY96BBhtQAlFPzc xjl2a0whTuCI7IdITofBGrhOmrbKaJAd9D/0jQLZv59KhPMuxD1s4onGOmXYWKjrFVqU jwRKpOx46QPu4B9JHslDQbMgJaCZWEpid+O5SKckNE6putprVKP9CH19uh6NhAA5B+kq 8Bsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@verizon.com header.s=corp header.b=ByFab1ac; dkim=fail header.i=@verizon.com header.s=corp header.b=efgwrWWI; dkim=fail header.i=@verizon.com header.s=corp header.b=V8JN+/Nr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f3si393158pgn.718.2017.12.12.18.06.18; Tue, 12 Dec 2017 18:06:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@verizon.com header.s=corp header.b=ByFab1ac; dkim=fail header.i=@verizon.com header.s=corp header.b=efgwrWWI; dkim=fail header.i=@verizon.com header.s=corp header.b=V8JN+/Nr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753769AbdLMCGO (ORCPT + 11 others); Tue, 12 Dec 2017 21:06:14 -0500 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:6075 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753616AbdLMCCN (ORCPT ); Tue, 12 Dec 2017 21:02:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1513130533; x=1544666533; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=SiKXX91pFimnaxCplR8b51Ik3s0ES6AON+Sziclw86g=; b=ByFab1ac9+efHAL0/be2Ptccqpj5fPAX6cLxmr5QNlGJVwqE2ympLyTC SzQYqcp2qAP2EvjLQ2aM8E+qdWeLDNJ7HYUeh3MM0+LHvIK+xgpqgZE9f y6OIlbkXUXbvup1AwBYd8WCUHpNGQVLKCPDYgcr/d7MT7vol1RsCwqAlS c=; Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by fldsmtpe03.verizon.com with ESMTP; 13 Dec 2017 02:01:58 +0000 Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO apollo.verizonwireless.com) ([10.255.192.101]) by fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Dec 2017 02:01:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1513130514; x=1544666514; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=SiKXX91pFimnaxCplR8b51Ik3s0ES6AON+Sziclw86g=; b=efgwrWWID7m9zVr70DUvC823xjyBbqRGZ8fabEQl1Wq7NK0v/WRbxM/c bWFjdVlr9ZYZ4FTfsPlKA3U4CM7pNqanLCFLTbdmOCvHe4IhbpStm7NTk p2E4s929p0sGUYKe9KzxsDWSZecjX9ITgHaT9MVtUe7bK73KnQmK6kudN g=; Received: from endeavour.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.163]) by apollo.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 12 Dec 2017 21:01:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1513130514; x=1544666514; h=to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from:cc; bh=SiKXX91pFimnaxCplR8b51Ik3s0ES6AON+Sziclw86g=; b=V8JN+/Nrh0DShdUTDqYY9qu+oSftwlYX3UGiYQelFQiD+NL0ALkCFk8b tLUGoeya9RDAM/uwyZ9ahzY1bWB+0+tvkQTJfAIDcbVMUyX6ZIYbmnQd/ eDpSo/7dVnGnvRYxYNNWep49xXsECiTxHgu2hZBls2nQljcZ+TtvszDkA s=; From: alexander.levin@verizon.com Cc: Gabriele Paoloni , Dongdong Liu , Bjorn Helgaas , alexander.levin@verizon.com X-Host: endeavour.tdc.vzwcorp.com Received: from ohtwi1exh002.uswin.ad.vzwcorp.com ([10.144.218.44]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 13 Dec 2017 02:01:53 +0000 Received: from tbwexch26apd.uswin.ad.vzwcorp.com (153.114.162.50) by OHTWI1EXH002.uswin.ad.vzwcorp.com (10.144.218.44) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 12 Dec 2017 21:01:53 -0500 Received: from OMZP1LUMXCA20.uswin.ad.vzwcorp.com (144.8.22.198) by tbwexch26apd.uswin.ad.vzwcorp.com (153.114.162.50) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 12 Dec 2017 21:01:53 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA20.uswin.ad.vzwcorp.com (144.8.22.198) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 12 Dec 2017 20:01:45 -0600 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Tue, 12 Dec 2017 20:01:45 -0600 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH AUTOSEL for 3.18 34/40] PCI/AER: Report non-fatal errors only to the affected endpoint Thread-Topic: [PATCH AUTOSEL for 3.18 34/40] PCI/AER: Report non-fatal errors only to the affected endpoint Thread-Index: AQHTc7X9LfogNNxCv0eQ4Z7FMpGEcg== Date: Wed, 13 Dec 2017 01:59:19 +0000 Message-ID: <20171213015905.7059-34-alexander.levin@verizon.com> References: <20171213015905.7059-1-alexander.levin@verizon.com> In-Reply-To: <20171213015905.7059-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gabriele Paoloni [ Upstream commit 86acc790717fb60fb51ea3095084e331d8711c74 ] Previously, if an non-fatal error was reported by an endpoint, we called report_error_detected() for the endpoint, every sibling on the bus, and their descendents. If any of them did not implement the .error_detected() method, do_recovery() failed, leaving all these devices unrecovered. For example, the system described in the bugzilla below has two devices: 0000:74:02.0 [19e5:a230] SAS controller, driver has .error_detected() 0000:74:03.0 [19e5:a235] SATA controller, driver lacks .error_detected() When a device such as 74:02.0 reported a non-fatal error, do_recovery() failed because 74:03.0 lacked an .error_detected() method. But per PCIe r3.1, sec 6.2.2.2.2, such an error does not compromise the Link and does not affect 74:03.0: Non-fatal errors are uncorrectable errors which cause a particular transaction to be unreliable but the Link is otherwise fully functional. Isolating Non-fatal from Fatal errors provides Requester/Receiver logic in a device or system management software the opportunity to recover from the error without resetting the components on the Link and disturbing other transactions in progress. Devices not associated with the transaction in error are not impacted by the error. Report non-fatal errors only to the endpoint that reported them. We really want to check for AER_NONFATAL here, but the current code structure doesn't allow that. Looking for pci_channel_io_normal is the best we can do now. Link: https://bugzilla.kernel.org/show_bug.cgi?id=197055 Fixes: 6c2b374d7485 ("PCI-Express AER implemetation: AER core and aerdriver") Signed-off-by: Gabriele Paoloni Signed-off-by: Dongdong Liu [bhelgaas: changelog] Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/pcie/aer/aerdrv_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index b60a325234c5..cca4b4789ac4 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -360,7 +360,14 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev, * If the error is reported by an end point, we think this * error is related to the upstream link of the end point. */ - pci_walk_bus(dev->bus, cb, &result_data); + if (state == pci_channel_io_normal) + /* + * the error is non fatal so the bus is ok, just invoke + * the callback for the function that logged the error. + */ + cb(dev, &result_data); + else + pci_walk_bus(dev->bus, cb, &result_data); } return result_data.result;