Greg Kroah-Hartman
e09000ee19
Revert half of "ANDROID: vendor_hooks: Add hooks for memory when debug"
...
This reverts parts of commit 24149445adxieliujie@oppo.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: I63621110c0c38b7e5d5e5e6f85c513bf00ecc00b
2022-01-21 13:11:10 +01:00
Greg Kroah-Hartman
3f305a9101
Revert half of "ANDROID: gic-v3: Add vendor hook to GIC v3"
...
This reverts parts of commit 00c6f53e03neeraju@codeaurora.org >
Cc: Prasad Sodagudi <psodagud@codeaurora.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: I30cc4ebf738b77c2ea48df1d74ef5663f0ae1be6
2022-01-21 13:11:10 +01:00
Greg Kroah-Hartman
3b4ca92614
Merge tag 'android12-5.10.81_r00' into android12-5.10
...
This is the merge of the upstream LTS release of 5.10.81 into the
android12-5.10 branch.
New symbols were added to be tracked, which are the only ABI changes:
Leaf changes summary: 209 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 192 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 17 Added variables
192 Added functions:
[A] 'function void __bforget(buffer_head*)'
[A] 'function ssize_t __blockdev_direct_IO(kiocb*, inode*, block_device*, iov_iter*, get_block_t*, dio_iodone_t*, dio_submit_t*, int)'
[A] 'function buffer_head* __bread_gfp(block_device*, sector_t, unsigned int, gfp_t)'
[A] 'function void __breadahead(block_device*, sector_t, unsigned int)'
[A] 'function void __brelse(buffer_head*)'
[A] 'function void __cancel_dirty_page(page*)'
[A] 'function void __cleancache_invalidate_inode(address_space*)'
[A] 'function void __filemap_set_wb_err(address_space*, int)'
[A] 'function void __insert_inode_hash(inode*, unsigned long int)'
[A] 'function void __mark_inode_dirty(inode*, int)'
[A] 'function void __pagevec_release(pagevec*)'
[A] 'function void __remove_inode_hash(inode*)'
[A] 'function int __set_page_dirty_buffers(page*)'
[A] 'function int __set_page_dirty_nobuffers(page*)'
[A] 'function int __test_set_page_writeback(page*, bool)'
[A] 'function int __traceiter_android_rvh_binder_transaction(void*, binder_proc*, binder_proc*, binder_thread*, binder_transaction_data*)'
[A] 'function int __traceiter_android_rvh_do_sched_yield(void*, rq*)'
[A] 'function int __traceiter_android_vh_binder_del_ref(void*, task_struct*, uint32_t)'
[A] 'function int __traceiter_android_vh_binder_free_proc(void*, binder_proc*)'
[A] 'function int __traceiter_android_vh_binder_has_work_ilocked(void*, binder_thread*, bool, int*)'
[A] 'function int __traceiter_android_vh_binder_looper_state_registered(void*, binder_thread*, binder_proc*)'
[A] 'function int __traceiter_android_vh_binder_new_ref(void*, task_struct*, uint32_t, int)'
[A] 'function int __traceiter_android_vh_binder_proc_transaction(void*, task_struct*, task_struct*, task_struct*, int, unsigned int, bool)'
[A] 'function int __traceiter_android_vh_binder_proc_transaction_end(void*, task_struct*, task_struct*, task_struct*, unsigned int, bool, bool)'
[A] 'function int __traceiter_android_vh_binder_read_done(void*, binder_proc*, binder_thread*)'
[A] 'function int __traceiter_android_vh_binder_thread_read(void*, list_head**, binder_proc*, binder_thread*)'
[A] 'function int __traceiter_android_vh_binder_thread_release(void*, binder_proc*, binder_thread*)'
[A] 'function int __traceiter_android_vh_futex_sleep_start(void*, task_struct*)'
[A] 'function int __traceiter_block_bio_remap(void*, request_queue*, bio*, dev_t, sector_t)'
[A] 'function int add_to_page_cache_locked(page*, address_space*, unsigned long int, gfp_t)'
[A] 'function bio* bio_split(bio*, int, gfp_t, bio_set*)'
[A] 'function wait_queue_head* bit_waitqueue(void*, int)'
[A] 'function blk_plug_cb* blk_check_plugged(blk_plug_cb_fn, void*, int)'
[A] 'function void blk_queue_max_write_same_sectors(request_queue*, unsigned int)'
[A] 'function int blkdev_issue_discard(block_device*, sector_t, sector_t, gfp_t, unsigned long int)'
[A] 'function void block_invalidatepage(page*, unsigned int, unsigned int)'
[A] 'function int block_is_partially_uptodate(page*, unsigned long int, unsigned long int)'
[A] 'function int buffer_migrate_page(address_space*, page*, page*, migrate_mode)'
[A] 'function bool capable_wrt_inode_uidgid(const inode*, int)'
[A] 'function void clean_bdev_aliases(block_device*, sector_t, sector_t)'
[A] 'function void clear_inode(inode*)'
[A] 'function int clear_page_dirty_for_io(page*)'
[A] 'function int clk_set_duty_cycle(clk*, unsigned int, unsigned int)'
[A] 'function int clocksource_mmio_init(void*, const char*, unsigned long int, int, unsigned int, typedef u64 (clocksource*)*)'
[A] 'function u64 clocksource_mmio_readl_up(clocksource*)'
[A] 'function void create_empty_buffers(page*, unsigned long int, unsigned long int)'
[A] 'function int current_umask()'
[A] 'function dentry* d_add_ci(dentry*, inode*, qstr*)'
[A] 'function void d_instantiate(dentry*, inode*)'
[A] 'function dentry* d_obtain_alias(inode*)'
[A] 'function dentry* d_splice_alias(inode*, dentry*)'
[A] 'function void delete_from_page_cache(page*)'
[A] 'function i3c_device* dev_to_i3cdev(device*)'
[A] 'function spi_mem_dirmap_desc* devm_spi_mem_dirmap_create(device*, spi_mem*, const spi_mem_dirmap_info*)'
[A] 'function void disk_stack_limits(gendisk*, block_device*, sector_t)'
[A] 'function void drop_nlink(inode*)'
[A] 'function void end_buffer_write_sync(buffer_head*, int)'
[A] 'function void end_page_writeback(page*)'
[A] 'function errseq_t errseq_set(errseq_t*, int)'
[A] 'function int fb_get_options(const char*, char**)'
[A] 'function int fiemap_fill_next_extent(fiemap_extent_info*, u64, u64, u64, u32)'
[A] 'function int fiemap_prep(inode*, fiemap_extent_info*, u64, u64*, u32)'
[A] 'function int file_remove_privs(file*)'
[A] 'function int file_update_time(file*)'
[A] 'function int file_write_and_wait_range(file*, loff_t, loff_t)'
[A] 'function vm_fault_t filemap_fault(vm_fault*)'
[A] 'function int filemap_fdatawait_range(address_space*, loff_t, loff_t)'
[A] 'function int filemap_fdatawrite(address_space*)'
[A] 'function int filemap_flush(address_space*)'
[A] 'function int filemap_write_and_wait_range(address_space*, loff_t, loff_t)'
[A] 'function file* filp_open(const char*, int, umode_t)'
[A] 'function void flush_delayed_fput()'
[A] 'function int freq_qos_remove_notifier(freq_constraints*, freq_qos_req_type, notifier_block*)'
[A] 'function int generic_error_remove_page(address_space*, page*)'
[A] 'function ssize_t generic_file_direct_write(kiocb*, iov_iter*)'
[A] 'function int generic_file_mmap(file*, vm_area_struct*)'
[A] 'function int generic_file_open(inode*, file*)'
[A] 'function ssize_t generic_file_splice_read(file*, loff_t*, pipe_inode_info*, size_t, unsigned int)'
[A] 'function void generic_fillattr(inode*, kstat*)'
[A] 'function ssize_t generic_read_dir(file*, char*, size_t, loff_t*)'
[A] 'function int genphy_restart_aneg(phy_device*)'
[A] 'function page* grab_cache_page_write_begin(address_space*, unsigned long int, unsigned int)'
[A] 'function const i3c_device_id* i3c_device_match_id(i3c_device*, const i3c_device_id*)'
[A] 'function inode* iget5_locked(super_block*, unsigned long int, int (inode*, void*)*, int (inode*, void*)*, void*)'
[A] 'function inode* igrab(inode*)'
[A] 'function void ihold(inode*)'
[A] 'function int iio_device_claim_direct_mode(iio_dev*)'
[A] 'function void iio_device_release_direct_mode(iio_dev*)'
[A] 'function int iio_push_event(iio_dev*, u64, s64)'
[A] 'function int iio_read_mount_matrix(device*, const char*, iio_mount_matrix*)'
[A] 'function ssize_t iio_show_mount_matrix(iio_dev*, uintptr_t, const iio_chan_spec*, char*)'
[A] 'function int iio_write_channel_raw(iio_channel*, int)'
[A] 'function inode* ilookup5(super_block*, unsigned long int, int (inode*, void*)*, void*)'
[A] 'function int in_group_p(kgid_t)'
[A] 'function void inc_nlink(inode*)'
[A] 'function void init_special_inode(inode*, umode_t, dev_t)'
[A] 'function void inode_dio_wait(inode*)'
[A] 'function void inode_init_once(inode*)'
[A] 'function void inode_init_owner(inode*, const inode*, umode_t)'
[A] 'function int inode_newsize_ok(const inode*, loff_t)'
[A] 'function void inode_set_flags(inode*, unsigned int, unsigned int)'
[A] 'function void io_schedule()'
[A] 'function void iov_iter_advance(iov_iter*, size_t)'
[A] 'function unsigned long int iov_iter_alignment(const iov_iter*)'
[A] 'function size_t iov_iter_copy_from_user_atomic(page*, iov_iter*, unsigned long int, size_t)'
[A] 'function int iov_iter_fault_in_readable(iov_iter*, size_t)'
[A] 'function ssize_t iov_iter_get_pages(iov_iter*, page**, size_t, unsigned int, size_t*)'
[A] 'function size_t iov_iter_single_seg_count(const iov_iter*)'
[A] 'function bool is_bad_inode(inode*)'
[A] 'function ssize_t iter_file_splice_write(pipe_inode_info*, file*, loff_t*, size_t, unsigned int)'
[A] 'function ino_t iunique(super_block*, ino_t)'
[A] 'function int kernel_sock_shutdown(socket*, sock_shutdown_cmd)'
[A] 'function void kill_block_super(super_block*)'
[A] 'function int kill_pid(pid*, int, int)'
[A] 'function bool kthread_freezable_should_stop(bool*)'
[A] 'function void ll_rw_block(int, int, int, buffer_head**)'
[A] 'function nls_table* load_nls(char*)'
[A] 'function nls_table* load_nls_default()'
[A] 'function void lru_cache_add(page*)'
[A] 'function void make_bad_inode(inode*)'
[A] 'function void mark_buffer_async_write(buffer_head*)'
[A] 'function void mark_buffer_dirty(buffer_head*)'
[A] 'function void mark_buffer_write_io_error(buffer_head*)'
[A] 'function void mark_page_accessed(page*)'
[A] 'function void mnt_drop_write_file(file*)'
[A] 'function int mnt_want_write_file(file*)'
[A] 'function dentry* mount_bdev(file_system_type*, int, const char*, void*, int (super_block*, void*, int)*)'
[A] 'function void mpage_readahead(readahead_control*, get_block_t*)'
[A] 'function int mpage_readpage(page*, get_block_t*)'
[A] 'function int notify_change(dentry*, iattr*, inode**)'
[A] 'function unsigned long int page_cache_next_miss(address_space*, unsigned long int, unsigned long int)'
[A] 'function unsigned long int page_cache_prev_miss(address_space*, unsigned long int, unsigned long int)'
[A] 'function bool page_mapped(page*)'
[A] 'function int page_mkclean(page*)'
[A] 'function void page_zero_new_buffers(page*, unsigned int, unsigned int)'
[A] 'function page* pagecache_get_page(address_space*, unsigned long int, int, gfp_t)'
[A] 'function unsigned int pagevec_lookup_range(pagevec*, address_space*, unsigned long int*, unsigned long int)'
[A] 'function unsigned int pagevec_lookup_range_tag(pagevec*, address_space*, unsigned long int*, unsigned long int, xa_mark_t)'
[A] 'function int phy_modify_mmd(phy_device*, int, u32, u16, u16)'
[A] 'function void put_pages_list(list_head*)'
[A] 'function gfp_t readahead_gfp_mask(address_space*)'
[A] 'function int redirty_page_for_writepage(writeback_control*, page*)'
[A] 'function int rproc_set_firmware(rproc*, const char*)'
[A] 'function int sb_min_blocksize(super_block*, int)'
[A] 'function int sb_set_blocksize(super_block*, int)'
[A] 'function void sched_clock_register(typedef u64 ()*, int, unsigned long int)'
[A] 'function int security_inode_init_security(inode*, inode*, const qstr*, const initxattrs, void*)'
[A] 'function void set_nlink(inode*, unsigned int)'
[A] 'function int setattr_prepare(dentry*, iattr*)'
[A] 'function int snd_interval_ranges(snd_interval*, unsigned int, const snd_interval*, unsigned int)'
[A] 'function int snd_pcm_hw_constraint_ratnums(snd_pcm_runtime*, unsigned int, snd_pcm_hw_param_t, const snd_pcm_hw_constraint_ratnums*)'
[A] 'function int snd_soc_limit_volume(snd_soc_card*, const char*, int)'
[A] 'function int sock_recvmsg(socket*, msghdr*, int)'
[A] 'function socket* sockfd_lookup(int, int*)'
[A] 'function const spi_device_id* spi_get_device_id(const spi_device*)'
[A] 'function int spi_mem_adjust_op_size(spi_mem*, spi_mem_op*)'
[A] 'function bool spi_mem_default_supports_op(spi_mem*, const spi_mem_op*)'
[A] 'function ssize_t spi_mem_dirmap_read(spi_mem_dirmap_desc*, u64, size_t, void*)'
[A] 'function ssize_t spi_mem_dirmap_write(spi_mem_dirmap_desc*, u64, size_t, void*)'
[A] 'function int spi_mem_driver_register_with_owner(spi_mem_driver*, module*)'
[A] 'function void spi_mem_driver_unregister(spi_mem_driver*)'
[A] 'function bool spi_mem_dtr_supports_op(spi_mem*, const spi_mem_op*)'
[A] 'function int spi_mem_exec_op(spi_mem*, const spi_mem_op*)'
[A] 'function const char* spi_mem_get_name(spi_mem*)'
[A] 'function bool spi_mem_supports_op(spi_mem*, const spi_mem_op*)'
[A] 'function blk_qc_t submit_bio_noacct(bio*)'
[A] 'function int sync_dirty_buffer(buffer_head*)'
[A] 'function int sync_filesystem(super_block*)'
[A] 'function int sync_inode_metadata(inode*, int)'
[A] 'function void tag_pages_for_writeback(address_space*, unsigned long int, unsigned long int)'
[A] 'function timespec64 timestamp_truncate(timespec64, inode*)'
[A] 'function void touch_atime(const path*)'
[A] 'function void touchscreen_parse_properties(input_dev*, bool, touchscreen_properties*)'
[A] 'function void touchscreen_report_pos(input_dev*, const touchscreen_properties*, unsigned int, unsigned int, bool)'
[A] 'function int trace_set_clr_event(const char*, const char*, int)'
[A] 'function void truncate_inode_pages(address_space*, loff_t)'
[A] 'function void truncate_inode_pages_final(address_space*)'
[A] 'function void truncate_pagecache(inode*, loff_t)'
[A] 'function void truncate_setsize(inode*, loff_t)'
[A] 'function int try_to_release_page(page*, gfp_t)'
[A] 'function void try_to_writeback_inodes_sb(super_block*, wb_reason)'
[A] 'function void unload_nls(nls_table*)'
[A] 'function void unlock_buffer(buffer_head*)'
[A] 'function void unlock_new_inode(inode*)'
[A] 'function void usbnet_cdc_unbind(usbnet*, usb_interface*)'
[A] 'function int usbnet_generic_cdc_bind(usbnet*, usb_interface*)'
[A] 'function int vsscanf(const char*, const char*, va_list)'
[A] 'function void wait_on_page_bit(page*, int)'
[A] 'function int wake_bit_function(wait_queue_entry*, unsigned int, int, void*)'
[A] 'function void wq_worker_comm(char*, size_t, task_struct*)'
[A] 'function int write_inode_now(inode*, int)'
[A] 'function int write_one_page(page*)'
17 Added variables:
[A] 'tracepoint __tracepoint_android_rvh_binder_transaction'
[A] 'tracepoint __tracepoint_android_rvh_do_ptrauth_fault'
[A] 'tracepoint __tracepoint_android_rvh_do_sched_yield'
[A] 'tracepoint __tracepoint_android_vh_binder_del_ref'
[A] 'tracepoint __tracepoint_android_vh_binder_free_proc'
[A] 'tracepoint __tracepoint_android_vh_binder_has_work_ilocked'
[A] 'tracepoint __tracepoint_android_vh_binder_looper_state_registered'
[A] 'tracepoint __tracepoint_android_vh_binder_new_ref'
[A] 'tracepoint __tracepoint_android_vh_binder_proc_transaction'
[A] 'tracepoint __tracepoint_android_vh_binder_proc_transaction_end'
[A] 'tracepoint __tracepoint_android_vh_binder_read_done'
[A] 'tracepoint __tracepoint_android_vh_binder_thread_read'
[A] 'tracepoint __tracepoint_android_vh_binder_thread_release'
[A] 'tracepoint __tracepoint_android_vh_futex_sleep_start'
[A] 'tracepoint __tracepoint_android_vh_subpage_dma_contig_alloc'
[A] 'tracepoint __tracepoint_block_bio_remap'
[A] 'device platform_bus'
This merge contains the following new commits:
4b6443562994097f943499957dcea40685efd9846a315471cbbd40513d0bdf58fb431abe3f6035836c1ad56b2d5bf5f46483f28c620e1a9b61500ee5c49bfdfe53b31bac0619a0958a535480407c6ad9ac4bb9951cbcf3752243483ed895223afe11be64f27060e28e04e46514fe79ff56c613eaafc59005971945b722e101be336e2d94ebb760c553d9a246706ebf15a1f884bb85b81e49a79bc345490bfa1efc25889a6674ba917cfd5be42b203f1e7340950d188bf40391d41f4d4dd76f9f17287ec7a440cd30f967d120a5f3396f6d83102335523477d543e6879dcdadd6cc51e34fcf72e1de04df8eb4e2e9fbd1963db3ccc113566bc1119b366f5221cbc55cf4a31f420818dfc9ca9669de57de1fbecf1174298a5b7d0341b37d332306b1e71d45798736ac7f6befc31ada86999d7fcf86565b951fb7bf3851cf71d5cb74293225f532246cefb9a8cdf34ff80bf5c6a1e47930892cbdf67f6eb7171372eb18711ee5bc2ba8fc42bbb782241c74cc6503f2578153ee79560cb78b215edb7a93bc3ef6077e03b797bead3d219e84b30459c0caee11f16fee79aa8706b4b5703462a44af0cd17e7c842a4c4ae8b5c98a67c0fe81d7a20727c8124339f0e683e1bb833274ae67091fcc75f64bde0c2dba3c205c017300d8747486439b91fefacb01e962a090e17075fee8a3ae48ad83832d4a8354ae5ca6ce04a7a84bb3fe164e719628773a759e78c267eb7111f77594dde9721ee8a8c3e204fb60afb3bc53409595fd2cecbe31149e5bc3f207ed9ba5eb0e443ef9f7ab9baaaa64ee14aa4cbf00e5ab04c17acf4bba31f3b1f41968262bb6caab6c96b178522aa75a1d6a60ee00e1709b2a090e741522110f210871791e43a8500038dfd67d35061e1023436104e1f710b73c025bfd2ff7a8b07c4eb6849903e7b08ebf41494389185bea3213f19ec6dba3ffe2e548581fee94c59b64e8ac076ce719d438dbf73f3492c4a92602ab1fd40851b622e7b9c9c33ea4cdbdf0f2207c8447cb14a80e6643393cb0fdd9aaeef9d007a91c0faad6e9d4310970d0be2f0bff41126be378079f2886010a8515778f9d8fd056574a70a46740a0aec40a28495a0467ca4d2b41c528b1431e7a836e2fc86da757d6774a42932068dfa570dd293bd40fb75df593941948d8f2f2fc8e5edca68503d6e5fb881e37cf40db288b841c11812deb08fd34982c087602fefd4563fb75227bd78238479b951bcffb3950bb8359f9c8e1feecc040058f7fbeabce61de56412c4673204c553d67301d8da6328ec92a80e1ca2cfbf58ac8e54965d92a4e01a4d7560113207234a61c5d9fa5667074c63cdfb24243e6d20cc0fa1d0d3833d3c569a224420098b6124d924e1959450b7ddb13ddacc4438a745703fe8d239e3c550c7c9ae23e8f775d95972e974eb1db71de28bd833ddddecd70247b752980c7bdd20c4edd206d524149c954f6348983be7b6493c2b7d85085c34374ccb7e4a9720baf016387a1617a99164a43b7712fe3c11fc622887df89e73f33f09d9fcdd3dd905c2fde76df185282385ee6a2c17c93b7bfedc81776f84c7a03d14a50bc008484dde8c8c99308f9c9c7a3fdcd16b15b3f720419366235d4be8f3d88139d71ec65c700fb41b8f5e808449a5c0eb17f424f882989a396b8ae1f588ca1a586453da93965cc2e9f62d12650b8975c15a19b3aa98ef8f75109802499c3ac7519445b7b4afead3925134eff227efdda51ff1a0f71cc43b4860b5829a1cc3b50759f27cfa3a729eb55b350fcaa715512872fd7e4255eb8f8af4d4d6aa2ef0b95aaa4937cd4af996c293fa72d62d337537181807f01f60c6d1f3157aa8e2f97df6ab9f142d748e8c0b748457668cbe0cbd405eb115014e12b7a764ed5bb3df6e2702264751a270dada0116652a3d57a8e4effbb4d5c7f07c74187bf331025c032c5857c1c7ac9d1daf15fa1fd14d24157723424931fa3a342cb4772c85c6fadbee1ee11473a786976b25afbc80c83f1e29352f16241fe79cf114756d7fbaf72de92d33f2fd26ec36ea9fbeb5bbc9e4f708df6508faf87216a161001418d98683fa6d99fdd13a71fe4b24419740a794e01af756be29c68803253821b2d422a26d01e847d8452e3545eeff03e0624e966f7de13d1848f1f00c6c34bfe4204388cebfa7386626be4b688315edafe4280b30ea9e43b301cb1c85e591b77e2f3608a0b0a85325fc54303b39b50375150b3aa8980f9d144cbbf816cb7c39154d3d6ffed64553808fb0008d94519fb9105b6a46ec871ac49af173c9833cb320678fb8c999203725f7125f0b40bf3e4310f581f543a95dbc8b7ba8ba76885a585e04e34fb4a58f51938098444b7582de9e385f0bc12b848b36ab509e1abf37e855e6b72caabc4226d68fb6cc20d8c197419337ed10ebc9199271c0c5e946794a1ec31a0beee75174f6a50a2d1229b44d4c43babd8166a27c66f038b1a94ddfcae9052c4cfdf5fa8a27095cda1b917f9b946428bb3d71eeeb96ebdc642d8c280ddc2e5f43db0b3ae170b8eb870d8a76c16a79811889ceac307b525a45d3999c11aecbe0532a9a8fdbae658d59f0ed6dca066fc9f4bd00a6e7a0b68eecb82327823f32659d8213de73574f7bc1a10bf4c9d49cc377654451cef276f16c2dd0ab5ea7f8803a35736f1deadab5c46f258aa5d35e350cad55afe372338c35017b34ea3c91e517feec952e1d7f0202a9101e2574b832fad367c65c84e09e8b600866018219df0f6ba38608d32ad3c2434d9a68524501a0eb94e5bd540e3bc3e1141b499d40571272e54604cf09e1a2d2c6e242c557a1f38e5e8033d5575b3f57d54f52d8fd506a3d60d2709971f9f40b8e7dee5a62edd8390b570e36a77f4037b9b10d9349416402052c4cebc0c91bb4fbd309ea2248df4c652bd3509ee09359aaded39ff1f461a71a1a643ab64578897890f36332114f8088968ac723fb1f526d948c3bab15174ec7ca1711d591c04dabbd13fac6feca902ddf26d848d433ab5c828118dcc87b92a5df2c75af57ce8a6396e302cc87f43cda6507987f31e54c10465f6d64dfba42604509ae4a4f062b90d7eeb780fff2c756758d66516890e4edcec898622adb76edf4cffe10e71591e91edc54662545f31af4e78ab4755ea916384620608a4e7a8c43246709163a56bc8317b8cceeb0a8a87bc1274df3fe2e8961fbcbd5d9828222b99c6fb654bb5399c1c2ad10bbf846a0da19be55fb031fcd42b861523d71085ee52363bcbace714c1a8fb2374adcfc317d34fd9f0509aaf7d25d78596e7880a43694c0c84a6cd0b29a89b47462c5e60c1e6e4274093fccb1f89875609ad80c3cb7b5c9d9f9d6d391fbd37419f4f924955df37f2feac81ed5720436bc77e867f8bb355c97165ad62bd9eac5f5e63b85a484fbecebb315c6fedce4a30cdf50357aef1a67fbfda8b3b95c5d69ffec3aa41d97e036046752a7aeda194e9c721701cf28e01890e416c02d59d2f7af7daccf403201c422d6301c1b8ad661f3d62e1c9bcc044f34ca2c7400e2ec8eab090dfcb73b79ada4c30182b8c13ce560076091336b2af8af34487c7f2fd1e4d8c61a5d8d7671031f5c9254602ecf56faa5b7e3bb163db04fb4111a09a5f4c072f65b76c44b4a4c9dc44b406439afe8992aab294a99da5b6800bfb1c1a169b86eb2f342167a9a12cc9a7d5fe159813218e96ad6a2a1e56c8270435cf7d1fb5c12c4d41059b9eb8cb3f4ffa07f7a18649db1d9d102e0e86b727a969b14e23dfb92ac0a9caa3564fb7b00ad7f317b9bc3e73ebb74002f3944da1ea41f91da903984385f03e04bb9d6491ccdde2e519acba2f7986fdbbe0ad01685177a6cb5e09e177fee241e6940783d08d75710d583c92556e3c2b73199aadcddf8a74fc15115810a265b05eea1bcbd81e341fb14089432dc0aa21b7e3d3782025948bb980ce4ebb7c6fd52504ecd536c57af503a25a3d9259518fab3c7a3f2d7921f9c02a4d0e4c288a744f9e9c389e62b189f9f3a770cb746b88bcfcc50d0288f838a23d0e5d2eaff0750e9801a2b3dbc9fd151eff588071a137376bb2b5126a7739275d2ec6949c5b6daa9ac25cd2f4dd189feeba32498b888915b4142aea284ad31054823b487cfb7b24b669d3c1d31266de37b15db1d806cc8187db9d623bf17339264eaa6dab0a06769e8c341d11c8d1eb42de7cafbec52fbc0d9f4ae7cdbd9cea41ac7f1d5a1a7dff3230268787acf4924e525e61a871bd816c278362424fe4c28971158af11cf43e92899963ba5b9d844b02496eb7fd7f338733d7a47073ef143dc0c3786f5b034586d4aedcbcc430094541ab4af56ae207d1db141e42681b90c41309753b78274091431294e5305a38a8db6fd04decf58653f1be686d451ebb235e8cc250405204824c7c024327f3eb44f49668765fc977f84b791d4cbbc920fb326d67b2a73b5a7957491e50f46bd309d7fc85f610b93a70bf2bb9c85a71e10382fdf9ae748786564a7b57c38d12a7c8ce846076698ea35fa73948962009df347cfdfbb91dadb56f416815c57a4cf25d83acb8832f6a8ecddaca79e11a7355fb727e5deca8a7112b8eebc2442f721914c1e02b11dad24864148c50693d25ad111d44354509000a255b88bb937781780b624d258c5fea4458722323d444e8c93e1ec2af2092c9bfa6fbdb4ee81bed557fbe98be1a17aead02927a863a423ee02b7c5eed1904121b10cdaed897e96bb0a2cd385536e911a16be51371bd682cf7d935d610e40fb2f524fd8e2f02c63d7f2ca932f3db20f14286c72c53d98883f6c3c3e17e58f5ee4908f909dd2260ec6415dec6d8f8cac6b043ce01599bf7cceb3b6805e3c21b40022169a7fa5cb08fb858b74a4c22227e39fa29cec42cdb1191a5295043fbd29401169a4335ee3213b117a95a76fc0112a46f72f444c2bc2a6befe934629ff3dec7e7acc828115a1411c0406b4c0b1b3e086b5aa5bab5799a52798dce01c2881bb0017718dfbb693ecbe8f7b663890d85d4d9c06598e184a21b5c3f2c12ec8a5a768b4d3e15b278f94bc06d7d9bfc8a6af97c316ad8bbc9d33ceaa85c334944ec82eb378e85d1aecfa79faf7ec56c801391d088db86373a845fa00f021b6d11e53a0dc2e35acfe9266213188907c252f18b90e9362304dfb548c58654f34496fe50612996f0aebf2990c8e8c0820eb2544796ea9c1f5d8a7a5a1f09c8e56a3e7ae385c8d8c1609f591cbdbeab4f542b5115d3ad7988f9d16a4284369db2a91d81d8e70cdc69078a9436f40c2281d296835b68d70e033cb407f8a65413457f221ccbee77c0ef979e8f042315fcb41fd8f5d2568f90634048843dd23cc5c2a80368197ec50b2dfbd724c49b9258f584323e16d9d52516802fa4c30d867a3599a2606acf416411397b6db721500c97895ceeff313cda4bfffd93be0eeea1f1b98569e81727e8688d603d4bcc0fd48db508f95abc9b9d3c864e77771aecfccb1c58053bc12df00917fb040628f28e4bc39697ad63954758e92e754a0928c3eb00ad7a0154eccd00728b6418508a3a29f1bdcaa3d36b15e3e76a72e1d78a32b860d36496c013f40c21f61d104353770a411581dbd898fb6edf99b000ef97219d5f38d984e5e8c28bea6b879c8943812d911e01990c69ea08c1b5842fce431939afed394c2a670c32300f4308a164546c04c857bfef5d8262d8284c981c101e1bcb11a6285b1b2285c1827eee5489c1bed5f59da9f7efb6f32897afb3b7f831a4234d53d2bb221975092a3a9842b42e3e287365213593fa147cf33890d9bb9c546af1816da9af2d25ecfd4fa15b51f6e72ca6fdaff7f9e8057ee6843bc6b24000952c56587174b28586fb04abd118641591a340768ba7b45024f6d0f0e17103a4a37e6516d9428f08e1c216cebdd2e59d8397437eef482db7116932c0e450cb95487c3f2960b39f2f21f06a5eba39f5595284e0f2fc66e19c10d6e0f2e1de07509053c5b45912da46cb6a4f7bddf8c5afb0c67dfd33ca85010517a027aafdd84a69ac416fecdb5b542d937cc12c6e6082250b48613e687e6e6e3018d376644f945907f88568246c0024bcaa0fbc3cf7ddabe5b13dd941e84a4f25e811506f601671cfd31bf931076d324425d059aad078043a17a8177f0576be8ef91d61d5f13bbb51b45923f66eea947267eb9e46bdfb5557e4888640a7bd0dd3f292e6e08ca286e3ad8b753f0ca245a8ecad614b0cbf26bc72dcd4b77900cf3147f572159d89e287113b427514015100dc44892c5dd2a8afd40e193abddec944bb70dc3e0a20db0ee66290f09f0d6c781ce4f7171c230e32a2b85c52924879ed352349aa494ed68471bc95d3aba5fe206868a5b6e7e3ed5c92a31c33aa800c970088595dab6e8f14e3c37135c9faba7916cd7ef43c0f68c3bf276fd71099953b32554a5027f50fa256509b1e10c6bf158a5f01f4b0c6e5290e6c9bb1659ac57680631ac74aab156d30f077d699c1a336e746e377434fe5a042b49f012bbb893f0754bdae2a083457c7ca3d55d993d1e1c4621ddffb70a5ba615fbedb868b453242c871d38ebda06aff033d68c7b0ab194e8a4f0a977aee58149ec9a975ea5182d6db80bcb647c1e1f6952b1e22ddc4ba737bddf026d6ae0bcfa99e8f14cbfeeee4d7a15e1e4f87b4a703034b3fd2a81e0268aa579b825c00c2eef2447f65876bfe1f6fc85d637bc6f9df121cf550d7c36115fbf73ca4961d411b38fe6818a2a2cafca4037dded529fdb11ca82c152d9da8de834e12b9f86de018fd87990a60b4985cca1ad197aeed72af2dc768a98cd3a07ca78a35f6ddd9349a0430225272c2a68f1d5d903a694bf69556a42065fff0a8eff86e19d918008224cdc1d2ccbaaa6618d2568cc740a84fcae2628b31d967144715fbab3ec73ffeef60955b65bdc480d15190cb8880680b2b0035d10510afd1597295ba03fb4c442ea65d0cacff2d182c0d2dd40a7b6e6f79e398d70cb6c77a064faa8e8ad5f4b27c3c1d8f4447e829a19eaeb26b0132f7303d288ed983997bec509afbca14abc18aef3824e9d9b838ae399e99ad41942ba34cf0c18f977e97b214f52004bdd89a313a5725ac88e601ab8073794b427faa29e005287407deac06fe40e871d3ce62acf9a855d1bc9aac782ab08f174a208c12d4b179021bc2f315a29763ffd4da1500f0c8363a0feae5f6e5cb3680b913d17cc717de1e8bd36a1d4e9f27d2feb3fe702afc8b3e838bb3265b88e816d728110b56596148ae79f3d20a453cce4e4a1bd306ef529c5aa003b381387aecdab702bf504bc3b56475c29bae34f26d4a6d0ff92059b8add3f47a352b02562a84778fd66da7be240d178724a2a0e62e28f7dd377a670cfb0fc251d023edc4506403e1bcc4b4de636a4aaf1d842754fa3b73ed6574d48460df9f555676c7063c74b114f2d18efdfb3bc873a41938d07263c89930d450628b06e683050cc239f986cf2702e5611503242ababcd8c2627dc3c79cc23269dad55cd40b137c96f439a7ede2d192301adeb2949417f7ac4d24e157a269a1b1da5b8b9319dedfc35a2d17ccc64e4f28f0fdbac04ad4852b9a5c3a90b6ffa7f4c633ae3770e21f60a63474dbf69ccf35492bdc0942168ad11502fa267cea848678843efca98e67d1df6610f46e5db92f5f6a309a693bef1b724215fd3954bc011b4de95044c600a57d7fc5f60a013db53827a0d0d520c19ee63f6d8fe7071febc37e85e4f5d28d8e89876c84d4a14faf7964dae9551f8d3d27664ef8ba689cb620f6c4a31a16138cf9380306a2c7df1f2ca30fbdf1dd6e10f04967ae9ab459efda5073f9080723917e3eda32b8f2edf80cddc20a0ad7b67b771b1222ee4d0495a6d35d95e8b98321738c6e8de12ad916b22c5e2c8e5ee40530b089d96f147d560271d09f9c6591ae8e2c204cf5948576e72ac51282bb00833748871e1276bbb482d3c61736a9943f4e68902d62ba3c5010d93f65586c12cbdaeeb59f382e1edfc331fad63b0a16c9751e31a13f039e249e5e5a503778511dfc4ed671e6bcbebabb76ad782122ae7d57de2dcb18201ba843febd4e446a69516d9055031499bb2c3a7c4fd5de39196dabd96b23a6dfa10fd1d0016e4ae9edc7bc6123115ca7d23945c481362193cf76f4a7d4fc8440d570c48dd387b6b38b537d8687d4efdcf0824c26d69751309b33740c9227beafee90ec91607afb550dae5f42c05b4909f96149faae851008ed4cb090f93026b28e590942960535c0dfbbd38373d58c8967cdb51ab5cc71740ee49afad85a43db76cb05c0890e25c424044513c1fa0a511ba6d2fec3bd622d61454e7fd65520d27f028d768beaf0e99f903271f58d3058871ef68b84bc1963bdb748526261c1b754a4860c62ecf0dc5a902a08960577372d3e6ea16345a0bee8e567d335089561bb988731df1d037ccc3dd119d3de7e0300337721221e87a6322880533815fe7371ce092350b47040b37a9654e85b6c28b18ba3f477568662e37faf7c9ffe2b0595fc4794cb948b158a3d42ed6b798cba4c2698215df4349955e6f8b3c0419fab1cb0c6ecdcba9d5c6bfde2454ea4925c7056a8f0b18fc64e6c307a2d030542510032f8b3cfc2598bce41b4e54f5f421bba406c07db94f89e1d3aa50241e191d4da33c32eaa39d83e43c880b860b4561bd29e8a00c832ef4e0fd1d795ca435999bc1365a0dc55d5afe3cf526c3f1b741c117661cb9d22538c1bde55352944b48d6a21e4cd43241a6c6e68d4fbe6227dc9225fcd3dfffcd260640946fc560ea9ac731a80af86c1228326be9e5191e4ad05bf2c28bb016b600b19610a0daf57973fdc131d3f13d58fc9e9c1996f7c4a1fa05ff80001b9e697e60cd5b0473707302e60e26ab33b3db4760809b8576fa34d6ef0c7f79282849193028da5e95940e22528d071c7fd455f4bfac2611fbd7eb385838297222b437be4d6fa31bd6cd06a0f8a659a24119f513123f04036b0925f4196eaa97c09505e9e83a3cb200e647c19bc619a14014df723dfb959c6a2551d0a29a6a2b36a8c0a2ea5c0e5db8838e48ad7736e2faa0f36028d015770b54b115acb21e30d0480f7a480d95b50ff07aa1af89a66c43803c1aa921ef7cfef487ead34a2386fd6fd01b26ced26259c1ea8537735492619e0c12cf7f9afb4bb0b171b2a07348e98ca907291e1b9a1526d5145bd9dd1bec9538018cbd1f9ecc00d912afe602ee418ce8b8d8193ad306e41aa215734113a69460d48271d10bf777344da34322b70b522c63df77c4074190973ab0796d99c1b30417cbecce464b3876b375e779ec338ab04186f87c4144450ebcd3fd920fa64b089319d49973b085d0e6a5e446b24588708ccb79116c3ffca467668473cea49835ce134e65ff91d25a7c8ad00533858ce90c6706deb46d7c8ae79286ea83074d54e5ceb9493e92a399e766b86a91b6d7b3a214d8524048aa23d3576219f2972e151619d747c1847bc9c3929b2f9b7455b027c44b8c852a7e666719a3f52f73c639a2eddb701cad477a9fad75e0463f90a34faba7245023184eb635e008c87b34cd6489c98d2bd148c01c620ae6e2d36f2b1c361c955600db7e0d9f6f89b0d032ff450958f7f5711ced58eb167a0cec1f86956143dc2b52963fd5a20adc388f5176a07989da1fb128c5402b31c0ca957d82b2353921242cfb9b89da56a812cbb143ce8dfc446a187479b10ebf10f727cf9ed44be1cbe62f813769f1cf43a1e579e89c22d1cb1f3be0c30063c3d980d00303e4592ab7cf225014320c222c2d92d3a9c2b4a93393203ce660d6dfce76ccbdedb70ac967a7b9ae759a36b7f2b3242f0ca8ecd7444c422c555051cac475eebe5609d3fd5365cdfcc6e81381b72f44892b1515ba83e032cc43aedfe4b0875420f9400b6352e2e27aa638669c8d5c5d1b14113f366bab0b7d4f310bb03cc3a29237a44361a1f619f137ffd49cf30ebb3aa39eb744aad47e09221b76522c7c334fc06d0470511d099db49eff4ab7de68795c110aeb67214ce0ab9981fa05221e66329e00eae1d6b53947b68c535d3ab2ea2cf6f29bb2cdf38f941a7cad96d0e507843861e21983ef86629c5102ced8a8f8ad122ffc586bc31d529a5af9112229e9293b233c983f7a1fd9ed47fe6abe460eb6fedfab735d56c3cb65d56f6f8076655bd6d9a0dd4855c17ffa6c5c9ee2d36ee3ffd56b412551b75b06672dc68e20346f8a2c5cc9d96c9f9ea995e8a62660dfbf20822163efedc6b1c223d8ac63e6e0951cf24bd826e0759f648478f95553f0087f7032dc2cd64b416aea67e7cdbc684da60070c1a5a3ba21ace8f81b76d88f3d951e2575279059efaf816b0f8ad3ea16746412974e75f8976e0944395251e6833b80a99e048583c4f3d097b1abace16c29485e34ebb693c114e84cac4f806be1fcecfc1d0aaea1f115944d0e2b000cdb2fb4db2e72e53cd6d86634d7b388f12dabb2d2d8b0ecace75a6b399e1fa3b2b6027dd91221b086faa4a2e55be9eb1939c8414325e137dafa72269775e4e177a5756e9059a4e7f90386930a2a5be2c304c65defb1ee02787c49a52046da4301d06a05ed5d594d9aa3708236ebe457b27ddb1d547f2f53ad66d67821e930253789c5c65ecbd4bbf0a9d90a693aff5e84ed6510e059e80a3d88f3ed8982df5608c8359c5eb04c51a430e9f44922127d4a96add969eddc3b47344a8a80129c8f13a348de01a896cc0751eeb93ba2faddf1f7c7d6c9cd8d1e382a04a3aab5bffdd7f43da79eb834ecf61ce1a40e60e2abe69ed7bb94a48ed4794d72afec087b225eeaf3a87ae522e46c10b1afc2f6d657f1fa1aa82a111762fd1964f759baf6f8ca2756924bc189ce6e293752d3fab9cea2225a5cd2f0df5eba67b9486d7ac9f1f5db5b8a32a69325ee5868831492d39738ebfadc53c68c9bf4b1b4d3f45fca514f25c49e2bcb7cfa99eec36ed6698029de3240a7025a624618e92d527e8bc1f5baa06cfc5299c2b89f64f035e8d5a6d9713dfa51883449db3aa2254383788155e704790f86bc4a1a498d44b7be6a1073aad49d6c91423993841dfa7eb63ebc1f1dfd763afc4ea491c8be2190f0f1de02bf76f78f9f4127f3610a00bbbe3ec67ac21cd44c92b0fa8d53035e5c99b1543ccafc91ff868c2d62abda9c84edbaa16e76c80da714a198334e9c5667574287874c96a00decce3699c914758310a127178783be2a9424e014ff22ec159db240ce3a2e20ed5ac1bcf53e34cb4967472a64e3f1d8a9cf8272420f1fb1f6fa18fb3d8c151f710323dcd5d008cb7633142476fa037437a60a9f4c7c95e3e6528cc687c3b82e4799f4af60a543b874d5aa06c035f83b5abd0a8ef04c22603740df8dd3307a8b3b763d2e7d4973c57c5e677d62f2bcc863d2eb2f764583448c2bcc61adefd63abc0eb8a6a8dcd2ffb3740418ccdbe2e11b9f86a3564739b99121dec146f51f42412a5999d18a85b3a45eedd52bb703f7123e5fb6475e5cecb91059a85b9e376c6e5eebd95f462a39eb8b4f5c9454de944a22126165c55af5f642639bb8d03f4492dbf5534de13b6b2b8137ec9566ddd2d94224cf5e8c8463b3edfbad3ca78775d34609faad006a553a99b54e51d288bdf19d951413533aa65e69de06dcd4729ab7f6d50e0c17c11b167c9262e3f9f11de5601e78a0b4a33cca6127587cc12ab5951aad29a00a5871abd1e61c327b69e966a985c57942048907d8c10a135969fb32d3ded9d6afd1e053d1e4cfe954b981bf9b0aabb8108546dd04925fb8d4b71928e5c1c934aba9f45cb5f86c1fd69f613afd320c1b2e76bf98b94ff9bab2bc4c2b4849e2ac7e91077cf17903ca538f5add8e8c3404c0c4f7021bda5602c1c926bf91248e84a72f696253bac6c60947579a6961bc19e4062dc45777499782c40178441066433bed3612083ec6291fd0eeaf02ab9d1d321a2be1a51f19abe0463f3d30161279aa7a3ffb12a542421eb4b96edea5cfa55e76641ca7f7e37ba31fd3211ef49e4c83db8876e45c95ea77da9de0d1988836e30c5a5528da73b2bbcccd6d353e093c00f711378f059137b7dff8ea3e622affe2a1cd622b824bae96f273ed4f47ef1eccc4081ef5395fbad782ceaba972d586a3f5b70fd9363674e89aea738b50db4c02f9d60905754fa3c15ccf2df23bd40ed72f2be3432088a1052f79302a3c00c74d6dfcb0fce7e64e63aba73bc1666bcbc44e42d300ccb129276668bdee0bcc0c767f92d2aaa200cc0eaaa6868516dbe27f46cae39f4577509c4cb7c4f920fefd80d54bbad805df14bba00646870ad8e4753723f8bde32e151802d3a9dff7601e6c64bbc3fdf2feb6ce80c45dbe2610e8b26211e1136fbe87524fcd09c96bf326fb97eb16be25fac99b3aa832daa118a3f8248b61b86c37085d606907944851a37566a343f5f13c8bae8d15554f985a58f082554c1b249e02a0901af53da9ac218642d548ee201fb54eb6211b9a3ed34bcad5103b73334ebedb252a4gregkh@google.com >
Change-Id: Icc858b61fec7d76c8b144958c0d5c1859508ecb2
2022-01-21 09:35:04 +01:00
Steven Rostedt (VMware)
bdc732d112
UPSTREAM: tracefs: Set all files to the same group ownership as the mount option
...
commit 48b27b6b5191e2e1f2798cd80877b6e4ef47c351 upstream.
As people have been asking to allow non-root processes to have access to
the tracefs directory, it was considered best to only allow groups to have
access to the directory, where it is easier to just set the tracefs file
system to a specific group (as other would be too dangerous), and that way
the admins could pick which processes would have access to tracefs.
Unfortunately, this broke tooling on Android that expected the other bit
to be set. For some special cases, for non-root tools to trace the system,
tracefs would be mounted and change the permissions of the top level
directory which gave access to all running tasks permission to the
tracing directory. Even though this would be dangerous to do in a
production environment, for testing environments this can be useful.
Now with the new changes to not allow other (which is still the proper
thing to do), it breaks the testing tooling. Now more code needs to be
loaded on the system to change ownership of the tracing directory.
The real solution is to have tracefs honor the gid=xxx option when
mounting. That is,
(tracing group tracing has value 1003)
mount -t tracefs -o gid=1003 tracefs /sys/kernel/tracing
should have it that all files in the tracing directory should be of the
given group.
Copy the logic from d_walk() from dcache.c and simplify it for the mount
case of tracefs if gid is set. All the files in tracefs will be walked and
their group will be set to the value passed in.
Link: https://lkml.kernel.org/r/20211207171729.2a54e1b3@gandalf.local.home
Cc: Ingo Molnar <mingo@kernel.org >
Cc: Kees Cook <keescook@chromium.org >
Cc: Andrew Morton <akpm@linux-foundation.org >
Cc: Linus Torvalds <torvalds@linux-foundation.org >
Cc: linux-fsdevel@vger.kernel.org
Cc: Al Viro <viro@ZenIV.linux.org.uk >
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Reported-by: Kalesh Singh <kaleshsingh@google.com >
Reported-by: Yabin Cui <yabinc@google.com >
Fixes: 49d67e445742 ("tracefs: Have tracefs directories not set OTH permission bits by default")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 5f1f94c26brogerliao@google.com >
Change-Id: Ib82bc6fec33f9fd2f926d76db752d43ec8db8dd1
2022-01-20 15:54:50 +00:00
Steven Rostedt (VMware)
8455746a45
UPSTREAM: tracefs: Have new files inherit the ownership of their parent
...
commit ee7f3666995d8537dec17b1d35425f28877671a9 upstream.
If directories in tracefs have their ownership changed, then any new files
and directories that are created under those directories should inherit
the ownership of the director they are created in.
Link: https://lkml.kernel.org/r/20211208075720.4855d180@gandalf.local.home
Cc: Kees Cook <keescook@chromium.org >
Cc: Ingo Molnar <mingo@kernel.org >
Cc: Andrew Morton <akpm@linux-foundation.org >
Cc: Linus Torvalds <torvalds@linux-foundation.org >
Cc: Al Viro <viro@zeniv.linux.org.uk >
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Cc: Yabin Cui <yabinc@google.com >
Cc: Christian Brauner <christian.brauner@ubuntu.com >
Cc: stable@vger.kernel.org
Fixes: 4282d60689kaleshsingh@google.com >
Reported: https://lore.kernel.org/all/CAC_TJve8MMAv+H_NdLSJXZUSoxOEq2zB_pVaJ9p=7H6Bu3X76g@mail.gmail.com/
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 33204825ccrogerliao@google.com >
Change-Id: I033edde0b38d2c1cad638a9d5f8648aa7f16cfdf
2022-01-20 15:54:38 +00:00
Steven Rostedt (VMware)
9c63be2ada
UPSTREAM: tracefs: Have tracefs directories not set OTH permission bits by default
...
[ Upstream commit 49d67e445742bbcb03106b735b2ab39f6e5c56bc ]
The tracefs file system is by default mounted such that only root user can
access it. But there are legitimate reasons to create a group and allow
those added to the group to have access to tracing. By changing the
permissions of the tracefs mount point to allow access, it will allow
group access to the tracefs directory.
There should not be any real reason to allow all access to the tracefs
directory as it contains sensitive information. Have the default
permission of directories being created not have any OTH (other) bits set,
such that an admin that wants to give permission to a group has to first
disable all OTH bits in the file system.
Link: https://lkml.kernel.org/r/20210818153038.664127804@goodmis.org
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org >
Signed-off-by: Sasha Levin <sashal@kernel.org >
(cherry picked from commit 3c2434d9a6rogerliao@google.com >
Change-Id: Id2cd708f00f31adc8ef398c80e098fe8742e6fa9
2022-01-20 15:54:15 +00:00
Greg Kroah-Hartman
64095600fd
Revert "ANDROID: vendor_hooks: Add hooks to recognize special worker thread."
...
This reverts commit 8f3f46d77cxieliujie@oppo.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: I3112f4e067c27ecb6889333bb58f9342df0ecb63
2022-01-20 10:04:49 +01:00
Greg Kroah-Hartman
7887091009
Revert "ANDROID: sysrq: add vendor hook for sysrq crash information"
...
This reverts commit 0d8928ed6esangmoon.kim@samsung.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: I1b4b9280081e0fb569bb74c7f0d3efcb18728b48
2022-01-20 10:04:49 +01:00
Greg Kroah-Hartman
63e7148b27
Revert "ANDROID: user: Add vendor hook to user for GKI purpose"
...
This reverts commit c9b8fa644fheshuai1@xiaomi.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: I2aa3f95ab52c2d81eb790ba8b64b864f8189222b
2022-01-20 10:04:49 +01:00
Greg Kroah-Hartman
18975040b9
Revert portions of "ANDROID: sched: Add vendor hooks for sched."
...
This reverts part of commit 54f66141a8lijianzhong@xiaomi.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: I92acc11802939d1ebfcc8253490193019567695d
2022-01-20 10:04:49 +01:00
Greg Kroah-Hartman
96c08d9210
Revert portions of "ANDROID: vendor_hooks: Add hooks for scheduler"
...
This reverts part of commit 53e8099784xieliujie@oppo.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: I69bdc14143760bfdd07bbd72ed3d5a4127fbc4c8
2022-01-20 10:04:49 +01:00
Jamie Hill-Daniel
a32e89883a
UPSTREAM: vfs: fs_context: fix up param length parsing in legacy_parse_param
...
The "PAGE_SIZE - 2 - size" calculation in legacy_parse_param() is an
unsigned type so a large value of "size" results in a high positive
value instead of a negative value as expected. Fix this by getting rid
of the subtraction.
Signed-off-by: Jamie Hill-Daniel <jamie@hill-daniel.co.uk >
Signed-off-by: William Liu <willsroot@protonmail.com >
Tested-by: Salvatore Bonaccorso <carnil@debian.org >
Tested-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com >
Acked-by: Dan Carpenter <dan.carpenter@oracle.com >
Acked-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
(cherry picked from commit 722d94847de29310e8aa03fcbdb41fc92c521756)
Bug: 213421437
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: Ica4c894715daae0d4393a377ac3e81260a651df9
2022-01-19 09:14:26 +01:00
Yangtao Li
2c152aa329
UPSTREAM: f2fs: reduce the scope of setting fsck tag when de->name_len is zero
...
I recently found a case where de->name_len is 0 in f2fs_fill_dentries()
easily reproduced, and finally set the fsck flag.
Thread A Thread B
- f2fs_readdir
- f2fs_read_inline_dir
- ctx->pos = d.max
- f2fs_add_dentry
- f2fs_add_inline_entry
- do_convert_inline_dir
- f2fs_add_regular_entry
- f2fs_readdir
- f2fs_fill_dentries
- set_sbi_flag(sbi, SBI_NEED_FSCK)
Process A opens the folder, and has been reading without closing it.
During this period, Process B created a file under the folder (occupying
multiple f2fs_dir_entry, exceeding the d.max of the inline dir). After
creation, process A uses the d.max of inline dir to read it again, and
it will read that de->name_len is 0.
And Chao pointed out that w/o inline conversion, the race condition still
can happen as below:
dir_entry1: A
dir_entry2: B
dir_entry3: C
free slot: _
ctx->pos: ^
Thread A is traversing directory,
ctx-pos moves to below position after readdir() by thread A:
AAAABBBB___
^
Then thread B delete dir_entry2, and create dir_entry3.
Thread A calls readdir() to lookup dirents starting from middle
of new dirent slots as below:
AAAACCCCCC_
^
In these scenarios, the file system is not damaged, and it's hard to
avoid it. But we can bypass tagging FSCK flag if:
a) bit_pos (:= ctx->pos % d->max) is non-zero and
b) before bit_pos moves to first valid dir_entry.
Fixes: ddf06b753afrank.li@vivo.com >
[Chao: clean up description]
Reviewed-by: Chao Yu <chao@kernel.org >
(cherry picked from commit 7b9b92ff1bf07300628e05d966d28318f32b3ecc)
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org >
Change-Id: Iffb4f0e92a6c98cfafb9dcc7d7a0f5e5b1b3a1ef
Change-Id: Ic7bd8a5bb10f2770fee913f4b5faad4f2b177efb
Signed-off-by: haojianhua1 <haojianhua1@xiaomi.com >
2022-01-14 17:35:16 +00:00
gaolong
c29dd368ef
ANDROID: GKI: Update symbols to abi_gki_aarch64_oplus
...
Update symbols to symbol list externed by oem modules.
Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
1 Added function:
[A] 'function int freq_qos_remove_notifier(freq_constraints*, freq_qos_req_type, notifier_block*)'
Bug: 193384408
Signed-off-by: gaolong <gaolong@oppo.com >
Change-Id: I50eac29ee78a0ee963602a8a00d94ad4af2ced03
2022-01-14 16:43:53 +00:00
Hammer_Tsao
428d0bb762
ANDROID: Add initial ASUS symbol list
...
for texfat/tntfs requirement
Leaf changes summary: 125 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 125 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
125 Added functions:
[A] 'function void __bforget(buffer_head*)'
[A] 'function ssize_t __blockdev_direct_IO(kiocb*, inode*, block_device*, iov_iter*, get_block_t*, dio_iodone_t*, dio_submit_t*, int)'
[A] 'function buffer_head* __bread_gfp(block_device*, sector_t, unsigned int, gfp_t)'
[A] 'function void __breadahead(block_device*, sector_t, unsigned int)'
[A] 'function void __brelse(buffer_head*)'
[A] 'function void __cancel_dirty_page(page*)'
[A] 'function void __cleancache_invalidate_inode(address_space*)'
[A] 'function void __filemap_set_wb_err(address_space*, int)'
[A] 'function void __insert_inode_hash(inode*, unsigned long int)'
[A] 'function void __mark_inode_dirty(inode*, int)'
[A] 'function void __pagevec_release(pagevec*)'
[A] 'function void __remove_inode_hash(inode*)'
[A] 'function int __set_page_dirty_buffers(page*)'
[A] 'function int __set_page_dirty_nobuffers(page*)'
[A] 'function int __test_set_page_writeback(page*, bool)'
[A] 'function int add_to_page_cache_locked(page*, address_space*, unsigned long int, gfp_t)'
[A] 'function wait_queue_head* bit_waitqueue(void*, int)'
[A] 'function int blkdev_issue_discard(block_device*, sector_t, sector_t, gfp_t, unsigned long int)'
[A] 'function void block_invalidatepage(page*, unsigned int, unsigned int)'
[A] 'function int block_is_partially_uptodate(page*, unsigned long int, unsigned long int)'
[A] 'function int buffer_migrate_page(address_space*, page*, page*, migrate_mode)'
[A] 'function bool capable_wrt_inode_uidgid(const inode*, int)'
[A] 'function void clean_bdev_aliases(block_device*, sector_t, sector_t)'
[A] 'function void clear_inode(inode*)'
[A] 'function int clear_page_dirty_for_io(page*)'
[A] 'function void create_empty_buffers(page*, unsigned long int, unsigned long int)'
[A] 'function int current_umask()'
[A] 'function dentry* d_add_ci(dentry*, inode*, qstr*)'
[A] 'function void d_instantiate(dentry*, inode*)'
[A] 'function dentry* d_obtain_alias(inode*)'
[A] 'function dentry* d_splice_alias(inode*, dentry*)'
[A] 'function void delete_from_page_cache(page*)'
[A] 'function void drop_nlink(inode*)'
[A] 'function void end_buffer_write_sync(buffer_head*, int)'
[A] 'function void end_page_writeback(page*)'
[A] 'function errseq_t errseq_set(errseq_t*, int)'
[A] 'function int fiemap_fill_next_extent(fiemap_extent_info*, u64, u64, u64, u32)'
[A] 'function int fiemap_prep(inode*, fiemap_extent_info*, u64, u64*, u32)'
[A] 'function int file_remove_privs(file*)'
[A] 'function vm_fault_t filemap_fault(vm_fault*)'
[A] 'function int filemap_fdatawait_range(address_space*, loff_t, loff_t)'
[A] 'function int filemap_fdatawrite(address_space*)'
[A] 'function int filemap_flush(address_space*)'
[A] 'function int filemap_write_and_wait_range(address_space*, loff_t, loff_t)'
[A] 'function file* filp_open(const char*, int, umode_t)'
[A] 'function int generic_error_remove_page(address_space*, page*)'
[A] 'function ssize_t generic_file_direct_write(kiocb*, iov_iter*)'
[A] 'function int generic_file_mmap(file*, vm_area_struct*)'
[A] 'function int generic_file_open(inode*, file*)'
[A] 'function ssize_t generic_file_splice_read(file*, loff_t*, pipe_inode_info*, size_t, unsigned int)'
[A] 'function void generic_fillattr(inode*, kstat*)'
[A] 'function ssize_t generic_read_dir(file*, char*, size_t, loff_t*)'
[A] 'function page* grab_cache_page_write_begin(address_space*, unsigned long int, unsigned int)'
[A] 'function inode* iget5_locked(super_block*, unsigned long int, int (inode*, void*)*, int (inode*, void*)*, void*)'
[A] 'function inode* igrab(inode*)'
[A] 'function void ihold(inode*)'
[A] 'function inode* ilookup5(super_block*, unsigned long int, int (inode*, void*)*, void*)'
[A] 'function int in_group_p(kgid_t)'
[A] 'function void inc_nlink(inode*)'
[A] 'function void init_special_inode(inode*, umode_t, dev_t)'
[A] 'function void inode_dio_wait(inode*)'
[A] 'function void inode_init_once(inode*)'
[A] 'function void inode_init_owner(inode*, const inode*, umode_t)'
[A] 'function int inode_newsize_ok(const inode*, loff_t)'
[A] 'function void inode_set_flags(inode*, unsigned int, unsigned int)'
[A] 'function void io_schedule()'
[A] 'function void iov_iter_advance(iov_iter*, size_t)'
[A] 'function unsigned long int iov_iter_alignment(const iov_iter*)'
[A] 'function size_t iov_iter_copy_from_user_atomic(page*, iov_iter*, unsigned long int, size_t)'
[A] 'function int iov_iter_fault_in_readable(iov_iter*, size_t)'
[A] 'function ssize_t iov_iter_get_pages(iov_iter*, page**, size_t, unsigned int, size_t*)'
[A] 'function size_t iov_iter_single_seg_count(const iov_iter*)'
[A] 'function bool is_bad_inode(inode*)'
[A] 'function ssize_t iter_file_splice_write(pipe_inode_info*, file*, loff_t*, size_t, unsigned int)'
[A] 'function ino_t iunique(super_block*, ino_t)'
[A] 'function void kill_block_super(super_block*)'
[A] 'function void ll_rw_block(int, int, int, buffer_head**)'
[A] 'function nls_table* load_nls(char*)'
[A] 'function nls_table* load_nls_default()'
[A] 'function void lru_cache_add(page*)'
[A] 'function void make_bad_inode(inode*)'
[A] 'function void mark_buffer_async_write(buffer_head*)'
[A] 'function void mark_buffer_dirty(buffer_head*)'
[A] 'function void mark_buffer_write_io_error(buffer_head*)'
[A] 'function void mark_page_accessed(page*)'
[A] 'function void mnt_drop_write_file(file*)'
[A] 'function int mnt_want_write_file(file*)'
[A] 'function dentry* mount_bdev(file_system_type*, int, const char*, void*, int (super_block*, void*, int)*)'
[A] 'function void mpage_readahead(readahead_control*, get_block_t*)'
[A] 'function int mpage_readpage(page*, get_block_t*)'
[A] 'function int notify_change(dentry*, iattr*, inode**)'
[A] 'function unsigned long int page_cache_next_miss(address_space*, unsigned long int, unsigned long int)'
[A] 'function unsigned long int page_cache_prev_miss(address_space*, unsigned long int, unsigned long int)'
[A] 'function bool page_mapped(page*)'
[A] 'function void page_zero_new_buffers(page*, unsigned int, unsigned int)'
[A] 'function page* pagecache_get_page(address_space*, unsigned long int, int, gfp_t)'
[A] 'function unsigned int pagevec_lookup_range(pagevec*, address_space*, unsigned long int*, unsigned long int)'
[A] 'function unsigned int pagevec_lookup_range_tag(pagevec*, address_space*, unsigned long int*, unsigned long int, xa_mark_t)'
[A] 'function void put_pages_list(list_head*)'
[A] 'function gfp_t readahead_gfp_mask(address_space*)'
[A] 'function int redirty_page_for_writepage(writeback_control*, page*)'
[A] 'function int sb_min_blocksize(super_block*, int)'
[A] 'function int sb_set_blocksize(super_block*, int)'
[A] 'function int security_inode_init_security(inode*, inode*, const qstr*, const initxattrs, void*)'
[A] 'function void set_nlink(inode*, unsigned int)'
[A] 'function int setattr_prepare(dentry*, iattr*)'
[A] 'function int sync_dirty_buffer(buffer_head*)'
[A] 'function int sync_filesystem(super_block*)'
[A] 'function int sync_inode_metadata(inode*, int)'
[A] 'function void tag_pages_for_writeback(address_space*, unsigned long int, unsigned long int)'
[A] 'function timespec64 timestamp_truncate(timespec64, inode*)'
[A] 'function void touch_atime(const path*)'
[A] 'function void truncate_inode_pages(address_space*, loff_t)'
[A] 'function void truncate_inode_pages_final(address_space*)'
[A] 'function void truncate_pagecache(inode*, loff_t)'
[A] 'function void truncate_setsize(inode*, loff_t)'
[A] 'function int try_to_release_page(page*, gfp_t)'
[A] 'function void try_to_writeback_inodes_sb(super_block*, wb_reason)'
[A] 'function void unload_nls(nls_table*)'
[A] 'function void unlock_buffer(buffer_head*)'
[A] 'function void unlock_new_inode(inode*)'
[A] 'function void wait_on_page_bit(page*, int)'
[A] 'function int wake_bit_function(wait_queue_entry*, unsigned int, int, void*)'
[A] 'function int write_inode_now(inode*, int)'
[A] 'function int write_one_page(page*)'
Bug: 210074446
Change-Id: I597bf48aecce6c2cd90b79d08d153002d55a4e5f
Signed-off-by: Hammer_Tsao <hammer_tsao@asus.com >
2022-01-12 20:07:30 +00:00
Greg Kroah-Hartman
87a74496ed
ANDROID: configfs: add proper module namespace marking
...
Commit d483eed85fd483eed85fgregkh@google.com >
Change-Id: I1abc2f17d9a8f90f1fe060b314eb69cb1e6cfc5d
2022-01-12 17:15:55 +00:00
Qingqing Zhou
b7a6c15a6f
ANDROID: Configure out the macros in android_kabi and android_vendor
...
Add one CONFIG to control removing the macros or not. On some platform,
configureing out the macros removes the associated members from the
structs, this reduces the object size of the slabs related with the
structs, therefore reduces the total slab memory consumption of system.
Besides, this also reduces vmlinux size a bit, therefore the total
kernel memory size increses a bit.
The macros are ANDROID_KABI_RESERVE, ANDROID_VENDOR_DATA,
ANDROID_VENDOR_DATA_ARRAY, ANDROID_OEM_DATA, ANDROID_OEM_DATA_ARRAY.
Bug: 206561931
Signed-off-by: Qingqing Zhou <quic_qqzhou@quicinc.com >
Change-Id: I0868d299ccce3c4b39f42af17916828500be6cc4
2022-01-12 16:49:39 +08:00
chunhui.li
bdc772adbd
ANDROID: kernel: fix debug_kinfo set twice crash issue
...
If write string to /sys/module/debug_kinfo/parameters/build_info
twice, kernel will crash. fix by removing vunmap in build_info_set.
Bug: 213120696
Signed-off-by: Chunhui Li <chunhui.li@mediatek.com >
Change-Id: I683859067a31068de0006be8490efa4b0107044f
2022-01-11 20:58:26 +00:00
Greg Kroah-Hartman
d483eed85f
ANDROID: GKI: set vfs-only exports into their own namespace
...
We have namespaces, so use them for all vfs-exported namespaces so that
filesystems can use them, but not anything else.
Some in-kernel drivers that do direct filesystem accesses (because they
serve up files) are also allowed access to these symbols to keep 'make
allmodconfig' builds working properly, but it is not needed for Android
kernel images.
Bug: 157965270
Bug: 210074446
Cc: Matthias Maennich <maennich@google.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: Iaf6140baf3a18a516ab2d5c3966235c42f3f70de
2022-01-11 09:30:47 +01:00
Willem de Bruijn
27fc5a7c69
UPSTREAM: net/packet: rx_owner_map depends on pg_vec
...
[ Upstream commit ec6af094ea28f0f2dda1a6a33b14cd57e36a9755 ]
Packet sockets may switch ring versions. Avoid misinterpreting state
between versions, whose fields share a union. rx_owner_map is only
allocated with a packet ring (pg_vec) and both are swapped together.
If pg_vec is NULL, meaning no packet ring was allocated, then neither
was rx_owner_map. And the field may be old state from a tpacket_v3.
Bug: 213464034
Fixes: 61fad6816fsyzbot+1ac0994a0a0c55151121@syzkaller.appspotmail.com >
Signed-off-by: Willem de Bruijn <willemb@google.com >
Reviewed-by: Eric Dumazet <edumazet@google.com >
Link: https://lore.kernel.org/r/20211215143937.106178-1-willemdebruijn.kernel@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
Signed-off-by: Sasha Levin <sashal@kernel.org >
Signed-off-by: Aaron Ding <aaronding@google.com >
Change-Id: Ifd09717336bafe2a3e20389f7f7eb7b95d19e8cd
2022-01-10 17:38:26 +00:00
Liujie Xie
f70ea63f3b
ANDROID: GKI: Update symbols to symbol list
...
Update symbols to symbol list externed by oem modules.
Leaf changes summary: 12 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 6 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 6 Added variables
6 Added functions:
[A] 'function int __traceiter_android_vh_binder_free_proc(void*, binder_proc*)'
[A] 'function int __traceiter_android_vh_binder_has_work_ilocked(void*, binder_thread*, bool, int*)'
[A] 'function int __traceiter_android_vh_binder_looper_state_registered(void*, binder_thread*, binder_proc*)'
[A] 'function int __traceiter_android_vh_binder_read_done(void*, binder_proc*, binder_thread*)'
[A] 'function int __traceiter_android_vh_binder_thread_read(void*, list_head**, binder_proc*, binder_thread*)'
[A] 'function int __traceiter_android_vh_binder_thread_release(void*, binder_proc*, binder_thread*)'
6 Added variables:
[A] 'tracepoint __tracepoint_android_vh_binder_free_proc'
[A] 'tracepoint __tracepoint_android_vh_binder_has_work_ilocked'
[A] 'tracepoint __tracepoint_android_vh_binder_looper_state_registered'
[A] 'tracepoint __tracepoint_android_vh_binder_read_done'
[A] 'tracepoint __tracepoint_android_vh_binder_thread_read'
[A] 'tracepoint __tracepoint_android_vh_binder_thread_release'
Bug: 193384408
Change-Id: Ic2ad0d3bd86eaa1ebb37b478ad4b8806fa0f63f4
Signed-off-by: Liujie Xie <xieliujie@oppo.com >
2022-01-10 15:03:53 +00:00
Greg Kroah-Hartman
a593acdae8
FROMLIST: module.h: allow #define strings to work with MODULE_IMPORT_NS
...
The MODULE_IMPORT_NS() macro does not allow defined strings to work
properly with it, so add a layer of indirection to allow this to happen.
Cc: Luis Chamberlain <mcgrof@kernel.org >
Cc: Jessica Yu <jeyu@kernel.org >
Cc: Matthias Maennich <maennich@google.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Link: https://lore.kernel.org/r/20220108140657.3361237-1-gregkh@linuxfoundation.org
Bug: 210074446
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: Ibd64ba139912ea10e81ac22490831129b23a31e1
2022-01-08 15:24:52 +01:00
Greg Kroah-Hartman
eb171b4cbe
FROMLIST: export: fix string handling of namespace in EXPORT_SYMBOL_NS
...
Commit c3a6cf19e6c3a6cf19e6mbenes@suse.cz >
Cc: Emil Velikov <emil.l.velikov@gmail.com >
Cc: Jessica Yu <jeyu@kernel.org >
Cc: Quentin Perret <qperret@google.com >
Cc: Masahiro Yamada <yamada.masahiro@socionext.com >
Cc: Matthias Maennich <maennich@google.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Link: https://lore.kernel.org/r/20220108140415.3360088-1-gregkh@linuxfoundation.org
Bug: 210074446
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: Ie43aa24f64b55cd1d70161c906b0ef32610430aa
2022-01-08 15:24:25 +01:00
Liujie Xie
05c23b7a50
ANDROID: vendor_hooks: Add hooks for binder
...
We want to add some hooks in the binder module so that we can reduce
block time until binder thread is available
Here are what new hooks do for:
1、android_vh_binder_looper_state_registered: choose a binder thread(do proc work) as a low-level thread.Only this thread has power to excute background binder transaction.
2、android_vh_binder_thread_read: let binder thread do works which come from
our list.
3、android_vh_binder_free_proc: free some pointers and variable.
4、android_vh_binder_thread_release: free the list that we create before.
5、android_vh_binder_has_work_ilocked: to check if our list has work.
6、android_vh_binder_read_done: because of we add hook in binder_has_work_ilocked,
binder_has_work_ilocked may return true, so we try to wake up low-level thread immediately.
Bug: 212483521
Change-Id: Ic40f452cc4dcf8fc85422e23e6f1a7ad77547309
Signed-off-by: Liujie Xie <xieliujie@oppo.com >
2022-01-07 16:09:31 +00:00
Suren Baghdasaryan
e99926fdfa
ANDROID: mm/oom_kill: allow process_mrelease reclaim memory in parallel with exit_mmap
...
To allow process_mrelease to reap targeted mm in parallel with exit_mmap
mark the victim with MMF_OOM_VICTIM flag.
Bug: 189803002
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Change-Id: I89cf5f8fbeeb18b93a340b9ebe7f200837ebe846
2022-01-06 17:38:17 +00:00
Suren Baghdasaryan
f4f2c619d5
FROMLIST: mm/oom_kill: allow process_mrelease to run under mmap_lock protection
...
With exit_mmap holding mmap_write_lock during free_pgtables call,
process_mrelease does not need to elevate mm->mm_users in order to
prevent exit_mmap from destrying pagetables while __oom_reap_task_mm
is walking the VMA tree. The change prevents process_mrelease from
calling the last mmput, which can lead to waiting for IO completion
in exit_aio.
Fixes: 337546e83fc7 ("mm/oom_kill.c: prevent a race between process_mrelease and exit_mmap")
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Link: https://lore.kernel.org/all/20211124235906.14437-2-surenb@google.com/
Bug: 130172058
Bug: 189803002
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Change-Id: I1e2728e0c477af9cc20e9e0b715ee67dee760618
2022-01-06 17:38:05 +00:00
Suren Baghdasaryan
2452622293
FROMLIST: mm: protect free_pgtables with mmap_lock write lock in exit_mmap
...
oom-reaper and process_mrelease system call should protect against
races with exit_mmap which can destroy page tables while they
walk the VMA tree. oom-reaper protects from that race by setting
MMF_OOM_VICTIM and by relying on exit_mmap to set MMF_OOM_SKIP
before taking and releasing mmap_write_lock. process_mrelease has
to elevate mm->mm_users to prevent such race. Both oom-reaper and
process_mrelease hold mmap_read_lock when walking the VMA tree.
The locking rules and mechanisms could be simpler if exit_mmap takes
mmap_write_lock while executing destructive operations such as
free_pgtables.
Change exit_mmap to hold the mmap_write_lock when calling
free_pgtables. Operations like unmap_vmas() and unlock_range() are not
destructive and could run under mmap_read_lock but for simplicity we
take one mmap_write_lock during almost the entire operation. Note
also that because oom-reaper checks VM_LOCKED flag, unlock_range()
should not be allowed to race with it.
In most cases this lock should be uncontended. Previously, Kirill
reported ~4% regression caused by a similar change [1]. We reran the
same test and although the individual results are quite noisy, the
percentiles show lower regression with 1.6% being the worst case [2].
The change allows oom-reaper and process_mrelease to execute safely
under mmap_read_lock without worries that exit_mmap might destroy page
tables from under them.
[1] https://lore.kernel.org/all/20170725141723.ivukwhddk2voyhuc@node.shutemov.name/
[2] https://lore.kernel.org/all/CAJuCfpGC9-c9P40x7oy=jy5SphMcd0o0G_6U1-+JAziGKG6dGA@mail.gmail.com/
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Link: https://lore.kernel.org/all/20211124235906.14437-1-surenb@google.com/
Bug: 130172058
Bug: 189803002
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Change-Id: Ic87272d09a0b68a1b0e968e8f1a1510fd6fc776a
2022-01-06 17:37:54 +00:00
Suren Baghdasaryan
fd7af95538
UPSTREAM: mm/oom_kill.c: prevent a race between process_mrelease and exit_mmap
...
Race between process_mrelease and exit_mmap, where free_pgtables is
called while __oom_reap_task_mm is in progress, leads to kernel crash
during pte_offset_map_lock call. oom-reaper avoids this race by setting
MMF_OOM_VICTIM flag and causing exit_mmap to take and release
mmap_write_lock, blocking it until oom-reaper releases mmap_read_lock.
Reusing MMF_OOM_VICTIM for process_mrelease would be the simplest way to
fix this race, however that would be considered a hack. Fix this race
by elevating mm->mm_users and preventing exit_mmap from executing until
process_mrelease is finished. Patch slightly refactors the code to
adapt for a possible mmget_not_zero failure.
This fix has considerable negative impact on process_mrelease
performance and will likely need later optimization.
Link: https://lkml.kernel.org/r/20211022014658.263508-1-surenb@google.com
Fixes: 884a7e5964e0 ("mm: introduce process_mrelease system call")
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Acked-by: Michal Hocko <mhocko@suse.com >
Cc: David Rientjes <rientjes@google.com >
Cc: Matthew Wilcox (Oracle) <willy@infradead.org >
Cc: Johannes Weiner <hannes@cmpxchg.org >
Cc: Roman Gushchin <guro@fb.com >
Cc: Rik van Riel <riel@surriel.com >
Cc: Minchan Kim <minchan@kernel.org >
Cc: Christian Brauner <christian@brauner.io >
Cc: Christoph Hellwig <hch@infradead.org >
Cc: Oleg Nesterov <oleg@redhat.com >
Cc: David Hildenbrand <david@redhat.com >
Cc: Jann Horn <jannh@google.com >
Cc: Shakeel Butt <shakeelb@google.com >
Cc: Andy Lutomirski <luto@kernel.org >
Cc: Christian Brauner <christian.brauner@ubuntu.com >
Cc: Florian Weimer <fweimer@redhat.com >
Cc: Jan Engelhardt <jengelh@inai.de >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
(cherry picked from commit 337546e83fc7e50917f44846beee936abb9c9f1f)
Bug: 189803002
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Change-Id: I7cf9c869faa7b746995a94ea93f6a617104385aa
2022-01-06 17:37:44 +00:00
Suren Baghdasaryan
fe50dcab7a
UPSTREAM: mm: wire up syscall process_mrelease
...
Split off from prev patch in the series that implements the syscall.
Link: https://lkml.kernel.org/r/20210809185259.405936-2-surenb@google.com
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org >
Cc: Andy Lutomirski <luto@kernel.org >
Cc: Christian Brauner <christian.brauner@ubuntu.com >
Cc: Christoph Hellwig <hch@infradead.org >
Cc: David Hildenbrand <david@redhat.com >
Cc: David Rientjes <rientjes@google.com >
Cc: Florian Weimer <fweimer@redhat.com >
Cc: Jan Engelhardt <jengelh@inai.de >
Cc: Jann Horn <jannh@google.com >
Cc: Johannes Weiner <hannes@cmpxchg.org >
Cc: Matthew Wilcox (Oracle) <willy@infradead.org >
Cc: Michal Hocko <mhocko@suse.com >
Cc: Minchan Kim <minchan@kernel.org >
Cc: Oleg Nesterov <oleg@redhat.com >
Cc: Rik van Riel <riel@surriel.com >
Cc: Roman Gushchin <guro@fb.com >
Cc: Shakeel Butt <shakeelb@google.com >
Cc: Tim Murray <timmurray@google.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
(cherry picked from commit dce49103962840dd61423d7627748d6c558d58c5)
Bug: 189803002
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Change-Id: I6f02c1ec136a7e102f133ee46a7070a151781345
2022-01-06 17:37:36 +00:00
Suren Baghdasaryan
7fc3ac4968
UPSTREAM: mm: introduce process_mrelease system call
...
In modern systems it's not unusual to have a system component monitoring
memory conditions of the system and tasked with keeping system memory
pressure under control. One way to accomplish that is to kill
non-essential processes to free up memory for more important ones.
Examples of this are Facebook's OOM killer daemon called oomd and
Android's low memory killer daemon called lmkd.
For such system component it's important to be able to free memory quickly
and efficiently. Unfortunately the time process takes to free up its
memory after receiving a SIGKILL might vary based on the state of the
process (uninterruptible sleep), size and OPP level of the core the
process is running. A mechanism to free resources of the target process
in a more predictable way would improve system's ability to control its
memory pressure.
Introduce process_mrelease system call that releases memory of a dying
process from the context of the caller. This way the memory is freed in a
more controllable way with CPU affinity and priority of the caller. The
workload of freeing the memory will also be charged to the caller. The
operation is allowed only on a dying process.
After previous discussions [1, 2, 3] the decision was made [4] to
introduce a dedicated system call to cover this use case.
The API is as follows,
int process_mrelease(int pidfd, unsigned int flags);
DESCRIPTION
The process_mrelease() system call is used to free the memory of
an exiting process.
The pidfd selects the process referred to by the PID file
descriptor.
(See pidfd_open(2) for further information)
The flags argument is reserved for future use; currently, this
argument must be specified as 0.
RETURN VALUE
On success, process_mrelease() returns 0. On error, -1 is
returned and errno is set to indicate the error.
ERRORS
EBADF pidfd is not a valid PID file descriptor.
EAGAIN Failed to release part of the address space.
EINTR The call was interrupted by a signal; see signal(7).
EINVAL flags is not 0.
EINVAL The memory of the task cannot be released because the
process is not exiting, the address space is shared
with another live process or there is a core dump in
progress.
ENOSYS This system call is not supported, for example, without
MMU support built into Linux.
ESRCH The target process does not exist (i.e., it has terminated
and been waited on).
[1] https://lore.kernel.org/lkml/20190411014353.113252-3-surenb@google.com/
[2] https://lore.kernel.org/linux-api/20201113173448.1863419-1-surenb@google.com/
[3] https://lore.kernel.org/linux-api/20201124053943.1684874-3-surenb@google.com/
[4] https://lore.kernel.org/linux-api/20201223075712.GA4719@lst.de/
Link: https://lkml.kernel.org/r/20210809185259.405936-1-surenb@google.com
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Reviewed-by: Shakeel Butt <shakeelb@google.com >
Acked-by: David Hildenbrand <david@redhat.com >
Acked-by: Michal Hocko <mhocko@suse.com >
Acked-by: Christian Brauner <christian.brauner@ubuntu.com >
Cc: David Rientjes <rientjes@google.com >
Cc: Matthew Wilcox (Oracle) <willy@infradead.org >
Cc: Johannes Weiner <hannes@cmpxchg.org >
Cc: Roman Gushchin <guro@fb.com >
Cc: Rik van Riel <riel@surriel.com >
Cc: Minchan Kim <minchan@kernel.org >
Cc: Christoph Hellwig <hch@infradead.org >
Cc: Oleg Nesterov <oleg@redhat.com >
Cc: Jann Horn <jannh@google.com >
Cc: Geert Uytterhoeven <geert@linux-m68k.org >
Cc: Andy Lutomirski <luto@kernel.org >
Cc: Christian Brauner <christian.brauner@ubuntu.com >
Cc: Florian Weimer <fweimer@redhat.com >
Cc: Jan Engelhardt <jengelh@inai.de >
Cc: Tim Murray <timmurray@google.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
(cherry picked from commit 884a7e5964e06ed93c7771c0d7cf19c09a8946f1)
Bug: 189803002
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Change-Id: I60d37051acaeff1b7eb7d10aeca23dfa1f2469a3
2022-01-06 17:37:25 +00:00
Peter Collingbourne
ac44888155
Revert "FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once"
...
This reverts commit b44e46bb04https://lore.kernel.org/all/CAHk-=wj4KCujAH_oPh40Bkp48amM4MXr+8AcbZ=qd5LF4Q+TDg@mail.gmail.com/#t
Bug: 213339151
Signed-off-by: Peter Collingbourne <pcc@google.com >
Change-Id: I81c2cef4076487df1dd0ee75449dcb2371ac1dbc
2022-01-06 17:19:23 +00:00
Eric Biggers
3a624c9ccd
ANDROID: fips140: add show_invalid_inputs command to fips140_lab_util
...
Add a new fips140_lab_util command 'show_invalid_inputs' which uses
AF_ALG to call some crypto algorithms with invalid parameters to show
that they fail. This is needed to meet a new requirement we've received
from the lab. This requirement is vague, but a representative sample of
algorithms and inputs appears to be acceptable.
For this to work, AF_ALG needs to be enabled in the kernel. This makes
fips140_lab_util start depending on a custom kernel build, not just on a
custom fips140 module build as was the case before. However, the lab
testing was going to need custom boot images anyway once fips140.ko is
included in the normal builds, since the production build of fips140.ko
won't have CONFIG_CRYPTO_FIPS140_MOD_EVAL_TESTING=y. AF_ALG is also
needed to do the Jitter RNG entropy analysis properly, and the
AF_ALG-enabled kernel can also be reused for ACVP testing.
Bug: 188620248
Change-Id: I69054eab5005fc3ca0ea081760877f73ea229f5b
Signed-off-by: Eric Biggers <ebiggers@google.com >
(cherry picked from commit 04e49b41be57bbc668e39a2bb65fa6022a22deba)
2022-01-05 10:04:46 -08:00
Eric Biggers
a481d43521
ANDROID: fips140: refactor and rename fips140_lab_test
...
fips140_lab_test doesn't really do any tests per se, but rather is a
utility program that dumps some output. The actual "test" is when the
lab checks the output; we aren't allowed to check it ourselves.
We also need to add some new functionality, which would work well as
sub-commands. Also, the original idea was that this was just sample
code which the lab would modify, but that's not actually happening.
Therefore, rename fips140_lab_test to fips140_lab_util, and refactor its
functionality into sub-commands 'show_module_version' and
'show_service_indicators'. This fits better with what is needed.
Bug: 188620248
Change-Id: I7da84a139283f185f79b8d866547151169f26415
Signed-off-by: Eric Biggers <ebiggers@google.com >
(cherry picked from commit 6ed33b82eaf8352574ba9ac7cff351a678fbe8e6)
2022-01-05 10:04:46 -08:00
zhiyong tian
d4b5ca56b5
ANDROID: GKI: add lenovo symbol list
...
Leaf changes summary: 7 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 6 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 1 Added variable
6 Added functions:
[A] 'function int __traceiter_block_bio_remap(void*, request_queue*, bio*,
dev_t, sector_t)'
[A] 'function bio* bio_split(bio*, int, gfp_t, bio_set*)'
[A] 'function void blk_queue_max_write_same_sectors(request_queue*,
unsigned int)'
[A] 'function int clk_set_duty_cycle(clk*, unsigned int, unsigned int)'
[A] 'function void disk_stack_limits(gendisk*, block_device*, sector_t)'
[A] 'function blk_qc_t submit_bio_noacct(bio*)'
1 Added variable:
[A] 'tracepoint __tracepoint_block_bio_remap'
Bug: 209325946
Signed-off-by: zhiyong tian <tianzy7@lenovo.com >
Change-Id: Ie8ea02148ce780274ab4ca72ec260ffc738db0b4
2022-01-05 11:31:47 +00:00
Yogesh Lal
47874cc690
ANDROID: abi_gki_aarch64_qcom: Add rproc_set_firmware
...
rproc_set_firmware() is helpful in changing firmware
name. Add it to the symbol list.
Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
1 Added function:
[A] 'function int rproc_set_firmware(rproc*, const char*)'
Bug: 213024513
Change-Id: I509ecc2bb6834c904fb19b006babb16855109f58
Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com >
Signed-off-by: Yogesh Lal <quic_ylal@quicinc.com >
2022-01-04 20:45:55 +05:30
Suman Anna
c41767a8ec
UPSTREAM: remoteproc: Add a rproc_set_firmware() API
...
A new API, rproc_set_firmware() is added to allow the remoteproc platform
drivers and remoteproc client drivers to be able to configure a custom
firmware name that is different from the default name used during
remoteproc registration. This function is being introduced to provide
a kernel-level equivalent of the current sysfs interface to remoteproc
client drivers, and can only change firmwares when the remoteproc is
offline. This allows some remoteproc drivers to choose different firmwares
at runtime based on the functionality the remote processor is providing.
The TI PRU Ethernet driver will be an example of such usage as it
requires to use different firmwares for different supported protocols.
Also, update the firmware_store() function used by the sysfs interface
to reuse this function to avoid code duplication.
Bug: 213024513
Change-Id: Ie365179ac296c43c7c5c54b46f9f9f7587d5d263
Reviewed-by: Rishabh Bhatnagar <rishabhb@codeaurora.org >
Signed-off-by: Suman Anna <s-anna@ti.com >
Link: https://lore.kernel.org/r/20201121032042.6195-1-s-anna@ti.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org >
(cherry picked from commit 4c1ad562d303526b5d9b49f5e0d72da13ef78dec
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master)
Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com >
2022-01-04 14:15:08 +05:30
Yunfei Wang
28d62c68d1
FROMGIT: iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure
...
In __arm_v7s_alloc_table function:
iommu call kmem_cache_alloc to allocate page table, this function
allocate memory may fail, when kmem_cache_alloc fails to allocate
table, call virt_to_phys will be abnomal and return unexpected phys
and goto out_free, then call kmem_cache_free to release table will
trigger KE, __get_free_pages and free_pages have similar problem,
so add error handle for page table allocation failure.
Fixes: 29859aeb8ayf.wang@mediatek.com >
Cc: <stable@vger.kernel.org > # 5.10.*
Acked-by: Robin Murphy <robin.murphy@arm.com >
Link: https://lore.kernel.org/r/20211207113315.29109-1-yf.wang@mediatek.com
Signed-off-by: Will Deacon <will@kernel.org >
Bug: 210958369
(cherry picked from commit a556cfe4cabc6d79cbb7733f118bbb420b376fe6
https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates)
Signed-off-by: Yunfei Wang <yf.wang@mediatek.com >
Change-Id: I6435903336d1e15b5a57d08c284b3d3d66ea985d
2021-12-23 07:08:01 +00:00
Marcelo Ricardo Leitner
99ad261273
UPSTREAM: sctp: add param size validation for SCTP_PARAM_SET_PRIMARY
...
commit ef6c8d6ccf0c1dccdda092ebe8782777cd7803c9 upstream.
When SCTP handles an INIT chunk, it calls for example:
sctp_sf_do_5_1B_init
sctp_verify_init
sctp_verify_param
sctp_process_init
sctp_process_param
handling of SCTP_PARAM_SET_PRIMARY
sctp_verify_init() wasn't doing proper size validation and neither the
later handling, allowing it to work over the chunk itself, possibly being
uninitialized memory.
Bug: 197154735
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Aaron Ding <aaronding@google.com >
Change-Id: I032230924ead7a03dfb3101e9cd4d48e36bfc616
2021-12-22 17:20:33 +00:00
Marcelo Ricardo Leitner
282a4de8f0
UPSTREAM: sctp: validate chunk size in __rcv_asconf_lookup
...
commit b6ffe7671b24689c09faa5675dd58f93758a97ae upstream.
In one of the fallbacks that SCTP has for identifying an association for an
incoming packet, it looks for AddIp chunk (from ASCONF) and take a peek.
Thing is, at this stage nothing was validating that the chunk actually had
enough content for that, allowing the peek to happen over uninitialized
memory.
Similar check already exists in actual asconf handling in
sctp_verify_asconf().
Bug: 197154735
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Aaron Ding <aaronding@google.com >
Change-Id: Ibfe53fc724143423353ed6b2984d2508ee4fc457
2021-12-22 17:20:23 +00:00
Tatsuhiko Yasumatsu
fef7dba3a7
UPSTREAM: bpf: Fix integer overflow in prealloc_elems_and_freelist()
...
[ Upstream commit 30e29a9a2bc6a4888335a6ede968b75cd329657a ]
In prealloc_elems_and_freelist(), the multiplication to calculate the
size passed to bpf_map_area_alloc() could lead to an integer overflow.
As a result, out-of-bounds write could occur in pcpu_freelist_populate()
as reported by KASAN:
[...]
[ 16.968613] BUG: KASAN: slab-out-of-bounds in pcpu_freelist_populate+0xd9/0x100
[ 16.969408] Write of size 8 at addr ffff888104fc6ea0 by task crash/78
[ 16.970038]
[ 16.970195] CPU: 0 PID: 78 Comm: crash Not tainted 5.15.0-rc2+ #1
[ 16.970878] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014
[ 16.972026] Call Trace:
[ 16.972306] dump_stack_lvl+0x34/0x44
[ 16.972687] print_address_description.constprop.0+0x21/0x140
[ 16.973297] ? pcpu_freelist_populate+0xd9/0x100
[ 16.973777] ? pcpu_freelist_populate+0xd9/0x100
[ 16.974257] kasan_report.cold+0x7f/0x11b
[ 16.974681] ? pcpu_freelist_populate+0xd9/0x100
[ 16.975190] pcpu_freelist_populate+0xd9/0x100
[ 16.975669] stack_map_alloc+0x209/0x2a0
[ 16.976106] __sys_bpf+0xd83/0x2ce0
[...]
The possibility of this overflow was originally discussed in [0], but
was overlooked.
Fix the integer overflow by changing elem_size to u64 from u32.
[0] https://lore.kernel.org/bpf/728b238e-a481-eb50-98e9-b0f430ab01e7@gmail.com/
Bug: 202511260
Fixes: 557c0c6e7dth.yasumatsu@gmail.com >
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net >
Link: https://lore.kernel.org/bpf/20210930135545.173698-1-th.yasumatsu@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org >
Signed-off-by: Aaron Ding <aaronding@google.com >
Change-Id: I45de17135336ce329b539d3e9e95fdcddafb2b00
2021-12-22 17:19:46 +00:00
Liujie Xie
893425f545
ANDROID: GKI: Update symbol list
...
Update the list of symbols exported in the patch below:
https://android-review.googlesource.com/c/kernel/common/+/1925906
Leaf changes summary: 2 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 1 Added variable
1 Added function:
[A] 'function int __traceiter_android_vh_futex_sleep_start(void*, task_struct*)'
1 Added variable:
[A] 'tracepoint __tracepoint_android_vh_futex_sleep_start'
Bug: 211555290
Signed-off-by: Liujie Xie <xieliujie@oppo.com >
Change-Id: I2afdb9239fb4ae2d3015b8ebdb76ec53bb27091c
2021-12-21 22:31:05 +00:00
Woogeun Lee
cef0df2218
ANDROID: ABI: update allowed list for galaxy
...
Leaf changes summary: 2 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 2 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
2 Added functions:
[A] 'function void usbnet_cdc_unbind(usbnet*, usb_interface*)'
[A] 'function int usbnet_generic_cdc_bind(usbnet*, usb_interface*)'
Bug: 211557881
Signed-off-by: Woogeun Lee <woogeun.lee@samsung.com >
Change-Id: Ied606874c2135d514a20831d20642de5c105986a
2021-12-21 17:28:45 +09:00
Liujie Xie
a7ab784f60
ANDROID: vendor_hooks: Add hooks for futex
...
We want to use this hook to record the sleeping time due to Futex
Bug: 210947226
Signed-off-by: Liujie Xie <xieliujie@oppo.com >
Change-Id: I637f889dce42937116d10979e0c40fddf96cd1a2
2021-12-20 04:23:00 +00:00
Chris Goldsworthy
84fc3abca0
ANDROID: dma-contiguous: Add tracehook to allow subpage allocations in dma_alloc_contiguous
...
Add a tracehook to allow callers into dma_alloc_contiguous() to make
use of the built-in CMA area if the caller has addressing limitations;
this provides a means of allocating from memory whose bounds are
restricted to the lower 4 GB of memory, without having to enable DMA32
(assuming the default CMA area has been restricted to the appropriate
address ranges).
Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 1 Added variable
1 Added variable:
[A] 'tracepoint __tracepoint_android_vh_subpage_dma_contig_alloc'
Bug: 199917449
Change-Id: Ia86fb416376bca231405b06ab27b0674c8fe3e14
Signed-off-by: Chris Goldsworthy <quic_cgoldswo@quicinc.com >
2021-12-17 02:31:49 -08:00
Will McVicker
d94655c43e
ANDROID: Update the ABI xml and symbol list
...
Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
1 Added function:
[A] 'function blk_plug_cb* blk_check_plugged(blk_plug_cb_fn, void*, int)'
Bug: 208435530
Signed-off-by: Will McVicker <willmcvicker@google.com >
Change-Id: I6aaff3a916a986b2ba5ec894e7c67d778d0149bf
2021-12-16 22:41:22 +00:00
Takashi Iwai
414c32d38e
UPSTREAM: ALSA: memalloc: Align buffer allocations in page size
...
Currently the standard memory allocator (snd_dma_malloc_pages*())
passes the byte size to allocate as is. Most of the backends
allocates real pages, hence the actual allocations are aligned in page
size. However, the genalloc doesn't seem assuring the size alignment,
hence it may result in the access outside the buffer when the whole
memory pages are exposed via mmap.
For avoiding such inconsistencies, this patch makes the allocation
size always to be aligned in page size.
Note that, after this change, snd_dma_buffer.bytes field contains the
aligned size, not the originally requested size. This value is also
used for releasing the pages in return.
BUG: 209931573
cherry picked from commit 5c1733e33c888a3cb7f576564d8ad543d5ad4a9e
Change-Id: Ib65f0e29b87d55e13006c7416793a4539d376cc8
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de >
Link: https://lore.kernel.org/r/20201218145625.2045-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de >
Signed-off-by: Denis Hsu <denis.hsu@mediatek.com >
2021-12-16 22:11:32 +00:00
Suren Baghdasaryan
75617df5b3
ANDROID: Fix mmu_notifier_trylock definition for !CONFIG_MMU_NOTIFIER config
...
mmu_notifier_trylock definition for CONFIG_MMU_NOTIFIER=n configuration
has not been modified from the older version. Correct that mistake.
Fixes: 6971350406surenb@google.com >
Change-Id: I71b8644bd2864b6ed98a7ff9c15a99fbd4c5a6c5
2021-12-16 19:18:09 +00:00
Greg Kroah-Hartman
7531e63661
FROMGIT: USB: gadget: bRequestType is a bitfield, not a enum
...
Szymon rightly pointed out that the previous check for the endpoint
direction in bRequestType was not looking at only the bit involved, but
rather the whole value. Normally this is ok, but for some request
types, bits other than bit 8 could be set and the check for the endpoint
length could not stall correctly.
Fix that up by only checking the single bit.
Fixes: 153a2d7e3350 ("USB: gadget: detect too-big endpoint 0 requests")
Cc: Felipe Balbi <balbi@kernel.org >
Reported-by: Szymon Heidrich <szymon.heidrich@gmail.com >
Link: https://lore.kernel.org/r/20211214184621.385828-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit f08adf5add9a071160c68bb2a61d697f39ab0758
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-linus)
Bug: 210292376
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
Change-Id: I7e708b2b94433009c87f697346e0515d93454f48
2021-12-16 11:47:06 +00:00
Patrick Daly
70c9301d9c
ANDROID: qcom: Add flush_delayed_fput to ABI
...
When a kernel thread calls dma_buf_put() to release the last reference
to a dma-buf, fput_many() defers calling the release callback to a
workqueue. This means that if the same kernel thread later calls
dma_heap_buffer_alloc(), it has no guarantee that the memory from the
prior free is available, leading to random failures. As a short-term
workaround, call flush_delayed_fput() to ensure the free completes
synchronously.
Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
1 Added function:
[A] 'function void flush_delayed_fput()'
Bug: 210598057
Change-Id: Id936aa0bcd410b23b12f4b922b676aa61a358b4c
Signed-off-by: Patrick Daly <quic_pdaly@quicinc.com >
2021-12-15 21:49:35 +00:00
Suren Baghdasaryan
5d8520b557
ANDROID: fix ABI breakage caused by mm_struct->mmu_notifier_lock addition
...
To prevent ABI breakage, move mm->mmu_notifier_lock into
mm->notifier_subscriptions and allocate mm->notifier_subscriptions
during mm creation in mmu_notifier_subscriptions_init. This results
in additional 176 bytes allocated for each mm, but prevents ABI breakage.
mmu_notifier_subscriptions_hdr structure is introduced at the beginning
of mmu_notifier_subscriptions to keep mmu_notifier_subscriptions hidden
and prevent its type CRC from changing when used in other structures.
Bug: 161210518
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
Change-Id: I6f435708d642b70b22e0243c8b33108c208ce5bb
2021-12-15 21:45:28 +00:00
Greg Kroah-Hartman