From patchwork Tue May 30 02:46:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 13259180 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 3114EC7EE23 for ; Tue, 30 May 2023 02:47:48 +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=xlenJyFuFHLTHo1SZbxo1K+uUdIvKwaA1VORCgcC4p4=; b=YzOJzyR87gHL8D rlHEZVYlOKfXW23k6V5feZ/X3G8kGEAGjWM5xsPhIFO2PGBdk/dc7e+YH85G6a6oxdQCm2TcfOR+z jQmbjr2zMpw0p7zZzruPkrCfVAGkdmVp2bXqeCfKi12f9I6YRaCG9uK2tnfCacal/aKCX+wiC3ECi 8ED+WSRXu5i8jKwzi0iOin1Lbej59s1X5T9pYlAloZ1jRjsoeWYXu0y99Hi6PzDhe1FgFD9rrfQhg dciRj7q8HzzJJ5mpm7ZAiHioTW/I/uRRb7GVhiuiDwDlFr49H4wvQu4++VP37X6YnBXY8ScfRvU7h 0Gt87p0AObsNtp7rlipQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q3pOP-00CERh-1j; Tue, 30 May 2023 02:47:25 +0000 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q3pOJ-00CEQm-1f for linux-arm-kernel@lists.infradead.org; Tue, 30 May 2023 02:47:23 +0000 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1ae3fe67980so35117065ad.3 for ; Mon, 29 May 2023 19:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1685414834; x=1688006834; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=alV8inSLdkpveU+gErF0Hqmj8NeaEg9f/ZBWhD5ez2U=; b=VXyb2L0Lk9rF7WpImdHVoDcV+wHY1TpjAjC6TnDsrpgVCNTBuP+09WDoovYSiQjFKp EyxL1UVZBQ8nW28vfQL72iihabRnhi/EkD8gk5OONuEfLhM+7gyFIuZ7gyhMgwCU+N4W pezZ+Dmt9GIkAGHjmh34aCGDBos3FhMi9ipGNE/4+KA2Jldfys+/6gNvVkHEqP2srBq3 T0H6/N5WI5tiwwj9Vk+x1MlRC9IL1vjeh4j22arGcxuzaoP267EdprZlv6D2nwJHQrn6 LLBLFXd1d0JlKwxP+YzIDQSbUuT51wptUFFfemshptbvqcUslGnBI1URWLf7UVKDT83K 35QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685414834; x=1688006834; 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=alV8inSLdkpveU+gErF0Hqmj8NeaEg9f/ZBWhD5ez2U=; b=ZgGuXreER678uSceuunjjLn8QFWqyaTDXSblASXWshKRT+4YqP04lh4kzTJz0b60ni kH5XkIXTE9ddwZWasXJ6FHdUoTbl6IZWFrOoDVg7hJUHEbs9p7cGbdhwnZKhQaMKyFjP NMdEPCdtb0cS7RmXLC/lYpgUDl5WYWOTfzd7oEtVfnqdR2xskrRk4wKhBJl3Qkn3hdhz W7PS4b3AI0MLzKS3GvvdlSLiMh+WPYfl700bPpRiN1DZ8Z0JeA4M0xcw1NUnwlstTkvC OdtIERaR3tZ7bYE1YjbnVKXsfsbeYXqQmLpI8j58MubPXFvcqYkWiotRaBaKySMtAgWF NP/A== X-Gm-Message-State: AC+VfDxH37OZycixYgfNlw4de17j1sb2NaN2SKTh0KU8tEm8FZLMsgx/ fXVJGNwFmpMYUtSi/DWqBWJLIA== X-Google-Smtp-Source: ACHHUZ5esirN+GjiMvMiqRhafSMP/4L6Nwl3/8gg9VPgzza/IsiTQ+IctgDBLZQizuhsmpqFTzEGGg== X-Received: by 2002:a17:902:da82:b0:1b0:5ce9:adbb with SMTP id j2-20020a170902da8200b001b05ce9adbbmr967084plx.45.1685414834012; Mon, 29 May 2023 19:47:14 -0700 (PDT) Received: from fedora.. ([157.82.203.71]) by smtp.gmail.com with ESMTPSA id 2-20020a170902c10200b001aaf370b1c7sm8926329pli.278.2023.05.29.19.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 19:47:13 -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 v2] KVM: arm64: Populate fault info for watchpoint Date: Tue, 30 May 2023 11:46:51 +0900 Message-Id: <20230530024651.10014-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-20230529_194719_553871_DD6C6A13 X-CRM114-Status: GOOD ( 12.55 ) 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") Suggested-by: Marc Zyngier Signed-off-by: Akihiko Odaki --- arch/arm64/kvm/hyp/include/hyp/switch.h | 8 ++++++-- arch/arm64/kvm/hyp/nvhe/switch.c | 2 ++ arch/arm64/kvm/hyp/vhe/switch.c | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 07d37ff88a3f..33f4d4200329 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -351,17 +351,21 @@ 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_memory_fault(struct kvm_vcpu *vcpu, u64 *exit_code) { if (!__populate_fault_info(vcpu)) return true; return false; } +static bool kvm_hyp_handle_iabt_low(struct kvm_vcpu *vcpu, u64 *exit_code) + __alias(kvm_hyp_handle_memory_fault); +static bool kvm_hyp_handle_watchpt_low(struct kvm_vcpu *vcpu, u64 *exit_code) + __alias(kvm_hyp_handle_memory_fault); static bool kvm_hyp_handle_dabt_low(struct kvm_vcpu *vcpu, u64 *exit_code) { - if (!__populate_fault_info(vcpu)) + if (kvm_hyp_handle_memory_fault(vcpu, exit_code)) return true; if (static_branch_unlikely(&vgic_v2_cpuif_trap)) { diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c index c2cb46ca4fb6..895fb3200076 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -186,6 +186,7 @@ static const exit_handler_fn hyp_exit_handlers[] = { [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low, [ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low, + [ESR_ELx_EC_WATCHPT_LOW] = kvm_hyp_handle_watchpt_low, [ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth, }; @@ -196,6 +197,7 @@ static const exit_handler_fn pvm_exit_handlers[] = { [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low, [ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low, + [ESR_ELx_EC_WATCHPT_LOW] = kvm_hyp_handle_watchpt_low, [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..45ac4a59cc2c 100644 --- a/arch/arm64/kvm/hyp/vhe/switch.c +++ b/arch/arm64/kvm/hyp/vhe/switch.c @@ -110,6 +110,7 @@ static const exit_handler_fn hyp_exit_handlers[] = { [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low, [ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low, + [ESR_ELx_EC_WATCHPT_LOW] = kvm_hyp_handle_watchpt_low, [ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth, };