From f76a006b1139e7346c97127b59910aba4e191634 Mon Sep 17 00:00:00 2001 From: gaochao Date: Sun, 31 Jul 2022 22:13:12 +0800 Subject: [PATCH] ohos inclusion category: feature issue:I5JRX5 CVE: NA Signed-off-by: gaochao -------- change config and function name of trace ponit --- drivers/Kconfig | 2 +- drivers/Makefile | 2 +- drivers/hooks/Kconfig | 13 ------------- drivers/vendor/Kconfig | 13 +++++++++++++ drivers/{hooks => vendor}/Makefile | 2 +- drivers/{hooks/vendor_hooks.c => vendor/traces.c} | 9 ++++----- include/trace/hooks/vendor_hooks.h | 13 ------------- include/trace/{hooks => vendor}/mm.h | 8 ++++---- include/trace/vendor/traces.h | 13 +++++++++++++ mm/mmap.c | 2 +- mm/mprotect.c | 2 +- 11 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 drivers/hooks/Kconfig create mode 100644 drivers/vendor/Kconfig rename drivers/{hooks => vendor}/Makefile (66%) rename drivers/{hooks/vendor_hooks.c => vendor/traces.c} (75%) delete mode 100644 include/trace/hooks/vendor_hooks.h rename include/trace/{hooks => vendor}/mm.h (73%) create mode 100644 include/trace/vendor/traces.h diff --git a/drivers/Kconfig b/drivers/Kconfig index 3584901f1252..493a9453f469 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -240,6 +240,6 @@ source "drivers/most/Kconfig" source "drivers/accesstokenid/Kconfig" -source "drivers/hooks/Kconfig" +source "drivers/vendor/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index f13d70df6557..d13076f8ece1 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -193,4 +193,4 @@ obj-$(CONFIG_INTERCONNECT) += interconnect/ obj-$(CONFIG_COUNTER) += counter/ obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_ACCESS_TOKENID) += accesstokenid/ -obj-$(CONFIG_VENDOR_HOOKS) += hooks/ +obj-$(CONFIG_VENDOR_TRACES) += vendor/ diff --git a/drivers/hooks/Kconfig b/drivers/hooks/Kconfig deleted file mode 100644 index 547933c5975f..000000000000 --- a/drivers/hooks/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# 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_TRACE or DECLARE_HOOK - -endmenu diff --git a/drivers/vendor/Kconfig b/drivers/vendor/Kconfig new file mode 100644 index 000000000000..15c7ad367705 --- /dev/null +++ b/drivers/vendor/Kconfig @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0 +menu "Vendor Tracepoints" + +config VENDOR_TRACES + bool "Vendor Tracepoints" + depends on TRACEPOINTS + help + Enable vendor tracepoints which allow vendor changes to kernel + + Allow vendor modules to attach to tracepoint defined via + DECLARE_TRACE or DECLARE_VENDOR_TRACE + +endmenu diff --git a/drivers/hooks/Makefile b/drivers/vendor/Makefile similarity index 66% rename from drivers/hooks/Makefile rename to drivers/vendor/Makefile index 533f270e0920..3c03518c26cc 100644 --- a/drivers/hooks/Makefile +++ b/drivers/vendor/Makefile @@ -2,4 +2,4 @@ ccflags-y += -I$(src) # needed for trace events -obj-$(CONFIG_VENDOR_HOOKS) += vendor_hooks.o +obj-$(CONFIG_VENDOR_TRACES) += traces.o diff --git a/drivers/hooks/vendor_hooks.c b/drivers/vendor/traces.c similarity index 75% rename from drivers/hooks/vendor_hooks.c rename to drivers/vendor/traces.c index 939146da879c..37922978f421 100644 --- a/drivers/hooks/vendor_hooks.c +++ b/drivers/vendor/traces.c @@ -1,15 +1,14 @@ // SPDX-License-Identifier: GPL-2.0-only -/* vendor_hooks.c +/* traces.c * - * Vendor Hook Support + * Vendor tracepoints Support * - * Copyright (C) 2020 Google, Inc. * Copyright (C) 2022 Huawei Technologies Co., Ltd. */ #define CREATE_TRACE_POINTS -#include -#include +#include +#include /* * Export tracepoints that act as a bare tracehook(ie: have no trace event diff --git a/include/trace/hooks/vendor_hooks.h b/include/trace/hooks/vendor_hooks.h deleted file mode 100644 index 21bafd638874..000000000000 --- a/include/trace/hooks/vendor_hooks.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#include - -#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_VENDOR_HOOKS) - -#define DECLARE_HOOK DECLARE_TRACE - -#else /* !CONFIG_TRACEPOINTS || !CONFIG_VENDOR_HOOKS */ - -#define DECLARE_HOOK DECLARE_EVENT_NOP - -#endif diff --git a/include/trace/hooks/mm.h b/include/trace/vendor/mm.h similarity index 73% rename from include/trace/hooks/mm.h rename to include/trace/vendor/mm.h index dbe41923041b..0393780aab6d 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/vendor/mm.h @@ -2,19 +2,19 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM mm -#define TRACE_INCLUDE_PATH trace/hooks +#define TRACE_INCLUDE_PATH trace/vendor #if !defined(_TRACE_HOOKS_MM_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_HOOKS_MM_H #include -#include +#include -DECLARE_HOOK(vendor_do_mmap, +DECLARE_VENDOR_TRACE(vendor_do_mmap, TP_PROTO(vm_flags_t *vm_flags, int *err), TP_ARGS(vm_flags, err) ); -DECLARE_HOOK(vendor_do_mprotect_pkey, +DECLARE_VENDOR_TRACE(vendor_do_mprotect_pkey, TP_PROTO(unsigned long prot, int *err), TP_ARGS(prot, err) ); diff --git a/include/trace/vendor/traces.h b/include/trace/vendor/traces.h new file mode 100644 index 000000000000..46f070d4ebf0 --- /dev/null +++ b/include/trace/vendor/traces.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_VENDOR_TRACES) + +#define DECLARE_VENDOR_TRACE DECLARE_TRACE + +#else /* !CONFIG_TRACEPOINTS || !CONFIG_VENDOR_TRACES */ + +#define DECLARE_VENDOR_TRACE DECLARE_EVENT_NOP + +#endif diff --git a/mm/mmap.c b/mm/mmap.c index d6c6a639ce3d..a4b41e074d9a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -58,7 +58,7 @@ #include #undef CREATE_TRACE_POINTS -#include +#include #include "internal.h" diff --git a/mm/mprotect.c b/mm/mprotect.c index 8fc1f3bee7f3..746f07164836 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include "internal.h" static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, -- Gitee