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 7DB3FC54E58 for ; Tue, 12 Mar 2024 16:25:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0591610FDD7; Tue, 12 Mar 2024 16:25:17 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ee86q56V"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9740410F439; Tue, 12 Mar 2024 16:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710260715; x=1741796715; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=+MPXvyYNJYib1bQ1dRQ22YOCsLt/rHnd/cQVcx71UAA=; b=ee86q56VVRKKI16hjJFBEetzG5nxtC62MBhhMCe0TgbwUHCeQ50E26jR M9xjk3oZJlMWWsbOynrTqfuCU1zMQWQuRCPbBGA31WUBgg6QsNx6X1unX H/tPEpI5R+92M5VRDd0O+sHAJijTmrNSQSThZ0IQFX0JmUktJPdu1qHr7 QkfFJwv4Vinxgf8oGY8dEupfr83U6GNkteZymgEQKusaVJgG0HZzWEsWa HzlS8AcJUlWMspXw0kWRLY4m3dnLcAYHaE4QKWLuRbxtH94QndFI+8nfJ twbPUNuZdX+5nhiJno7jBb1y97x2DtmZpJw3C7KBRFfgnYfgkbbISEJ/r A==; X-IronPort-AV: E=McAfee;i="6600,9927,11011"; a="22500685" X-IronPort-AV: E=Sophos;i="6.07,119,1708416000"; d="scan'208";a="22500685" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2024 09:25:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,119,1708416000"; d="scan'208";a="16240920" Received: from orsosgc001.jf.intel.com (HELO unerlige-ril.intel.com) ([10.165.21.138]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2024 09:25:15 -0700 Date: Tue, 12 Mar 2024 09:25:14 -0700 Message-ID: <85zfv35set.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Janusz Krzysztofik Cc: , , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Anshuman Gupta , "Badal\ Nilawar" , Guenter Roeck , "Dale\ B Stimson" , Andi Shyti , Jonathan Cavitt , Nirmoy Das Subject: Re: [PATCH v2] drm/i915/hwmon: Fix locking inversion in sysfs getter In-Reply-To: <20240311203500.518675-2-janusz.krzysztofik@linux.intel.com> References: <20240311203500.518675-2-janusz.krzysztofik@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (x86_64-redhat-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII 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" On Mon, 11 Mar 2024 13:34:58 -0700, Janusz Krzysztofik wrote: > > In i915 hwmon sysfs getter path we now take a hwmon_lock, then acquire an > rpm wakeref. That results in lock inversion: > > <4> [197.079335] ====================================================== > <4> [197.085473] WARNING: possible circular locking dependency detected > <4> [197.091611] 6.8.0-rc7-Patchwork_129026v7-gc4dc92fb1152+ #1 Not tainted > <4> [197.098096] ------------------------------------------------------ > <4> [197.104231] prometheus-node/839 is trying to acquire lock: > <4> [197.109680] ffffffff82764d80 (fs_reclaim){+.+.}-{0:0}, at: __kmalloc+0x9a/0x350 > <4> [197.116939] > but task is already holding lock: > <4> [197.122730] ffff88811b772a40 (&hwmon->hwmon_lock){+.+.}-{3:3}, at: hwm_energy+0x4b/0x100 [i915] > <4> [197.131543] > which lock already depends on the new lock. > ... > <4> [197.507922] Chain exists of: > fs_reclaim --> >->reset.mutex --> &hwmon->hwmon_lock > <4> [197.518528] Possible unsafe locking scenario: > <4> [197.524411] CPU0 CPU1 > <4> [197.528916] ---- ---- > <4> [197.533418] lock(&hwmon->hwmon_lock); > <4> [197.537237] lock(>->reset.mutex); > <4> [197.543376] lock(&hwmon->hwmon_lock); > <4> [197.549682] lock(fs_reclaim); > ... > <4> [197.632548] Call Trace: > <4> [197.634990] > <4> [197.637088] dump_stack_lvl+0x64/0xb0 > <4> [197.640738] check_noncircular+0x15e/0x180 > <4> [197.652968] check_prev_add+0xe9/0xce0 > <4> [197.656705] __lock_acquire+0x179f/0x2300 > <4> [197.660694] lock_acquire+0xd8/0x2d0 > <4> [197.673009] fs_reclaim_acquire+0xa1/0xd0 > <4> [197.680478] __kmalloc+0x9a/0x350 > <4> [197.689063] acpi_ns_internalize_name.part.0+0x4a/0xb0 > <4> [197.694170] acpi_ns_get_node_unlocked+0x60/0xf0 > <4> [197.720608] acpi_ns_get_node+0x3b/0x60 > <4> [197.724428] acpi_get_handle+0x57/0xb0 > <4> [197.728164] acpi_has_method+0x20/0x50 > <4> [197.731896] acpi_pci_set_power_state+0x43/0x120 > <4> [197.736485] pci_power_up+0x24/0x1c0 > <4> [197.740047] pci_pm_default_resume_early+0x9/0x30 > <4> [197.744725] pci_pm_runtime_resume+0x2d/0x90 > <4> [197.753911] __rpm_callback+0x3c/0x110 > <4> [197.762586] rpm_callback+0x58/0x70 > <4> [197.766064] rpm_resume+0x51e/0x730 > <4> [197.769542] rpm_resume+0x267/0x730 > <4> [197.773020] rpm_resume+0x267/0x730 > <4> [197.776498] rpm_resume+0x267/0x730 > <4> [197.779974] __pm_runtime_resume+0x49/0x90 > <4> [197.784055] __intel_runtime_pm_get+0x19/0xa0 [i915] > <4> [197.789070] hwm_energy+0x55/0x100 [i915] > <4> [197.793183] hwm_read+0x9a/0x310 [i915] > <4> [197.797124] hwmon_attr_show+0x36/0x120 > <4> [197.800946] dev_attr_show+0x15/0x60 > <4> [197.804509] sysfs_kf_seq_show+0xb5/0x100 > > Acquire the wakeref before the lock and hold it as long as the lock is > also held. Follow that pattern across the whole source file where similar > lock inversion can happen. > > v2: Keep hardware read under the lock so the whole operation of updating > energy from hardware is still atomic (Guenter), > - instead, acquire the rpm wakeref before the lock and hold it as long > as the lock is held, > - use the same aproach for other similar places across the i915_hwmon.c > source file (Rodrigo). > > Fixes: c41b8bdcc297 ("drm/i915/hwmon: Show device level energy usage") I would think that the lock inversion issue was introduced here: 1b44019a93e2 ("drm/i915/guc: Disable PL1 power limit when loading GuC firmware") This is the commit which introduced this sequence: lock(>->reset.mutex); lock(&hwmon->hwmon_lock); Before this, everything was fine. So perhaps the Fixes tag should reference this commit? Otherwise the patch LGTM: Reviewed-by: Ashutosh Dixit