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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 07A66C0650F for ; Mon, 5 Aug 2019 15:34:33 +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 CBD4D21734 for ; Mon, 5 Aug 2019 15:34:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBD4D21734 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]:54984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huf0J-00085d-Ug for qemu-devel@archiver.kernel.org; Mon, 05 Aug 2019 11:34:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52274) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huewl-0003u7-DP for qemu-devel@nongnu.org; Mon, 05 Aug 2019 11:30:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1huewj-0000wx-Bm for qemu-devel@nongnu.org; Mon, 05 Aug 2019 11:30:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59926) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1huewj-0000w9-40; Mon, 05 Aug 2019 11:30:49 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8975585537; Mon, 5 Aug 2019 15:30:47 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35AF0BABB; Mon, 5 Aug 2019 15:30:38 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 5 Aug 2019 17:29:45 +0200 Message-Id: <20190805152947.28536-8-david@redhat.com> In-Reply-To: <20190805152947.28536-1-david@redhat.com> References: <20190805152947.28536-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 05 Aug 2019 15:30:47 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.2 v1 7/9] s390x/mmu: Implement Instruction-Execution-Protection Facility 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: Thomas Huth , Janosch Frank , David Hildenbrand , Cornelia Huck , Ilya Leoshkevich , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" IEP support in the mmu is fairly easy. Set the right permissions for TLB entries and properly report an exception. Make sure to handle EDAT-2 by setting bit 56/60/61 of the TEID (TEC) to the right values. Signed-off-by: David Hildenbrand --- target/s390x/cpu.h | 1 + target/s390x/mmu_helper.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 1ff14250bd..9a8318b3aa 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -311,6 +311,7 @@ extern const struct VMStateDescription vmstate_s390_c= pu; #define CR0_EDAT 0x0000000000800000ULL #define CR0_AFP 0x0000000000040000ULL #define CR0_VECTOR 0x0000000000020000ULL +#define CR0_IEP 0x0000000000100000ULL #define CR0_EMERGENCY_SIGNAL_SC 0x0000000000004000ULL #define CR0_EXTERNAL_CALL_SC 0x0000000000002000ULL #define CR0_CKC_SC 0x0000000000000800ULL diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 631cc29c28..83e241c430 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -140,6 +140,8 @@ static int mmu_translate_asce(CPUS390XState *env, tar= get_ulong vaddr, const bool edat1 =3D (env->cregs[0] & CR0_EDAT) && s390_has_feat(S390_FEAT_EDAT); const bool edat2 =3D edat1 && s390_has_feat(S390_FEAT_EDAT_2); + const bool iep =3D (env->cregs[0] & CR0_IEP) && + s390_has_feat(S390_FEAT_INSTRUCTION_EXEC_PROT); const int asce_tl =3D asce & ASCE_TABLE_LENGTH; const int asce_p =3D asce & ASCE_PRIVATE_SPACE; hwaddr gaddr =3D asce & ASCE_ORIGIN; @@ -242,6 +244,9 @@ static int mmu_translate_asce(CPUS390XState *env, tar= get_ulong vaddr, *flags &=3D ~PAGE_WRITE; } if (edat2 && (entry & REGION3_ENTRY_FC)) { + if (iep && (entry & REGION3_ENTRY_IEP)) { + *flags &=3D ~PAGE_EXEC; + } *raddr =3D entry & REGION3_ENTRY_RFAA; return 0; } @@ -268,6 +273,9 @@ static int mmu_translate_asce(CPUS390XState *env, tar= get_ulong vaddr, *flags &=3D ~PAGE_WRITE; } if (edat1 && (entry & SEGMENT_ENTRY_FC)) { + if (iep && (entry & SEGMENT_ENTRY_IEP)) { + *flags &=3D ~PAGE_EXEC; + } *raddr =3D entry & SEGMENT_ENTRY_SFAA; return 0; } @@ -287,6 +295,9 @@ static int mmu_translate_asce(CPUS390XState *env, tar= get_ulong vaddr, if (entry & PAGE_ENTRY_P) { *flags &=3D ~PAGE_WRITE; } + if (iep && (entry & PAGE_ENTRY_IEP)) { + *flags &=3D ~PAGE_EXEC; + } =20 *raddr =3D entry & TARGET_PAGE_MASK; return 0; @@ -386,6 +397,16 @@ int mmu_translate(CPUS390XState *env, target_ulong v= addr, int rw, uint64_t asc, return -1; } =20 + /* check for Instruction-Execution-Protection */ + if (rw =3D=3D MMU_INST_FETCH && !(*flags & PAGE_EXEC)) { + if (exc) { + /* IEP sets bit 56 and 61 */ + tec |=3D 0x84; + trigger_access_exception(env, PGM_PROTECTION, ilen, tec); + } + return -1; + } + nodat: /* Convert real address -> absolute address */ *raddr =3D mmu_real2abs(env, *raddr); --=20 2.21.0