Skip to content

Commit ae65a52

Browse files
committed
mm/slab: document kfree() as allowed for kmem_cache_alloc() objects
This will make it easier to free objects in situations when they can come from either kmalloc() or kmem_cache_alloc(), and also allow kfree_rcu() for freeing objects from kmem_cache_alloc(). For the SLAB and SLUB allocators this was always possible so with SLOB gone, we can document it as supported. Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: "Paul E. McKenney" <paulmck@kernel.org> Cc: Frederic Weisbecker <frederic@kernel.org> Cc: Neeraj Upadhyay <quic_neeraju@quicinc.com> Cc: Josh Triplett <josh@joshtriplett.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Joel Fernandes <joel@joelfernandes.org>
1 parent 6630e95 commit ae65a52

3 files changed

Lines changed: 18 additions & 10 deletions

File tree

Documentation/core-api/memory-allocation.rst

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,16 @@ should be used if a part of the cache might be copied to the userspace.
170170
After the cache is created kmem_cache_alloc() and its convenience
171171
wrappers can allocate memory from that cache.
172172

173-
When the allocated memory is no longer needed it must be freed. You can
174-
use kvfree() for the memory allocated with `kmalloc`, `vmalloc` and
175-
`kvmalloc`. The slab caches should be freed with kmem_cache_free(). And
176-
don't forget to destroy the cache with kmem_cache_destroy().
173+
When the allocated memory is no longer needed it must be freed.
174+
175+
Objects allocated by `kmalloc` can be freed by `kfree` or `kvfree`. Objects
176+
allocated by `kmem_cache_alloc` can be freed with `kmem_cache_free`, `kfree`
177+
or `kvfree`, where the latter two might be more convenient thanks to not
178+
needing the kmem_cache pointer.
179+
180+
The same rules apply to _bulk and _rcu flavors of freeing functions.
181+
182+
Memory allocated by `vmalloc` can be freed with `vfree` or `kvfree`.
183+
Memory allocated by `kvmalloc` can be freed with `kvfree`.
184+
Caches created by `kmem_cache_create` should be freed with
185+
`kmem_cache_destroy` only after freeing all the allocated objects first.

include/linux/rcupdate.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,8 +976,10 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
976976
* either fall back to use of call_rcu() or rearrange the structure to
977977
* position the rcu_head structure into the first 4096 bytes.
978978
*
979-
* Note that the allowable offset might decrease in the future, for example,
980-
* to allow something like kmem_cache_free_rcu().
979+
* The object to be freed can be allocated either by kmalloc() or
980+
* kmem_cache_alloc().
981+
*
982+
* Note that the allowable offset might decrease in the future.
981983
*
982984
* The BUILD_BUG_ON check must not involve any function calls, hence the
983985
* checks are done in macros here.

mm/slab_common.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -989,12 +989,9 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
989989

990990
/**
991991
* kfree - free previously allocated memory
992-
* @object: pointer returned by kmalloc.
992+
* @object: pointer returned by kmalloc() or kmem_cache_alloc()
993993
*
994994
* If @object is NULL, no operation is performed.
995-
*
996-
* Don't free memory not originally allocated by kmalloc()
997-
* or you will run into trouble.
998995
*/
999996
void kfree(const void *object)
1000997
{

0 commit comments

Comments
 (0)