Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1777761pxp; Mon, 7 Mar 2022 02:05:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzypYxZ6s4R3vDr82SOdyyhPbPLCfjeIrUylTzC2AZSwaiEnbB9DVCD/fsbC1EjZBmlClAl X-Received: by 2002:a17:906:4c4b:b0:6da:a5d9:7af9 with SMTP id d11-20020a1709064c4b00b006daa5d97af9mr8485204ejw.336.1646647523573; Mon, 07 Mar 2022 02:05:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646647523; cv=none; d=google.com; s=arc-20160816; b=HP7nK6NMAubjRsig8KJDUujGzGrJ7IxBttYD30QsO90iG0h9YCVzddDhJzsoa3PTwG 4JR0mBTU/y98xqd+zb7r1XGqwMusaHzc2T20h25C17+Sz2iLwIuTQWHCLeOTuspVfpJD xQxxjYwy+uxgYnqq3w3FMFipP1XsC55qlAQOmKselAZLeinwUPmvj4Xb4x86hzS9UUzM EVtA0xCM/sco42YGZqQwHrVYy1SFWKtkTSJZDobSzzbRQ3pv+zOp1iC8WerXZXSu9eqa NXrps0cyUHTC+HjsKwR8YWm2prfv3sLSMKt+il/Hqf7Lru8TSYl4uuhewwfFfX95Q4rZ 5sCA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=R2socbDeCnb177gzre664yYS0fSUmY9JoOEfWficWaE=; b=FZ+JcgZhWp2J6Bhz80EbxL0mOY8WrmbNOOnggPUNvwBB68rrlFZJdkmRp17WJUvH46 hZ4pLtF94ysF66FB2gNoQB7CNmOGzKcS0Aya7eD69G6cqW5IiCFsHDtMjDX5cU1AhZhh 3sNjbhs/p5VhIvP17goM0a7cHTHHLWFC42UTrZ/DXwBTzGMMxVhMmpzYJQz+vyf9FkeB Rs9gNQSYPi4Hea2utaAFB6Hwy9vEi6hlDD4Y1MRpE/eANvR5ZYC9WYSnBybs3LLGMZUm OjX3A54nAkpKjPmHErDqzhOeWGrzOqik+MquhEwY/0W7XmQNCBYaFuhQsB+BObDwVhp6 rNMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tFc7jhmH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs19-20020a1709073e9300b006da8440e213si10191207ejc.67.2022.03.07.02.05.01; Mon, 07 Mar 2022 02:05:23 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tFc7jhmH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237148AbiCGJba (ORCPT + 99 others); Mon, 7 Mar 2022 04:31:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237813AbiCGJ21 (ORCPT ); Mon, 7 Mar 2022 04:28:27 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B9D66B082; Mon, 7 Mar 2022 01:26:07 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BFF7AB810BF; Mon, 7 Mar 2022 09:25:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29B15C340F3; Mon, 7 Mar 2022 09:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646645148; bh=4Do5akYphTBtPcYBc/ozTHbz6rGCD1xHyIWyKYfRseI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tFc7jhmHZ7XRiyTra2Yxt06C/XvhVlU8UzmYJc2WXVabRIULIpLrrEJqzgVAwrdNa 41+oHLp1IZmoRwhOF+cvac17OOUe/xCvzXXEC9mC04kNi3urfDDXZOvC9zNEBOWP2z 3t4m3rrzWDNtd/iRvevD1S2+eVpGjbLvey8TUtfw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joseph Bao , Lukas Wunner , Bjorn Helgaas , Stuart Hayes , Sudip Mukherjee Subject: [PATCH 4.19 30/51] PCI: pciehp: Fix infinite loop in IRQ handler upon power fault Date: Mon, 7 Mar 2022 10:19:05 +0100 Message-Id: <20220307091637.848544322@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091636.988950823@linuxfoundation.org> References: <20220307091636.988950823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Lukas Wunner commit 23584c1ed3e15a6f4bfab8dc5a88d94ab929ee12 upstream. The Power Fault Detected bit in the Slot Status register differs from all other hotplug events in that it is sticky: It can only be cleared after turning off slot power. Per PCIe r5.0, sec. 6.7.1.8: If a power controller detects a main power fault on the hot-plug slot, it must automatically set its internal main power fault latch [...]. The main power fault latch is cleared when software turns off power to the hot-plug slot. The stickiness used to cause interrupt storms and infinite loops which were fixed in 2009 by commits 5651c48cfafe ("PCI pciehp: fix power fault interrupt storm problem") and 99f0169c17f3 ("PCI: pciehp: enable software notification on empty slots"). Unfortunately in 2020 the infinite loop issue was inadvertently reintroduced by commit 8edf5332c393 ("PCI: pciehp: Fix MSI interrupt race"): The hardirq handler pciehp_isr() clears the PFD bit until pciehp's power_fault_detected flag is set. That happens in the IRQ thread pciehp_ist(), which never learns of the event because the hardirq handler is stuck in an infinite loop. Fix by setting the power_fault_detected flag already in the hardirq handler. Link: https://bugzilla.kernel.org/show_bug.cgi?id=214989 Link: https://lore.kernel.org/linux-pci/DM8PR11MB5702255A6A92F735D90A4446868B9@DM8PR11MB5702.namprd11.prod.outlook.com Fixes: 8edf5332c393 ("PCI: pciehp: Fix MSI interrupt race") Link: https://lore.kernel.org/r/66eaeef31d4997ceea357ad93259f290ededecfd.1637187226.git.lukas@wunner.de Reported-by: Joseph Bao Tested-by: Joseph Bao Signed-off-by: Lukas Wunner Signed-off-by: Bjorn Helgaas Cc: stable@vger.kernel.org # v4.19+ Cc: Stuart Hayes [sudip: adjust context] Signed-off-by: Sudip Mukherjee Signed-off-by: Greg Kroah-Hartman --- drivers/pci/hotplug/pciehp_hpc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -576,6 +576,8 @@ read_status: */ if (ctrl->power_fault_detected) status &= ~PCI_EXP_SLTSTA_PFD; + else if (status & PCI_EXP_SLTSTA_PFD) + ctrl->power_fault_detected = true; events |= status; if (!events) { @@ -585,7 +587,7 @@ read_status: } if (status) { - pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, events); + pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, status); /* * In MSI mode, all event bits must be zero before the port @@ -660,8 +662,7 @@ static irqreturn_t pciehp_ist(int irq, v } /* Check Power Fault Detected */ - if ((events & PCI_EXP_SLTSTA_PFD) && !ctrl->power_fault_detected) { - ctrl->power_fault_detected = 1; + if (events & PCI_EXP_SLTSTA_PFD) { ctrl_err(ctrl, "Slot(%s): Power fault\n", slot_name(slot)); pciehp_set_attention_status(slot, 1); pciehp_green_led_off(slot);