Skip to content

Commit

Permalink
mm, slub: restore the original intention of prefetch_freepointer()
Browse files Browse the repository at this point in the history
In SLUB, prefetch_freepointer() is used when allocating an object from
cache's freelist, to make sure the next object in the list is cache-hot,
since it's probable it will be allocated soon.

Commit 2482dde ("mm: add SLUB free list pointer obfuscation") has
unintentionally changed the prefetch in a way where the prefetch is
turned to a real fetch, and only the next->next pointer is prefetched.
In case there is not a stream of allocations that would benefit from
prefetching, the extra real fetch might add a useless cache miss to the
allocation.  Restore the previous behavior.

Link: http://lkml.kernel.org/r/[email protected]
Fixes: 2482dde ("mm: add SLUB free list pointer obfuscation")
Signed-off-by: Vlastimil Babka <[email protected]>
Acked-by: Kees Cook <[email protected]>
Cc: Daniel Micay <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Joonsoo Kim <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
tehcaster authored and torvalds committed Aug 17, 2018
1 parent 1f4aace commit 0882ff9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,7 @@ static inline void *get_freepointer(struct kmem_cache *s, void *object)

static void prefetch_freepointer(const struct kmem_cache *s, void *object)
{
if (object)
prefetch(freelist_dereference(s, object + s->offset));
prefetch(object + s->offset);
}

static inline void *get_freepointer_safe(struct kmem_cache *s, void *object)
Expand Down

0 comments on commit 0882ff9

Please sign in to comment.