Commit 63054186 authored Jan 16, 2013 by Dave Airlie Committed by Dave Airlie Jan 21, 2013

ttm: don't destroy old mm_node on memcpy failure

When we are using memcpy to move objects around, and we fail to memcpy
due to lack of memory to populate or failure to finish the copy, we don't
want to destroy the mm_node that has been copied into old_copy.

While working on a new kms driver that uses memcpy, if I overallocated bo's
up to the memory limits, and eviction failed, then machine would oops soon
after due to having an active bo with an already freed drm_mm embedded in it,
freeing it a second time didn't end well.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent ffb5fd53

drivers/gpu/drm/ttm/ttm_bo_util.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -344,9 +344,13 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,

		if (ttm->state == tt_unpopulated) {
		ret = ttm->bdev->driver->ttm_tt_populate(ttm);
		if (ret)
		if (ret) {
		/* if we fail here don't nuke the mm node
		* as the bo still owns it */
		old_copy.mm_node = NULL;
		goto out1;
		}
		}

		add = 0;
		dir = 1;
		@@ -371,9 +375,12 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
		prot);
		} else
		ret = ttm_copy_io_page(new_iomap, old_iomap, page);
		if (ret)
		if (ret) {
		/* failing here, means keep old copy as-is */
		old_copy.mm_node = NULL;
		goto out1;
		}
		}
		mb();
		out2:
		old_copy = *old_mem;