From patchwork Tue Jun 20 12:35:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 9799369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 54A6B600F6 for ; Tue, 20 Jun 2017 12:36:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47BF0265B9 for ; Tue, 20 Jun 2017 12:36:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B48228487; Tue, 20 Jun 2017 12:36:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D50F9265B9 for ; Tue, 20 Jun 2017 12:36:45 +0000 (UTC) Received: from localhost ([::1]:48583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNIOi-0000Wx-Mi for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Jun 2017 08:36:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNIO5-0000Wi-Rg for qemu-devel@nongnu.org; Tue, 20 Jun 2017 08:36:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNIO3-0000eL-9s for qemu-devel@nongnu.org; Tue, 20 Jun 2017 08:36:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60470) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dNIO3-0000e5-4X for qemu-devel@nongnu.org; Tue, 20 Jun 2017 08:36:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB4457F6B1; Tue, 20 Jun 2017 12:36:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CB4457F6B1 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=david@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CB4457F6B1 Received: from t460s.redhat.com (ovpn-117-74.ams2.redhat.com [10.36.117.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 498C760840; Tue, 20 Jun 2017 12:35:59 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 20 Jun 2017 14:35:51 +0200 Message-Id: <20170620123553.16186-2-david@redhat.com> In-Reply-To: <20170620123553.16186-1-david@redhat.com> References: <20170620123553.16186-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 (mx1.redhat.com [10.5.110.25]); Tue, 20 Jun 2017 12:36:01 +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 Subject: [Qemu-devel] [PATCH v1 1/3] target/s390x: Indicate and check for local tlb clearing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, david@redhat.com, agraf@suse.de, Aurelien Jarno , rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Let's allow to enable it for the qemu cpu model and correctly emulate it. Signed-off-by: David Hildenbrand --- target/s390x/cpu_models.c | 1 + target/s390x/mem_helper.c | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 478bcc6..8fce957 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -685,6 +685,7 @@ static void add_qemu_cpu_model_features(S390FeatBitmap fbm) S390_FEAT_GENERAL_INSTRUCTIONS_EXT, S390_FEAT_EXECUTE_EXT, S390_FEAT_STFLE_45, + S390_FEAT_LOCAL_TLB_CLEARING, }; int i; diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 80caab9..1de0494 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1558,18 +1558,13 @@ void HELPER(ipte)(CPUS390XState *env, uint64_t pto, uint64_t vaddr, /* XXX we exploit the fact that Linux passes the exact virtual address here - it's not obliged to! */ - /* XXX: the LC bit should be considered as 0 if the local-TLB-clearing - facility is not installed. */ - if (m4 & 1) { + if (s390_has_feat(S390_FEAT_LOCAL_TLB_CLEARING) && (m4 & 1)) { tlb_flush_page(cs, page); - } else { - tlb_flush_page_all_cpus_synced(cs, page); - } - - /* XXX 31-bit hack */ - if (m4 & 1) { + /* 31 bit hack */ tlb_flush_page(cs, page ^ 0x80000000); } else { + tlb_flush_page_all_cpus_synced(cs, page); + /* 31 bit hack */ tlb_flush_page_all_cpus_synced(cs, page ^ 0x80000000); } }