From patchwork Wed Dec 13 01:58:38 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: 121702 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4886110qgn; Tue, 12 Dec 2017 18:02:04 -0800 (PST) X-Google-Smtp-Source: ACJfBoseRP+0Lj25nxH2J61GQE6dijnveIXLkqTjnh7R1rbBtgt3YnB2LjAeZih8WfrXLYKF0wqk X-Received: by 10.99.119.15 with SMTP id s15mr3803188pgc.90.1513130524106; Tue, 12 Dec 2017 18:02:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513130524; cv=none; d=google.com; s=arc-20160816; b=BgYw+uFtoEyMO02OpYao87nSAKp5ClLfHdzCc1MTdOtzAkTHKMPuHA9udpdowleDMJ vdi9ZVXYhiCVkrDbOjMSkVcUBNUJTeWpxlmc6Rv6vvnxd6cSp9mJiyXmkAf9aQ3aYMbp C90ci8R7sqBPNmsmr0VFW8aWrI258LDO6CoWcZA/+7y7xobXvLujkbJv2FgTx76JOKuN piJaAovkHdAXa4w7Hx5jUtUW/o7nLMLvQlqy66EDRMduZ+OVUSMwPf+DyckKNZ1lIRVo LGg4mqEvoCy28FZ94jj3yV7kDsPyrpDSxOkZav+4+IBnzRh/oyCMyplIooIyl46yodEe H0lw== 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=peDbPfbp/7zGokig6k8FF1bWTIcV/Z7UCLWI9w8DHmA=; b=uxhsUbqIWHp5FzqvzXRJLTEdAHBsEUsUvbcSMPUvNL/lmIDlXa3bMpQhpogoH03GYk NjPUQL9atriLbM4woygO0cwSGgvAUkU7Q30Yd5tBczVJylG/b8zimaDlZLJTfyVLOKOb TiAFDwSHhKOJPOCe/AoqRrou1jCj0SrNZFFSFjrkqMiTapFUTOXSEEsiKBJrP0bjsfcC BoueVozCcRLkpx2IwhY1zno3l+szXhHLFOhI7eAMSEJjqGehLKBDUlZifMOX/ULTPVRT YP6+LmuUspCfpvgfdwIzlB6G/zvnJcbMR0xB09fKYYFd6nKCivCuesHWW97NF17JaDCv VlBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@verizon.com header.s=corp header.b=Qq6SNqCM; dkim=fail header.i=@verizon.com header.s=corp header.b=TDGOoteS; dkim=fail header.i=@verizon.com header.s=corp header.b=q22u9qFt; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 h188si390358pgc.559.2017.12.12.18.02.03; Tue, 12 Dec 2017 18:02:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=Qq6SNqCM; dkim=fail header.i=@verizon.com header.s=corp header.b=TDGOoteS; dkim=fail header.i=@verizon.com header.s=corp header.b=q22u9qFt; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1753847AbdLMCB5 (ORCPT + 10 others); Tue, 12 Dec 2017 21:01:57 -0500 Received: from omzsmtpe03.verizonbusiness.com ([199.249.25.208]:49281 "EHLO omzsmtpe03.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753586AbdLMCBy (ORCPT ); Tue, 12 Dec 2017 21:01:54 -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=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=CvirPqh17RAsxnosN75CjNcwkZSFe3vfghUAmK1/E6I=; b=Qq6SNqCMp7J0ARbq0H1ZgqTQ+QQ2E5OM68Z3drbvb39dcqdxX/+2neFX 3+0e/TvbpIAjVfh8ECXOXTA0uFoasdZyIyBerV2emcunEJash3XZP0AOy JpRSYn3UsxirANvOQWm5gZF4St/eemtUpc6C3EAJwhDN5+PAcMqQEeins c=; Received: from unknown (HELO fldsmtpi03.verizon.com) ([166.68.71.145]) by omzsmtpe03.verizonbusiness.com with ESMTP; 13 Dec 2017 02:01:53 +0000 Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi03.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Dec 2017 02:00:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1513130483; x=1544666483; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=CvirPqh17RAsxnosN75CjNcwkZSFe3vfghUAmK1/E6I=; b=TDGOoteS9wDTgwfx74buEKzf2NozTRfSjy45SuQ65PQIx9zZOM6K4BMD zfNw4GE2FW/nKJzkjGS0cS01wKgEVgQOpzW34jo1O9TCC7V3ifmEKDFEp cU0zbn65UJVI/e01Oc+euQNgCK0XG+JFaB+PHaejGt4ZXYcvELoaCp7pV 4=; Received: from mariner.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.84]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 12 Dec 2017 21:00:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1513130450; x=1544666450; h=to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from:cc; bh=CvirPqh17RAsxnosN75CjNcwkZSFe3vfghUAmK1/E6I=; b=q22u9qFtTPms2zFSId58Augw1IAiccjgNi7eOFVedRCyvyHMYwL/unP6 +7KYMPuIshUyYfB0LJtIWhNhPi3z1gRzILT0MIIAN6pIz75Lc4a5Mbxbl j1CedCfXCNJHv1QcyShqVn/PX7BViJrAvMXiCmgGhcKutpcN82Do0kJHs 8=; From: alexander.levin@verizon.com Cc: Gabriele Paoloni , Dongdong Liu , Bjorn Helgaas , alexander.levin@verizon.com X-Host: mariner.tdc.vzwcorp.com Received: from ohtwi1exh003.uswin.ad.vzwcorp.com ([10.144.218.45]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 13 Dec 2017 02:00:49 +0000 Received: from tbwexch21apd.uswin.ad.vzwcorp.com (153.114.162.45) by OHTWI1EXH003.uswin.ad.vzwcorp.com (10.144.218.45) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 12 Dec 2017 21:00:49 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by tbwexch21apd.uswin.ad.vzwcorp.com (153.114.162.45) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 12 Dec 2017 21:00:49 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 12 Dec 2017 20:00:48 -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:00:48 -0600 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH AUTOSEL for 4.4 51/59] PCI/AER: Report non-fatal errors only to the affected endpoint Thread-Topic: [PATCH AUTOSEL for 4.4 51/59] PCI/AER: Report non-fatal errors only to the affected endpoint Thread-Index: AQHTc7XkTFVfq9tqzkiw4CBxYBXwFg== Date: Wed, 13 Dec 2017 01:58:38 +0000 Message-ID: <20171213015817.6950-51-alexander.levin@verizon.com> References: <20171213015817.6950-1-alexander.levin@verizon.com> In-Reply-To: <20171213015817.6950-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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 4e14de0f0f98..ca5dbf03e388 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -388,7 +388,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;