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

Merge keystone/android12-5.10-keystone-qcom-release.43+ (7dc2d77) into msm-5.10

Browse Source 
* refs/heads/tmp-7dc2d77:
  UPSTREAM: kernel/irq: export irq_gc_set_wake
  FROMGIT: procfs: prevent unpriveleged processes accessing fdinfo dir
  FROMGIT: f2fs: don't sleep while grabing nat_tree_lock
  FROMLIST: scsi: ufs: Allow async suspend/resume callbacks
  ANDROID: ABI: update generic symbol list and ABI XML
  ANDROID: scsi: ufs: add vendor hook to override key reprogramming
  ANDROID: GKI: Add rockchip symbol list
  ANDROID: GKI: update allowed GKI symbol for Exynosauto SoC
  ANDROID: GKI: sync allowed list for exynosauto SoC
  ANDROID: ABI: update allowed list for galaxy
  ANDROID: Update symbol list for mtk
  ANDROID: vendor_hooks: Add hooks to tcp/udp send/recv msg functions.
  ANDROID: fs: pipe: wakeup readers on small writes even if pipe had data
  ANDROID: GKI: sort the list of symbol lists
  Revert "ANDROID: ABI: update symbols to unisoc whitelist for the fifth time"
  ANDROID: Update the exynos symbol list
  ANDROID: GKI: Add some symbols to symbol list
  ANDROID: abi_gki_aarch64_qcom: Add additional symbols for show_cpufinfo_max_freq
  ANDROID: sched: add restricted hook to override show_cpufinfo_max_freq
  ANDROID: ABI: initial update allowed list for galaxy
  ANDROID: abi_gki_aarch64_qcom: Add I3C interface symbols to qcom tree
  ANDROID: Update symbol list for mtk
  ANDROID:  abi_gki_aarch64_qcom: Add additional symbols for after hooks
  FROMGIT: usb: gadget: composite: Allow bMaxPower=0 if self-powered
  FROMGIT: f2fs: let's keep writing IOs on SBI_NEED_FSCK
  FROMLIST: scsi: ufs: Fix memory corruption by ufshcd_read_desc_param()
  Revert "ANDROID: ABI: initial update allowed list for galaxy"
  Revert "ANDROID: ABI: update allowed list for galaxy"
  Revert "ANDROID: ABI: Update allowed list for galaxy"
  ANDROID: Use authoritative Dr. No list from android-mainline
  ANDROID: ABI: Update allowed list for galaxy
  UPSTREAM: mm/compaction: correct deferral logic for proactive compaction
  ANDROID: Enable GKI Dr. No Enforcement
  ANDROID: media: v4l2-core: Fix deadlock in vendor hook
  FROMGIT: dma_buf: remove dmabuf sysfs teardown before release
  ANDROID: update mtk symbol list
  UPSTREAM: mfd: syscon: Free the allocated name field of struct regmap_config
  ANDROID: Give UIC cmd timeout a larger value
  ANDROID: binder: retry security_secid_to_secctx()
  ANDROID: update new gki symbol for mtk
  ANDROID: mm, kasan: fix for "integrate page_alloc init with HW_TAGS"
  UPSTREAM: kasan: fix conflict with page poisoning
  ANDROID: GKI: Export two more mm symbols for GKI
  ANDROID: Update symbol list for mtk
  FROMLIST: kfence: skip all GFP_ZONEMASK allocations
  FROMLIST: kfence: move the size check to the beginning of __kfence_alloc()

Change-Id: If3e8e3123501eed0ea7d323dbd3cf8d78bca8f66
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
This commit is contained in:
Ivaylo Georgiev 2021-08-02 00:06:25 -07:00
commit 4ad2fd2ce6
62 changed files with 12139 additions and 12236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/ABI/testing/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/Documentation/ABI/testing/OWNERS

2
Documentation/filesystems/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/Documentation/filesystems/OWNERS

14
OWNERS
View File

@ -1,2 +1,12 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/OWNERS
set noparent
# GKI Dr. No Enforcement is active on this branch. Approval of one of the Dr.
# No reviewers is required following a regular CodeReview+2 vote of a code
# reviewer.
#
# See the GKI release documentation (go/gki-dr-no) for further details.
#
# The expanded list of reviewers can be found at:
# https://android.googlesource.com/kernel/common/+/android-mainline/OWNERS_DrNo
include kernel/common:android-mainline:/OWNERS_DrNo

12
android/OWNERS
View File

@ -1,12 +0,0 @@
# If we ever add another OWNERS above this directory, it's likely to be
# more permissive, so don't inherit from it
set noparent
adelva@google.com
maennich@google.com
saravanak@google.com
sspatil@google.com
tkjos@google.com
willmcvicker@google.com
# Downstream boards maintained directly in this manifest branch
per-file abi_gki_aarch64_cuttlefish = adelva@google.com, rammuthiah@google.com
per-file abi_gki_aarch64_goldfish = rkir@google.com

10970
android/abi_gki_aarch64.xml
View File

File diff suppressed because it is too large Load Diff

75
android/abi_gki_aarch64_exynos
View File

@ -73,9 +73,9 @@
blocking_notifier_call_chain
blocking_notifier_chain_register
blocking_notifier_chain_unregister
bpf_trace_run1
bpf_trace_run10
bpf_trace_run12
bpf_trace_run1
bpf_trace_run2
bpf_trace_run3
bpf_trace_run4
@ -247,6 +247,7 @@
debugfs_create_x32
debugfs_create_x64
debugfs_remove
debugfs_rename
dec_zone_page_state
default_llseek
default_wake_function
@ -257,6 +258,7 @@
del_timer_sync
destroy_workqueue
dev_alloc_name
dev_change_net_namespace
dev_close
_dev_crit
dev_driver_string
@ -278,6 +280,8 @@
devfreq_suspend_device
devfreq_unregister_opp_notifier
devfreq_update_interval
__dev_get_by_index
dev_get_by_index
dev_get_by_name
dev_get_regmap
device_add
@ -298,6 +302,7 @@
device_property_read_u32_array
device_register
device_remove_file
device_rename
device_set_wakeup_capable
device_set_wakeup_enable
device_show_bool
@ -757,6 +762,7 @@
event_triggers_call
extcon_get_state
extcon_set_state_sync
failure_tracking
fb_mode_option
__fdget
fd_install
@ -807,6 +813,8 @@
get_cpu_idle_time
get_device
__get_free_pages
get_net_ns_by_fd
get_net_ns_by_pid
get_random_bytes
get_random_u32
__get_task_comm
@ -816,6 +824,8 @@
get_unused_fd_flags
get_user_pages
get_user_pages_fast
get_user_pages_remote
__get_vm_area_caller
get_zeroed_page
gic_nonsecure_priorities
gpiochip_add_data_with_key
@ -827,6 +837,7 @@
gpiochip_remove
gpiochip_unlock_as_irq
gpiod_direction_input
gpiod_direction_output
gpiod_direction_output_raw
gpiod_get_raw_value
gpiod_get_raw_value_cansleep
@ -881,6 +892,21 @@
i2c_transfer_buffer_flags
i2c_unregister_device
i2c_verify_client
i3c_generic_ibi_alloc_pool
i3c_generic_ibi_free_pool
i3c_generic_ibi_get_free_slot
i3c_generic_ibi_recycle_slot
i3c_master_add_i3c_dev_locked
i3c_master_defslvs_locked
i3c_master_disec_locked
i3c_master_do_daa
i3c_master_enec_locked
i3c_master_entdaa_locked
i3c_master_get_free_addr
i3c_master_queue_ibi
i3c_master_register
i3c_master_set_info
i3c_master_unregister
ida_alloc_range
ida_destroy
ida_free
@ -900,6 +926,7 @@
iio_device_unregister
iio_read_channel_processed
inc_zone_page_state
inet_csk_get_port
init_dummy_netdev
init_net
init_pseudo
@ -907,6 +934,7 @@
__init_swait_queue_head
init_task
init_timer_key
init_uts_ns
init_wait_entry
__init_waitqueue_head
input_allocate_device
@ -988,9 +1016,9 @@
is_dma_buf_file
is_vmalloc_addr
iterate_fd
jiffies
jiffies_64_to_clock_t
jiffies64_to_msecs
jiffies
jiffies_to_msecs
jiffies_to_usecs
kasan_flag_enabled
@ -998,6 +1026,9 @@
kernel_kobj
kern_mount
kern_unmount
key_create_or_update
key_put
keyring_alloc
__kfifo_alloc
__kfifo_free
__kfifo_in
@ -1063,6 +1094,7 @@
kthread_unpark
kthread_worker_fn
ktime_get
ktime_get_coarse_with_offset
ktime_get_mono_fast_ns
ktime_get_raw
ktime_get_raw_ts64
@ -1088,9 +1120,11 @@
lzo1x_1_compress
lzo1x_decompress_safe
lzorle1x_1_compress
map_kernel_range
media_device_register_entity
media_entity_pads_init
memchr
memcmp
memcpy
__memcpy_fromio
__memcpy_toio
@ -1164,6 +1198,7 @@
__napi_schedule
napi_schedule_prep
__netdev_alloc_skb
netdev_err
netif_carrier_off
netif_carrier_on
netif_napi_add
@ -1173,14 +1208,23 @@
netif_rx_ni
netif_tx_stop_all_queues
netif_tx_wake_queue
netlink_broadcast
__netlink_kernel_create
netlink_kernel_release
netlink_register_notifier
netlink_unicast
netlink_unregister_notifier
net_ns_type_operations
net_ratelimit
nla_append
nla_find
nla_memcpy
__nla_parse
nla_put
nla_put_64bit
nla_put_nohdr
nla_reserve
__nla_validate
__nlmsg_put
no_llseek
nonseekable_open
@ -1267,6 +1311,7 @@
orderly_poweroff
page_endio
page_mapping
__page_pinner_migration_failed
panic
panic_notifier_list
param_array_ops
@ -1423,8 +1468,10 @@
proc_set_user
proc_symlink
__pskb_copy_fclone
__pskb_pull_tail
put_device
put_disk
__put_net
__put_page
put_pid
__put_task_struct
@ -1497,6 +1544,7 @@
register_netdevice
register_netdevice_notifier
register_oom_notifier
register_pernet_device
register_pm_notifier
register_reboot_notifier
register_restart_handler
@ -1549,8 +1597,12 @@
return_address
revalidate_disk_size
rfkill_alloc
rfkill_blocked
rfkill_destroy
rfkill_pause_polling
rfkill_register
rfkill_resume_polling
rfkill_set_hw_state
rfkill_unregister
rps_needed
rtc_class_close
@ -1620,6 +1672,7 @@
single_open
single_open_size
single_release
skb_add_rx_frag
skb_clone
skb_copy
skb_copy_bits
@ -1728,6 +1781,8 @@
snd_vendor_set_ops
snprintf
soc_device_register
__sock_create
sock_release
softnet_data
sort
__spi_alloc_controller
@ -1779,8 +1834,10 @@
strstr
submit_bh
subsys_system_register
__sw_hweight16
__sw_hweight32
__sw_hweight64
__sw_hweight8
swiotlb_nr_tbl
__sync_dirty_buffer
sync_file_create
@ -1811,6 +1868,7 @@
system_freezable_wq
system_freezing_cnt
system_highpri_wq
system_power_efficient_wq
system_state
system_unbound_wq
system_wq
@ -1845,7 +1903,10 @@
__traceiter_android_rvh_enqueue_task
__traceiter_android_rvh_find_lowest_rq
__traceiter_android_rvh_find_new_ilb
__traceiter_android_rvh_gic_v3_set_affinity
__traceiter_android_rvh_post_init_entity_util_avg
__traceiter_android_rvh_replace_next_task_fair
__traceiter_android_rvh_sched_fork_init
__traceiter_android_rvh_sched_newidle_balance
__traceiter_android_rvh_sched_nohz_balancer_kick
__traceiter_android_rvh_sched_rebalance_domains
@ -1854,7 +1915,6 @@
__traceiter_android_rvh_select_task_rq_rt
__traceiter_android_vh_cpu_idle_enter
__traceiter_android_vh_cpu_idle_exit
__traceiter_android_rvh_gic_v3_set_affinity
__traceiter_android_vh_ipi_stop
__traceiter_android_vh_scheduler_tick
__traceiter_android_vh_show_mem
@ -1885,7 +1945,6 @@
__traceiter_suspend_resume
__traceiter_workqueue_execute_end
__traceiter_workqueue_execute_start
__traceiter_gpu_mem_total
trace_output_call
__tracepoint_android_rvh_can_migrate_task
__tracepoint_android_rvh_cpu_cgroup_can_attach
@ -1893,7 +1952,10 @@
__tracepoint_android_rvh_enqueue_task
__tracepoint_android_rvh_find_lowest_rq
__tracepoint_android_rvh_find_new_ilb
__tracepoint_android_rvh_gic_v3_set_affinity
__tracepoint_android_rvh_post_init_entity_util_avg
__tracepoint_android_rvh_replace_next_task_fair
__tracepoint_android_rvh_sched_fork_init
__tracepoint_android_rvh_sched_newidle_balance
__tracepoint_android_rvh_sched_nohz_balancer_kick
__tracepoint_android_rvh_sched_rebalance_domains
@ -1902,7 +1964,6 @@
__tracepoint_android_rvh_select_task_rq_rt
__tracepoint_android_vh_cpu_idle_enter
__tracepoint_android_vh_cpu_idle_exit
__tracepoint_android_rvh_gic_v3_set_affinity
__tracepoint_android_vh_ipi_stop
__tracepoint_android_vh_scheduler_tick
__tracepoint_android_vh_show_mem
@ -1985,6 +2046,7 @@
tty_insert_flip_string_fixed_flag
tty_kref_put
tty_port_tty_get
typec_get_drvdata
typec_register_partner
typec_register_port
typec_set_data_role
@ -2029,6 +2091,7 @@
unregister_netdevice_notifier
unregister_netdevice_queue
unregister_oom_notifier
unregister_pernet_device
unregister_pm_notifier
unregister_reboot_notifier
unregister_shrinker
@ -2140,6 +2203,7 @@
vb2_streamoff
vb2_streamon
vb2_wait_for_all_buffers
verify_pkcs7_signature
vfree
vfs_fsync
vfs_getattr
@ -2188,6 +2252,7 @@
watchdog_register_device
watchdog_set_restart_priority
watchdog_unregister_device
wireless_nlevent_flush
work_busy
ww_mutex_lock
ww_mutex_lock_interruptible

51
android/abi_gki_aarch64_exynosauto
View File

@ -19,6 +19,7 @@
blocking_notifier_chain_unregister
bpf_trace_run2
bpf_trace_run4
cancel_delayed_work
cancel_delayed_work_sync
cancel_work_sync
capable
@ -113,6 +114,7 @@
dma_buf_detach
dma_buf_end_cpu_access
dma_buf_export
dma_buf_fd
dma_buf_get
dma_buf_map_attachment
dma_buf_mmap
@ -131,6 +133,7 @@
dma_free_attrs
dma_heap_buffer_alloc
dma_heap_find
dma_heap_get_drvdata
dma_heap_put
dma_map_page_attrs
dma_map_sg_attrs
@ -215,6 +218,7 @@
i2c_register_driver
i2c_transfer
i2c_unregister_device
idr_remove
__init_rwsem
__init_swait_queue_head
init_timer_key
@ -240,6 +244,7 @@
irq_to_desc
is_vmalloc_addr
jiffies
jiffies_to_msecs
kasan_flag_enabled
kasprintf
kfree
@ -247,7 +252,11 @@
__kmalloc
kmalloc_caches
kmalloc_order_trace
kmem_cache_alloc
kmem_cache_alloc_trace
kmem_cache_create
kmem_cache_destroy
kmem_cache_free
kmemdup
kobject_create_and_add
kobject_get
@ -256,6 +265,7 @@
krealloc
kset_unregister
kstrdup
kstrtobool
kstrtoint
kstrtou8
kstrtouint
@ -361,6 +371,9 @@
pinctrl_lookup_state
pinctrl_select_state
platform_bus_type
platform_device_register_full
platform_device_unregister
__platform_driver_probe
__platform_driver_register
platform_driver_unregister
platform_get_irq
@ -387,6 +400,10 @@
put_unused_fd
queue_delayed_work_on
queue_work_on
radix_tree_delete
radix_tree_insert
radix_tree_lookup
radix_tree_next_chunk
___ratelimit
_raw_spin_lock
_raw_spin_lock_irq
@ -398,6 +415,7 @@
__rcu_read_unlock
rdev_get_drvdata
rdev_get_id
refcount_dec_and_mutex_lock
refcount_warn_saturate
__refrigerator
regcache_mark_dirty
@ -674,7 +692,6 @@
platform_device_alloc
platform_device_del
platform_device_put
platform_device_unregister
platform_get_irq_byname_optional
__pm_relax
pm_runtime_allow
@ -865,7 +882,6 @@
drm_release
drm_universal_plane_init
drm_vblank_init
kstrtobool
mipi_dsi_host_register
mipi_dsi_host_unregister
mutex_is_locked
@ -927,7 +943,6 @@
# required by g2d.ko
add_timer
cancel_delayed_work
device_get_dma_attr
dma_fence_signal_locked
frame_vector_create
@ -978,6 +993,7 @@
module_put
of_machine_is_compatible
__page_pinner_migration_failed
param_array_ops
param_ops_byte
__put_page
rb_erase
@ -997,7 +1013,6 @@
__sw_hweight32
synchronize_rcu
sysfs_streq
system_highpri_wq
__traceiter_gpu_mem_total
trace_output_call
__tracepoint_gpu_mem_total
@ -1121,7 +1136,6 @@
fasync_helper
idr_alloc
idr_get_next
idr_remove
kill_fasync
# required by ptp.ko
@ -1158,7 +1172,6 @@
get_task_pid
i2c_get_adapter
i2c_new_client_device
jiffies_to_msecs
kobject_del
kstrtou16
kthread_flush_work
@ -1285,7 +1298,6 @@
dmabuf_page_pool_free
dma_heap_add
dma_heap_get_dev
dma_heap_get_drvdata
dma_heap_get_name
is_dma_buf_file
iterate_fd
@ -1316,10 +1328,6 @@
iommu_group_set_iommudata
iommu_put_dma_cookie
iommu_report_device_fault
kmem_cache_alloc
kmem_cache_create
kmem_cache_destroy
kmem_cache_free
of_get_dma_window
pfn_valid
@ -1366,6 +1374,7 @@
pm_runtime_no_callbacks
snd_pcm_hw_constraint_integer
snd_pcm_lib_free_pages
snd_pcm_lib_ioctl
snd_pcm_lib_malloc_pages
snd_pcm_lib_preallocate_free_for_all
snd_pcm_lib_preallocate_pages
@ -1409,6 +1418,7 @@
# required by ufs-exynosauto-core.ko
blk_ksm_init_passthrough
device_get_match_data
__traceiter_android_vh_ufs_fill_prdt
__tracepoint_android_vh_ufs_fill_prdt
ufshcd_config_pwr_mode
@ -1423,10 +1433,6 @@
# required by vbufq-be-module.ko
drain_workqueue
radix_tree_delete
radix_tree_insert
radix_tree_lookup
radix_tree_next_chunk
# required by vdriver-lib-module.ko
kset_create_and_add
@ -1467,6 +1473,14 @@
sysfs_create_bin_file
sysfs_remove_bin_file
# required by vlx-vdmaheap-module.ko
devm_get_free_pages
idr_alloc_cyclic
idr_find
radix_tree_iter_delete
uuid_gen
__vmalloc
# required by vlx-vipc-module.ko
sigprocmask
@ -1476,3 +1490,10 @@
# required by vrpc-module.ko
current_work
# required by vvideo2-fe-module.ko
__task_pid_nr_ns
vprintk
# preserved by --additions-only
system_highpri_wq

8721
android/abi_gki_aarch64_galaxy
View File

File diff suppressed because it is too large Load Diff

2
android/abi_gki_aarch64_generic
View File

@ -1916,6 +1916,7 @@
__traceiter_android_rvh_typec_tcpci_chk_contaminant
__traceiter_android_rvh_typec_tcpci_get_vbus
__traceiter_android_rvh_uclamp_eff_get
__traceiter_android_rvh_ufs_reprogram_all_keys
__traceiter_android_rvh_util_est_update
__traceiter_android_vh_arch_set_freq_scale
__traceiter_android_vh_cma_alloc_finish
@ -1989,6 +1990,7 @@
__tracepoint_android_rvh_typec_tcpci_chk_contaminant
__tracepoint_android_rvh_typec_tcpci_get_vbus
__tracepoint_android_rvh_uclamp_eff_get
__tracepoint_android_rvh_ufs_reprogram_all_keys
__tracepoint_android_rvh_util_est_update
__tracepoint_android_vh_arch_set_freq_scale
__tracepoint_android_vh_cma_alloc_finish

122
android/abi_gki_aarch64_mtk
View File

@ -44,7 +44,11 @@
bcmp
bdget_disk
bdput
bio_add_pc_page
bio_alloc_bioset
bio_endio
bio_put
bio_reset
__bitmap_andnot
__bitmap_clear
bitmap_find_free_region
@ -59,6 +63,13 @@
bitmap_zalloc
blk_alloc_queue
blk_cleanup_queue
blk_execute_rq
blk_execute_rq_nowait
blk_get_request
blk_mq_free_request
blk_mq_sched_mark_restart_hctx
blk_mq_start_request
blk_put_request
blk_queue_flag_clear
blk_queue_flag_set
blk_queue_io_min
@ -67,6 +78,7 @@
blk_queue_max_discard_sectors
blk_queue_max_write_zeroes_sectors
blk_queue_physical_block_size
blk_rq_append_bio
blocking_notifier_call_chain
blocking_notifier_chain_register
blocking_notifier_chain_unregister
@ -365,6 +377,7 @@
devm_input_allocate_device
devm_ioremap
devm_ioremap_resource
devm_ioremap_wc
devm_kasprintf
devm_kfree
devm_kmalloc
@ -479,9 +492,9 @@
dma_heap_add
dma_heap_buffer_alloc
dma_heap_bufferfd_alloc
dma_heap_buffer_free
dma_heap_find
dma_heap_get_dev
dma_heap_get_drvdata
dma_heap_get_name
dma_heap_put
dmam_alloc_attrs
@ -693,6 +706,7 @@
freq_qos_add_request
freq_qos_remove_request
freq_qos_update_request
fs_bio_set
fsg_common_create_luns
fsg_common_set_cdev
fsg_common_set_inquiry_string
@ -741,6 +755,7 @@
get_cpu_iowait_time_us
get_device
get_each_dmabuf
get_freelist_nr_pages
__get_free_pages
get_governor_parent_kobj
get_kernel_pages
@ -753,7 +768,6 @@
get_task_exe_file
get_task_mm
get_unused_fd_flags
get_user_pages
get_user_pages_remote
get_vaddr_frames
get_zeroed_page
@ -806,6 +820,7 @@
i2c_smbus_read_i2c_block_data
i2c_smbus_write_byte_data
i2c_smbus_write_i2c_block_data
i2c_smbus_write_word_data
i2c_transfer
i2c_transfer_buffer_flags
i2c_unregister_device
@ -877,6 +892,7 @@
iommu_group_alloc
iommu_group_ref_get
iommu_iova_to_phys
iommu_map
iommu_map_sg
iommu_present
iommu_put_dma_cookie
@ -955,13 +971,14 @@
kmemdup
kobject_add
kobject_create_and_add
kobject_del
kobject_get
kobject_init
kobject_init_and_add
kobject_put
kobject_uevent
kobject_uevent_env
krealloc
kset_find_obj
kstrdup
kstrdup_const
kstrndup
@ -1055,7 +1072,6 @@
media_entity_pads_init
media_entity_remote_pad
media_entity_remove_links
__media_entity_setup_link
media_graph_walk_next
media_graph_walk_start
media_pipeline_start
@ -1329,6 +1345,7 @@
pinctrl_utils_add_map_configs
pinctrl_utils_free_map
pinctrl_utils_reserve_map
pin_user_pages
pin_user_pages_fast
platform_bus_type
platform_device_add
@ -1404,7 +1421,6 @@
__put_net
__put_page
put_pid
put_task_stack
__put_task_struct
put_unused_fd
put_vaddr_frames
@ -1496,6 +1512,7 @@
regulator_enable_regmap
regulator_get
regulator_get_current_limit_regmap
regulator_get_mode
regulator_get_optional
regulator_get_voltage
regulator_get_voltage_sel_regmap
@ -1550,6 +1567,7 @@
__rht_bucket_nested
rht_bucket_nested
rht_bucket_nested_insert
root_task_group
round_jiffies
round_jiffies_relative
round_jiffies_up
@ -1584,6 +1602,7 @@
rtnl_lock
rtnl_unlock
runqueues
__sbitmap_queue_get
sched_clock
sched_feat_keys
sched_setattr_nocheck
@ -1593,19 +1612,22 @@
sched_uclamp_used
schedule
schedule_timeout
schedutil_cpu_util
scmi_driver_register
scmi_driver_unregister
scmi_protocol_register
scnprintf
scsi_autopm_get_device
scsi_autopm_put_device
scsi_block_requests
scsi_command_size_tbl
scsi_device_get
scsi_device_put
scsi_device_quiesce
__scsi_execute
__scsi_iterate_devices
scsi_normalize_sense
scsi_print_sense_hdr
scsi_unblock_requests
sdio_signal_irq
send_sig
seq_hex_dump
@ -1753,6 +1775,7 @@
srcu_notifier_call_chain
srcu_notifier_chain_register
srcu_notifier_chain_unregister
__srcu_read_unlock
sscanf
__stack_chk_fail
__stack_chk_guard
@ -1857,6 +1880,7 @@
__traceiter_android_rvh_setscheduler
__traceiter_android_rvh_set_user_nice
__traceiter_android_rvh_tick_entry
__traceiter_android_rvh_uclamp_eff_get
__traceiter_android_vh_alter_futex_plist_add
__traceiter_android_vh_alter_rwsem_list_add
__traceiter_android_vh_arch_set_freq_scale
@ -1864,6 +1888,9 @@
__traceiter_android_vh_binder_set_priority
__traceiter_android_vh_binder_transaction_init
__traceiter_android_vh_cgroup_set_task
__traceiter_android_vh_check_bpf_syscall
__traceiter_android_vh_check_file_open
__traceiter_android_vh_check_mmap_file
__traceiter_android_vh_clear_mask_adjust
__traceiter_android_vh_clear_reserved_fmt_fields
__traceiter_android_vh_commit_creds
@ -1874,7 +1901,6 @@
__traceiter_android_vh_iommu_alloc_iova
__traceiter_android_vh_iommu_free_iova
__traceiter_android_vh_logbuf
__traceiter_android_vh_media_device_setup_link
__traceiter_android_vh_override_creds
__traceiter_android_vh_prepare_update_load_avg_se
__traceiter_android_vh_revert_creds
@ -1895,9 +1921,8 @@
__traceiter_android_vh_set_module_permit_before_init
__traceiter_android_vh_set_wake_flags
__traceiter_android_vh_syscall_prctl_finished
__traceiter_android_vh_v4l2subdev_set_fmt
__traceiter_android_vh_v4l2subdev_set_frame_interval
__traceiter_android_vh_v4l2subdev_set_selection
__traceiter_android_vh_ufs_send_command
__traceiter_android_vh_ufs_send_tm_command
__traceiter_cpu_frequency
__traceiter_pelt_se_tp
__traceiter_rwmmio_post_read
@ -1919,6 +1944,7 @@
__tracepoint_android_rvh_setscheduler
__tracepoint_android_rvh_set_user_nice
__tracepoint_android_rvh_tick_entry
__tracepoint_android_rvh_uclamp_eff_get
__tracepoint_android_vh_alter_futex_plist_add
__tracepoint_android_vh_alter_rwsem_list_add
__tracepoint_android_vh_arch_set_freq_scale
@ -1926,6 +1952,9 @@
__tracepoint_android_vh_binder_set_priority
__tracepoint_android_vh_binder_transaction_init
__tracepoint_android_vh_cgroup_set_task
__tracepoint_android_vh_check_bpf_syscall
__tracepoint_android_vh_check_file_open
__tracepoint_android_vh_check_mmap_file
__tracepoint_android_vh_clear_mask_adjust
__tracepoint_android_vh_clear_reserved_fmt_fields
__tracepoint_android_vh_commit_creds
@ -1936,7 +1965,6 @@
__tracepoint_android_vh_iommu_alloc_iova
__tracepoint_android_vh_iommu_free_iova
__tracepoint_android_vh_logbuf
__tracepoint_android_vh_media_device_setup_link
__tracepoint_android_vh_override_creds
__tracepoint_android_vh_prepare_update_load_avg_se
__tracepoint_android_vh_revert_creds
@ -1957,9 +1985,8 @@
__tracepoint_android_vh_set_module_permit_before_init
__tracepoint_android_vh_set_wake_flags
__tracepoint_android_vh_syscall_prctl_finished
__tracepoint_android_vh_v4l2subdev_set_fmt
__tracepoint_android_vh_v4l2subdev_set_frame_interval
__tracepoint_android_vh_v4l2subdev_set_selection
__tracepoint_android_vh_ufs_send_command
__tracepoint_android_vh_ufs_send_tm_command
__tracepoint_cpu_frequency
__tracepoint_pelt_se_tp
tracepoint_probe_register
@ -1970,6 +1997,7 @@
__tracepoint_sched_update_nr_running_tp
tracepoint_srcu
trace_print_array_seq
trace_print_hex_seq
trace_print_symbols_seq
__trace_puts
trace_raw_output_prep
@ -2003,7 +2031,6 @@
uart_update_timeout
uclamp_eff_value
__udelay
ufshcd_auto_hibern8_update
ufshcd_delay_us
ufshcd_dme_get_attr
ufshcd_dme_set_attr
@ -2012,6 +2039,7 @@
ufshcd_get_pwr_dev_param
ufshcd_hba_enable
ufshcd_hba_stop
ufshcd_hold
ufshcd_link_recovery
ufshcd_make_hba_operational
ufshcd_pltfrm_init
@ -2019,12 +2047,18 @@
ufshcd_pltfrm_runtime_idle
ufshcd_pltfrm_runtime_resume
ufshcd_pltfrm_runtime_suspend
ufshcd_pltfrm_shutdown
ufshcd_pltfrm_suspend
ufshcd_query_attr
ufshcd_query_attr_retry
ufshcd_query_descriptor_retry
ufshcd_query_flag
ufshcd_read_desc_param
ufshcd_release
ufshcd_remove
ufshcd_shutdown
ufshcd_uic_hibern8_exit
unlock_page
unpin_user_page
unpin_user_pages
unregister_blkdev
__unregister_chrdev
@ -2179,6 +2213,7 @@
__v4l2_find_nearest_size
v4l2_format_info
v4l2_i2c_subdev_init
v4l2_m2m_buf_copy_metadata
v4l2_m2m_buf_queue
v4l2_m2m_buf_remove
v4l2_m2m_ctx_init
@ -2201,11 +2236,14 @@
v4l2_m2m_job_finish
v4l2_m2m_next_buf
v4l2_m2m_qbuf
v4l2_m2m_register_media_controller
v4l2_m2m_release
v4l2_m2m_request_queue
v4l2_m2m_resume
v4l2_m2m_streamoff
v4l2_m2m_suspend
v4l2_m2m_try_schedule
v4l2_m2m_unregister_media_controller
v4l2_pipeline_link_notify
v4l2_src_change_event_subscribe
v4l2_subdev_call_wrappers
@ -2282,6 +2320,7 @@
wait_for_completion
wait_for_completion_interruptible
wait_for_completion_interruptible_timeout
wait_for_completion_io_timeout
wait_for_completion_killable
wait_for_completion_timeout
wait_woken
@ -2290,6 +2329,7 @@
wake_up_process
wakeup_source_add
wakeup_source_create
wakeup_source_destroy
wakeup_source_register
wakeup_source_remove
wakeup_source_unregister
@ -2300,7 +2340,7 @@
woken_wake_function
work_busy
work_on_cpu
ww_mutex_lock_interruptible
ww_mutex_lock
ww_mutex_unlock
xhci_add_endpoint
xhci_check_bandwidth
@ -2314,19 +2354,16 @@
# preserved by --additions-only
all_vm_events
__arch_clear_user
bio_add_pc_page
bio_reset
__bitmap_equal
__bitmap_or
blk_insert_cloned_request
blk_mq_sched_mark_restart_hctx
blk_rq_append_bio
cache_line_size
cgroup_taskset_first
cgroup_taskset_next
class_create_file_ns
class_remove_file_ns
clear_page
cpufreq_update_util_data
cpu_pm_register_notifier
cpu_pm_unregister_notifier
debug_locks_off
@ -2344,10 +2381,11 @@
dma_buf_mmap
dma_fence_get_status
dma_fence_remove_callback
dma_heap_buffer_free
dma_sync_single_for_device
downgrade_write
down_read_trylock
get_freelist_nr_pages
get_user_pages
get_user_pages_fast
gpiod_set_raw_value
hci_alloc_dev
@ -2360,10 +2398,11 @@
irq_work_run
jiffies_64_to_clock_t
__kfifo_init
kobject_del
kset_find_obj
kstrtobool_from_user
ktime_get_raw
led_classdev_unregister
__media_entity_setup_link
memdup_user
__mmdrop
module_put
@ -2376,11 +2415,12 @@
param_ops_string
perf_num_counters
pin_user_pages_remote
put_task_stack
rb_prev
rb_replace_node
__release_region
__request_region
__sbitmap_queue_get
schedutil_cpu_util
sdio_claim_host
sdio_claim_irq
sdio_disable_func
@ -2415,34 +2455,54 @@
syscore_suspend
system_long_wq
thermal_zone_device_update
__traceiter_android_rvh_after_enqueue_task
__traceiter_android_rvh_media_device_setup_link
__traceiter_android_rvh_sched_rebalance_domains
__traceiter_android_rvh_v4l2subdev_set_fmt
__traceiter_android_rvh_v4l2subdev_set_frame_interval
__traceiter_android_rvh_v4l2subdev_set_selection
__traceiter_android_vh_cgroup_attach
__traceiter_android_vh_ipv6_gen_linklocal_addr
__traceiter_android_vh_is_fpsimd_save
__traceiter_android_vh_media_device_setup_link
__traceiter_android_vh_v4l2subdev_set_fmt
__traceiter_android_vh_v4l2subdev_set_frame_interval
__traceiter_android_vh_v4l2subdev_set_selection
__traceiter_gpu_mem_total
__traceiter_task_newtask
__traceiter_xhci_urb_giveback
trace_output_call
__tracepoint_android_rvh_after_enqueue_task
__tracepoint_android_rvh_media_device_setup_link
__tracepoint_android_rvh_sched_rebalance_domains
__tracepoint_android_rvh_v4l2subdev_set_fmt
__tracepoint_android_rvh_v4l2subdev_set_frame_interval
__tracepoint_android_rvh_v4l2subdev_set_selection
__tracepoint_android_vh_cgroup_attach
__tracepoint_android_vh_ipv6_gen_linklocal_addr
__tracepoint_android_vh_is_fpsimd_save
__tracepoint_android_vh_media_device_setup_link
__tracepoint_android_vh_ufs_update_sdev
__tracepoint_android_vh_v4l2subdev_set_fmt
__tracepoint_android_vh_v4l2subdev_set_frame_interval
__tracepoint_android_vh_v4l2subdev_set_selection
__tracepoint_gpu_mem_total
__tracepoint_task_newtask
__tracepoint_xhci_urb_giveback
trace_print_flags_seq
try_module_get
tty_driver_flush_buffer
tty_register_ldisc
tty_unregister_ldisc
ufshcd_pltfrm_shutdown
ufshcd_auto_hibern8_update
ufshcd_shutdown
unmap_mapping_range
unpin_user_page
unregister_syscore_ops
v4l2_m2m_buf_copy_metadata
v4l2_m2m_buf_remove_by_buf
v4l2_m2m_register_media_controller
v4l2_m2m_request_queue
v4l2_m2m_unregister_media_controller
vmf_insert_pfn_prot
wait_for_completion_killable_timeout
wireless_send_event
ww_mutex_lock
ww_mutex_lock_interruptible
zlib_deflate
zlib_deflateEnd
zlib_deflateInit2

15
android/abi_gki_aarch64_qcom
View File

@ -1053,6 +1053,15 @@
i2c_register_driver
i2c_transfer
i2c_transfer_buffer_flags
i3c_device_disable_ibi
i3c_device_do_priv_xfers
i3c_device_enable_ibi
i3c_device_free_ibi
i3c_device_get_info
i3c_device_request_ibi
i3cdev_to_dev
i3c_driver_register_with_owner
i3c_driver_unregister
i3c_generic_ibi_alloc_pool
i3c_generic_ibi_free_pool
i3c_generic_ibi_get_free_slot
@ -2463,6 +2472,8 @@
trace_get_event_file
trace_handle_return
__traceiter_android_rvh_account_irq
__traceiter_android_rvh_after_dequeue_task
__traceiter_android_rvh_after_enqueue_task
__traceiter_android_rvh_build_perf_domains
__traceiter_android_rvh_can_migrate_task
__traceiter_android_rvh_cgroup_force_kthread_migration
@ -2505,6 +2516,7 @@
__traceiter_android_rvh_set_readahead_gfp_mask
__traceiter_android_rvh_set_skip_swapcache_flags
__traceiter_android_rvh_set_task_cpu
__traceiter_android_rvh_show_max_freq
__traceiter_android_rvh_tick_entry
__traceiter_android_rvh_try_to_wake_up
__traceiter_android_rvh_try_to_wake_up_success
@ -2569,6 +2581,8 @@
__traceiter_sched_switch
__traceiter_suspend_resume
__tracepoint_android_rvh_account_irq
__tracepoint_android_rvh_after_dequeue_task
__tracepoint_android_rvh_after_enqueue_task
__tracepoint_android_rvh_build_perf_domains
__tracepoint_android_rvh_can_migrate_task
__tracepoint_android_rvh_cgroup_force_kthread_migration
@ -2611,6 +2625,7 @@
__tracepoint_android_rvh_set_readahead_gfp_mask
__tracepoint_android_rvh_set_skip_swapcache_flags
__tracepoint_android_rvh_set_task_cpu
__tracepoint_android_rvh_show_max_freq
__tracepoint_android_rvh_tick_entry
__tracepoint_android_rvh_try_to_wake_up
__tracepoint_android_rvh_try_to_wake_up_success

1518
android/abi_gki_aarch64_rockchip Normal file
View File

File diff suppressed because it is too large Load Diff

2534
android/abi_gki_aarch64_unisoc
View File

File diff suppressed because it is too large Load Diff

22
android/abi_gki_aarch64_vivo
View File

@ -1718,8 +1718,14 @@
__traceiter_android_vh_iommu_setup_dma_ops
__traceiter_android_vh_ipi_stop
__traceiter_android_vh_jiffies_update
__traceiter_android_vh_mmc_attach_sd
__traceiter_android_vh_mmc_blk_mq_rw_recovery
__traceiter_android_vh_mmc_blk_reset
__traceiter_android_vh_mmc_gpio_cd_irqt
__traceiter_android_vh_printk_hotplug
__traceiter_android_vh_scheduler_tick
__traceiter_android_vh_sdhci_get_cd
__traceiter_android_vh_sd_update_bus_speed_mode
__traceiter_android_vh_show_max_freq
__traceiter_android_vh_show_resume_epoch_val
__traceiter_android_vh_show_suspend_epoch_val
@ -1731,12 +1737,17 @@
__traceiter_binder_transaction_received
__traceiter_cpu_frequency_limits
__traceiter_cpu_idle
__traceiter_dwc3_complete_trb
__traceiter_dwc3_ctrl_req
__traceiter_dwc3_event
__traceiter_ipi_entry
__traceiter_ipi_raise
__traceiter_rwmmio_post_read
__traceiter_rwmmio_read
__traceiter_rwmmio_write
__traceiter_suspend_resume
__traceiter_usb_gadget_connect
__traceiter_usb_gadget_disconnect
__tracepoint_android_rvh_account_irq
__tracepoint_android_rvh_build_perf_domains
__tracepoint_android_rvh_can_migrate_task
@ -1789,8 +1800,14 @@
__tracepoint_android_vh_iommu_setup_dma_ops
__tracepoint_android_vh_ipi_stop
__tracepoint_android_vh_jiffies_update
__tracepoint_android_vh_mmc_attach_sd
__tracepoint_android_vh_mmc_blk_mq_rw_recovery
__tracepoint_android_vh_mmc_blk_reset
__tracepoint_android_vh_mmc_gpio_cd_irqt
__tracepoint_android_vh_printk_hotplug
__tracepoint_android_vh_scheduler_tick
__tracepoint_android_vh_sdhci_get_cd
__tracepoint_android_vh_sd_update_bus_speed_mode
__tracepoint_android_vh_show_max_freq
__tracepoint_android_vh_show_resume_epoch_val
__tracepoint_android_vh_show_suspend_epoch_val
@ -1802,6 +1819,9 @@
__tracepoint_binder_transaction_received
__tracepoint_cpu_frequency_limits
__tracepoint_cpu_idle
__tracepoint_dwc3_complete_trb
__tracepoint_dwc3_ctrl_req
__tracepoint_dwc3_event
__tracepoint_ipi_entry
__tracepoint_ipi_raise
tracepoint_probe_register
@ -1811,6 +1831,8 @@
__tracepoint_rwmmio_read
__tracepoint_rwmmio_write
__tracepoint_suspend_resume
__tracepoint_usb_gadget_connect
__tracepoint_usb_gadget_disconnect
trace_print_array_seq
trace_print_flags_seq
trace_print_symbols_seq

2
arch/arm/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/arch/arm/OWNERS

2
arch/arm64/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/arch/arm64/OWNERS

2
arch/x86/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/arch/x86/OWNERS

2
block/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/block/OWNERS

17
build.config.gki.aarch64
View File

@ -12,18 +12,19 @@ KMI_SYMBOL_LIST=android/abi_gki_aarch64
ADDITIONAL_KMI_SYMBOL_LISTS="
android/abi_gki_aarch64_core
android/abi_gki_aarch64_db845c
android/abi_gki_aarch64_qcom
android/abi_gki_aarch64_virtual_device
android/abi_gki_aarch64_hikey960
android/abi_gki_aarch64_galaxy
android/abi_gki_aarch64_generic
android/abi_gki_aarch64_exynos
android/abi_gki_aarch64_exynosauto
android/abi_gki_aarch64_mtk
android/abi_gki_aarch64_xiaomi
android/abi_gki_aarch64_fips140
android/abi_gki_aarch64_vivo
android/abi_gki_aarch64_galaxy
android/abi_gki_aarch64_generic
android/abi_gki_aarch64_hikey960
android/abi_gki_aarch64_mtk
android/abi_gki_aarch64_oplus
android/abi_gki_aarch64_qcom
android/abi_gki_aarch64_rockchip
android/abi_gki_aarch64_virtual_device
android/abi_gki_aarch64_vivo
android/abi_gki_aarch64_xiaomi
"
FILES="${FILES}

2
crypto/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/crypto/OWNERS

2
drivers/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/drivers/OWNERS

19
drivers/android/binder.c
View File

@ -2851,9 +2851,28 @@ static void binder_transaction(struct binder_proc *proc,
if (target_node && target_node->txn_security_ctx) {
u32 secid;
size_t added_size;
int max_retries = 100;
security_task_getsecid(proc->tsk, &secid);
retry_alloc:
ret = security_secid_to_secctx(secid, &secctx, &secctx_sz);
if (ret == -ENOMEM && max_retries-- > 0) {
struct page *dummy_page;
/*
* security_secid_to_secctx() can fail because of a
* GFP_ATOMIC allocation in which case -ENOMEM is
* returned. This needs to be retried, but there is
* currently no way to tell userspace to retry so we
* do it here. We make sure there is still available
* memory first and then retry.
*/
dummy_page = alloc_page(GFP_KERNEL);
if (dummy_page) {
__free_page(dummy_page);
goto retry_alloc;
}
}
if (ret) {
return_error = BR_FAILED_REPLY;
return_error_param = ret;

12
drivers/android/vendor_hooks.c
View File

@ -72,6 +72,7 @@
#include <trace/hooks/ipv6.h>
#include <trace/hooks/sound.h>
#include <trace/hooks/snd_compr.h>
#include <trace/hooks/ipv4.h>
/*
* Export tracepoints that act as a bare tracehook (ie: have no trace event
@ -212,6 +213,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_filemap_fault_cache_page);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_enable_thermal_genl_check);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_thermal_pm_notify_suspend);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_fill_prdt);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_ufs_reprogram_all_keys);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_prepare_command);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_update_sysfs);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_send_command);
@ -331,12 +333,16 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_task_comm);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpufreq_acct_update_power);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_typec_tcpm_log);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_media_device_setup_link);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_media_device_setup_link);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_clear_reserved_fmt_fields);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_fill_ext_fmtdesc);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_clear_mask_adjust);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_v4l2subdev_set_selection);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_v4l2subdev_set_selection);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_v4l2subdev_set_fmt);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_v4l2subdev_set_fmt);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_v4l2subdev_set_frame_interval);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_v4l2subdev_set_frame_interval);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_scmi_timeout_sync);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_new_ilb);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_uid);
@ -366,3 +372,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_usb_dev_resume);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ipv6_gen_linklocal_addr);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sound_usb_support_cpu_suspend);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_snd_compr_use_pause_in_drain);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_show_max_freq);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_sendmsg_locked);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_recvmsg);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_udp_sendmsg);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_udp_recvmsg);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_recvmsg_stat);

1
drivers/cpufreq/cpufreq.c
View File

@ -697,6 +697,7 @@ static ssize_t show_cpuinfo_max_freq(struct cpufreq_policy *policy, char *buf)
unsigned int max_freq = policy->cpuinfo.max_freq;
trace_android_vh_show_max_freq(policy, &max_freq);
trace_android_rvh_show_max_freq(policy, &max_freq);
return sprintf(buf, "%u\n", max_freq);
}

2
drivers/dma-buf/dma-buf.c
View File

@ -98,12 +98,12 @@ static void dma_buf_release(struct dentry *dentry)
*/
BUG_ON(dmabuf->cb_shared.active || dmabuf->cb_excl.active);
dma_buf_stats_teardown(dmabuf);
dmabuf->ops->release(dmabuf);
if (dmabuf->resv == (struct dma_resv *)&dmabuf[1])
dma_resv_fini(dmabuf->resv);
dma_buf_stats_teardown(dmabuf);
module_put(dmabuf->owner);
kfree(dmabuf->name);
kfree(dmabuf);

1
drivers/media/mc/mc-device.c
View File

@ -225,6 +225,7 @@ static long media_device_setup_link(struct media_device *mdev, void *arg)
/* Setup the link on both entities */
trace_android_vh_media_device_setup_link(link, linkd, &ret);
trace_android_rvh_media_device_setup_link(link, linkd, &ret);
if (ret)
return ret;

5
drivers/media/v4l2-core/v4l2-subdev.c
View File

@ -521,6 +521,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
trace_android_vh_v4l2subdev_set_fmt(sd, subdev_fh->pad,
format, &ret);
trace_android_rvh_v4l2subdev_set_fmt(sd, subdev_fh->pad,
format, &ret);
if (ret)
return ret;
@ -600,6 +602,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return -EPERM;
trace_android_vh_v4l2subdev_set_frame_interval(sd, fi, &ret);
trace_android_rvh_v4l2subdev_set_frame_interval(sd, fi, &ret);
if (ret)
return ret;
@ -632,6 +635,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
trace_android_vh_v4l2subdev_set_selection(sd, subdev_fh->pad,
sel, &ret);
trace_android_rvh_v4l2subdev_set_selection(sd, subdev_fh->pad,
sel, &ret);
if (ret)
return ret;

2
drivers/mfd/syscon.c
View File

@ -108,6 +108,7 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk)
syscon_config.max_register = resource_size(&res) - reg_io_width;
regmap = regmap_init_mmio(NULL, base, &syscon_config);
kfree(syscon_config.name);
if (IS_ERR(regmap)) {
pr_err("regmap init failed\n");
ret = PTR_ERR(regmap);
@ -144,7 +145,6 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk)
regmap_exit(regmap);
err_regmap:
iounmap(base);
kfree(syscon_config.name);
err_map:
kfree(syscon);
return ERR_PTR(ret);

12
drivers/scsi/ufs/ufshcd-crypto.c
View File

@ -6,6 +6,9 @@
#include "ufshcd.h"
#include "ufshcd-crypto.h"
#undef CREATE_TRACE_POINTS
#include <trace/hooks/ufshcd.h>
/* Blk-crypto modes supported by UFS crypto */
static const struct ufs_crypto_alg_entry {
enum ufs_crypto_alg ufs_alg;
@ -120,8 +123,13 @@ bool ufshcd_crypto_enable(struct ufs_hba *hba)
return false;
/* Reset might clear all keys, so reprogram all the keys. */
if (hba->ksm.num_slots)
blk_ksm_reprogram_all_keys(&hba->ksm);
if (hba->ksm.num_slots) {
int err = -EOPNOTSUPP;
trace_android_rvh_ufs_reprogram_all_keys(hba, &err);
if (err == -EOPNOTSUPP)
blk_ksm_reprogram_all_keys(&hba->ksm);
}
if (hba->quirks & UFSHCD_QUIRK_BROKEN_CRYPTO_ENABLE)
return false;

11
drivers/scsi/ufs/ufshcd.c
View File

@ -37,7 +37,7 @@
UTP_TASK_REQ_COMPL |\
UFSHCD_ERROR_MASK)
/* UIC command timeout, unit: ms */
#define UIC_CMD_TIMEOUT 500
#define UIC_CMD_TIMEOUT 5000
/* NOP OUT retries waiting for NOP IN response */
#define NOP_OUT_RETRIES 10
@ -3393,9 +3393,11 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
if (is_kmalloc) {
/* Make sure we don't copy more data than available */
if (param_offset + param_size > buff_len)
param_size = buff_len - param_offset;
memcpy(param_read_buf, &desc_buf[param_offset], param_size);
if (param_offset >= buff_len)
ret = -EINVAL;
else
memcpy(param_read_buf, &desc_buf[param_offset],
min_t(u32, param_size, buff_len - param_offset));
}
out:
if (is_kmalloc)
@ -9544,6 +9546,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
async_schedule(ufshcd_async_scan, hba);
ufs_sysfs_add_nodes(hba);
device_enable_async_suspend(dev);
return 0;
free_tmf_queue:

8
drivers/usb/gadget/composite.c
View File

@ -527,7 +527,7 @@ static u8 encode_bMaxPower(enum usb_device_speed speed,
{
unsigned val;
if (c->MaxPower)
if (c->MaxPower || (c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
val = c->MaxPower;
else
val = CONFIG_USB_GADGET_VBUS_DRAW;
@ -981,7 +981,11 @@ static int set_config(struct usb_composite_dev *cdev,
}
/* when we return, be sure our power usage is valid */
power = c->MaxPower ? c->MaxPower : CONFIG_USB_GADGET_VBUS_DRAW;
if (c->MaxPower || (c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
power = c->MaxPower;
else
power = CONFIG_USB_GADGET_VBUS_DRAW;
if (gadget->speed < USB_SPEED_SUPER)
power = min(power, 500U);
else

1
files_gki_aarch64.txt
View File

@ -3928,6 +3928,7 @@ include/trace/hooks/gpiolib.h
include/trace/hooks/hung_task.h
include/trace/hooks/i2c.h
include/trace/hooks/iommu.h
include/trace/hooks/ipv4.h
include/trace/hooks/ipv6.h
include/trace/hooks/logbuf.h
include/trace/hooks/memory.h

2
fs/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/fs/OWNERS

2
fs/f2fs/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/fs/f2fs/OWNERS

2
fs/f2fs/data.c
View File

@ -2514,6 +2514,8 @@ bool f2fs_should_update_outplace(struct inode *inode, struct f2fs_io_info *fio)
return true;
if (f2fs_is_atomic_file(inode))
return true;
if (is_sbi_flag_set(sbi, SBI_NEED_FSCK))
return true;
/* swap file is migrating in aligned write mode */
if (is_inode_flag_set(inode, FI_ALIGNED_WRITE))

17
fs/f2fs/node.c
View File

@ -552,7 +552,7 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,
int i;
ni->nid = nid;
retry:
/* Check nat cache */
down_read(&nm_i->nat_tree_lock);
e = __lookup_nat_cache(nm_i, nid);
@ -564,10 +564,19 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,
return 0;
}
memset(&ne, 0, sizeof(struct f2fs_nat_entry));
/*
* Check current segment summary by trying to grab journal_rwsem first.
* This sem is on the critical path on the checkpoint requiring the above
* nat_tree_lock. Therefore, we should retry, if we failed to grab here
* while not bothering checkpoint.
*/
if (!rwsem_is_locked(&sbi->cp_global_sem)) {
down_read(&curseg->journal_rwsem);
} else if (!down_read_trylock(&curseg->journal_rwsem)) {
up_read(&nm_i->nat_tree_lock);
goto retry;
}
/* Check current segment summary */
down_read(&curseg->journal_rwsem);
i = f2fs_lookup_journal_in_cursum(journal, NAT_JOURNAL, nid, 0);
if (i >= 0) {
ne = nat_in_journal(journal, i);

2
fs/f2fs/segment.c
View File

@ -3563,7 +3563,7 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio)
goto drop_bio;
}
if (is_sbi_flag_set(sbi, SBI_NEED_FSCK) || f2fs_cp_error(sbi)) {
if (f2fs_cp_error(sbi)) {
err = -EIO;
goto drop_bio;
}

2
fs/fuse/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/fs/fuse/OWNERS

2
fs/incfs/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/fs/incfs/OWNERS

19
fs/pipe.c
View File

@ -406,7 +406,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
ssize_t ret = 0;
size_t total_len = iov_iter_count(from);
ssize_t chars;
bool was_empty = false;
bool do_wakeup = false;
bool wake_next_writer = false;
/* Null write succeeds. */
@ -429,10 +429,11 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
#endif
/*
* Only wake up if the pipe started out empty, since
* otherwise there should be no readers waiting.
* Wake up readers if the pipe was written to. Regardless
* of whether it was empty or not. Otherwise, threads
* waiting with EPOLLET will hang until the pipe is emptied.
*
* If it wasn't empty we try to merge new data into
* If pipe wasn't empty we try to merge new data into
* the last buffer.
*
* That naturally merges small writes, but it also
@ -440,9 +441,8 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
* spanning multiple pages.
*/
head = pipe->head;
was_empty = pipe_empty(head, pipe->tail);
chars = total_len & (PAGE_SIZE-1);
if (chars && !was_empty) {
if (chars && !pipe_empty(head, pipe->tail)) {
unsigned int mask = pipe->ring_size - 1;
struct pipe_buffer *buf = &pipe->bufs[(head - 1) & mask];
int offset = buf->offset + buf->len;
@ -460,6 +460,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
}
buf->len += ret;
do_wakeup = true;
if (!iov_iter_count(from))
goto out;
}
@ -526,6 +527,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
ret += copied;
buf->offset = 0;
buf->len = copied;
do_wakeup = true;
if (!iov_iter_count(from))
break;
@ -553,13 +555,12 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
* become empty while we dropped the lock.
*/
__pipe_unlock(pipe);
if (was_empty) {
if (do_wakeup) {
wake_up_interruptible_sync_poll(&pipe->rd_wait, EPOLLIN | EPOLLRDNORM);
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
}
wait_event_interruptible_exclusive(pipe->wr_wait, pipe_writable(pipe));
__pipe_lock(pipe);
was_empty = pipe_empty(pipe->head, pipe->tail);
wake_next_writer = true;
}
out:
@ -576,7 +577,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
* how (for example) the GNU make jobserver uses small writes to
* wake up pending jobs
*/
if (was_empty) {
if (do_wakeup) {
wake_up_interruptible_sync_poll(&pipe->rd_wait, EPOLLIN | EPOLLRDNORM);
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
}

23
fs/proc/fd.c
View File

@ -71,7 +71,7 @@ static int seq_show(struct seq_file *m, void *v)
return 0;
}
static int seq_fdinfo_open(struct inode *inode, struct file *file)
static int proc_fdinfo_access_allowed(struct inode *inode)
{
bool allowed = false;
struct task_struct *task = get_proc_task(inode);
@ -85,6 +85,16 @@ static int seq_fdinfo_open(struct inode *inode, struct file *file)
if (!allowed)
return -EACCES;
return 0;
}
static int seq_fdinfo_open(struct inode *inode, struct file *file)
{
int ret = proc_fdinfo_access_allowed(inode);
if (ret)
return ret;
return single_open(file, seq_show, inode);
}
@ -365,12 +375,23 @@ static int proc_readfdinfo(struct file *file, struct dir_context *ctx)
proc_fdinfo_instantiate);
}
static int proc_open_fdinfo(struct inode *inode, struct file *file)
{
int ret = proc_fdinfo_access_allowed(inode);
if (ret)
return ret;
return 0;
}
const struct inode_operations proc_fdinfo_inode_operations = {
.lookup = proc_lookupfdinfo,
.setattr = proc_setattr,
};
const struct file_operations proc_fdinfo_operations = {
.open = proc_open_fdinfo,
.read = generic_read_dir,
.iterate_shared = proc_readfdinfo,
.llseek = generic_file_llseek,

2
include/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/include/OWNERS

2
include/linux/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/include/linux/OWNERS

2
include/trace/events/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/include/trace/events/OWNERS

4
include/trace/hooks/cpufreq.h
View File

@ -11,6 +11,10 @@
#include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>
DECLARE_RESTRICTED_HOOK(android_rvh_show_max_freq,
TP_PROTO(struct cpufreq_policy *policy, unsigned int *max_freq),
TP_ARGS(policy, max_freq), 1);
DECLARE_HOOK(android_vh_show_max_freq,
TP_PROTO(struct cpufreq_policy *policy, unsigned int *max_freq),
TP_ARGS(policy, max_freq));

34
include/trace/hooks/ipv4.h Normal file
View File

@ -0,0 +1,34 @@
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM ipv4
#define TRACE_INCLUDE_PATH trace/hooks
#if !defined(_TRACE_HOOK_IPV4_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HOOK_IPV4_H
#include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>
DECLARE_RESTRICTED_HOOK(android_rvh_tcp_sendmsg_locked,
TP_PROTO(struct sock *sk, int size),
TP_ARGS(sk, size), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_tcp_recvmsg,
TP_PROTO(struct sock *sk),
TP_ARGS(sk), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_udp_sendmsg,
TP_PROTO(struct sock *sk),
TP_ARGS(sk), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_udp_recvmsg,
TP_PROTO(struct sock *sk),
TP_ARGS(sk), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_tcp_recvmsg_stat,
TP_PROTO(struct sock *sk, int size),
TP_ARGS(sk, size), 1);
#endif /* _TRACE_HOOK_IPV4_H */
/* This part must be outside protection */
#include <trace/define_trace.h>

4
include/trace/hooks/ufshcd.h
View File

@ -19,6 +19,10 @@ DECLARE_HOOK(android_vh_ufs_fill_prdt,
unsigned int segments, int *err),
TP_ARGS(hba, lrbp, segments, err));
DECLARE_RESTRICTED_HOOK(android_rvh_ufs_reprogram_all_keys,
TP_PROTO(struct ufs_hba *hba, int *err),
TP_ARGS(hba, err), 1);
DECLARE_HOOK(android_vh_ufs_prepare_command,
TP_PROTO(struct ufs_hba *hba, struct request *rq,
struct ufshcd_lrb *lrbp, int *err),

17
include/trace/hooks/v4l2core.h
View File

@ -5,7 +5,7 @@
#define TRACE_INCLUDE_PATH trace/hooks
#if !defined(_TRACE_HOOK_V4L2CORE_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HOOK_V4L2_CORE_H
#define _TRACE_HOOK_V4L2CORE_H
#include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>
@ -44,6 +44,21 @@ DECLARE_HOOK(android_vh_v4l2subdev_set_frame_interval,
int *ret),
TP_ARGS(sd, fi, ret));
DECLARE_RESTRICTED_HOOK(android_rvh_v4l2subdev_set_selection,
TP_PROTO(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *pad,
struct v4l2_subdev_selection *sel, int *ret),
TP_ARGS(sd, pad, sel, ret), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_v4l2subdev_set_fmt,
TP_PROTO(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *pad,
struct v4l2_subdev_format *format, int *ret),
TP_ARGS(sd, pad, format, ret), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_v4l2subdev_set_frame_interval,
TP_PROTO(struct v4l2_subdev *sd, struct v4l2_subdev_frame_interval *fi,
int *ret),
TP_ARGS(sd, fi, ret), 1);
#endif /* _TRACE_HOOK_V4L2CORE_H */
/* This part must be outside protection */
#include <trace/define_trace.h>

5
include/trace/hooks/v4l2mc.h
View File

@ -16,6 +16,11 @@ DECLARE_HOOK(android_vh_media_device_setup_link,
TP_PROTO(struct media_link *link, struct media_link_desc *linkd, int *ret),
TP_ARGS(link, linkd, ret));
DECLARE_RESTRICTED_HOOK(android_rvh_media_device_setup_link,
TP_PROTO(struct media_link *link,
struct media_link_desc *linkd, int *ret),
TP_ARGS(link, linkd, ret), 1);
#endif /* _TRACE_HOOK_V4L2MC_H */
/* This part must be outside protection */
#include <trace/define_trace.h>

2
include/uapi/linux/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/include/uapi/linux/OWNERS

1
kernel/irq/generic-chip.c
View File

@ -200,6 +200,7 @@ int irq_gc_set_wake(struct irq_data *d, unsigned int on)
irq_gc_unlock(gc);
return 0;
}
EXPORT_SYMBOL_GPL(irq_gc_set_wake);
static u32 irq_readl_be(void __iomem *addr)
{

2
kernel/sched/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/kernel/sched/OWNERS

2
mm/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/mm/OWNERS

20
mm/compaction.c
View File

@ -1914,20 +1914,28 @@ static bool kswapd_is_running(pg_data_t *pgdat)
/*
* A zone's fragmentation score is the external fragmentation wrt to the
* COMPACTION_HPAGE_ORDER scaled by the zone's size. It returns a value
* in the range [0, 100].
* COMPACTION_HPAGE_ORDER. It returns a value in the range [0, 100].
*/
static unsigned int fragmentation_score_zone(struct zone *zone)
{
return extfrag_for_order(zone, COMPACTION_HPAGE_ORDER);
}
/*
* A weighted zone's fragmentation score is the external fragmentation
* wrt to the COMPACTION_HPAGE_ORDER scaled by the zone's size. It
* returns a value in the range [0, 100].
*
* The scaling factor ensures that proactive compaction focuses on larger
* zones like ZONE_NORMAL, rather than smaller, specialized zones like
* ZONE_DMA32. For smaller zones, the score value remains close to zero,
* and thus never exceeds the high threshold for proactive compaction.
*/
static unsigned int fragmentation_score_zone(struct zone *zone)
static unsigned int fragmentation_score_zone_weighted(struct zone *zone)
{
unsigned long score;
score = zone->present_pages *
extfrag_for_order(zone, COMPACTION_HPAGE_ORDER);
score = zone->present_pages * fragmentation_score_zone(zone);
return div64_ul(score, zone->zone_pgdat->node_present_pages + 1);
}
@ -1947,7 +1955,7 @@ static unsigned int fragmentation_score_node(pg_data_t *pgdat)
struct zone *zone;
zone = &pgdat->node_zones[zoneid];
score += fragmentation_score_zone(zone);
score += fragmentation_score_zone_weighted(zone);
}
return score;

19
mm/kfence/core.c
View File

@ -733,6 +733,22 @@ void kfence_shutdown_cache(struct kmem_cache *s)
void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags)
{
/*
* Perform size check before switching kfence_allocation_gate, so that
* we don't disable KFENCE without making an allocation.
*/
if (size > PAGE_SIZE)
return NULL;
/*
* Skip allocations from non-default zones, including DMA. We cannot
* guarantee that pages in the KFENCE pool will have the requested
* properties (e.g. reside in DMAable memory).
*/
if ((flags & GFP_ZONEMASK) ||
(s->flags & (SLAB_CACHE_DMA | SLAB_CACHE_DMA32)))
return NULL;
/*
* allocation_gate only needs to become non-zero, so it doesn't make
* sense to continue writing to it and pay the associated contention
@ -757,9 +773,6 @@ void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags)
if (!READ_ONCE(kfence_enabled))
return NULL;
if (size > PAGE_SIZE)
return NULL;
return kfence_guarded_alloc(s, size, flags);
}

8
mm/page_alloc.c
View File

@ -2359,6 +2359,13 @@ inline void post_alloc_hook(struct page *page, unsigned int order,
arch_alloc_page(page, order);
debug_pagealloc_map_pages(page, 1 << order);
/*
* Page unpoisoning must happen before memory initialization.
* Otherwise, the poison pattern will be overwritten for __GFP_ZERO
* allocations and the page unpoisoning code will complain.
*/
kernel_unpoison_pages(page, 1 << order);
/*
* As memory initialization might be integrated into KASAN,
* kasan_alloc_pages and kernel_init_free_pages must be
@ -2375,7 +2382,6 @@ inline void post_alloc_hook(struct page *page, unsigned int order,
gfp_flags & __GFP_ZEROTAGS);
}
kernel_unpoison_pages(page, 1 << order);
set_page_owner(page, order, gfp_flags);
}

4
mm/page_poison.c
View File

@ -77,12 +77,14 @@ static void unpoison_page(struct page *page)
void *addr;
addr = kmap_atomic(page);
kasan_disable_current();
/*
* Page poisoning when enabled poisons each and every page
* that is freed to buddy. Thus no extra check is done to
* see if a page was poisoned.
*/
check_poison_mem(addr, PAGE_SIZE);
check_poison_mem(kasan_reset_tag(addr), PAGE_SIZE);
kasan_enable_current();
kunmap_atomic(addr);
}

2
mm/vmalloc.c
View File

@ -327,6 +327,7 @@ int map_kernel_range(unsigned long start, unsigned long size, pgprot_t prot,
flush_cache_vmap(start, start + size);
return ret;
}
EXPORT_SYMBOL_GPL(map_kernel_range);
int is_vmalloc_or_module_addr(const void *x)
{
@ -2100,6 +2101,7 @@ struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags,
return __get_vm_area_node(size, 1, flags, start, end, NUMA_NO_NODE,
GFP_KERNEL, caller);
}
EXPORT_SYMBOL_GPL(__get_vm_area_caller);
/**
* get_vm_area - reserve a contiguous kernel virtual area

2
net/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/net/OWNERS

4
net/ipv4/tcp.c
View File

@ -280,6 +280,7 @@
#include <asm/ioctls.h>
#include <net/busy_poll.h>
#include <trace/hooks/ipv4.h>
struct percpu_counter tcp_orphan_count;
EXPORT_SYMBOL_GPL(tcp_orphan_count);
@ -1198,6 +1199,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
bool zc = false;
long timeo;
trace_android_rvh_tcp_sendmsg_locked(sk, size);
flags = msg->msg_flags;
if (flags & MSG_ZEROCOPY && size && sock_flag(sk, SOCK_ZEROCOPY)) {
@ -2031,6 +2033,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
if (unlikely(flags & MSG_ERRQUEUE))
return inet_recv_error(sk, msg, len, addr_len);
trace_android_rvh_tcp_recvmsg(sk);
if (sk_can_busy_loop(sk) && skb_queue_empty_lockless(&sk->sk_receive_queue) &&
(sk->sk_state == TCP_ESTABLISHED))
@ -2243,6 +2246,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
break;
} while (len > 0);
trace_android_rvh_tcp_recvmsg_stat(sk, copied);
/* According to UNIX98, msg_name/msg_namelen are ignored
* on connected socket. I was just happy when found this 8) --ANK
*/

3
net/ipv4/udp.c
View File

@ -116,6 +116,7 @@
#if IS_ENABLED(CONFIG_IPV6)
#include <net/ipv6_stubs.h>
#endif
#include <trace/hooks/ipv4.h>
struct udp_table udp_table __read_mostly;
EXPORT_SYMBOL(udp_table);
@ -1049,6 +1050,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
if (msg->msg_flags & MSG_OOB) /* Mirror BSD error message compatibility */
return -EOPNOTSUPP;
trace_android_rvh_udp_sendmsg(sk);
getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag;
@ -1801,6 +1803,7 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
if (!skb)
return err;
trace_android_rvh_udp_recvmsg(sk);
ulen = udp_skb_len(skb);
copied = len;

2
tools/testing/selftests/filesystems/incfs/OWNERS
View File

@ -1,2 +0,0 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/tools/testing/selftests/filesystems/incfs/OWNERS