From patchwork Fri Sep 6 09:42:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13793801 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 D4658CE7AFB for ; Fri, 6 Sep 2024 09:43:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E7C6A10E9D5; Fri, 6 Sep 2024 09:43:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Kk7Mts3f"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1AC3110E9D3; Fri, 6 Sep 2024 09:43:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725615782; x=1757151782; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=67MkjNbsItLfB5eRBWR9KkJZ6hke9S0Mf9UKUTZEb9Y=; b=Kk7Mts3fy3yShwGqcaPYnsdVT8l7A1sFGCBZFCNCQjmI0uDcyuIc78zP wqfntqVVya17QUH8iL2OXo8jm1qn7PI2WGH5e7lgF+YOHzHrxX5ipkaxP ko7FZ76xL/SFM4D7O/MMlNW/hUAbMi63472VJpRppbPMBIrQ65ZHjSNol GnbgteXIv8uHY1OBdQQni+VPGA+7HCO4uvq4dqJdoZ1UUiQjXPDH3X45T xlf1+bl8Qq4X7SKy56v4T8QBhogvYdnAZgsKWjKpomJUCICBhy7u71OrR ndxOa2/aAQMyHJNsFYKByyNeHtqoNGjW/74fh6JNOmxRTD+85bgFhc93i g==; X-CSE-ConnectionGUID: 2zM3W1z/QlC3lWS0dW/bog== X-CSE-MsgGUID: iOupzCfIS9iI9gCw9W8eXQ== X-IronPort-AV: E=McAfee;i="6700,10204,11186"; a="34965490" X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="34965490" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2024 02:43:01 -0700 X-CSE-ConnectionGUID: rNUMqbvtSQK3eYHkxJ1B1Q== X-CSE-MsgGUID: GpcMPjwwRluRBa8Fuaw3ow== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="103377552" Received: from jraag-nuc8i7beh.iind.intel.com ([10.145.169.79]) by orviesa001.jf.intel.com with ESMTP; 06 Sep 2024 02:42:57 -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, Raag Jadav Subject: [PATCH v4 1/3] drm: Introduce device wedged event Date: Fri, 6 Sep 2024 15:12:23 +0530 Message-Id: <20240906094225.3082162-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240906094225.3082162-1-raag.jadav@intel.com> References: <20240906094225.3082162-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 v4: s/drm_dev_wedged/drm_dev_wedged_event Use drm_info() (Jani) Kernel doc adjustment (Aravind) Signed-off-by: Raag Jadav --- drivers/gpu/drm/drm_drv.c | 20 ++++++++++++++++++++ include/drm/drm_drv.h | 1 + 2 files changed, 21 insertions(+) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 93543071a500..cca5d8295eb7 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -499,6 +499,26 @@ void drm_dev_unplug(struct drm_device *dev) } EXPORT_SYMBOL(drm_dev_unplug); +/** + * drm_dev_wedged_event - generate a device wedged uevent + * @dev: DRM device + * + * This generates a device wedged uevent for the DRM device specified by @dev, + * 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_event(struct drm_device *dev) +{ + char *event_string = "WEDGED=1"; + char *envp[] = { event_string, NULL }; + + drm_info(dev, "device wedged, generating uevent\n"); + + kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); +} +EXPORT_SYMBOL(drm_dev_wedged_event); + /* * 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..eed5e54c74fd 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_event(struct drm_device *dev); /** * drm_dev_is_unplugged - is a DRM device unplugged From patchwork Fri Sep 6 09:42:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13793802 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 7035ACE7AFA for ; Fri, 6 Sep 2024 09:43:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E362610E9D7; Fri, 6 Sep 2024 09:43:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="e/a3Z1q2"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0294E10E9D6; Fri, 6 Sep 2024 09:43:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725615788; x=1757151788; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZoDYzFYkCfOvNoivmgreA9sJeEKgLI2XYiUtKHwuF8Y=; b=e/a3Z1q233iaeBzCiu8105AdmpREcWq3UzZJLcdBDvKkj10cmmGDBC+L Gn+dZ7IfPJXtACqGX7kcKiNa5jeUZe+Hag22oc3RTfasOcJPbInQdhzsd 0KeJvDx4q4P9GGbxTcSzlt1CwHYThX0vw94iVyVySg1yQI/s/dCyZb5tk esuNp7fNSle59P6SlNszGNTzijhDvELSC2n7eoZ5x/t7tKr1U2S2tBRG7 0uwJ6itMzWjp3Tglg7sbfNLAC8lHgGLKT9d/LbsiQgy/whf0hnsUkM12N 83hcdVWd3yq+ac3yuzjQKaMwcIGbEd8/ysJCIB/Bm+T7w9bfowaXTUxOw g==; X-CSE-ConnectionGUID: qq7LqNXuTnKVfb9qN5H7xw== X-CSE-MsgGUID: +ngLrX0OQoew8NOlMUtpcg== X-IronPort-AV: E=McAfee;i="6700,10204,11186"; a="34965500" X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="34965500" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2024 02:43:07 -0700 X-CSE-ConnectionGUID: bGk0hAUSQLetFQeYUsNvVQ== X-CSE-MsgGUID: me5WrnfzR0WZpb9jHphpnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="103377576" Received: from jraag-nuc8i7beh.iind.intel.com ([10.145.169.79]) by orviesa001.jf.intel.com with ESMTP; 06 Sep 2024 02:43:02 -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, Raag Jadav Subject: [PATCH v4 2/3] drm/xe: Use device wedged event Date: Fri, 6 Sep 2024 15:12:24 +0530 Message-Id: <20240906094225.3082162-3-raag.jadav@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240906094225.3082162-1-raag.jadav@intel.com> References: <20240906094225.3082162-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" 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 v2: Change authorship to Himal (Aravind) Add uevent for all device wedged cases (Aravind) v3: Generic re-implementation in DRM subsystem (Lucas) v4: Change authorship to Raag (Aravind) 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..58d571967f83 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_event(&xe->drm); } for_each_gt(gt, xe, id) From patchwork Fri Sep 6 09:42:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13793803 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 5596ECE7AFD for ; Fri, 6 Sep 2024 09:43:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD7A110E9DB; Fri, 6 Sep 2024 09:43:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="b8iL+Szl"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B14510E9DA; Fri, 6 Sep 2024 09:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725615792; x=1757151792; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RKWTyFwPDUfBN6fzOOUhe2f/iAKmt3OcjbUwlENMT18=; b=b8iL+Szli/E9J0kk1Cgc8adU1hsAytg5uRwv2kkV1NQOc3LL3594GcnH kwVeuGAL3HytPclwmoDQAnfCE/xJalk9qAU4FtAO77cyqMsTvP2i980wi Jqtcb9aTvaSc2/CcddxuIRpIocTvypwudRyw+yhNSbD2BocImZJ+p37kx 0DmMG0yilfoqLVjvu6SoZtbWfPhvl45PhbDYSdp3cwe2ZeKAlwGHXduyR ab4Nx0qPfK0oYDd502TYksGCYfXOYHqiQjDx85ahmSHkeD7/ZapQy9pz4 iyc4D2BHXsStbPH4Lu2WVy3MU+sYfkdEloYom/wgMc/hWyviw7b1WbPhH A==; X-CSE-ConnectionGUID: Pe2Ynf02TG2ATCrtgMdMFg== X-CSE-MsgGUID: b/1e8MdGQoW5d09mTbst4g== X-IronPort-AV: E=McAfee;i="6700,10204,11186"; a="34965525" X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="34965525" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2024 02:43:12 -0700 X-CSE-ConnectionGUID: 7bsRKj8NQ1CgKX/bKQNwvA== X-CSE-MsgGUID: /yAKZd4uTkOHBMJ4TXPD8A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="103377587" Received: from jraag-nuc8i7beh.iind.intel.com ([10.145.169.79]) by orviesa001.jf.intel.com with ESMTP; 06 Sep 2024 02:43:07 -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, Raag Jadav Subject: [PATCH v4 3/3] drm/i915: Use device wedged event Date: Fri, 6 Sep 2024 15:12:25 +0530 Message-Id: <20240906094225.3082162-4-raag.jadav@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240906094225.3082162-1-raag.jadav@intel.com> References: <20240906094225.3082162-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..be0906490ce5 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_event(>->i915->drm); } /**