Commit 1a7b7180 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

drm/xe: Don't unnecessarily invoke the OOM killer on multiple binds 

Multiple single-ioctl binds can be split up into multiple bind
ioctls, reducing the memory required to hold the bind array.

So rather than allowing the OOM killer to be invoked, return
-ENOMEM or -ENOBUFS to user-space to take corrective action.

v2:
- Add __GFP_NOWARN to __GFP_RETRY_MAYFAIL allocations to avoid
  spamming the kernel log if a recoverable allocation fails.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2701


Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241031153732.164995-3-thomas.hellstrom@linux.intel.com
parent 6bd49cc1

drivers/gpu/drm/xe/xe_vm.c

+7 −4
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static int xe_vma_ops_alloc(struct xe_vma_ops *vops, bool array_of_binds) 
		vops->pt_update_ops[i].ops =

			kmalloc_array(vops->pt_update_ops[i].num_ops,

				      sizeof(*vops->pt_update_ops[i].ops),

				      GFP_KERNEL);

				      GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN);

		if (!vops->pt_update_ops[i].ops)

			return array_of_binds ? -ENOBUFS : -ENOMEM;

	}
@@ -2733,7 +2733,8 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe, 


		*bind_ops = kvmalloc_array(args->num_binds,

					   sizeof(struct drm_xe_vm_bind_op),

					   GFP_KERNEL | __GFP_ACCOUNT);

					   GFP_KERNEL | __GFP_ACCOUNT |

					   __GFP_RETRY_MAYFAIL | __GFP_NOWARN);

		if (!*bind_ops)

			return args->num_binds > 1 ? -ENOBUFS : -ENOMEM;
@@ -2973,14 +2974,16 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 


	if (args->num_binds) {

		bos = kvcalloc(args->num_binds, sizeof(*bos),

			       GFP_KERNEL | __GFP_ACCOUNT);

			       GFP_KERNEL | __GFP_ACCOUNT |

			       __GFP_RETRY_MAYFAIL | __GFP_NOWARN);

		if (!bos) {

			err = -ENOMEM;

			goto release_vm_lock;

		}



		ops = kvcalloc(args->num_binds, sizeof(*ops),

			       GFP_KERNEL | __GFP_ACCOUNT);

			       GFP_KERNEL | __GFP_ACCOUNT |

			       __GFP_RETRY_MAYFAIL | __GFP_NOWARN);

		if (!ops) {

			err = -ENOMEM;

			goto release_vm_lock;