From patchwork Sun Jun 28 15:04:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beata Michalska X-Patchwork-Id: 11630185 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0152B6C1 for ; Sun, 28 Jun 2020 15:06:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CC0AC206F1 for ; Sun, 28 Jun 2020 15:06:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="HyxZEMdm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC0AC206F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpYtK-0008DW-18 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 28 Jun 2020 11:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpYs9-0006dN-7Y for qemu-devel@nongnu.org; Sun, 28 Jun 2020 11:05:33 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:37912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpYs7-0002ok-F1 for qemu-devel@nongnu.org; Sun, 28 Jun 2020 11:05:32 -0400 Received: by mail-wm1-x343.google.com with SMTP id f18so13744935wml.3 for ; Sun, 28 Jun 2020 08:05:31 -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=YHUnlNTYL8kuwF/dn9zQBQSu72vzEY0j8LWMkkY+iTA=; b=HyxZEMdmMjenhtVIcvxQthheSRFco077pY8WtkXUY41J9AOZbJXSuE7IWO+rGrLB3Z 2B4EDaaZWBGHR3fmBcY2w5N2lmYbjL6MnsSHEZybnXkfLY//RYJOlnoQ64WkkzFYABm2 RfchE1b7rOOqM/tOboxQk510JiBuersjrMsxMZKtN9d+pCxIIwwcIg4UU9Sjsq84QO9I 2AcuB8wK9Rtz/sJfzMqB6Kr970cB1wsX8pDy2nzV+xDpaRLlOz8gdRgCmyJeCCg1Wf8w TFR0AJ/G9fj2qjKC7GOo6mL2V9O956bzPNEN0tsM4p1Ss132mk7BlOJcshNczi2YlEP5 vQtQ== 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=YHUnlNTYL8kuwF/dn9zQBQSu72vzEY0j8LWMkkY+iTA=; b=EMWoaoTBoSU/XS2B2dYEror0YWihI8Ha9yoY+mc9Zh7XfO1I7MerpLxsL7HDIUckRG Vl1wAOr6gQUFAciOdXPPmHrP65fKA9QFsq4ccZCHU1YJg4uJ7KmHublo4m8aDPnRND3+ vgYbsEy6L0cpiqhYjJW+GXRC1pdpWLlPry0+mhX3Tg4j+U2/nLAwONODs1d8dPqiw0Qk j6jx/TWV+AHuqq57iZrlRylEj23BJq1QjB2tRnVnDyvpAGm5xJd5ODEWxZINOo2i4c+w 64MmEK2yto0Xw90vhAuyT7u2o9kgfNFKxXHAzbjt3Mw7KZhPxI9FYVExnF5SMQbD0r/e GGLw== X-Gm-Message-State: AOAM530BIkNOsXVYGsf2gmswmluce3T+Pi9PfGSQDiYLRrnswrwb4btp xAFFNHLZjbJ4FiwNKfycs2EpFs7qOmu79g== X-Google-Smtp-Source: ABdhPJyeMSzzQ8V3207HGWeldbYr7eNX75C2WX5LkGOOqwTYusGay/wVePdb66wcQXkRCO8Gn2IlsQ== X-Received: by 2002:a05:600c:2253:: with SMTP id a19mr12253529wmm.136.1593356729962; Sun, 28 Jun 2020 08:05:29 -0700 (PDT) Received: from moi-limbo-9350.home (host86-139-146-71.range86-139.btcentralplus.com. [86.139.146.71]) by smtp.gmail.com with ESMTPSA id n5sm21309350wmi.34.2020.06.28.08.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 08:05:29 -0700 (PDT) From: Beata Michalska To: qemu-devel@nongnu.org Subject: [PATCH v8 1/2] target/arm: kvm: Handle DABT with no valid ISS Date: Sun, 28 Jun 2020 16:04:58 +0100 Message-Id: <20200628150459.18566-2-beata.michalska@linaro.org> In-Reply-To: <20200628150459.18566-1-beata.michalska@linaro.org> References: <20200628150459.18566-1-beata.michalska@linaro.org> Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=beata.michalska@linaro.org; helo=mail-wm1-x343.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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" On ARMv7 & ARMv8 some load/store instructions might trigger a data abort exception with no valid ISS info to be decoded. The lack of decode info makes it at least tricky to emulate those instruction which is one of the (many) reasons why KVM will not even try to do so. Add support for handling those by requesting KVM to inject external dabt into the quest. Signed-off-by: Beata Michalska Reviewed-by: Andrew Jones --- target/arm/kvm.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index eef3bbd..2dd8a9a 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -39,6 +39,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = { static bool cap_has_mp_state; static bool cap_has_inject_serror_esr; +static bool cap_has_inject_ext_dabt; static ARMHostCPUFeatures arm_host_cpu_features; @@ -245,6 +246,16 @@ int kvm_arch_init(MachineState *ms, KVMState *s) ret = -EINVAL; } + if (kvm_check_extension(s, KVM_CAP_ARM_NISV_TO_USER)) { + if (kvm_vm_enable_cap(s, KVM_CAP_ARM_NISV_TO_USER, 0)) { + error_report("Failed to enable KVM_CAP_ARM_NISV_TO_USER cap"); + } else { + /* Set status for supporting the external dabt injection */ + cap_has_inject_ext_dabt = kvm_check_extension(s, + KVM_CAP_ARM_INJECT_EXT_DABT); + } + } + return ret; } @@ -810,6 +821,45 @@ void kvm_arm_vm_state_change(void *opaque, int running, RunState state) } } +/** + * kvm_arm_handle_dabt_nisv: + * @cs: CPUState + * @esr_iss: ISS encoding (limited) for the exception from Data Abort + * ISV bit set to '0b0' -> no valid instruction syndrome + * @fault_ipa: faulting address for the synchronous data abort + * + * Returns: 0 if the exception has been handled, < 0 otherwise + */ +static int kvm_arm_handle_dabt_nisv(CPUState *cs, uint64_t esr_iss, + uint64_t fault_ipa) +{ + /* + * Request KVM to inject the external data abort into the guest + */ + if (cap_has_inject_ext_dabt) { + struct kvm_vcpu_events events = { }; + /* + * The external data abort event will be handled immediately by KVM + * using the address fault that triggered the exit on given VCPU. + * Requesting injection of the external data abort does not rely + * on any other VCPU state. Therefore, in this particular case, the VCPU + * synchronization can be exceptionally skipped. + */ + events.exception.ext_dabt_pending = 1; + /* + * KVM_CAP_ARM_INJECT_EXT_DABT implies KVM_CAP_VCPU_EVENTS + */ + return kvm_vcpu_ioctl(cs, KVM_SET_VCPU_EVENTS, &events); + + } else { + error_report("Data abort exception triggered by guest memory access " + "at physical address: 0x" TARGET_FMT_lx, + (target_ulong)fault_ipa); + error_printf("KVM unable to emulate faulting instruction.\n"); + } + return -1; +} + int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) { int ret = 0; @@ -820,7 +870,12 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) ret = EXCP_DEBUG; } /* otherwise return to guest */ break; - default: + case KVM_EXIT_ARM_NISV: + /* External DABT with no valid iss to decode */ + ret = kvm_arm_handle_dabt_nisv(cs, run->arm_nisv.esr_iss, + run->arm_nisv.fault_ipa); + break; + default: qemu_log_mask(LOG_UNIMP, "%s: un-handled exit reason %d\n", __func__, run->exit_reason); break;