Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp318888ybt; Sat, 13 Jun 2020 05:36:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfANeTXB1YPW/VeARrywvD6G+sc2tJit2Q4n2Icz+yn8eMOK+pt3GZAgel6r64wCXOSPPJ X-Received: by 2002:a05:6402:14c3:: with SMTP id f3mr16652729edx.341.1592051782172; Sat, 13 Jun 2020 05:36:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592051782; cv=none; d=google.com; s=arc-20160816; b=NQu61yGQasuUBlvxWw3J0Uk6VETDb7hS7N4rDtPQJ0WglaZvW5QEX8TN4+OjUxMaRC /6yTqEKtucZK921GnKi2MZD6RY5iNKkl0WxNJnkSsVgE4pnP056bwpZx4wDfxhNX4R88 aDfueupwj6iedMKTUCqEzQ6cOl76icGqamWfoEleZlFffYIjqRkQT5HpC+H/yX4RlS4v FWM0hxqZHQ9HI52D4Jdq8rOslqE2AB7+uPESO6yPgAFWOSZvndyPqjbE3AVOc3PvjNml WdJI4E1Z/YtdzYvSB/8uk1FJuWnSbuYQnXyytthbrW5Ni6amfArWb53zmZzgs8rbg3XV OaIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=NgezQL5SAIiQAamduSryXNCoN4qm00Nz7G4lENqQzs8=; b=tN1tLaag383y2tyqgpANNmedI4dP4+6GKtx3tDeyYjYN7t1lLMsMhlVmFJ0hAULMZF tRwsqPDxYVxsiDmI5QIUgtkG+CwplDrwkKPQZRiEJAeH89EJxG0pAP2L2CqJ3CKTRkks n+MTrnmGymnFcsjkmDXANvKN3Cl4Dsg3vwIaGqgrwL5MW37eZvqEv0nLs84JItYUBURl zK1nukq7irmUV9v9DfdrlEEKMvMyUylLmr7jRJ43UlkAjYn0briWUphv+8XzBlXEZXxa xOZYg35Ij1JhxBMQzdX+2leJdAiVWNEd+mS1Wj0VqPIjJ2jJRxiX0ereDlDcJXsRhvui OUow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fudan.edu.cn header.s=dkim header.b=rOoowyDK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fudan.edu.cn Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j17si5619904ejc.223.2020.06.13.05.35.59; Sat, 13 Jun 2020 05:36:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@fudan.edu.cn header.s=dkim header.b=rOoowyDK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fudan.edu.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726258AbgFMMba (ORCPT + 99 others); Sat, 13 Jun 2020 08:31:30 -0400 Received: from mail.fudan.edu.cn ([202.120.224.10]:50790 "EHLO fudan.edu.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726021AbgFMMba (ORCPT ); Sat, 13 Jun 2020 08:31:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fudan.edu.cn; s=dkim; h=Received:From:To:Cc:Subject:Date: Message-Id; bh=NgezQL5SAIiQAamduSryXNCoN4qm00Nz7G4lENqQzs8=; b=r OoowyDKltAqTmWCoZ7g2jgoeqqnOWnzN+YyWo4rJ3e1SWRya/92jjrSr/xkkzb1a TjWRe5nl8kHTH6S4L1/TIKvpx5zUQO1RXhqmGHGFFSe2dMrq1E7vuec/90G03l2k mwK90mGaFajMvdyMvv9iz2lJ103fYdOYUq/Jh0QZeg= Received: from localhost.localdomain (unknown [120.229.255.202]) by app1 (Coremail) with SMTP id XAUFCgB3fTH3xuReHq4YAA--.20878S3; Sat, 13 Jun 2020 20:30:48 +0800 (CST) From: Xiyu Yang To: Christian Koenig , Huang Rui , David Airlie , Daniel Vetter , Sumit Semwal , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Cc: yuanxzhang@fudan.edu.cn, kjlu@umn.edu, Xiyu Yang , Xin Tan Subject: [PATCH] drm/ttm: Fix dma_fence refcnt leak when adding move fence Date: Sat, 13 Jun 2020 20:30:25 +0800 Message-Id: <1592051425-94019-1-git-send-email-xiyuyang19@fudan.edu.cn> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: XAUFCgB3fTH3xuReHq4YAA--.20878S3 X-Coremail-Antispam: 1UD129KBjvJXoWxJrWUZFyDJF1DZr45tr4UXFb_yoW8JFWxpr s3GrW2krn8tF17X3sIy3W0gF95Ca47XFySgFZxCas8Zwn0v3sxKr15t390qFyUZrZ2qF42 qr1SkrsxuF1DuFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9E14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4U JVW0owA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IE rcIFxwACI402YVCY1x02628vn2kIc2xKxwCY02Avz4vE14v_Xr1l42xK82IYc2Ij64vIr4 1l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK 67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI 8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAv wI8IcIk0rVW3JVWrJr1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267 AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbeOJUUUUUU== X-CM-SenderInfo: irzsiiysuqikmy6i3vldqovvfxof0/ Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ttm_bo_add_move_fence() invokes dma_fence_get(), which returns a reference of the specified dma_fence object to "fence" with increased refcnt. When ttm_bo_add_move_fence() returns, local variable "fence" becomes invalid, so the refcount should be decreased to keep refcount balanced. The reference counting issue happens in one exception handling path of ttm_bo_add_move_fence(). When no_wait_gpu flag is equals to true, the function forgets to decrease the refcnt increased by dma_fence_get(), causing a refcnt leak. Fix this issue by calling dma_fence_put() when no_wait_gpu flag is equals to true. Signed-off-by: Xiyu Yang Signed-off-by: Xin Tan --- drivers/gpu/drm/ttm/ttm_bo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index f73b81c2576e..0f20e14a4cfd 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -883,8 +883,10 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, if (!fence) return 0; - if (no_wait_gpu) + if (no_wait_gpu) { + dma_fence_put(fence); return -EBUSY; + } dma_resv_add_shared_fence(bo->base.resv, fence); -- 2.7.4