Merge branch 'android14-5.15' into branch 'android14-5.15-lts'

Catch up on many commits and abi symbols to track that have been added
to the android14-5.15 branch.

This merge contains the following commits:

* c51de219f5 Merge tag 'android14-5.15.131_r00' into android-14-5.15
* c02575694d ANDROID: GKI: Update symbol list for Amlogic
* 232c6ce22f ANDROID: mm: allow hooks into __alloc_pages()
* 04636bb861 ANDROID: ABI: Update oplus symbol list
* a9cb381160 ANDROID: vendor_hooks: Add hooks for binder
* 833137a6d7 ANDROID: fuse-bpf: Add NULL pointer check in fuse_entry_revalidate
* 42e4a44198 UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP

Change-Id: I340c203e2cb064a03178ba69e443cef79453bcd6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-10-27 09:27:37 +00:00
8 changed files with 238 additions and 5 deletions

View File

@@ -9818,6 +9818,11 @@ pointer_reference {
kind: POINTER
pointee_type_id: 0x5fd666ab
}
pointer_reference {
id: 0x1d6b5d95
kind: POINTER
pointee_type_id: 0x5fed90c9
}
pointer_reference {
id: 0x1d6e33e5
kind: POINTER
@@ -291254,6 +291259,27 @@ function {
parameter_id: 0x02a8d0c9
parameter_id: 0x1d19a9d5
}
function {
id: 0x9ba26d2b
return_type_id: 0x6720d32f
parameter_id: 0x18bd6530
parameter_id: 0x02a8d0c9
parameter_id: 0x1f8dbf97
parameter_id: 0x24373219
parameter_id: 0x1d6b5d95
parameter_id: 0x3e6239e1
parameter_id: 0x6d7f5ff6
parameter_id: 0x11cfee5a
}
function {
id: 0x9ba26d9c
return_type_id: 0x6720d32f
parameter_id: 0x18bd6530
parameter_id: 0x02a8d0c9
parameter_id: 0x1f8dbf97
parameter_id: 0x24373219
parameter_id: 0x1c3dbe5a
}
function {
id: 0x9ba2930a
return_type_id: 0x6720d32f
@@ -291353,6 +291379,15 @@ function {
parameter_id: 0x33756485
parameter_id: 0x18bd6530
}
function {
id: 0x9ba70913
return_type_id: 0x6720d32f
parameter_id: 0x18bd6530
parameter_id: 0x06835e9c
parameter_id: 0x4585663f
parameter_id: 0xf1a6dfed
parameter_id: 0x6720d32f
}
function {
id: 0x9ba88768
return_type_id: 0x6720d32f
@@ -292311,6 +292346,14 @@ function {
parameter_id: 0x1c3dbe5a
parameter_id: 0x1c898f28
}
function {
id: 0x9bd8639c
return_type_id: 0x6720d32f
parameter_id: 0x18bd6530
parameter_id: 0x1f8dbf97
parameter_id: 0x24373219
parameter_id: 0x38b368bf
}
function {
id: 0x9bd88151
return_type_id: 0x6720d32f
@@ -292715,6 +292758,14 @@ function {
parameter_id: 0x92233392
parameter_id: 0x92233392
}
function {
id: 0x9bec16df
return_type_id: 0x6720d32f
parameter_id: 0x18bd6530
parameter_id: 0x10de2fab
parameter_id: 0x02a8d0c9
parameter_id: 0x1f8dbf97
}
function {
id: 0x9bee4a1e
return_type_id: 0x6720d32f
@@ -306604,6 +306655,15 @@ elf_symbol {
type_id: 0x9bf594ed
full_name: "__traceiter_android_vh_aes_expandkey"
}
elf_symbol {
id: 0xd0b4a794
name: "__traceiter_android_vh_alloc_oem_binder_struct"
is_defined: true
symbol_type: FUNCTION
crc: 0x72653196
type_id: 0x9bec16df
full_name: "__traceiter_android_vh_alloc_oem_binder_struct"
}
elf_symbol {
id: 0x91ee96d0
name: "__traceiter_android_vh_alloc_pages_entry"
@@ -306676,6 +306736,15 @@ elf_symbol {
type_id: 0x98731419
full_name: "__traceiter_android_vh_binder_alloc_new_buf_locked"
}
elf_symbol {
id: 0xcb807696
name: "__traceiter_android_vh_binder_free_buf"
is_defined: true
symbol_type: FUNCTION
crc: 0x71365aee
type_id: 0x9bd8639c
full_name: "__traceiter_android_vh_binder_free_buf"
}
elf_symbol {
id: 0xbebf7d98
name: "__traceiter_android_vh_binder_free_proc"
@@ -306784,6 +306853,15 @@ elf_symbol {
type_id: 0x9ba25f4a
full_name: "__traceiter_android_vh_binder_set_priority"
}
elf_symbol {
id: 0x6bce867e
name: "__traceiter_android_vh_binder_special_task"
is_defined: true
symbol_type: FUNCTION
crc: 0x93949f33
type_id: 0x9ba26d2b
full_name: "__traceiter_android_vh_binder_special_task"
}
elf_symbol {
id: 0x4785a3dd
name: "__traceiter_android_vh_binder_thread_read"
@@ -306811,6 +306889,15 @@ elf_symbol {
type_id: 0x9bd6fb19
full_name: "__traceiter_android_vh_binder_trans"
}
elf_symbol {
id: 0xcc2edef9
name: "__traceiter_android_vh_binder_transaction_received"
is_defined: true
symbol_type: FUNCTION
crc: 0xffec96fd
type_id: 0x9ba26d9c
full_name: "__traceiter_android_vh_binder_transaction_received"
}
elf_symbol {
id: 0x61c82fb5
name: "__traceiter_android_vh_binder_wait_for_work"
@@ -307099,6 +307186,15 @@ elf_symbol {
type_id: 0x9bdbdcc4
full_name: "__traceiter_android_vh_exit_signal"
}
elf_symbol {
id: 0x9e91661b
name: "__traceiter_android_vh_free_oem_binder_struct"
is_defined: true
symbol_type: FUNCTION
crc: 0xe3c92b7e
type_id: 0x9ba51920
full_name: "__traceiter_android_vh_free_oem_binder_struct"
}
elf_symbol {
id: 0x5ecff02f
name: "__traceiter_android_vh_free_task"
@@ -308296,6 +308392,15 @@ elf_symbol {
type_id: 0x9b4ecb46
full_name: "__traceiter_map"
}
elf_symbol {
id: 0xd61f2790
name: "__traceiter_mm_page_alloc"
is_defined: true
symbol_type: FUNCTION
crc: 0xadcf6a64
type_id: 0x9ba70913
full_name: "__traceiter_mm_page_alloc"
}
elf_symbol {
id: 0xbcec3880
name: "__traceiter_mm_vmscan_direct_reclaim_begin"
@@ -309610,6 +309715,15 @@ elf_symbol {
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_aes_expandkey"
}
elf_symbol {
id: 0xd7f9868e
name: "__tracepoint_android_vh_alloc_oem_binder_struct"
is_defined: true
symbol_type: OBJECT
crc: 0xf8d28f05
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_alloc_oem_binder_struct"
}
elf_symbol {
id: 0x3edc110a
name: "__tracepoint_android_vh_alloc_pages_entry"
@@ -309682,6 +309796,15 @@ elf_symbol {
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_binder_alloc_new_buf_locked"
}
elf_symbol {
id: 0x19dded7c
name: "__tracepoint_android_vh_binder_free_buf"
is_defined: true
symbol_type: OBJECT
crc: 0xf64d3ead
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_binder_free_buf"
}
elf_symbol {
id: 0xf32898c6
name: "__tracepoint_android_vh_binder_free_proc"
@@ -309790,6 +309913,15 @@ elf_symbol {
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_binder_set_priority"
}
elf_symbol {
id: 0xdda667b0
name: "__tracepoint_android_vh_binder_special_task"
is_defined: true
symbol_type: OBJECT
crc: 0x46cb2346
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_binder_special_task"
}
elf_symbol {
id: 0x306b5ff7
name: "__tracepoint_android_vh_binder_thread_read"
@@ -309817,6 +309949,15 @@ elf_symbol {
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_binder_trans"
}
elf_symbol {
id: 0xabc729f7
name: "__tracepoint_android_vh_binder_transaction_received"
is_defined: true
symbol_type: OBJECT
crc: 0x73e426b8
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_binder_transaction_received"
}
elf_symbol {
id: 0x75b174bb
name: "__tracepoint_android_vh_binder_wait_for_work"
@@ -310105,6 +310246,15 @@ elf_symbol {
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_exit_signal"
}
elf_symbol {
id: 0x901d0e89
name: "__tracepoint_android_vh_free_oem_binder_struct"
is_defined: true
symbol_type: OBJECT
crc: 0xc924dc00
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_free_oem_binder_struct"
}
elf_symbol {
id: 0xe6918e09
name: "__tracepoint_android_vh_free_task"
@@ -311302,6 +311452,15 @@ elf_symbol {
type_id: 0x18ccbd2c
full_name: "__tracepoint_map"
}
elf_symbol {
id: 0xc4a9ffae
name: "__tracepoint_mm_page_alloc"
is_defined: true
symbol_type: OBJECT
crc: 0x3bbb53b9
type_id: 0x18ccbd2c
full_name: "__tracepoint_mm_page_alloc"
}
elf_symbol {
id: 0xa7ceb432
name: "__tracepoint_mm_vmscan_direct_reclaim_begin"
@@ -362637,6 +362796,7 @@ interface {
symbol_id: 0x0556c9b1
symbol_id: 0xa3ddabd2
symbol_id: 0xf78be1c5
symbol_id: 0xd0b4a794
symbol_id: 0x91ee96d0
symbol_id: 0xa6e329cd
symbol_id: 0x505f4289
@@ -362645,6 +362805,7 @@ interface {
symbol_id: 0xf89a975f
symbol_id: 0x528da532
symbol_id: 0x530ad17d
symbol_id: 0xcb807696
symbol_id: 0xbebf7d98
symbol_id: 0x6935b08b
symbol_id: 0xd595bd2c
@@ -362657,9 +362818,11 @@ interface {
symbol_id: 0xc6c9353c
symbol_id: 0xd738b678
symbol_id: 0x2a9c6616
symbol_id: 0x6bce867e
symbol_id: 0x4785a3dd
symbol_id: 0x25f13dbe
symbol_id: 0xf6faffcb
symbol_id: 0xcc2edef9
symbol_id: 0x61c82fb5
symbol_id: 0x53fba77d
symbol_id: 0xe479b209
@@ -362692,6 +362855,7 @@ interface {
symbol_id: 0xdcaa59a3
symbol_id: 0x7f1591a1
symbol_id: 0x1f554c2a
symbol_id: 0x9e91661b
symbol_id: 0x5ecff02f
symbol_id: 0x812c6920
symbol_id: 0x3272ce60
@@ -362825,6 +362989,7 @@ interface {
symbol_id: 0x32248e2a
symbol_id: 0xe873a0cb
symbol_id: 0x8308c88f
symbol_id: 0xd61f2790
symbol_id: 0xbcec3880
symbol_id: 0xa34c49b3
symbol_id: 0x5c33446d
@@ -362971,6 +363136,7 @@ interface {
symbol_id: 0x58e7634f
symbol_id: 0x3a519484
symbol_id: 0x7ea1f05b
symbol_id: 0xd7f9868e
symbol_id: 0x3edc110a
symbol_id: 0x1ebb872f
symbol_id: 0xd82141b7
@@ -362979,6 +363145,7 @@ interface {
symbol_id: 0xe423541d
symbol_id: 0xfb7cdd24
symbol_id: 0xc8703937
symbol_id: 0x19dded7c
symbol_id: 0xf32898c6
symbol_id: 0x332635cd
symbol_id: 0xf06625d6
@@ -362991,9 +363158,11 @@ interface {
symbol_id: 0x57a9a36a
symbol_id: 0x21d8d29a
symbol_id: 0x2e04cb9c
symbol_id: 0xdda667b0
symbol_id: 0x306b5ff7
symbol_id: 0x2fce8f78
symbol_id: 0xec7035fd
symbol_id: 0xabc729f7
symbol_id: 0x75b174bb
symbol_id: 0x506628ab
symbol_id: 0x0d3c7607
@@ -363026,6 +363195,7 @@ interface {
symbol_id: 0x54b2cd01
symbol_id: 0xdef7c547
symbol_id: 0x0d418d38
symbol_id: 0x901d0e89
symbol_id: 0xe6918e09
symbol_id: 0x4ce6de1a
symbol_id: 0xace80c56
@@ -363159,6 +363329,7 @@ interface {
symbol_id: 0x0713b56c
symbol_id: 0x83005ddd
symbol_id: 0x269ee6ad
symbol_id: 0xc4a9ffae
symbol_id: 0xa7ceb432
symbol_id: 0x32564229
symbol_id: 0x88a08d67

View File

@@ -539,6 +539,7 @@
drm_atomic_helper_resume
drm_atomic_helper_set_config
drm_atomic_helper_setup_commit
drm_atomic_helper_shutdown
drm_atomic_helper_suspend
drm_atomic_helper_swap_state
drm_atomic_helper_update_plane
@@ -651,6 +652,8 @@
drm_poll
drm_prime_gem_destroy
drm_printf
__drm_printfn_coredump
__drm_printfn_seq_file
drm_property_add_enum
drm_property_blob_get
drm_property_blob_put
@@ -661,9 +664,12 @@
drm_property_destroy
drm_property_lookup_blob
drm_property_replace_blob
__drm_puts_coredump
__drm_puts_seq_file
drm_read
drm_release
drm_self_refresh_helper_update_avg_times
drm_state_dump
drm_universal_plane_init
drm_vblank_init
drm_writeback_connector_init
@@ -1990,6 +1996,7 @@
__traceiter_mmap_lock_acquire_returned
__traceiter_mmap_lock_released
__traceiter_mmap_lock_start_locking
__traceiter_mm_page_alloc
__traceiter_rwmmio_post_read
__traceiter_rwmmio_post_write
__traceiter_rwmmio_read
@@ -2037,6 +2044,7 @@
__tracepoint_mmap_lock_acquire_returned
__tracepoint_mmap_lock_released
__tracepoint_mmap_lock_start_locking
__tracepoint_mm_page_alloc
tracepoint_probe_register
tracepoint_probe_unregister
__tracepoint_rwmmio_post_read

View File

@@ -161,6 +161,11 @@
__traceiter_sched_stat_wait
__traceiter_sched_waking
__traceiter_task_rename
__traceiter_android_vh_alloc_oem_binder_struct
__traceiter_android_vh_binder_transaction_received
__traceiter_android_vh_free_oem_binder_struct
__traceiter_android_vh_binder_special_task
__traceiter_android_vh_binder_free_buf
__tracepoint_android_rvh_check_preempt_tick
__tracepoint_android_rvh_dequeue_entity
__tracepoint_android_rvh_enqueue_entity
@@ -239,6 +244,11 @@
__tracepoint_sched_stat_wait
__tracepoint_sched_waking
__tracepoint_task_rename
__tracepoint_android_vh_alloc_oem_binder_struct
__tracepoint_android_vh_binder_transaction_received
__tracepoint_android_vh_free_oem_binder_struct
__tracepoint_android_vh_binder_special_task
__tracepoint_android_vh_binder_free_buf
try_to_free_mem_cgroup_pages
unregister_kprobe
unregister_kretprobe

View File

@@ -1786,6 +1786,7 @@ static void binder_free_transaction(struct binder_transaction *t)
{
struct binder_proc *target_proc = t->to_proc;
trace_android_vh_free_oem_binder_struct(t);
if (target_proc) {
binder_inner_proc_lock(target_proc);
target_proc->outstanding_txns--;
@@ -2971,6 +2972,7 @@ static int binder_proc_transaction(struct binder_transaction *t,
struct binder_transaction *t_outdated = NULL;
bool frozen = false;
bool skip = false;
bool enqueue_task = true;
BUG_ON(!node);
binder_node_lock(node);
@@ -3007,7 +3009,10 @@ static int binder_proc_transaction(struct binder_transaction *t,
binder_transaction_priority(thread, t, node);
binder_enqueue_thread_work_ilocked(thread, &t->work);
} else if (!pending_async) {
binder_enqueue_work_ilocked(&t->work, &proc->todo);
trace_android_vh_binder_special_task(t, proc, thread,
&t->work, &proc->todo, !oneway, &enqueue_task);
if (enqueue_task)
binder_enqueue_work_ilocked(&t->work, &proc->todo);
} else {
if ((t->flags & TF_UPDATE_TXN) && frozen) {
t_outdated = binder_find_outdated_transaction_ilocked(t,
@@ -3020,7 +3025,10 @@ static int binder_proc_transaction(struct binder_transaction *t,
proc->outstanding_txns--;
}
}
binder_enqueue_work_ilocked(&t->work, &node->async_todo);
trace_android_vh_binder_special_task(t, proc, thread,
&t->work, &node->async_todo, !oneway, &enqueue_task);
if (enqueue_task)
binder_enqueue_work_ilocked(&t->work, &node->async_todo);
}
trace_android_vh_binder_proc_transaction_finish(proc, t,
@@ -3461,6 +3469,7 @@ static void binder_transaction(struct binder_proc *proc,
t->buffer->target_node = target_node;
t->buffer->clear_on_free = !!(t->flags & TF_CLEAR_BUF);
trace_binder_transaction_alloc_buf(t->buffer);
trace_android_vh_alloc_oem_binder_struct(tr, t, target_proc);
if (binder_alloc_copy_user_to_buffer(
&target_proc->alloc,
@@ -3946,6 +3955,9 @@ binder_free_buf(struct binder_proc *proc,
struct binder_thread *thread,
struct binder_buffer *buffer, bool is_failure)
{
bool enqueue_task = true;
trace_android_vh_binder_free_buf(proc, thread, buffer);
binder_inner_proc_lock(proc);
if (buffer->transaction) {
buffer->transaction->buffer = NULL;
@@ -3965,8 +3977,10 @@ binder_free_buf(struct binder_proc *proc,
if (!w) {
buf_node->has_async_transaction = false;
} else {
binder_enqueue_work_ilocked(
w, &proc->todo);
trace_android_vh_binder_special_task(NULL, proc, thread, w,
&proc->todo, false, &enqueue_task);
if (enqueue_task)
binder_enqueue_work_ilocked(w, &proc->todo);
binder_wakeup_proc_ilocked(proc);
}
binder_node_inner_unlock(buf_node);
@@ -4924,6 +4938,7 @@ skip:
ptr += trsize;
trace_binder_transaction_received(t);
trace_android_vh_binder_transaction_received(t, proc, thread, cmd);
binder_stat_br(proc, thread, cmd);
binder_debug(BINDER_DEBUG_TRANSACTION,
"%d:%d %s %d %d:%d, cmd %d size %zd-%zd ptr %016llx-%016llx\n",

View File

@@ -365,3 +365,8 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_user);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cma_alloc_bypass);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_xhci_urb_suitable_bypass);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_pages_entry);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_oem_binder_struct);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_transaction_received);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_oem_binder_struct);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_special_task);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_free_buf);

View File

@@ -183,7 +183,7 @@ static bool backing_data_changed(struct fuse_inode *fi, struct dentry *entry,
int err;
bool ret = true;
if (!entry) {
if (!entry || !fi->backing_inode) {
ret = false;
goto put_backing_file;
}

View File

@@ -16,6 +16,8 @@ struct binder_thread;
struct binder_transaction;
struct task_struct;
struct binder_transaction_data;
struct binder_work;
struct binder_buffer;
DECLARE_HOOK(android_vh_binder_transaction_init,
TP_PROTO(struct binder_transaction *t),
@@ -93,6 +95,26 @@ DECLARE_HOOK(android_vh_binder_trans,
TP_PROTO(struct binder_proc *target_proc, struct binder_proc *proc,
struct binder_thread *thread, struct binder_transaction_data *tr),
TP_ARGS(target_proc, proc, thread, tr));
DECLARE_HOOK(android_vh_alloc_oem_binder_struct,
TP_PROTO(struct binder_transaction_data *tr, struct binder_transaction *t,
struct binder_proc *proc),
TP_ARGS(tr, t, proc));
DECLARE_HOOK(android_vh_binder_transaction_received,
TP_PROTO(struct binder_transaction *t, struct binder_proc *proc,
struct binder_thread *thread, uint32_t cmd),
TP_ARGS(t, proc, thread, cmd));
DECLARE_HOOK(android_vh_free_oem_binder_struct,
TP_PROTO(struct binder_transaction *t),
TP_ARGS(t));
DECLARE_HOOK(android_vh_binder_special_task,
TP_PROTO(struct binder_transaction *t, struct binder_proc *proc,
struct binder_thread *thread, struct binder_work *w,
struct list_head *head, bool sync, bool *special_task),
TP_ARGS(t, proc, thread, w, head, sync, special_task));
DECLARE_HOOK(android_vh_binder_free_buf,
TP_PROTO(struct binder_proc *proc, struct binder_thread *thread,
struct binder_buffer *buffer),
TP_ARGS(proc, thread, buffer));
#endif /* _TRACE_HOOK_BINDER_H */
/* This part must be outside protection */

View File

@@ -81,6 +81,8 @@
#include "shuffle.h"
#include "page_reporting.h"
EXPORT_TRACEPOINT_SYMBOL_GPL(mm_page_alloc);
/* Free Page Internal flags: for internal, non-pcp variants of free_pages(). */
typedef int __bitwise fpi_t;