linux.git/drivers/gpu/drm/ttm, branch v3.8-rc2

drm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling

2012-12-19T21:46:20+00:00

Fix regression introduced by 85b144f860176
"drm/ttm: call ttm_bo_cleanup_refs with reservation and lru lock held, v3"

Slowpath ttm_bo_cleanup_refs_and_unlock accidentally tried to increase
refcount on &bo->sync_obj instead of bo->sync_obj.

The compiler didn't complain since sync_obj_ref takes a void pointer,
so it was still valid c.

This could result in lockups, memory corruptions, and warnings like
these when graphics card VRAM usage is high:

------------[ cut here ]------------
WARNING: at include/linux/kref.h:42 radeon_fence_ref+0x2c/0x40()
Hardware name: System Product Name
Pid: 157, comm: X Not tainted 3.7.0-rc7-00520-g85b144f-dirty #174
Call Trace:
[] ? warn_slowpath_common+0x74/0xb0
[] ? radeon_fence_ref+0x2c/0x40
[] ? ttm_bo_cleanup_refs_and_unlock+0x18c/0x2d0
[] ? ttm_mem_evict_first+0x1dc/0x2a0
[] ? ttm_bo_man_get_node+0x62/0xb0
[] ? ttm_bo_mem_space+0x28e/0x340
[] ? ttm_bo_move_buffer+0xfc/0x170
[] ? kmem_cache_alloc+0xb2/0xc0
[] ? ttm_bo_validate+0x95/0x110
[] ? ttm_bo_init+0x2ec/0x3b0
[] ? radeon_bo_create+0x18a/0x200
[] ? radeon_bo_clear_va+0x40/0x40
[] ? radeon_gem_object_create+0x92/0x160
[] ? radeon_gem_create_ioctl+0x6c/0x150
[] ? radeon_gem_object_free+0x2f/0x40
[] ? drm_ioctl+0x420/0x4f0
[] ? radeon_gem_pwrite_ioctl+0x20/0x20
[] ? do_vfs_ioctl+0x2e4/0x4e0
[] ? vfs_read+0x118/0x160
[] ? sys_ioctl+0x4c/0xa0
[] ? sys_read+0x51/0xa0
[] ? system_call_fastpath+0x16/0x1b

Signed-off-by: Maarten Lankhorst 
Reported-by: Markus Trippelsdorf 
Acked-by: Paul Menzel 
Signed-off-by: Dave Airlie

drm/ttm: remove no_wait_reserve, v3

2012-12-10T10:21:30+00:00

All items on the lru list are always reservable, so this is a stupid
thing to keep. Not only that, it is used in a way which would
guarantee deadlocks if it were ever to be set to block on reserve.

This is a lot of churn, but mostly because of the removal of the
argument which can be nested arbitrarily deeply in many places.

No change of code in this patch except removal of the no_wait_reserve
argument, the previous patch removed the use of no_wait_reserve.

v2:
 - Warn if -EBUSY is returned on reservation, all objects on the list
   should be reservable. Adjusted patch slightly due to conflicts.
v3:
 - Focus on no_wait_reserve removal only.

Signed-off-by: Maarten Lankhorst 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie

drm/ttm: cope with reserved buffers on lru list in ttm_mem_evict_first, v2

2012-12-10T10:21:22+00:00

Replace the goto loop with a simple for each loop, and only run the
delayed destroy cleanup if we can reserve the buffer first.

No race occurs, since lru lock is never dropped any more. An empty list
and a list full of unreservable buffers both cause -EBUSY to be returned,
which is identical to the previous situation, because previously buffers
on the lru list were always guaranteed to be reservable.

This should work since currently ttm guarantees items on the lru are
always reservable, and reserving items blockingly with some bo held
are enough to cause you to run into a deadlock.

Currently this is not a concern since removal off the lru list and
reservations are always done with atomically, but when this guarantee
no longer holds, we have to handle this situation or end up with
possible deadlocks.

Signed-off-by: Maarten Lankhorst 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie

drm/ttm: cope with reserved buffers on swap list in ttm_bo_swapout, v2

2012-12-10T10:21:06+00:00

Replace the while loop with a simple for each loop, and only run the
delayed destroy cleanup if we can reserve the buffer first.

No race occurs, since lru lock is never dropped any more. An empty list
and a list full of unreservable buffers both cause -EBUSY to be returned,
which is identical to the previous situation.

Signed-off-by: Maarten Lankhorst 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie

drm/ttm: call ttm_bo_cleanup_refs with reservation and lru lock held, v3

2012-12-10T10:21:03+00:00

By removing the unlocking of lru and retaking it immediately, a race is
removed where the bo is taken off the swap list or the lru list between
the unlock and relock. As such the cleanup_refs code can be simplified,
it will attempt to call ttm_bo_wait non-blockingly, and if it fails
it will drop the locks and perform a blocking wait, or return an error
if no_wait_gpu was set.

The need for looping is also eliminated, since swapout and evict_mem_first
will always follow the destruction path, no new fence is allowed
to be attached. As far as I can see this may already have been the case,
but the unlocking / relocking required a complicated loop to deal with
re-reservation.

Changes since v1:
 - Simplify no_wait_gpu case by folding it in with empty ddestroy.
 - Hold a reservation while calling ttm_bo_cleanup_memtype_use again.
Changes since v2:
 - Do not remove bo from lru list while waiting

Signed-off-by: Maarten Lankhorst 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie

drm/ttm: change fence_lock to inner lock

2012-12-10T10:09:58+00:00

This requires changing the order in ttm_bo_cleanup_refs_or_queue to
take the reservation first, as there is otherwise no race free way to
take lru lock before fence_lock.

Signed-off-by: Maarten Lankhorst 
Reviewed-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie

Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next

2012-12-10T10:03:58+00:00

Alex writes:
Pretty minor -next pull request.  We some additional new bits waiting
internally for release.  Hopefully Monday we can get at least some of
them out.  The others will probably take a few more weeks.

Highlights of the current request:
- ELD registers for passing audio information to the sound hardware
- Handle GPUVM page faults more gracefully
- Misc fixes

Merge radeon test
* 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux: (483 commits)
  drm/radeon: bump driver version for new info ioctl requests
  drm/radeon: fix eDP clk and lane setup for scaled modes
  drm/radeon: add new INFO ioctl requests
  drm/radeon/dce32+: use fractional fb dividers for high clocks
  drm/radeon: use cached memory when evicting for vram on non agp
  drm/radeon: add a CS flag END_OF_FRAME
  drm/radeon: stop page faults from hanging the system (v2)
  drm/radeon/dce4/5: add registers for ELD handling
  drm/radeon/dce3.2: add registers for ELD handling
  radeon: fix pll/ctrc mapping on dce2 and dce3 hardware
  Linux 3.7-rc7
  powerpc/eeh: Do not invalidate PE properly
  Revert "drm/i915: enable rc6 on ilk again"
  ALSA: hda - Fix build without CONFIG_PM
  of/address: sparc: Declare of_iomap as an extern function for sparc again
  PM / QoS: fix wrong error-checking condition
  bnx2x: remove redundant warning log
  vxlan: fix command usage in its doc
  8139cp: revert "set ring address before enabling receiver"
  MPI: Fix compilation on MIPS with GCC 4.4 and newer
  ...

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_encoder.c
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

drm/ttm: Optimize vm locking using kref_get_unless_zero v3

2012-11-28T08:37:59+00:00

Removes the need for a write lock each time we call ttm_bo_unref().

v2: Remove an unused variable.
v3: Really remove the unused variable.

Signed-off-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie

drm/ttm: Use the hashtab _rcu interface for ttm_objects

2012-11-28T08:36:15+00:00

Also move a kref_init() out of spinlocked region

Signed-off-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie

drm/ttm: Fix locking in an error path

2012-11-28T08:36:14+00:00

Signed-off-by: Thomas Hellstrom 
Signed-off-by: Dave Airlie