Merge branch 'android12-5.10' into android12-5.10-lts

Sync up with android12-5.10 for the following commits:

32432740cd ANDROID: GKI: Add symbols abi for USB IP kernel modules.
c27d7f71b5 ANDROID: GKI: Fix file mode on mtk abi file
ca9ee53cea UPSTREAM: erofs: fix deadlock when shrink erofs slab
898e7ec950 ANDROID: init_task: Init android vendor and oem data
3c54070823 UPSTREAM: sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()
f0a7e5394b ANDROID: Update symbol list for mtk
b943d32888 UPSTREAM: erofs: fix unsafe pagevec reuse of hooked pclusters
028f7128c4 UPSTREAM: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
504b13fb83 UPSTREAM: usb: dwc3: gadget: Fix null pointer exception
143ac63130 ANDROID: fips140: support "evaluation testing" builds via build.sh
cbd64e25c2 FROMGIT: sched/scs: Reset task stack state in bringup_cpu()
3ed40fb65a ANDROID: dma-buf: heaps: fix dma-buf heap pool pages stat
851990cc99 ANDROID: ABI: Add several spi_mem related symbols
be30f0ce33 UPSTREAM: spi: spi-mem: add spi_mem_dtr_supports_op()
e5dfa89138 ANDROID: gki_defconfig: enable CONFIG_SPI_MEM
bb18be4257 ANDROID: ABI: Add several iio related symbols
1407b7e124 ANDROID: ABI: Update symbol list for IMX
575a552ac7 ANDROID: usb: gadget: f_accessory: Mitgate handling of non-existent USB request
376046be3b ANDROID: GKI: fix up abi break in ehci code
bf13278d66 UPSTREAM: usb: ehci: handshake CMD_RUN instead of STS_HALT
c3c2bb34ac ANDROID: arm64/mm: Add command line option to make ZONE_DMA32 empty
f8f6c7332b ANDROID: GKI: Add newly added vendor hook to abi symbol list
109f31ac23 ANDROID: fips140: add userspace interface for evaluation testing
97fb2104fe ANDROID: fips140: add support for injecting integrity error
903e97a0ca ANDROID: fips140: refactor evaluation testing support
53a812c6bb ANDROID: sched: add hook point in do_sched_yield()
00d29953bb ANDROID: GKI: Update symbols to symbol list
7a069c6071 FROMGIT: usb: gadget: f_fs: Use stream_open() for endpoint files

Due to api additions in android12-5.10, this also adds more api symbols
to track:

Leaf changes summary: 44 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 38 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 6 Added variables

38 Added functions:

  [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_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 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 int genphy_restart_aneg(phy_device*)'
  [A] 'function const i3c_device_id* i3c_device_match_id(i3c_device*, const i3c_device_id*)'
  [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 kernel_sock_shutdown(socket*, sock_shutdown_cmd)'
  [A] 'function int kill_pid(pid*, int, int)'
  [A] 'function bool kthread_freezable_should_stop(bool*)'
  [A] 'function int phy_modify_mmd(phy_device*, int, u32, u16, u16)'
  [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 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 int vsscanf(const char*, const char*, va_list)'

6 Added variables:

  [A] 'tracepoint __tracepoint_android_rvh_binder_transaction'
  [A] 'tracepoint __tracepoint_android_rvh_do_sched_yield'
  [A] 'tracepoint __tracepoint_android_vh_binder_del_ref'
  [A] 'tracepoint __tracepoint_android_vh_binder_new_ref'
  [A] 'tracepoint __tracepoint_android_vh_binder_proc_transaction'
  [A] 'device platform_bus'

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6de103b0d75261c17c11454051e2559bb6d1eecf
This commit is contained in:
Greg Kroah-Hartman
2021-12-03 11:02:05 +01:00
39 changed files with 3174 additions and 2064 deletions

View File

@@ -978,6 +978,8 @@ 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));
trace_android_vh_dup_task_struct(tsk, orig);
return tsk;