Merge branch 'android12-5.10' into android12-5.10-lts
Sync up with android12-5.10 for the following commits:2c152aa329
UPSTREAM: f2fs: reduce the scope of setting fsck tag when de->name_len is zeroc29dd368ef
ANDROID: GKI: Update symbols to abi_gki_aarch64_oplus428d0bb762
ANDROID: Add initial ASUS symbol list87a74496ed
ANDROID: configfs: add proper module namespace markingb7a6c15a6f
ANDROID: Configure out the macros in android_kabi and android_vendorbdc772adbd
ANDROID: kernel: fix debug_kinfo set twice crash issued483eed85f
ANDROID: GKI: set vfs-only exports into their own namespace27fc5a7c69
UPSTREAM: net/packet: rx_owner_map depends on pg_vecf70ea63f3b
ANDROID: GKI: Update symbols to symbol lista593acdae8
FROMLIST: module.h: allow #define strings to work with MODULE_IMPORT_NSeb171b4cbe
FROMLIST: export: fix string handling of namespace in EXPORT_SYMBOL_NS05c23b7a50
ANDROID: vendor_hooks: Add hooks for bindere99926fdfa
ANDROID: mm/oom_kill: allow process_mrelease reclaim memory in parallel with exit_mmapf4f2c619d5
FROMLIST: mm/oom_kill: allow process_mrelease to run under mmap_lock protection2452622293
FROMLIST: mm: protect free_pgtables with mmap_lock write lock in exit_mmapfd7af95538
UPSTREAM: mm/oom_kill.c: prevent a race between process_mrelease and exit_mmapfe50dcab7a
UPSTREAM: mm: wire up syscall process_mrelease7fc3ac4968
UPSTREAM: mm: introduce process_mrelease system callac44888155
Revert "FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once"3a624c9ccd
ANDROID: fips140: add show_invalid_inputs command to fips140_lab_utila481d43521
ANDROID: fips140: refactor and rename fips140_lab_testd4b5ca56b5
ANDROID: GKI: add lenovo symbol list47874cc690
ANDROID: abi_gki_aarch64_qcom: Add rproc_set_firmwarec41767a8ec
UPSTREAM: remoteproc: Add a rproc_set_firmware() API28d62c68d1
FROMGIT: iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure99ad261273
UPSTREAM: sctp: add param size validation for SCTP_PARAM_SET_PRIMARY282a4de8f0
UPSTREAM: sctp: validate chunk size in __rcv_asconf_lookupfef7dba3a7
UPSTREAM: bpf: Fix integer overflow in prealloc_elems_and_freelist()893425f545
ANDROID: GKI: Update symbol listcef0df2218
ANDROID: ABI: update allowed list for galaxya7ab784f60
ANDROID: vendor_hooks: Add hooks for futex84fc3abca0
ANDROID: dma-contiguous: Add tracehook to allow subpage allocations in dma_alloc_contiguousd94655c43e
ANDROID: Update the ABI xml and symbol list414c32d38e
UPSTREAM: ALSA: memalloc: Align buffer allocations in page size75617df5b3
ANDROID: Fix mmu_notifier_trylock definition for !CONFIG_MMU_NOTIFIER config7531e63661
FROMGIT: USB: gadget: bRequestType is a bitfield, not a enum70c9301d9c
ANDROID: qcom: Add flush_delayed_fput to ABI5d8520b557
ANDROID: fix ABI breakage caused by mm_struct->mmu_notifier_lock additiona4d26b9a4b
ANDROID: fix ABI breakage caused by percpu_rw_semaphore changes6971350406
ANDROID: fix mmu_notifier race caused by not taking mmap_lock during SPF2fc2c66b9c
ANDROID: percpu-rwsem: enable percpu_sem destruction in atomic contextf3f87608d8
FROMLIST: virtio_mmio: pm: Add notification handlers for restore and freeze9180348b91
FROMLIST: virtio: do not reset stateful devices on resume392cb940f6
FROMGIT: f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a fileddd9e01504
UPSTREAM: mm, slub: fix incorrect memcg slab count for bulk free82ac5b0b1d
UPSTREAM: mm, slub: fix potential use-after-free in slab_debugfs_fopse07a663f5d
UPSTREAM: mm, slub: fix potential memoryleak in kmem_cache_open()cd02f347ab
UPSTREAM: mm, slub: fix mismatch between reconstructed freelist depth and cnt6b6725f77d
UPSTREAM: mm, slub: fix two bugs in slab_debug_trace_open()791f85d16d
UPSTREAM: mm, slub: allocate private object map for debugfs listings1260b47d4f
FROMGIT: dma-buf: remove restriction of IOCTL:DMA_BUF_SET_NAMEe80be54e4b
UPSTREAM: usb: dwc3: core: balance phy init and exit89137e0047
UPSTREAM: xhci: Fix failure to give back some cached cancelled URBs.f37b6d79f8
ANDROID: mm/memory_hotplug: Don't special case memory_block_size_bytes8b7ffd60a5
UPSTREAM: usb: gadget: uvc: fix multiple opensae22ebebbb
UPSTREAM: aio: fix use-after-free due to missing POLLFREE handlingb9c8788830
UPSTREAM: aio: keep poll requests on waitqueue until completedf965176884
UPSTREAM: signalfd: use wake_up_pollfree()49744a390d
UPSTREAM: binder: use wake_up_pollfree()e50fe1de2f
UPSTREAM: wait: add wake_up_pollfree()53afb231f5
UPSTREAM: USB: gadget: zero allocate endpoint 0 buffers593309a377
BACKPORT: scsi: ufs: Improve SCSI abort handling further21949c429a
FROMGIT: scsi: ufs: Introduce ufshcd_release_scsi_cmd()d600bdedac
FROMGIT: scsi: ufs: Remove the 'update_scaling' local variable5f9614157c
UPSTREAM: scsi: ufs: core: Fix another task management completion race76760a995c
BACKPORT: scsi: ufs: core: Fix task management completion timeout racedab2a8a288
ANDROID: qcom: Add android_rvh_do_ptrauth_fault to ABIb4604acd52
UPSTREAM: USB: gadget: detect too-big endpoint 0 requests2d6a43c036
ANDROID: ABI: Add symbols used by frame buffer driver183905923f
UPSTREAM: xhci: Add bus number to some debug messages5b15c955a6
UPSTREAM: xhci: Add additional dynamic debug to follow URBs in cancel and error cases.f4cbe34956
UPSTREAM: Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set"c23b0e7c47
UPSTREAM: xhci: Fix failure to give back some cached cancelled URBs.7320fb1abd
UPSTREAM: HID: check for valid USB device for many HID driverse98c96b8b8
UPSTREAM: HID: wacom: fix problems when device is not a valid USB device5a72ef56c8
UPSTREAM: HID: bigbenff: prevent null pointer dereference7b8a19b917
UPSTREAM: HID: add USB_HID dependancy on some USB HID drivers8219b106a3
UPSTREAM: HID: add USB_HID dependancy to hid-chiconya4909c90b7
UPSTREAM: HID: add USB_HID dependancy to hid-prodikeysddea17081f
UPSTREAM: HID: add hid_is_usb() function to make it simpler for USB detection81b6ea435e
FROMGIT: clk: Don't parent clks until the parent is fully registered78ea29e570
UPSTREAM: mm/gup: remove the vma allocation from gup_longterm_locked()709fde7c61
BACKPORT: usb: typec: tcpm: Wait in SNK_DEBOUNCED until disconnectea4a92c6af
ANDROID: ABI: Add iio_write_channel_raw symbolf803f248dd
ANDROID: GKI: Update symbols to symbol list672d51b2a7
UPSTREAM: ASoC: dapm: use component prefix when checking widget names686cd3b2d8
ANDROID: ABI: Add symbols used by clocksource driver80c1cef2d1
ANDROID: GKI: Export clocksource_mmio_init84881c68b1
ANDROID: GKI: Export sched_clock_register9e5446d7de
FROMGIT: f2fs: show number of pending discard commands28de741861
ANDROID: workqueue: export symbol of the function wq_worker_comm()71f00d64c1
ANDROID: GKI: Update symbols to symbol list05aa93d251
ANDROID: vendor_hooks: Add hooks for binder proc transaction Also update the .xml file for the following new symbols that are now being tracked: Leaf changes summary: 165 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 154 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 11 Added variables 154 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_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_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 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 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 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 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 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 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 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 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 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*)' 11 Added variables: [A] 'tracepoint __tracepoint_android_rvh_do_ptrauth_fault' [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_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' Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I064b6ff0420cee2d64e17814f43fbff8e2d9b019 Change-Id: Ia880c70c912f2b801a770feb1fdc4f4eb390d34d
This commit is contained in:
@@ -978,8 +978,10 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
|
||||
#ifdef CONFIG_MEMCG
|
||||
tsk->active_memcg = NULL;
|
||||
#endif
|
||||
memset(&tsk->android_vendor_data1, 0, sizeof(tsk->android_vendor_data1));
|
||||
memset(&tsk->android_oem_data1, 0, sizeof(tsk->android_oem_data1));
|
||||
|
||||
android_init_vendor_data(tsk, 1);
|
||||
android_init_oem_data(tsk, 1);
|
||||
|
||||
trace_android_vh_dup_task_struct(tsk, orig);
|
||||
return tsk;
|
||||
|
||||
@@ -1072,7 +1074,8 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p,
|
||||
mm_init_owner(mm, p);
|
||||
mm_init_pasid(mm);
|
||||
RCU_INIT_POINTER(mm->exe_file, NULL);
|
||||
mmu_notifier_subscriptions_init(mm);
|
||||
if (!mmu_notifier_subscriptions_init(mm))
|
||||
goto fail_nopgd;
|
||||
init_tlb_flush_pending(mm);
|
||||
#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS
|
||||
mm->pmd_huge_pte = NULL;
|
||||
|
Reference in New Issue
Block a user