From patchwork Fri Jun 26 15:13:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 191832 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp588038ilg; Fri, 26 Jun 2020 08:25:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwe49pEpw1/cVfoTbfLEOk7QRUxG+MfJknHJv/xlD7qItI7upc/icrFUHjz/hRkzr3ox8y7 X-Received: by 2002:a25:bb8a:: with SMTP id y10mr5644924ybg.197.1593185155882; Fri, 26 Jun 2020 08:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593185155; cv=none; d=google.com; s=arc-20160816; b=Y3rF/9Z0pPVt3s08p1aw1hdOffZY/tWqroMP6soyoExaE7s0n5uZj3/S6BH8wRLskz 4NfeANYxbvuiGdyoktNUsebwE8Z0xzFZU93g3dl90ob0ecX6g7rJNQW5PzKfp8r9MSPb FtSY5A6XI7+9cHbdxTfMhyoV1AUqqQmnT+oCu/sGwFO2eMxlwTFu98Nt859NDk19Z5JC LKcafCSpzk77QXmT+J/25HbP9A3wjXsUJi6hhfX21FxVirlZpBEOTdk1NiGtc9VROTGw poWjnojHwXC6gQF/onOGd3TBWuhz447Mh4LlShmHpoKKLjJOSD7bzHmkcN5MwrGXK/RW RUFw== 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:to:from :dkim-signature; bh=kErye9eNnDjstzH+b9YxgalNIVLgWMD+e3T4oMN/njw=; b=XqT5ewbpgfqNCLRZAHR8FBJZN0olGuZmqoA9KtfUjzhXuMBJ5xZVjEgZsAb4izRVBi qlIq9g+liG8tR5OEUkwJUYUG4RClJW+iC/zmiYk5q62hTS+GKB4hIvcy0mryrFtlc2/h 2h5bqqp7c4ecWl6EUpjTZB+/FHemTi5VcLbAxF/X9I6sMUWXSSr40oKjPcE5AkVRUT56 VLgB91UyLkPTqZ8d8tWz2cSbLD8vTucOG0LoP2muXoOGNbcHZKArls0g6NHjOfa1N8BY jm8ybjCxbJrcaBhETJU53gL0azo1AV1A6PaJOY+6Qe+Y85RTkS1Cr8EUjmbfFhGyvGHz PzsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qAWak+eV; 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 i205si24250150yba.151.2020.06.26.08.25.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 08:25:55 -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=qAWak+eV; 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]:35504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joqEl-000517-8y for patch@linaro.org; Fri, 26 Jun 2020 11:25:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joq4G-0002nT-KO for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:15:04 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:36933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joq4E-0006YN-Lf for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:15:04 -0400 Received: by mail-wm1-x344.google.com with SMTP id o2so9723983wmh.2 for ; Fri, 26 Jun 2020 08:15:02 -0700 (PDT) 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=kErye9eNnDjstzH+b9YxgalNIVLgWMD+e3T4oMN/njw=; b=qAWak+eV11R9viLF53UGkq2Gcrob3Vnb9jXyQwLw9aT5IPNSOPI6AIisqRounN5vmn vRLbQU71r5VcFYYv54mmrUBrNprPkvfcra6BYglJrzoUZFAcE3jCyscvL2ZFE5PhJwfe QGE9cOovv0Ht2GyKsd30qATrnFhZo/eyeLYTr6uSPuks5vjihbNHKwD/2aqJagCybPeH YakvGp1Ph5DVYTenvmNWp5DNIGHl9z8hqKdDTV1p1p9W+1r5KaPXupvdyLOteXkq2DVO 6rY9IvgfqnmkXzOg5wnWcQkVqA9+WjTW2Mz5MfSjK1bAL2uU6CmCIhU8wTtWJ6KPKfR/ m+xg== 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=kErye9eNnDjstzH+b9YxgalNIVLgWMD+e3T4oMN/njw=; b=VqARpkMh2N/FzyvPuo/GFlnaPblDWlXYJpkkijRXrnXekkSHPvs4mmDNG7ZgPSxCeV 4MRARe3JIUrQy0Kv3MWnuO1oG2fwxRt6bjq7tsp+EjPPQiYthmItGZwGs8tovFGhlXOI jClJW9l2fPtG4m4hFvSBYiFNtpWF0qHvUcV56uZuqCBsIeBAY0O0294akDNaIPf/IVsB vfT3zMlTQ1IVIkC9PnQFet0MSEuPusoetjr6bzcBJJCWHb2erTYFyxpaaVeIxofFSfst 9TAk0U5ooblpdrgVccy8jmQWTEOE63qBE0mbnDWaOhZ06Taf4dxQPE+f6xgiuzFrm9e2 JQKQ== X-Gm-Message-State: AOAM530YDuZPeD20E7ewJViQ9CDMuqrzTQ5iy+mYRyTCTJfacI5sTR+I zqGaD2fPcRyUB4zw/bddaaDVZn2lMpHh7g== X-Received: by 2002:a7b:ca52:: with SMTP id m18mr3920667wml.92.1593184500902; Fri, 26 Jun 2020 08:15:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm37838852wrr.67.2020.06.26.08.14.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 08:15:00 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 30/57] target/arm: Simplify DC_ZVA Date: Fri, 26 Jun 2020 16:13:57 +0100 Message-Id: <20200626151424.30117-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626151424.30117-1-peter.maydell@linaro.org> References: <20200626151424.30117-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" From: Richard Henderson Now that we know that the operation is on a single page, we need not loop over pages while probing. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200626033144.790098-19-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper-a64.c | 94 +++++++++++------------------------------ 1 file changed, 25 insertions(+), 69 deletions(-) -- 2.20.1 diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index bc0649a44aa..8682630ff6c 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -1119,85 +1119,41 @@ void HELPER(dc_zva)(CPUARMState *env, uint64_t vaddr_in) * (which matches the usual QEMU behaviour of not implementing either * alignment faults or any memory attribute handling). */ - - ARMCPU *cpu = env_archcpu(env); - uint64_t blocklen = 4 << cpu->dcz_blocksize; + int blocklen = 4 << env_archcpu(env)->dcz_blocksize; uint64_t vaddr = vaddr_in & ~(blocklen - 1); + int mmu_idx = cpu_mmu_index(env, false); + void *mem; + + /* + * Trapless lookup. In addition to actual invalid page, may + * return NULL for I/O, watchpoints, clean pages, etc. + */ + mem = tlb_vaddr_to_host(env, vaddr, MMU_DATA_STORE, mmu_idx); #ifndef CONFIG_USER_ONLY - { + if (unlikely(!mem)) { + uintptr_t ra = GETPC(); + /* - * Slightly awkwardly, QEMU's TARGET_PAGE_SIZE may be less than - * the block size so we might have to do more than one TLB lookup. - * We know that in fact for any v8 CPU the page size is at least 4K - * and the block size must be 2K or less, but TARGET_PAGE_SIZE is only - * 1K as an artefact of legacy v5 subpage support being present in the - * same QEMU executable. So in practice the hostaddr[] array has - * two entries, given the current setting of TARGET_PAGE_BITS_MIN. + * Trap if accessing an invalid page. DC_ZVA requires that we supply + * the original pointer for an invalid page. But watchpoints require + * that we probe the actual space. So do both. */ - int maxidx = DIV_ROUND_UP(blocklen, TARGET_PAGE_SIZE); - void *hostaddr[DIV_ROUND_UP(2 * KiB, 1 << TARGET_PAGE_BITS_MIN)]; - int try, i; - unsigned mmu_idx = cpu_mmu_index(env, false); - TCGMemOpIdx oi = make_memop_idx(MO_UB, mmu_idx); + (void) probe_write(env, vaddr_in, 1, mmu_idx, ra); + mem = probe_write(env, vaddr, blocklen, mmu_idx, ra); - assert(maxidx <= ARRAY_SIZE(hostaddr)); - - for (try = 0; try < 2; try++) { - - for (i = 0; i < maxidx; i++) { - hostaddr[i] = tlb_vaddr_to_host(env, - vaddr + TARGET_PAGE_SIZE * i, - 1, mmu_idx); - if (!hostaddr[i]) { - break; - } - } - if (i == maxidx) { - /* - * If it's all in the TLB it's fair game for just writing to; - * we know we don't need to update dirty status, etc. - */ - for (i = 0; i < maxidx - 1; i++) { - memset(hostaddr[i], 0, TARGET_PAGE_SIZE); - } - memset(hostaddr[i], 0, blocklen - (i * TARGET_PAGE_SIZE)); - return; - } + if (unlikely(!mem)) { /* - * OK, try a store and see if we can populate the tlb. This - * might cause an exception if the memory isn't writable, - * in which case we will longjmp out of here. We must for - * this purpose use the actual register value passed to us - * so that we get the fault address right. + * The only remaining reason for mem == NULL is I/O. + * Just do a series of byte writes as the architecture demands. */ - helper_ret_stb_mmu(env, vaddr_in, 0, oi, GETPC()); - /* Now we can populate the other TLB entries, if any */ - for (i = 0; i < maxidx; i++) { - uint64_t va = vaddr + TARGET_PAGE_SIZE * i; - if (va != (vaddr_in & TARGET_PAGE_MASK)) { - helper_ret_stb_mmu(env, va, 0, oi, GETPC()); - } + for (int i = 0; i < blocklen; i++) { + cpu_stb_mmuidx_ra(env, vaddr + i, 0, mmu_idx, ra); } - } - - /* - * Slow path (probably attempt to do this to an I/O device or - * similar, or clearing of a block of code we have translations - * cached for). Just do a series of byte writes as the architecture - * demands. It's not worth trying to use a cpu_physical_memory_map(), - * memset(), unmap() sequence here because: - * + we'd need to account for the blocksize being larger than a page - * + the direct-RAM access case is almost always going to be dealt - * with in the fastpath code above, so there's no speed benefit - * + we would have to deal with the map returning NULL because the - * bounce buffer was in use - */ - for (i = 0; i < blocklen; i++) { - helper_ret_stb_mmu(env, vaddr + i, 0, oi, GETPC()); + return; } } -#else - memset(g2h(vaddr), 0, blocklen); #endif + + memset(mem, 0, blocklen); }