From patchwork Mon Aug 22 23:23:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 599208 Delivered-To: patch@linaro.org Received: by 2002:a05:6918:5e84:b0:d4:ea33:5523 with SMTP id nd4csp2084411ysb; Mon, 22 Aug 2022 16:28:30 -0700 (PDT) X-Google-Smtp-Source: AA6agR5kuhL/Ii4jc9gzV6q2IuKNhA3Y5UJMxZzhHLvHU5JHzm+BPEdlnO5DixBcuMlC8ZHgvck6 X-Received: by 2002:a05:622a:1047:b0:344:5631:3856 with SMTP id f7-20020a05622a104700b0034456313856mr17489541qte.160.1661210910125; Mon, 22 Aug 2022 16:28:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661210910; cv=none; d=google.com; s=arc-20160816; b=dH/Eep+z4oLbfo5Graba4d5Hq2VbaiQPX9i2f8JKtWapbojWG9ctN+FKoThxORCf4v yVaDMZZi7mQ4enyo9lu+Qmlja54UnE5xLxiNzlY1ZWgNVFoDIxjyUu20dY5l84sh+GXP z3+9UJXuJX4lwvf9Uvet7t5lFL5gb7byxseXwPbyLG8o0pWd7RUQ8nq9NxxLxyyySmpD bAf0PTiGDVN2h9zg2/7d9qXD/CF8UFDYQ3n8Z68CUlSDIWYofVwn9y2amkNSZGcBjy73 2ZjZRkdad9prLwy7T7iCkotwKZgUQrSELlv9DC7DnVpIiXJUE87FeCmQi85DKoHDIlks 8aNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nnTf8vYQrhFGbCh9F71+TS9pu/cqcKGq2pxwJ/zBizo=; b=hXy76pVn3YRWtsTFNRzX8Y/tiakPQJWrE9K8DLcKaKByk8ewD4+sWRSDoUErnXTYhA YsYPXdiFoU+yizLR/qbiyPScCU3SfY6PLD9nR1/c2K21tieMN4KDywdaEsQhCxdNM2fB e3L5PxleU+EvLyRHF+kZS0s6V7r87Dre2kmrYjmUzOW3LR46GEP13S8O2w9LnKtAziye hA9YUqLJ9sVjoK2kqfPHksEFKlScofiYMzn1E8+Fp2tgBN+9+Gtfv6h2UEFxWtClvNKi jAOmeK40D4JfLY9W8kmf568zkyxACmyz9Hc7OwzlazH6U5VAuej9fOpcDLDKo6SnRsQp SBJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Erp2M4pP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bm38-20020a05620a19a600b006bb33a62e97si6188168qkb.17.2022.08.22.16.28.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Aug 2022 16:28:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Erp2M4pP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQGqL-0003x8-LY for patch@linaro.org; Mon, 22 Aug 2022 19:28:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQGlr-0005e1-VN for qemu-devel@nongnu.org; Mon, 22 Aug 2022 19:23:52 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:42693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQGlp-0005bM-16 for qemu-devel@nongnu.org; Mon, 22 Aug 2022 19:23:51 -0400 Received: by mail-pg1-x529.google.com with SMTP id 73so10741355pgb.9 for ; Mon, 22 Aug 2022 16:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=nnTf8vYQrhFGbCh9F71+TS9pu/cqcKGq2pxwJ/zBizo=; b=Erp2M4pPEYOXS4FqQvkUXnl5DU+KPOQdEbYIv7v0vnBGl3vzwcB9VBkz1jTjRdbMwA ByhUYUVIOlDO8fEbVkxme574B0iH5pXbB8YWTJ3v2ik7upqhFWJjcNtPAjmaUeMBpu3s 8yT/mUrQg8yXkKRQNfxFefVSCTfkoIwyqHblY50Pn7KO1oex73Z+su9lXYHcjAb80HYo V4+uF8NUyg7VGqiVPs2zBtPdFZ4V0Wa/mF0bsX/PcCROHX3ACpnLqtT7sHpdEVNNTpdU GQM3BH52x6sjh6ci1HxbbCpELqTQedXjNjZqYlzzibIHZHCOdG8Grm/4sDjQpD2y+l/A 7mPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=nnTf8vYQrhFGbCh9F71+TS9pu/cqcKGq2pxwJ/zBizo=; b=y1l8xTWA1OCN8N6B3TEHXmpiiaBuYnN3e+G/Z/WSPJ3VK58SaNPZeD5eEHf926eJWO YPThwyiv2W3Wnn4fcJK5NxC1dtlglpfIzgLIpEnr0ZgAu0LLtSxk8M5StHJ+HrM8JTx3 mmtpKL+wmjPb8MXxVvDXJEXBG9qAdMt0st8jAlrsrWKo1uCO5x7ja2/W23/W0li4PZmc 3gLORvOF0QKTfGg3/lewU2WFZZLVzBbhNh3aeHT0D788x8FVTa8z3LMv4biAZplH7Hh8 YEyybf92g8mGcLG6CqdYCcrdFlqA7WAryBbrneLO//h7X68YufJiZwUMFjj+wwJ/xREs 6mFw== X-Gm-Message-State: ACgBeo34jm3U4FvM1K3JT0fdyDEVaCCQ+19CMnQVAHO03wC5SLMTsstN S/n5xEb2YitBwI2DKNg4ncO82NSzmRGU9A== X-Received: by 2002:a65:6854:0:b0:41c:feab:e17c with SMTP id q20-20020a656854000000b0041cfeabe17cmr18878843pgt.256.1661210624252; Mon, 22 Aug 2022 16:23:44 -0700 (PDT) Received: from stoup.. ([2602:47:d49d:ec01:c3f1:b74f:5edd:63af]) by smtp.gmail.com with ESMTPSA id k17-20020aa79731000000b0052d3899f8c2sm3809112pfg.4.2022.08.22.16.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 16:23:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v3 04/17] accel/tcg: Do not align tb->page_addr[0] Date: Mon, 22 Aug 2022 16:23:25 -0700 Message-Id: <20220822232338.1727934-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220822232338.1727934-1-richard.henderson@linaro.org> References: <20220822232338.1727934-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Let tb->page_addr[0] contain the offset within the page of the start of the translation block. We need to recover this value anyway at various points, and it is easier to discard the page offset when it's not needed, which happens naturally via the existing find_page shift. Signed-off-by: Richard Henderson --- accel/tcg/cpu-exec.c | 16 ++++++++-------- accel/tcg/cputlb.c | 3 ++- accel/tcg/translate-all.c | 9 +++++---- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 7b8977a0a4..b1fd962718 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -174,7 +174,7 @@ struct tb_desc { target_ulong pc; target_ulong cs_base; CPUArchState *env; - tb_page_addr_t phys_page1; + tb_page_addr_t page_addr0; uint32_t flags; uint32_t cflags; uint32_t trace_vcpu_dstate; @@ -186,7 +186,7 @@ static bool tb_lookup_cmp(const void *p, const void *d) const struct tb_desc *desc = d; if (tb->pc == desc->pc && - tb->page_addr[0] == desc->phys_page1 && + tb->page_addr[0] == desc->page_addr0 && tb->cs_base == desc->cs_base && tb->flags == desc->flags && tb->trace_vcpu_dstate == desc->trace_vcpu_dstate && @@ -195,12 +195,12 @@ static bool tb_lookup_cmp(const void *p, const void *d) if (tb->page_addr[1] == -1) { return true; } else { - tb_page_addr_t phys_page2; - target_ulong virt_page2; + tb_page_addr_t phys_page1; + target_ulong virt_page1; - virt_page2 = (desc->pc & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; - phys_page2 = get_page_addr_code(desc->env, virt_page2); - if (tb->page_addr[1] == phys_page2) { + virt_page1 = TARGET_PAGE_ALIGN(desc->pc); + phys_page1 = get_page_addr_code(desc->env, virt_page1); + if (tb->page_addr[1] == phys_page1) { return true; } } @@ -226,7 +226,7 @@ static TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, if (phys_pc == -1) { return NULL; } - desc.phys_page1 = phys_pc & TARGET_PAGE_MASK; + desc.page_addr0 = phys_pc; h = tb_hash_func(phys_pc, pc, flags, cflags, *cpu->trace_dstate); return qht_lookup_custom(&tb_ctx.htable, &desc, h, tb_lookup_cmp); } diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index ae7b40dd51..8b81b07b79 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -951,7 +951,8 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu, can be detected */ void tlb_protect_code(ram_addr_t ram_addr) { - cpu_physical_memory_test_and_clear_dirty(ram_addr, TARGET_PAGE_SIZE, + cpu_physical_memory_test_and_clear_dirty(ram_addr & TARGET_PAGE_MASK, + TARGET_PAGE_SIZE, DIRTY_MEMORY_CODE); } diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index a8f1c34c4e..20f00f4335 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1167,7 +1167,7 @@ static void do_tb_phys_invalidate(TranslationBlock *tb, bool rm_from_page_list) qemu_spin_unlock(&tb->jmp_lock); /* remove the TB from the hash list */ - phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); + phys_pc = tb->page_addr[0]; h = tb_hash_func(phys_pc, tb->pc, tb->flags, orig_cflags, tb->trace_vcpu_dstate); if (!qht_remove(&tb_ctx.htable, tb, h)) { @@ -1291,7 +1291,7 @@ tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, * we can only insert TBs that are fully initialized. */ page_lock_pair(&p, phys_pc, &p2, phys_page2, true); - tb_page_add(p, tb, 0, phys_pc & TARGET_PAGE_MASK); + tb_page_add(p, tb, 0, phys_pc); if (p2) { tb_page_add(p2, tb, 1, phys_page2); } else { @@ -1644,11 +1644,12 @@ tb_invalidate_phys_page_range__locked(struct page_collection *pages, if (n == 0) { /* NOTE: tb_end may be after the end of the page, but it is not a problem */ - tb_start = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); + tb_start = tb->page_addr[0]; tb_end = tb_start + tb->size; } else { tb_start = tb->page_addr[1]; - tb_end = tb_start + ((tb->pc + tb->size) & ~TARGET_PAGE_MASK); + tb_end = tb_start + ((tb->page_addr[0] + tb->size) + & ~TARGET_PAGE_MASK); } if (!(tb_end <= start || tb_start >= end)) { #ifdef TARGET_HAS_PRECISE_SMC