From patchwork Tue Dec 19 19:12:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755964 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1601934wra; Tue, 19 Dec 2023 11:17:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHqEBnlmUSd7IX0qhvcsm9G1HyHkWHgRFwM5JNvSt14kFfrIlDAcJl90OSRn12/G4z9SpsH X-Received: by 2002:a05:6214:29ca:b0:67f:2d16:a2e4 with SMTP id gh10-20020a05621429ca00b0067f2d16a2e4mr7519180qvb.104.1703013463440; Tue, 19 Dec 2023 11:17:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013463; cv=none; d=google.com; s=arc-20160816; b=sIMo5mgHG7ra54FUzhaOtpfFpcKfL/L9483Sc1zWz0/AJErEdHHjNmE2p2qGHSxCv1 Yg4Jn0EmPXJWnx4J3vHcLHqUDOJ8DIjO+Ecxy9yMWvWPBpZLPvLNUw/ro0fS1gi2nADr mRaDwB9bDsZUCSSBRt8ECsWpPM38T/HZ5Xib83M7lYmv8M3/hkeTZxgilS3zfW5MTLht ZiQQUWpz+n0Fdv0kbc4cOVyM91c/DrD4a1R40ryndZnGcxicaYPhbSzdRSccElq7bmHz Lq6aQY397CuuyHgJpwPruhN3AEfUUStQM0mz+9q7h4W8kmgMISwOJIIRfuCPPbIUVu34 Gujw== 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=YAewmSP9F+VoC5qgl8O0d9adIruOSueyhNLq1gS1SEk=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=R689MEGi3hUpwG6foVKQNyQ9r/61t5jE63kD2ob3qtiGmQ6j5FG0RLkNc3AoxvwwTd pewogfW9sI5l2jCS/nwgk3VHgZlQjtHOe+nzgtZh53CibjosFPZ4QxbGqfpPrzZVaefw ZtFAYH6N2KDJEMkbBzH9oG9AegbmrxSiiG0if6rFxLObD0quYgEive9n8XOHV7uDNY/4 aaffXDeHggY2ktbrFSIuyJkerMfCqe879v3kybi660YKVQIITDCaG6hzhnwGYj5hP8aB Jg9ILFh+M3utp13KMi/ckysHkfO9/ZJL9AQnPkbX26/JZWld0ltVQ38FH/6i4L+qbj4u t3cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a6aV5kx6; 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 y25-20020a0c9a99000000b0067f38fde213si6323329qvd.463.2023.12.19.11.17.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:17:43 -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=pass header.i=@linaro.org header.s=google header.b=a6aV5kx6; 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 1rFfWo-0001oL-PB; Tue, 19 Dec 2023 14:13:18 -0500 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 1rFfWl-0001k6-4i for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:15 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFfWi-0001lQ-RP for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:14 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-33664b6d6abso2681141f8f.2 for ; Tue, 19 Dec 2023 11:13:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703013191; x=1703617991; darn=nongnu.org; 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=YAewmSP9F+VoC5qgl8O0d9adIruOSueyhNLq1gS1SEk=; b=a6aV5kx6XXbTgfYG0QrYkTP8fWT/jc5PHaGDV33fiCASmTOAgrC9bE0sMuJ+jHXaJO NDQctOBv7SMpNDLhc3zCv02134DOc8UzyDUAgDAYF46Z6rydO8ZoiYj3L3KekzXmXcfh LLu03ppUbaQkqL5x0d6F/VkxuDh7VebFPqBSd2BNADUy6G1nPZTTxePKg+HXHJwlKa/p DSx+B88BZQSSBCsx1dXGvite6kkwmi7E6tpTmixfJ4tPf0OXKFEeiVhX4ieCEXe5axkU VJc8sgePwABpm85b4I+JwMf/trQNpHnolSPskfPxcXzwSo7LTz2zCGasqnz3LKr9cUG9 j2IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703013191; x=1703617991; 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=YAewmSP9F+VoC5qgl8O0d9adIruOSueyhNLq1gS1SEk=; b=Op6Bq+DJ7av5yj9Aaw+wVjnYTsSsQZMeyo3RyqPxaYrvFXNPlIADqUVCUDD62Lfqqu fUjnsLeONUw1v0S6TXcHhglkMtMdKPHoIlsHkJ1tvEgC3mYayoVd+fiSaV0DTyNw3JP6 gZoqLFwJ68awvn//9GzECMzbykMmnTGhasjk9RLdVSMB5zpdHgSh5tOlY+d8yYOthpSQ t5IgXGgky6Y/NheIN2/TKRcXr+uRlfh1JtB5/NiiJgrudLU6pSMyrbF8Pzu2QHJKWDF1 DxHvTonEpdCv3r0efnnx7KqO9unLsvXoL6kRbdKbHYc8QXIrqpKkcvzZslkZjuEFhNY7 yaBw== X-Gm-Message-State: AOJu0YwZHrMP468VIfNewFxHUy3qjVzwWaSDGteZHYiWHXaj9I2tZFzD KwV1fF9F5DpoyTdveK9wIt3vAttairpUsQo8oEk= X-Received: by 2002:a5d:4592:0:b0:336:6dba:e092 with SMTP id p18-20020a5d4592000000b003366dbae092mr1733394wrq.3.1703013191378; Tue, 19 Dec 2023 11:13:11 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f5-20020a5d5685000000b0033657376b62sm12007754wrv.105.2023.12.19.11.13.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:11 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/43] target/arm/kvm: Move kvm_arm_verify_ext_dabt_pending and unexport Date: Tue, 19 Dec 2023 19:12:28 +0000 Message-Id: <20231219191307.2895919-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219191307.2895919-1-peter.maydell@linaro.org> References: <20231219191307.2895919-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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 From: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Gavin Shan Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 10 -------- target/arm/kvm.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ target/arm/kvm64.c | 49 ------------------------------------- 3 files changed, 57 insertions(+), 59 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index fe6d824a52c..bb284a47de3 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -472,14 +472,4 @@ bool kvm_arm_hw_debug_active(CPUState *cs); struct kvm_guest_debug_arch; void kvm_arm_copy_hw_debug_data(struct kvm_guest_debug_arch *ptr); -/** - * kvm_arm_verify_ext_dabt_pending: - * @cs: CPUState - * - * Verify the fault status code wrt the Ext DABT injection - * - * Returns: true if the fault status code is as expected, false otherwise - */ -bool kvm_arm_verify_ext_dabt_pending(CPUState *cs); - #endif diff --git a/target/arm/kvm.c b/target/arm/kvm.c index b4836da6b25..696bc63e863 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -793,6 +793,63 @@ int kvm_get_vcpu_events(ARMCPU *cpu) return 0; } +#define ARM64_REG_ESR_EL1 ARM64_SYS_REG(3, 0, 5, 2, 0) +#define ARM64_REG_TCR_EL1 ARM64_SYS_REG(3, 0, 2, 0, 2) + +/* + * ESR_EL1 + * ISS encoding + * AARCH64: DFSC, bits [5:0] + * AARCH32: + * TTBCR.EAE == 0 + * FS[4] - DFSR[10] + * FS[3:0] - DFSR[3:0] + * TTBCR.EAE == 1 + * FS, bits [5:0] + */ +#define ESR_DFSC(aarch64, lpae, v) \ + ((aarch64 || (lpae)) ? ((v) & 0x3F) \ + : (((v) >> 6) | ((v) & 0x1F))) + +#define ESR_DFSC_EXTABT(aarch64, lpae) \ + ((aarch64) ? 0x10 : (lpae) ? 0x10 : 0x8) + +/** + * kvm_arm_verify_ext_dabt_pending: + * @cs: CPUState + * + * Verify the fault status code wrt the Ext DABT injection + * + * Returns: true if the fault status code is as expected, false otherwise + */ +static bool kvm_arm_verify_ext_dabt_pending(CPUState *cs) +{ + uint64_t dfsr_val; + + if (!kvm_get_one_reg(cs, ARM64_REG_ESR_EL1, &dfsr_val)) { + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + int aarch64_mode = arm_feature(env, ARM_FEATURE_AARCH64); + int lpae = 0; + + if (!aarch64_mode) { + uint64_t ttbcr; + + if (!kvm_get_one_reg(cs, ARM64_REG_TCR_EL1, &ttbcr)) { + lpae = arm_feature(env, ARM_FEATURE_LPAE) + && (ttbcr & TTBCR_EAE); + } + } + /* + * The verification here is based on the DFSC bits + * of the ESR_EL1 reg only + */ + return (ESR_DFSC(aarch64_mode, lpae, dfsr_val) == + ESR_DFSC_EXTABT(aarch64_mode, lpae)); + } + return false; +} + void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) { ARMCPU *cpu = ARM_CPU(cs); diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 40f459b7862..7d937e25390 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -1213,52 +1213,3 @@ bool kvm_arm_handle_debug(CPUState *cs, struct kvm_debug_exit_arch *debug_exit) return false; } - -#define ARM64_REG_ESR_EL1 ARM64_SYS_REG(3, 0, 5, 2, 0) -#define ARM64_REG_TCR_EL1 ARM64_SYS_REG(3, 0, 2, 0, 2) - -/* - * ESR_EL1 - * ISS encoding - * AARCH64: DFSC, bits [5:0] - * AARCH32: - * TTBCR.EAE == 0 - * FS[4] - DFSR[10] - * FS[3:0] - DFSR[3:0] - * TTBCR.EAE == 1 - * FS, bits [5:0] - */ -#define ESR_DFSC(aarch64, lpae, v) \ - ((aarch64 || (lpae)) ? ((v) & 0x3F) \ - : (((v) >> 6) | ((v) & 0x1F))) - -#define ESR_DFSC_EXTABT(aarch64, lpae) \ - ((aarch64) ? 0x10 : (lpae) ? 0x10 : 0x8) - -bool kvm_arm_verify_ext_dabt_pending(CPUState *cs) -{ - uint64_t dfsr_val; - - if (!kvm_get_one_reg(cs, ARM64_REG_ESR_EL1, &dfsr_val)) { - ARMCPU *cpu = ARM_CPU(cs); - CPUARMState *env = &cpu->env; - int aarch64_mode = arm_feature(env, ARM_FEATURE_AARCH64); - int lpae = 0; - - if (!aarch64_mode) { - uint64_t ttbcr; - - if (!kvm_get_one_reg(cs, ARM64_REG_TCR_EL1, &ttbcr)) { - lpae = arm_feature(env, ARM_FEATURE_LPAE) - && (ttbcr & TTBCR_EAE); - } - } - /* - * The verification here is based on the DFSC bits - * of the ESR_EL1 reg only - */ - return (ESR_DFSC(aarch64_mode, lpae, dfsr_val) == - ESR_DFSC_EXTABT(aarch64_mode, lpae)); - } - return false; -}