From patchwork Fri Mar 14 20:38:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 14017410 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 4D088C28B2F for ; Fri, 14 Mar 2025 20:52:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3971110E25F; Fri, 14 Mar 2025 20:52:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="g5k/CoF7"; dkim-atps=neutral Received: from mgamail.intel.com (unknown [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2471410E266; Fri, 14 Mar 2025 20:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741985552; x=1773521552; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=euQ1uz41Dg9KJ2DaehE2ohgTznSqzybbxeicRNvhh8g=; b=g5k/CoF7pZS02+j4HTKNSEivpbdaAkdW4fYuEacNBadwid3DTvisJMlm IlMsNcalAmGOT646w+yGzth3jiuwN0oT++WKe6kf68LcPLxu7vAGpVhOv zaQExfBWpZ9lLopxLZ/16D7KDCs4KwbG4j93k3YQBauj8IS2jtgAOtGmv OMv3nyddUZgTOHjIr050x/3CVanjkBhGBSPCZG9BxaOW0KgPgBNk41HY+ UUzaYfzHl53OTD9k9MTxtQe6lkHcrsnk22F46MnWboPPDJkR7UQ65rAkP fqVzPrN1VhpmS0bbAxdGZpuFmiXaOMT9LDDK+2f80BR3jzg0/N6EFc0Ul Q==; X-CSE-ConnectionGUID: 5dnxziPGQ5+zz0DtNL6Iow== X-CSE-MsgGUID: 61JA2ClJSOGPGijSPsJDZw== X-IronPort-AV: E=McAfee;i="6700,10204,11373"; a="43284799" X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="43284799" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 13:52:28 -0700 X-CSE-ConnectionGUID: NDEca4VbQ3WLcspaAXUYOw== X-CSE-MsgGUID: mU7d1/gBS5adoJZnQZlF/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="121578447" Received: from jkrzyszt-mobl2.ger.corp.intel.com (HELO jkrzyszt-mobl2.intranet) ([10.245.246.206]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 13:52:25 -0700 From: Janusz Krzysztofik To: intel-gfx@lists.freedesktop.org, Jani Nikula , Andi Shyti Cc: dri-devel@lists.freedesktop.org, Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Chris Wilson , Lucas De Marchi , Alan Previn , Ashutosh Dixit , Daniele Ceraolo Spurio , Krzysztof Niemiec , Janusz Krzysztofik Subject: [PATCH v5 2/3] drm/i915: Fix PXP cleanup missing from probe error rewind Date: Fri, 14 Mar 2025 21:38:34 +0100 Message-ID: <20250314205202.809563-7-janusz.krzysztofik@linux.intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250314205202.809563-5-janusz.krzysztofik@linux.intel.com> References: <20250314205202.809563-5-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Commit f67986b0119c04 ("drm/i915/pxp: Promote pxp subsystem to top-level of i915") added PXP initialization to driver probe path, but didn't add a respective PXP cleanup on probe error. That lack of cleanup seems harmless as long as PXP is still unused and idle when a probe failure occurs and error rewind path is entered, but as soon as PXP starts consuming device and driver resources keeping them busy, kernel warnings may be triggered when cleaning up resources provided by memory regions, GGTT, GEM and/or VMA cache from the probe error rewind and/or module unload paths because of missing PXP cleanup. That scenario was observed on attempts to fail the probe and enter the rewind path on injection of now ignored error in device registration path. Fix it. Cc: Alan Previn Cc: Daniele Ceraolo Spurio Signed-off-by: Janusz Krzysztofik --- drivers/gpu/drm/i915/i915_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index e0dde7c0fa9c5..10d1d4f3c11c4 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -845,6 +845,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; out_cleanup_gem: + intel_pxp_fini(i915); i915_gem_suspend(i915); i915_gem_driver_remove(i915); i915_gem_driver_release(i915);