Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1594759

[PATCH RT 5/9] rt: Drop mutex_disable() on !DEBUG configs and the GPL

Show key headers only | View raw

4.1.38-rt46-rc1 stable review patch.
If you have any objection to the inclusion of this patch, let me know.

--- 8< --- 8< --- 8< ---
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

Alex Goins reported that mutex_destroy() on RT will force a GPL only symbol
which won't link and therefore fail on a non-GPL kernel module.
This does not happen on !RT and is a regression on RT which we would like to
avoid.
I try here the easy thing and to not use rt_mutex_destroy() if
CONFIG_DEBUG_MUTEXES is not enabled. This will still break for the DEBUG
configs so instead of adding a wrapper around rt_mutex_destroy() (which we have
for rt_mutex_lock() for instance) I am simply dropping the GPL part from the
export.

Reported-by: Alex Goins <agoins@nvidia.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
(cherry picked from commit 93f3bd72784ed58cbba1a32b043a842f205a631f)
Signed-off-by: Julia Cartwright <julia@ni.com>
---
 include/linux/mutex_rt.h | 5 +++++
 kernel/locking/rtmutex.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/linux/mutex_rt.h b/include/linux/mutex_rt.h
index c38a44b14da5..e0284edec655 100644
--- a/include/linux/mutex_rt.h
+++ b/include/linux/mutex_rt.h
@@ -43,7 +43,12 @@ extern void __lockfunc _mutex_unlock(struct mutex *lock);
 #define mutex_lock_killable(l)		_mutex_lock_killable(l)
 #define mutex_trylock(l)		_mutex_trylock(l)
 #define mutex_unlock(l)			_mutex_unlock(l)
+
+#ifdef CONFIG_DEBUG_MUTEXES
 #define mutex_destroy(l)		rt_mutex_destroy(&(l)->lock)
+#else
+static inline void mutex_destroy(struct mutex *lock) {}
+#endif
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 # define mutex_lock_nested(l, s)	_mutex_lock_nested(l, s)
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index e0b0d9b419b5..469075e06cde 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -2015,8 +2015,7 @@ void rt_mutex_destroy(struct rt_mutex *lock)
 	lock->magic = NULL;
 #endif
 }
-
-EXPORT_SYMBOL_GPL(rt_mutex_destroy);
+EXPORT_SYMBOL(rt_mutex_destroy);
 
 /**
  * __rt_mutex_init - initialize the rt lock
-- 
2.11.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH RT 0/9] Linux 4.1.38-rt46-rc1 Julia Cartwright <julia@ni.com> - 2017-03-08 01:10 +0100
  [PATCH RT 6/9] lockdep: Handle statically initialized PER_CPU locks Julia Cartwright <julia@ni.com> - 2017-03-08 01:30 +0100
  [PATCH RT 7/9] rt: Drop the removal of _GPL from rt_mutex_destroy()'s Julia Cartwright <julia@ni.com> - 2017-03-08 01:40 +0100
  [PATCH RT 5/9] rt: Drop mutex_disable() on !DEBUG configs and the GPL Julia Cartwright <julia@ni.com> - 2017-03-08 01:40 +0100
  [PATCH RT 9/9] Linux 4.1.38-rt46-rc1 Julia Cartwright <julia@ni.com> - 2017-03-08 02:00 +0100
  [PATCH RT 1/9] cpuset: Convert callback_lock to raw_spinlock_t Julia Cartwright <julia@ni.com> - 2017-03-08 02:00 +0100
  [PATCH RT 2/9] radix-tree: use local locks Julia Cartwright <julia@ni.com> - 2017-03-08 02:20 +0100
  [PATCH RT 8/9] lockdep: Fix compilation error for !CONFIG_MODULES and Julia Cartwright <julia@ni.com> - 2017-03-08 04:40 +0100

csiph-web