From nobody Fri May 17 10:44:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614778264; cv=none; d=zohomail.com; s=zohoarc; b=SLR6Y9AIU5qDrnRT/DKM7FRE4/1vm+c+OzN96wOniwOBv0s/5yo8CVaDcmojjDjRPpf40KbdzZay2wqNX26PaGR5PveFZJ731g5VlX1KDfYa5Pf8y91SYY0pXZgpsxcC3AxD9RQkMhOs+nyYK7BXxjk5N9LxnqFnSHrLsiaLczY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614778264; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=eHIoHfkL76q6vJt4KueDoCJ+zgUnQsh8bkFqq0hVvCo=; b=kkZqmw5fTm5sVVNPOM6kZ0I6yBtuNamqQjCnxyw9RVGBrJj8JDs9+SotY1GrcAOkngnF40IxWF0PTnIQHTWgBj+he9NmayH0kQ3W/j+7MWAsRg33pUxT4AV8jRY7tthiJzJlE0Dz/2wVfuq55ye9LkDwk/biyYLu/S2JNarQU38= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614778264177585.8656283446619; Wed, 3 Mar 2021 05:31:04 -0800 (PST) Received: from localhost ([::1]:45722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHRaf-0002ks-QT for importer@patchew.org; Wed, 03 Mar 2021 08:31:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHRZ1-0002Gw-MP for qemu-devel@nongnu.org; Wed, 03 Mar 2021 08:29:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lHRYr-000323-6g for qemu-devel@nongnu.org; Wed, 03 Mar 2021 08:29:18 -0500 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-244-ofGklVTGMHuX62UiOQBqLQ-1; Wed, 03 Mar 2021 08:29:02 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23CEA189C448; Wed, 3 Mar 2021 13:29:01 +0000 (UTC) Received: from thuth.com (ovpn-115-146.ams2.redhat.com [10.36.115.146]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B2E1100239A; Wed, 3 Mar 2021 13:28:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614778147; 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; bh=eHIoHfkL76q6vJt4KueDoCJ+zgUnQsh8bkFqq0hVvCo=; b=X/4Rd42HtnjQqktDuCpleL+dmGajX5fhqURsz1poZUkbiqWB8PG51GX/Dq6yylIJUm3ZVU 5I566Fj18oyT1ToKxCu1Nh6rJzLzSiQZG0/EeRoqPJ/63gqYqhJMUZGFlEyZ0/7KpbrXgv T9W5g5FPJKwFtLPrCTI/pSGiD+D5SNc= X-MC-Unique: ofGklVTGMHuX62UiOQBqLQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, David Hildenbrand Subject: [PATCH v4] target/s390x: Implement the MVPG condition-code-option bit Date: Wed, 3 Mar 2021 14:28:50 +0100 Message-Id: <20210303132850.459687-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: Claudio Imbrenda , qemu-s390x@nongnu.org, Cornelia Huck , Richard Henderson , Janosch Frank Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Richard Henderson If the CCO bit is set, MVPG should not generate an exception but report page translation faults via a CC code. Create a new helper, access_prepare_nf, which can use probe_access_flags in non-faulting mode, and then handle watchpoints. Signed-off-by: Richard Henderson [thuth: Added logic to still inject protection exceptions] Signed-off-by: Thomas Huth --- v4: Add logic to inject protection exceptions if necessary target/s390x/cpu.h | 3 ++ target/s390x/excp_helper.c | 3 ++ target/s390x/mem_helper.c | 93 ++++++++++++++++++++++++++++---------- 3 files changed, 76 insertions(+), 23 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 60d434d5ed..825503c6c0 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -114,6 +114,9 @@ struct CPUS390XState { =20 uint64_t diag318_info; =20 + uint64_t tlb_fill_tec; /* translation exception code during tlb_fill= */ + int tlb_fill_exc; /* exception number seen during tlb_fill */ + /* Fields up to this point are cleared by a CPU reset */ struct {} end_reset_fields; =20 diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index ce16af394b..c48cd6b46f 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -164,6 +164,9 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int= size, tec =3D 0; /* unused */ } =20 + env->tlb_fill_exc =3D excp; + env->tlb_fill_tec =3D tec; + if (!excp) { qemu_log_mask(CPU_LOG_MMU, "%s: set tlb %" PRIx64 " -> %" PRIx64 " (%x)\n", diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 25cfede806..cf741541d3 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -130,28 +130,62 @@ typedef struct S390Access { int mmu_idx; } S390Access; =20 +static bool access_prepare_nf(S390Access *access, CPUS390XState *env, + bool nofault, vaddr vaddr1, int size, + MMUAccessType access_type, + int mmu_idx, uintptr_t ra) +{ + void *haddr1, *haddr2 =3D NULL; + int size1, size2; + vaddr vaddr2 =3D 0; + int flags; + + assert(size > 0 && size <=3D 4096); + + size1 =3D MIN(size, -(vaddr1 | TARGET_PAGE_MASK)), + size2 =3D size - size1; + + flags =3D probe_access_flags(env, vaddr1, access_type, mmu_idx, + nofault, &haddr1, ra); + if (unlikely(size2)) { + /* The access crosses page boundaries. */ + vaddr2 =3D wrap_address(env, vaddr1 + size1); + flags |=3D probe_access_flags(env, vaddr2, access_type, mmu_idx, + nofault, &haddr2, ra); + } + + if (unlikely(flags & TLB_INVALID_MASK)) { + return false; + } + if (unlikely(flags & TLB_WATCHPOINT)) { + /* S390 does not presently use transaction attributes. */ + cpu_check_watchpoint(env_cpu(env), vaddr1, size, + MEMTXATTRS_UNSPECIFIED, + (access_type =3D=3D MMU_DATA_STORE + ? BP_MEM_WRITE : BP_MEM_READ), ra); + } + + *access =3D (S390Access) { + .vaddr1 =3D vaddr1, + .vaddr2 =3D vaddr2, + .haddr1 =3D haddr1, + .haddr2 =3D haddr2, + .size1 =3D size1, + .size2 =3D size2, + .mmu_idx =3D mmu_idx + }; + return true; +} + static S390Access access_prepare(CPUS390XState *env, vaddr vaddr, int size, MMUAccessType access_type, int mmu_idx, uintptr_t ra) { - S390Access access =3D { - .vaddr1 =3D vaddr, - .size1 =3D MIN(size, -(vaddr | TARGET_PAGE_MASK)), - .mmu_idx =3D mmu_idx, - }; - - g_assert(size > 0 && size <=3D 4096); - access.haddr1 =3D probe_access(env, access.vaddr1, access.size1, acces= s_type, - mmu_idx, ra); - - if (unlikely(access.size1 !=3D size)) { - /* The access crosses page boundaries. */ - access.vaddr2 =3D wrap_address(env, vaddr + access.size1); - access.size2 =3D size - access.size1; - access.haddr2 =3D probe_access(env, access.vaddr2, access.size2, - access_type, mmu_idx, ra); - } - return access; + S390Access ret; + bool ok =3D access_prepare_nf(&ret, env, false, vaddr, size, + access_type, mmu_idx, ra); + assert(ok); + return ret; } =20 /* Helper to handle memset on a single page. */ @@ -845,8 +879,10 @@ uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0,= uint64_t r1, uint64_t r2) const int mmu_idx =3D cpu_mmu_index(env, false); const bool f =3D extract64(r0, 11, 1); const bool s =3D extract64(r0, 10, 1); + const bool cco =3D extract64(r0, 8, 1); uintptr_t ra =3D GETPC(); S390Access srca, desta; + bool ok; =20 if ((f && s) || extract64(r0, 12, 4)) { tcg_s390_program_interrupt(env, PGM_SPECIFICATION, GETPC()); @@ -858,13 +894,24 @@ uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0= , uint64_t r1, uint64_t r2) /* * TODO: * - Access key handling - * - CC-option with surpression of page-translation exceptions * - Store r1/r2 register identifiers at real location 162 */ - srca =3D access_prepare(env, r2, TARGET_PAGE_SIZE, MMU_DATA_LOAD, mmu_= idx, - ra); - desta =3D access_prepare(env, r1, TARGET_PAGE_SIZE, MMU_DATA_STORE, mm= u_idx, - ra); + ok =3D access_prepare_nf(&srca, env, cco, r2, TARGET_PAGE_SIZE, + MMU_DATA_LOAD, mmu_idx, ra); + if (!ok) { + return 2; + } + ok =3D access_prepare_nf(&desta, env, cco, r1, TARGET_PAGE_SIZE, + MMU_DATA_STORE, mmu_idx, ra); + if (!ok) { + if (env->tlb_fill_exc =3D=3D PGM_PROTECTION) { + stq_phys(env_cpu(env)->as, + env->psa + offsetof(LowCore, trans_exc_code), + env->tlb_fill_tec); + tcg_s390_program_interrupt(env, PGM_PROTECTION, ra); + } + return 1; + } access_memmove(env, &desta, &srca, ra); return 0; /* data moved */ } --=20 2.27.0