From patchwork Wed Nov 30 15:36:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Murphy X-Patchwork-Id: 27860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1000820wrr; Wed, 30 Nov 2022 07:44:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf70uIHjrMxsW/GH9wn9d5kjzRMCHmaOyyeJd6HQfwJVkmWzihxn6nn9UIniCPDKoMsm9sVd X-Received: by 2002:aa7:c719:0:b0:46a:bfd0:f816 with SMTP id i25-20020aa7c719000000b0046abfd0f816mr23004836edq.277.1669823049833; Wed, 30 Nov 2022 07:44:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669823049; cv=none; d=google.com; s=arc-20160816; b=TQZzw9BQg/2BacQf4fyCnfvA5+EbQsTxURG8Vb0b79genigPvSRzx33SDmSdZfVOFV /MrYLod5q6O7a5vEZNK44LGYxmEoma4ov5fo8ryHzVbR37f53oZwDxbWlL73QSxyeXZu woaXuMmqkpizE89NvRxCgRCnKAKOHNvrCwIDYnby2/6FTszTWlbV3qN5dRVV73l4zytH HMyUh3V0Fy8Ib+wcqzTHIJE8jYdGaxGf4HCHXUX9QXTYB2jS0HlshbD7uU3tEIIZpdvx X7sspYPMS3Wl69ar7pRl9UP40ql+a+f08AXptE3okJ6eLEC0oeDt5D33+n+OZNfiLeLA NiTg== 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=ZI8eyYc7bcYKHsbj+xdLTVIi9edDK3QqeLwe6+vjYKU=; b=yp4qG+99II/IzbkGTTcXVGZ/amGShXToBv+dW9clIY7vkPkEAVaNHz1F7bdAAno6MJ l6WV6xw5CClwsoIPrIZYesToJ3uPp0zsMf6ZdwULFel0yEHV0g3xGrs4ZyoYOHXoPyrc moJ8PMcoF85eZefVqhKLj2mfcw5RqS5r9lAOPNWOvBMSphEoQ/phavohlyc4zCicTqoI qO/T0XGTuei1ppjFJv7tBIE4sfdhiKg7xnwjgT+F8rgVmQKmjyKTyAgSlT4a9bMF0B29 VSnY8wZPMlnTNqFPesfBaqwy9gqzHBX3Kac5Px+zeaZ69+rJFeV6BSlw967QKe/J0Kt+ 3ucQ== 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=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z21-20020a05640235d500b0045d4a88c735si1891513edc.220.2022.11.30.07.43.44; Wed, 30 Nov 2022 07:44:09 -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=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229921AbiK3PhQ (ORCPT + 99 others); Wed, 30 Nov 2022 10:37:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229601AbiK3Pgr (ORCPT ); Wed, 30 Nov 2022 10:36:47 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C7FA51C43D for ; Wed, 30 Nov 2022 07:36:45 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 30EE4D6E; Wed, 30 Nov 2022 07:36:52 -0800 (PST) Received: from e121345-lin.cambridge.arm.com (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C77E33F67D; Wed, 30 Nov 2022 07:36:44 -0800 (PST) From: Robin Murphy To: will@kernel.org, mark.rutland@arm.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Geoff Blake Subject: [PATCH 1/2] perf/arm-cmn: Cope with spurious IRQs better Date: Wed, 30 Nov 2022 15:36:38 +0000 Message-Id: X-Mailer: git-send-email 2.36.1.dirty MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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?1750936374314888355?= X-GMAIL-MSGID: =?utf-8?q?1750936374314888355?= Although we reset the CMN state during probe before requesting our interrupt(s), a pending IRQ could already have been latched at the interrupt controller, and thus be delivered spuriously as soon as the IRQ is enabled. Not handling that can then lead to the IRQ layer disabling it again, and things subseuqently going wonky. Since we can't support shared IRQs anyway for affinity-management reasons, the only time we should concievably return IRQ_NONE is for a spurious interrupt which did somehow originate from our CMN, so there should be no harm in removing the problem by simply claiming to have handled those as well. Reported-by: Geoff Blake Signed-off-by: Robin Murphy --- drivers/perf/arm-cmn.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c index b80a9b74662b..9e8be5586423 100644 --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -1798,7 +1798,6 @@ static int arm_cmn_pmu_offline_cpu(unsigned int cpu, struct hlist_node *cpuhp_no static irqreturn_t arm_cmn_handle_irq(int irq, void *dev_id) { struct arm_cmn_dtc *dtc = dev_id; - irqreturn_t ret = IRQ_NONE; for (;;) { u32 status = readl_relaxed(dtc->base + CMN_DT_PMOVSR); @@ -1807,7 +1806,6 @@ static irqreturn_t arm_cmn_handle_irq(int irq, void *dev_id) for (i = 0; i < CMN_DTM_NUM_COUNTERS; i++) { if (status & (1U << i)) { - ret = IRQ_HANDLED; if (WARN_ON(!dtc->counters[i])) continue; delta = (u64)arm_cmn_read_counter(dtc, i) << 16; @@ -1816,7 +1814,6 @@ static irqreturn_t arm_cmn_handle_irq(int irq, void *dev_id) } if (status & (1U << CMN_DT_NUM_COUNTERS)) { - ret = IRQ_HANDLED; if (dtc->cc_active && !WARN_ON(!dtc->cycles)) { delta = arm_cmn_read_cc(dtc); local64_add(delta, &dtc->cycles->count); @@ -1826,7 +1823,7 @@ static irqreturn_t arm_cmn_handle_irq(int irq, void *dev_id) writel_relaxed(status, dtc->base + CMN_DT_PMOVSR_CLR); if (!dtc->irq_friend) - return ret; + return IRQ_HANDLED; dtc += dtc->irq_friend; } }