From patchwork Wed Dec 6 10:04:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13481346 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 2D8A1C10DC1 for ; Wed, 6 Dec 2023 10:06:03 +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=OIpOjYpMuAWnYVeO5ZUjLFfTf6pCDTM85Z29TIno1t8=; b=h9uiUJPJ8ReoCqU8m5/FuM9wmp ACKfGhnk/+q+5HWaayKLkCcnL6RsA1ibfRW4qTaucT9R94MRf62g4avBRiBB69X6R2Ij7DaQ9opZX 7yjlyLrOagrLUjm+QZG+i3RtHwgMzkNL6is2V1R/zTAL2JMSvwsO4vmyxZ/OLJszRzZInmCF/m1XI e4E0RhXRC5LBW8JVMq5AaTujtVGiOC374UmQq2mrLYeWX83dLS6+JTdUGCloxmsW8odgd83QXodB8 JYqUq/xfgXld7hx1Rx+k3fVQrbh3I2tRTngHZwqmXcCXsCUw510k7P9EIU75+5kv8K5aj/BgUw8su cFk0LOLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAomZ-009dBr-0q; Wed, 06 Dec 2023 10:05:31 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAomW-009d7B-2J for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2023 10:05:30 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5d1ed4b268dso109361447b3.0 for ; Wed, 06 Dec 2023 02:05:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701857123; x=1702461923; 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=0rwJ30mtQDKT8Q+NADoqH7KGsOCgT9qo84vSBXBr5ag=; b=Nzwm+8X6tr86JgFAlNU920OFNC+JMyvF31rmm3tUako7SKcy9O93gL7hf3adNNBtiq FtZ0AIfPKDskRYx5LJwCmkkoG4vPem5MFo+uf4Yb+Gke8ANbeOmPa9enRwLtMSamB9pS vsxfWAgQePKnvcJZlS+mf1USBS9bbJY+15vRqoecILl3DjRnF61155BYLA2t4K4LVBTg K9mh6QyxKCh7V//gso1l2M78prWU3wWJhWDEd8wT8FHY+paF2TMMU7FzpskvDK90p+7X gbhCwUxdx+MeWSVQZ51srbglxayjFKrQHfoOsS8DD1k7NMuKAX85CcjAkT61QVkx+CJg dRjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701857123; x=1702461923; 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=0rwJ30mtQDKT8Q+NADoqH7KGsOCgT9qo84vSBXBr5ag=; b=t+ILG9CJe3xaYCq35qvkLmy3QOblGasVf8z0CjOasvDrZRTXqqnQTh/hHXoAIVIOiO c8op7WEIr29n+jVMW4iRp4pRYwpDAMXNWiP6NXwaWalQV1xgIjza8vgMe6J7kvyfvbu6 mZjD3qNVxcFmwik5Z5JNbwQK6YKeGe7H0Fzh5jRd0KqQKc8nlVVxlIHs9Qcehjoe3rcV h9TY2YcjLVBURuTKZrNhTv2dWxmNxY3saGZ7bip2+/tLiczj/oieZK9F7VCb7xHQYUBC y1Jmw9gfTGyy0KmhpuQb2swWjv2cWnNMKGssTJRQY/rlVPT9KeqX4AEcaw3ReiZlYOa3 ar4g== X-Gm-Message-State: AOJu0YxAE5wzB8Esbiu6Te8dMnwJt2ASAZ9D41AMJXO/tjX6PVhfd+ja aHzSazdBe9xn3/WFoajOXF7cQ3kESA== X-Google-Smtp-Source: AGHT+IGbI1V/lZzU72pljVYJRqszGeM94wQTaGKOFZNfAmCrHkJ+RF1iF3Ab3jJIweG3Lob8HrVaPkV+Dw== X-Received: from fuad.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1613]) (user=tabba job=sendgmr) by 2002:a81:be18:0:b0:5d4:27ab:83c with SMTP id i24-20020a81be18000000b005d427ab083cmr5758ywn.1.1701857122557; Wed, 06 Dec 2023 02:05:22 -0800 (PST) Date: Wed, 6 Dec 2023 10:04:57 +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-8-tabba@google.com> Subject: [PATCH v2 07/12] KVM: arm64: Add build validation for FGT trap mask values 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_020528_762263_12D6424F X-CRM114-Status: GOOD ( 10.56 ) 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 These checks help ensure that all the bits are accounted for, that there hasn't been a transcribing error from the spec nor from the generated mask values, which will be used in subsequent patches. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/include/hyp/switch.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 76a3d78b13d9..91d0f73161bd 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -79,6 +79,16 @@ static inline void __activate_traps_fpsimd32(struct kvm_vcpu *vcpu) clr |= ~hfg & __ ## reg ## _nMASK; \ } while(0) +/* + * Validate the fine grain trap masks. + * Check that the masks do not overlap and that all bits are accounted for. + */ +#define CHECK_FGT_MASKS(reg) \ + do { \ + BUILD_BUG_ON((__ ## reg ## _MASK) & (__ ## reg ## _nMASK)); \ + BUILD_BUG_ON(~((__ ## reg ## _RES0) ^ (__ ## reg ## _MASK) ^ \ + (__ ## reg ## _nMASK))); \ + } while(0) static inline void __activate_traps_hfgxtr(struct kvm_vcpu *vcpu) { @@ -86,6 +96,14 @@ static inline void __activate_traps_hfgxtr(struct kvm_vcpu *vcpu) u64 r_clr = 0, w_clr = 0, r_set = 0, w_set = 0, tmp; u64 r_val, w_val; + CHECK_FGT_MASKS(HFGRTR_EL2); + CHECK_FGT_MASKS(HFGWTR_EL2); + CHECK_FGT_MASKS(HFGITR_EL2); + CHECK_FGT_MASKS(HDFGRTR_EL2); + CHECK_FGT_MASKS(HDFGWTR_EL2); + CHECK_FGT_MASKS(HAFGRTR_EL2); + CHECK_FGT_MASKS(HCRX_EL2); + if (!cpus_have_final_cap(ARM64_HAS_FGT)) return;