6db59d357e
We need to use "%#" PRIx64 for u64 values, not "%lx". In arm64's and s390x cases the compiler doesn't complain, but lets fix this in case this code gets copied to a 32-bit arch, like with powerpc 32-bit that got fixed in the previous patch. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Hewenliang <hewenliang4@huawei.com> Cc: Hu Shiyuan <hushiyuan@huawei.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Richter <tmricht@linux.ibm.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
53 lines
1.7 KiB
C
53 lines
1.7 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <inttypes.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <internal/lib.h> // page_size
|
|
#include "machine.h"
|
|
#include "api/fs/fs.h"
|
|
#include "debug.h"
|
|
#include "symbol.h"
|
|
|
|
int arch__fix_module_text_start(u64 *start, u64 *size, const char *name)
|
|
{
|
|
u64 m_start = *start;
|
|
char path[PATH_MAX];
|
|
|
|
snprintf(path, PATH_MAX, "module/%.*s/sections/.text",
|
|
(int)strlen(name) - 2, name + 1);
|
|
if (sysfs__read_ull(path, (unsigned long long *)start) < 0) {
|
|
pr_debug2("Using module %s start:%#lx\n", path, m_start);
|
|
*start = m_start;
|
|
} else {
|
|
/* Successful read of the modules segment text start address.
|
|
* Calculate difference between module start address
|
|
* in memory and module text segment start address.
|
|
* For example module load address is 0x3ff8011b000
|
|
* (from /proc/modules) and module text segment start
|
|
* address is 0x3ff8011b870 (from file above).
|
|
*
|
|
* Adjust the module size and subtract the GOT table
|
|
* size located at the beginning of the module.
|
|
*/
|
|
*size -= (*start - m_start);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* On s390 kernel text segment start is located at very low memory addresses,
|
|
* for example 0x10000. Modules are located at very high memory addresses,
|
|
* for example 0x3ff xxxx xxxx. The gap between end of kernel text segment
|
|
* and beginning of first module's text segment is very big.
|
|
* Therefore do not fill this gap and do not assign it to the kernel dso map.
|
|
*/
|
|
void arch__symbols__fixup_end(struct symbol *p, struct symbol *c)
|
|
{
|
|
if (strchr(p->name, '[') == NULL && strchr(c->name, '['))
|
|
/* Last kernel symbol mapped to end of page */
|
|
p->end = roundup(p->end, page_size);
|
|
else
|
|
p->end = c->start;
|
|
pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end);
|
|
}
|