On Thu, Sep 19, 2013 at 08:57:04AM +0200, Daniel Vetter wrote: > On Wed, Sep 18, 2013 at 10:38 PM, Dave Chinner <david@xxxxxxxxxxxxx> wrote: > > No, that's wrong. ->count_objects should never ass SHRINK_STOP. > > Indeed, it should always return a count of objects in the cache, > > regardless of the context. > > > > SHRINK_STOP is for ->scan_objects to tell the shrinker it can make > > any progress due to the context it is called in. This allows the > > shirnker to defer the work to another call in a different context. > > However, if ->count-objects doesn't return a count, the work that > > was supposed to be done cannot be deferred, and that is what > > ->count_objects should always return the number of objects in the > > cache. > > So we should rework the locking in the drm/i915 shrinker to be able to > always count objects? Thus far no one screamed yet that we're not > really able to do that in all call contexts ... It's not the end of the world if you count no objects. in an ideal world, you keep a count of the object sizes on the LRU when you add/remove the objects on the list, that way .count_objects doesn't need to walk or lock anything, which is what things like the inode and dentry caches do... > > So should I revert 81e49f or will the early return 0; completely upset > the core shrinker logic? It looks to me like 81e49f changed the wrong function to return SHRINK_STOP. It should have changed i915_gem_inactive_scan() to return SHRINK_STOP when the locks could not be taken, not i915_gem_inactive_count(). What should happen is this: max_pass = count_objects() if (max_pass == 0) /* skip to next shrinker */ /* calculate total_scan from max_pass and previous leftovers */ while (total_scan) { freed = scan_objects(batch_size) if (freed == SHRINK_STOP) break; /* can't make progress */ total_scan -= batch_size; } /* save remaining total_scan for next pass */ i.e. SHRINK_STOP will abort the scan loop when nothing can be done. Right now, if nothing can be done because the locks can't be taken, the scan loop will continue running until total_scan reaches zero. i.e. it does a whole lotta nothing. So right now, I'd revert 81e49f and then convert i915_gem_inactive_scan() to return SHRINK_STOP if it can't get locks, and everything shoul dwork just fine... Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx