From mboxrd@z Thu Jan 1 00:00:00 1970 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 701A0C4167B for ; Wed, 6 Dec 2023 11:15:37 +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:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8JwhRdNeSA15r0NTpHbp5m1ymbq+IlDv0qFZ3Kjo410=; b=AYEQfCfqml/3G/1GnCwlD1Rcc/ 6GXjyfNQn88/TlNLVCDwzeM+9iK/6A3iv0sYI1dFflFHf1yaPuw56PhsDbyaBinhT3hgQ0eWwV/zY bU4U810DL8+yev/zq9TMuTT2cTA6lzKhtzgsF5409xiEMcet1qPgtyniYznSZevYVQbiC/WCiT66o xaQ1RuuA8idjvsAPCYVsMWhvSZBXOcIFcZCFP9nLrWYc6k8I9bT8twlzi6IhEI/8l9xxL15VudADj m1rPqeY618n8ZBZFZ4vdP2PyTdtaLmSD4Ks/GR/+HhlK0UpJ/xc89Za5S7YPcICqTZq4Q42O+ZdIs l3b0KnYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rApsL-009teN-0v; Wed, 06 Dec 2023 11:15:33 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAomb-009dDS-2D for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2023 10:05:35 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5c941936f7fso5874827b3.0 for ; Wed, 06 Dec 2023 02:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701857132; x=1702461932; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=hrfldcOZCeMx7EH6nJTIZOW2ImS4e6CjoBRwxFPBnYY=; b=3h+Vehwhmq0Fxe4QClF1fdJdLYwiejGVcl61JWvXMHihbEt9OgbJPeryJE8+boMF+F Negt5muGm++6gigE2irp3mIkm8+FL7gOQW3gq3Rm1HeHm1u3YOzXualSfGvWANy0Rm5G LJp1sXGOapttp/aCrjt9Pb3cIN7wFonvV/6Uep/Z+53Cu6YxNf9a+l61KEKtnbBBMVRx RsMxsHCaBT06nb8gkaWJ2STV1PNwAHQ1hDCEbSPSzfElwcG37O7nTAd/+l0M0j3kEV5U Em7LhqTfODu79cGQhN4QkQ/BvF0QlqYeT4HAmQJflWUVzDPqILCFV5Mr5rh9esHoPmQm IVrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701857132; x=1702461932; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hrfldcOZCeMx7EH6nJTIZOW2ImS4e6CjoBRwxFPBnYY=; b=RGsykP8NdlOUjqyp22EoTZ1F35DaoCIrBqfiquB5gR5777uLoikLxU2bz/c25t0EO3 jpVLmmurYTaxNSwbcfcRjHMyhvYhs5/XGTpAGvn9eUOavv439/6Gkp+EoxNGRbcDAE2R alCTe4ex0iwKZqPEO47krOsevDijBh1GALi3rCEmVjQqORoEFAwXjmqRfyZdIo89mBBT fnzQyclvzMCpCM/APum+JiS9jcEPYwTwtQq57fUCszC69fUy7yFWtY0Mcym/FbBa62pH w7ADm5bbVte7HCgmgipWITcIxVamDOWtcwdz/OEjzFMLQTtFBeyk5hw4JfK7//EdKQzn llYA== X-Gm-Message-State: AOJu0Yw3Rit2YcPi/NO01wwJEnI2iL0MeIXzi8xLfC4LdA3THGcmevmQ kODINhqNEIv97Tv+XGvKx1oK5C/3hw== X-Google-Smtp-Source: AGHT+IGzrK8EB8ayunJchvbQsIRFZYUpQibF48L1UBSApQWsOQGeXNXv4lAo2xGY5BO41qaP5geB/xZKyA== X-Received: from fuad.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1613]) (user=tabba job=sendgmr) by 2002:a05:6902:51:b0:da3:b467:af07 with SMTP id m17-20020a056902005100b00da3b467af07mr83570ybh.2.1701857132544; Wed, 06 Dec 2023 02:05:32 -0800 (PST) Date: Wed, 6 Dec 2023 10:05:01 +0000 In-Reply-To: <20231206100503.564090-1-tabba@google.com> Mime-Version: 1.0 References: <20231206100503.564090-1-tabba@google.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Message-ID: <20231206100503.564090-12-tabba@google.com> Subject: [PATCH v2 11/12] KVM: arm64: Trap external trace for protected VMs From: Fuad Tabba To: kvmarm@lists.linux.dev Cc: maz@kernel.org, oliver.upton@linux.dev, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, eric.auger@redhat.com, jingzhangos@google.com, joey.gouly@arm.com, tabba@google.com, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231206_020533_742709_B7A1CF4B X-CRM114-Status: GOOD ( 11.45 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pKVM does not support external trace for protected VMs. Trap external trace, and add the ExtTrcBuff to make it possible to check for the feature. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 4 ++++ arch/arm64/tools/sysreg | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 9d23a51d7f75..84b5c3f387d8 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -136,6 +136,10 @@ static void pvm_init_traps_aa64dfr0(struct kvm_vcpu *vcpu) cptr_set |= CPTR_EL2_TTA; } + /* Trap External Trace */ + if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_ExtTrcBuff), feature_ids)) + mdcr_clear |= MDCR_EL2_E2TB_MASK << MDCR_EL2_E2TB_SHIFT; + vcpu->arch.mdcr_el2 |= mdcr_set; vcpu->arch.mdcr_el2 &= ~mdcr_clear; vcpu->arch.cptr_el2 |= cptr_set; diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 85f8b385fed2..be857797cc00 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -1115,7 +1115,10 @@ Enum 63:60 HPMN0 0b0000 UNPREDICTABLE 0b0001 DEF EndEnum -Res0 59:56 +UnsignedEnum 59:56 ExtTrcBuff + 0b0000 NI + 0b0001 IMP +EndEnum UnsignedEnum 55:52 BRBE 0b0000 NI 0b0001 IMP -- 2.43.0.rc2.451.g8631bc7472-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel