From patchwork Sun May 9 15:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 432870 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2108507jao; Sun, 9 May 2021 08:20:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3zja9lH8v0NG7CbAZvym6zRemADnJGfZec35bG2eRel6EjT8gT8OLNG6s2MCGhsvgXgE4 X-Received: by 2002:a67:ea4d:: with SMTP id r13mr17060247vso.11.1620573607914; Sun, 09 May 2021 08:20:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620573607; cv=none; d=google.com; s=arc-20160816; b=k4j4I4nVAj0hc1Ol0h3Mk8k1u+1x1/xdrgK0WLPOVfY6FLcxyxkL+Asr3k1q7JAEFu pd2eOLCrqTcJmx3n5gSiHB/cZUqK46UYJbm2WfaGn7N5ytUV6I/2tofRkpsrksnKpFpG kiSAbyXhrIBo6oEdH4jCzYp8HkAHqJerQxGkBCqj3q7wb6shZuWEnN86YEhsYVp7gibs b8MpbIx6kpvQLe3AXo/rCdIe57j8fIZNhkY2BOOLJloxpixIX0jqY6yb85ExRpmYySoH Pt9JEv7jUNuyY4L4niRRoh/yfieCqogDhbZWYwVo/NbTQdaBy1LqEC/dL4c0u3VJXsGz QYMw== 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=62KhF+aHTJsms61syfsXVhbiLTTTHduiXAK5ql6cZIo=; b=eIKkYnnV4QshcanxinAY4R5RTv+gcHiH2ksCR3+7jcNRO5jutp7noBzYdL9ylnf4z/ 0nfOXY/WTjD1WX9bduW5mZyBm1jNOFSDS7qF0JwQQnjfOhURMgJKeO7JJp4bQ1z4OYM4 YacdRLK5Fs3AGvxMoPV+3Y70QsQ7UeNWarh6SCngl2eo6bbjjqHOX049d7b9qO65Etoa jY6IKYOHmtUtSefqZiGPmcF0+yh8Se6XzYiclmMKp8jVkz0AK0Dg3xzvdQ1D/I6lVKUx lbCEekJKd14h2RzJEuBf9MprCkZiToNWSDEnvsFYuyYdhDgtCfIzh0jxLhYPCJmZBNl4 iyIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=a9HLnfkB; 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=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p22si4961452uar.85.2021.05.09.08.20.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 May 2021 08:20:07 -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=fail header.i=@gmail.com header.s=20161025 header.b=a9HLnfkB; 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=amsat.org Received: from localhost ([::1]:59300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lflDz-0002yi-9a for patch@linaro.org; Sun, 09 May 2021 11:20:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lflAc-0005Hg-9K for qemu-devel@nongnu.org; Sun, 09 May 2021 11:16:38 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:55066) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lflAa-0005Mq-Ev for qemu-devel@nongnu.org; Sun, 09 May 2021 11:16:38 -0400 Received: by mail-wm1-x32e.google.com with SMTP id o127so7761021wmo.4 for ; Sun, 09 May 2021 08:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=62KhF+aHTJsms61syfsXVhbiLTTTHduiXAK5ql6cZIo=; b=a9HLnfkBeHQYqq2uhH/njwJCmKJs8fL64QZatvt/kLZn2/eoYkVOa6z9j6ALoc4aLs HrYsyWx0RNbVUdyEsxCF+IKrPLTEXPkcQRNHEt72eOnR2soFlq6Y8wSINbQBreYBQ3WO SnFPH3CQENfRtjdkWij5TM9osXc9cBUwzWx95BKR1JbqGmF/AzpCkTpOdXLl396vFAHK XEIPCd1AgjZVoK9J3xdqG4KkZLRTDLd31jP0BgIzqHi/YzEiEtj+lc+opnwDe1MdLq35 E6xwGMootkZ4ChYs62ay0V8Jfx9F3dpSFwPPxpI31RRNjbWfmGEuzZGnF4pmpbVHniU8 Ypow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=62KhF+aHTJsms61syfsXVhbiLTTTHduiXAK5ql6cZIo=; b=UBQFL/VWU6pL0emEKbIVum3lEtOoFNZEWnOLJVA0Qjyms6+lJ2/O1muZHDXihh6wYe dA+STuXE7ZiEmuGnTj0+ZVR7AmhY6QlGxiiBUPU7uWk5faKZnpk72WpeeLDNbHhKE+H6 6dlyqT8MqxUqbWXQiKuqnneG+zg1nm9IBrXjgoz5DVvNz6cHG0j+ZGqakzUJAUaK3GCG lrcwtsLcuvPh+ydpeg+BfkaaZ7np+nyQY4Bu98pPQlBhCwU+tsxgYLbx9sUmUcn52QGC QlEtL3nA7Pbj8yqXmPk/F/JAZq37ZppNkdx8bArAeNqUyxqp9Wm4/jGeK2/Mc3VO+5S8 MpCg== X-Gm-Message-State: AOAM5304CZvRbYaKOPrnpBNkSlA6eyJT0IlyhZyfi1L8QXASDTIZAf4r gItDrFSv7LnWYU8w3JqQkdS7fNhPxByGR6QM X-Received: by 2002:a7b:c0cb:: with SMTP id s11mr21618989wmh.146.1620573394933; Sun, 09 May 2021 08:16:34 -0700 (PDT) Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id d3sm4507459wrs.41.2021.05.09.08.16.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 08:16:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/9] accel/tlb: Rename TLBFlushPageBitsByMMUIdxData -> TLBFlushRangeData Date: Sun, 9 May 2021 17:16:12 +0200 Message-Id: <20210509151618.2331764-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210509151618.2331764-1-f4bug@amsat.org> References: <20210509151618.2331764-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: , Cc: Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Message-Id: <20210508201640.1045808-1-richard.henderson@linaro.org> [PMD: Split from bigger patch] Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/cputlb.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.26.3 diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index df5d5dbf879..36e7831ef70 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -762,11 +762,11 @@ typedef struct { target_ulong len; uint16_t idxmap; uint16_t bits; -} TLBFlushPageBitsByMMUIdxData; +} TLBFlushRangeData; static void tlb_flush_page_bits_by_mmuidx_async_0(CPUState *cpu, - TLBFlushPageBitsByMMUIdxData d) + TLBFlushRangeData d) { CPUArchState *env = cpu->env_ptr; int mmu_idx; @@ -790,7 +790,7 @@ tlb_flush_page_bits_by_mmuidx_async_0(CPUState *cpu, } static bool encode_pbm_to_runon(run_on_cpu_data *out, - TLBFlushPageBitsByMMUIdxData d) + TLBFlushRangeData d) { /* We need 6 bits to hold to hold @bits up to 63. */ if (d.idxmap <= MAKE_64BIT_MASK(0, TARGET_PAGE_BITS - 6)) { @@ -800,11 +800,11 @@ static bool encode_pbm_to_runon(run_on_cpu_data *out, return false; } -static TLBFlushPageBitsByMMUIdxData +static TLBFlushRangeData decode_runon_to_pbm(run_on_cpu_data data) { target_ulong addr_map_bits = (target_ulong) data.target_ptr; - return (TLBFlushPageBitsByMMUIdxData){ + return (TLBFlushRangeData){ .addr = addr_map_bits & TARGET_PAGE_MASK, .idxmap = (addr_map_bits & ~TARGET_PAGE_MASK) >> 6, .bits = addr_map_bits & 0x3f @@ -820,7 +820,7 @@ static void tlb_flush_page_bits_by_mmuidx_async_1(CPUState *cpu, static void tlb_flush_page_bits_by_mmuidx_async_2(CPUState *cpu, run_on_cpu_data data) { - TLBFlushPageBitsByMMUIdxData *d = data.host_ptr; + TLBFlushRangeData *d = data.host_ptr; tlb_flush_page_bits_by_mmuidx_async_0(cpu, *d); g_free(d); } @@ -828,7 +828,7 @@ static void tlb_flush_page_bits_by_mmuidx_async_2(CPUState *cpu, void tlb_flush_page_bits_by_mmuidx(CPUState *cpu, target_ulong addr, uint16_t idxmap, unsigned bits) { - TLBFlushPageBitsByMMUIdxData d; + TLBFlushRangeData d; run_on_cpu_data runon; /* If all bits are significant, this devolves to tlb_flush_page. */ @@ -854,7 +854,7 @@ void tlb_flush_page_bits_by_mmuidx(CPUState *cpu, target_ulong addr, async_run_on_cpu(cpu, tlb_flush_page_bits_by_mmuidx_async_1, runon); } else { /* Otherwise allocate a structure, freed by the worker. */ - TLBFlushPageBitsByMMUIdxData *p = g_memdup(&d, sizeof(d)); + TLBFlushRangeData *p = g_memdup(&d, sizeof(d)); async_run_on_cpu(cpu, tlb_flush_page_bits_by_mmuidx_async_2, RUN_ON_CPU_HOST_PTR(p)); } @@ -865,7 +865,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus(CPUState *src_cpu, uint16_t idxmap, unsigned bits) { - TLBFlushPageBitsByMMUIdxData d; + TLBFlushRangeData d; run_on_cpu_data runon; /* If all bits are significant, this devolves to tlb_flush_page. */ @@ -893,7 +893,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus(CPUState *src_cpu, /* Allocate a separate data block for each destination cpu. */ CPU_FOREACH(dst_cpu) { if (dst_cpu != src_cpu) { - TLBFlushPageBitsByMMUIdxData *p = g_memdup(&d, sizeof(d)); + TLBFlushRangeData *p = g_memdup(&d, sizeof(d)); async_run_on_cpu(dst_cpu, tlb_flush_page_bits_by_mmuidx_async_2, RUN_ON_CPU_HOST_PTR(p)); @@ -909,7 +909,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu, uint16_t idxmap, unsigned bits) { - TLBFlushPageBitsByMMUIdxData d; + TLBFlushRangeData d; run_on_cpu_data runon; /* If all bits are significant, this devolves to tlb_flush_page. */ @@ -935,7 +935,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu, runon); } else { CPUState *dst_cpu; - TLBFlushPageBitsByMMUIdxData *p; + TLBFlushRangeData *p; /* Allocate a separate data block for each destination cpu. */ CPU_FOREACH(dst_cpu) {