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

Snap for 11148269 from 8578f794ea to android14-6.1-keystone-qcom-release

Browse Source 
Change-Id: Ic1e860f77e5e4bd20401f195d1dc4ca75d19208d
This commit is contained in:
Android Build Coastguard Worker 2023-11-28 09:15:23 +00:00
commit 06be4eb868
8 changed files with 82 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
android/abi_gki_aarch64.stg
View File

@ -25368,6 +25368,11 @@ pointer_reference {
kind: POINTER
pointee_type_id: 0xf1938ae0
}
pointer_reference {
id: 0x36f98e5c
kind: POINTER
pointee_type_id: 0xf1a6dfed
}
pointer_reference {
id: 0x36f998d3
kind: POINTER
@ -314871,6 +314876,13 @@ function {
parameter_id: 0x188b9e81
parameter_id: 0x4585663f
}
function {
id: 0x9ab41198
return_type_id: 0x6720d32f
parameter_id: 0x18bd6530
parameter_id: 0x4585663f
parameter_id: 0x36f98e5c
}
function {
id: 0x9ab438eb
return_type_id: 0x6720d32f
@ -334389,6 +334401,24 @@ elf_symbol {
type_id: 0x9bd1d928
full_name: "__traceiter_android_vh_account_task_time"
}
elf_symbol {
id: 0xf71b3e6c
name: "__traceiter_android_vh_adjust_alloc_flags"
is_defined: true
symbol_type: FUNCTION
crc: 0x63961554
type_id: 0x9ab41198
full_name: "__traceiter_android_vh_adjust_alloc_flags"
}
elf_symbol {
id: 0xc9756e19
name: "__traceiter_android_vh_adjust_kvmalloc_flags"
is_defined: true
symbol_type: FUNCTION
crc: 0xda390245
type_id: 0x9ab41198
full_name: "__traceiter_android_vh_adjust_kvmalloc_flags"
}
elf_symbol {
id: 0xd0b4a794
name: "__traceiter_android_vh_alloc_oem_binder_struct"
@ -338088,6 +338118,24 @@ elf_symbol {
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_account_task_time"
}
elf_symbol {
id: 0x8f23a62a
name: "__tracepoint_android_vh_adjust_alloc_flags"
is_defined: true
symbol_type: OBJECT
crc: 0x762cddf3
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_adjust_alloc_flags"
}
elf_symbol {
id: 0xf3cd7eeb
name: "__tracepoint_android_vh_adjust_kvmalloc_flags"
is_defined: true
symbol_type: OBJECT
crc: 0x7a4f5bf1
type_id: 0x18ccbd2c
full_name: "__tracepoint_android_vh_adjust_kvmalloc_flags"
}
elf_symbol {
id: 0xd7f9868e
name: "__tracepoint_android_vh_alloc_oem_binder_struct"
@ -396095,6 +396143,8 @@ interface {
symbol_id: 0xebcd0234
symbol_id: 0xa3af7947
symbol_id: 0x86527a4e
symbol_id: 0xf71b3e6c
symbol_id: 0xc9756e19
symbol_id: 0xd0b4a794
symbol_id: 0x33f9278c
symbol_id: 0x2e343246
@ -396506,6 +396556,8 @@ interface {
symbol_id: 0xdcf22716
symbol_id: 0x4f980315
symbol_id: 0xe1489e0c
symbol_id: 0x8f23a62a
symbol_id: 0xf3cd7eeb
symbol_id: 0xd7f9868e
symbol_id: 0x37776872
symbol_id: 0xfc735654

4
android/abi_gki_aarch64_oplus
View File

@ -160,6 +160,8 @@
__traceiter_android_vh_rwsem_opt_spin_finish
__traceiter_android_vh_rwsem_opt_spin_start
__traceiter_android_vh_rwsem_wake_finish
__traceiter_android_vh_adjust_alloc_flags
__traceiter_android_vh_adjust_kvmalloc_flags
__traceiter_android_vh_sched_stat_runtime_rt
__traceiter_android_vh_shrink_node_memcgs
__traceiter_android_vh_sync_txn_recvd
@ -248,6 +250,8 @@
__tracepoint_android_vh_rwsem_opt_spin_finish
__tracepoint_android_vh_rwsem_opt_spin_start
__tracepoint_android_vh_rwsem_wake_finish
__tracepoint_android_vh_adjust_alloc_flags
__tracepoint_android_vh_adjust_kvmalloc_flags
__tracepoint_android_vh_sched_stat_runtime_rt
__tracepoint_android_vh_shrink_node_memcgs
__tracepoint_android_vh_sync_txn_recvd

2
drivers/android/vendor_hooks.c
View File

@ -253,6 +253,8 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_readahead_gfp_mask);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_mutex_list_add);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_unlock_slowpath);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_wake_finish);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_adjust_alloc_flags);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_adjust_kvmalloc_flags);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_looper_state_registered);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_thread_read);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_free_proc);

1
drivers/iommu/dma-iommu.c
View File

@ -779,6 +779,7 @@ static struct page **__iommu_dma_alloc_pages(struct device *dev,
order_size = 1U << order;
if (order_mask > order_size)
alloc_flags |= __GFP_NORETRY;
trace_android_vh_adjust_alloc_flags(order, &alloc_flags);
page = alloc_pages_node(nid, alloc_flags, order);
if (!page)
continue;

19
drivers/usb/gadget/udc/core.c
View File

@ -1099,12 +1099,12 @@ EXPORT_SYMBOL_GPL(usb_gadget_set_state);
/* ------------------------------------------------------------------------- */
/* Acquire connect_lock before calling this function. */
static void usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
static int usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
{
if (udc->vbus)
usb_gadget_connect_locked(udc->gadget);
return usb_gadget_connect_locked(udc->gadget);
else
usb_gadget_disconnect_locked(udc->gadget);
return usb_gadget_disconnect_locked(udc->gadget);
}
static void vbus_event_work(struct work_struct *work)
@ -1578,12 +1578,23 @@ static int gadget_bind_driver(struct device *dev)
}
usb_gadget_enable_async_callbacks(udc);
udc->allow_connect = true;
usb_udc_connect_control_locked(udc);
ret = usb_udc_connect_control_locked(udc);
if (ret)
goto err_connect_control;
mutex_unlock(&udc->connect_lock);
kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
return 0;
err_connect_control:
udc->allow_connect = false;
usb_gadget_disable_async_callbacks(udc);
if (gadget->irq)
synchronize_irq(gadget->irq);
usb_gadget_udc_stop_locked(udc);
mutex_unlock(&udc->connect_lock);
err_start:
driver->unbind(udc->gadget);

3
include/trace/hooks/iommu.h
View File

@ -44,6 +44,9 @@ DECLARE_RESTRICTED_HOOK(android_rvh_iommu_limit_align_shift,
DECLARE_HOOK(android_vh_bus_iommu_probe,
TP_PROTO(struct iommu_device *iommu, struct bus_type *bus, bool *skip),
TP_ARGS(iommu, bus, skip));
DECLARE_HOOK(android_vh_adjust_alloc_flags,
TP_PROTO(unsigned int order, gfp_t *alloc_flags),
TP_ARGS(order, alloc_flags));
#endif /* _TRACE_HOOK_IOMMU_H */

3
include/trace/hooks/mm.h
View File

@ -158,6 +158,9 @@ struct oom_control;
DECLARE_HOOK(android_vh_mm_alloc_pages_may_oom_exit,
TP_PROTO(struct oom_control *oc, unsigned long did_some_progress),
TP_ARGS(oc, did_some_progress));
DECLARE_HOOK(android_vh_adjust_kvmalloc_flags,
TP_PROTO(unsigned int order, gfp_t *alloc_flags),
TP_ARGS(order, alloc_flags));
#endif /* _TRACE_HOOK_MM_H */
/* This part must be outside protection */

3
mm/util.c
View File

@ -25,7 +25,7 @@
#include <linux/compat.h>
#include <linux/uaccess.h>
#include <trace/hooks/mm.h>
#include "internal.h"
#include "swap.h"
@ -582,6 +582,7 @@ void *kvmalloc_node(size_t size, gfp_t flags, int node)
/* nofail semantic is implemented by the vmalloc fallback */
kmalloc_flags &= ~__GFP_NOFAIL;
}
trace_android_vh_adjust_kvmalloc_flags(get_order(size), &kmalloc_flags);
ret = kmalloc_node(size, kmalloc_flags, node);