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 X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 485F6C433DB for ; Tue, 2 Mar 2021 15:29:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6B6864F2F for ; Tue, 2 Mar 2021 15:29:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1578759AbhCBP1A (ORCPT ); Tue, 2 Mar 2021 10:27:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:60556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351015AbhCBNDf (ORCPT ); Tue, 2 Mar 2021 08:03:35 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7AD3B64FB4; Tue, 2 Mar 2021 11:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686354; bh=jU4kWJYQHfR0aAfQPcS4kqkjBdaWff57P6igI62WjtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O455QuwmnWSs65YGF3JL3LnTAnEKSgVzxHlEv6iqZNP6xm6R/SjEwvzVgm8I9RO7L X8i4J3NAiLTrVpdkiOU5YXhKHRmwIGrG73h52pWB4gjvaWeIpDkucyzOQxptU+3GLB SQJNjg6cnugrnYTHA74gscbqWyIoCxMa5AfYxxKURZDPkLZu8a5Va1lGj248EJg9Qk gyw85MA9/SqYGpNANWIf1eVHQRT6/Dol3p72ZBqkqVuchH4+LThWAeI0HFJvqNPaqB xMwFpjBzmz8GfuV1217P7imGIYIzVz3vwXg9Gt/aAYPjlWLveScxl9SUzWaJbf/W/u NQNOEJxAK+XUg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Kaiser , Lorenzo Pieralisi , Sasha Levin , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 08/13] PCI: xgene-msi: Fix race in installing chained irq handler Date: Tue, 2 Mar 2021 06:58:58 -0500 Message-Id: <20210302115903.63458-8-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115903.63458-1-sashal@kernel.org> References: <20210302115903.63458-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: linux-kernel@vger.kernel.org From: Martin Kaiser [ Upstream commit a93c00e5f975f23592895b7e83f35de2d36b7633 ] Fix a race where a pending interrupt could be received and the handler called before the handler's data has been setup, by converting to irq_set_chained_handler_and_data(). See also 2cf5a03cb29d ("PCI/keystone: Fix race in installing chained IRQ handler"). Based on the mail discussion, it seems ok to drop the error handling. Link: https://lore.kernel.org/r/20210115212435.19940-3-martin@kaiser.cx Signed-off-by: Martin Kaiser Signed-off-by: Lorenzo Pieralisi Signed-off-by: Sasha Levin --- drivers/pci/host/pci-xgene-msi.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c index 1f42a202b021..784b3f61199e 100644 --- a/drivers/pci/host/pci-xgene-msi.c +++ b/drivers/pci/host/pci-xgene-msi.c @@ -393,13 +393,9 @@ static int xgene_msi_hwirq_alloc(unsigned int cpu) if (!msi_group->gic_irq) continue; - irq_set_chained_handler(msi_group->gic_irq, - xgene_msi_isr); - err = irq_set_handler_data(msi_group->gic_irq, msi_group); - if (err) { - pr_err("failed to register GIC IRQ handler\n"); - return -EINVAL; - } + irq_set_chained_handler_and_data(msi_group->gic_irq, + xgene_msi_isr, msi_group); + /* * Statically allocate MSI GIC IRQs to each CPU core. * With 8-core X-Gene v1, 2 MSI GIC IRQs are allocated -- 2.30.1 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 X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B929CC433DB for ; Wed, 3 Mar 2021 19:16:09 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 781AC64E90 for ; Wed, 3 Mar 2021 19:16:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 781AC64E90 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=K8XX1ZKVSRNI9NAU2/Y3mBgVJa0hG54I8q2frFcQrVk=; b=O1JGGwi3qNktBNPqm62HFIDqI DGd3a/QJFpcu42GbIlu9n9jTDpiEryfiIvD2MB7naWTqx+gK7fiHLWZehPKhOGtSmyVjAP0zW7y/Q gWK7Tu60V5MUIb9D9X6I15z3ijuDRfQVrdnrPY7B6CFRtg8O/53LOyK5tL7MMm2MRnYNEYgmdG1xh h4sg5AOqCSLkr6tqTGIZvj6c5lrcYI8YD209+Sdhuovmf/9hCVj5gBS2wt/xHn2iK1VI32T5NkFnQ h1yEJB+E+kTCWn55TbMkDKwNwwEzUDmMuODf3U/wYhzJEGo4eRSP6ki5W/54N+bSdLnxefZRIOThz dYhh6H4Iw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHWw9-006A9B-4z; Wed, 03 Mar 2021 19:13:33 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHT2Y-005HlD-Fo for linux-arm-kernel@desiato.infradead.org; Wed, 03 Mar 2021 15:03:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=LF6MQw0f/kLjMnPbx6vUnSFc+Lj8ji7mth8uR2oqfm0=; b=oTmNxctwqTj2oXXLDaCe2rx3Lj +Y58y4+4omMWWY8YYYV7STHHHK57M4Z3coaeRkFjdjtn9z37cznZRLLBCP0vP/knBwE5vWV+duhPn hQUKrJz6ZgI+4yz2niNaX1wzqGeRpDVuAimEO+5eji14GEcAG0+CVXMp4bf22QEe2kfRvXPk2v2iu 5V0Hdk2BosRd1OUVw5WJlRHAvnGPev74FoW7Pw/Ct1AaPhYI3HjK5bu6cCk9WUJ9JA/Z8HDaGLzI5 pmLEKs1HQ+ymiHWjtxuwmCPriOIXmqmqn/bhBgEgQh2xPhj9IbU9tFGFnFkDo+sO2F5vcVngUcagi VH/2CXzg==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lH3gN-00H3Uk-4Q for linux-arm-kernel@lists.infradead.org; Tue, 02 Mar 2021 11:59:22 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7AD3B64FB4; Tue, 2 Mar 2021 11:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686354; bh=jU4kWJYQHfR0aAfQPcS4kqkjBdaWff57P6igI62WjtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O455QuwmnWSs65YGF3JL3LnTAnEKSgVzxHlEv6iqZNP6xm6R/SjEwvzVgm8I9RO7L X8i4J3NAiLTrVpdkiOU5YXhKHRmwIGrG73h52pWB4gjvaWeIpDkucyzOQxptU+3GLB SQJNjg6cnugrnYTHA74gscbqWyIoCxMa5AfYxxKURZDPkLZu8a5Va1lGj248EJg9Qk gyw85MA9/SqYGpNANWIf1eVHQRT6/Dol3p72ZBqkqVuchH4+LThWAeI0HFJvqNPaqB xMwFpjBzmz8GfuV1217P7imGIYIzVz3vwXg9Gt/aAYPjlWLveScxl9SUzWaJbf/W/u NQNOEJxAK+XUg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Kaiser , Lorenzo Pieralisi , Sasha Levin , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 08/13] PCI: xgene-msi: Fix race in installing chained irq handler Date: Tue, 2 Mar 2021 06:58:58 -0500 Message-Id: <20210302115903.63458-8-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115903.63458-1-sashal@kernel.org> References: <20210302115903.63458-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_115922_692181_0803760F X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Martin Kaiser [ Upstream commit a93c00e5f975f23592895b7e83f35de2d36b7633 ] Fix a race where a pending interrupt could be received and the handler called before the handler's data has been setup, by converting to irq_set_chained_handler_and_data(). See also 2cf5a03cb29d ("PCI/keystone: Fix race in installing chained IRQ handler"). Based on the mail discussion, it seems ok to drop the error handling. Link: https://lore.kernel.org/r/20210115212435.19940-3-martin@kaiser.cx Signed-off-by: Martin Kaiser Signed-off-by: Lorenzo Pieralisi Signed-off-by: Sasha Levin --- drivers/pci/host/pci-xgene-msi.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c index 1f42a202b021..784b3f61199e 100644 --- a/drivers/pci/host/pci-xgene-msi.c +++ b/drivers/pci/host/pci-xgene-msi.c @@ -393,13 +393,9 @@ static int xgene_msi_hwirq_alloc(unsigned int cpu) if (!msi_group->gic_irq) continue; - irq_set_chained_handler(msi_group->gic_irq, - xgene_msi_isr); - err = irq_set_handler_data(msi_group->gic_irq, msi_group); - if (err) { - pr_err("failed to register GIC IRQ handler\n"); - return -EINVAL; - } + irq_set_chained_handler_and_data(msi_group->gic_irq, + xgene_msi_isr, msi_group); + /* * Statically allocate MSI GIC IRQs to each CPU core. * With 8-core X-Gene v1, 2 MSI GIC IRQs are allocated -- 2.30.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel