cgroup: Fix compilation issue due to cgroup_mutex not being exported
PATCH v2 1/1 cgroup: Fix compilation issue due to cgroup_mutex not being exported
When adding folio_memcg function call in the zram module for Android 16-6.12, the following error occurs during compilation:
ERROR: modpost: "cgroup_mutex" [../soc-repo/zram.ko] undefined!
This error is caused by the indirect call to lockdep_is_held(&cgroup_mutex) within folio_memcg. The export setting for cgroup_mutex is controlled by the CONFIG_PROVE_RCU macro. If CONFIG_LOCKDEP is enabled while CONFIG_PROVE_RCU is not, this compilation error will occur.
To resolve this issue, add a parallel macro CONFIG_LOCKDEP control to ensure cgroup_mutex is properly exported when needed.
---
v1 -> v2: update the notes of the description above DEFINE_MUTEX(cgroup_mutex) per Kamalesh's suggestion.
--- kernel/cgroup/cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/cgroup/cgroup.c +3 -3
@@ -84,13 +84,13 @@* css_set_lock protects task->cgroups pointer, the list of css_set * objects, and the chain of tasks off each css_set. * -* These locks are exported if CONFIG_PROVE_RCU so that accessors in -* cgroup.h can use them for lockdep annotations. +* These locks are exported if CONFIG_PROVE_RCU or CONFIG_LOCKDEP so that +* accessors in cgroup.h can use them for lockdep annotations. */ DEFINE_MUTEX (cgroup_mutex);DEFINE_SPINLOCK (css_set_lock); -#ifdef CONFIG_PROVE_RCU +#if (definedCONFIG_PROVE_RCU || definedCONFIG_LOCKDEP )EXPORT_SYMBOL_GPL (cgroup_mutex);EXPORT_SYMBOL_GPL (css_set_lock);#endif
Signature · 1 line
2.17.1
Hi,
On 4/18/25 8:12 AM, gaoxu wrote:
[...]
kernel/cgroup/cgroup.c line 89
Quoted 13 lines
kernel/cgroup/cgroup.c +2
-2@@ -84,13 +84,13 @@* css_set_lock protects task->cgroups pointer, the list of css_set * objects, and the chain of tasks off each css_set. * -* These locks are exported if CONFIG_PROVE_RCU so that accessors in -* cgroup.h can use them for lockdep annotations. +* These locks are exported if CONFIG_PROVE_RCU or CONFIG_LOCKDEP so that +* accessors in cgroup.h can use them for lockdep annotations. */
Tejun has already merged the initial version of the patch without the updated description. You may want to send the description change as a separate patch, rebased on top of the cgroup/for-next branch.
I've rephrased the description to clarify that lockdep annotations can occur even without CONFIG_PROVE_RCU. Feel free to use this version or modify it further:
"Export locks for lockdep annotations. Use CONFIG_PROVE_RCU for accessors in cgroup.h, and CONFIG_LOCKDEP for accessors that do not require CONFIG_PROVE_RCU."
Signature · 2 lines
Cheers, Kamalesh
Quoted 25 lines
Hi,
On 4/18/25 8:12 AM, gaoxu wrote:
[...]
Quoted 5 lines
kernel/cgroup/cgroup.c index renamed from kernel/cgroup/cgroup.c +0
-0
447ac857e..c1bc51058100644kernel/cgroup/cgroup.c line 90
Quoted 9 lines
kernel/cgroup/cgroup.c +3
-2@@ -84,13 +84,13 @@* css_set_lock protects task->cgroups pointer, the list of css_set * objects, and the chain of tasks off each css_set. * -* These locks are exported if CONFIG_PROVE_RCU so that accessors in -* cgroup.h can use them for lockdep annotations. +* These locks are exported if CONFIG_PROVE_RCU or CONFIG_LOCKDEP so +that +* accessors in cgroup.h can use them for lockdep annotations. */ Tejun has already merged the initial version of the patch without the updated description. You may want to send the description change as a separate patch, rebased on top of the cgroup/for-next branch.
Quoted 5 lines
I've rephrased the description to clarify that lockdep annotations can occur even without
CONFIG_PROVE_RCU. Feel free to use this version or modify it further:
"Export locks for lockdep annotations. UseCONFIG_PROVE_RCUfor accessors incgroup.h, andCONFIG_LOCKDEPfor accessors that do not requireCONFIG_PROVE_RCU."
Received, thanks!
Quoted 4 lines
--
Cheers,
Kamalesh