From patchwork Mon May 29 02:48:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 13258012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9A12EC77B7E for ; Mon, 29 May 2023 02:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=8mwBCB8+VOvOvbBFOaA6B/GzEZqo4v+5uGwURrkjrH0=; b=nFfxBHfmKmYXTq MGDq2xINyIvT/GDL8i++Yn4fVqGqsmh5rKgb6fOKYfxYY95d5kkJz0bKOGtUaVAC89NjnSJEe+XMo Pm97ODv4oVIY3+uDpOeFyKx9uA2lzdbY3HzYl7iX29NvTYNJ+D2HxL6oOBysRRl1UhGTMqQAFW7zc 3acDLuAxE3+kyBQpsZ1Wfq5p+I8QCcbrLUgJmf2/f2MInABDQqeovt3ktRDazqz0cUfmOINz7xypN tB/jTurVbHmQ/mSrxT3oYao59DBxyxgI0cfK/TK7UzIhV5cck3CyxtZJ/1eKLa3O3sK6jw/VhLL0i HY4GuJ4jowjA883L6PXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q3SwO-008uYU-2p; Mon, 29 May 2023 02:49:00 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q3SwM-008uXT-0L for linux-arm-kernel@lists.infradead.org; Mon, 29 May 2023 02:48:59 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-64d1e96c082so2075682b3a.1 for ; Sun, 28 May 2023 19:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1685328535; x=1687920535; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=G4Nb/gFMm8Ye9wyALRV/xgn92872VRuD4vbstmC2QEw=; b=NOjWamSYnCLQvYfKu8DJq+B0/i3lMIg0lSMnghs2kA7eYtwehwitTw8cfLbYhKd0ju foqc4dLoVmDgrUN4Ezs5H6a7UBsIJyFrXiEacDO5HjrImstFrJvGqwuZrTatKkTAarSE O+Y2NpFKFMia/vtb7J1ZW03ErSdff5CWJI7/jkRzHLzbcdT4JCqNigWlprjEou16haR6 Pl0P+rk2jW8g8oJx7qBpc4A1n3D6xsfQX5BwzPvKJO3WcrhXerEgnyX6/Pa/4w0Vm83i 6CFPiuIuLuF8HOg6QCCOk/haz6HHhzZn4V+eoWVH1z27pqmnnEBa/0ximUKIKtaAC/IJ jFYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685328535; x=1687920535; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=G4Nb/gFMm8Ye9wyALRV/xgn92872VRuD4vbstmC2QEw=; b=gEPz7LigH5EBXceptg/Ig9EiIzwQ4gQuzML2TVGEwVbvzowJLpf69TjJXhG245q69+ 1M9sFkdvS5EmNzLArFs2vl0dOJmhMJ+G+6QmkZ5z+I+/plumHoZQ3DE6acKEXtUY2fC+ S8TnQTszxUkNS4aAvxQAnsG1o1ypaLmT1jC2finUDo90iMQ8kXz9vtbkQLHBfGwsZ+qB l8Xe63qfAW4NoHr3Dhf6pAbnzaxSWvprmWoM/NL9sl/ikvG3NenRXCLtQGOKeBgEDcOe E3ZrxL538+jOv1QWdD1yleZ3w9ntmVvBMVfZ6CpCs1UMIdB8evNYeQd48MC9ycTetX3H 2Ryw== X-Gm-Message-State: AC+VfDxQC41Wtf/5pzov5x5FhK5DKLciQSQx6tWS6S5wl7/gwrtafVqg NxneALYl4f7cOiTorctWMTojNAacXn/4GdFVT0w= X-Google-Smtp-Source: ACHHUZ4mx6kzGcSLWLye7VJKM8QzXipRR+WZ0JOezVy9o+7MbOB0M4Cmb/lafTqjjm77gYCEBD9Uxw== X-Received: by 2002:a05:6a00:1486:b0:647:b6c9:179d with SMTP id v6-20020a056a00148600b00647b6c9179dmr15084106pfu.21.1685328535460; Sun, 28 May 2023 19:48:55 -0700 (PDT) Received: from fedora.. ([157.82.203.71]) by smtp.gmail.com with ESMTPSA id c8-20020aa78c08000000b0063d2d9990ecsm5791039pfd.87.2023.05.28.19.48.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 19:48:55 -0700 (PDT) From: Akihiko Odaki To: Cc: Marc Zyngier , James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Akihiko Odaki Subject: [PATCH] KVM: arm64: Populate fault info for watchpoint Date: Mon, 29 May 2023 11:48:47 +0900 Message-Id: <20230529024847.8671-1-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230528_194858_142261_1ECBD83D X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When handling ESR_ELx_EC_WATCHPT_LOW, far_el2 member of struct kvm_vcpu_fault_info will be copied to far member of struct kvm_debug_exit_arch and exposed to the userspace. The userspace will see stale values from older faults if the fault info does not get populated. Fixes: 8fb2046180a0 ("KVM: arm64: Move early handlers to per-EC handlers") Signed-off-by: Akihiko Odaki --- arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- arch/arm64/kvm/hyp/nvhe/switch.c | 6 ++++-- arch/arm64/kvm/hyp/vhe/switch.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 07d37ff88a3f..2eb0a1481ead 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -351,7 +351,7 @@ static bool kvm_hyp_handle_cp15_32(struct kvm_vcpu *vcpu, u64 *exit_code) return false; } -static bool kvm_hyp_handle_iabt_low(struct kvm_vcpu *vcpu, u64 *exit_code) +static bool kvm_hyp_handle_generic_fault(struct kvm_vcpu *vcpu, u64 *exit_code) { if (!__populate_fault_info(vcpu)) return true; diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c index c2cb46ca4fb6..1b77866079dc 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -184,8 +184,9 @@ static const exit_handler_fn hyp_exit_handlers[] = { [ESR_ELx_EC_SYS64] = kvm_hyp_handle_sysreg, [ESR_ELx_EC_SVE] = kvm_hyp_handle_fpsimd, [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, - [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low, + [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_generic_fault, [ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low, + [ESR_ELx_EC_WATCHPT_LOW] = kvm_hyp_handle_generic_fault, [ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth, }; @@ -194,8 +195,9 @@ static const exit_handler_fn pvm_exit_handlers[] = { [ESR_ELx_EC_SYS64] = kvm_handle_pvm_sys64, [ESR_ELx_EC_SVE] = kvm_handle_pvm_restricted, [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, - [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low, + [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_generic_fault, [ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low, + [ESR_ELx_EC_WATCHPT_LOW] = kvm_hyp_handle_generic_fault, [ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth, }; diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c index 1a97391fedd2..08ae0ee4697b 100644 --- a/arch/arm64/kvm/hyp/vhe/switch.c +++ b/arch/arm64/kvm/hyp/vhe/switch.c @@ -108,8 +108,9 @@ static const exit_handler_fn hyp_exit_handlers[] = { [ESR_ELx_EC_SYS64] = kvm_hyp_handle_sysreg, [ESR_ELx_EC_SVE] = kvm_hyp_handle_fpsimd, [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, - [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low, + [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_generic_fault, [ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low, + [ESR_ELx_EC_WATCHPT_LOW] = kvm_hyp_handle_generic_fault, [ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth, };