Commit 656d2950 authored by Rodrigo Vivi's avatar Rodrigo Vivi

drm/xe: Do not take any action if our device was removed.

Unfortunately devcoredump infrastructure does not provide and
interface for us to force the device removal upon the pci_remove
time of our device.

The devcoredump is linked at the device level, so when in use
it will prevent the module removal, but it doesn't prevent the
call of the pci_remove callback. This callback cannot fail
anyway and we end up clearing and freeing the entire pci device.

Hence, after we removed the pci device, we shouldn't allow any
read or free operations to avoid segmentation fault.
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
parent e7994850
...@@ -57,6 +57,10 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset, ...@@ -57,6 +57,10 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
struct drm_print_iterator iter; struct drm_print_iterator iter;
struct timespec64 ts; struct timespec64 ts;
/* Our device is gone already... */
if (!data || !coredump_to_xe(coredump))
return -ENODEV;
iter.data = buffer; iter.data = buffer;
iter.offset = 0; iter.offset = 0;
iter.start = offset; iter.start = offset;
...@@ -81,6 +85,10 @@ static void xe_devcoredump_free(void *data) ...@@ -81,6 +85,10 @@ static void xe_devcoredump_free(void *data)
{ {
struct xe_devcoredump *coredump = data; struct xe_devcoredump *coredump = data;
/* Our device is gone. Nothing to do... */
if (!data || !coredump_to_xe(coredump))
return;
coredump->captured = false; coredump->captured = false;
drm_info(&coredump_to_xe(coredump)->drm, drm_info(&coredump_to_xe(coredump)->drm,
"Xe device coredump has been deleted.\n"); "Xe device coredump has been deleted.\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment