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 B4D48C07548 for ; Wed, 15 Nov 2023 11:12:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3644C10E541; Wed, 15 Nov 2023 11:12:10 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C31310E541 for ; Wed, 15 Nov 2023 11:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700046728; x=1731582728; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=E1l9QSsu+7X7yPpARUCTUK1VadqqKuDHANUCFWAGw1E=; b=ax6pyolUst8TLfvt4taLOavK7gfzbNle1NJAlVB6ztiZokINxsFQcXm/ CPZHEEKyVbtpUt/suG/msygfFP6TL97ogIWzdpPBisCZpPjU3CeqqEqAn EEkrSfViEj6Pb6fh1BKtCpmrLc8Y9SBvUG3ac7r0ZZhEUhy8q5oIW1SGk nH+AOn747AJnHs0+p1ObM4xfGukjDNkvrS59sr6T/PWfTjJnt4OOe48tC m9HqhVm2zRkK8MYCT74UGAXzF/+ZYpcqXr2UP+qCguEGnAXm1Qr3nZNcB SqYdKeBdqwM1Loarvek0PUeoEG5Pfqg4V7ToczrA3kwQi8yO3yjhdtvNy A==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="381252041" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="381252041" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 03:12:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="908739396" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="908739396" Received: from jcornall-mobl3.ger.corp.intel.com (HELO [10.213.211.209]) ([10.213.211.209]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 03:12:06 -0800 Message-ID: <1ef9ca05-3fb0-4db1-bcee-06028cc5ab59@linux.intel.com> Date: Wed, 15 Nov 2023 11:12:04 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Andrzej Hajda , intel-gfx@lists.freedesktop.org References: <20231115-dont_clean_gt_on_error_path-v2-1-54250125470a@intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: <20231115-dont_clean_gt_on_error_path-v2-1-54250125470a@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: do not clean GT table on error path 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 , Tvrtko Ursulin Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 15/11/2023 10:54, Andrzej Hajda wrote: > The only task of intel_gt_release_all is to zero gt table. Calling > it on error path prevents intel_gt_driver_late_release_all (called from > i915_driver_late_release) to cleanup GTs, causing leakage. > After i915_driver_late_release GT array is not used anymore so > it does not need cleaning at all. > > Sample leak report: > > BUG i915_request (...): Objects remaining in i915_request on __kmem_cache_shutdown() > ... > Object 0xffff888113420040 @offset=64 > Allocated in __i915_request_create+0x75/0x610 [i915] age=18339 cpu=1 pid=1454 > kmem_cache_alloc+0x25b/0x270 > __i915_request_create+0x75/0x610 [i915] > i915_request_create+0x109/0x290 [i915] > __engines_record_defaults+0xca/0x440 [i915] > intel_gt_init+0x275/0x430 [i915] > i915_gem_init+0x135/0x2c0 [i915] > i915_driver_probe+0x8d1/0xdc0 [i915] > > v2: removed whole intel_gt_release_all > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8489 > Fixes: bec68cc9ea42d8 ("drm/i915: Prepare for multiple GTs") > Signed-off-by: Andrzej Hajda > --- > - Link to v1: https://lore.kernel.org/r/20231114-dont_clean_gt_on_error_path-v1-1-37f2fa827fd2@intel.com > --- > drivers/gpu/drm/i915/gt/intel_gt.c | 11 ----------- > drivers/gpu/drm/i915/i915_driver.c | 4 +--- > 2 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c > index ed32bf5b15464e..ba1186fc524f84 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c > @@ -982,8 +982,6 @@ int intel_gt_probe_all(struct drm_i915_private *i915) > > err: > i915_probe_error(i915, "Failed to initialize %s! (%d)\n", gtdef->name, ret); > - intel_gt_release_all(i915); > - > return ret; > } > > @@ -1002,15 +1000,6 @@ int intel_gt_tiles_init(struct drm_i915_private *i915) > return 0; > } > > -void intel_gt_release_all(struct drm_i915_private *i915) > -{ > - struct intel_gt *gt; > - unsigned int id; > - > - for_each_gt(gt, i915, id) > - i915->gt[id] = NULL; > -} > - > void intel_gt_info_print(const struct intel_gt_info *info, > struct drm_printer *p) > { > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index 01fd25b622d16c..2a1faf4039659c 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -776,7 +776,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > > ret = i915_driver_mmio_probe(i915); > if (ret < 0) > - goto out_tiles_cleanup; > + goto out_runtime_pm_put; > > ret = i915_driver_hw_probe(i915); > if (ret < 0) > @@ -836,8 +836,6 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > i915_ggtt_driver_late_release(i915); > out_cleanup_mmio: > i915_driver_mmio_release(i915); > -out_tiles_cleanup: > - intel_gt_release_all(i915); > out_runtime_pm_put: > enable_rpm_wakeref_asserts(&i915->runtime_pm); > i915_driver_late_release(i915); > > --- > base-commit: 1489bab52c281a869295414031a56506a375b036 > change-id: 20231114-dont_clean_gt_on_error_path-91cd9c3caa0a Looks okay. Reviewed-by: Tvrtko Ursulin Although on the overall driver init/exit in general again started feeling a bit messy. Seems like it would need an overhaul every few years to keep tidy and logical but meh. Regards, Tvrtko