shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: futex: Add vendor hook for wait queue"

Browse Source 
This reverts commit 3ba4b6d6a3.

The futex code is changed in large ways in 5.16-rc1, so the hook here is
no longer relevant and causes merge conflicts.  It will have to be
re-added if it is still needed in the future.

Bug: 163431711
Cc: JianMin Liu <jian-min.liu@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I318ed87ac80ef7d4fb55240d55f74efb291b7907
This commit is contained in:
Greg Kroah-Hartman
2021-11-03 14:10:39 +01:00
parent d9bdbf0207
commit 2c2b3a46d5
3 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/android/vendor_hooks.c
View File

@@ -12,7 +12,6 @@
#include <trace/hooks/fpsimd.h>
#include <trace/hooks/binder.h>
#include <trace/hooks/rwsem.h>
#include <trace/hooks/futex.h>
#include <trace/hooks/dtask.h>
#include <trace/hooks/cpuidle.h>
#include <trace/hooks/topology.h>
@@ -71,7 +70,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_init);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_wake);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_finished);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_rwsem_list_add);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_add);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_read_wait_start);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_read_wait_finish);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_wait_start);

22
include/trace/hooks/futex.h
View File

@@ -1,22 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM futex
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH trace/hooks
#if !defined(_TRACE_HOOK_FUTEX_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HOOK_FUTEX_H
#include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>
#include <linux/plist.h>
/*
* Following tracepoints are not exported in tracefs and provide a
* mechanism for vendor modules to hook and extend functionality
*/
DECLARE_HOOK(android_vh_alter_futex_plist_add,
TP_PROTO(struct plist_node *node,
struct plist_head *head,
bool *already_on_hb),
TP_ARGS(node, head, already_on_hb));
#endif /* _TRACE_HOOK_FUTEX_H */
/* This part must be outside protection */
#include <trace/define_trace.h>

6
kernel/futex.c
View File

@@ -43,7 +43,6 @@
#include <asm/futex.h>
#include "locking/rtmutex_common.h"
#include <trace/hooks/futex.h>
/*
* READ this before attempting to hack on futexes!
@@ -2476,7 +2475,6 @@ queue_unlock(struct futex_hash_bucket *hb)
static inline void __queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
{
int prio;
bool already_on_hb = false;
/*
* The priority used to register this element is
@@ -2489,9 +2487,7 @@ static inline void __queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
prio = min(current->normal_prio, MAX_RT_PRIO);
plist_node_init(&q->list, prio);
trace_android_vh_alter_futex_plist_add(&q->list, &hb->chain, &already_on_hb);
if (!already_on_hb)
plist_add(&q->list, &hb->chain);
plist_add(&q->list, &hb->chain);
q->task = current;
}