android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "locking/rwsem: Add vendor hook for rwsem enhancement""

Browse Source
This commit is contained in:
qctecmdr 2021-11-18 20:21:55 -08:00 committed by Gerrit - the friendly Code Review server
commit 5361cb67a5
1 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/soc/qcom/qcom_cpu_vendor_hooks.c
View File

@ -16,8 +16,6 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
#include <linux/sched/debug.h>
#include <linux/sched/task.h>
#include <linux/rwsem.h>
#include <linux/io.h>
#include <soc/qcom/watchdog.h>
@ -25,9 +23,6 @@
#include <trace/hooks/debug.h>
#include <trace/hooks/printk.h>
#include <trace/hooks/timer.h>
#include <trace/hooks/rwsem.h>
#define RWSEM_MAX_PREEMPT_ALLOWED 3000
static DEFINE_PER_CPU(struct pt_regs, regs_before_stop);
static DEFINE_RAW_SPINLOCK(stop_lock);
@ -107,45 +102,6 @@ static void register_spinlock_bug_hook(struct platform_device *pdev)
static inline void register_spinlock_bug_hook(struct platform_device *pdev) { }
#endif
static inline void rwsem_list_add_per_prio(void *ignore,
struct rwsem_waiter *waiter_in,
struct rw_semaphore *sem, bool *already_on_list)
{
struct list_head *pos;
struct list_head *head;
struct rwsem_waiter *waiter = NULL;
pos = head = &sem->wait_list;
/*
* Rules for task prio aware rwsem wait list queueing:
* 1: Only try to preempt waiters with which task priority
* which is higher than DEFAULT_PRIO.
* 2: To avoid starvation, add count in rw_semaphore struct
* to record how many high priority waiters preempt to queue
* in wait list.
* If preempt count is exceed RWSEM_MAX_PREEMPT_ALLOWED,
* use simple fifo until wait list is empty.
*/
if (list_empty(head)) {
sem->android_vendor_data1 = 0;
return;
}
if (waiter_in->task->prio < DEFAULT_PRIO
&& sem->android_vendor_data1 < RWSEM_MAX_PREEMPT_ALLOWED) {
list_for_each(pos, head) {
waiter = list_entry(pos, struct rwsem_waiter, list);
if (waiter->task->prio > waiter_in->task->prio) {
list_add(&waiter_in->list, pos->prev);
sem->android_vendor_data1++;
*already_on_list = true;
return;
}
}
}
}
#ifdef CONFIG_RANDOMIZE_BASE
#define KASLR_OFFSET_MASK 0x00000000FFFFFFFF
static void __iomem *map_prop_mem(const char *propname)
@ -210,15 +166,6 @@ static int cpu_vendor_hooks_driver_probe(struct platform_device *pdev)
return ret;
}
ret = register_trace_android_vh_alter_rwsem_list_add(rwsem_list_add_per_prio, NULL);
if (ret) {
dev_err(&pdev->dev, "Failed to android_vh_alter_rwsem_list_add\n");
unregister_trace_android_vh_ipi_stop(trace_ipi_stop, NULL);
unregister_trace_android_vh_printk_hotplug(printk_hotplug, NULL);
unregister_trace_android_vh_timer_calc_index(timer_recalc_index, NULL);
return ret;
}
register_spinlock_bug_hook(pdev);
return ret;
@ -230,7 +177,6 @@ static int cpu_vendor_hooks_driver_remove(struct platform_device *pdev)
unregister_trace_android_vh_ipi_stop(trace_ipi_stop, NULL);
unregister_trace_android_vh_printk_hotplug(printk_hotplug, NULL);
unregister_trace_android_vh_timer_calc_index(timer_recalc_index, NULL);
unregister_trace_android_vh_alter_rwsem_list_add(rwsem_list_add_per_prio, NULL);
return 0;
}