From patchwork Sun Feb 27 02:04:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546433 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp1609700imf; Sat, 26 Feb 2022 18:09:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1S75J1Bx/e86WGLsbcoozL+PWrku/Ec2Z6heMgP7c3jKl/z6GalOBJUXqjrzux2OCRg55 X-Received: by 2002:a25:6406:0:b0:624:c79:22b9 with SMTP id y6-20020a256406000000b006240c7922b9mr13793886ybb.347.1645927743196; Sat, 26 Feb 2022 18:09:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645927743; cv=none; d=google.com; s=arc-20160816; b=SxMPuJNCk07ewcZ12PeGJfxadWSaE+aQ8YbutSWCPrgYUMXwY0ey98xP/jwnPyb72o wLSqHK1+9PP4+tUe4unrQzW8ZMcMJ27z3MX6zH4BbzvYByrs0AlekP1o4pgAxcjn0KR7 I2N+1GagCkbsSr1hFXviWh3BPuQj/EsOiSuZCYVgTVooC995j2VpjNsqov0dPkOsO2Y1 AUesPPWS0WZi5JkaBoCQwTzD68bg6BEVT/26XqnQH3weYOzsLMfonUEaNZgqc5OUmBqL J0QnvwIcextysAvayjpgLYagp+di/0ONNnlNsHFMLFpTSyxo5ktJjBfKcKyez0WAByto DVPw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=f5NF1Xhw+Erdj+thQwPRUzILFmSAD0uMaYQuiNMvI6I=; b=z5RlFYej5DpcUz0XEOUBf02A/QBNpLVX9YhNs1bRmMj5xxhY6nFYOsWDygipsZi/Gu 2RxI82yLpvCm17e0N+yao7I3KE7NKciOA7Rwvtcg4taNb7YQBgzTVy8jrtNDqbHp9p+A LZbFDUD2fnwF7pO/wJ7q8fA886Q5ExAO018155WoOHfMiCIkhO5B8gKLb94nbMOPaFrd IVPlk+w0Zmk4kYyKN9OfLY1hJF56Ksx25AM0sko3N4cWBRU5EUsbA5AW82rSxDrCB3dO 1OUYkqCsJaLDEKOw7nVYdO91X3YXx9WtRXMl/Q//AgrIgma8mF0Rbu4C+MbqgrviXUNl gnyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PYT3sZGK; 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=fail (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 a17-20020a258711000000b0061d98099919si4922138ybl.668.2022.02.26.18.09.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 26 Feb 2022 18:09:03 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=PYT3sZGK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nO8ze-0008HM-Mg for patch@linaro.org; Sat, 26 Feb 2022 21:09:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nO8v8-0002Q6-Eb for qemu-devel@nongnu.org; Sat, 26 Feb 2022 21:04:23 -0500 Received: from [2607:f8b0:4864:20::632] (port=41609 helo=mail-pl1-x632.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nO8v6-0007Ri-6I for qemu-devel@nongnu.org; Sat, 26 Feb 2022 21:04:22 -0500 Received: by mail-pl1-x632.google.com with SMTP id z2so7892376plg.8 for ; Sat, 26 Feb 2022 18:04:19 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=f5NF1Xhw+Erdj+thQwPRUzILFmSAD0uMaYQuiNMvI6I=; b=PYT3sZGKww9VDikoLcbCZFQVhj6rGqE4zQ1lSDuEmKrI9KEcFv+CrK2F62roIkQJBy rG585xKZ/1bJV7jt4g7Bqf7YBEbLQ1a+ULFvnHs8nVQ0jPvsmyPml025wCjFMud2v/6U G2ClT0jEpxnVVo/1D2WSzKda3OzpHEC4bs/N05VzE/RTVmlw9JhZnNqQeopUzjzHe3ST hwSiiPtbhRK8bK+Ou7v0Hi4UfvxD7RYZxBAXTaCz6QzIX/UDNiEg33nPKWdJdaB6qAim ayk076uwHnXD4+zQkuIDA7kAwYG2OESqs5FbefvAM9ejRwbS7PB4No33LsgpH920A+Gw 0tbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f5NF1Xhw+Erdj+thQwPRUzILFmSAD0uMaYQuiNMvI6I=; b=Fyq5/nt13yBNJwZk0sndRp+vctRNOCRVg6co1gOe15LqqP/VDQdBq/rKJ8Qj1zG5pR uWDbBtUfNcKmLmxuA/0+ba0Vo0ZCxmQODrj3J5wHiCtIVaiopUlUZT8mKrjYw3on4XMa +nDNlluXKz6TjeIPX24x0ClJpcjCvC1vdusJgrAgoGRElrrq+oTMfzUOfRfJWGEPyLpT CXbT5lNc1QhrLOppSmy1UgBYaMi0jdh32OJ/2CNpzlnKzYEdMiobqpwHJE4qv460E9ea QK8ZY7v67Nf3lv/TJVOG1GhPtA3P2k/V1obvkZA0mGtAKpGfm5x9ejwGy4MP5Hgiz4l7 WDqw== X-Gm-Message-State: AOAM533uegWbhQs5RdovNLiehf03XGWymo9EaOXL+8UiWOi856pJWF8x toUBZ1CtoKrYs5cAaSfd5B/RWzDJE5Jpso9I X-Received: by 2002:a17:902:f344:b0:151:533b:b6c5 with SMTP id q4-20020a170902f34400b00151533bb6c5mr3455500ple.58.1645927459001; Sat, 26 Feb 2022 18:04:19 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-9001-d56a-9ee0-0246.res6.spectrum.com. [2603:800c:1201:c600:9001:d56a:9ee0:246]) by smtp.gmail.com with ESMTPSA id q13-20020a056a00088d00b004e1bea9c582sm8304021pfj.43.2022.02.26.18.04.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 18:04:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 2/9] accel/tcg: Split out g2h_tlbe Date: Sat, 26 Feb 2022 16:04:06 -1000 Message-Id: <20220227020413.11741-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227020413.11741-1-richard.henderson@linaro.org> References: <20220227020413.11741-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::632 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: WANG Xuerui , Alistair Francis , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Create a new function to combine a CPUTLBEntry addend with the guest address to form a host address. Reviewed-by: WANG Xuerui Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Signed-off-by: Richard Henderson --- accel/tcg/cputlb.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 3b918fe018..0e62aa5d7c 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -91,6 +91,11 @@ static inline size_t sizeof_tlb(CPUTLBDescFast *fast) return fast->mask + (1 << CPU_TLB_ENTRY_BITS); } +static inline uintptr_t g2h_tlbe(const CPUTLBEntry *tlb, target_ulong gaddr) +{ + return tlb->addend + (uintptr_t)gaddr; +} + static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns, size_t max_entries) { @@ -986,8 +991,7 @@ static void tlb_reset_dirty_range_locked(CPUTLBEntry *tlb_entry, if ((addr & (TLB_INVALID_MASK | TLB_MMIO | TLB_DISCARD_WRITE | TLB_NOTDIRTY)) == 0) { - addr &= TARGET_PAGE_MASK; - addr += tlb_entry->addend; + addr = g2h_tlbe(tlb_entry, addr & TARGET_PAGE_MASK); if ((addr - start) < length) { #if TCG_OVERSIZED_GUEST tlb_entry->addr_write |= TLB_NOTDIRTY; @@ -1537,7 +1541,7 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, target_ulong addr, return -1; } - p = (void *)((uintptr_t)addr + entry->addend); + p = (void *)g2h_tlbe(entry, addr); if (hostp) { *hostp = p; } @@ -1629,7 +1633,7 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr, } /* Everything else is RAM. */ - *phost = (void *)((uintptr_t)addr + entry->addend); + *phost = (void *)g2h_tlbe(entry, addr); return flags; } @@ -1737,7 +1741,7 @@ bool tlb_plugin_lookup(CPUState *cpu, target_ulong addr, int mmu_idx, data->v.io.offset = (iotlbentry->addr & TARGET_PAGE_MASK) + addr; } else { data->is_io = false; - data->v.ram.hostaddr = (void *)((uintptr_t)addr + tlbe->addend); + data->v.ram.hostaddr = (void *)g2h_tlbe(tlbe, addr); } return true; } else { @@ -1836,7 +1840,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, goto stop_the_world; } - hostaddr = (void *)((uintptr_t)addr + tlbe->addend); + hostaddr = (void *)g2h_tlbe(tlbe, addr); if (unlikely(tlb_addr & TLB_NOTDIRTY)) { notdirty_write(env_cpu(env), addr, size, @@ -1967,7 +1971,7 @@ load_helper(CPUArchState *env, target_ulong addr, MemOpIdx oi, access_type, op ^ (need_swap * MO_BSWAP)); } - haddr = (void *)((uintptr_t)addr + entry->addend); + haddr = (void *)g2h_tlbe(entry, addr); /* * Keep these two load_memop separate to ensure that the compiler @@ -2004,7 +2008,7 @@ load_helper(CPUArchState *env, target_ulong addr, MemOpIdx oi, return res & MAKE_64BIT_MASK(0, size * 8); } - haddr = (void *)((uintptr_t)addr + entry->addend); + haddr = (void *)g2h_tlbe(entry, addr); return load_memop(haddr, op); } @@ -2375,7 +2379,7 @@ store_helper(CPUArchState *env, target_ulong addr, uint64_t val, notdirty_write(env_cpu(env), addr, size, iotlbentry, retaddr); } - haddr = (void *)((uintptr_t)addr + entry->addend); + haddr = (void *)g2h_tlbe(entry, addr); /* * Keep these two store_memop separate to ensure that the compiler @@ -2400,7 +2404,7 @@ store_helper(CPUArchState *env, target_ulong addr, uint64_t val, return; } - haddr = (void *)((uintptr_t)addr + entry->addend); + haddr = (void *)g2h_tlbe(entry, addr); store_memop(haddr, val, op); }