From patchwork Thu Oct 18 18:27:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149188 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2330378lji; Thu, 18 Oct 2018 11:33:44 -0700 (PDT) X-Google-Smtp-Source: ACcGV60/lWoL/YiFgEb54DhHyxo8+YJYKsgaAQpfP3kf0v7k40LdWJYXrH0ChspHgMTt24tRT7Yn X-Received: by 2002:ac8:689a:: with SMTP id m26-v6mr29415499qtq.254.1539887624528; Thu, 18 Oct 2018 11:33:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539887624; cv=none; d=google.com; s=arc-20160816; b=J1ZmsHxh45Jjqs/L3SJ2HW4/Crw2xyKCsrUuqhfJ+4WUe15B+bvjkmHIoRaRjG3X5k vTL3nweh6LRxTz2k9foM1mu/tX7ZRADEVthjOJn6VkADsciR7uD0S5d2LPS4JB4VoJ5m PYloAv66IY84p19dDiN+0lG+lIqIUuYMp6KdZ60AfFOIVHKVg5SWFu313M7qGTIBRv50 i7E6wi1kp2lNKNztp4DHQlxSavMsjnxIoru0+PLmDdYuvVZZtYkjIckMPyjEIlzNTATx 8lB8EmDjIKWw5BGcq+sQ91kyAD/AyUZ+yP0wHR8HFvLBHrRfW3UEBS3liyI6J7wFX3OF gbGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=cG+M4f15Qyl1siFY1/s1Wd/xk37msYwrgv+4KODvxkI=; b=dyVw+WtOh20eIgBSA35S6c9ZEcsNDFFeJgOISbJo7KsiAZSTP9Wea5AE6foXkL22zf DgzY88X+OrLNEfJsdzAiGrHQBJXgLTijIT1S+5ERc+OnZKvWfaMv4rVBoPU8tNNaRj2U ePeX4prssgGEUhJiHBlcLkKYMftAXD0g5/Cg2ycWMA2Vt87DFmbRQ1jVo5SptsgiPAYr kYUIALKHCfbzjDHJXlBMKmqgZN4B9u9WazpsBFhqpmtvd4EbNXQKZiYyfWZsot1OUWTM DFKqnd6INc3fS/53dGGGFjh37AU1U6upJnEqbsgwZLaULSoiiw2XJfT/pbef97xlBLje ODtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RHRRlS7e; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f4-v6si4450613qkm.213.2018.10.18.11.33.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 11:33:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RHRRlS7e; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDD79-0006io-Ur for patch@linaro.org; Thu, 18 Oct 2018 14:33:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDD1i-000231-9w for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDD1g-00006V-8C for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:06 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:44191) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDD1f-0008VL-UC for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:04 -0400 Received: by mail-pl1-x644.google.com with SMTP id d23-v6so1248996pls.11 for ; Thu, 18 Oct 2018 11:28:03 -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=cG+M4f15Qyl1siFY1/s1Wd/xk37msYwrgv+4KODvxkI=; b=RHRRlS7eSYSfsnA7pepH4Jg7mTglOumxdbYqY9DGq5UPLD5TQhfKMCp+SdE0USZrAq M1y94SV2PRKgeLCqyJWV7Qnu5JiHw858u1uD05BYzQiAm3L0KBhPNT+45KhKYNZN38Gh yR7cAOhCLGo2aGNLyiQxNF2s5OXCfU7pEpqgA= 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=cG+M4f15Qyl1siFY1/s1Wd/xk37msYwrgv+4KODvxkI=; b=RRkspSpj7sa7ziDtKFgptaWIsrPTVzs7BPSu16V3oZj8lLYZu3ZyHuXyzBS8tbsfVb xZSkhWxAokwFVMWyBE2ltNjFyZr+OiUwfjkgxd+5+WTH9GyvYhiHYA5SQynv+bs8iDr2 BW8vG4rtmXF5jw8T7sPdt5ecNPGwDlyWAi1R6tM/5vg+bo3l8lcfzDHbeibXLy7PqeHH 4fXu+wmqZSndmWW1T2jsVGbdThjdXsUKClbx3Pexx1BG8KpSlf4jHN7K95PFOK/jv854 9JWSK43+Dix2y5rc7f82lBqT0YS4v124rtc7JFSZQGFnj5p8fvSWMusXUjsuN+FRfdMO 8K/A== X-Gm-Message-State: ABuFfojQTA/c8MnQ6cLNITCDcVq4872Mr91p9443CBlz6ZwtH/AcYxdS 01zkxKEdGO+O2AiMEOli+VvdUE5JqfI= X-Received: by 2002:a17:902:54d:: with SMTP id 71-v6mr23475015plf.80.1539887282442; Thu, 18 Oct 2018 11:28:02 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id d187-v6sm4795738pfc.13.2018.10.18.11.28.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 11:28:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 11:27:56 -0700 Message-Id: <20181018182758.18646-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181018182758.18646-1-richard.henderson@linaro.org> References: <20181018182758.18646-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::644 Subject: [Qemu-devel] [PATCH 1/3] target/arm: Remove writefn from TTBR0_EL3 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The EL3 version of this register does not include an ASID, and so the tlb_flush performed by vmsa_ttbr_write is not needed. Signed-off-by: Richard Henderson --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.2 Reviewed-by: Aaron Lindsay diff --git a/target/arm/helper.c b/target/arm/helper.c index e3946562aa..24bbde4f76 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4214,7 +4214,7 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.mvbar) }, { .name = "TTBR0_EL3", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 6, .crn = 2, .crm = 0, .opc2 = 0, - .access = PL3_RW, .writefn = vmsa_ttbr_write, .resetvalue = 0, + .access = PL3_RW, .resetvalue = 0, .fieldoffset = offsetof(CPUARMState, cp15.ttbr0_el[3]) }, { .name = "TCR_EL3", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 6, .crn = 2, .crm = 0, .opc2 = 2, From patchwork Thu Oct 18 18:27:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149187 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2326986lji; Thu, 18 Oct 2018 11:30:41 -0700 (PDT) X-Google-Smtp-Source: ACcGV60VB3vfbm9hCjJxMZPX4Tql4JaQCgHWqo4QFVhfehPtsfy7Aks5RuxJoncx1Z6DaQ6YDNoG X-Received: by 2002:ac8:392e:: with SMTP id s43-v6mr30672199qtb.294.1539887441543; Thu, 18 Oct 2018 11:30:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539887441; cv=none; d=google.com; s=arc-20160816; b=sRj1Ct3BI4znHenMFch4Q6+he52ob+8xD8oMdIzhZ8Dl62VxMqDFcP5/ilL29BUZpD 4xjL5Bsn83TKDCY4UCcv9mdXQJ0SBJX3xLHYOb6afsOicJOmDPTja0EvbBuNLYl7/EGX UjdbSBYLeC8dDZh4v/haTx1gYWNq3Yqs7lkusBJWp6DU4CL4elYfVig6WOU4GyG9T91D QbtXPY/5o6ZNbKQO5Sh1ERLmztsKmhYIVNEgp/IaD4qc2PEPS0KS9gcm8oCHpEWS/394 8jhRr1fn7cKfQuAhOilkyLcaRWEAETF6he3uQOxMLy5PptwVRwW6asdNdooWO+YwlLvB dxQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=D3wqGudfW+0khCsxkoB/kpathOtA+AYb9IQL2BiwWuM=; b=kS/vvbpgsHDAkYXGvCPNZxMEKQaS4DLV5GYeL2HisF43+vuNwnV2VSf0iVw7Y9ya1n /6oHb3g2rjIwtamK7Mglz1ozoYyKifsTi3oNLg1zYsEvn37zpZEhaHfnwBLyyn7f2O8/ mtAHj+aM1HEFk4OseMcRrBs8kI+T68+2rq+jyG25x2x9UUFbGI/5h6w6/G6bjUMUBdaH LLORkFJgG8OuDSTNxzfSlqdPnZI+U3+02xgt7vuwbGaY4SzDVGrkQScIthLMHni443Ov GlqbOLL1S1Ax28j+ot1VKf/4BN2LFgsvK8+DA2D2kcOTS3OjEW90vJ2t6og0/xduyijv HFbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OCOSZhui; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 75-v6si6543081qkv.68.2018.10.18.11.30.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 11:30:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OCOSZhui; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDD4C-00046o-PD for patch@linaro.org; Thu, 18 Oct 2018 14:30:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDD1i-000232-EL for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDD1h-00009o-H5 for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:06 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:34664) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDD1h-00007D-8O for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:05 -0400 Received: by mail-pf1-x444.google.com with SMTP id f78-v6so9506366pfe.1 for ; Thu, 18 Oct 2018 11:28:05 -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=D3wqGudfW+0khCsxkoB/kpathOtA+AYb9IQL2BiwWuM=; b=OCOSZhuiJguo8ReanZXRLIdlQmkqF0IqpJE9u/OOkznwn39Wmv7sLvUJRtkPwqNd2E MMwmOKsjG9SSk8yusWeMJJH5GyVD1rZGfMJvl5YuJijV19nIN2pksuj4HJjzTN8cGM6N uRXkDPn1UahtXGGPU8nSts4gAR+IjlDdxhROY= 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=D3wqGudfW+0khCsxkoB/kpathOtA+AYb9IQL2BiwWuM=; b=ATws+F4KEJhWC85XY2JwqPIvzrUxaO8TQeLgChiFYpTRmqY1ayNhUIXSGnsktL+yZs Bw2at+9Msa1RL9C3hy937tQN9nXWH6VQQEIlqeVJz6Scc/iNz5U4Y7gZ7gIUA6pztnHU UjeOsYiRJypq/CDGz/aqP7b/0o3i5KzIa16y2VTWrhJeOWCSqfAHYNPFPkuP0tE4M9ck n589KtwwSdwLRgEZwKA/Zz9tIE8AV3FFyl48lsXoaBzSh/vECdiat2BTmfiI1fuXpgKR F0PGBYQGl6L5IGm0KvrKC+dJKIwwcc4LH0rh7/k42jgBTS4Gp+MkkEO5VqKOAw0K4XFM QR4A== X-Gm-Message-State: ABuFfogL3DdThMCF9IN5PQTLNWagTZ9+3els9eqqdFr5ZdWS4rJk1sP5 9u+/mY75q7jIxKD5DSBQ50qe5DnviYs= X-Received: by 2002:a63:f448:: with SMTP id p8-v6mr29349523pgk.124.1539887283899; Thu, 18 Oct 2018 11:28:03 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id d187-v6sm4795738pfc.13.2018.10.18.11.28.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 11:28:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 11:27:57 -0700 Message-Id: <20181018182758.18646-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181018182758.18646-1-richard.henderson@linaro.org> References: <20181018182758.18646-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::444 Subject: [Qemu-devel] [PATCH 2/3] target/arm: Only flush tlb if ASID 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Since QEMU does not implement ASIDs, changes to the ASID must flush the tlb. However, if the ASID does not change there is no reason to flush. In testing a boot of the Ubuntu installer to the first menu, this reduces the number of flushes by 30%, or nearly 600k instances. Signed-off-by: Richard Henderson --- target/arm/helper.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.17.2 Reviewed-by: Aaron Lindsay diff --git a/target/arm/helper.c b/target/arm/helper.c index 24bbde4f76..ed70ac645e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2709,12 +2709,10 @@ static void vmsa_tcr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, static void vmsa_ttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - /* 64 bit accesses to the TTBRs can change the ASID and so we - * must flush the TLB. - */ - if (cpreg_field_is_64bit(ri)) { + /* If the ASID changes (with a 64-bit write), we must flush the TLB. */ + if (cpreg_field_is_64bit(ri) && + extract64(raw_read(env, ri) ^ value, 48, 16) != 0) { ARMCPU *cpu = arm_env_get_cpu(env); - tlb_flush(CPU(cpu)); } raw_write(env, ri, value); From patchwork Thu Oct 18 18:27:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149185 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2324878lji; Thu, 18 Oct 2018 11:28:32 -0700 (PDT) X-Google-Smtp-Source: ACcGV62uTiTsptm+C+TWLIAWcuT9hyxLbLzp8uxQ88mL7+5Fnx4oar6vinOum7gCM5wKZl4FZrK2 X-Received: by 2002:ad4:424c:: with SMTP id l12mr19529454qvq.118.1539887312012; Thu, 18 Oct 2018 11:28:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539887312; cv=none; d=google.com; s=arc-20160816; b=TWHGfkrRtsyzo184vTejdGeADmNxmO3jm+MftMgN6bTgNHSZhv8tslJxlZEYL8bER8 PGIgupnTU9mRvqSROQMA7a59/SeyPHPZKpDUfx3qLeM7/tlXoXn0peO6QLGowSFxd6SF AJoeSYGmYCQ5bemKxwfnV328wkSbsSm2qi5q6945ppEUuxXNyM11ImTBIe+dgKeU35Q0 7INBGXd+4JiUtoTQDpoeVH0QqyHKbKr8xzFB40v7fYzcWOef+7VV1EpfRt3x1tNTg6ql Up3OYjXq1ETTXjGey8hg63cPIMupTcFls1yXFfnQqwFM4rqddtbMmLCGVR6sRksQTPG1 6Maw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=ivNiql6u6gG8SOjY6K8rzKNCwFBL7QEcg4GjVI+RHRU=; b=Mqsn1N0aobQFlkNK4SpfPSsg4mfmIKQJSMwVIJUlOxpzavoPEChc2fPvTNDllmSGBS dTI7clcR4avejTO4mJElGMPU0ZYy91c+jVO4De3uwa+UXl2eDNNOqnB7Xm7gY5wvjvXR 7s41VwNaP3wVhUAKV8ueR0fDCp2I3LdMMm1h4kjW94q26CZgokZATCLMooFraz40pvXZ B9BJm8dbC8JAaXjitBZFYpXOWm2vw8DVaLyaSt8KnJ/khr9qj8n/IVHSv0uemThxJP7q sXAy3KO0dVNu1d2aTvGUOUZkL4vIO53tvvaNA0R9h3fXGeOpTU0whF3hlWa7V5ELsCFK x7kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="THu/Fn7X"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n8-v6si8909014qtp.145.2018.10.18.11.28.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 11:28:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="THu/Fn7X"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDD27-00025w-E8 for patch@linaro.org; Thu, 18 Oct 2018 14:28:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDD1k-00023p-9F for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDD1i-0000EJ-WD for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:08 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:35743) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDD1i-0000C5-LS for qemu-devel@nongnu.org; Thu, 18 Oct 2018 14:28:06 -0400 Received: by mail-pl1-x642.google.com with SMTP id f8-v6so14709715plb.2 for ; Thu, 18 Oct 2018 11:28:06 -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=ivNiql6u6gG8SOjY6K8rzKNCwFBL7QEcg4GjVI+RHRU=; b=THu/Fn7X9x+6tThS+pgyJGs6+en5RmB3xuT38cwWSNYl7nfddP7iaidIvXt3VUxi92 yFdA9h7/tqouFKhyMWTKuaqYsEpbMuv2pHHtwNSOIhaE+/lHn8VBvpzmrA/5SDsFAT19 4OLW+Ub10l90O17BLD5hyPmf5ojCQgtzxHiKg= 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=ivNiql6u6gG8SOjY6K8rzKNCwFBL7QEcg4GjVI+RHRU=; b=G1XGotfgMp7srRFQRCEE2IsKyFlMO+iHdklkuS3IkfUo+MUSdeKGEJ11lLMGP6j/v3 nrqPYRhxnLux+NUFyxDF6CPsry4Cz10jKwUESeTBJdL7hcOSqOlBsNDgq0KxwSY/P5bC C9L42NSBkxkrE5P9kFT/pAakm8tWoGa6YXsloFwRdZOVEwupMLoYJMAZa81xcXvri5Uh Y921evD++MBj/VV3jptHTMhU6T7/zlbOtVeV/XIPXPWIDv/oc4s64weUQkpJxEWucZDN zSHVfEiY+7tgRB0JB+qIQC5MR+zo85Wa8Qf+IeTw2zv6Hc23TYk7VId9bWXKTsqrIY/M nN5g== X-Gm-Message-State: ABuFfoizD0+/sFiASCTqGZ1ZfNu3icKr6xXK4p0yK1a9+xNVE1cVrx/L 22KWtBJ/rYXHpJL0Ejn1oXNWy76tiE4= X-Received: by 2002:a17:902:7802:: with SMTP id p2-v6mr30450727pll.170.1539887285238; Thu, 18 Oct 2018 11:28:05 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id d187-v6sm4795738pfc.13.2018.10.18.11.28.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 11:28:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 11:27:58 -0700 Message-Id: <20181018182758.18646-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181018182758.18646-1-richard.henderson@linaro.org> References: <20181018182758.18646-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::642 Subject: [Qemu-devel] [PATCH 3/3] target/arm: Flush only the TLBs affected by TTBR*_EL1 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Only the EL0 and EL1 TLBs are affected by the EL1 register, so flush only 2 of the 8 TLBs. In testing a boot of the Ubuntu installer to the first menu, this accounts for nearly all of the full tlb flushes: all but 11k of the 1.2M instances without the patch. Signed-off-by: Richard Henderson --- target/arm/helper.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) -- 2.17.2 diff --git a/target/arm/helper.c b/target/arm/helper.c index ed70ac645e..a943e91666 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2706,14 +2706,16 @@ static void vmsa_tcr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, tcr->raw_tcr = value; } -static void vmsa_ttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, - uint64_t value) +static void vmsa_ttbr1_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) { /* If the ASID changes (with a 64-bit write), we must flush the TLB. */ if (cpreg_field_is_64bit(ri) && extract64(raw_read(env, ri) ^ value, 48, 16) != 0) { ARMCPU *cpu = arm_env_get_cpu(env); - tlb_flush(CPU(cpu)); + tlb_flush_by_mmuidx(CPU(cpu), + ARMMMUIdxBit_S12NSE1 | + ARMMMUIdxBit_S12NSE0); } raw_write(env, ri, value); } @@ -2761,12 +2763,12 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.esr_el[1]), .resetvalue = 0, }, { .name = "TTBR0_EL1", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 0, .opc2 = 0, - .access = PL1_RW, .writefn = vmsa_ttbr_write, .resetvalue = 0, + .access = PL1_RW, .writefn = vmsa_ttbr1_write, .resetvalue = 0, .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr0_s), offsetof(CPUARMState, cp15.ttbr0_ns) } }, { .name = "TTBR1_EL1", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 0, .opc2 = 1, - .access = PL1_RW, .writefn = vmsa_ttbr_write, .resetvalue = 0, + .access = PL1_RW, .writefn = vmsa_ttbr1_write, .resetvalue = 0, .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr1_s), offsetof(CPUARMState, cp15.ttbr1_ns) } }, { .name = "TCR_EL1", .state = ARM_CP_STATE_AA64, @@ -3018,12 +3020,12 @@ static const ARMCPRegInfo lpae_cp_reginfo[] = { .access = PL1_RW, .type = ARM_CP_64BIT | ARM_CP_ALIAS, .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr0_s), offsetof(CPUARMState, cp15.ttbr0_ns) }, - .writefn = vmsa_ttbr_write, }, + .writefn = vmsa_ttbr1_write, }, { .name = "TTBR1", .cp = 15, .crm = 2, .opc1 = 1, .access = PL1_RW, .type = ARM_CP_64BIT | ARM_CP_ALIAS, .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr1_s), offsetof(CPUARMState, cp15.ttbr1_ns) }, - .writefn = vmsa_ttbr_write, }, + .writefn = vmsa_ttbr1_write, }, REGINFO_SENTINEL };