On Thu, 30 Nov 2017 12:57:00 +0100 David Hildenbrand <da...@redhat.com> wrote:
> On 30.11.2017 12:39, Thomas Huth wrote: > > On 29.11.2017 21:26, David Hildenbrand wrote: > >> s390_cpu_virt_mem_rw() must always return, so callers can react on > >> an exception (e.g. see ioinst_handle_stcrw()). > >> > >> Therefore, using program_interrupt() is wrong. Fix that up. > >> > >> Signed-off-by: David Hildenbrand <da...@redhat.com> > >> --- > >> target/s390x/mmu_helper.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c > >> index dbe2f511f8..2c7f3d7d95 100644 > >> --- a/target/s390x/mmu_helper.c > >> +++ b/target/s390x/mmu_helper.c > >> @@ -459,7 +459,7 @@ static int translate_pages(S390CPU *cpu, vaddr addr, > >> int nr_pages, > >> } > >> if (!address_space_access_valid(&address_space_memory, pages[i], > >> TARGET_PAGE_SIZE, is_write)) { > >> - program_interrupt(env, PGM_ADDRESSING, ILEN_AUTO); > >> + trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_AUTO); > >> return -EFAULT; > >> } > >> addr += TARGET_PAGE_SIZE; > > > > Is that still right when running with KVM? I think the exception will > > then silently be ignored instead? > > Good point (for older KVM). And ugly. > > if (kvm_enabled()) { > kvm_s390_program_interrupt... > } else { > trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_AUTO); > } Maybe add a comment that this is only for old kernels that do not support the mem op interface?