1. 02 8月, 2010 7 次提交
    • C
      drm/i915: Unreference object not handle on creation · 86f100b1
      Chris Wilson 提交于
      When creating an object, we create the handle by which it is known to
      the process and which own the reference to the object. That reference to
      the new handle is what we want to transfer to the process, not the lost
      reference to the object; so free the local object reference *not* the
      process's handle reference.
      
      This brings i915_gem_object_create_ioctl() into line with
      drm_gem_open_ioctl()
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      86f100b1
    • C
      drm/i915: Attempt to uncouple object after catastrophic failure in unbind · 8dc1775d
      Chris Wilson 提交于
      If we fail to flush outstanding GPU writes but return the memory to the
      system, we risk corrupting memory should the GPU recovery and complete
      those writes. On the other hand, if we bail early and free the object
      then we have a definite use-after-free and real memory corruption.
      Choose the lesser of two evils, since in order to recover from the hung
      GPU we need to completely reset it, those pending writes should
      never happen.
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      8dc1775d
    • C
      drm/i915: Repeat unbinding during free if interrupted (v6) · be72615b
      Chris Wilson 提交于
      If during the freeing of an object the unbind is interrupted by a system
      call, which is quite possible if we have outstanding GPU writes that
      must be flushed, the unbind is silently aborted. This still leaves the
      AGP region and backing pages allocated, and perhaps more importantly,
      the object remains upon the various lists exposing us to memory
      corruption.
      
      I think this is the cause behind the use-after-free, such as
      
        Bug 15664 - Graphics hang and kernel backtrace when starting Azureus
                    with Compiz enabled
        https://bugzilla.kernel.org/show_bug.cgi?id=15664
      
      v2: Daniel Vetter reminded me that kernel space programming is never easy.
      We cannot simply spin to clear the pending signal and so must deferred
      the freeing of the object until later.
      v3: Run from the top level retire requests.
      v4: Tested with P(return -ERESTARTSYS)=.5 from i915_gem_do_wait_request()
      v5: Rebase against Eric's for-linus tree.
      v6: Refactor, split and add a comment about avoiding unbounded recursion.
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Cc: Daniel Vetter <daniel@ffwll.ch>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      be72615b
    • C
      drm/i915: Refactor i915_gem_retire_requests() · b09a1fec
      Chris Wilson 提交于
      Combine the iteration over active render rings into a common function.
      This is in preparation for reusing the idle function to also retire
      deferred free requests.
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      b09a1fec
    • C
    • C
      drm/i915: Propagate error from drm_install_irq() during EnterVT · 5f35308b
      Chris Wilson 提交于
      Simple fix for error propagation along the old UMS path.
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      5f35308b
    • C
      drm/i915: Explosion following OOM in do_execbuffer. · 43b27f40
      Chris Wilson 提交于
      Oops, when merging the extra details following an OOM, I missed that
      driver_private is now NULL and the correct way to convert from the
      drm_gem_object into the drm_i915_gem_object is to use to_intel_bo().
      
      BUG: unable to handle kernel NULL pointer dereference at 00000069
      IP: [<c11a4a02>] i915_gem_do_execbuffer+0x71f/0xbb6
      *pde = 00000000
      Oops: 0000 [#1] SMP
      last sysfs file: /sys/devices/virtual/vc/vcsa3/uevent
      
      Pid: 10993, comm: X Not tainted 2.6.35-rc2+ #67 /
      EIP: 0060:[<c11a4a02>] EFLAGS: 00213202 CPU: 0
      EIP is at i915_gem_do_execbuffer+0x71f/0xbb6
      EAX: f647e8a8 EBX: 00000000 ECX: 00000003 EDX: 00000000
      ESI: 00424000 EDI: 00000000 EBP: f6508e48 ESP: f6508dd4
       DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
      Process X (pid: 10993, ti=f6508000 task=f6432880 task.ti=f6508000)
      Stack:
       f6508de0 f7130000 00000001 00000000 00000000 f647e8a8 00000000 f64f8480
      <0> f7974414 00000000 00000006 00000000 00000000 f6578000 00000008 00000006
      <0> f6797880 00400000 00000000 ffffffe4 f7974400 000000d0 000000d0 000001c0
      Call Trace:
       [<c11a4f3a>] ? i915_gem_execbuffer2+0xa1/0xe7
       [<c118ab96>] ? drm_ioctl+0x22c/0x2fa
       [<c11a4e99>] ? i915_gem_execbuffer2+0x0/0xe7
       [<c107e88c>] ? do_sync_read+0x8f/0xca
       [<c1088cbd>] ? vfs_ioctl+0x2c/0x96
       [<c118a96a>] ? drm_ioctl+0x0/0x2fa
       [<c10891f4>] ? do_vfs_ioctl+0x429/0x45a
       [<c107e5c9>] ? fsnotify_access+0x54/0x5f
       [<c107ee1c>] ? vfs_read+0x9a/0xae
       [<c1089258>] ? sys_ioctl+0x33/0x4d
       [<c1002610>] ? sysenter_do_call+0x12/0x26
      Code: d0 89 4d c4 31 c9 89 45 d8 eb 44 8b 45 cc 8b 14 88 8b 42 50 89 45
      bc 8b 45 a0 8b 52 38 89 55 d0 31 d2 f6 40 20 01 74 0d 8b 55 bc <f6> 42
      69 30 0f 95 c2 0f b6 d2 8b 45 d0 c7 45 d4 00 00 00 00 89
      EIP: [<c11a4a02>] i915_gem_do_execbuffer+0x71f/0xbb6 SS:ESP 0068:f6508dd4
      CR2: 0000000000000069
      ---[ end trace 3f1d514b34d39381 ]---
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      43b27f40
  2. 20 7月, 2010 1 次提交
  3. 19 7月, 2010 2 次提交
    • D
      mm: add context argument to shrinker callback · 7f8275d0
      Dave Chinner 提交于
      The current shrinker implementation requires the registered callback
      to have global state to work from. This makes it difficult to shrink
      caches that are not global (e.g. per-filesystem caches). Pass the shrinker
      structure to the callback so that users can embed the shrinker structure
      in the context the shrinker needs to operate on and get back to it in the
      callback via container_of().
      Signed-off-by: NDave Chinner <dchinner@redhat.com>
      Reviewed-by: NChristoph Hellwig <hch@lst.de>
      7f8275d0
    • L
      drm/i915: add 'reclaimable' to i915 self-reclaimable page allocations · cd9f040d
      Linus Torvalds 提交于
      The hibernate issues that got fixed in commit 985b823b ("drm/i915:
      fix hibernation since i915 self-reclaim fixes") turn out to have been
      incomplete.  Vefa Bicakci tested lots of hibernate cycles, and without
      the __GFP_RECLAIMABLE flag the system eventually fails to resume.
      
      With the flag added, Vefa can apparently hibernate forever (or until he
      gets bored running his automated scripts, whichever comes first).
      
      The reclaimable flag was there originally, and was one of the flags that
      were dropped (unintentionally) by commit 4bdadb97 ("drm/i915:
      Selectively enable self-reclaim") that introduced all these problems,
      but I didn't want to just blindly add back all the flags in commit
      985b823b, and it looked like __GFP_RECLAIM wasn't necessary.  It
      clearly was.
      
      I still suspect that there is some subtle reason we're missing that
      causes the problems, but __GFP_RECLAIMABLE is certainly not wrong to use
      in this context, and is what the code historically used.  And we have no
      idea what the causes the corruption without it.
      Reported-and-tested-by: NM. Vefa Bicakci <bicave@superonline.com>
      Cc: Dave Airlie <airlied@gmail.com>
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cd9f040d
  4. 07 7月, 2010 1 次提交
  5. 06 7月, 2010 1 次提交
    • C
      drm/i915: Explosion following OOM in do_execbuffer. · 6f772d7e
      Chris Wilson 提交于
      Oops, when merging the extra details following an OOM, I missed that
      driver_private is now NULL and the correct way to convert from the
      drm_gem_object into the drm_i915_gem_object is to use to_intel_bo().
      
      BUG: unable to handle kernel NULL pointer dereference at 00000069
      IP: [<c11a4a02>] i915_gem_do_execbuffer+0x71f/0xbb6
      *pde = 00000000
      Oops: 0000 [#1] SMP
      last sysfs file: /sys/devices/virtual/vc/vcsa3/uevent
      
      Pid: 10993, comm: X Not tainted 2.6.35-rc2+ #67 /
      EIP: 0060:[<c11a4a02>] EFLAGS: 00213202 CPU: 0
      EIP is at i915_gem_do_execbuffer+0x71f/0xbb6
      EAX: f647e8a8 EBX: 00000000 ECX: 00000003 EDX: 00000000
      ESI: 00424000 EDI: 00000000 EBP: f6508e48 ESP: f6508dd4
       DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
      Process X (pid: 10993, ti=f6508000 task=f6432880 task.ti=f6508000)
      Stack:
       f6508de0 f7130000 00000001 00000000 00000000 f647e8a8 00000000 f64f8480
      <0> f7974414 00000000 00000006 00000000 00000000 f6578000 00000008 00000006
      <0> f6797880 00400000 00000000 ffffffe4 f7974400 000000d0 000000d0 000001c0
      Call Trace:
       [<c11a4f3a>] ? i915_gem_execbuffer2+0xa1/0xe7
       [<c118ab96>] ? drm_ioctl+0x22c/0x2fa
       [<c11a4e99>] ? i915_gem_execbuffer2+0x0/0xe7
       [<c107e88c>] ? do_sync_read+0x8f/0xca
       [<c1088cbd>] ? vfs_ioctl+0x2c/0x96
       [<c118a96a>] ? drm_ioctl+0x0/0x2fa
       [<c10891f4>] ? do_vfs_ioctl+0x429/0x45a
       [<c107e5c9>] ? fsnotify_access+0x54/0x5f
       [<c107ee1c>] ? vfs_read+0x9a/0xae
       [<c1089258>] ? sys_ioctl+0x33/0x4d
       [<c1002610>] ? sysenter_do_call+0x12/0x26
      Code: d0 89 4d c4 31 c9 89 45 d8 eb 44 8b 45 cc 8b 14 88 8b 42 50 89 45
      bc 8b 45 a0 8b 52 38 89 55 d0 31 d2 f6 40 20 01 74 0d 8b 55 bc <f6> 42
      69 30 0f 95 c2 0f b6 d2 8b 45 d0 c7 45 d4 00 00 00 00 89
      EIP: [<c11a4a02>] i915_gem_do_execbuffer+0x71f/0xbb6 SS:ESP 0068:f6508dd4
      CR2: 0000000000000069
      ---[ end trace 3f1d514b34d39381 ]---
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      6f772d7e
  6. 02 7月, 2010 1 次提交
  7. 29 5月, 2010 9 次提交
  8. 27 5月, 2010 6 次提交
  9. 11 5月, 2010 1 次提交
  10. 08 5月, 2010 1 次提交
  11. 24 4月, 2010 1 次提交
  12. 23 4月, 2010 1 次提交
  13. 20 4月, 2010 5 次提交
  14. 19 4月, 2010 1 次提交
    • D
      drm/i915: fix tiling limits for i915 class hw v2 · c36a2a6d
      Daniel Vetter 提交于
      Current code is definitely crap: Largest pitch allowed spills into
      the TILING_Y bit of the fence registers ... :(
      
      I've rewritten the limits check under the assumption that 3rd gen hw
      has a 3d pitch limit of 8kb (like 2nd gen). This is supported by an
      otherwise totally misleading XXX comment.
      
      This bug mostly resulted in tiling-corrupted pixmaps because the kernel
      allowed too wide buffers to be tiled. Bug brought to the light by the
      xf86-video-intel 2.11 release because that unconditionally enabled
      tiling for pixmaps, relying on the kernel to check things. Tiling for
      the framebuffer was not affected because the ddx does some additional
      checks there ensure the buffer is within hw-limits.
      
      v2: Instead of computing the value that would be written into the
      hw fence registers and then checking the limits simply check whether
      the stride is above the 8kb limit. To better document the hw, add
      some WARN_ONs in i915_write_fence_reg like I've done for the i830
      case (using the right limits).
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27449Tested-by: NAlexander Lam <lambchop468@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: NEric Anholt <eric@anholt.net>
      c36a2a6d
  15. 30 3月, 2010 1 次提交
    • T
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking... · 5a0e3ad6
      Tejun Heo 提交于
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
      
      percpu.h is included by sched.h and module.h and thus ends up being
      included when building most .c files.  percpu.h includes slab.h which
      in turn includes gfp.h making everything defined by the two files
      universally available and complicating inclusion dependencies.
      
      percpu.h -> slab.h dependency is about to be removed.  Prepare for
      this change by updating users of gfp and slab facilities include those
      headers directly instead of assuming availability.  As this conversion
      needs to touch large number of source files, the following script is
      used as the basis of conversion.
      
        http://userweb.kernel.org/~tj/misc/slabh-sweep.py
      
      The script does the followings.
      
      * Scan files for gfp and slab usages and update includes such that
        only the necessary includes are there.  ie. if only gfp is used,
        gfp.h, if slab is used, slab.h.
      
      * When the script inserts a new include, it looks at the include
        blocks and try to put the new include such that its order conforms
        to its surrounding.  It's put in the include block which contains
        core kernel includes, in the same order that the rest are ordered -
        alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
        doesn't seem to be any matching order.
      
      * If the script can't find a place to put a new include (mostly
        because the file doesn't have fitting include block), it prints out
        an error message indicating which .h file needs to be added to the
        file.
      
      The conversion was done in the following steps.
      
      1. The initial automatic conversion of all .c files updated slightly
         over 4000 files, deleting around 700 includes and adding ~480 gfp.h
         and ~3000 slab.h inclusions.  The script emitted errors for ~400
         files.
      
      2. Each error was manually checked.  Some didn't need the inclusion,
         some needed manual addition while adding it to implementation .h or
         embedding .c file was more appropriate for others.  This step added
         inclusions to around 150 files.
      
      3. The script was run again and the output was compared to the edits
         from #2 to make sure no file was left behind.
      
      4. Several build tests were done and a couple of problems were fixed.
         e.g. lib/decompress_*.c used malloc/free() wrappers around slab
         APIs requiring slab.h to be added manually.
      
      5. The script was run on all .h files but without automatically
         editing them as sprinkling gfp.h and slab.h inclusions around .h
         files could easily lead to inclusion dependency hell.  Most gfp.h
         inclusion directives were ignored as stuff from gfp.h was usually
         wildly available and often used in preprocessor macros.  Each
         slab.h inclusion directive was examined and added manually as
         necessary.
      
      6. percpu.h was updated not to include slab.h.
      
      7. Build test were done on the following configurations and failures
         were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
         distributed build env didn't work with gcov compiles) and a few
         more options had to be turned off depending on archs to make things
         build (like ipr on powerpc/64 which failed due to missing writeq).
      
         * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
         * powerpc and powerpc64 SMP allmodconfig
         * sparc and sparc64 SMP allmodconfig
         * ia64 SMP allmodconfig
         * s390 SMP allmodconfig
         * alpha SMP allmodconfig
         * um on x86_64 SMP allmodconfig
      
      8. percpu.h modifications were reverted so that it could be applied as
         a separate patch and serve as bisection point.
      
      Given the fact that I had only a couple of failures from tests on step
      6, I'm fairly confident about the coverage of this conversion patch.
      If there is a breakage, it's likely to be something in one of the arch
      headers which should be easily discoverable easily on most builds of
      the specific arch.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Guess-its-ok-by: NChristoph Lameter <cl@linux-foundation.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
      5a0e3ad6
  16. 26 3月, 2010 1 次提交