[PATCH] drm/xe/uapi: Remove reset uevent for now

[PATCH] drm/xe/uapi: Remove reset uevent for now

[Francois Dugast]

From: Rodrigo Vivi <rodrigo.vivi@intel.com>

This kernel uevent is getting removed for now. It will come
back later with a better future proof name.

v2: Rebase (Francois Dugast)

Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Francois Dugast <francois.dugast@intel.com>
Cc: Aravind Iddamsetty <aravind.iddamsetty@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
---
 drivers/gpu/drm/xe/xe_gt.c | 18 ------------------
 include/uapi/drm/xe_drm.h  | 11 -----------
 2 files changed, 29 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index f5d18e98f8b6..3af2adec1295 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -589,20 +589,6 @@ 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[4];
-
-	reset_event[0] = DRM_XE_RESET_FAILED_UEVENT "=NEEDS_RESET";
-	reset_event[1] = kasprintf(GFP_KERNEL, "TILE_ID=%d", tile_id);
-	reset_event[2] = kasprintf(GFP_KERNEL, "GT_ID=%d", gt_id);
-	reset_event[3] = NULL;
-	kobject_uevent_env(&pdev->dev.kobj, KOBJ_CHANGE, reset_event);
-
-	kfree(reset_event[1]);
-	kfree(reset_event[2]);
-}
-
 static int gt_reset(struct xe_gt *gt)
 {
 	int err;
@@ -659,10 +645,6 @@ static int gt_reset(struct xe_gt *gt)
 err_fail:
 	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);
-
 	gt_to_xe(gt)->needs_flr_on_fini = true;
 
 	return err;
diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index b905ab16aa40..8c35ec43faef 100644
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -20,7 +20,6 @@ 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
  */
 
 /**
@@ -1341,16 +1340,6 @@ struct drm_xe_wait_user_fence {
 	__u64 reserved[2];
 };
 
-/**
- * DOC: uevent generated by xe on it's pci node.
- *
- * DRM_XE_RESET_FAILED_UEVENT - Event is generated when attempt to reset gt
- * fails. The value supplied with the event is always "NEEDS_RESET".
- * Additional information supplied is tile id and gt id of the gt unit for
- * which reset has failed.
- */
-#define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS"
-
 #if defined(__cplusplus)
 }
 #endif
-- 
2.34.1

✗ CI.Patch_applied: failure for drm/xe/uapi: Remove reset uevent for now

[Patchwork]

== Series Details ==

Series: drm/xe/uapi: Remove reset uevent for now
URL   : https://patchwork.freedesktop.org/series/127865/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: ===
Base commit: 6154a8abd drm/xe: Drop some unnecessary header includes
=== git am output follows ===
error: patch failed: include/uapi/drm/xe_drm.h:20
error: include/uapi/drm/xe_drm.h: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: drm/xe/uapi: Remove reset uevent for now
Patch failed at 0001 drm/xe/uapi: Remove reset uevent for now
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Re: [PATCH] drm/xe/uapi: Remove reset uevent for now

[Aravind Iddamsetty]

On 12/15/23 15:13, Francois Dugast wrote:
> From: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> This kernel uevent is getting removed for now. It will come
> back later with a better future proof name.
>
> v2: Rebase (Francois Dugast)
as mentioned in IGT series we need to drop this commit as well

14a663d83da2 drm/xe: Introduce fault injection for gt reset.

Thanks,
Aravind.

>
> Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Cc: Francois Dugast <francois.dugast@intel.com>
> Cc: Aravind Iddamsetty <aravind.iddamsetty@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Francois Dugast <francois.dugast@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_gt.c | 18 ------------------
>  include/uapi/drm/xe_drm.h  | 11 -----------
>  2 files changed, 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index f5d18e98f8b6..3af2adec1295 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -589,20 +589,6 @@ 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[4];
> -
> -	reset_event[0] = DRM_XE_RESET_FAILED_UEVENT "=NEEDS_RESET";
> -	reset_event[1] = kasprintf(GFP_KERNEL, "TILE_ID=%d", tile_id);
> -	reset_event[2] = kasprintf(GFP_KERNEL, "GT_ID=%d", gt_id);
> -	reset_event[3] = NULL;
> -	kobject_uevent_env(&pdev->dev.kobj, KOBJ_CHANGE, reset_event);
> -
> -	kfree(reset_event[1]);
> -	kfree(reset_event[2]);
> -}
> -
>  static int gt_reset(struct xe_gt *gt)
>  {
>  	int err;
> @@ -659,10 +645,6 @@ static int gt_reset(struct xe_gt *gt)
>  err_fail:
>  	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);
> -
>  	gt_to_xe(gt)->needs_flr_on_fini = true;
>  
>  	return err;
> diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
> index b905ab16aa40..8c35ec43faef 100644
> --- a/include/uapi/drm/xe_drm.h
> +++ b/include/uapi/drm/xe_drm.h
> @@ -20,7 +20,6 @@ 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
>   */
>  
>  /**
> @@ -1341,16 +1340,6 @@ struct drm_xe_wait_user_fence {
>  	__u64 reserved[2];
>  };
>  
> -/**
> - * DOC: uevent generated by xe on it's pci node.
> - *
> - * DRM_XE_RESET_FAILED_UEVENT - Event is generated when attempt to reset gt
> - * fails. The value supplied with the event is always "NEEDS_RESET".
> - * Additional information supplied is tile id and gt id of the gt unit for
> - * which reset has failed.
> - */
> -#define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS"
> -
>  #if defined(__cplusplus)
>  }
>  #endif

Re: [PATCH] drm/xe/uapi: Remove reset uevent for now

[Rodrigo Vivi]

[-- Attachment #1: Type: text/plain, Size: 3677 bytes --]

On Fri, Dec 15, 2023 at 5:13 AM Aravind Iddamsetty <
aravind.iddamsetty@linux.intel.com> wrote:

>
> On 12/15/23 15:13, Francois Dugast wrote:
> > From: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >
> > This kernel uevent is getting removed for now. It will come
> > back later with a better future proof name.
> >
> > v2: Rebase (Francois Dugast)
> as mentioned in IGT series we need to drop this commit as well
>
> 14a663d83da2 drm/xe: Introduce fault injection for gt reset.
>

No need for dropping that. We are going to restore the uevent soon. But
with the proper final name.
The problem is only with the uapi because we won’t be able to rename or
change when we are in-tree.




> Thanks,
> Aravind.
>
> >
> > Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Cc: Francois Dugast <francois.dugast@intel.com>
> > Cc: Aravind Iddamsetty <aravind.iddamsetty@linux.intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Signed-off-by: Francois Dugast <francois.dugast@intel.com>
> > ---
> >  drivers/gpu/drm/xe/xe_gt.c | 18 ------------------
> >  include/uapi/drm/xe_drm.h  | 11 -----------
> >  2 files changed, 29 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> > index f5d18e98f8b6..3af2adec1295 100644
> > --- a/drivers/gpu/drm/xe/xe_gt.c
> > +++ b/drivers/gpu/drm/xe/xe_gt.c
> > @@ -589,20 +589,6 @@ 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[4];
> > -
> > -     reset_event[0] = DRM_XE_RESET_FAILED_UEVENT "=NEEDS_RESET";
> > -     reset_event[1] = kasprintf(GFP_KERNEL, "TILE_ID=%d", tile_id);
> > -     reset_event[2] = kasprintf(GFP_KERNEL, "GT_ID=%d", gt_id);
> > -     reset_event[3] = NULL;
> > -     kobject_uevent_env(&pdev->dev.kobj, KOBJ_CHANGE, reset_event);
> > -
> > -     kfree(reset_event[1]);
> > -     kfree(reset_event[2]);
> > -}
> > -
> >  static int gt_reset(struct xe_gt *gt)
> >  {
> >       int err;
> > @@ -659,10 +645,6 @@ static int gt_reset(struct xe_gt *gt)
> >  err_fail:
> >       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);
> > -
> >       gt_to_xe(gt)->needs_flr_on_fini = true;
> >
> >       return err;
> > diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
> > index b905ab16aa40..8c35ec43faef 100644
> > --- a/include/uapi/drm/xe_drm.h
> > +++ b/include/uapi/drm/xe_drm.h
> > @@ -20,7 +20,6 @@ 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
> >   */
> >
> >  /**
> > @@ -1341,16 +1340,6 @@ struct drm_xe_wait_user_fence {
> >       __u64 reserved[2];
> >  };
> >
> > -/**
> > - * DOC: uevent generated by xe on it's pci node.
> > - *
> > - * DRM_XE_RESET_FAILED_UEVENT - Event is generated when attempt to
> reset gt
> > - * fails. The value supplied with the event is always "NEEDS_RESET".
> > - * Additional information supplied is tile id and gt id of the gt unit
> for
> > - * which reset has failed.
> > - */
> > -#define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS"
> > -
> >  #if defined(__cplusplus)
> >  }
> >  #endif
>

[-- Attachment #2: Type: text/html, Size: 5472 bytes --]

Re: [PATCH] drm/xe/uapi: Remove reset uevent for now

[Francois Dugast]

+ intel-xe@lists.freedesktop.org

(There was a typo in the original submission to the mailing list)

On Fri, Dec 15, 2023 at 03:37:24PM +0100, Ghimiray, Himal Prasad wrote:
> 
> 
> > -----Original Message-----
> > From: Vivi, Rodrigo <rodrigo.vivi@intel.com>
> > Sent: 15 December 2023 06:14
> > To: intel-xe@lists.freedektop.org
> > Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Ghimiray, Himal Prasad
> > <himal.prasad.ghimiray@intel.com>; De Marchi, Lucas
> > <lucas.demarchi@intel.com>; Dugast, Francois <francois.dugast@intel.com>
> > Subject: [PATCH] drm/xe/uapi: Remove reset uevent for now
> > 
> > This kernel uevent is getting removed for now. It will come back later with a
> > better future proof name.
> > 
> > Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Cc: Francois Dugast <francois.dugast@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/xe/xe_gt.c | 18 ------------------  include/uapi/drm/xe_drm.h
> > | 10 ----------
> >  2 files changed, 28 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c index
> > dfd9cf01a5d5..9f9527329842 100644
> > --- a/drivers/gpu/drm/xe/xe_gt.c
> > +++ b/drivers/gpu/drm/xe/xe_gt.c
> > @@ -589,20 +589,6 @@ 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[4];
> > -
> > -	reset_event[0] = DRM_XE_RESET_FAILED_UEVENT "=NEEDS_RESET";
> > -	reset_event[1] = kasprintf(GFP_KERNEL, "TILE_ID=%d", tile_id);
> > -	reset_event[2] = kasprintf(GFP_KERNEL, "GT_ID=%d", gt_id);
> > -	reset_event[3] = NULL;
> > -	kobject_uevent_env(&pdev->dev.kobj, KOBJ_CHANGE, reset_event);
> > -
> > -	kfree(reset_event[1]);
> > -	kfree(reset_event[2]);
> > -}
> > -
> >  static int gt_reset(struct xe_gt *gt)
> >  {
> >  	int err;
> > @@ -659,10 +645,6 @@ static int gt_reset(struct xe_gt *gt)
> >  err_fail:
> >  	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);
> > -
> >  	gt_to_xe(gt)->needs_flr_on_fini = true;
> > 
> >  	return err;
> > diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h index
> > 0895e4d2a981..a98cfd3d0496 100644
> > --- a/include/uapi/drm/xe_drm.h
> > +++ b/include/uapi/drm/xe_drm.h
> > @@ -16,16 +16,6 @@ extern "C" {
> >   * subject to backwards-compatibility constraints.
> >   */
> > 
> > -/**
> > - * DOC: uevent generated by xe on it's pci node.
> > - *
> > - * DRM_XE_RESET_FAILED_UEVENT - Event is generated when attempt to
> > reset gt
> > - * fails. The value supplied with the event is always "NEEDS_RESET".
> > - * Additional information supplied is tile id and gt id of the gt unit for
> > - * which reset has failed.
> > - */
> > -#define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS"
> > -
> Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
> >  /**
> >   * struct xe_user_extension - Base class for defining a chain of extensions
> >   *
> > --
> > 2.43.0
>