From patchwork Tue Mar 12 16:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1055541 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="CTvXRIeL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgmY5dwMz9s5c for ; Wed, 13 Mar 2019 03:44:28 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kVq-0001iY-8w for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:44:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7w-0006Dy-Ct for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7t-00049R-Ao for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:38 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:38005) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7o-0003xo-R1 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:33 -0400 Received: by mail-pf1-x435.google.com with SMTP id n125so2181808pfn.5 for ; Tue, 12 Mar 2019 09:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2oD8fcQwkAapZc8IcOr4/np/dBqn/2xhFjzyXT52fTs=; b=CTvXRIeLsfs81PpQAdWj4P1Aa7labYqT+COeYWBXY0s6GCHSw1FAawrWBXkC/2SFC9 3QwoUxBUg/Ds/cNzBN+rfBZhXy0VHBTVRJM5/0t75tnnKa4It7NembMx5G+1GBlFm57N SaCKq3YftJcfEAc4fdwKScUPLiPIK3RF9cMs4xyqQNUtcTYNK1yq4ZQeBM30FDeRWBl/ Vly7o8BPVkjiDf7KIJBNTsUnjkfzF2vtl1uT/btiQ5fuNfVoeHibCoL6RqR4KCL/LEFN iOnaLvK7fL5hf46FsA2OrqiA6q2pyu1z3HCPzoLsCmgU8xoIWXTQGYNLgXqw6MWLhi/y WxbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2oD8fcQwkAapZc8IcOr4/np/dBqn/2xhFjzyXT52fTs=; b=PDlUUKv2IG9+MhMyeitn2IM+87tWkKqqB57SKr/HKBJbkg/vgaUx1pDL79nruL7o+x u0N0rNhwD5/wDds42pLsyVlOJgAzt8sGS4qFGJNybLHfgIxO2bDjH27fb6Lh3W1iwNWk RxbkDlI99Rr5CdK4JJ2+3386r1wlr624ff2q03zGyJNlmnynq5CRHE8MMiz/SgOSS46E mO6Qo0Dbzo7zjEksXXRxmxR3z2lXEehxL3Yx1ANoHNYwTYysC6M08CiagWHKGu+dfGMY bnjIu2/EKUOFRYjuvFeQ1grOBMS4znj+DAonpqhKPL6dik3LdzZ601BAs92nkSV9xZ+d zPBg== X-Gm-Message-State: APjAAAUTy5cTt2OhmB+FVd4nCU8626CI0kmpjXn/WZvTFHwEKEpE+J0y goRvhbrYEGs+0yfFQlyc3LsP2Nfigg0= X-Google-Smtp-Source: APXvYqzKL5HHFiGiBV+HKlGvXwJvxo/e9bKzqiy5t50FWcUorFcmp6cCt/eHjRZ6zEU3oUN+1FA8/A== X-Received: by 2002:a62:564d:: with SMTP id k74mr39089255pfb.19.1552407562269; Tue, 12 Mar 2019 09:19:22 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:19:04 -0700 Message-Id: <20190312161904.31130-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::435 Subject: [Qemu-devel] [PULL 11/11] target/hppa: exit TB if either Data or Instruction TLB changes 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: peter.maydell@linaro.org, Sven Schnelle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle The current code assumes that we don't need to exit the TB if a Data Cache Flush or Insert has happend. However, as we have a shared Data/Instruction TLB, a Data cache flush also flushes Instruction TLB entries, and a Data cache TLB insert might also evict a Instruction TLB entry. So exit the TB in all cases if Instruction translation is enabled. Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-11-svens@stackframe.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- target/hppa/translate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 70a7cd4a89..35c504087f 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2482,9 +2482,8 @@ static bool trans_ixtlbx(DisasContext *ctx, arg_ixtlbx *a) gen_helper_itlbp(cpu_env, addr, reg); } - /* Exit TB for ITLB change if mmu is enabled. This *should* not be - the case, since the OS TLB fill handler runs with mmu disabled. */ - if (!a->data && (ctx->tb_flags & PSW_C)) { + /* Exit TB for TLB change if mmu is enabled. */ + if (ctx->tb_flags & PSW_C) { ctx->base.is_jmp = DISAS_IAQ_N_STALE; } return nullify_end(ctx); @@ -2511,7 +2510,7 @@ static bool trans_pxtlbx(DisasContext *ctx, arg_pxtlbx *a) } /* Exit TB for TLB change if mmu is enabled. */ - if (!a->data && (ctx->tb_flags & PSW_C)) { + if (ctx->tb_flags & PSW_C) { ctx->base.is_jmp = DISAS_IAQ_N_STALE; } return nullify_end(ctx);