6:47 a.m.
Hi all,
Currently physical and virtual addresses are the same on S390X,
but in the future it is going to be uncoupled just like on any
other architecture. This series supports that feature, but it
does not impact the current and older kernel versions.
Patch 2 is basically NOP and only fix semantics.
Patch 3 uses the feature if it is available in kernel.
Thanks!
Alexander Gordeev (3):
Fix identity_map_base value dump on S390
s390x: fix virtual vs physical address confusion
s390x: uncouple physical and virtual memory spaces
defs.h | 20 ++++-
s390.c | 2 +-
s390x.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 255 insertions(+), 12 deletions(-)
--
2.40.1
6:47 a.m.
New subject: [PATCH 1/3] Fix identity_map_base value dump on S390
Kernel virtual base instead of identity base is printed
Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com>
---
s390.c | 2 +-
s390x.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/s390.c b/s390.c
index 42f5cc6..a8b2bcc 100644
--- a/s390.c
+++ b/s390.c
@@ -183,7 +183,7 @@ s390_dump_machdep_table(ulong arg)
fprintf(fp, ")\n");
fprintf(fp, " kvbase: %lx\n", machdep->kvbase);
- fprintf(fp, " identity_map_base: %lx\n", machdep->kvbase);
+ fprintf(fp, " identity_map_base: %lx\n", machdep->identity_map_base);
fprintf(fp, " pagesize: %d\n", machdep->pagesize);
fprintf(fp, " pageshift: %d\n", machdep->pageshift);
fprintf(fp, " pagemask: %llx\n", machdep->pagemask);
diff --git a/s390x.c b/s390x.c
index d7ee375..096c072 100644
--- a/s390x.c
+++ b/s390x.c
@@ -650,7 +650,7 @@ s390x_dump_machdep_table(ulong arg)
fprintf(fp, ")\n");
fprintf(fp, " kvbase: %lx\n", machdep->kvbase);
- fprintf(fp, " identity_map_base: %lx\n", machdep->kvbase);
+ fprintf(fp, " identity_map_base: %lx\n", machdep->identity_map_base);
fprintf(fp, " pagesize: %d\n", machdep->pagesize);
fprintf(fp, " pageshift: %d\n", machdep->pageshift);
fprintf(fp, " pagemask: %llx\n", machdep->pagemask);
--
2.40.1
6:47 a.m.
New subject: [PATCH 2/3] s390x: fix virtual vs physical address confusion
Physical and virtual addresses are the same on S390X.
That led to missing to use PTOV and VTOP macros where
they actually expected.
Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com>
---
s390x.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/s390x.c b/s390x.c
index 096c072..4024d84 100644
--- a/s390x.c
+++ b/s390x.c
@@ -311,7 +311,7 @@ static struct s390x_cpu *s390x_cpu_get(struct bt_info *bt)
readmem(lowcore_ptr + cpu * sizeof(long), KVADDR,
&prefix, sizeof(long), "lowcore_ptr", FAULT_ON_ERROR);
for (i = 0; i < s390x_cpu_cnt; i++) {
- if (s390x_cpu_vec[i].prefix == prefix)
+ if (s390x_cpu_vec[i].prefix == VTOP(prefix))
return &s390x_cpu_vec[i];
}
error(FATAL, "cannot determine CPU for task: %lx\n", bt->task);
@@ -985,12 +985,12 @@ int s390x_vtop(ulong table, ulong vaddr, physaddr_t *phys_addr, int
verbose)
verbose);
if (!entry)
return FALSE;
- table = entry & ~0xfffULL;
+ table = PTOV(entry & ~0xfffULL);
/* Check if this a 2GB page */
if ((entry & 0x400ULL) && (level == 1)) {
/* Add the 2GB frame offset & return the final value. */
table &= ~0x7fffffffULL;
- *phys_addr = table + (vaddr & 0x7fffffffULL);
+ *phys_addr = VTOP(table + (vaddr & 0x7fffffffULL));
return TRUE;
}
len = entry & 0x3ULL;
@@ -1001,12 +1001,12 @@ int s390x_vtop(ulong table, ulong vaddr, physaddr_t *phys_addr,
int verbose)
if (entry & 0x400ULL) {
/* Add the 1MB page offset and return the final value. */
table &= ~0xfffffULL;
- *phys_addr = table + (vaddr & 0xfffffULL);
+ *phys_addr = VTOP(table + (vaddr & 0xfffffULL));
return TRUE;
}
/* Get the page table entry */
- entry = _kl_pg_table_deref_s390x(vaddr, entry & ~0x7ffULL, verbose);
+ entry = _kl_pg_table_deref_s390x(vaddr, PTOV(entry & ~0x7ffULL), verbose);
if (!entry)
return FALSE;
@@ -1033,7 +1033,7 @@ s390x_vmalloc_start(void)
{
unsigned long highmem_addr,high_memory;
highmem_addr=symbol_value("high_memory");
- readmem(highmem_addr, PHYSADDR, &high_memory,sizeof(long),
+ readmem(highmem_addr, KVADDR, &high_memory,sizeof(long),
"highmem",FAULT_ON_ERROR);
return high_memory;
}
--
2.40.1
6:47 a.m.
New subject: [PATCH 3/3] s390x: uncouple physical and virtual memory spaces
Rework VTOP and PTOV macros to reflect the future
uncoupling of physical and virtual address spaces
in kernel. Existing versions are not affected.
Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com>
---
defs.h | 20 ++++-
s390x.c | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 247 insertions(+), 4 deletions(-)
diff --git a/defs.h b/defs.h
index 5218a94..20237b7 100644
--- a/defs.h
+++ b/defs.h
@@ -4564,9 +4564,9 @@ struct efi_memory_desc_t {
#define _64BIT_
#define MACHINE_TYPE "S390X"
-#define PTOV(X) ((unsigned long)(X)+(machdep->kvbase))
-#define VTOP(X) ((unsigned long)(X)-(machdep->kvbase))
-#define IS_VMALLOC_ADDR(X) (vt->vmalloc_start && (ulong)(X) >=
vt->vmalloc_start)
+#define PTOV(X) s390x_PTOV((ulong)(X))
+#define VTOP(X) s390x_VTOP((ulong)(X))
+#define IS_VMALLOC_ADDR(X) s390x_IS_VMALLOC_ADDR(X)
#define PTRS_PER_PTE 512
#define PTRS_PER_PMD 1024
#define PTRS_PER_PGD 2048
@@ -6827,7 +6827,21 @@ void get_s390_panicmsg(char *);
* s390x.c
*/
#ifdef S390X
+
+struct machine_specific
+{
+ ulong (*virt_to_phys)(ulong vaddr);
+ ulong (*phys_to_virt)(ulong paddr);
+ int (*is_vmalloc_addr)(ulong vaddr);
+ ulong __kaslr_offset_phys;
+ ulong amode31_start;
+ ulong amode31_end;
+};
+
void s390x_init(int);
+ulong s390x_PTOV(ulong);
+ulong s390x_VTOP(ulong);
+int s390x_IS_VMALLOC_ADDR(ulong);
void s390x_dump_machdep_table(ulong);
#define display_idt_table() \
error(FATAL, "-d option is not applicable to S390X architecture\n")
diff --git a/s390x.c b/s390x.c
index 4024d84..d8d7041 100644
--- a/s390x.c
+++ b/s390x.c
@@ -47,6 +47,7 @@
#define S390X_PSW_MASK_PSTATE 0x0001000000000000UL
#define S390X_LC_VMCORE_INFO 0xe0c
+#define S390X_LC_OS_INFO 0xe18
/*
* Flags for Region and Segment table entries.
@@ -168,6 +169,19 @@ static struct line_number_hook s390x_line_number_hooks[];
static int s390x_is_uvaddr(ulong, struct task_context *);
static int s390x_get_kvaddr_ranges(struct vaddr_range *);
static int set_s390x_max_physmem_bits(void);
+static ulong s390x_generic_VTOP(ulong vaddr);
+static ulong s390x_generic_PTOV(ulong paddr);
+static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr);
+static ulong s390x_vr_VTOP(ulong vaddr);
+static ulong s390x_vr_PTOV(ulong paddr);
+static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr);
+static int s390x_vr_is_kvaddr(ulong);
+
+struct machine_specific s390x_machine_specific = {
+ .virt_to_phys = s390x_generic_VTOP,
+ .phys_to_virt = s390x_generic_PTOV,
+ .is_vmalloc_addr = s390x_generic_IS_VMALLOC_ADDR,
+};
/*
* struct lowcore name (old: "_lowcore", new: "lowcore")
@@ -546,6 +560,210 @@ static void s390x_check_kaslr(void)
free(vmcoreinfo);
}
+#define OS_INFO_VERSION_MAJOR 1
+#define OS_INFO_VERSION_MINOR 1
+
+#define OS_INFO_VMCOREINFO 0
+#define OS_INFO_REIPL_BLOCK 1
+#define OS_INFO_FLAGS_ENTRY 2
+#define OS_INFO_RESERVED 3
+#define OS_INFO_IDENTITY_BASE 4
+#define OS_INFO_KASLR_OFFSET 5
+#define OS_INFO_KASLR_OFF_PHYS 6
+#define OS_INFO_VMEMMAP 7
+#define OS_INFO_AMODE31_START 8
+#define OS_INFO_AMODE31_END 9
+
+struct os_info_entry {
+ union {
+ __u64 addr;
+ __u64 val;
+ };
+ __u64 size;
+ __u32 csum;
+} __attribute__((packed));
+
+struct os_info {
+ __u64 magic;
+ __u32 csum;
+ __u16 version_major;
+ __u16 version_minor;
+ __u64 crashkernel_addr;
+ __u64 crashkernel_size;
+ struct os_info_entry entry[10];
+ __u8 reserved[3864];
+} __attribute__((packed));
+
+struct vm_info {
+ __u64 __identity_base;
+ __u64 __kaslr_offset;
+ __u64 __kaslr_offset_phys;
+ __u64 amode31_start;
+ __u64 amode31_end;
+};
+
+static bool
+vmcoreinfo_read_u64(const char *key, __u64 *val)
+{
+ char *string;
+
+ string = pc->read_vmcoreinfo(key);
+ if (string) {
+ *val = strtoul(string, NULL, 16);
+ free(string);
+ return true;
+ }
+
+ return false;
+}
+
+static bool vmcoreinfo_read_vm_info(struct vm_info *_vm_info)
+{
+ struct vm_info vm_info;
+
+ if (!vmcoreinfo_read_u64("IDENTITYBASE", &vm_info.__identity_base) ||
+ !vmcoreinfo_read_u64("KERNELOFFSET", &vm_info.__kaslr_offset) ||
+ !vmcoreinfo_read_u64("KERNELOFFPHYS", &vm_info.__kaslr_offset_phys)
||
+ !vmcoreinfo_read_u64("SAMODE31", &vm_info.amode31_start) ||
+ !vmcoreinfo_read_u64("EAMODE31", &vm_info.amode31_end))
+ return false;
+
+ *_vm_info = vm_info;
+
+ return true;
+}
+
+static bool os_info_read_vm_info(struct vm_info *vm_info)
+{
+ struct os_info os_info;
+ ulong addr;
+
+ if (!readmem(S390X_LC_OS_INFO, PHYSADDR, &addr,
+ sizeof(addr), "s390x os_info ptr",
+ QUIET|RETURN_ON_ERROR))
+ return false;
+
+ if (addr == 0)
+ return true;
+
+ if (!readmem(addr, PHYSADDR, &os_info,
+ offsetof(struct os_info, reserved), "s390x os_info header",
+ QUIET|RETURN_ON_ERROR))
+ return false;
+
+ vm_info->__identity_base = os_info.entry[OS_INFO_IDENTITY_BASE].val;
+ vm_info->__kaslr_offset = os_info.entry[OS_INFO_KASLR_OFFSET].val;
+ vm_info->__kaslr_offset_phys = os_info.entry[OS_INFO_KASLR_OFF_PHYS].val;
+ vm_info->amode31_start = os_info.entry[OS_INFO_AMODE31_START].val;
+ vm_info->amode31_end = os_info.entry[OS_INFO_AMODE31_END].val;
+
+ return true;
+}
+
+static bool vm_info_empty(struct vm_info *vm_info)
+{
+ return !vm_info->__kaslr_offset;
+}
+
+static bool is_read_proc_kcore(void)
+{
+ struct stat kcore_stat, fd_stat;
+ int kcore_fd, fd;
+ int rc;
+
+ rc = stat("/proc/kcore", &kcore_stat);
+ if (rc)
+ return false;
+
+ fd = REMOTE_MEMSRC() ? pc->sockfd : (ACTIVE() ? pc->mfd : pc->dfd);
+ rc = fstat(fd, &fd_stat);
+ if (rc)
+ return false;
+
+ return (fd_stat.st_ino == kcore_stat.st_ino) &&
+ (fd_stat.st_dev == kcore_stat.st_dev);
+}
+
+static bool s390x_init_vm(void)
+{
+ struct vm_info vm_info;
+
+ if (is_read_proc_kcore()) {
+ if (!vmcoreinfo_read_vm_info(&vm_info))
+ return true;
+ } else {
+ if (!os_info_read_vm_info(&vm_info))
+ return false;
+ }
+ if (vm_info_empty(&vm_info))
+ return true;
+
+ machdep->identity_map_base = vm_info.__identity_base;
+ machdep->kvbase = vm_info.__kaslr_offset;
+ machdep->machspec->__kaslr_offset_phys = vm_info.__kaslr_offset_phys;
+ machdep->machspec->amode31_start = vm_info.amode31_start;
+ machdep->machspec->amode31_end = vm_info.amode31_end;
+
+ machdep->is_kvaddr = s390x_vr_is_kvaddr;
+ machdep->machspec->virt_to_phys = s390x_vr_VTOP;
+ machdep->machspec->phys_to_virt = s390x_vr_PTOV;
+ machdep->machspec->is_vmalloc_addr = s390x_vr_IS_VMALLOC_ADDR;
+
+ return true;
+}
+
+static ulong s390x_generic_VTOP(ulong vaddr)
+{
+ return vaddr - machdep->kvbase;
+}
+
+static ulong s390x_generic_PTOV(ulong paddr)
+{
+ return paddr + machdep->kvbase;
+}
+
+static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return vt->vmalloc_start && vaddr >= vt->vmalloc_start;
+}
+
+static ulong s390x_vr_VTOP(ulong vaddr)
+{
+ if (vaddr < LOWCORE_SIZE)
+ return vaddr;
+ if ((vaddr < machdep->machspec->amode31_end) &&
+ (vaddr >= machdep->machspec->amode31_start))
+ return vaddr;
+ if (vaddr < machdep->kvbase)
+ return vaddr - machdep->identity_map_base;
+ return vaddr - machdep->kvbase + machdep->machspec->__kaslr_offset_phys;
+}
+
+static ulong s390x_vr_PTOV(ulong paddr)
+{
+ return paddr + machdep->identity_map_base;
+}
+
+static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return (vaddr >= vt->vmalloc_start && vaddr < machdep->kvbase);
+}
+
+ulong s390x_VTOP(ulong vaddr)
+{
+ return machdep->machspec->virt_to_phys(vaddr);
+}
+
+ulong s390x_PTOV(ulong paddr)
+{
+ return machdep->machspec->phys_to_virt(paddr);
+}
+
+int s390x_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return machdep->machspec->is_vmalloc_addr(vaddr);
+}
+
/*
* Do all necessary machine-specific setup here. This is called several
* times during initialization.
@@ -560,6 +778,7 @@ s390x_init(int when)
machdep->process_elf_notes = s390x_process_elf_notes;
break;
case PRE_SYMTAB:
+ machdep->machspec = &s390x_machine_specific;
machdep->verify_symbol = s390x_verify_symbol;
if (pc->flags & KERNEL_DEBUG_QUERY)
return;
@@ -587,6 +806,8 @@ s390x_init(int when)
machdep->kvbase = 0;
machdep->identity_map_base = 0;
machdep->is_kvaddr = generic_is_kvaddr;
+ if (!s390x_init_vm())
+ error(FATAL, "cannot initialize VM parameters.");
machdep->is_uvaddr = s390x_is_uvaddr;
machdep->eframe_search = s390x_eframe_search;
machdep->back_trace = s390x_back_trace_cmd;
@@ -681,7 +902,9 @@ s390x_dump_machdep_table(ulong arg)
fprintf(fp, " dis_filter: s390x_dis_filter()\n");
fprintf(fp, " cmd_mach: s390x_cmd_mach()\n");
fprintf(fp, " get_smp_cpus: s390x_get_smp_cpus()\n");
- fprintf(fp, " is_kvaddr: generic_is_kvaddr()\n");
+ fprintf(fp, " is_kvaddr: %s()\n", machdep->is_kvaddr ==
s390x_vr_is_kvaddr ?
+ "s390x_vr_is_kvaddr" :
+ "generic_is_kvaddr");
fprintf(fp, " is_uvaddr: s390x_is_uvaddr()\n");
fprintf(fp, " verify_paddr: generic_verify_paddr()\n");
fprintf(fp, " get_kvaddr_ranges: s390x_get_kvaddr_ranges()\n");
@@ -702,6 +925,12 @@ s390x_dump_machdep_table(ulong arg)
fprintf(fp, " machspec: %lx\n", (ulong)machdep->machspec);
}
+static int
+s390x_vr_is_kvaddr(ulong vaddr)
+{
+ return (vaddr < LOWCORE_SIZE) || (vaddr >= machdep->identity_map_base);
+}
+
/*
* Check if address is in context's address space
*/
--
2.40.1
9:04 a.m.
New subject: [PATCH v2 3/3] s390x: uncouple physical and virtual memory spaces
Rework VTOP and PTOV macros to reflect the future
uncoupling of physical and virtual address spaces
in kernel. Existing versions are not affected.
Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com>
---
Makefile | 18 ++---
defs.h | 20 ++++-
s390x.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 256 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index a94a243..762d458 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ PROGRAM=crash
# Supported targets: X86 ALPHA PPC IA64 PPC64 SPARC64
# TARGET and GDB_CONF_FLAGS will be configured automatically by configure
#
-TARGET=
+TARGET=S390X
GDB_CONF_FLAGS=
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e
s/sa110/arm/)
@@ -35,10 +35,10 @@ endif
#
# GDB, GDB_FILES, GDB_OFILES and GDB_PATCH_FILES will be configured automatically by
configure
#
-GDB=
-GDB_FILES=
-GDB_OFILES=
-GDB_PATCH_FILES=
+GDB=gdb-10.2
+GDB_FILES=${GDB_10.2_FILES}
+GDB_OFILES=${GDB_10.2_OFILES}
+GDB_PATCH_FILES=gdb-10.2.patch
#
# Default installation directory
@@ -46,7 +46,7 @@ GDB_PATCH_FILES=
INSTALLDIR=${DESTDIR}/usr/bin
# LDFLAGS will be configured automatically by configure
-LDFLAGS=
+LDFLAGS=-llzo2
GENERIC_HFILES=defs.h xen_hyper_defs.h xen_dom0.h
MCORE_HFILES=va_server.h vas_crash.h
@@ -190,7 +190,7 @@ GDB_10.2_OFILES=${GDB}/gdb/symtab.o crash_target.o
#
# GDB_FLAGS is passed up from the gdb Makefile.
#
-GDB_FLAGS=
+GDB_FLAGS=-DGDB_10_2
#
# WARNING_OPTIONS and WARNING_ERROR are both applied on a per-file basis.
@@ -203,11 +203,11 @@ GDB_FLAGS=
#WARNING_ERROR=-Werror
# TARGET_CFLAGS will be configured automatically by configure
-TARGET_CFLAGS=
+TARGET_CFLAGS= -DLZO
CRASH_CFLAGS=-g -D${TARGET} ${TARGET_CFLAGS} ${GDB_FLAGS} ${CFLAGS}
-GPL_FILES=
+GPL_FILES=COPYING3
TAR_FILES=${SOURCE_FILES} Makefile ${GPL_FILES} README .rh_rpm_package crash.8 \
${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES}
CSCOPE_FILES=${SOURCE_FILES}
diff --git a/defs.h b/defs.h
index 5218a94..20237b7 100644
--- a/defs.h
+++ b/defs.h
@@ -4564,9 +4564,9 @@ struct efi_memory_desc_t {
#define _64BIT_
#define MACHINE_TYPE "S390X"
-#define PTOV(X) ((unsigned long)(X)+(machdep->kvbase))
-#define VTOP(X) ((unsigned long)(X)-(machdep->kvbase))
-#define IS_VMALLOC_ADDR(X) (vt->vmalloc_start && (ulong)(X) >=
vt->vmalloc_start)
+#define PTOV(X) s390x_PTOV((ulong)(X))
+#define VTOP(X) s390x_VTOP((ulong)(X))
+#define IS_VMALLOC_ADDR(X) s390x_IS_VMALLOC_ADDR(X)
#define PTRS_PER_PTE 512
#define PTRS_PER_PMD 1024
#define PTRS_PER_PGD 2048
@@ -6827,7 +6827,21 @@ void get_s390_panicmsg(char *);
* s390x.c
*/
#ifdef S390X
+
+struct machine_specific
+{
+ ulong (*virt_to_phys)(ulong vaddr);
+ ulong (*phys_to_virt)(ulong paddr);
+ int (*is_vmalloc_addr)(ulong vaddr);
+ ulong __kaslr_offset_phys;
+ ulong amode31_start;
+ ulong amode31_end;
+};
+
void s390x_init(int);
+ulong s390x_PTOV(ulong);
+ulong s390x_VTOP(ulong);
+int s390x_IS_VMALLOC_ADDR(ulong);
void s390x_dump_machdep_table(ulong);
#define display_idt_table() \
error(FATAL, "-d option is not applicable to S390X architecture\n")
diff --git a/s390x.c b/s390x.c
index 4024d84..7aa37c7 100644
--- a/s390x.c
+++ b/s390x.c
@@ -47,6 +47,7 @@
#define S390X_PSW_MASK_PSTATE 0x0001000000000000UL
#define S390X_LC_VMCORE_INFO 0xe0c
+#define S390X_LC_OS_INFO 0xe18
/*
* Flags for Region and Segment table entries.
@@ -168,6 +169,19 @@ static struct line_number_hook s390x_line_number_hooks[];
static int s390x_is_uvaddr(ulong, struct task_context *);
static int s390x_get_kvaddr_ranges(struct vaddr_range *);
static int set_s390x_max_physmem_bits(void);
+static ulong s390x_generic_VTOP(ulong vaddr);
+static ulong s390x_generic_PTOV(ulong paddr);
+static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr);
+static ulong s390x_vr_VTOP(ulong vaddr);
+static ulong s390x_vr_PTOV(ulong paddr);
+static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr);
+static int s390x_vr_is_kvaddr(ulong);
+
+struct machine_specific s390x_machine_specific = {
+ .virt_to_phys = s390x_generic_VTOP,
+ .phys_to_virt = s390x_generic_PTOV,
+ .is_vmalloc_addr = s390x_generic_IS_VMALLOC_ADDR,
+};
/*
* struct lowcore name (old: "_lowcore", new: "lowcore")
@@ -546,6 +560,210 @@ static void s390x_check_kaslr(void)
free(vmcoreinfo);
}
+#define OS_INFO_VERSION_MAJOR 1
+#define OS_INFO_VERSION_MINOR 1
+
+#define OS_INFO_VMCOREINFO 0
+#define OS_INFO_REIPL_BLOCK 1
+#define OS_INFO_FLAGS_ENTRY 2
+#define OS_INFO_RESERVED 3
+#define OS_INFO_IDENTITY_BASE 4
+#define OS_INFO_KASLR_OFFSET 5
+#define OS_INFO_KASLR_OFF_PHYS 6
+#define OS_INFO_VMEMMAP 7
+#define OS_INFO_AMODE31_START 8
+#define OS_INFO_AMODE31_END 9
+
+struct os_info_entry {
+ union {
+ __u64 addr;
+ __u64 val;
+ };
+ __u64 size;
+ __u32 csum;
+} __attribute__((packed));
+
+struct os_info {
+ __u64 magic;
+ __u32 csum;
+ __u16 version_major;
+ __u16 version_minor;
+ __u64 crashkernel_addr;
+ __u64 crashkernel_size;
+ struct os_info_entry entry[10];
+ __u8 reserved[3864];
+} __attribute__((packed));
+
+struct vm_info {
+ __u64 __identity_base;
+ __u64 __kaslr_offset;
+ __u64 __kaslr_offset_phys;
+ __u64 amode31_start;
+ __u64 amode31_end;
+};
+
+static bool
+vmcoreinfo_read_u64(const char *key, __u64 *val)
+{
+ char *string;
+
+ string = pc->read_vmcoreinfo(key);
+ if (string) {
+ *val = strtoul(string, NULL, 16);
+ free(string);
+ return true;
+ }
+
+ return false;
+}
+
+static bool vmcoreinfo_read_vm_info(struct vm_info *_vm_info)
+{
+ struct vm_info vm_info;
+
+ if (!vmcoreinfo_read_u64("IDENTITYBASE", &vm_info.__identity_base) ||
+ !vmcoreinfo_read_u64("KERNELOFFSET", &vm_info.__kaslr_offset) ||
+ !vmcoreinfo_read_u64("KERNELOFFPHYS", &vm_info.__kaslr_offset_phys)
||
+ !vmcoreinfo_read_u64("SAMODE31", &vm_info.amode31_start) ||
+ !vmcoreinfo_read_u64("EAMODE31", &vm_info.amode31_end))
+ return false;
+
+ *_vm_info = vm_info;
+
+ return true;
+}
+
+static bool os_info_read_vm_info(struct vm_info *vm_info)
+{
+ struct os_info os_info;
+ ulong addr;
+
+ if (!readmem(S390X_LC_OS_INFO, PHYSADDR, &addr,
+ sizeof(addr), "s390x os_info ptr",
+ QUIET|RETURN_ON_ERROR))
+ return false;
+
+ if (addr == 0)
+ return true;
+
+ if (!readmem(addr, PHYSADDR, &os_info,
+ offsetof(struct os_info, reserved), "s390x os_info header",
+ QUIET|RETURN_ON_ERROR))
+ return false;
+
+ vm_info->__identity_base = os_info.entry[OS_INFO_IDENTITY_BASE].val;
+ vm_info->__kaslr_offset = os_info.entry[OS_INFO_KASLR_OFFSET].val;
+ vm_info->__kaslr_offset_phys = os_info.entry[OS_INFO_KASLR_OFF_PHYS].val;
+ vm_info->amode31_start = os_info.entry[OS_INFO_AMODE31_START].val;
+ vm_info->amode31_end = os_info.entry[OS_INFO_AMODE31_END].val;
+
+ return true;
+}
+
+static bool vm_info_empty(struct vm_info *vm_info)
+{
+ return !vm_info->__kaslr_offset;
+}
+
+static bool is_read_proc_kcore(void)
+{
+ struct stat kcore_stat, fd_stat;
+ int fd;
+ int rc;
+
+ rc = stat("/proc/kcore", &kcore_stat);
+ if (rc)
+ return false;
+
+ fd = REMOTE_MEMSRC() ? pc->sockfd : (ACTIVE() ? pc->mfd : pc->dfd);
+ rc = fstat(fd, &fd_stat);
+ if (rc)
+ return false;
+
+ return (fd_stat.st_ino == kcore_stat.st_ino) &&
+ (fd_stat.st_dev == kcore_stat.st_dev);
+}
+
+static bool s390x_init_vm(void)
+{
+ struct vm_info vm_info;
+
+ if (is_read_proc_kcore()) {
+ if (!vmcoreinfo_read_vm_info(&vm_info))
+ return true;
+ } else {
+ if (!os_info_read_vm_info(&vm_info))
+ return false;
+ }
+ if (vm_info_empty(&vm_info))
+ return true;
+
+ machdep->identity_map_base = vm_info.__identity_base;
+ machdep->kvbase = vm_info.__kaslr_offset;
+ machdep->machspec->__kaslr_offset_phys = vm_info.__kaslr_offset_phys;
+ machdep->machspec->amode31_start = vm_info.amode31_start;
+ machdep->machspec->amode31_end = vm_info.amode31_end;
+
+ machdep->is_kvaddr = s390x_vr_is_kvaddr;
+ machdep->machspec->virt_to_phys = s390x_vr_VTOP;
+ machdep->machspec->phys_to_virt = s390x_vr_PTOV;
+ machdep->machspec->is_vmalloc_addr = s390x_vr_IS_VMALLOC_ADDR;
+
+ return true;
+}
+
+static ulong s390x_generic_VTOP(ulong vaddr)
+{
+ return vaddr - machdep->kvbase;
+}
+
+static ulong s390x_generic_PTOV(ulong paddr)
+{
+ return paddr + machdep->kvbase;
+}
+
+static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return vt->vmalloc_start && vaddr >= vt->vmalloc_start;
+}
+
+static ulong s390x_vr_VTOP(ulong vaddr)
+{
+ if (vaddr < LOWCORE_SIZE)
+ return vaddr;
+ if ((vaddr < machdep->machspec->amode31_end) &&
+ (vaddr >= machdep->machspec->amode31_start))
+ return vaddr;
+ if (vaddr < machdep->kvbase)
+ return vaddr - machdep->identity_map_base;
+ return vaddr - machdep->kvbase + machdep->machspec->__kaslr_offset_phys;
+}
+
+static ulong s390x_vr_PTOV(ulong paddr)
+{
+ return paddr + machdep->identity_map_base;
+}
+
+static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return (vaddr >= vt->vmalloc_start && vaddr < machdep->kvbase);
+}
+
+ulong s390x_VTOP(ulong vaddr)
+{
+ return machdep->machspec->virt_to_phys(vaddr);
+}
+
+ulong s390x_PTOV(ulong paddr)
+{
+ return machdep->machspec->phys_to_virt(paddr);
+}
+
+int s390x_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return machdep->machspec->is_vmalloc_addr(vaddr);
+}
+
/*
* Do all necessary machine-specific setup here. This is called several
* times during initialization.
@@ -560,6 +778,7 @@ s390x_init(int when)
machdep->process_elf_notes = s390x_process_elf_notes;
break;
case PRE_SYMTAB:
+ machdep->machspec = &s390x_machine_specific;
machdep->verify_symbol = s390x_verify_symbol;
if (pc->flags & KERNEL_DEBUG_QUERY)
return;
@@ -587,6 +806,8 @@ s390x_init(int when)
machdep->kvbase = 0;
machdep->identity_map_base = 0;
machdep->is_kvaddr = generic_is_kvaddr;
+ if (!s390x_init_vm())
+ error(FATAL, "cannot initialize VM parameters.");
machdep->is_uvaddr = s390x_is_uvaddr;
machdep->eframe_search = s390x_eframe_search;
machdep->back_trace = s390x_back_trace_cmd;
@@ -681,7 +902,9 @@ s390x_dump_machdep_table(ulong arg)
fprintf(fp, " dis_filter: s390x_dis_filter()\n");
fprintf(fp, " cmd_mach: s390x_cmd_mach()\n");
fprintf(fp, " get_smp_cpus: s390x_get_smp_cpus()\n");
- fprintf(fp, " is_kvaddr: generic_is_kvaddr()\n");
+ fprintf(fp, " is_kvaddr: %s()\n", machdep->is_kvaddr ==
s390x_vr_is_kvaddr ?
+ "s390x_vr_is_kvaddr" :
+ "generic_is_kvaddr");
fprintf(fp, " is_uvaddr: s390x_is_uvaddr()\n");
fprintf(fp, " verify_paddr: generic_verify_paddr()\n");
fprintf(fp, " get_kvaddr_ranges: s390x_get_kvaddr_ranges()\n");
@@ -702,6 +925,12 @@ s390x_dump_machdep_table(ulong arg)
fprintf(fp, " machspec: %lx\n", (ulong)machdep->machspec);
}
+static int
+s390x_vr_is_kvaddr(ulong vaddr)
+{
+ return (vaddr < LOWCORE_SIZE) || (vaddr >= machdep->identity_map_base);
+}
+
/*
* Check if address is in context's address space
*/
--
2.40.1
7:33 p.m.
New subject: [PATCH v2 3/3] s390x: uncouple physical and virtual memory spaces
On 2023/12/05 0:04, Alexander Gordeev wrote:
+static bool is_read_proc_kcore(void)
+{
+ struct stat kcore_stat, fd_stat;
+ int fd;
+ int rc;
+
+ rc = stat("/proc/kcore", &kcore_stat);
+ if (rc)
+ return false;
+
+ fd = REMOTE_MEMSRC() ? pc->sockfd : (ACTIVE() ? pc->mfd : pc->dfd);
+ rc = fstat(fd, &fd_stat);
+ if (rc)
+ return false;
+
+ return (fd_stat.st_ino == kcore_stat.st_ino) &&
+ (fd_stat.st_dev == kcore_stat.st_dev);
+}
+
+static bool s390x_init_vm(void)
+{
+ struct vm_info vm_info;
+
+ if (is_read_proc_kcore()) {
Just to clarify, does this mean that "pc->flags & PROC_KCORE" cannot be
used here?
Thanks,
Kazu
9:52 a.m.
New subject: [PATCH v2 3/3] s390x: uncouple physical and virtual memory spaces
On Thu, Dec 07, 2023 at 01:33:42AM +0000, HAGIO KAZUHITO(萩尾 一仁) wrote:
Hi Kazu,
On 2023/12/05 0:04, Alexander Gordeev wrote:
> +static bool is_read_proc_kcore(void)
> +{
> + struct stat kcore_stat, fd_stat;
> + int fd;
> + int rc;
> +
> + rc = stat("/proc/kcore", &kcore_stat);
> + if (rc)
> + return false;
> +
> + fd = REMOTE_MEMSRC() ? pc->sockfd : (ACTIVE() ? pc->mfd : pc->dfd);
> + rc = fstat(fd, &fd_stat);
> + if (rc)
> + return false;
> +
> + return (fd_stat.st_ino == kcore_stat.st_ino) &&
> + (fd_stat.st_dev == kcore_stat.st_dev);
> +}
> +
> +static bool s390x_init_vm(void)
> +{
> + struct vm_info vm_info;
> +
> + if (is_read_proc_kcore()) {
Just to clarify, does this mean that "pc->flags & PROC_KCORE" cannot be
used here?
Indeed, it can be used instead. I will post v3 of this patch. The
interdiff is:
diff -u b/s390x.c b/s390x.c
--- b/s390x.c
+++ b/s390x.c
@@ -665,30 +665,11 @@
return !vm_info->__kaslr_offset;
}
-static bool is_read_proc_kcore(void)
-{
- struct stat kcore_stat, fd_stat;
- int kcore_fd, fd;
- int rc;
-
- rc = stat("/proc/kcore", &kcore_stat);
- if (rc)
- return false;
-
- fd = REMOTE_MEMSRC() ? pc->sockfd : (ACTIVE() ? pc->mfd : pc->dfd);
- rc = fstat(fd, &fd_stat);
- if (rc)
- return false;
-
- return (fd_stat.st_ino == kcore_stat.st_ino) &&
- (fd_stat.st_dev == kcore_stat.st_dev);
-}
-
static bool s390x_init_vm(void)
{
struct vm_info vm_info;
- if (is_read_proc_kcore()) {
+ if (pc->flags & PROC_KCORE) {
if (!vmcoreinfo_read_vm_info(&vm_info))
return true;
} else {
@Lianbo, would you keep your Ack?
Thanks,
Kazu
Thanks!
9:54 a.m.
New subject: [PATCH v3 3/3] s390x: uncouple physical and virtual memory spaces
Rework VTOP and PTOV macros to reflect the future
uncoupling of physical and virtual address spaces
in kernel. Existing versions are not affected.
Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com>
---
defs.h | 20 +++++-
s390x.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 228 insertions(+), 4 deletions(-)
diff --git a/defs.h b/defs.h
index 5218a94..20237b7 100644
--- a/defs.h
+++ b/defs.h
@@ -4564,9 +4564,9 @@ struct efi_memory_desc_t {
#define _64BIT_
#define MACHINE_TYPE "S390X"
-#define PTOV(X) ((unsigned long)(X)+(machdep->kvbase))
-#define VTOP(X) ((unsigned long)(X)-(machdep->kvbase))
-#define IS_VMALLOC_ADDR(X) (vt->vmalloc_start && (ulong)(X) >=
vt->vmalloc_start)
+#define PTOV(X) s390x_PTOV((ulong)(X))
+#define VTOP(X) s390x_VTOP((ulong)(X))
+#define IS_VMALLOC_ADDR(X) s390x_IS_VMALLOC_ADDR(X)
#define PTRS_PER_PTE 512
#define PTRS_PER_PMD 1024
#define PTRS_PER_PGD 2048
@@ -6827,7 +6827,21 @@ void get_s390_panicmsg(char *);
* s390x.c
*/
#ifdef S390X
+
+struct machine_specific
+{
+ ulong (*virt_to_phys)(ulong vaddr);
+ ulong (*phys_to_virt)(ulong paddr);
+ int (*is_vmalloc_addr)(ulong vaddr);
+ ulong __kaslr_offset_phys;
+ ulong amode31_start;
+ ulong amode31_end;
+};
+
void s390x_init(int);
+ulong s390x_PTOV(ulong);
+ulong s390x_VTOP(ulong);
+int s390x_IS_VMALLOC_ADDR(ulong);
void s390x_dump_machdep_table(ulong);
#define display_idt_table() \
error(FATAL, "-d option is not applicable to S390X architecture\n")
diff --git a/s390x.c b/s390x.c
index 4024d84..54b4ebc 100644
--- a/s390x.c
+++ b/s390x.c
@@ -47,6 +47,7 @@
#define S390X_PSW_MASK_PSTATE 0x0001000000000000UL
#define S390X_LC_VMCORE_INFO 0xe0c
+#define S390X_LC_OS_INFO 0xe18
/*
* Flags for Region and Segment table entries.
@@ -168,6 +169,19 @@ static struct line_number_hook s390x_line_number_hooks[];
static int s390x_is_uvaddr(ulong, struct task_context *);
static int s390x_get_kvaddr_ranges(struct vaddr_range *);
static int set_s390x_max_physmem_bits(void);
+static ulong s390x_generic_VTOP(ulong vaddr);
+static ulong s390x_generic_PTOV(ulong paddr);
+static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr);
+static ulong s390x_vr_VTOP(ulong vaddr);
+static ulong s390x_vr_PTOV(ulong paddr);
+static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr);
+static int s390x_vr_is_kvaddr(ulong);
+
+struct machine_specific s390x_machine_specific = {
+ .virt_to_phys = s390x_generic_VTOP,
+ .phys_to_virt = s390x_generic_PTOV,
+ .is_vmalloc_addr = s390x_generic_IS_VMALLOC_ADDR,
+};
/*
* struct lowcore name (old: "_lowcore", new: "lowcore")
@@ -546,6 +560,191 @@ static void s390x_check_kaslr(void)
free(vmcoreinfo);
}
+#define OS_INFO_VERSION_MAJOR 1
+#define OS_INFO_VERSION_MINOR 1
+
+#define OS_INFO_VMCOREINFO 0
+#define OS_INFO_REIPL_BLOCK 1
+#define OS_INFO_FLAGS_ENTRY 2
+#define OS_INFO_RESERVED 3
+#define OS_INFO_IDENTITY_BASE 4
+#define OS_INFO_KASLR_OFFSET 5
+#define OS_INFO_KASLR_OFF_PHYS 6
+#define OS_INFO_VMEMMAP 7
+#define OS_INFO_AMODE31_START 8
+#define OS_INFO_AMODE31_END 9
+
+struct os_info_entry {
+ union {
+ __u64 addr;
+ __u64 val;
+ };
+ __u64 size;
+ __u32 csum;
+} __attribute__((packed));
+
+struct os_info {
+ __u64 magic;
+ __u32 csum;
+ __u16 version_major;
+ __u16 version_minor;
+ __u64 crashkernel_addr;
+ __u64 crashkernel_size;
+ struct os_info_entry entry[10];
+ __u8 reserved[3864];
+} __attribute__((packed));
+
+struct vm_info {
+ __u64 __identity_base;
+ __u64 __kaslr_offset;
+ __u64 __kaslr_offset_phys;
+ __u64 amode31_start;
+ __u64 amode31_end;
+};
+
+static bool
+vmcoreinfo_read_u64(const char *key, __u64 *val)
+{
+ char *string;
+
+ string = pc->read_vmcoreinfo(key);
+ if (string) {
+ *val = strtoul(string, NULL, 16);
+ free(string);
+ return true;
+ }
+
+ return false;
+}
+
+static bool vmcoreinfo_read_vm_info(struct vm_info *_vm_info)
+{
+ struct vm_info vm_info;
+
+ if (!vmcoreinfo_read_u64("IDENTITYBASE", &vm_info.__identity_base) ||
+ !vmcoreinfo_read_u64("KERNELOFFSET", &vm_info.__kaslr_offset) ||
+ !vmcoreinfo_read_u64("KERNELOFFPHYS", &vm_info.__kaslr_offset_phys)
||
+ !vmcoreinfo_read_u64("SAMODE31", &vm_info.amode31_start) ||
+ !vmcoreinfo_read_u64("EAMODE31", &vm_info.amode31_end))
+ return false;
+
+ *_vm_info = vm_info;
+
+ return true;
+}
+
+static bool os_info_read_vm_info(struct vm_info *vm_info)
+{
+ struct os_info os_info;
+ ulong addr;
+
+ if (!readmem(S390X_LC_OS_INFO, PHYSADDR, &addr,
+ sizeof(addr), "s390x os_info ptr",
+ QUIET|RETURN_ON_ERROR))
+ return false;
+
+ if (addr == 0)
+ return true;
+
+ if (!readmem(addr, PHYSADDR, &os_info,
+ offsetof(struct os_info, reserved), "s390x os_info header",
+ QUIET|RETURN_ON_ERROR))
+ return false;
+
+ vm_info->__identity_base = os_info.entry[OS_INFO_IDENTITY_BASE].val;
+ vm_info->__kaslr_offset = os_info.entry[OS_INFO_KASLR_OFFSET].val;
+ vm_info->__kaslr_offset_phys = os_info.entry[OS_INFO_KASLR_OFF_PHYS].val;
+ vm_info->amode31_start = os_info.entry[OS_INFO_AMODE31_START].val;
+ vm_info->amode31_end = os_info.entry[OS_INFO_AMODE31_END].val;
+
+ return true;
+}
+
+static bool vm_info_empty(struct vm_info *vm_info)
+{
+ return !vm_info->__kaslr_offset;
+}
+
+static bool s390x_init_vm(void)
+{
+ struct vm_info vm_info;
+
+ if (pc->flags & PROC_KCORE) {
+ if (!vmcoreinfo_read_vm_info(&vm_info))
+ return true;
+ } else {
+ if (!os_info_read_vm_info(&vm_info))
+ return false;
+ }
+ if (vm_info_empty(&vm_info))
+ return true;
+
+ machdep->identity_map_base = vm_info.__identity_base;
+ machdep->kvbase = vm_info.__kaslr_offset;
+ machdep->machspec->__kaslr_offset_phys = vm_info.__kaslr_offset_phys;
+ machdep->machspec->amode31_start = vm_info.amode31_start;
+ machdep->machspec->amode31_end = vm_info.amode31_end;
+
+ machdep->is_kvaddr = s390x_vr_is_kvaddr;
+ machdep->machspec->virt_to_phys = s390x_vr_VTOP;
+ machdep->machspec->phys_to_virt = s390x_vr_PTOV;
+ machdep->machspec->is_vmalloc_addr = s390x_vr_IS_VMALLOC_ADDR;
+
+ return true;
+}
+
+static ulong s390x_generic_VTOP(ulong vaddr)
+{
+ return vaddr - machdep->kvbase;
+}
+
+static ulong s390x_generic_PTOV(ulong paddr)
+{
+ return paddr + machdep->kvbase;
+}
+
+static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return vt->vmalloc_start && vaddr >= vt->vmalloc_start;
+}
+
+static ulong s390x_vr_VTOP(ulong vaddr)
+{
+ if (vaddr < LOWCORE_SIZE)
+ return vaddr;
+ if ((vaddr < machdep->machspec->amode31_end) &&
+ (vaddr >= machdep->machspec->amode31_start))
+ return vaddr;
+ if (vaddr < machdep->kvbase)
+ return vaddr - machdep->identity_map_base;
+ return vaddr - machdep->kvbase + machdep->machspec->__kaslr_offset_phys;
+}
+
+static ulong s390x_vr_PTOV(ulong paddr)
+{
+ return paddr + machdep->identity_map_base;
+}
+
+static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return (vaddr >= vt->vmalloc_start && vaddr < machdep->kvbase);
+}
+
+ulong s390x_VTOP(ulong vaddr)
+{
+ return machdep->machspec->virt_to_phys(vaddr);
+}
+
+ulong s390x_PTOV(ulong paddr)
+{
+ return machdep->machspec->phys_to_virt(paddr);
+}
+
+int s390x_IS_VMALLOC_ADDR(ulong vaddr)
+{
+ return machdep->machspec->is_vmalloc_addr(vaddr);
+}
+
/*
* Do all necessary machine-specific setup here. This is called several
* times during initialization.
@@ -560,6 +759,7 @@ s390x_init(int when)
machdep->process_elf_notes = s390x_process_elf_notes;
break;
case PRE_SYMTAB:
+ machdep->machspec = &s390x_machine_specific;
machdep->verify_symbol = s390x_verify_symbol;
if (pc->flags & KERNEL_DEBUG_QUERY)
return;
@@ -587,6 +787,8 @@ s390x_init(int when)
machdep->kvbase = 0;
machdep->identity_map_base = 0;
machdep->is_kvaddr = generic_is_kvaddr;
+ if (!s390x_init_vm())
+ error(FATAL, "cannot initialize VM parameters.");
machdep->is_uvaddr = s390x_is_uvaddr;
machdep->eframe_search = s390x_eframe_search;
machdep->back_trace = s390x_back_trace_cmd;
@@ -681,7 +883,9 @@ s390x_dump_machdep_table(ulong arg)
fprintf(fp, " dis_filter: s390x_dis_filter()\n");
fprintf(fp, " cmd_mach: s390x_cmd_mach()\n");
fprintf(fp, " get_smp_cpus: s390x_get_smp_cpus()\n");
- fprintf(fp, " is_kvaddr: generic_is_kvaddr()\n");
+ fprintf(fp, " is_kvaddr: %s()\n", machdep->is_kvaddr ==
s390x_vr_is_kvaddr ?
+ "s390x_vr_is_kvaddr" :
+ "generic_is_kvaddr");
fprintf(fp, " is_uvaddr: s390x_is_uvaddr()\n");
fprintf(fp, " verify_paddr: generic_verify_paddr()\n");
fprintf(fp, " get_kvaddr_ranges: s390x_get_kvaddr_ranges()\n");
@@ -702,6 +906,12 @@ s390x_dump_machdep_table(ulong arg)
fprintf(fp, " machspec: %lx\n", (ulong)machdep->machspec);
}
+static int
+s390x_vr_is_kvaddr(ulong vaddr)
+{
+ return (vaddr < LOWCORE_SIZE) || (vaddr >= machdep->identity_map_base);
+}
+
/*
* Check if address is in context's address space
*/
--
2.40.1
12:08 a.m.
New subject: [PATCH v3 3/3] s390x: uncouple physical and virtual memory spaces
On 2023/12/08 0:54, Alexander Gordeev wrote:
Rework VTOP and PTOV macros to reflect the future
uncoupling of physical and virtual address spaces
in kernel. Existing versions are not affected.
Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com>
For the series with the 3/3 v3,
Acked-by: Kazuhito Hagio <k-hagio-ab(a)nec.com>
Thanks,
Kazu
> ---
> defs.h | 20 +++++-
> s390x.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 228 insertions(+), 4 deletions(-)
>
> diff --git a/defs.h b/defs.h
> index 5218a94..20237b7 100644
> --- a/defs.h
> +++ b/defs.h
> @@ -4564,9 +4564,9 @@ struct efi_memory_desc_t {
> #define _64BIT_
> #define MACHINE_TYPE "S390X"
>
> -#define PTOV(X) ((unsigned long)(X)+(machdep->kvbase))
> -#define VTOP(X) ((unsigned long)(X)-(machdep->kvbase))
> -#define IS_VMALLOC_ADDR(X) (vt->vmalloc_start && (ulong)(X) >=
vt->vmalloc_start)
> +#define PTOV(X) s390x_PTOV((ulong)(X))
> +#define VTOP(X) s390x_VTOP((ulong)(X))
> +#define IS_VMALLOC_ADDR(X) s390x_IS_VMALLOC_ADDR(X)
> #define PTRS_PER_PTE 512
> #define PTRS_PER_PMD 1024
> #define PTRS_PER_PGD 2048
> @@ -6827,7 +6827,21 @@ void get_s390_panicmsg(char *);
> * s390x.c
> */
> #ifdef S390X
> +
> +struct machine_specific
> +{
> + ulong (*virt_to_phys)(ulong vaddr);
> + ulong (*phys_to_virt)(ulong paddr);
> + int (*is_vmalloc_addr)(ulong vaddr);
> + ulong __kaslr_offset_phys;
> + ulong amode31_start;
> + ulong amode31_end;
> +};
> +
> void s390x_init(int);
> +ulong s390x_PTOV(ulong);
> +ulong s390x_VTOP(ulong);
> +int s390x_IS_VMALLOC_ADDR(ulong);
> void s390x_dump_machdep_table(ulong);
> #define display_idt_table() \
> error(FATAL, "-d option is not applicable to S390X
architecture\n")
> diff --git a/s390x.c b/s390x.c
> index 4024d84..54b4ebc 100644
> --- a/s390x.c
> +++ b/s390x.c
> @@ -47,6 +47,7 @@
> #define S390X_PSW_MASK_PSTATE 0x0001000000000000UL
>
> #define S390X_LC_VMCORE_INFO 0xe0c
> +#define S390X_LC_OS_INFO 0xe18
>
> /*
> * Flags for Region and Segment table entries.
> @@ -168,6 +169,19 @@ static struct line_number_hook s390x_line_number_hooks[];
> static int s390x_is_uvaddr(ulong, struct task_context *);
> static int s390x_get_kvaddr_ranges(struct vaddr_range *);
> static int set_s390x_max_physmem_bits(void);
> +static ulong s390x_generic_VTOP(ulong vaddr);
> +static ulong s390x_generic_PTOV(ulong paddr);
> +static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr);
> +static ulong s390x_vr_VTOP(ulong vaddr);
> +static ulong s390x_vr_PTOV(ulong paddr);
> +static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr);
> +static int s390x_vr_is_kvaddr(ulong);
> +
> +struct machine_specific s390x_machine_specific = {
> + .virt_to_phys = s390x_generic_VTOP,
> + .phys_to_virt = s390x_generic_PTOV,
> + .is_vmalloc_addr = s390x_generic_IS_VMALLOC_ADDR,
> +};
>
> /*
> * struct lowcore name (old: "_lowcore", new: "lowcore")
> @@ -546,6 +560,191 @@ static void s390x_check_kaslr(void)
> free(vmcoreinfo);
> }
>
> +#define OS_INFO_VERSION_MAJOR 1
> +#define OS_INFO_VERSION_MINOR 1
> +
> +#define OS_INFO_VMCOREINFO 0
> +#define OS_INFO_REIPL_BLOCK 1
> +#define OS_INFO_FLAGS_ENTRY 2
> +#define OS_INFO_RESERVED 3
> +#define OS_INFO_IDENTITY_BASE 4
> +#define OS_INFO_KASLR_OFFSET 5
> +#define OS_INFO_KASLR_OFF_PHYS 6
> +#define OS_INFO_VMEMMAP 7
> +#define OS_INFO_AMODE31_START 8
> +#define OS_INFO_AMODE31_END 9
> +
> +struct os_info_entry {
> + union {
> + __u64 addr;
> + __u64 val;
> + };
> + __u64 size;
> + __u32 csum;
> +} __attribute__((packed));
> +
> +struct os_info {
> + __u64 magic;
> + __u32 csum;
> + __u16 version_major;
> + __u16 version_minor;
> + __u64 crashkernel_addr;
> + __u64 crashkernel_size;
> + struct os_info_entry entry[10];
> + __u8 reserved[3864];
> +} __attribute__((packed));
> +
> +struct vm_info {
> + __u64 __identity_base;
> + __u64 __kaslr_offset;
> + __u64 __kaslr_offset_phys;
> + __u64 amode31_start;
> + __u64 amode31_end;
> +};
> +
> +static bool
> +vmcoreinfo_read_u64(const char *key, __u64 *val)
> +{
> + char *string;
> +
> + string = pc->read_vmcoreinfo(key);
> + if (string) {
> + *val = strtoul(string, NULL, 16);
> + free(string);
> + return true;
> + }
> +
> + return false;
> +}
> +
> +static bool vmcoreinfo_read_vm_info(struct vm_info *_vm_info)
> +{
> + struct vm_info vm_info;
> +
> + if (!vmcoreinfo_read_u64("IDENTITYBASE", &vm_info.__identity_base)
||
> + !vmcoreinfo_read_u64("KERNELOFFSET", &vm_info.__kaslr_offset)
||
> + !vmcoreinfo_read_u64("KERNELOFFPHYS",
&vm_info.__kaslr_offset_phys) ||
> + !vmcoreinfo_read_u64("SAMODE31", &vm_info.amode31_start)
||
> + !vmcoreinfo_read_u64("EAMODE31", &vm_info.amode31_end))
> + return false;
> +
> + *_vm_info = vm_info;
> +
> + return true;
> +}
> +
> +static bool os_info_read_vm_info(struct vm_info *vm_info)
> +{
> + struct os_info os_info;
> + ulong addr;
> +
> + if (!readmem(S390X_LC_OS_INFO, PHYSADDR, &addr,
> + sizeof(addr), "s390x os_info ptr",
> + QUIET|RETURN_ON_ERROR))
> + return false;
> +
> + if (addr == 0)
> + return true;
> +
> + if (!readmem(addr, PHYSADDR, &os_info,
> + offsetof(struct os_info, reserved), "s390x os_info header",
> + QUIET|RETURN_ON_ERROR))
> + return false;
> +
> + vm_info->__identity_base = os_info.entry[OS_INFO_IDENTITY_BASE].val;
> + vm_info->__kaslr_offset = os_info.entry[OS_INFO_KASLR_OFFSET].val;
> + vm_info->__kaslr_offset_phys = os_info.entry[OS_INFO_KASLR_OFF_PHYS].val;
> + vm_info->amode31_start = os_info.entry[OS_INFO_AMODE31_START].val;
> + vm_info->amode31_end = os_info.entry[OS_INFO_AMODE31_END].val;
> +
> + return true;
> +}
> +
> +static bool vm_info_empty(struct vm_info *vm_info)
> +{
> + return !vm_info->__kaslr_offset;
> +}
> +
> +static bool s390x_init_vm(void)
> +{
> + struct vm_info vm_info;
> +
> + if (pc->flags & PROC_KCORE) {
> + if (!vmcoreinfo_read_vm_info(&vm_info))
> + return true;
> + } else {
> + if (!os_info_read_vm_info(&vm_info))
> + return false;
> + }
> + if (vm_info_empty(&vm_info))
> + return true;
> +
> + machdep->identity_map_base = vm_info.__identity_base;
> + machdep->kvbase = vm_info.__kaslr_offset;
> + machdep->machspec->__kaslr_offset_phys = vm_info.__kaslr_offset_phys;
> + machdep->machspec->amode31_start = vm_info.amode31_start;
> + machdep->machspec->amode31_end = vm_info.amode31_end;
> +
> + machdep->is_kvaddr = s390x_vr_is_kvaddr;
> + machdep->machspec->virt_to_phys = s390x_vr_VTOP;
> + machdep->machspec->phys_to_virt = s390x_vr_PTOV;
> + machdep->machspec->is_vmalloc_addr = s390x_vr_IS_VMALLOC_ADDR;
> +
> + return true;
> +}
> +
> +static ulong s390x_generic_VTOP(ulong vaddr)
> +{
> + return vaddr - machdep->kvbase;
> +}
> +
> +static ulong s390x_generic_PTOV(ulong paddr)
> +{
> + return paddr + machdep->kvbase;
> +}
> +
> +static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr)
> +{
> + return vt->vmalloc_start && vaddr >= vt->vmalloc_start;
> +}
> +
> +static ulong s390x_vr_VTOP(ulong vaddr)
> +{
> + if (vaddr < LOWCORE_SIZE)
> + return vaddr;
> + if ((vaddr < machdep->machspec->amode31_end) &&
> + (vaddr >= machdep->machspec->amode31_start))
> + return vaddr;
> + if (vaddr < machdep->kvbase)
> + return vaddr - machdep->identity_map_base;
> + return vaddr - machdep->kvbase + machdep->machspec->__kaslr_offset_phys;
> +}
> +
> +static ulong s390x_vr_PTOV(ulong paddr)
> +{
> + return paddr + machdep->identity_map_base;
> +}
> +
> +static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr)
> +{
> + return (vaddr >= vt->vmalloc_start && vaddr <
machdep->kvbase);
> +}
> +
> +ulong s390x_VTOP(ulong vaddr)
> +{
> + return machdep->machspec->virt_to_phys(vaddr);
> +}
> +
> +ulong s390x_PTOV(ulong paddr)
> +{
> + return machdep->machspec->phys_to_virt(paddr);
> +}
> +
> +int s390x_IS_VMALLOC_ADDR(ulong vaddr)
> +{
> + return machdep->machspec->is_vmalloc_addr(vaddr);
> +}
> +
> /*
> * Do all necessary machine-specific setup here. This is called several
> * times during initialization.
> @@ -560,6 +759,7 @@ s390x_init(int when)
> machdep->process_elf_notes = s390x_process_elf_notes;
> break;
> case PRE_SYMTAB:
> + machdep->machspec = &s390x_machine_specific;
> machdep->verify_symbol = s390x_verify_symbol;
> if (pc->flags & KERNEL_DEBUG_QUERY)
> return;
> @@ -587,6 +787,8 @@ s390x_init(int when)
> machdep->kvbase = 0;
> machdep->identity_map_base = 0;
> machdep->is_kvaddr = generic_is_kvaddr;
> + if (!s390x_init_vm())
> + error(FATAL, "cannot initialize VM parameters.");
> machdep->is_uvaddr = s390x_is_uvaddr;
> machdep->eframe_search = s390x_eframe_search;
> machdep->back_trace = s390x_back_trace_cmd;
> @@ -681,7 +883,9 @@ s390x_dump_machdep_table(ulong arg)
> fprintf(fp, " dis_filter: s390x_dis_filter()\n");
> fprintf(fp, " cmd_mach: s390x_cmd_mach()\n");
> fprintf(fp, " get_smp_cpus: s390x_get_smp_cpus()\n");
> - fprintf(fp, " is_kvaddr: generic_is_kvaddr()\n");
> + fprintf(fp, " is_kvaddr: %s()\n", machdep->is_kvaddr ==
s390x_vr_is_kvaddr ?
> + "s390x_vr_is_kvaddr" :
> + "generic_is_kvaddr");
> fprintf(fp, " is_uvaddr: s390x_is_uvaddr()\n");
> fprintf(fp, " verify_paddr: generic_verify_paddr()\n");
> fprintf(fp, " get_kvaddr_ranges: s390x_get_kvaddr_ranges()\n");
> @@ -702,6 +906,12 @@ s390x_dump_machdep_table(ulong arg)
> fprintf(fp, " machspec: %lx\n",
(ulong)machdep->machspec);
> }
>
> +static int
> +s390x_vr_is_kvaddr(ulong vaddr)
> +{
> + return (vaddr < LOWCORE_SIZE) || (vaddr >= machdep->identity_map_base);
> +}
> +
> /*
> * Check if address is in context's address space
> */
4:28 a.m.
New subject: [PATCH v3 3/3] s390x: uncouple physical and virtual memory spaces
On 12/11/23 14:08, HAGIO KAZUHITO(萩尾 一仁) wrote:
On 2023/12/08 0:54, Alexander Gordeev wrote:
> Rework VTOP and PTOV macros to reflect the future
> uncoupling of physical and virtual address spaces
> in kernel. Existing versions are not affected.
>
> Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com>
For the series with the 3/3 v3,
Acked-by: Kazuhito Hagio <k-hagio-ab(a)nec.com>
The patch set looks good to me. I tested it again and it works well on
the current kernel version.
Please go ahead, Kazu.
Thanks
Lianbo
Thanks,
Kazu
> ---
> defs.h | 20 +++++-
> s390x.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 228 insertions(+), 4 deletions(-)
>
> diff --git a/defs.h b/defs.h
> index 5218a94..20237b7 100644
> --- a/defs.h
> +++ b/defs.h
> @@ -4564,9 +4564,9 @@ struct efi_memory_desc_t {
> #define _64BIT_
> #define MACHINE_TYPE "S390X"
>
> -#define PTOV(X) ((unsigned long)(X)+(machdep->kvbase))
> -#define VTOP(X) ((unsigned long)(X)-(machdep->kvbase))
> -#define IS_VMALLOC_ADDR(X) (vt->vmalloc_start && (ulong)(X) >=
vt->vmalloc_start)
> +#define PTOV(X) s390x_PTOV((ulong)(X))
> +#define VTOP(X) s390x_VTOP((ulong)(X))
> +#define IS_VMALLOC_ADDR(X) s390x_IS_VMALLOC_ADDR(X)
> #define PTRS_PER_PTE 512
> #define PTRS_PER_PMD 1024
> #define PTRS_PER_PGD 2048
> @@ -6827,7 +6827,21 @@ void get_s390_panicmsg(char *);
> * s390x.c
> */
> #ifdef S390X
> +
> +struct machine_specific
> +{
> + ulong (*virt_to_phys)(ulong vaddr);
> + ulong (*phys_to_virt)(ulong paddr);
> + int (*is_vmalloc_addr)(ulong vaddr);
> + ulong __kaslr_offset_phys;
> + ulong amode31_start;
> + ulong amode31_end;
> +};
> +
> void s390x_init(int);
> +ulong s390x_PTOV(ulong);
> +ulong s390x_VTOP(ulong);
> +int s390x_IS_VMALLOC_ADDR(ulong);
> void s390x_dump_machdep_table(ulong);
> #define display_idt_table() \
> error(FATAL, "-d option is not applicable to S390X
architecture\n")
> diff --git a/s390x.c b/s390x.c
> index 4024d84..54b4ebc 100644
> --- a/s390x.c
> +++ b/s390x.c
> @@ -47,6 +47,7 @@
> #define S390X_PSW_MASK_PSTATE 0x0001000000000000UL
>
> #define S390X_LC_VMCORE_INFO 0xe0c
> +#define S390X_LC_OS_INFO 0xe18
>
> /*
> * Flags for Region and Segment table entries.
> @@ -168,6 +169,19 @@ static struct line_number_hook s390x_line_number_hooks[];
> static int s390x_is_uvaddr(ulong, struct task_context *);
> static int s390x_get_kvaddr_ranges(struct vaddr_range *);
> static int set_s390x_max_physmem_bits(void);
> +static ulong s390x_generic_VTOP(ulong vaddr);
> +static ulong s390x_generic_PTOV(ulong paddr);
> +static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr);
> +static ulong s390x_vr_VTOP(ulong vaddr);
> +static ulong s390x_vr_PTOV(ulong paddr);
> +static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr);
> +static int s390x_vr_is_kvaddr(ulong);
> +
> +struct machine_specific s390x_machine_specific = {
> + .virt_to_phys = s390x_generic_VTOP,
> + .phys_to_virt = s390x_generic_PTOV,
> + .is_vmalloc_addr = s390x_generic_IS_VMALLOC_ADDR,
> +};
>
> /*
> * struct lowcore name (old: "_lowcore", new: "lowcore")
> @@ -546,6 +560,191 @@ static void s390x_check_kaslr(void)
> free(vmcoreinfo);
> }
>
> +#define OS_INFO_VERSION_MAJOR 1
> +#define OS_INFO_VERSION_MINOR 1
> +
> +#define OS_INFO_VMCOREINFO 0
> +#define OS_INFO_REIPL_BLOCK 1
> +#define OS_INFO_FLAGS_ENTRY 2
> +#define OS_INFO_RESERVED 3
> +#define OS_INFO_IDENTITY_BASE 4
> +#define OS_INFO_KASLR_OFFSET 5
> +#define OS_INFO_KASLR_OFF_PHYS 6
> +#define OS_INFO_VMEMMAP 7
> +#define OS_INFO_AMODE31_START 8
> +#define OS_INFO_AMODE31_END 9
> +
> +struct os_info_entry {
> + union {
> + __u64 addr;
> + __u64 val;
> + };
> + __u64 size;
> + __u32 csum;
> +} __attribute__((packed));
> +
> +struct os_info {
> + __u64 magic;
> + __u32 csum;
> + __u16 version_major;
> + __u16 version_minor;
> + __u64 crashkernel_addr;
> + __u64 crashkernel_size;
> + struct os_info_entry entry[10];
> + __u8 reserved[3864];
> +} __attribute__((packed));
> +
> +struct vm_info {
> + __u64 __identity_base;
> + __u64 __kaslr_offset;
> + __u64 __kaslr_offset_phys;
> + __u64 amode31_start;
> + __u64 amode31_end;
> +};
> +
> +static bool
> +vmcoreinfo_read_u64(const char *key, __u64 *val)
> +{
> + char *string;
> +
> + string = pc->read_vmcoreinfo(key);
> + if (string) {
> + *val = strtoul(string, NULL, 16);
> + free(string);
> + return true;
> + }
> +
> + return false;
> +}
> +
> +static bool vmcoreinfo_read_vm_info(struct vm_info *_vm_info)
> +{
> + struct vm_info vm_info;
> +
> + if (!vmcoreinfo_read_u64("IDENTITYBASE", &vm_info.__identity_base)
||
> + !vmcoreinfo_read_u64("KERNELOFFSET", &vm_info.__kaslr_offset)
||
> + !vmcoreinfo_read_u64("KERNELOFFPHYS",
&vm_info.__kaslr_offset_phys) ||
> + !vmcoreinfo_read_u64("SAMODE31", &vm_info.amode31_start) ||
> + !vmcoreinfo_read_u64("EAMODE31", &vm_info.amode31_end))
> + return false;
> +
> + *_vm_info = vm_info;
> +
> + return true;
> +}
> +
> +static bool os_info_read_vm_info(struct vm_info *vm_info)
> +{
> + struct os_info os_info;
> + ulong addr;
> +
> + if (!readmem(S390X_LC_OS_INFO, PHYSADDR, &addr,
> + sizeof(addr), "s390x os_info ptr",
> + QUIET|RETURN_ON_ERROR))
> + return false;
> +
> + if (addr == 0)
> + return true;
> +
> + if (!readmem(addr, PHYSADDR, &os_info,
> + offsetof(struct os_info, reserved), "s390x os_info header",
> + QUIET|RETURN_ON_ERROR))
> + return false;
> +
> + vm_info->__identity_base = os_info.entry[OS_INFO_IDENTITY_BASE].val;
> + vm_info->__kaslr_offset = os_info.entry[OS_INFO_KASLR_OFFSET].val;
> + vm_info->__kaslr_offset_phys = os_info.entry[OS_INFO_KASLR_OFF_PHYS].val;
> + vm_info->amode31_start = os_info.entry[OS_INFO_AMODE31_START].val;
> + vm_info->amode31_end = os_info.entry[OS_INFO_AMODE31_END].val;
> +
> + return true;
> +}
> +
> +static bool vm_info_empty(struct vm_info *vm_info)
> +{
> + return !vm_info->__kaslr_offset;
> +}
> +
> +static bool s390x_init_vm(void)
> +{
> + struct vm_info vm_info;
> +
> + if (pc->flags & PROC_KCORE) {
> + if (!vmcoreinfo_read_vm_info(&vm_info))
> + return true;
> + } else {
> + if (!os_info_read_vm_info(&vm_info))
> + return false;
> + }
> + if (vm_info_empty(&vm_info))
> + return true;
> +
> + machdep->identity_map_base = vm_info.__identity_base;
> + machdep->kvbase = vm_info.__kaslr_offset;
> + machdep->machspec->__kaslr_offset_phys = vm_info.__kaslr_offset_phys;
> + machdep->machspec->amode31_start = vm_info.amode31_start;
> + machdep->machspec->amode31_end = vm_info.amode31_end;
> +
> + machdep->is_kvaddr = s390x_vr_is_kvaddr;
> + machdep->machspec->virt_to_phys = s390x_vr_VTOP;
> + machdep->machspec->phys_to_virt = s390x_vr_PTOV;
> + machdep->machspec->is_vmalloc_addr = s390x_vr_IS_VMALLOC_ADDR;
> +
> + return true;
> +}
> +
> +static ulong s390x_generic_VTOP(ulong vaddr)
> +{
> + return vaddr - machdep->kvbase;
> +}
> +
> +static ulong s390x_generic_PTOV(ulong paddr)
> +{
> + return paddr + machdep->kvbase;
> +}
> +
> +static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr)
> +{
> + return vt->vmalloc_start && vaddr >= vt->vmalloc_start;
> +}
> +
> +static ulong s390x_vr_VTOP(ulong vaddr)
> +{
> + if (vaddr < LOWCORE_SIZE)
> + return vaddr;
> + if ((vaddr < machdep->machspec->amode31_end) &&
> + (vaddr >= machdep->machspec->amode31_start))
> + return vaddr;
> + if (vaddr < machdep->kvbase)
> + return vaddr - machdep->identity_map_base;
> + return vaddr - machdep->kvbase + machdep->machspec->__kaslr_offset_phys;
> +}
> +
> +static ulong s390x_vr_PTOV(ulong paddr)
> +{
> + return paddr + machdep->identity_map_base;
> +}
> +
> +static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr)
> +{
> + return (vaddr >= vt->vmalloc_start && vaddr <
machdep->kvbase);
> +}
> +
> +ulong s390x_VTOP(ulong vaddr)
> +{
> + return machdep->machspec->virt_to_phys(vaddr);
> +}
> +
> +ulong s390x_PTOV(ulong paddr)
> +{
> + return machdep->machspec->phys_to_virt(paddr);
> +}
> +
> +int s390x_IS_VMALLOC_ADDR(ulong vaddr)
> +{
> + return machdep->machspec->is_vmalloc_addr(vaddr);
> +}
> +
> /*
> * Do all necessary machine-specific setup here. This is called several
> * times during initialization.
> @@ -560,6 +759,7 @@ s390x_init(int when)
> machdep->process_elf_notes = s390x_process_elf_notes;
> break;
> case PRE_SYMTAB:
> + machdep->machspec = &s390x_machine_specific;
> machdep->verify_symbol = s390x_verify_symbol;
> if (pc->flags & KERNEL_DEBUG_QUERY)
> return;
> @@ -587,6 +787,8 @@ s390x_init(int when)
> machdep->kvbase = 0;
> machdep->identity_map_base = 0;
> machdep->is_kvaddr = generic_is_kvaddr;
> + if (!s390x_init_vm())
> + error(FATAL, "cannot initialize VM parameters.");
> machdep->is_uvaddr = s390x_is_uvaddr;
> machdep->eframe_search = s390x_eframe_search;
> machdep->back_trace = s390x_back_trace_cmd;
> @@ -681,7 +883,9 @@ s390x_dump_machdep_table(ulong arg)
> fprintf(fp, " dis_filter: s390x_dis_filter()\n");
> fprintf(fp, " cmd_mach: s390x_cmd_mach()\n");
> fprintf(fp, " get_smp_cpus: s390x_get_smp_cpus()\n");
> - fprintf(fp, " is_kvaddr: generic_is_kvaddr()\n");
> + fprintf(fp, " is_kvaddr: %s()\n", machdep->is_kvaddr ==
s390x_vr_is_kvaddr ?
> + "s390x_vr_is_kvaddr" :
> + "generic_is_kvaddr");
> fprintf(fp, " is_uvaddr: s390x_is_uvaddr()\n");
> fprintf(fp, " verify_paddr: generic_verify_paddr()\n");
> fprintf(fp, " get_kvaddr_ranges: s390x_get_kvaddr_ranges()\n");
> @@ -702,6 +906,12 @@ s390x_dump_machdep_table(ulong arg)
> fprintf(fp, " machspec: %lx\n",
(ulong)machdep->machspec);
> }
>
> +static int
> +s390x_vr_is_kvaddr(ulong vaddr)
> +{
> + return (vaddr < LOWCORE_SIZE) || (vaddr >= machdep->identity_map_base);
> +}
> +
> /*
> * Check if address is in context's address space
> */
8:37 p.m.
New subject: [PATCH v3 3/3] s390x: uncouple physical and virtual memory spaces
On 2023/12/11 19:28, Lianbo Jiang wrote:
On 12/11/23 14:08, HAGIO KAZUHITO(萩尾 一仁) wrote:
> On 2023/12/08 0:54, Alexander Gordeev wrote:
>> Rework VTOP and PTOV macros to reflect the future
>> uncoupling of physical and virtual address spaces
>> in kernel. Existing versions are not affected.
>>
>> Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com>
> For the series with the 3/3 v3,
>
> Acked-by: Kazuhito Hagio <k-hagio-ab(a)nec.com>
The patch set looks good to me. I tested it again and it works well on the current kernel
version.
Please go ahead, Kazu.
Good, applied.
https://github.com/crash-utility/crash/compare/c15da07...d0164e7
Thanks,
Kazu
200
days inactive
213
days old
devel@lists.crash-utility.osci.io
10 comments
3 participants
participants (3)
-
Alexander Gordeev -
HAGIO KAZUHITO(萩尾 一仁) -
Lianbo Jiang