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 C1886C32774 for ; Tue, 23 Aug 2022 09:12:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E7680B1DA3; Tue, 23 Aug 2022 09:11:51 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E957CB1A42; Tue, 23 Aug 2022 09:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661245895; x=1692781895; h=date:from:to:cc:subject:message-id:reply-to:references: mime-version:in-reply-to; bh=y6ubK7hMGpNlm54mKiwGKa2Cttke5Tinx3OLpzRac4c=; b=XYmyl9y704HQFLoZ87pJr9Fqk5bLMz48nkmnL5zJsXIUgrnTAXTZDRDQ +8VGY+O/RYE/042g20Jfh1mvwelet4BjfoQ/414B+3ez/JCklav5OaRGB RVpraMTpTdZ/mNv5T991I1Fxzv/wy6QeVaM+CjVayjdqySovO0abAM11l QIcHKtFL7IjGVRjYbYwR0dd/8jD2bhkLis64NkJw97PwTwDXsahg68Ypi Ra7Q4+3sv435yBBzGHju91eqmqafm30aNUeViX67uvdZD0LP3xdGJ0n0Q 4zJkMwrh7M2p+4fy6B1A6Y1Rk2lAkxanLZzzts+pRemhg5+BdkUGo18Qj Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10447"; a="357614890" X-IronPort-AV: E=Sophos;i="5.93,257,1654585200"; d="scan'208";a="357614890" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2022 02:11:33 -0700 X-IronPort-AV: E=Sophos;i="5.93,257,1654585200"; d="scan'208";a="560090812" Received: from ideak-desk.fi.intel.com ([10.237.72.175]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2022 02:11:31 -0700 Date: Tue, 23 Aug 2022 12:10:57 +0300 From: Imre Deak To: Jani Nikula Message-ID: References: <20220722125143.1604709-1-andrzej.hajda@intel.com> <20220722125143.1604709-2-andrzej.hajda@intel.com> <87czcrmmot.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87czcrmmot.fsf@intel.com> Subject: Re: [Intel-gfx] [PATCH v6 1/4] drm/i915/hpd: postpone HPD cancel work after last user suspension 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: , Reply-To: imre.deak@intel.com Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Andrzej Hajda , Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Aug 23, 2022 at 10:41:22AM +0300, Jani Nikula wrote: > On Mon, 22 Aug 2022, Imre Deak wrote: > > On Fri, Jul 22, 2022 at 02:51:40PM +0200, Andrzej Hajda wrote: > >> i915->hotplug.dig_port_work can be queued from intel_hpd_irq_handler > >> called by IRQ handler or by intel_hpd_trigger_irq called from dp_mst. > >> Since dp_mst is suspended after irq handler uninstall, a cleaner approach > >> is to cancel hpd work after intel_dp_mst_suspend, otherwise we risk > >> use-after-free. > >> > >> It should fix following WARNINGS: > >> [283.405824] cpu_latency_qos_update_request called for unknown object > >> [283.405866] WARNING: CPU: 2 PID: 240 at kernel/power/qos.c:296 cpu_latency_qos_update_request+0x2d/0x100 > >> [283.405912] CPU: 2 PID: 240 Comm: kworker/u64:9 Not tainted 5.18.0-rc6-Patchwork_103738v3-g1672d1c43e43+ #1 > >> [283.405915] Hardware name: Intel Corporation Raptor Lake Client Platform/RPL-S ADP-S DDR5 UDIMM CRB, BIOS RPLSFWI1.R00.2397.A01.2109300731 09/30/2021 > >> [283.405916] Workqueue: i915-dp i915_digport_work_func [i915] > >> [283.406020] RIP: 0010:cpu_latency_qos_update_request+0x2d/0x100 > >> ... > >> [283.406040] Call Trace: > >> [283.406041] > >> [283.406044] intel_dp_aux_xfer+0x60e/0x8e0 [i915] > >> [283.406131] ? finish_swait+0x80/0x80 > >> [283.406139] intel_dp_aux_transfer+0xc5/0x2b0 [i915] > >> [283.406218] drm_dp_dpcd_access+0x79/0x130 [drm_display_helper] > >> [283.406227] drm_dp_dpcd_read+0xe2/0xf0 [drm_display_helper] > >> [283.406233] intel_dp_hpd_pulse+0x134/0x570 [i915] > >> [283.406308] ? __down_killable+0x70/0x140 > >> [283.406313] i915_digport_work_func+0xba/0x150 [i915] > >> > >> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/4586 > >> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5558 > >> Signed-off-by: Andrzej Hajda > >> Reviewed-by: Arun R Murthy > >> --- > >> drivers/gpu/drm/i915/display/intel_display.c | 3 +++ > >> drivers/gpu/drm/i915/i915_irq.c | 1 - > >> 2 files changed, 3 insertions(+), 1 deletion(-) > >> > >> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > >> index a0f84cbe974fc3..f1c765ac7ab8aa 100644 > >> --- a/drivers/gpu/drm/i915/display/intel_display.c > >> +++ b/drivers/gpu/drm/i915/display/intel_display.c > >> @@ -9021,6 +9021,9 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915) > >> */ > >> intel_dp_mst_suspend(i915); > >> > >> + /* MST is the last user of HPD work */ > >> + intel_hpd_cancel_work(i915); > >> + > > > > MST still requires AUX and short HPD interrupts and during shutdown and > > suspend the order is suspend-MST -> disable-IRQs. So I think it makes > > more sense to move intel_dp_mst_suspend() to i915_driver_remove() before > > intel_irq_uninstall(). > > The high level i915_driver_remove() code should only call high level > display functions, not something like intel_dp_mst_suspend() directly. Ok, calling it at the end of intel_modeset_driver_remove() should be still ok. > BR, > Jani. > > > > >> /* poll work can call into fbdev, hence clean that up afterwards */ > >> intel_fbdev_fini(i915); > >> > >> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > >> index 73cebc6aa65072..db14787aef95dd 100644 > >> --- a/drivers/gpu/drm/i915/i915_irq.c > >> +++ b/drivers/gpu/drm/i915/i915_irq.c > >> @@ -4597,7 +4597,6 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv) > >> > >> free_irq(irq, dev_priv); > >> > >> - intel_hpd_cancel_work(dev_priv); > >> dev_priv->runtime_pm.irqs_enabled = false; > >> } > >> > >> -- > >> 2.25.1 > >> > > -- > Jani Nikula, Intel Open Source Graphics Center