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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A2020EB64DD for ; Fri, 21 Jul 2023 07:42:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D634810E18A; Fri, 21 Jul 2023 07:42:57 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 269D810E18A for ; Fri, 21 Jul 2023 07:42:53 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7CFCB61557; Fri, 21 Jul 2023 07:42:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51891C433C7; Fri, 21 Jul 2023 07:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689925371; bh=1KDOxZIbKp6YhXaedh5RHk//+8vUFdnb3PKGvJutDkU=; h=Subject:To:Cc:From:Date:From; b=flFYFEcWWj8iv5TRll7ZKWo7tNcTJ/XfAX5gDta4FqNominAJ2mu+7w+3cn3iVuCr mJMIVkn/1EI59cNYnPhAlIHbNiaw7seU8YPG25hlkt/imkH4TbkZQ7Ha4QS8WyEDy8 7DDU8I9oqXpmTybWCwRpTHLnjQKI5WxUx9Pda+Co= Subject: Patch "drm/ttm: Don't leak a resource on swapout move error" has been added to the 6.4-stable tree To: andi.shyti@linux.intel.com, christian.koenig@amd.com, ckoenig.leichtzumerken@gmail.com, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, nirmoy.das@intel.com, thomas.hellstrom@linux.intel.com From: Date: Fri, 21 Jul 2023 09:40:43 +0200 Message-ID: <2023072143-plutonium-jukebox-95cf@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable-commits@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is a note to let you know that I've just added the patch titled drm/ttm: Don't leak a resource on swapout move error to the 6.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-ttm-don-t-leak-a-resource-on-swapout-move-error.patch and it can be found in the queue-6.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From a590f03d8de7c4cb7ce4916dc7f2fd10711faabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= Date: Mon, 26 Jun 2023 11:14:50 +0200 Subject: drm/ttm: Don't leak a resource on swapout move error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Thomas Hellström commit a590f03d8de7c4cb7ce4916dc7f2fd10711faabe upstream. If moving the bo to system for swapout failed, we were leaking a resource. Fix. Fixes: bfa3357ef9ab ("drm/ttm: allocate resource object instead of embedding it v2") Cc: Christian König Cc: "Christian König" Cc: dri-devel@lists.freedesktop.org Cc: # v5.14+ Signed-off-by: Thomas Hellström Reviewed-by: Nirmoy Das Reviewed-by: Andi Shyti Reviewed-by: Christian König Link: https://patchwork.freedesktop.org/patch/msgid/20230626091450.14757-5-thomas.hellstrom@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ttm/ttm_bo.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1167,6 +1167,7 @@ int ttm_bo_swapout(struct ttm_buffer_obj ret = ttm_bo_handle_move_mem(bo, evict_mem, true, &ctx, &hop); if (unlikely(ret != 0)) { WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n"); + ttm_resource_free(bo, &evict_mem); goto out; } } Patches currently in stable-queue which might be from thomas.hellstrom@linux.intel.com are queue-6.4/drm-ttm-don-t-leak-a-resource-on-swapout-move-error.patch queue-6.4/drm-ttm-don-t-leak-a-resource-on-eviction-error.patch