Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp2547008rwo; Sun, 23 Jul 2023 18:37:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlHHYK8+PRpn+3r0lHmgKcNk0zEwkOqgHz3Cmxd78PZ3kMHNvxznDUWHdvgb4151yU1f1tbY X-Received: by 2002:aa7:d757:0:b0:522:2dcc:afb6 with SMTP id a23-20020aa7d757000000b005222dccafb6mr930777eds.7.1690162658002; Sun, 23 Jul 2023 18:37:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690162657; cv=none; d=google.com; s=arc-20160816; b=IfoaIYq9C1l6Ydd0a/6fPeoonFps+3/cTKz+oSOcDQ2otg7jRw48Z9T+7lKCrraoPb 9lmrvTWV45wBK4B5wcaxgcB8DJrzfc2fS+2PAqyV5xguEdYl0lCEOmV2H8NxBQad4Fwv oeZTnvPDnMv6zTbUWvwVdWeyodZDldnzHfTStl0/SC/qTZe6ILL4oenxieraIMGNAJbs xyGAYnq7vHdV3t0Qk/x7i57qqay0pZiZHCQCpAfjhidMl4ndjOriHwnJXuQdGX2O0B32 EJbk3VWSsgKUa0DQnZ3MxVlku4QobD+Vyop3ISJGD9N6siAfC3BgiFHpRWhMIVyy2Peu aN0A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/mAg6OLwtE8Zk8gmxxhkUnWZOsfujzME1i/MpmDMKT4=; fh=BfEYw57I3S2ZyJlFNUAbwfq117UAYv9Qu1hpViRXM0I=; b=xW3jIecC1mJuZnm0XlDLmbDFFnF8DhPzQdewBCmQSp2wcDLAy+NlsI/muFElGIFWfa ibmlp8rM7nP9nA2G/0nd+dhLmfOlMsIRstwNEvQ3ZK9lp+b4nVEuLlhhceWsM/esFFDe 2BUmrtMuIR/FKQNG7DiLofM0okdA1/vEONwta28VtWkAcjtjaLZxS2L++beaXxxVkQ0s 6NYDi1iRO7C/NzRDuQuGKo4m6Cr/7ea9ZbclJP05tLkQsBJyNr/EEIT2oJMHOylvgnGn Ko7NKAdZVI0TFIrnkD499SQC4o/ey6dt0ISj+RhcOd4/PWpGNYBTpkVIBYkuNoyPoJ/L U7QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=otEOWpT0; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f26-20020a056402069a00b0051e26a33fa2si5786520edy.436.2023.07.23.18.37.13; Sun, 23 Jul 2023 18:37:37 -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=@kernel.org header.s=k20201202 header.b=otEOWpT0; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229882AbjGXBOa (ORCPT + 99 others); Sun, 23 Jul 2023 21:14:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbjGXBOU (ORCPT ); Sun, 23 Jul 2023 21:14:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F05E10EC; Sun, 23 Jul 2023 18:14:05 -0700 (PDT) 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 08A3D60EFB; Mon, 24 Jul 2023 01:14:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3BE0C433CA; Mon, 24 Jul 2023 01:14:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690161243; bh=/OAx81oXf+Sgc5G8llzSkZ0rBNM5DS8RqudljSSGI5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=otEOWpT0q9zh3T/2TUmanhK4EiaW3IvJwDwmoT3FSDJSXpZmYRYCtekArAzbqDkuY wSj2nA/o8r50Vdg/k0vsIywN/oVcUFF+KiaVXlvZaexZCIwpB/eu8spR4+3OCvfQuE 5OBn0OD324Q0Ag9b/v8MCSH+fpFr8OKLonzMfNivdi5EroX5kdti76PmRQKWd9Y5xq 6x0nAtk4/TefAp1ioqqj0jOw2I9y6EiGh6FZlBwbHvBPwueKFWw4JDirZJwWS7RkRJ NRFNkFXf3jnXV7UJRVhsvWLZlBG4lka4XkQ79Ik0jBIn5nmsUmrD+bkjGZTlw882fU fWAP3yWIa+AXQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jack Xiao , Hawking Zhang , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Victor.Zhao@amd.com, luben.tuikov@amd.com, Jiadong.Zhu@amd.com, bas@basnieuwenhuizen.nl, srinivasan.shanmugam@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.4 07/58] drm/amdgpu: fix memory leak in mes self test Date: Sun, 23 Jul 2023 21:12:35 -0400 Message-Id: <20230724011338.2298062-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230724011338.2298062-1-sashal@kernel.org> References: <20230724011338.2298062-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.5 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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: Jack Xiao [ Upstream commit 31d7c3a4fc3d312a0646990767647925d5bde540 ] The fences associated with mes queue have to be freed up during amdgpu_ring_fini. Signed-off-by: Jack Xiao Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 49de3a3eebc78..de04606c2061e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -361,6 +361,8 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring) amdgpu_bo_free_kernel(&ring->ring_obj, &ring->gpu_addr, (void **)&ring->ring); + } else { + kfree(ring->fence_drv.fences); } dma_fence_put(ring->vmid_wait); -- 2.39.2