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 E1F19C4332F for ; Thu, 14 Dec 2023 10:03:27 +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=2tKe4JIs5Bg33SB6LYtAQSKF9Jh6JJtecJ7KA3uiwPI=; b=gi4BqkrkDYNioRK2324pOic4cu 3aWIL+y77Lkk3dMNw3FF26PlHUG5AL0ILm/QFUbco45h/t9bhdfMN3mJSrMoIJUGL4Ybk/LLRPZB/ LJksRHQHr1lGUhlhCBSOOYYLM8UoLwfuVGlZTftwOdqfII2JSpVyNLIormYFY0314hyCGvzAN647O w1admU7jQEDzbRtJNLFLAdLyOsDPMC2BJFVVamGgw1zE+R+GkiAqHWwavKaWJkp3EhO1VMjFbRz4h xDb7+Yf/1B2/8CCp0NQBKexqezyAofiX6nWYmyL5/o7m/3y/ErAWmjiMtfS/3Nh8MwZiUd+z9ZfiT u9n/c7xg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDiYR-00HPH8-1z; Thu, 14 Dec 2023 10:02:55 +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 1rDiXy-00HOwS-1T for linux-arm-kernel@lists.infradead.org; Thu, 14 Dec 2023 10:02:27 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5d0c4ba7081so94682417b3.0 for ; Thu, 14 Dec 2023 02:02:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702548145; x=1703152945; 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=MtoBQdO9BZcT6cVULOx3THPVjJf72EU09T5C8iMtUIE=; b=IoWZZEv5t05KTJpW2G68w/0QudQdSoDJLVzi26uqYfUDjKYaGEZXoTs9Thka1U4IXO 05ZYsK4xTLWaaFNeqGLBpyjrOYpcejkslL1j1WVeOZQCbajkh/MpAN5mIGg1GDlHEoq2 RFsZepXty467al5Bt06wfyFcswRHhhHxzglQLZ28EJ5ZJgxYNVWVJnbkHtLktjnVoNbP xc8/701AP7XMLFwStj1LPoy/lYxl3ulGvwOsNt23flgHjQpQzX5egxjypuHFb8exLfxe 4+/w+mSDT3vTLa4O37940f4iqDGAVsAykSlW0jaO1THTAR3iJWIUifIfOJ5VK/B+t+CG ioWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702548145; x=1703152945; 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=MtoBQdO9BZcT6cVULOx3THPVjJf72EU09T5C8iMtUIE=; b=uDZxK3fkfi/Dpy+sLD3cb9gz4MHLJdAvSGlRkS1RyG4bWcEakhy/FHWpjkbE+N1FTN ntLG/O1cCEGRuuELw6hy36G2BbZUlLB28GfSqTHLZvcycjOWjQeohfN1lcexuXc7Z/SH y0UAt8FuO+FsQbrXB6O72TYeSTO/hcZtJEuAYuYjCON/V5o5i5FZ/ITOQgGnh9GbPQuD Y8X0lNUWQ6387gMnSBLZ5uBRl+LbQthvQCF4Q0am52XjVP/H+sriNFHn4KU4wGtV1HTc w/ONktN/kDv3DJjd34lGtiIr1Lt4RhiqkQzpvxv1argJ84yyLZHKVR2ltzOZ9u3syAiC pi+A== X-Gm-Message-State: AOJu0YxHWJNn1CfTvUNJuXefR4xZ8DoLTlML7gUyaCoriPCgh3HlpOCz PYYf516dLumvgIoGuEpMqU8IFzaMkg== X-Google-Smtp-Source: AGHT+IF3yQ4ifUSZxuey84w9AQVk0MTmWSACizMj1HStOjIjCJwuTOu76xneTkqOBFoVyWUvXJZXskiKxQ== X-Received: from fuad.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1613]) (user=tabba job=sendgmr) by 2002:a05:690c:891:b0:5d0:a744:719a with SMTP id cd17-20020a05690c089100b005d0a744719amr115733ywb.2.1702548145070; Thu, 14 Dec 2023 02:02:25 -0800 (PST) Date: Thu, 14 Dec 2023 10:01:51 +0000 In-Reply-To: <20231214100158.2305400-1-tabba@google.com> Mime-Version: 1.0 References: <20231214100158.2305400-1-tabba@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231214100158.2305400-12-tabba@google.com> Subject: [PATCH v3 11/17] 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, broonie@kernel.org, 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-20231214_020226_491701_E4E7DC37 X-CRM114-Status: GOOD ( 10.41 ) 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 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 22f3b916f60c..17ce40f5b006 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; -- 2.43.0.472.g3155946c3a-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel