ANDROID: vendor_hook: add hooks to protect locking-tsk in cpu scheduler
Providing vendor hooks to record the start time of holding the lock, which protects rwsem/mutex locking-process from being preemptedfor a short time in some cases. - android_vh_record_mutex_lock_starttime - android_vh_record_rtmutex_lock_starttime - android_vh_record_rwsem_lock_starttime - android_vh_record_percpu_rwsem_lock_starttime Bug: 241191475 Signed-off-by: Peifeng Li <lipeifeng@oppo.com> Change-Id: I0e967a1e8b77c32a1ad588acd54028fae2f90c4e
This commit is contained in:

committed by
Matthias Männich

parent
fb39cdb9ea
commit
eed2741ae6
@@ -279,6 +279,10 @@ static inline bool rwsem_read_trylock(struct rw_semaphore *sem)
|
||||
long cnt = atomic_long_add_return_acquire(RWSEM_READER_BIAS, &sem->count);
|
||||
if (WARN_ON_ONCE(cnt < 0))
|
||||
rwsem_set_nonspinnable(sem);
|
||||
|
||||
if ((cnt & RWSEM_READ_FAILED_MASK) == 0)
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
|
||||
return !(cnt & RWSEM_READ_FAILED_MASK);
|
||||
}
|
||||
|
||||
@@ -1021,9 +1025,11 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, int state)
|
||||
raw_spin_unlock_irq(&sem->wait_lock);
|
||||
wake_up_q(&wake_q);
|
||||
}
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
return sem;
|
||||
} else if (rwsem_reader_phase_trylock(sem, waiter.last_rowner)) {
|
||||
/* rwsem_reader_phase_trylock() implies ACQUIRE on success */
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
return sem;
|
||||
}
|
||||
|
||||
@@ -1104,6 +1110,7 @@ queue:
|
||||
__set_current_state(TASK_RUNNING);
|
||||
trace_android_vh_rwsem_read_wait_finish(sem);
|
||||
lockevent_inc(rwsem_rlock);
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
return sem;
|
||||
|
||||
out_nolock:
|
||||
@@ -1150,6 +1157,7 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state)
|
||||
if (rwsem_can_spin_on_owner(sem, RWSEM_WR_NONSPINNABLE) &&
|
||||
rwsem_optimistic_spin(sem, true)) {
|
||||
/* rwsem_optimistic_spin() implies ACQUIRE on success */
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
return sem;
|
||||
}
|
||||
|
||||
@@ -1280,7 +1288,7 @@ trylock_again:
|
||||
rwsem_disable_reader_optspin(sem, disable_rspin);
|
||||
raw_spin_unlock_irq(&sem->wait_lock);
|
||||
lockevent_inc(rwsem_wlock);
|
||||
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
return ret;
|
||||
|
||||
out_nolock:
|
||||
@@ -1396,6 +1404,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
|
||||
if (atomic_long_try_cmpxchg_acquire(&sem->count, &tmp,
|
||||
tmp + RWSEM_READER_BIAS)) {
|
||||
rwsem_set_reader_owned(sem);
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
return 1;
|
||||
}
|
||||
} while (!(tmp & RWSEM_READ_FAILED_MASK));
|
||||
@@ -1410,10 +1419,12 @@ static inline void __down_write(struct rw_semaphore *sem)
|
||||
long tmp = RWSEM_UNLOCKED_VALUE;
|
||||
|
||||
if (unlikely(!atomic_long_try_cmpxchg_acquire(&sem->count, &tmp,
|
||||
RWSEM_WRITER_LOCKED)))
|
||||
RWSEM_WRITER_LOCKED))) {
|
||||
rwsem_down_write_slowpath(sem, TASK_UNINTERRUPTIBLE);
|
||||
else
|
||||
} else {
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
rwsem_set_owner(sem);
|
||||
}
|
||||
}
|
||||
|
||||
static inline int __down_write_killable(struct rw_semaphore *sem)
|
||||
@@ -1425,6 +1436,7 @@ static inline int __down_write_killable(struct rw_semaphore *sem)
|
||||
if (IS_ERR(rwsem_down_write_slowpath(sem, TASK_KILLABLE)))
|
||||
return -EINTR;
|
||||
} else {
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
rwsem_set_owner(sem);
|
||||
}
|
||||
return 0;
|
||||
@@ -1440,6 +1452,7 @@ static inline int __down_write_trylock(struct rw_semaphore *sem)
|
||||
if (atomic_long_try_cmpxchg_acquire(&sem->count, &tmp,
|
||||
RWSEM_WRITER_LOCKED)) {
|
||||
rwsem_set_owner(sem);
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, jiffies);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -1455,6 +1468,7 @@ static inline void __up_read(struct rw_semaphore *sem)
|
||||
DEBUG_RWSEMS_WARN_ON(sem->magic != sem, sem);
|
||||
DEBUG_RWSEMS_WARN_ON(!is_rwsem_reader_owned(sem), sem);
|
||||
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, 0);
|
||||
rwsem_clear_reader_owned(sem);
|
||||
tmp = atomic_long_add_return_release(-RWSEM_READER_BIAS, &sem->count);
|
||||
DEBUG_RWSEMS_WARN_ON(tmp < 0, sem);
|
||||
@@ -1481,6 +1495,7 @@ static inline void __up_write(struct rw_semaphore *sem)
|
||||
DEBUG_RWSEMS_WARN_ON((rwsem_owner(sem) != current) &&
|
||||
!rwsem_test_oflags(sem, RWSEM_NONSPINNABLE), sem);
|
||||
|
||||
trace_android_vh_record_rwsem_lock_starttime(current, 0);
|
||||
rwsem_clear_owner(sem);
|
||||
tmp = atomic_long_fetch_add_release(-RWSEM_WRITER_LOCKED, &sem->count);
|
||||
if (unlikely(tmp & RWSEM_FLAG_WAITERS))
|
||||
|
Reference in New Issue
Block a user