Commit 4402e360 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers: Update the copy of x86's memcpy_64.S used in 'perf bench' 

We also need to add SYM_TYPED_FUNC_START() to util/include/linux/linkage.h
and update tools/perf/check_headers.sh to ignore the include cfi_types.h
line when checking if the kernel original files drifted from the copies
we carry.

This is to get the changes from:

  ccace936 ("x86: Add types to indirectly called assembly functions")

Addressing these tools/perf build warnings:

  Warning: Kernel ABI header at 'tools/arch/x86/lib/memcpy_64.S' differs from latest version at 'arch/x86/lib/memcpy_64.S'
  diff -u tools/arch/x86/lib/memcpy_64.S arch/x86/lib/memcpy_64.S

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Sami Tolvanen <samitolvanen@google.com>
Link: https://lore.kernel.org/lkml/Y1f3VRIec9EBgX6F@kernel.org/


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ffc1df3d

tools/arch/x86/lib/memcpy_64.S

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * Output:

 * rax original destination

 */

SYM_FUNC_START(__memcpy)

SYM_TYPED_FUNC_START(__memcpy)

	ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \

		      "jmp memcpy_erms", X86_FEATURE_ERMS

tools/perf/check-headers.sh

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ for i in $SYNC_CHECK_FILES; do 
done



# diff with extra ignore lines

check arch/x86/lib/memcpy_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))"'

check arch/x86/lib/memcpy_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))" -I"^#include <linux/cfi_types.h>"'

check arch/x86/lib/memset_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"'

check arch/x86/include/asm/amd-ibs.h  '-I "^#include [<\"]\(asm/\)*msr-index.h"'

check arch/arm64/include/asm/cputype.h '-I "^#include [<\"]\(asm/\)*sysreg.h"'

tools/perf/util/include/linux/linkage.h

+13 −0
Original line number Diff line number Diff line
@@ -115,4 +115,17 @@ 
	SYM_ALIAS(alias, name, SYM_T_FUNC, SYM_L_WEAK)

#endif



// In the kernel sources (include/linux/cfi_types.h), this has a different

// definition when CONFIG_CFI_CLANG is used, for tools/ just use the !clang

// definition:

#ifndef SYM_TYPED_START

#define SYM_TYPED_START(name, linkage, align...)        \

        SYM_START(name, linkage, align)

#endif



#ifndef SYM_TYPED_FUNC_START

#define SYM_TYPED_FUNC_START(name)                      \

        SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)

#endif



#endif	/* PERF_LINUX_LINKAGE_H_ */