From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27C6EC4332F for ; Mon, 28 Mar 2022 11:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238769AbiC1L0M (ORCPT ); Mon, 28 Mar 2022 07:26:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241114AbiC1LZR (ORCPT ); Mon, 28 Mar 2022 07:25:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41D2FB6A; Mon, 28 Mar 2022 04:23:23 -0700 (PDT) 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 B6C1AB8105D; Mon, 28 Mar 2022 11:23:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66B38C340F3; Mon, 28 Mar 2022 11:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648466600; bh=vYsMLDYVMr0DTK/i9DNXbMo0fVtarin0N+Axfv9aNdA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KdUPEPFZdVv+U+PVvBB2AJSMgEBBTygvsa7rWGflIVkhdTjgmlsKzRasCbdNtpXQ+ p9foYM2gFy10v48PC7xwVTX33LD8Rf6yW82pmCtHXWXTntwmS8HL5M6uFAbUIsMM3T 1JSM3LiosMZce+KEisskaxLR2p5qtw2qJyvQq5bzBHY/xPDwy4XMr72Y/z6SZgOg+7 gv3LoxnPzdfBKbgbEkTvoK91mm+KnuN2OcYk4IbL3n/xALRcUFI+mzbistlQ9hzFXd Gmbr61OTGGBrkPdPWBV/8SQ70RSkmaJqYrBbyXHt4iTcsd2vsdZZVR10j7pX1HviDU hVpDPHD4mR/XA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marc Zyngier , Maulik Shah , Sasha Levin , agross@kernel.org, bjorn.andersson@linaro.org, tglx@linutronix.de, linux-arm-msm@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 10/21] irqchip/qcom-pdc: Fix broken locking Date: Mon, 28 Mar 2022 07:22:43 -0400 Message-Id: <20220328112254.1556286-10-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328112254.1556286-1-sashal@kernel.org> References: <20220328112254.1556286-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Zyngier [ Upstream commit a6aca2f460e203781dc41391913cc5b54f4bc0ce ] pdc_enable_intr() serves as a primitive to qcom_pdc_gic_{en,dis}able, and has a raw spinlock for mutual exclusion, which is uses with interruptible primitives. This means that this critical section can itself be interrupted. Should the interrupt also be a PDC interrupt, and the endpoint driver perform an irq_disable() on that interrupt, we end-up in a deadlock. Fix this by using the irqsave/irqrestore variants of the locking primitives. Signed-off-by: Marc Zyngier Reviewed-by: Maulik Shah Link: https://lore.kernel.org/r/20220224101226.88373-5-maz@kernel.org Signed-off-by: Sasha Levin --- drivers/irqchip/qcom-pdc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/qcom-pdc.c b/drivers/irqchip/qcom-pdc.c index 5dc63c20b67e..fc747b7f4983 100644 --- a/drivers/irqchip/qcom-pdc.c +++ b/drivers/irqchip/qcom-pdc.c @@ -74,17 +74,18 @@ static int qcom_pdc_gic_set_irqchip_state(struct irq_data *d, static void pdc_enable_intr(struct irq_data *d, bool on) { int pin_out = d->hwirq; + unsigned long flags; u32 index, mask; u32 enable; index = pin_out / 32; mask = pin_out % 32; - raw_spin_lock(&pdc_lock); + raw_spin_lock_irqsave(&pdc_lock, flags); enable = pdc_reg_read(IRQ_ENABLE_BANK, index); enable = on ? ENABLE_INTR(enable, mask) : CLEAR_INTR(enable, mask); pdc_reg_write(IRQ_ENABLE_BANK, index, enable); - raw_spin_unlock(&pdc_lock); + raw_spin_unlock_irqrestore(&pdc_lock, flags); } static void qcom_pdc_gic_disable(struct irq_data *d) -- 2.34.1