From patchwork Sat Jun 27 15:25:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beata Michalska X-Patchwork-Id: 191953 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1443542ilg; Sat, 27 Jun 2020 08:27:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjjlx1FFXNYcIMaoGnDfF26XXE+dyUzczdDbd23lOmf8HYMjMHljS3K1kWUQB15o8GsoLj X-Received: by 2002:a5b:f0b:: with SMTP id x11mr13119615ybr.342.1593271669456; Sat, 27 Jun 2020 08:27:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593271669; cv=none; d=google.com; s=arc-20160816; b=XA0Q0ihJcWJa4VspN5jm+DMnQ+65Lx+KdsCXExaxWZQTAyRdWydNTjP00BF6v9NMpP ivJEE6motiSP2QcEvOxX4vj8qMcJNG1DE9M1wZwE2dItCIOgV42CmE0XiV5XFnBjXJ4j 4RN/cg56qYVoezsoePLLiqj9vJqQpmcpJCvsddF0dJydXb37fU6LgJb8ky3unPNIdpGu TB4+Hjn0p7Qr/jGmBvSf3mb0qGZo7GkjPmEaFWE7rKdprTCGmtNUAZsbrrNFJYOP85kR 9BCm4lkNDvRwaB1lFHZ4PbiXswIQ01lB6e/BIuFkJkyzl6UreurPbxOGSAlw4CYyGYYB wHtg== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=n/6jUch7mGHyEeK3tacOaSSb1YHko1j6EhQD5+qAa6A=; b=BtrfqqiXW93ljQMYXtrO31AQXjDN+G2doBvQ4SX9uA424WTOLeJhpPAeq/7XvMOqHT xWnfupVkRsrWbhKONIW8OnzsUmO4tpv3bcclgxvqJ+N4/yweFFqMDz64C50w6ovwkb/x mWQO43wrYwVMXIba5/k9dCuYGoyI/zxXsQE+yra6+TLjI33H48z8mT2ejqSMHg3JCEsc MmiYkI6wIIyYX8lh4zwXeoQaIFd5d5tavrRXnYC9BOrIFZq9DGVAp4xAHDA5t/jrlQWA COH/6Fp5sgkzzunZwDt38b6krdr1xud88lUTOIcJvXnKYHMEwpTJCrNx+ZD29xwkfiZD s7iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=g+lTXTe5; 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 x17si28987863ybm.189.2020.06.27.08.27.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Jun 2020 08:27:49 -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=@linaro.org header.s=google header.b=g+lTXTe5; 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]:48312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpCk8-0006Cg-VG for patch@linaro.org; Sat, 27 Jun 2020 11:27:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpCis-0004Jl-S3 for qemu-devel@nongnu.org; Sat, 27 Jun 2020 11:26:30 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpCiq-0007TO-CD for qemu-devel@nongnu.org; Sat, 27 Jun 2020 11:26:30 -0400 Received: by mail-wr1-x442.google.com with SMTP id g18so12306896wrm.2 for ; Sat, 27 Jun 2020 08:26:27 -0700 (PDT) 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; bh=n/6jUch7mGHyEeK3tacOaSSb1YHko1j6EhQD5+qAa6A=; b=g+lTXTe5bhAAe4vDb1NZ7db+wwa2/yz2oQ8pEwuqKjtmq1B8+GU71Ku9eBNDWwS8CF eWKRe5ew5tR2Ug0G1mtMRFJjVhDzNGNDqUAMC/j+PI9HWdCFvzLNz2Zaw7Pb6O9pbeMK f2adRDciNW9aSFXPM2LP0r28vxNJZTQBn8LhqlU0JzBCozD25ugt6NDyF5fsTGQKG1i1 FKIJiF1FAG4F5/7dmhp9ST81S3AUV3dkcl19+Gm6hpYLI6ZTbBrFvYqz6BnLU6cpkzuu reIZX4y7MDEXSjASYQpxT/Qb33+x8urCxJVw3s3cUcEIMk2yKU5q8W83sg9V/OW//ZMx iZoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n/6jUch7mGHyEeK3tacOaSSb1YHko1j6EhQD5+qAa6A=; b=uT48lzv+WuZ8cJadA7OWsZOLs6iI+PlmnY/tZcr0+ehpvjHa8F8xGnhAzXf7lnJiB4 zP/DtrxYEt4NaOCcu2pKPT3Cd4XDUPHp6riW7ZR3Ly9YZ8/g2MHMAPTIth/8f1qFfBX4 gUo8UR4bG+Glg/tyKg0RkWe2sYHzQWw7c50cBhA3E1LtJRQDUd3vXzBY/Zlh7xLrbYf7 MSo5rVN9TrD7VRr+pfIUnXFyzF0k8Sey2Bb6vx/yFjItPZmw7Pye6LFhwvq0nmioY4Wg sQa1ZQFje/Ac59Eotf7vOu7i7MxoAmIVWmDy6p+lyFpI8iR0MCTK3wI0bEnf4xco/5hE 78WA== X-Gm-Message-State: AOAM532eOn1Fne+PCJ1eMP5hgZBjeQrOL25J5cq2i2TI+nKANBwf682Q 73TL9Pl0zMn9ite8T6M3l+4Az2EYAesUpw== X-Received: by 2002:a05:6000:cf:: with SMTP id q15mr9144736wrx.203.1593271586577; Sat, 27 Jun 2020 08:26:26 -0700 (PDT) Received: from moi-limbo-9350.home (host-92-18-20-3.as13285.net. [92.18.20.3]) by smtp.gmail.com with ESMTPSA id c6sm20965438wma.15.2020.06.27.08.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jun 2020 08:26:26 -0700 (PDT) From: Beata Michalska To: qemu-devel@nongnu.org Subject: [PATCH v7 2/2] target/arm: kvm: Handle misconfigured dabt injection Date: Sat, 27 Jun 2020 16:25:56 +0100 Message-Id: <20200627152556.7391-3-beata.michalska@linaro.org> In-Reply-To: <20200627152556.7391-1-beata.michalska@linaro.org> References: <20200627152556.7391-1-beata.michalska@linaro.org> Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=beata.michalska@linaro.org; helo=mail-wr1-x442.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: , Cc: peter.maydell@linaro.org, drjones@redhat.com, Christoffer.Dall@arm.com, qemu-arm@nongnu.org, pbonzini@redhat.com, kvmarm@lists.cs.columbia.edu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Injecting external data abort through KVM might trigger an issue on kernels that do not get updated to include the KVM fix. For those and aarch32 guests, the injected abort gets misconfigured to be an implementation defined exception. This leads to the guest repeatedly re-running the faulting instruction. Add support for handling that case. [ Fixed-by: 018f22f95e8a ('KVM: arm: Fix DFSR setting for non-LPAE aarch32 guests') Fixed-by: 21aecdbd7f3a ('KVM: arm: Make inject_abt32() inject an external abort instead') ] Signed-off-by: Beata Michalska --- target/arm/cpu.h | 2 ++ target/arm/kvm.c | 30 +++++++++++++++++++++++++++++- target/arm/kvm32.c | 34 ++++++++++++++++++++++++++++++++++ target/arm/kvm64.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ target/arm/kvm_arm.h | 10 ++++++++++ 5 files changed, 124 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 677584e..ed0ff09 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -570,6 +570,8 @@ typedef struct CPUARMState { uint64_t esr; } serror; + uint8_t ext_dabt_raised; /* Tracking/verifying injection of ext DABT */ + /* State of our input IRQ/FIQ/VIRQ/VFIQ lines */ uint32_t irq_line_state; diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 3ea6f9a..66d5ee5 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -749,6 +749,29 @@ int kvm_get_vcpu_events(ARMCPU *cpu) void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) { + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + + if (unlikely(env->ext_dabt_raised)) { + /* + * Verifying that the ext DABT has been properly injected, + * otherwise risking indefinitely re-running the faulting instruction + * Covering a very narrow case for kernels 5.5..5.5.4 + * when injected abort was misconfigured to be + * an IMPLEMENTATION DEFINED exception (for 32-bit EL1) + */ + if (!arm_feature(env, ARM_FEATURE_AARCH64) && + unlikely(!kvm_arm_verify_ext_dabt_pending(cs))) { + + error_report("Data abort exception with no valid ISS generated by " + "guest memory access. KVM unable to emulate faulting " + "instruction. Failed to inject an external data abort " + "into the guest."); + abort(); + } + /* Clear the status */ + env->ext_dabt_raised = 0; + } } MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) @@ -833,6 +856,8 @@ void kvm_arm_vm_state_change(void *opaque, int running, RunState state) static int kvm_arm_handle_dabt_nisv(CPUState *cs, uint64_t esr_iss, uint64_t fault_ipa) { + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; /* * Request KVM to inject the external data abort into the guest */ @@ -851,7 +876,10 @@ static int kvm_arm_handle_dabt_nisv(CPUState *cs, uint64_t esr_iss, */ events.exception.ext_dabt_pending = 1; - return kvm_vcpu_ioctl(cs, KVM_SET_VCPU_EVENTS, &events); + if (!kvm_vcpu_ioctl(cs, KVM_SET_VCPU_EVENTS, &events)) { + env->ext_dabt_raised = 1; + return 0; + } } else { error_report("Data abort exception triggered by guest memory access " "at physical address: 0x" TARGET_FMT_lx, diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index 7b3a19e..0af46b4 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -559,3 +559,37 @@ void kvm_arm_pmu_init(CPUState *cs) { qemu_log_mask(LOG_UNIMP, "%s: not implemented\n", __func__); } + +#define ARM_REG_DFSR ARM_CP15_REG32(0, 5, 0, 0) +#define ARM_REG_TTBCR ARM_CP15_REG32(0, 2, 0, 2) +/* + *DFSR: + * TTBCR.EAE == 0 + * FS[4] - DFSR[10] + * FS[3:0] - DFSR[3:0] + * TTBCR.EAE == 1 + * FS, bits [5:0] + */ +#define DFSR_FSC(lpae, v) \ + ((lpae) ? ((v) & 0x3F) : (((v) >> 6) | ((v) & 0x1F))) + +#define DFSC_EXTABT(lpae) ((lpae) ? 0x10 : 0x08) + +bool kvm_arm_verify_ext_dabt_pending(CPUState *cs) +{ + uint32_t dfsr_val; + + if (!kvm_get_one_reg(cs, ARM_REG_DFSR, &dfsr_val)) { + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + uint32_t ttbcr; + int lpae = 0; + + if (!kvm_get_one_reg(cs, ARM_REG_TTBCR, &ttbcr)) { + lpae = arm_feature(env, ARM_FEATURE_LPAE) && (ttbcr & TTBCR_EAE); + } + /* The verification is based on FS filed of the DFSR reg only*/ + return (DFSR_FSC(lpae, dfsr_val) == DFSC_EXTABT(lpae)); + } + return false; +} diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index f09ed9f..88cf10c 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -1497,3 +1497,52 @@ 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; +} diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 48bf5e1..471ddd1 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -453,6 +453,16 @@ 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); + +/** * its_class_name: * * Return the ITS class name to use depending on whether KVM acceleration