Use mutex_lock_killable() in ap_bus_force_rescan()
Subsystems (2)
Harald Freudenberger
maintainerv4 cover Use mutex_lock_killable() in ap_bus_force_rescan()
A deep dive into the AP bus code and zcrypt device driver about the usage of mutex locking showed that there is one questionable call in ap_bus.c in function ap_bus_force_rescan(). This function may be called in kernel and process context. In both contexts only one info is important: was there a AP bus scan running and did it result in some updates on the AP devices. So only true/false is returned but no info like -EINTR. But still the mutex lock call should be interruptible to be able to kill a user space program blocked forever on this. So this patch replaces mutex_lock_interruptible() with mutex_lock_killable() to be able to handle SIGKILL especially in user space process context.
v1 - initial version
v2 - with v1 came up some discussion from Holger and Heiko. Heiko especially
wanted me to rephrase the header of the patch.
However v2 went out with a rewrite of the code as discussed and suggested by Holger but Heikos complain were not addressed.
v3 - now and finally I rephrased the patch header. Let's see what feedback
I'll get for this now.
v4 - Rephrased the subject, Reviewed-by updated
Harald Freudenberger (1):
s390/ap: Use mutex_lock_killable() in ap_bus_force_rescan()
drivers/s390/crypto/ap_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.43.0
Harald Freudenberger
maintainerPATCH v4 1/1 s390/ap: Use mutex_lock_killable() in ap_bus_force_rescan()
A deep dive into the AP bus code and zcrypt device driver about the usage of mutex locking showed that there is one questionable call in ap_bus.c in function ap_bus_force_rescan(). This function may be called in kernel and process context. In both contexts only one info is important: was there a AP bus scan running and did it result in some updates on the AP devices. So only true/false is returned but no info like -EINTR. But still the mutex lock call should be interruptible to be able to kill a user space program blocked forever on this. So this patch replaces mutex_lock_interruptible() with mutex_lock_killable() to be able to handle SIGKILL especially in user space process context.
--- drivers/s390/crypto/ap_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/crypto/ap_bus.c +2 -2
@@ -1173,8 +1173,8 @@ bool ap_bus_force_rescan(void)* for the lock which means the other task has finished and * stored the result in ap_scan_bus_result. */ -if (mutex_lock_interruptible (&ap_scan_bus_mutex)) { -/* some error occurred, ignore and go out */ +if (mutex_lock_killable (&ap_scan_bus_mutex)) { +/* fatal signal received, go out */ goto out; } rc = ap_scan_bus_result;
Signature · 1 line
2.43.0
Quoted 21 lines · Harald Freudenberger
A deep dive into the AP bus code and zcrypt device driver about the usage of mutex locking showed that there is one questionable call in
ap_bus.cin functionap_bus_force_rescan(). This function may be called in kernel and process context. In both contexts only one info is important: was there a AP bus scan running and did it result in some updates on the AP devices. So only true/false is returned but no info like-EINTR. But still the mutex lock call should be interruptible to be able to kill a user space program blocked forever on this. So this patch replacesmutex_lock_interruptible()withmutex_lock_killable()to be able to handle SIGKILL especially in user space process context.v1 - initial version
v2 - with v1 came up some discussion from Holger and Heiko. Heiko especially
wanted me to rephrase the header of the patch.
However v2 went out with a rewrite of the code as discussed and suggested by Holger but Heikos complain were not addressed.
v3 - now and finally I rephrased the patch header. Let's see what feedback
I'll get for this now.
v4 - Rephrased the subject, Reviewed-by updated
Quoted 5 lines
Harald Freudenberger (1):
s390/ap: Usemutex_lock_killable()inap_bus_force_rescan()drivers/s390/crypto/ap_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thank you!