hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/kernel/locking/rwsem.c
....@@ -28,7 +28,6 @@
2828 #include <linux/rwsem.h>
2929 #include <linux/atomic.h>
3030
31
-#ifndef CONFIG_PREEMPT_RT
3231 #include "lock_events.h"
3332 #include <trace/hooks/rwsem.h>
3433 #include <trace/hooks/dtask.h>
....@@ -1525,7 +1524,6 @@
15251524 if (tmp & RWSEM_FLAG_WAITERS)
15261525 rwsem_downgrade_wake(sem);
15271526 }
1528
-#endif
15291527
15301528 /*
15311529 * lock for reading
....@@ -1639,6 +1637,7 @@
16391637 void up_write(struct rw_semaphore *sem)
16401638 {
16411639 rwsem_release(&sem->dep_map, _RET_IP_);
1640
+ trace_android_vh_rwsem_write_finished(sem);
16421641 __up_write(sem);
16431642 }
16441643 EXPORT_SYMBOL(up_write);
....@@ -1649,6 +1648,7 @@
16491648 void downgrade_write(struct rw_semaphore *sem)
16501649 {
16511650 lock_downgrade(&sem->dep_map, _RET_IP_);
1651
+ trace_android_vh_rwsem_write_finished(sem);
16521652 __downgrade_write(sem);
16531653 }
16541654 EXPORT_SYMBOL(downgrade_write);
....@@ -1689,9 +1689,7 @@
16891689 {
16901690 might_sleep();
16911691 __down_read(sem);
1692
-#ifndef CONFIG_PREEMPT_RT
16931692 __rwsem_set_reader_owned(sem, NULL);
1694
-#endif
16951693 }
16961694 EXPORT_SYMBOL(down_read_non_owner);
16971695
....@@ -1720,9 +1718,7 @@
17201718
17211719 void up_read_non_owner(struct rw_semaphore *sem)
17221720 {
1723
-#ifndef CONFIG_PREEMPT_RT
17241721 DEBUG_RWSEMS_WARN_ON(!is_rwsem_reader_owned(sem), sem);
1725
-#endif
17261722 __up_read(sem);
17271723 }
17281724 EXPORT_SYMBOL(up_read_non_owner);