Unverified Commit 558216c8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3818 [sync] PR-1989: support Android vendor hooks 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1989 
 
PR sync from: Yu Liao <liaoyu15@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LMQPMPI62GPQY25ZMPK5OYRY5MCHOEXL/ 
support android vendor hooks for openEuler-23.09

Jialin Zhang (2):
  vendor_hooks: make android vendor hooks feature generic.
  openeuler_defconfig: enable CONFIG_VENDOR_HOOKS for x86 and arm64

Nick Desaulniers (1):
  ANDROID: vendor_hooks: fix __section macro

Todd Kjos (5):
  ANDROID: add support for vendor hooks
  ANDROID: fix redefinition error for restricted vendor hooks
  ANDROID: use static_call() for restricted hooks
  ANDROID: simplify vendor hooks for non-GKI builds
  ANDROID: fixup restricted hooks after tracepont refactoring


-- 
2.33.0
 
https://gitee.com/openeuler/kernel/issues/I7YFU9 
 
Link:https://gitee.com/openeuler/kernel/pulls/3818

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 31fb44c8 3834a603

arch/arm64/configs/openeuler_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -6721,6 +6721,12 @@ CONFIG_USB4=m 
# CONFIG_ANDROID_BINDER_IPC is not set

# end of Android



#

# Vendor Hooks

#

CONFIG_VENDOR_HOOKS=y

# end of Vendor Hooks



CONFIG_LIBNVDIMM=m

CONFIG_BLK_DEV_PMEM=m

CONFIG_ND_CLAIM=y

arch/x86/configs/openeuler_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -7927,6 +7927,12 @@ CONFIG_USB4=m 
# CONFIG_ANDROID_BINDER_IPC is not set

# end of Android



#

# Vendor Hooks

#

CONFIG_VENDOR_HOOKS=y

# end of Vendor Hooks



CONFIG_LIBNVDIMM=m

CONFIG_BLK_DEV_PMEM=m

CONFIG_ND_CLAIM=y

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ source "drivers/thunderbolt/Kconfig" 


source "drivers/android/Kconfig"



source "drivers/hooks/Kconfig"



source "drivers/gpu/trace/Kconfig"



source "drivers/nvdimm/Kconfig"

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ obj-y += hwtracing/intel_th/ 
obj-$(CONFIG_STM)		+= hwtracing/stm/

obj-$(CONFIG_HISI_PTT)		+= hwtracing/ptt/

obj-y				+= android/

obj-$(CONFIG_VENDOR_HOOKS)	+= hooks/

obj-$(CONFIG_NVMEM)		+= nvmem/

obj-$(CONFIG_FPGA)		+= fpga/

obj-$(CONFIG_FSI)		+= fsi/

drivers/hooks/Kconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

menu "Vendor Hooks"



config VENDOR_HOOKS

        bool "Vendor Hooks"

        depends on TRACEPOINTS

        help

          Enable vendor hooks implemented as tracepoints



          Allow vendor modules to attach to tracepoint "hooks" defined via

          DECLARE_HOOK or DECLARE_RESTRICTED_HOOK.



endmenu