From patchwork Wed May 31 04:02:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 687275 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1063355wru; Tue, 30 May 2023 21:12:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ79AIlnPUdOMGBiMlsEpENla2n1rOe4jcThfvW0rovmu+PCcqYQ1v+eis/gOlL97HvbvnPE X-Received: by 2002:ad4:5f8b:0:b0:623:86a9:7696 with SMTP id jp11-20020ad45f8b000000b0062386a97696mr4911680qvb.5.1685506329728; Tue, 30 May 2023 21:12:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685506329; cv=none; d=google.com; s=arc-20160816; b=G0VVTlTpXx6gEFQcsvK3iBmvLHgQDTp70Bn3FTR87hw+rEJN8KqYH/bT5Ebee+KE+J V7mtUPnQEycqZJ+kpcBViPTIFa5kHzoB9oA9YFJSPJov1LEGIEXgSw6ksKI4PREKtc+C H8Prg5eBV3oJA6nWsjHZoKKB0s9R2K3ZUAclzZTBzg5KJUAwLFMS7ldmWD4JhAHIWTx1 FXoV1I8YChOB6UZWXsAvzeEX4QOc5htVH9ISFSBQuCFzRA/11Dvst+DNiGm59NiO8gy0 eMo1P4Tt89MAsyKcDpPd4S1INw5fpkFqFMZH0cOcLx3QlaTfN+hPajxN14tkGfgEOTHO fmOA== 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=lLJ+OrJ6ZDoNmYA/4Pv3PzTB4pxZ5PUcgKGyl5lAA2g=; b=HmctSt/0ksGfPGwgFLvqZGSr+Fs6r5p0k7cZok7tZxcfbjGR43UsCcTXod15aaUV5e 5T0ICgO4J0bmY0ZxXzgm73QAlbtqBiHekhuu5yy5W63VS+nqMyVtCrXiPEjPgDQMWeY0 U1hbH2yv4YB9xi8S+5d2b6jr8RlKITGnMGkFO1U5XJtfUjoygx2A8IsK0wF9fJnfDAvj NPD0dCYiT5ywCUiLp9HHqYGCvc0e2C0mG6r7YjB5s0shurGyVeEzU/68yCxb2DvlsyQB cYY92Ve1ef9Tp9+bc7yG6/xlF8xXjCdeTdh2tcML93Ycitd5G8wC4qImTwc0VE3gvjso M7CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LUiCXAJT; 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 kl21-20020a056214519500b005ef631e043csi7537112qvb.350.2023.05.30.21.12.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 May 2023 21:12:09 -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=LUiCXAJT; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4D3s-000769-FV; Wed, 31 May 2023 00:03:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4D3p-0006sl-Ii for qemu-devel@nongnu.org; Wed, 31 May 2023 00:03:45 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4D3n-0006An-GK for qemu-devel@nongnu.org; Wed, 31 May 2023 00:03:44 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-64d5b4c400fso5913628b3a.1 for ; Tue, 30 May 2023 21:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685505820; x=1688097820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lLJ+OrJ6ZDoNmYA/4Pv3PzTB4pxZ5PUcgKGyl5lAA2g=; b=LUiCXAJTu77xq4A3gkmcONvnBd4ybBhi7enh9S43dotqsgy4EO4U50IaP0EQw3TFsC OKahk8heBUdU5MMJs18zINVDYvcPyI/obB8szuD9QV/yit9zoK88fqm2aZXUGTyZoy8b z85fV7/0/hcHf/PRMBdgU/FNitAbgiOekFF+K2PlKCMPmf8mGBZfuFnZ9U01UCfJGQHP npDk5GZ9LvTwGOPRT6/KolBmtS4vfF7g9uvR0gyflsUuEWtNGaNmQ1ufd3/6WUeIlh/h 1D2+IpgxMbvnTYLv8cfoFuUFd8mtOIqrPpdDYWiqSTT/Rj03rTqYRbB4JE4b7qmbmHyr S5Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685505820; x=1688097820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lLJ+OrJ6ZDoNmYA/4Pv3PzTB4pxZ5PUcgKGyl5lAA2g=; b=IGALE3UYxTDtveEVpca6vIjWuIoXgmX5ZZBLnjz7XD2J1pd3LNgPY3Cvqkd5ZVs90z inurFMNTnzyGkj5X11Gx118+nA+w1slAoPnbUKvD5suJWrpzau1id/oNQzeqDBnh5glE 2Cn4NU3xKBopPenwksN6wvAyNNBY6h17BlZ87zpd2Fi6sdbUhn5s5oNqjlGLB0AS/wrW DK0CriNnftYp406vp94t2fsQf361lklYeM7P7FGtJVKkL6X6fAgCF3W1TFvvszbHFZ6b C0ntVHvXKWtSikKRb5VRCxFkwQzmFxuZX8AZgfjxdXzKcfWu8nkIcOYKBfQjPr3+fdp8 ZvFA== X-Gm-Message-State: AC+VfDxcT/ZKsNQJ+NEiDMW0CShTGnkS7xj/qyIvFr55frdKcFatAAQX AGrimfBMa6Pu7IakXVxYZUyHjoqQeymPID0OPy0= X-Received: by 2002:a05:6a20:7491:b0:10f:7e62:3806 with SMTP id p17-20020a056a20749100b0010f7e623806mr5391743pzd.22.1685505820572; Tue, 30 May 2023 21:03:40 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:1cd:ec7a:a720:ce9a]) by smtp.gmail.com with ESMTPSA id j12-20020a63fc0c000000b005348af1b84csm194814pgi.74.2023.05.30.21.03.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 21:03:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 12/48] target/arm: Fix test of TCG_OVERSIZED_GUEST Date: Tue, 30 May 2023 21:02:54 -0700 Message-Id: <20230531040330.8950-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230531040330.8950-1-richard.henderson@linaro.org> References: <20230531040330.8950-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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=ham 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-bounces+patch=linaro.org@nongnu.org The symbol is always defined, even if to 0. We wanted to test for TCG_OVERSIZED_GUEST == 0. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/arm/ptw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 69c05cd9da..b0d2a05403 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -418,6 +418,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, uint64_t new_val, S1Translate *ptw, ARMMMUFaultInfo *fi) { +#ifdef TARGET_AARCH64 uint64_t cur_val; void *host = ptw->out_host; @@ -473,7 +474,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, * we know that TCG_OVERSIZED_GUEST is set, which means that we are * running in round-robin mode and could only race with dma i/o. */ -#ifndef TCG_OVERSIZED_GUEST +#if !TCG_OVERSIZED_GUEST # error "Unexpected configuration" #endif bool locked = qemu_mutex_iothread_locked(); @@ -497,6 +498,10 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, #endif return cur_val; +#else + /* AArch32 does not have FEAT_HADFS. */ + g_assert_not_reached(); +#endif } static bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx,