From patchwork Tue Feb 5 17:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10797903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BDBFD922 for ; Tue, 5 Feb 2019 17:40:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE3712C62B for ; Tue, 5 Feb 2019 17:40:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9922A2C6FF; Tue, 5 Feb 2019 17:40:07 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7CDE02C62B for ; Tue, 5 Feb 2019 17:40:06 +0000 (UTC) Received: from localhost ([127.0.0.1]:35716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr4hZ-0005KU-NZ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Feb 2019 12:40:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr4AT-0001ua-TH for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr4AR-0000Yp-Bd for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:53 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46429) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr4AR-0000KW-32 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:51 -0500 Received: by mail-wr1-x441.google.com with SMTP id l9so4402816wrt.13 for ; Tue, 05 Feb 2019 09:05:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=H88QF3tD3acCANsnTz/zX9Jk/GgtG49XYl3KKrNDbuU=; b=WBHgh3t45YMGmdtvXmMH9THaQ3NKbSXSi9mnvGOJMR1I9Iqq9ROFJSuFfKylB+J04K 3Ou7jS1LPtR0/YXvSE62RWqtspUU9/xkzHt9bj/wBacHRjHu1JmLtZluIPgHbwXJ2ODg xErw3Yzm6N7eZAPuZE7SHgT7CrR3e1X/yUBHFDdlLsMUe7dEx9scy6G2+Vu8UOA9iMZP jVFYoy1cXsRfPN0EozqZdC1CEj+MqX7XedJEoxZXkzpRBcUMr4YbxLyZkBR3rYKqiI6g hmUqwvW1Jd56ypPOy9mz9Qn3dLCqwv+QlbDhXtFcX+pE14O1LduKVk1pv1i+2HupWyXj bevg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H88QF3tD3acCANsnTz/zX9Jk/GgtG49XYl3KKrNDbuU=; b=GakDhKBHZ5r1ZP4MDM1aQYNWpnVPlM4uQXuwG15Cak1hHfKLxjM0EzeFapsVRCboZg Oxpfg6pAyW6IAO6+5yAAWDroKdvj/RR/uS5j1mCox5xk0fZFiAshs4WC8WuXSJdi8nBz QfUHkld4OHING4l21LHh6f4o25WL9rhMgzar1VHnERXwBTyAAbga0zZhtDWOEE6N0Hto dZYgwyowV5Z0zslFK2EOyfQyuqnQ726p3QYyPTW71dkV41Bv3kIZOb6PpSQzsNKsK3Tb p7ZZiuq8xDlcDPOrY1P4FJybuyAgez9RDdbp9fbhYhP5tfOevXswIuelI3ZCeEpZlwlM ZfDQ== X-Gm-Message-State: AHQUAuYDswJ8ccOGPhA/ya9F51PRRxmyBhl/uvpi8xYqi5tQs3vTgrca eVnrmzrIYP+M7mCsv/aJHUCdLuI7bwXlBw== X-Google-Smtp-Source: AHgI3IYhpyV8Vj6+JgyA2ms/Jh3UnMhVbKNC3OH1UH4U967Zt5GekZT7E3MesgFNMdzrX6xSdAP5ng== X-Received: by 2002:adf:f009:: with SMTP id j9mr4384605wro.170.1549386320198; Tue, 05 Feb 2019 09:05:20 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm5583164wmf.5.2019.02.05.09.05.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 09:05:19 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 17:04:53 +0000 Message-Id: <20190205170510.21984-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205170510.21984-1-peter.maydell@linaro.org> References: <20190205170510.21984-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PULL 05/22] target/arm: Cache the GP bit for a page in MemTxAttrs 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Richard Henderson Caching the bit means that we will not have to re-walk the page tables to look up the bit during translation. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-id: 20190128223118.5255-6-richard.henderson@linaro.org [PMM: no need to OR in guarded bit status] Signed-off-by: Peter Maydell --- target/arm/helper.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index 45ba678a7df..be0ec7de2a4 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10577,6 +10577,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, bool ttbr1_valid; uint64_t descaddrmask; bool aarch64 = arm_el_is_aa64(env, el); + bool guarded = false; /* TODO: * This code does not handle the different format TCR for VTCR_EL2. @@ -10756,6 +10757,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, } /* Merge in attributes from table descriptors */ attrs |= nstable << 3; /* NS */ + guarded = extract64(descriptor, 50, 1); /* GP */ if (param.hpd) { /* HPD disables all the table attributes except NSTable. */ break; @@ -10801,6 +10803,10 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, */ txattrs->secure = false; } + /* When in aarch64 mode, and BTI is enabled, remember GP in the IOTLB. */ + if (aarch64 && guarded && cpu_isar_feature(aa64_bti, cpu)) { + txattrs->target_tlb_bit0 = true; + } if (cacheattrs != NULL) { if (mmu_idx == ARMMMUIdx_S2NS) {