From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83D48C5DF60 for ; Tue, 5 Nov 2019 19:33:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 36C3A214B2 for ; Tue, 5 Nov 2019 19:33:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="chYyqges" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 36C3A214B2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iS4aC-0000AX-GT for qemu-devel@archiver.kernel.org; Tue, 05 Nov 2019 14:33:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45296) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iS4WN-00057D-BH for qemu-devel@nongnu.org; Tue, 05 Nov 2019 14:29:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iS4WM-0008Ni-5W for qemu-devel@nongnu.org; Tue, 05 Nov 2019 14:29:43 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:47409 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iS4WM-0008KC-1Q for qemu-devel@nongnu.org; Tue, 05 Nov 2019 14:29:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572982180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ETfAqzNFymJrucM+aekentN+MwutefpQmpSwbNHOt9A=; b=chYyqgesj4Thrz6Ui2bGwrYz1gzHgN420TSvHzlYwRabqZ3uWGnYg5RhXlBcYtWVGMZaFB hCs/h2PDPA6rQc6jds53cGwPP217vCE7PpTiSVwklevkhGIs2odAqGH9fvo08DYNEufgeT Rz5KUUGG3TyccnF+bEMuoeV89x9hqjQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-dQ0mH1D0Mcmykh5LsL4I_Q-1; Tue, 05 Nov 2019 14:29:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0C711800D4A; Tue, 5 Nov 2019 19:29:37 +0000 (UTC) Received: from [10.36.116.98] (ovpn-116-98.ams2.redhat.com [10.36.116.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 496155C1BB; Tue, 5 Nov 2019 19:29:32 +0000 (UTC) Subject: Re: [PATCH] s390x: Properly fetch and test the short psw on diag308 subc 0/1 To: Janosch Frank , qemu-devel@nongnu.org References: <20191105184434.16148-1-frankja@linux.ibm.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <76ba0773-b6da-a73a-0a76-9a23f004a9b7@redhat.com> Date: Tue, 5 Nov 2019 20:29:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191105184434.16148-1-frankja@linux.ibm.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: dQ0mH1D0Mcmykh5LsL4I_Q-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: borntraeger@de.ibm.com, cohuck@redhat.com, Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 05.11.19 19:44, Janosch Frank wrote: > We need to actually fetch the cpu mask and set it after checking for > psw bit 12 instead of completely ignoring it. >=20 > Signed-off-by: Janosch Frank > --- > target/s390x/cpu.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) >=20 > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index 736a7903e2..0acba843a7 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -76,8 +76,15 @@ static bool s390_cpu_has_work(CPUState *cs) > static void s390_cpu_load_normal(CPUState *s) > { > S390CPU *cpu =3D S390_CPU(s); > - cpu->env.psw.addr =3D ldl_phys(s->as, 4) & PSW_MASK_ESA_ADDR; > - cpu->env.psw.mask =3D PSW_MASK_32 | PSW_MASK_64; > + uint64_t spsw =3D ldq_phys(s->as, 0); > + > + /* Mask out bit 12 and instruction address */ > + cpu->env.psw.mask =3D spsw & 0xfff7ffff80000000UL; > + cpu->env.psw.addr =3D spsw & 0x7fffffffUL; "set it after checking for psw bit 12" does not match your code. > + > + if (!(spsw & 0x8000000000000UL)) { > + s390_program_interrupt(&cpu->env, PGM_SPECIFICATION, 0, RA_IGNOR= ED); > + } So, this code is called from s390_machine_reset() via run_on_cpu() - so=20 not from a helper. There is no state to rewind. This feels wrong to me. In tcg_s390_program_interrupt(), we do 1. A cpu_restore_state(), which is bad with a ra of 0 2. A cpu_loop_exit(), which is bad, as we are not in the cpu loop. We *could* do here instead /* This code is not called from the CPU loop, but via run_on_cpu() */ if (tcg_enabled()) { /* * HW injects a PGM exception with ILC 0. We won't rewind. */ env->int_pgm_ilen =3D 2; trigger_pgm_exception(&cpu->env, PGM_SPECIFICATION); } else { kvm_s390_program_interrupt(env_archcpu(&cpu->env), PGM_SPECIFICATION); } BUT I do wonder if we should actually get a PGM_SPECIFICATION for the=20 *diag* instruction, not on the boot CPU. I think you should check +=20 inject inside handle_diag_308() instead. Then that complicated handling=20 is gone. --=20 Thanks, David / dhildenb