Commit 31d2e6b5 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench' 

We also continue with SYM_TYPED_FUNC_START() in util/include/linux/linkage.h
and with an exception in tools/perf/check_headers.sh's diff check 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:

  69d4c0d3 ("entry, kasan, x86: Disallow overriding mem*() functions")

That addresses these perf tools build warning:

  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
  Warning: Kernel ABI header at 'tools/arch/x86/lib/memset_64.S' differs from latest version at 'arch/x86/lib/memset_64.S'
  diff -u tools/arch/x86/lib/memset_64.S arch/x86/lib/memset_64.S

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/lkml/ZAH%2FjsioJXGIOrkf@kernel.org


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

tools/arch/x86/lib/memcpy_64.S

+2 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <asm/alternative.h>

#include <asm/export.h>



.pushsection .noinstr.text, "ax"

.section .noinstr.text, "ax"



/*

 * We build a jump to memcpy_orig by default which gets NOPped out on
@@ -42,7 +42,7 @@ SYM_TYPED_FUNC_START(__memcpy) 
SYM_FUNC_END(__memcpy)

EXPORT_SYMBOL(__memcpy)



SYM_FUNC_ALIAS_WEAK(memcpy, __memcpy)

SYM_FUNC_ALIAS(memcpy, __memcpy)

EXPORT_SYMBOL(memcpy)



/*
@@ -183,4 +183,3 @@ SYM_FUNC_START_LOCAL(memcpy_orig) 
	RET

SYM_FUNC_END(memcpy_orig)

.popsection

tools/arch/x86/lib/memset_64.S

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#include <asm/alternative.h>

#include <asm/export.h>



.section .noinstr.text, "ax"



/*

 * ISO C memset - set a memory block to a byte value. This function uses fast

 * string to get better performance than the original function. The code is
@@ -43,7 +45,7 @@ SYM_FUNC_START(__memset) 
SYM_FUNC_END(__memset)

EXPORT_SYMBOL(__memset)



SYM_FUNC_ALIAS_WEAK(memset, __memset)

SYM_FUNC_ALIAS(memset, __memset)

EXPORT_SYMBOL(memset)



/*