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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 148FCC48BDF for ; Tue, 15 Jun 2021 12:35:26 +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 A063661461 for ; Tue, 15 Jun 2021 12:35:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A063661461 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 10A586E2E3; Tue, 15 Jun 2021 12:35:24 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id C05366E2E3; Tue, 15 Jun 2021 12:35:22 +0000 (UTC) IronPort-SDR: PHKsVc0H80ADA/jvX5KjlBHi1LogSAcZQF04iNRgjBWmYxSwfQOoceLLz8Yb4OwuiLQL07kJ2U CQs+HhHUM7cA== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="269829221" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="269829221" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2021 05:35:20 -0700 IronPort-SDR: 0ppNb/nI+vahgTzDi26pSb+IbJ3yS7yB3SPGF0rePm3iTDY3yYmeExgvzccD5a/9bj+GPPyFaq kMtiX7DKorbQ== X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="484455237" Received: from aperelma-mobl.ger.corp.intel.com (HELO [10.252.37.64]) ([10.252.37.64]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2021 05:35:18 -0700 Subject: Re: [PATCH] drm/i915/ttm: Fix memory leaks To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210615122408.32347-1-thomas.hellstrom@linux.intel.com> From: Maarten Lankhorst Message-ID: <222f7ebd-d746-f6b9-3524-f3195a95e3aa@linux.intel.com> Date: Tue, 15 Jun 2021 14:35:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210615122408.32347-1-thomas.hellstrom@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US 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: matthew.auld@intel.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Op 15-06-2021 om 14:24 schreef Thomas Hellström: > Fix two memory leaks introduced with the ttm backend. > > Fixes: 213d50927763 ("drm/i915/ttm: Introduce a TTM i915 gem object backend") > Signed-off-by: Thomas Hellström > --- > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > index 08b72c280cb5..8059cb61bc3c 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > @@ -122,6 +122,7 @@ static void i915_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) > struct i915_ttm_tt *i915_tt = container_of(ttm, typeof(*i915_tt), ttm); > > ttm_tt_destroy_common(bdev, ttm); > + ttm_tt_fini(ttm); > kfree(i915_tt); > } > > @@ -217,6 +218,7 @@ static void i915_ttm_delete_mem_notify(struct ttm_buffer_object *bo) > > if (likely(obj)) { > /* This releases all gem object bindings to the backend. */ > + i915_ttm_free_cached_io_st(obj); > __i915_gem_free_object(obj); > } > } Reviewed-by: Maarten Lankhorst 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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 947D4C48BE5 for ; Tue, 15 Jun 2021 12:35:28 +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 5BB5961461 for ; Tue, 15 Jun 2021 12:35:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5BB5961461 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 54CAB6E2ED; Tue, 15 Jun 2021 12:35:24 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id C05366E2E3; Tue, 15 Jun 2021 12:35:22 +0000 (UTC) IronPort-SDR: PHKsVc0H80ADA/jvX5KjlBHi1LogSAcZQF04iNRgjBWmYxSwfQOoceLLz8Yb4OwuiLQL07kJ2U CQs+HhHUM7cA== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="269829221" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="269829221" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2021 05:35:20 -0700 IronPort-SDR: 0ppNb/nI+vahgTzDi26pSb+IbJ3yS7yB3SPGF0rePm3iTDY3yYmeExgvzccD5a/9bj+GPPyFaq kMtiX7DKorbQ== X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="484455237" Received: from aperelma-mobl.ger.corp.intel.com (HELO [10.252.37.64]) ([10.252.37.64]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2021 05:35:18 -0700 To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210615122408.32347-1-thomas.hellstrom@linux.intel.com> From: Maarten Lankhorst Message-ID: <222f7ebd-d746-f6b9-3524-f3195a95e3aa@linux.intel.com> Date: Tue, 15 Jun 2021 14:35:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210615122408.32347-1-thomas.hellstrom@linux.intel.com> Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH] drm/i915/ttm: Fix memory leaks X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.auld@intel.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" T3AgMTUtMDYtMjAyMSBvbSAxNDoyNCBzY2hyZWVmIFRob21hcyBIZWxsc3Ryw7ZtOgo+IEZpeCB0 d28gbWVtb3J5IGxlYWtzIGludHJvZHVjZWQgd2l0aCB0aGUgdHRtIGJhY2tlbmQuCj4KPiBGaXhl czogMjEzZDUwOTI3NzYzICgiZHJtL2k5MTUvdHRtOiBJbnRyb2R1Y2UgYSBUVE0gaTkxNSBnZW0g b2JqZWN0IGJhY2tlbmQiKQo+IFNpZ25lZC1vZmYtYnk6IFRob21hcyBIZWxsc3Ryw7ZtIDx0aG9t YXMuaGVsbHN0cm9tQGxpbnV4LmludGVsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvZ2VtL2k5MTVfZ2VtX3R0bS5jIHwgMiArKwo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRp b25zKCspCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2Vt X3R0bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX3R0bS5jCj4gaW5kZXgg MDhiNzJjMjgwY2I1Li44MDU5Y2I2MWJjM2MgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvZ2VtL2k5MTVfZ2VtX3R0bS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2Vt L2k5MTVfZ2VtX3R0bS5jCj4gQEAgLTEyMiw2ICsxMjIsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3R0 bV90dF9kZXN0cm95KHN0cnVjdCB0dG1fZGV2aWNlICpiZGV2LCBzdHJ1Y3QgdHRtX3R0ICp0dG0p Cj4gIAlzdHJ1Y3QgaTkxNV90dG1fdHQgKmk5MTVfdHQgPSBjb250YWluZXJfb2YodHRtLCB0eXBl b2YoKmk5MTVfdHQpLCB0dG0pOwo+ICAKPiAgCXR0bV90dF9kZXN0cm95X2NvbW1vbihiZGV2LCB0 dG0pOwo+ICsJdHRtX3R0X2ZpbmkodHRtKTsKPiAgCWtmcmVlKGk5MTVfdHQpOwo+ICB9Cj4gIAo+ IEBAIC0yMTcsNiArMjE4LDcgQEAgc3RhdGljIHZvaWQgaTkxNV90dG1fZGVsZXRlX21lbV9ub3Rp Znkoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibykKPiAgCj4gIAlpZiAobGlrZWx5KG9iaikp IHsKPiAgCQkvKiBUaGlzIHJlbGVhc2VzIGFsbCBnZW0gb2JqZWN0IGJpbmRpbmdzIHRvIHRoZSBi YWNrZW5kLiAqLwo+ICsJCWk5MTVfdHRtX2ZyZWVfY2FjaGVkX2lvX3N0KG9iaik7Cj4gIAkJX19p OTE1X2dlbV9mcmVlX29iamVjdChvYmopOwo+ICAJfQo+ICB9CgpSZXZpZXdlZC1ieTogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=