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 4C61ECED606 for ; Wed, 9 Oct 2024 06:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wWCrDVY1QHGwuzKsAgSCJUox8r6YSpQfYuO0QZvJ8G4=; b=hPiFYjI0ZGq9yjvkH2pt5VRLE9 58P0z+MjlPXhrm6qWw0UCjsLuuTgFTynO98Mb0iCcIvXHkX2UNRXdGpy846Aa1NhFH9PjGr6d0GD5 1vOYAinWWAvODQD4tuv81d/rmN2R5s0q9FX1JpLGdrosBxfFuvfoe1XxGUGXjBSYdIYSkPKEEZtdM i5/j4aXOXX3XhzIrnK5/c/mxFsITNgpWJaLAV846hdEIH6/HvGqGPMBGWnaEuTSAY+5MZEmMD8g0p LJccRjiaTh/LZQwdxcfVh/UtXH9Mx/ztngkgH274N3OXPR13xJyfHTgiqiWVBayaZ5SpIojWHaDTX ryd5ztzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1syPy9-000000083qF-2NZg; Wed, 09 Oct 2024 06:14:45 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1syPwA-000000083dK-11KS for linux-arm-kernel@lists.infradead.org; Wed, 09 Oct 2024 06:12:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728454361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wWCrDVY1QHGwuzKsAgSCJUox8r6YSpQfYuO0QZvJ8G4=; b=Dfp8AhCWB33vnDz9gr/rdOJD9Mf37uO/n+tXWbYTp4j2W4GoPILzK5krl9vN2H2b4yyMQB aTEFxibWQhEKIbkNpsZM6/p8zuX2HoJnqijChih3fW3lakhVrD3nNpK2KsgadLvAKAQrcv J2YpJ+hEY7F/h3xHPxwhRNMUfOCIx8c= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-322-5mJJG9i5MGmbFsBZxDb0KA-1; Wed, 09 Oct 2024 02:12:39 -0400 X-MC-Unique: 5mJJG9i5MGmbFsBZxDb0KA-1 Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-2e28f0e4a54so524578a91.1 for ; Tue, 08 Oct 2024 23:12:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728454358; x=1729059158; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wWCrDVY1QHGwuzKsAgSCJUox8r6YSpQfYuO0QZvJ8G4=; b=rY0lkGDQlPzAf3OseSazTarfxATP1fzudJQT4Yr9U58/QwOvkyazK4mbEGm9a8Xouq EWf9pIacNDRgsqKG8ar8T0VOBxqrubn8IxGB7GQJQgVPEd9t6eOoGdM9JRzTxcUAvKHO Ya1z6ggtuvQICkX1/XxENKTUsmFmEi0ZzNTm1dEGUdVOxowgi75wlj6wkV2Qy2ZOpg6X gs+HGpO6o39vYzSji7G8YRPOvhvtbIdT9FKdexDXGyNBZNI98QYCObJGBSwew2HIYEnH 7JM6yRKLZE87xoQL/hcy8SqKeHkVc8GnqTSM3xLf+lAjnaOHHv4Xf7nDP0Tsg8yhPcb4 7a9w== X-Forwarded-Encrypted: i=1; AJvYcCXQ4sGna/tFuKb9fEBACwYMYk0RmM4h2dXWnilJFaAUTdtu5Yzv441yo5Dsl/NCgstzyIJAbEgZQhPydAraksAG@lists.infradead.org X-Gm-Message-State: AOJu0YwJnSeJPLa/ehi2YzwNWQxjNqk9aA3Z0ybqNwfTsQ+buprTgLLa 79Jl7eBgw6Br8aBNfm/ySyJjPcuT9OR1Nfx8n8I+xSk+SwyDlvXFpnVuinLMAKiJI60Fest6ECp du8O7iGSDGQX5b1hxlxdqaPBREjfcjD8spBB7CnUUXfsHXdZkGD8txpTSmu9M9K2r4EfdZ0Uz X-Received: by 2002:a17:90a:9a9:b0:2da:6e46:ad48 with SMTP id 98e67ed59e1d1-2e2a0758299mr2627908a91.1.1728454358716; Tue, 08 Oct 2024 23:12:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG7pK3x27vXs8b2CyjV7xUcxV0b7iw89YOVtT9MINIXxU8SElUIYRnvikpH62rBQwvm3L21nA== X-Received: by 2002:a17:90a:9a9:b0:2da:6e46:ad48 with SMTP id 98e67ed59e1d1-2e2a0758299mr2627882a91.1.1728454358313; Tue, 08 Oct 2024 23:12:38 -0700 (PDT) Received: from [192.168.68.54] ([43.252.112.159]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e2a58574f5sm716293a91.36.2024.10.08.23.12.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Oct 2024 23:12:37 -0700 (PDT) Message-ID: Date: Wed, 9 Oct 2024 16:12:31 +1000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 5/7] KVM: arm64: Add a macro for creating filtered sys_reg_descs entries To: Joey Gouly , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Cc: anshuman.khandual@arm.com, james.morse@arm.com, Marc Zyngier , Oliver Upton , Suzuki K Poulose , Zenghui Yu , Jing Zhang , Shameerali Kolothum Thodi , Catalin Marinas , Will Deacon References: <20241004110714.2051604-1-joey.gouly@arm.com> <20241004110714.2051604-6-joey.gouly@arm.com> From: Gavin Shan In-Reply-To: <20241004110714.2051604-6-joey.gouly@arm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241008_231244_162510_C61B11F9 X-CRM114-Status: GOOD ( 26.95 ) 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 On 10/4/24 9:07 PM, Joey Gouly wrote: > From: James Morse > > The sys_reg_descs array holds function pointers and reset value for > managing the user-space and guest view of system registers. These > are mostly created by a set of macro's as only some combinations > of behaviour are needed. > > If a register needs special treatment, its sys_reg_descs entry is > open-coded. This is true of some id registers where the value provided > by user-space is validated by some helpers. > > Before adding another one of these, add a helper that covers the > existing special cases. 'ID_FILTERED' expects helpers to set the > user-space value, and retrieve the modified reset value. > > Signed-off-by: James Morse > Signed-off-by: Joey Gouly > --- > arch/arm64/kvm/sys_regs.c | 54 ++++++++++++++++++++------------------- > 1 file changed, 28 insertions(+), 26 deletions(-) > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 8b1a6cedc49e..1fd08f12f2bb 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -1833,6 +1833,12 @@ static int set_id_dfr0_el1(struct kvm_vcpu *vcpu, > return set_id_reg(vcpu, rd, val); > } > > +static int set_id_aa64pfr0_el1(struct kvm_vcpu *vcpu, > + const struct sys_reg_desc *rd, u64 val) > +{ > + return set_id_reg(vcpu, rd, val); > +} > + > /* > * cpufeature ID register user accessors > * > @@ -2131,6 +2137,15 @@ static bool bad_redir_trap(struct kvm_vcpu *vcpu, > .val = 0, \ > } > > +/* sys_reg_desc initialiser for cpufeature ID registers that need filtering */ > +#define ID_FILTERED(sysreg, name, filtered_fields) { \ > + ID_DESC(sysreg), \ > + .set_user = set_##name, \ > + .visibility = id_visibility, \ > + .reset = read_sanitised_##name, \ > + .val = (filtered_fields), \ > +} > + > /* sys_reg_desc initialiser for known cpufeature ID registers */ > #define AA32_ID_SANITISED(name) { \ > ID_DESC(name), \ > @@ -2337,14 +2352,9 @@ static const struct sys_reg_desc sys_reg_descs[] = { > /* CRm=1 */ > AA32_ID_SANITISED(ID_PFR0_EL1), > AA32_ID_SANITISED(ID_PFR1_EL1), > - { SYS_DESC(SYS_ID_DFR0_EL1), > - .access = access_id_reg, > - .get_user = get_id_reg, > - .set_user = set_id_dfr0_el1, > - .visibility = aa32_id_visibility, > - .reset = read_sanitised_id_dfr0_el1, > - .val = ID_DFR0_EL1_PerfMon_MASK | > - ID_DFR0_EL1_CopDbg_MASK, }, > + ID_FILTERED(ID_DFR0_EL1, id_dfr0_el1, > + ID_DFR0_EL1_PerfMon_MASK | > + ID_DFR0_EL1_CopDbg_MASK), The replacement causes logical change because the 'visibility' callback has been changed from aa32_id_visibility() to id_visibility(). I think we need an aa32 variant of ID_FILTERED, to be used here. #define AA32_ID_FILTERED(sysreg, name, filtered_fields) { \ ID_DESC(sysreg), \ .set_user = set_##name, \ .visibility = aa32_id_visibility, \ /* the only differentiated field */ .reset = read_sanitised_##name, \ .val = (filtered_fields), \ } > ID_HIDDEN(ID_AFR0_EL1), > AA32_ID_SANITISED(ID_MMFR0_EL1), > AA32_ID_SANITISED(ID_MMFR1_EL1), > @@ -2373,17 +2383,13 @@ static const struct sys_reg_desc sys_reg_descs[] = { > > /* AArch64 ID registers */ > /* CRm=4 */ > - { SYS_DESC(SYS_ID_AA64PFR0_EL1), > - .access = access_id_reg, > - .get_user = get_id_reg, > - .set_user = set_id_reg, > - .reset = read_sanitised_id_aa64pfr0_el1, > - .val = ~(ID_AA64PFR0_EL1_AMU | > - ID_AA64PFR0_EL1_MPAM | > - ID_AA64PFR0_EL1_SVE | > - ID_AA64PFR0_EL1_RAS | > - ID_AA64PFR0_EL1_AdvSIMD | > - ID_AA64PFR0_EL1_FP), }, > + ID_FILTERED(ID_AA64PFR0_EL1, id_aa64pfr0_el1, > + ~(ID_AA64PFR0_EL1_AMU | > + ID_AA64PFR0_EL1_MPAM | > + ID_AA64PFR0_EL1_SVE | > + ID_AA64PFR0_EL1_RAS | > + ID_AA64PFR0_EL1_AdvSIMD | > + ID_AA64PFR0_EL1_FP)), Note that the 'visibility' callback has been changed from NULL to id_visibility(), not resulting in logical changes since id_visibility() returns 0 for ID_AA64PFR0_EL1. However, it would be nice to be documented in the change log? > ID_SANITISED(ID_AA64PFR1_EL1), > ID_WRITABLE(ID_AA64PFR2_EL1, ID_AA64PFR2_EL1_FPMR), > ID_UNALLOCATED(4,3), > @@ -2393,13 +2399,9 @@ static const struct sys_reg_desc sys_reg_descs[] = { > ID_WRITABLE(ID_AA64FPFR0_EL1, ~ID_AA64FPFR0_EL1_RES0), > > /* CRm=5 */ > - { SYS_DESC(SYS_ID_AA64DFR0_EL1), > - .access = access_id_reg, > - .get_user = get_id_reg, > - .set_user = set_id_aa64dfr0_el1, > - .reset = read_sanitised_id_aa64dfr0_el1, > - .val = ID_AA64DFR0_EL1_PMUVer_MASK | > - ID_AA64DFR0_EL1_DebugVer_MASK, }, > + ID_FILTERED(ID_AA64DFR0_EL1, id_aa64dfr0_el1, > + ID_AA64DFR0_EL1_PMUVer_MASK | > + ID_AA64DFR0_EL1_DebugVer_MASK), Same as above. The 'visibility' callback has been changed from NULL to id_visibility(), even there is no logical changes. > ID_SANITISED(ID_AA64DFR1_EL1), > ID_UNALLOCATED(5,2), > ID_UNALLOCATED(5,3), Thanks, Gavin