{"id":818780,"url":"http://patchwork.ozlabs.org/api/patches/818780/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170926183318.12995-7-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170926183318.12995-7-david@redhat.com>","list_archive_url":null,"date":"2017-09-26T18:33:18","name":"[v1,6/6] s390x/tcg: make idte/ipte use the new _real mmu","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"55db58b8deaa58d3be892b99ad7353bd6f8195dd","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170926183318.12995-7-david@redhat.com/mbox/","series":[{"id":5209,"url":"http://patchwork.ozlabs.org/api/series/5209/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5209","date":"2017-09-26T18:33:12","name":"s390x/tcg: fix some accesses using low address","version":1,"mbox":"http://patchwork.ozlabs.org/series/5209/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818780/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818780/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y1qW72QT7z9sP1\n\tfor ;\n\tWed, 27 Sep 2017 04:39:47 +1000 (AEST)","from localhost ([::1]:50692 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dwull-0000Dy-Ej\n\tfor incoming@patchwork.ozlabs.org; Tue, 26 Sep 2017 14:39:45 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:45207)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dwufs-0004Wm-BN\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 14:33:43 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dwufr-0003Vj-Je\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 14:33:40 -0400","from mx1.redhat.com ([209.132.183.28]:53750)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dwufr-0003VH-E1\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 14:33:39 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 734375AFED;\n\tTue, 26 Sep 2017 18:33:38 +0000 (UTC)","from t460s.redhat.com (ovpn-117-152.ams2.redhat.com\n\t[10.36.117.152])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id B25CD17F29;\n\tTue, 26 Sep 2017 18:33:36 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 734375AFED","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Tue, 26 Sep 2017 20:33:18 +0200","Message-Id":"<20170926183318.12995-7-david@redhat.com>","In-Reply-To":"<20170926183318.12995-1-david@redhat.com>","References":"<20170926183318.12995-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tTue, 26 Sep 2017 18:33:38 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v1 6/6] s390x/tcg: make idte/ipte use the new\n\t_real mmu","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, David Hildenbrand , cohuck@redhat.com,\n\tAlexander Graf ,\n\tChristian Borntraeger ,\n\tRichard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We don't wrap addresses in the mmu for the _real case, therefore the\nbehavior should be unchanged.\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/mem_helper.c | 9 +++++----\n 1 file changed, 5 insertions(+), 4 deletions(-)","diff":"diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c\nindex 4cf4f29171..010f509ac5 100644\n--- a/target/s390x/mem_helper.c\n+++ b/target/s390x/mem_helper.c\n@@ -1889,11 +1889,11 @@ void HELPER(idte)(CPUS390XState *env, uint64_t r1, uint64_t r2, uint32_t m4)\n for (i = 0; i < entries; i++) {\n /* addresses are not wrapped in 24/31bit mode but table index is */\n raddr = table + ((index + i) & 0x7ff) * sizeof(entry);\n- entry = ldq_phys(cs->as, raddr);\n+ entry = cpu_ldq_real_ra(env, raddr, ra);\n if (!(entry & _REGION_ENTRY_INV)) {\n /* we are allowed to not store if already invalid */\n entry |= _REGION_ENTRY_INV;\n- stq_phys(cs->as, raddr, entry);\n+ cpu_stq_real_ra(env, raddr, entry, ra);\n }\n }\n }\n@@ -1911,6 +1911,7 @@ void HELPER(ipte)(CPUS390XState *env, uint64_t pto, uint64_t vaddr,\n uint32_t m4)\n {\n CPUState *cs = CPU(s390_env_get_cpu(env));\n+ const uintptr_t ra = GETPC();\n uint64_t page = vaddr & TARGET_PAGE_MASK;\n uint64_t pte_addr, pte;\n \n@@ -1919,9 +1920,9 @@ void HELPER(ipte)(CPUS390XState *env, uint64_t pto, uint64_t vaddr,\n pte_addr += (vaddr & VADDR_PX) >> 9;\n \n /* Mark the page table entry as invalid */\n- pte = ldq_phys(cs->as, pte_addr);\n+ pte = cpu_ldq_real_ra(env, pte_addr, ra);\n pte |= _PAGE_INVALID;\n- stq_phys(cs->as, pte_addr, pte);\n+ cpu_stq_real_ra(env, pte_addr, pte, ra);\n \n /* XXX we exploit the fact that Linux passes the exact virtual\n address here - it's not obliged to! */\n","prefixes":["v1","6/6"]}