From patchwork Mon Sep 2 07:48:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13786854 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 0FF2BCD3427 for ; Mon, 2 Sep 2024 07:28:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F60710E20A; Mon, 2 Sep 2024 07:28:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="PtXqko5T"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 16AEE10E209; Mon, 2 Sep 2024 07:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725262102; x=1756798102; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XV2spn+7q3CoqC5pi9lK1DJomCtje/1fM12P8EVUuG8=; b=PtXqko5TViG0nbX2PqC453ou7pT3Dccjvcw+C7VjqgVHH9EJhPYINTqa 36SyUkJyE0njawKCAYQlQOT7RXTq8jm6etwNWT3Igbw4m6gnoyAv6xfXs V7MoNPwkIQNosdUC52lHT8sX+Qeu1+rMrZF0RfdhmN27xkNEstpTDpExA ofJqVvVtvI09Cj4ugWKXz2iMZc5IM7m/NK1+KIGWdF/J9daoGAB2JqwAH JeSU1Fr7utcQmuy7iGR5DIcSNuFb+tTXeSmfLy73cIHnwR3olfc60SMez M8yvVg3M3FDnyx4/8s9MLJDVfrGbfualHjew79/LlQkDO0L12n2yR4yGS A==; X-CSE-ConnectionGUID: e3OlRwiARaC6HLnSs4Ekmw== X-CSE-MsgGUID: HzZ40DfMT4+kMWqJcPyaHw== X-IronPort-AV: E=McAfee;i="6700,10204,11182"; a="23990632" X-IronPort-AV: E=Sophos;i="6.10,195,1719903600"; d="scan'208";a="23990632" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2024 00:28:22 -0700 X-CSE-ConnectionGUID: FHTAz+aJQYyWYKbzd9rydg== X-CSE-MsgGUID: 3Sl6ipUMSjunDPPp35Mtaw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,195,1719903600"; d="scan'208";a="68922595" Received: from jraag-nuc8i7beh.iind.intel.com ([10.145.169.79]) by fmviesa005.fm.intel.com with ESMTP; 02 Sep 2024 00:28:17 -0700 From: Raag Jadav To: airlied@gmail.com, daniel@ffwll.ch, lucas.demarchi@intel.com, thomas.hellstrom@linux.intel.com, rodrigo.vivi@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, tursulin@ursulin.net Cc: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, himal.prasad.ghimiray@intel.com, francois.dugast@intel.com, aravind.iddamsetty@linux.intel.com, anshuman.gupta@intel.com, bellekallu.rajkiran@intel.com, saikishore.konda@intel.com, Raag Jadav Subject: [PATCH v3 1/3] drm: Introduce device wedged event Date: Mon, 2 Sep 2024 13:18:57 +0530 Message-Id: <20240902074859.2992849-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240902074859.2992849-1-raag.jadav@intel.com> References: <20240902074859.2992849-1-raag.jadav@intel.com> MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Introduce device wedged event, which will notify userspace of wedged (hanged/unusable) state of the DRM device through a uevent. This is useful especially in cases where the device is in unrecoverable state and requires userspace intervention for recovery. Purpose of this implementation is to be vendor agnostic. Userspace consumers (sysadmin) can define udev rules to parse this event and take respective action to recover the device. Consumer expectations: ---------------------- 1) Unbind driver 2) Reset bus device 3) Re-bind driver Signed-off-by: Raag Jadav --- drivers/gpu/drm/drm_drv.c | 21 +++++++++++++++++++++ include/drm/drm_drv.h | 1 + 2 files changed, 22 insertions(+) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 93543071a500..dc55cc237d89 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -499,6 +499,27 @@ void drm_dev_unplug(struct drm_device *dev) } EXPORT_SYMBOL(drm_dev_unplug); +/** + * drm_dev_wedged - declare DRM device as wedged + * @dev: DRM device + * + * This declares a DRM device specified by @dev as wedged (hanged/unusable) + * and generates a uevent for it, on the basis of which, userspace may take + * respective action to recover the device. + * Currently we only set WEDGED=1 in the uevent environment, but this can + * be expanded in the future. + */ +void drm_dev_wedged(struct drm_device *dev) +{ + char *event_string = "WEDGED=1"; + char *envp[] = { event_string, NULL }; + + DRM_INFO("%s: device wedged, generating uevent\n", dev_name(dev->dev)); + + kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); +} +EXPORT_SYMBOL(drm_dev_wedged); + /* * DRM internal mount * We want to be able to allocate our own "struct address_space" to control diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index cd37936c3926..a0b2d1435b86 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -489,6 +489,7 @@ void drm_put_dev(struct drm_device *dev); bool drm_dev_enter(struct drm_device *dev, int *idx); void drm_dev_exit(int idx); void drm_dev_unplug(struct drm_device *dev); +void drm_dev_wedged(struct drm_device *dev); /** * drm_dev_is_unplugged - is a DRM device unplugged From patchwork Mon Sep 2 07:48:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13786855 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 02ECECA0ED3 for ; Mon, 2 Sep 2024 07:28:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F40510E20F; Mon, 2 Sep 2024 07:28:29 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Bvq28MGQ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8FAF910E20D; Mon, 2 Sep 2024 07:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725262108; x=1756798108; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+wO5HqrbLFYT+X9rzVWpbEm/Nyw/BPAJBa5eyV2vJLQ=; b=Bvq28MGQNIC2noiJMfd38VoZNYZEu3DU/sjDtAvCsszcttGtE61eMzY3 yrd7gyLC9G5Oh8XuVHqco1v0W2+57sDT7RY9NsBOvdQUP/TOnZz0yh7bO dzHGILDX3pfty48NxMxdekBjucAa8cxGd2w5caatj/e72rq7UmZRjagSH lYm3EvexvXcr4dm+JyFSAU/A0s8u1JVKc2W5A6DtwyIW7p5+eAtiwyCnJ HhJ2IllW7vWhlJ+dEszAkMjt50qFNQ4V0LGEk5ZxvdhVuobS5R0lBI749 uq4ahnB2wzQvC5TARr3aVxki81ccVqs/cGgUfw2XeoYfaq4AgyTMz6n5i w==; X-CSE-ConnectionGUID: 9TKb0PtSQ3Sj9Bog4wf8Wg== X-CSE-MsgGUID: v0jHiqW1TeKxJgkGkmj34Q== X-IronPort-AV: E=McAfee;i="6700,10204,11182"; a="23990659" X-IronPort-AV: E=Sophos;i="6.10,195,1719903600"; d="scan'208";a="23990659" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2024 00:28:27 -0700 X-CSE-ConnectionGUID: DwCcCb5OQbq7w1pH2smtTA== X-CSE-MsgGUID: sggyGL2pSySF2gmVVPawFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,195,1719903600"; d="scan'208";a="68922603" Received: from jraag-nuc8i7beh.iind.intel.com ([10.145.169.79]) by fmviesa005.fm.intel.com with ESMTP; 02 Sep 2024 00:28:22 -0700 From: Raag Jadav To: airlied@gmail.com, daniel@ffwll.ch, lucas.demarchi@intel.com, thomas.hellstrom@linux.intel.com, rodrigo.vivi@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, tursulin@ursulin.net Cc: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, himal.prasad.ghimiray@intel.com, francois.dugast@intel.com, aravind.iddamsetty@linux.intel.com, anshuman.gupta@intel.com, bellekallu.rajkiran@intel.com, saikishore.konda@intel.com, Raag Jadav Subject: [PATCH v3 2/3] drm/xe: Use device wedged event Date: Mon, 2 Sep 2024 13:18:58 +0530 Message-Id: <20240902074859.2992849-3-raag.jadav@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240902074859.2992849-1-raag.jadav@intel.com> References: <20240902074859.2992849-1-raag.jadav@intel.com> MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Himal Prasad Ghimiray This was previously attempted as xe specific reset uevent but dropped in commit 77a0d4d1cea2 ("drm/xe/uapi: Remove reset uevent for now") as part of refactoring. Now that we have device wedged event supported by DRM core, make use of it. With this in place userspace will be notified of wedged device, on the basis of which, userspace may take respective action to recover the device. $ udevadm monitor --property --kernel monitor will print the received events for: KERNEL - the kernel uevent KERNEL[307.420340] change /devices/pci0000:00/0000:00:01.0/0000:01:00.0/0000:02:01.0/0000:03:00.0/drm/card0 (drm) ACTION=change DEVPATH=/devices/pci0000:00/0000:00:01.0/0000:01:00.0/0000:02:01.0/0000:03:00.0/drm/card0 SUBSYSTEM=drm WEDGED=1 DEVNAME=/dev/dri/card0 DEVTYPE=drm_minor SEQNUM=5106 MAJOR=226 MINOR=0 Signed-off-by: Himal Prasad Ghimiray Co-developed-by: Raag Jadav Signed-off-by: Raag Jadav --- drivers/gpu/drm/xe/xe_device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 1a0d7fdd094b..82b1583ada30 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -959,11 +959,12 @@ static void xe_device_wedged_fini(struct drm_device *drm, void *arg) * xe_device_declare_wedged - Declare device wedged * @xe: xe device instance * - * This is a final state that can only be cleared with a mudule + * This is a final state that can only be cleared with a module * re-probe (unbind + bind). * In this state every IOCTL will be blocked so the GT cannot be used. * In general it will be called upon any critical error such as gt reset - * failure or guc loading failure. + * failure or guc loading failure. Userspace will be notified of this state + * by a DRM uevent. * If xe.wedged module parameter is set to 2, this function will be called * on every single execution timeout (a.k.a. GPU hang) right after devcoredump * snapshot capture. In this mode, GT reset won't be attempted so the state of @@ -993,6 +994,9 @@ void xe_device_declare_wedged(struct xe_device *xe) "IOCTLs and executions are blocked. Only a rebind may clear the failure\n" "Please file a _new_ bug report at https://gitlab.freedesktop.org/drm/xe/kernel/issues/new\n", dev_name(xe->drm.dev)); + + /* Notify userspace of wedged device */ + drm_dev_wedged(&xe->drm); } for_each_gt(gt, xe, id) From patchwork Mon Sep 2 07:48:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13786856 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 58BC6CA0ED3 for ; Mon, 2 Sep 2024 07:28:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 849CE10E211; Mon, 2 Sep 2024 07:28:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ZIaThZOS"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 20DB710E210; Mon, 2 Sep 2024 07:28: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=1725262112; x=1756798112; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sbihx63rRH8gdcp/5yltnhaUOeB9DCjFMU5dJ0lMfjE=; b=ZIaThZOSNj0jv2Wc70i+yT2SX9IgjNa+ZZFnAurG+VYxQ4fURNxCNEKZ KPBR9y52ZrCWIVB1zV6g1qNqVA2l8NnWULVTD3M6V6dqY2og9tocp0pJs SiRifx/Lvo0/Dn1qwET5lYWkRAM5c2tCUKQi+NsB3wHQvlI+Fwn9lqlKx 89kyEN5vzlR+aipBS50NxapRE3mo/XFXOLk2NlHnsV88BtDl0PgXH9l5w jQD+W3PgjteZiknMFlt5DZbsdIsLPRuF19Gy/tzMB3RQgEUynW8iwGMZK ZOodA6tJF+YkLo+n0KuRlogthsDYxgM7IsFT9HpkTKCxipUokkFR7pa3G w==; X-CSE-ConnectionGUID: 5oE1r1LMQTKDnaq6iKL2QA== X-CSE-MsgGUID: azR6yMElRnqNwUmoUoYiMg== X-IronPort-AV: E=McAfee;i="6700,10204,11182"; a="23990680" X-IronPort-AV: E=Sophos;i="6.10,195,1719903600"; d="scan'208";a="23990680" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2024 00:28:32 -0700 X-CSE-ConnectionGUID: 6lbmkXkGQhCMTQwEgu8Gjw== X-CSE-MsgGUID: 69YR4mQrQ32Bp3j6LhUgWQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,195,1719903600"; d="scan'208";a="68922607" Received: from jraag-nuc8i7beh.iind.intel.com ([10.145.169.79]) by fmviesa005.fm.intel.com with ESMTP; 02 Sep 2024 00:28:27 -0700 From: Raag Jadav To: airlied@gmail.com, daniel@ffwll.ch, lucas.demarchi@intel.com, thomas.hellstrom@linux.intel.com, rodrigo.vivi@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, tursulin@ursulin.net Cc: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, himal.prasad.ghimiray@intel.com, francois.dugast@intel.com, aravind.iddamsetty@linux.intel.com, anshuman.gupta@intel.com, bellekallu.rajkiran@intel.com, saikishore.konda@intel.com, Raag Jadav Subject: [PATCH v3 3/3] drm/i915: Use device wedged event Date: Mon, 2 Sep 2024 13:18:59 +0530 Message-Id: <20240902074859.2992849-4-raag.jadav@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240902074859.2992849-1-raag.jadav@intel.com> References: <20240902074859.2992849-1-raag.jadav@intel.com> MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Now that we have device wedged event supported by DRM core, make use of it. With this in place, userspace will be notified of wedged device on gt reset failure. Signed-off-by: Raag Jadav --- drivers/gpu/drm/i915/gt/intel_reset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 735cd23a43c6..60d09ec536c4 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -1409,6 +1409,8 @@ static void intel_gt_reset_global(struct intel_gt *gt, if (!test_bit(I915_WEDGED, >->reset.flags)) kobject_uevent_env(kobj, KOBJ_CHANGE, reset_done_event); + else + drm_dev_wedged(>->i915->drm); } /**