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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 BEE59C433B4 for ; Fri, 2 Apr 2021 18:54:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 68B51610C9 for ; Fri, 2 Apr 2021 18:54:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68B51610C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=vivo.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=nouveau-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E08EE6EEB1; Fri, 2 Apr 2021 18:54:01 +0000 (UTC) X-Greylist: delayed 414 seconds by postgrey-1.36 at gabe; Fri, 02 Apr 2021 09:02:47 UTC Received: from mail-m17635.qiye.163.com (mail-m17635.qiye.163.com [59.111.176.35]) by gabe.freedesktop.org (Postfix) with ESMTPS id A75286E093 for ; Fri, 2 Apr 2021 09:02:47 +0000 (UTC) Received: from ubuntu.localdomain (unknown [36.152.145.181]) by mail-m17635.qiye.163.com (Hmail) with ESMTPA id A3C5F40010F; Fri, 2 Apr 2021 16:55:51 +0800 (CST) From: Bernard Zhao To: Ben Skeggs , David Airlie , Daniel Vetter , Lyude Paul , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Fri, 2 Apr 2021 01:55:47 -0700 Message-Id: <20210402085549.77050-1-bernard@vivo.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZTkpITUkYTh1DSB5MVkpNSkxITkhMTkpCTk9VEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS09ISFVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MRQ6PRw*ST8UCipKDTgCCQ81 ThwaCQ5VSlVKTUpMSE5ITE5JSUxDVTMWGhIXVRkeCRUaCR87DRINFFUYFBZFWVdZEgtZQVlITVVK TklVSk9OVUpDSllXWQgBWUFJSEJNNwY+ X-HM-Tid: 0a7891cbbd49d991kuwsa3c5f40010f X-Mailman-Approved-At: Fri, 02 Apr 2021 18:54:00 +0000 Subject: [Nouveau] [PATCH] drm/nouveau: fix potential abnormal lock/unlock X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernard Zhao Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" Fix coccicheck warning: drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c:115:3-9: preceding lock on line 109 drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c:98:2-8: preceding lock on line 95 As we see, function nvkm_fifo_chan_inst & nvkm_fifo_chan_chid both use spin_lock_irqsave, but no spin_unlock_irqrestore in if/return branch, seems like a potential bug? Signed-off-by: Bernard Zhao --- drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c index 2ed4ff05d207..e3f624d97644 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c @@ -95,6 +95,7 @@ nvkm_fifo_chan_inst(struct nvkm_fifo *fifo, u64 inst, unsigned long *rflags) spin_lock_irqsave(&fifo->lock, flags); if ((chan = nvkm_fifo_chan_inst_locked(fifo, inst))) { *rflags = flags; + spin_unlock_irqrestore(&fifo->lock, flags); return chan; } spin_unlock_irqrestore(&fifo->lock, flags); @@ -112,6 +113,7 @@ nvkm_fifo_chan_chid(struct nvkm_fifo *fifo, int chid, unsigned long *rflags) list_del(&chan->head); list_add(&chan->head, &fifo->chan); *rflags = flags; + spin_unlock_irqrestore(&fifo->lock, flags); return chan; } } -- 2.31.0 _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau