Received-SPF: pass (google.com: domain of linux-kernel+bounces-137662-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 9 Apr 2024 18:21:45 -0400
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: =?iso-8859-1?Q?Jos=E9?= Roberto de Souza <jose.souza@intel.com>
CC: <linux-kernel@vger.kernel.org>, <intel-xe@lists.freedesktop.org>, Jonathan
 Cavitt <jonathan.cavitt@intel.com>
Subject: Re: [PATCH v4 2/2] drm/xe: Remove devcoredump during driver release
Message-ID: <ZhW_eTyS6Irp619S@intel.com>
References: <20240409200206.108452-1-jose.souza@intel.com>
 <20240409200206.108452-2-jose.souza@intel.com>
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20240409200206.108452-2-jose.souza@intel.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?rdlDzt80Y0E9R7e26ZLQdapbpBR3GAjTC01VzrQvyym8xvl/BF+hlVJazg?=
 =?iso-8859-1?Q?59Knzhf6ndYhxx6D+iR+4qdwji1gq1BaXOgoez4zmRbDSmEIrg1nj4pSKg?=
 =?iso-8859-1?Q?PzyIkq6tKaqkzWULK02HSvlsDCs9nlj1hcdb0Vu06zuJeCHS9LvFO/4uGP?=
 =?iso-8859-1?Q?EldOt8N4MVuB8iTt0GojGORN6VLVz2ud21SzFRjxdoyn6JsWVrXUr+XbDw?=
 =?iso-8859-1?Q?LHKFdhC1r0+y6uY7oflwhOX83/9Q/IwqkVr6ypqf6ALJe1Qjmy1iC6rOWO?=
 =?iso-8859-1?Q?N8M4gRiILbQx4ifwVI+74B+YvnS59UWWeQ7FAyIrwoQFZQX0p1B0UbqjlE?=
 =?iso-8859-1?Q?k8tggKAxJF6/1J5zF1KVIJO54Zd9XYwp30g9mxyPcqTljV5M7Zff2skGNc?=
 =?iso-8859-1?Q?8VKA5JiPPRNxVIxdnKoBOSYD/eF/hjbYH5MlLMvYqWPrCbonCLBKOUOeQC?=
 =?iso-8859-1?Q?teUqw8efiXYR93zFubjAjDPCNcFgbzsOcTsFJOwQtFHyrpnsaJ7fYEY5XW?=
 =?iso-8859-1?Q?zrsvaWtIlf9VBzttpu3RmSYrXoEE/ySFVqcmXxuAPm/vfAjioKuGd+GZxr?=
 =?iso-8859-1?Q?ixLhri5MftFdizs470S6hbe577g0RuTyA3qVy7N072lNKnNJI0g5mRsAiB?=
 =?iso-8859-1?Q?tXSLn1Nbil35czgGlt1U2PphrnK7/xkrorpt06F9b+pb3zI/qTXyGdmqkB?=
 =?iso-8859-1?Q?fscfVQjffSITOUAEP5akonJKcbXdWTabOU3HpOIj0ns2imFNyo7tKfPm0n?=
 =?iso-8859-1?Q?HAwAPMhtYd4U2zM+Lly0p1ozpuZ9owTaAbGia3dLjSDgbFf5kUHXEe09Nt?=
 =?iso-8859-1?Q?mzwShZvQhnpQIAPANaM95+BityFZ3oOEQikOyhBeDf5Z3NwVg0v9Cv208k?=
 =?iso-8859-1?Q?QgfPttg+qwMcyDPZY3bDLWChAp+dr3Gyu4jYtlUHESqKdugIfWeSV7G+Xm?=
 =?iso-8859-1?Q?NlHQ9s2bCBxaxct6Yg7w6rfpvjgpDqSkHPI1Y2ri2v5siR0O5kyOvbVI/N?=
 =?iso-8859-1?Q?v6Yso/VpaVBIxKg86/0IwUFkYkwKrP4PTatjiPjKgViFiTX55l+vVwL4ah?=
 =?iso-8859-1?Q?Z4jAW/56GBfZ31J99M9ruJJUkB2XRZWGQqbFUCflzPNWzpBC5+h9xzOo+M?=
 =?iso-8859-1?Q?Fw0w/M85aVNF+mzsgqNjlBK/857xJDmgXnvA2EsZwiX+RjQVGV7WRqwS25?=
 =?iso-8859-1?Q?m/7fAjWrh9o0AZnn1LjDNiH2cNsKKLOOiz9+GGlyJvVPbzYgE45DbM5EJO?=
 =?iso-8859-1?Q?lkrieHWaggyA8Md2bXQM+YeNfBkmnvOBg8Kdtzzn8XdPcvV7+SRMR1x/FB?=
 =?iso-8859-1?Q?hhQ7Hz7fbK0uqKHk03E4rTZvEfZTPCKgRVzQ/puhyUZlAeKt5hU0R9ZCdy?=
 =?iso-8859-1?Q?xBZFNMDvjTPJRHvTqxp/unInvUjT5IsP476x07ZVaoh8gwhV2CAtfxEIBR?=
 =?iso-8859-1?Q?VErvwZrgwYg9tsA9+0tn79C7QAEjpD35d+T8DsziWtsXQp6qNYgmygdP6A?=
 =?iso-8859-1?Q?vx79HdjVY8PhQslIN6FMMa8D0OKlUI/7tu1j6mzblNtlhfji5tzdl6nU1Z?=
 =?iso-8859-1?Q?LtHZqjFXJUm+io0pHtoUx+OMl8m9aZKun1gJBdA70lSD23vGg95yQgfeot?=
 =?iso-8859-1?Q?z379L6c1xIcAMy25f3u0na3h0zgjpU1BZnF18SueIsz6f1sdgc9ZIEYg?=
 =?iso-8859-1?Q?=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 90863b0b-5b53-4cb4-9eb0-08dc58e37363
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6059.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2024 22:21:50.0420
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: rCpzQIzyPG2PGgpJTwSl3I/JfVJwWSZUiM1JlcjlJvKa7a6kpEVXHqR9+f/X7s7vtk3ej9Dpb9xc63wR6MYjYg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB5890
X-OriginatorOrg: intel.com

On Tue, Apr 09, 2024 at 01:02:06PM -0700, Jos? Roberto de Souza wrote:
> This will remove devcoredump from file system and free its resources
> during driver unload.
> 
> This fix the driver unload after gpu hang happened, otherwise this
> it would report that Xe KMD is still in use and it would leave the
> kernel in a state that Xe KMD can't be unload without a reboot.
> 
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Jonathan Cavitt <jonathan.cavitt@intel.com>
> Acked-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
> Signed-off-by: Jos? Roberto de Souza <jose.souza@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_devcoredump.c | 13 ++++++++++++-
>  drivers/gpu/drm/xe/xe_devcoredump.h |  6 ++++++
>  drivers/gpu/drm/xe/xe_device.c      |  4 ++++
>  3 files changed, 22 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
> index 283ca7518aff2..3d7980232be1c 100644
> --- a/drivers/gpu/drm/xe/xe_devcoredump.c
> +++ b/drivers/gpu/drm/xe/xe_devcoredump.c
> @@ -9,6 +9,8 @@
>  #include <linux/devcoredump.h>
>  #include <generated/utsrelease.h>
>  
> +#include <drm/drm_managed.h>
> +
>  #include "xe_device.h"
>  #include "xe_exec_queue.h"
>  #include "xe_force_wake.h"
> @@ -235,5 +237,14 @@ void xe_devcoredump(struct xe_sched_job *job)
>  	dev_coredumpm(xe->drm.dev, THIS_MODULE, coredump, 0, GFP_KERNEL,
>  		      xe_devcoredump_read, xe_devcoredump_free);
>  }
> -#endif
>  
> +static void xe_driver_devcoredump_fini(struct drm_device *drm, void *arg)
> +{
> +	dev_coredump_put(drm->dev);
> +}
> +
> +int xe_devcoredump_init(struct xe_device *xe)
> +{
> +	return drmm_add_action_or_reset(&xe->drm, xe_driver_devcoredump_fini, xe);
> +}
> +#endif
> diff --git a/drivers/gpu/drm/xe/xe_devcoredump.h b/drivers/gpu/drm/xe/xe_devcoredump.h
> index df8671f0b5eb2..e2fa65ce09322 100644
> --- a/drivers/gpu/drm/xe/xe_devcoredump.h
> +++ b/drivers/gpu/drm/xe/xe_devcoredump.h
> @@ -11,10 +11,16 @@ struct xe_sched_job;
>  
>  #ifdef CONFIG_DEV_COREDUMP
>  void xe_devcoredump(struct xe_sched_job *job);
> +int xe_devcoredump_init(struct xe_device *xe);
>  #else
>  static inline void xe_devcoredump(struct xe_sched_job *job)
>  {
>  }
> +
> +static inline int xe_devcoredump_init(struct xe_device *xe)
> +{
> +	return 0;
> +}
>  #endif
>  
>  #endif
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index 9083f5e02dd9e..ce27d0d1bdb34 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -20,6 +20,7 @@
>  #include "regs/xe_regs.h"
>  #include "xe_bo.h"
>  #include "xe_debugfs.h"
> +#include "xe_devcoredump.h"
>  #include "xe_dma_buf.h"
>  #include "xe_drm_client.h"
>  #include "xe_drv.h"
> @@ -513,6 +514,9 @@ int xe_device_probe(struct xe_device *xe)
>  			return err;
>  	}
>  
> +	err = xe_devcoredump_init(xe);
> +	if (err)
> +		return err;
>  	err = drmm_add_action_or_reset(&xe->drm, xe_driver_flr_fini, xe);
>  	if (err)
>  		return err;
> -- 
> 2.44.0
>