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 1D234C3DA64 for ; Tue, 6 Aug 2024 08:54:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C06C110E010; Tue, 6 Aug 2024 08:54:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="bsTOG6Pg"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 47FB510E010; Tue, 6 Aug 2024 08:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722934481; x=1754470481; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=Iyf3zdABSVg02IOekBnUIw0m3tMKfI4cdpn0Jy57kgE=; b=bsTOG6PgJjBXS1Bfz67SYJdy2Pd8NSMXUeDg8aWWhFy2ktrZPxAe8OlR rH2zPW/ZDoz2u2ZYEu/R1vVGV2hL1q+PzUSVQ11Asi/c6lqY9EfW639oB ffwYPhWv+jQjW1gSCxkY4egaxCPt6UXwINLijJcgYPuRwUGvpXSV4ylQ4 YgwLKByXeb6evSrObOlflAkyk2NZwcOHg6AFLe/XsNIGG/59fkL/yRtzv C2R68yLWOrozTdUbVy+Je2Nk9E3p0Noo3+fqIug/kaCKySFUdtJFm4CS3 Z/osEE/9f+Ux/el1sVEk5MMEPZThdapRX/vbMQFhgv010+l1Nkqg7zYcA Q==; X-CSE-ConnectionGUID: lAbdjbEoTMCA48djF3lJow== X-CSE-MsgGUID: hE/XiEcNSPSuCfkcYZP/Ng== X-IronPort-AV: E=McAfee;i="6700,10204,11155"; a="21115836" X-IronPort-AV: E=Sophos;i="6.09,267,1716274800"; d="scan'208";a="21115836" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2024 01:54:40 -0700 X-CSE-ConnectionGUID: XTvT/GwVR6i1J0gFExicYw== X-CSE-MsgGUID: 0RcR880GT5WdhZ2I/7E1Xg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,267,1716274800"; d="scan'208";a="61264296" Received: from aravind-dev.iind.intel.com (HELO [10.145.162.146]) ([10.145.162.146]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2024 01:54:34 -0700 Message-ID: <35971288-2142-4dc4-8ce1-62b730fa9b44@linux.intel.com> Date: Tue, 6 Aug 2024 14:27:41 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1] drm/xe/uapi: Bring back reset uevent To: Raag Jadav , lucas.demarchi@intel.com, thomas.hellstrom@linux.intel.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch Cc: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, himal.prasad.ghimiray@intel.com, francois.dugast@intel.com, rodrigo.vivi@intel.com, anshuman.gupta@intel.com References: <20240806043231.624645-1-raag.jadav@intel.com> Content-Language: en-US From: Aravind Iddamsetty In-Reply-To: <20240806043231.624645-1-raag.jadav@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 06/08/24 10:02, Raag Jadav wrote: This change  was originally sent by Himal, so may be you should keep his authorship. > From: Lucas De Marchi > > Bring back uevent for gt reset failure with better uapi naming. > With this in place we can receive failure event using udev. > > $ udevadm monitor --property --kernel > monitor will print the received events for: > KERNEL - the kernel uevent > > KERNEL[871.188570] change /devices/pci0000:00/0000:00:01.0/0000:01:00.0/0000:02:01.0/0000:03:00.0 (pci) > ACTION=change > DEVPATH=/devices/pci0000:00/0000:00:01.0/0000:01:00.0/0000:02:01.0/0000:03:00.0 > SUBSYSTEM=pci > DEVICE_STATUS=NEEDS_RESET > REASON=GT_RESET_FAILED > TILE_ID=0 > GT_ID=0 > DRIVER=xe > PCI_CLASS=30000 > PCI_ID=8086:56B1 > PCI_SUBSYS_ID=8086:1210 > PCI_SLOT_NAME=0000:03:00.0 > MODALIAS=pci:v00008086d000056B1sv00008086sd00001210bc03sc00i00 > SEQNUM=6104 > > Signed-off-by: Lucas De Marchi > Signed-off-by: Raag Jadav > --- > drivers/gpu/drm/xe/xe_gt.c | 27 +++++++++++++++++++++++++-- > include/uapi/drm/xe_drm.h | 17 +++++++++++++++++ > 2 files changed, 42 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c > index b04e47186f5b..5ceef0059861 100644 > --- a/drivers/gpu/drm/xe/xe_gt.c > +++ b/drivers/gpu/drm/xe/xe_gt.c > @@ -740,6 +740,30 @@ static int do_gt_restart(struct xe_gt *gt) > return 0; > } > > +static void xe_uevent_gt_reset_failure(struct pci_dev *pdev, u8 tile_id, u8 gt_id) > +{ > + char *reset_event[5]; > + > + reset_event[0] = DRM_XE_RESET_REQUIRED_UEVENT; > + reset_event[1] = DRM_XE_RESET_REQUIRED_UEVENT_REASON_GT; > + reset_event[2] = kasprintf(GFP_KERNEL, "TILE_ID=%d", tile_id); > + reset_event[3] = kasprintf(GFP_KERNEL, "GT_ID=%d", gt_id); > + reset_event[4] = NULL; > + kobject_uevent_env(&pdev->dev.kobj, KOBJ_CHANGE, reset_event); > + > + kfree(reset_event[2]); > + kfree(reset_event[3]); > +} > + > +static void gt_reset_failed(struct xe_gt *gt, int err) > +{ > + xe_gt_err(gt, "reset failed (%pe)\n", ERR_PTR(err)); > + > + /* Notify userspace about gt reset failure */ > + xe_uevent_gt_reset_failure(to_pci_dev(gt_to_xe(gt)->drm.dev), > + gt_to_tile(gt)->id, gt->info.id); > +} > + > static int gt_reset(struct xe_gt *gt) > { > int err; > @@ -795,8 +819,7 @@ static int gt_reset(struct xe_gt *gt) > XE_WARN_ON(xe_uc_start(>->uc)); > xe_pm_runtime_put(gt_to_xe(gt)); > err_fail: > - xe_gt_err(gt, "reset failed (%pe)\n", ERR_PTR(err)); > - > + gt_reset_failed(gt, err); > xe_device_declare_wedged(gt_to_xe(gt)); Also, we might want to have a RESET_REQUIRED event whenever device is wedged. Thanks, Aravind. > > return err; > diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h > index 19619d4952a8..9ea3be97535e 100644 > --- a/include/uapi/drm/xe_drm.h > +++ b/include/uapi/drm/xe_drm.h > @@ -20,6 +20,7 @@ extern "C" { > * 2. Extension definition and helper structs > * 3. IOCTL's Query structs in the order of the Query's entries. > * 4. The rest of IOCTL structs in the order of IOCTL declaration. > + * 5. uEvents > */ > > /** > @@ -1686,6 +1687,22 @@ struct drm_xe_oa_stream_info { > __u64 reserved[3]; > }; > > +/** > + * DOC: uevent generated by xe on it's pci node. > + * > + * DRM_XE_RESET_REQUIRED_UEVENT - Event is generated when device needs reset. > + * The REASON is provided along with the event for which reset is required. > + * On the basis of REASONS, additional information might be supplied. > + */ > +#define DRM_XE_RESET_REQUIRED_UEVENT "DEVICE_STATUS=NEEDS_RESET" > + > +/** > + * DRM_XE_RESET_REQUIRED_UEVENT_REASON_GT - Reason provided to DRM_XE_RESET_REQUIRED_UEVENT > + * incase of gt reset failure. The additional information supplied is tile id and > + * gt id of the gt unit for which reset has failed. > + */ > +#define DRM_XE_RESET_REQUIRED_UEVENT_REASON_GT "REASON=GT_RESET_FAILED" > + > #if defined(__cplusplus) > } > #endif