Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1488489iob; Thu, 5 May 2022 02:27:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxy55eTFkDPaPglGSHjNs9cQVqQszCLj3WI/NZX54jcWF91s/3xh2fDC/0UzDxbHmK+Gn4a X-Received: by 2002:a50:eb87:0:b0:425:c3e2:17a9 with SMTP id y7-20020a50eb87000000b00425c3e217a9mr28706121edr.109.1651742869861; Thu, 05 May 2022 02:27:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651742869; cv=none; d=google.com; s=arc-20160816; b=obZdSeyqq8Y/6M+edk8mgKvJE9bqn7DI1pzIjFOrs/X67aq/1Ol7X/JHxfCADMgTfM E0rK6V251j+oDm2txZN+XcR28DflGBgCEuuEJNApwsajEZUq5vR23wQg0RBnQbdG03qb DCItxFCn3Qp6Kbz5v4vdqVjrm0Q5T04yFSoGFyz9erSr60ZOS4SVGaQvQelwzeuPfrz3 EB1cl0X+eo+TcPCB8kuaZGlDB/OV7VWIFvF7mAV7dh5b/RXHsaoQWp5G05o72i8TVsOs chuhRB8G5rz/szc4/CoVNLFkMN+FnMCHrdxnpgZwlSH33e/a5mj0/psSx52CfLBlfdeU Blew== 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=GtQjyZt2EQ8f1PkUIZfVKeTmkLCtvnCfPS+gu+/1C4E=; b=KGOvZ8+5yE8F5is4KTPc4fqU//4Z/Q4CE9yGEjcoQ52gHms6SJvdBDmHLoApwGn6CG qgF/J+bFq9mlDwbrXCcjn0f7tdr+C14AW5Ly3sdWQ96Ov4XPFOu5dJTgsyykVvleQDKQ sF9smh0spg5XNSOLCDVJ1tzjV8ydh5FF0eqAj5WBIsCQQPoQeN8WjH6RkhwS65BNHOaF Cb66HWW2zZJomrEtG2lquutpbppvkncKOQeXIDdLEQu0x8KZrNOGItv4HXrTiEMq6nDq 7CgB4gBVDBgjkQuRgDjfrPTOPSsTNGkIOgIDlloO2ZDw/RlSj9SMmWxi++wQOWwH0wu6 fLTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2wITdWzY; 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 c7-20020a05640227c700b00425d417f45dsi1502441ede.488.2022.05.05.02.27.25; Thu, 05 May 2022 02:27:49 -0700 (PDT) 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=2wITdWzY; 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 S1356812AbiEDRly (ORCPT + 99 others); Wed, 4 May 2022 13:41:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356857AbiEDRJq (ORCPT ); Wed, 4 May 2022 13:09:46 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBE8941631; Wed, 4 May 2022 09:56:04 -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 6E759B8278E; Wed, 4 May 2022 16:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EE57C385A5; Wed, 4 May 2022 16:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683362; bh=MHJqpfJfKuElTaqjHbxfjwwRYPPXj/+pu17OoUxRRzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2wITdWzYeUpzDvV89fx/MfNj9aW3Xt3kyxV5Yp+QUHbqYLWIBDG/WqpfPJPVqKD9j j+Lge1dLMzds+y0hWbrZBJIVbWTvS4GMz3RQ3J4W4iTSHUVbxxosIWFSA7ZUzsjZya HtDPPRWw2d69QI3lvbm7X4NeDOj/Zm5dcHJhhnw8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shinichiro Kawasaki , Thomas Gleixner , Damien Le Moal Subject: [PATCH 5.17 049/225] bus: fsl-mc-msi: Fix MSI descriptor mutex lock for msi_first_desc() Date: Wed, 4 May 2022 18:44:47 +0200 Message-Id: <20220504153114.491213159@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@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.7 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: Shin'ichiro Kawasaki commit c7d2f89fea26c84d5accc55d9976dd7e5305e63a upstream. Commit e8604b1447b4 introduced a call to the helper function msi_first_desc(), which needs MSI descriptor mutex lock before call. However, the required mutex lock was not added. This results in lockdep assertion: WARNING: CPU: 4 PID: 119 at kernel/irq/msi.c:274 msi_first_desc+0xd0/0x10c msi_first_desc+0xd0/0x10c fsl_mc_msi_domain_alloc_irqs+0x7c/0xc0 fsl_mc_populate_irq_pool+0x80/0x3cc Fix this by adding the mutex lock and unlock around the function call. Fixes: e8604b1447b4 ("bus: fsl-mc-msi: Simplify MSI descriptor handling") Signed-off-by: Shin'ichiro Kawasaki Signed-off-by: Thomas Gleixner Reviewed-by: Damien Le Moal Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220412075636.755454-1-shinichiro.kawasaki@wdc.com Signed-off-by: Greg Kroah-Hartman --- drivers/bus/fsl-mc/fsl-mc-msi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fsl-mc/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c index 5e0e4393ce4d..0cfe859a4ac4 100644 --- a/drivers/bus/fsl-mc/fsl-mc-msi.c +++ b/drivers/bus/fsl-mc/fsl-mc-msi.c @@ -224,8 +224,12 @@ int fsl_mc_msi_domain_alloc_irqs(struct device *dev, unsigned int irq_count) if (error) return error; + msi_lock_descs(dev); if (msi_first_desc(dev, MSI_DESC_ALL)) - return -EINVAL; + error = -EINVAL; + msi_unlock_descs(dev); + if (error) + return error; /* * NOTE: Calling this function will trigger the invocation of the -- 2.36.0