Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp1635320rdb; Tue, 20 Feb 2024 02:12:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVfKP/dPDMkPhQ8QbhbBe5Ad7OUO4d207BIEhTpioxqHPYlTflIbeZ62NaeGu2BQyngfgqPtVoinw4TBGyHz7XEC3HOe3nV+wE2wjRSEg== X-Google-Smtp-Source: AGHT+IFyTpBrHnh3dkGUAveJiYTc2AFIlxFCxZBZ8NyZglKltS9T2WZhZ4ZZG6bitQolhnyltV+A X-Received: by 2002:a17:906:81d9:b0:a3f:16ab:fb8b with SMTP id e25-20020a17090681d900b00a3f16abfb8bmr167859ejx.48.1708423962632; Tue, 20 Feb 2024 02:12:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708423962; cv=pass; d=google.com; s=arc-20160816; b=dbbzOt93sbiPgrHN4esd8lC/HllxPFfhx68viWJ2hHf8snY7TEsjw79MQKzS9nl5kD oBFqgK0/3y6Gd4f5/PPe97GHk2iCXEWZd8xbxw7GZ6yaJfHDT88F7OOXrdYe0/czTCCD +ylp3bKdXm39x59OLB57nGJ7TLN6b36tSMO1UmOi4zOk8bTAZgkpLF3KLWfAN06UXA6E WgM6l0gL0Wjr1dfWgUN1As9ha/UY3RvASKvHgTIiJedMc4rvf35QrsxagwWS+ivVrhfv SfR3QhXOs4HAcEsM4Yvw9H/1EdGqv5Vlr1nV+gPnMANqXUs216a08HvYdQ8zVvBotD3a +cRw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=SuhsoZ9yxkOtXNtwghRhzqlr7hjyEtGuwDfMDq0wIoM=; fh=e49+Q+0Mcu1JLYxRnP38UtpBElbVy5zcw2GZlArYJaY=; b=DpHNbCoyow15z/SqH5A+baeZdeCc5gv/F3OGe8VqWf3Vh+sikvFZWbApvMocsFrCV9 bMdGZNTVvWahXA0QSvv6R+5wm3tLwwCty6Tu4P4vO1u3M75W37vd+alRmgjF1wdZyjhn bSF6Z2wFG8I0qZfm1eDUgaq7qWi6gLvjIKWSCSPQq9Vk7fhLPTUOaJBMl3bbDOU28sFG c6HINq3pAUEaupQmtupETZ2+AfKG0sl6k3rZsPurWEcCGlMxXiK3RwvCy2AYZq6RcpRM cslZk0rF8d3AhlYFtOhjmqSxPzKPb3FJPrCQ78nKkIFEI75M82xCn7z/iQLspsptXdXL srRw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-72788-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72788-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id o18-20020a1709062e9200b00a3e4ca18f70si2597215eji.680.2024.02.20.02.12.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 02:12:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72788-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-72788-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72788-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 54D141F23D25 for ; Tue, 20 Feb 2024 10:12:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D86B361682; Tue, 20 Feb 2024 10:11:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 15A3261663 for ; Tue, 20 Feb 2024 10:11:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708423870; cv=none; b=U7X1iDY2grSzNB96BP6s0e2KXJX4FQHqtY4zlVq0s563PxjmexcZU1u70335WBIzn3FCVUE5suxtOBFsxmcZc5Up96NVmkAOcSLbnM31iPDN2RFIICLxXfXF7/W+IebF3NGKwRG1jcI36eu4zaMqDDtHfv1rxJ4RKWbe9frg63g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708423870; c=relaxed/simple; bh=cbxfJgCAmVL5Spatj5+lcM+mVBl+lKDc+gUzzsinU6E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B5Esfw1W/1CYBsYoDjuBATCcRQlMgv+0qw3UEuny2/jPjJhyMrDo2XRgL8we9JTbbgODH4JxbfsxJmVsBXSFZy/ps93kMI7rFGzF9rmTNCiE9FfFhd7OjNNEphs6EXi+U1Hpqk7uJvg41c3LhIRdjemzk/SkUqKB6POgILOs78U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 858DE1007; Tue, 20 Feb 2024 02:11:46 -0800 (PST) Received: from e127643.broadband (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7BD703F762; Tue, 20 Feb 2024 02:11:01 -0800 (PST) From: James Clark To: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, maz@kernel.org, suzuki.poulose@arm.com, acme@kernel.org, oliver.upton@linux.dev, broonie@kernel.org Cc: James Clark , James Morse , Zenghui Yu , Catalin Marinas , Will Deacon , Mike Leach , Alexander Shishkin , Anshuman Khandual , Miguel Luis , Joey Gouly , Ard Biesheuvel , Arnd Bergmann , Helge Deller , Greg Kroah-Hartman , Mark Rutland , Kalesh Singh , Ryan Roberts , Vincent Donnefort , Fuad Tabba , Jing Zhang , linux-kernel@vger.kernel.org Subject: [PATCH v5 6/7] arm64: KVM: Write TRFCR value on guest switch with nVHE Date: Tue, 20 Feb 2024 10:09:16 +0000 Message-Id: <20240220100924.2761706-7-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220100924.2761706-1-james.clark@arm.com> References: <20240220100924.2761706-1-james.clark@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The guest value for TRFCR requested by the Coresight driver is saved in kvm_guest_trfcr. On guest switch this value needs to be written to the register. Currently TRFCR is only modified when we want to disable trace completely in guests due to an issue with TRBE. Expand the __debug_save_trace() function to always write to the register if a different value for guests is required, but also keep the existing TRBE disable behavior if that's required. In pKVM, the kvm_guest_trfcr can't be read and the host isn't trusted, so always disable trace. __debug_restore_trace() now has to restore unconditionally, because even a value of 0 needs to be written to overwrite whatever was set for the guest. Signed-off-by: James Clark --- arch/arm64/kvm/hyp/nvhe/debug-sr.c | 53 +++++++++++++++++------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/debug-sr.c b/arch/arm64/kvm/hyp/nvhe/debug-sr.c index 4558c02eb352..3adac2e01908 100644 --- a/arch/arm64/kvm/hyp/nvhe/debug-sr.c +++ b/arch/arm64/kvm/hyp/nvhe/debug-sr.c @@ -51,30 +51,39 @@ static void __debug_restore_spe(u64 pmscr_el1) write_sysreg_s(pmscr_el1, SYS_PMSCR_EL1); } -static void __debug_save_trace(u64 *trfcr_el1) +static void __debug_save_trace(struct kvm_vcpu *vcpu) { - *trfcr_el1 = 0; - - /* Check if the TRBE is enabled */ - if (!(read_sysreg_s(SYS_TRBLIMITR_EL1) & TRBLIMITR_EL1_E)) - return; - /* - * Prohibit trace generation while we are in guest. - * Since access to TRFCR_EL1 is trapped, the guest can't - * modify the filtering set by the host. - */ - *trfcr_el1 = read_sysreg_s(SYS_TRFCR_EL1); - write_sysreg_s(0, SYS_TRFCR_EL1); - isb(); - /* Drain the trace buffer to memory */ - tsb_csync(); + u64 host_trfcr_el1 = read_sysreg_s(SYS_TRFCR_EL1); + u64 guest_trfcr_el1; + + vcpu->arch.host_debug_state.trfcr_el1 = host_trfcr_el1; + + /* Check if the TRBE buffer or pKVM is enabled */ + if (is_protected_kvm_enabled() || + (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRBE) && + read_sysreg_s(SYS_TRBLIMITR_EL1) & TRBLIMITR_EL1_E)) { + /* + * Prohibit trace generation while we are in guest. Since access + * to TRFCR_EL1 is trapped, the guest can't modify the filtering + * set by the host. + */ + write_sysreg_s(0, SYS_TRFCR_EL1); + isb(); + /* Drain the trace buffer to memory */ + tsb_csync(); + } else { + /* + * Tracing is allowed, apply the filters provided by the + * Coresight driver. + */ + guest_trfcr_el1 = kvm_guest_trfcr[vcpu->cpu]; + if (host_trfcr_el1 != guest_trfcr_el1) + write_sysreg_s(guest_trfcr_el1, SYS_TRFCR_EL1); + } } static void __debug_restore_trace(u64 trfcr_el1) { - if (!trfcr_el1) - return; - /* Restore trace filter controls */ write_sysreg_s(trfcr_el1, SYS_TRFCR_EL1); } @@ -85,8 +94,8 @@ void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu) if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_SPE)) __debug_save_spe(&vcpu->arch.host_debug_state.pmscr_el1); /* Disable and flush Self-Hosted Trace generation */ - if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRBE)) - __debug_save_trace(&vcpu->arch.host_debug_state.trfcr_el1); + if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRFCR)) + __debug_save_trace(vcpu); } void __debug_switch_to_guest(struct kvm_vcpu *vcpu) @@ -98,7 +107,7 @@ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu) { if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_SPE)) __debug_restore_spe(vcpu->arch.host_debug_state.pmscr_el1); - if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRBE)) + if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRFCR)) __debug_restore_trace(vcpu->arch.host_debug_state.trfcr_el1); } -- 2.34.1