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.2 required=3.0 tests=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 49527C432C2 for ; Thu, 26 Sep 2019 08:08:29 +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 1C2FC222BE for ; Thu, 26 Sep 2019 08:08:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C2FC222BE 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]:60638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDOp9-0002DG-8D for qemu-devel@archiver.kernel.org; Thu, 26 Sep 2019 04:08:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38674) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDOoO-0001bq-SE for qemu-devel@nongnu.org; Thu, 26 Sep 2019 04:07:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDOoM-0006pJ-JZ for qemu-devel@nongnu.org; Thu, 26 Sep 2019 04:07:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51194) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDOoM-0006oK-BP; Thu, 26 Sep 2019 04:07:38 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC55C18C4272; Thu, 26 Sep 2019 08:07:35 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-127.ams2.redhat.com [10.36.116.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 410B519C5B; Thu, 26 Sep 2019 08:07:31 +0000 (UTC) Subject: Re: [PATCH v2 6/7] s390x/mmu: DAT table definition overhaul To: David Hildenbrand , qemu-devel@nongnu.org References: <20190925125236.4043-1-david@redhat.com> <20190925125236.4043-7-david@redhat.com> <5b625047-0c9c-b074-ccef-a0d8d96ef0f0@redhat.com> <9c8c8539-742e-7960-1ba4-d5dc34a24a08@redhat.com> From: Thomas Huth Openpgp: preference=signencrypt Autocrypt: addr=thuth@redhat.com; prefer-encrypt=mutual; keydata= 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 Organization: Red Hat Message-ID: <7f46ba66-041e-9511-1aa4-67c618bc3f0c@redhat.com> Date: Thu, 26 Sep 2019 10:07:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <9c8c8539-742e-7960-1ba4-d5dc34a24a08@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Thu, 26 Sep 2019 08:07:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: Janosch Frank , Cornelia Huck , 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" On 26/09/2019 09.59, David Hildenbrand wrote: > On 26.09.19 09:52, Thomas Huth wrote: >> On 26/09/2019 09.38, David Hildenbrand wrote: >>> On 26.09.19 09:35, Thomas Huth wrote: >>>> On 25/09/2019 14.52, David Hildenbrand wrote: >>>>> Let's use consitent names for the region/section/page table entries and >>>>> for the macros to extract relevant parts from virtual address. Make them >>>>> match the definitions in the PoP - e.g., how the televant bits are actually >>>> >>>> s/televant/relevant/ >>>> >>>>> called. >>>>> >>>>> Introduce defines for all bits declared in the PoP. This will come in >>>>> handy in follow-up patches. >>>>> >>>>> Signed-off-by: David Hildenbrand >>>>> --- >>>>> target/s390x/cpu.h | 77 +++++++++++++++++++++++++++++---------- >>>>> target/s390x/mem_helper.c | 12 +++--- >>>>> target/s390x/mmu_helper.c | 37 ++++++++++--------- >>>>> 3 files changed, 83 insertions(+), 43 deletions(-) >>>>> >>>>> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h >>>>> index 163dae13d7..e74a809257 100644 >>>>> --- a/target/s390x/cpu.h >>>>> +++ b/target/s390x/cpu.h >>>>> @@ -558,26 +558,63 @@ QEMU_BUILD_BUG_ON(sizeof(SysIB) != 4096); >>>>> #define ASCE_TYPE_SEGMENT 0x00 /* segment table type */ >>>>> #define ASCE_TABLE_LENGTH 0x03 /* region table length */ >>>>> >>>>> -#define REGION_ENTRY_ORIGIN (~0xfffULL) /* region/segment table origin */ >>>>> -#define REGION_ENTRY_RO 0x200 /* region/segment protection bit */ >>>>> -#define REGION_ENTRY_TF 0xc0 /* region/segment table offset */ >>>>> -#define REGION_ENTRY_INV 0x20 /* invalid region table entry */ >>>>> -#define REGION_ENTRY_TYPE_MASK 0x0c /* region/segment table type mask */ >>>>> -#define REGION_ENTRY_TYPE_R1 0x0c /* region first table type */ >>>>> -#define REGION_ENTRY_TYPE_R2 0x08 /* region second table type */ >>>>> -#define REGION_ENTRY_TYPE_R3 0x04 /* region third table type */ >>>>> -#define REGION_ENTRY_LENGTH 0x03 /* region third length */ >>>>> - >>>>> -#define SEGMENT_ENTRY_ORIGIN (~0x7ffULL) /* segment table origin */ >>>>> -#define SEGMENT_ENTRY_FC 0x400 /* format control */ >>>>> -#define SEGMENT_ENTRY_RO 0x200 /* page protection bit */ >>>>> -#define SEGMENT_ENTRY_INV 0x20 /* invalid segment table entry */ >>>>> - >>>>> -#define VADDR_PX 0xff000 /* page index bits */ >>>>> - >>>>> -#define PAGE_RO 0x200 /* HW read-only bit */ >>>>> -#define PAGE_INVALID 0x400 /* HW invalid bit */ >>>>> -#define PAGE_RES0 0x800 /* bit must be zero */ >>>>> +#define REGION_ENTRY_ORIGIN 0xfffffffffffff000ULL >>>>> +#define REGION_ENTRY_P 0x0000000000000200ULL >>>>> +#define REGION_ENTRY_TF 0x00000000000000c0ULL >>>>> +#define REGION_ENTRY_I 0x0000000000000020ULL >>>>> +#define REGION_ENTRY_TT 0x000000000000000cULL >>>>> +#define REGION_ENTRY_TL 0x0000000000000003ULL >>>> >>>> Any chance that you could keep the comments after the definitions? I >>>> think they are useful for people who are not 100% familiar with the DAT >>>> on s390x. >>> >>> I thought about that, but do we expect people that don't have a clue >>> about s390x DAT and don't compare the code against the PoP to understand >>> our DAT translation just by comments on defines? >> >> I'm not sure that everybody is aware of the PoP ... maybe you could just >> put a comment in front of the block a la: >> >> /* >> * For details on the following definitions, see the "Dynamic Address >> * Translation" section in chapter 3 of the "z/Architecture Principles >> * of Operations - SA22-7832-11" >> */ >> > > We also have the PSW/PGM/PER definitions in there without such a note. > What about something generic as: > > diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h > index e74a809257..690b94c8ea 100644 > --- a/target/s390x/cpu.h > +++ b/target/s390x/cpu.h > @@ -1,6 +1,10 @@ > /* > * S/390 virtual CPU header > * > + * For details on the s390x architecture and used definitions (e.g., > + * PSW, PER and DAT (Dynamic Address Translation)), please refer to > + * the "z/Architecture Principles of Operations" - a.k.a. PoP. > + * Fine for me, too. Thomas