vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/s390x: Return exception from translate_pages 

Do not raise the exception directly within translate_pages,
but pass it back so that caller may do so.

Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20191001171614.8405-11-richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
master
Richard Henderson 2019-10-01 10:16:06 -07:00 committed by David Hildenbrand
parent ce7ac79d28
commit a79d225335
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/s390x/mmu_helper.c
View File

@ -451,25 +451,22 @@ nodat:
* the MEMOP interface. * the MEMOP interface.
*/ */
static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages, static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages,
target_ulong *pages, bool is_write) target_ulong *pages, bool is_write, uint64_t *tec)
{ {
uint64_t asc = cpu->env.psw.mask & PSW_MASK_ASC; uint64_t asc = cpu->env.psw.mask & PSW_MASK_ASC;
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
int ret, i, pflags; int ret, i, pflags;
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
uint64_t tec; ret = mmu_translate(env, addr, is_write, asc, &pages[i], &pflags, tec);
ret = mmu_translate(env, addr, is_write, asc, &pages[i], &pflags, &tec);
if (ret) { if (ret) {
trigger_access_exception(env, ret, ILEN_AUTO, tec); return ret;
return -EFAULT;
} }
if (!address_space_access_valid(&address_space_memory, pages[i], if (!address_space_access_valid(&address_space_memory, pages[i],
TARGET_PAGE_SIZE, is_write, TARGET_PAGE_SIZE, is_write,
MEMTXATTRS_UNSPECIFIED)) { MEMTXATTRS_UNSPECIFIED)) {
trigger_access_exception(env, PGM_ADDRESSING, ILEN_AUTO, 0); *tec = 0; /* unused */
return -EFAULT; return PGM_ADDRESSING;
} }
addr += TARGET_PAGE_SIZE; addr += TARGET_PAGE_SIZE;
} }
@ -497,6 +494,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,
{ {
int currlen, nr_pages, i; int currlen, nr_pages, i;
target_ulong *pages; target_ulong *pages;
uint64_t tec;
int ret; int ret;
if (kvm_enabled()) { if (kvm_enabled()) {
@ -510,8 +508,10 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,
+ 1; + 1;
pages = g_malloc(nr_pages * sizeof(*pages)); pages = g_malloc(nr_pages * sizeof(*pages));
ret = translate_pages(cpu, laddr, nr_pages, pages, is_write); ret = translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec);
if (ret == 0 && hostbuf != NULL) { if (ret) {
trigger_access_exception(&cpu->env, ret, ILEN_AUTO, tec);
} else if (hostbuf != NULL) {
/* Copy data by stepping through the area page by page */ /* Copy data by stepping through the area page by page */
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
currlen = MIN(len, TARGET_PAGE_SIZE - (laddr % TARGET_PAGE_SIZE)); currlen = MIN(len, TARGET_PAGE_SIZE - (laddr % TARGET_PAGE_SIZE));