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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16713C433EF for ; Fri, 15 Oct 2021 13:10:59 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D873A60F9D for ; Fri, 15 Oct 2021 13:10:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D873A60F9D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YF/BVAUxinvcGyGfDq6I1RJW8sIRX2FZ6kpjW9Hbqww=; b=sBZSsF+iRW0BMP bz64XzVtTYkoT9iwHRL4r3eyCZKyy/HiojpSIY+VsNMyCQE7fDQjhzFlLLi0VMaKZCd9ohJ9rX4HL 7qr9dntlbwOl7Mp0/d2PEeRQFSVEGEY8hijzf9R4iD5+mPZc8kJnLt5gzPDM9I3bO2AQwmG4A2qjW A++1TZv1/ZRIJa9NlrbDGfJuj4YX+RdUfyz11wXYeTqC8dYoaRT346x+c1QKWQ3757g/V3C9NGAnK 73c9h8MySkKocQDBLu4dZ4vg7D1SaWub+94o9EP6c9oitPw7eZsKUPgDh5FU/JaeU0X3UbKgRBL5T kMJ+C7/jaIJdrdfpO21g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbMxn-0078yY-JW; Fri, 15 Oct 2021 13:09:31 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbMxh-0078x3-Ob for linux-arm-kernel@lists.infradead.org; Fri, 15 Oct 2021 13:09:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634303363; 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: in-reply-to:in-reply-to:references:references; bh=BLbKqYqpIN8Ja2kVeWEWl5tGGqw23sSzKTE1tUG4uzk=; b=XMVwoGJHwr75qKqzSk4AX6cevzDALEfeyfQrHNAb2EQGsPTgXRQ3yQnIM77yKZ6NMt+YkM rOSj4KU/nkxEIiFindfiL1anD3mInagm71UL7njYuPy8McneTCfJ9s4A1XTu2YCYimTOml T1NpOIM3yQLuXmamiGwALycFWJIDEA4= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-217-Z5_rv9cuNyq5XosMd0Y3JQ-1; Fri, 15 Oct 2021 09:09:22 -0400 X-MC-Unique: Z5_rv9cuNyq5XosMd0Y3JQ-1 Received: by mail-wm1-f69.google.com with SMTP id l39-20020a05600c1d2700b0030dba1dc6eeso818277wms.7 for ; Fri, 15 Oct 2021 06:09:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BLbKqYqpIN8Ja2kVeWEWl5tGGqw23sSzKTE1tUG4uzk=; b=eoSla02FgZgSm3cv0A78v547kK+ttP17cNZ8ToIi2mHINMzJk1uK0KxsHmrQR010+j Mh8ne2i+6b75Nfns42g8I/oiVKAro8HF6yrvg9OYK7AxSom02ZVjtHuOQHTYlJz534D3 ECiJGW48DfnqnzGU5EkcE7Iyt83FKQ2OwDqEyeZ2ZwcjFUeJFTQNspnkvhA5TwZKeCHI vvimKOxGwirxFB5rVem4Wbj/WjvhoxwZSV0bMVIU+0urProUF7wuqlTTOckol0zHycZc b8joTqP20ex0ozSyOHD3Ga6bLUeKxCr/cbtV2a2hjb+z1KVioPQ3zu5NvYWZinrj0oEL dbLQ== X-Gm-Message-State: AOAM532QM4N0Sk4lrF1++1rkD8gfl4xc4gOZMY0YBTzdSysrn2sl3hte 2isY9JwqZZ368nBbNU0EFfTQ48pC5E/WMXwkyVoJ5pBvdKr9agbJW0cRl7xICTpgTFkw1dOD/jS 3smoCzp+QDsdJLxcF3y8RMeOI5YHfF3qJo5I= X-Received: by 2002:a5d:6e8d:: with SMTP id k13mr14355102wrz.295.1634303360386; Fri, 15 Oct 2021 06:09:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxic2R6KXXZZ57/dhqX3xAovzW11pgEB61Y/9hhSMf4P+hqbB1TynbVpy39qNRQfsYQIVpJmg== X-Received: by 2002:a5d:6e8d:: with SMTP id k13mr14355062wrz.295.1634303360180; Fri, 15 Oct 2021 06:09:20 -0700 (PDT) Received: from gator (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id v10sm5197903wri.29.2021.10.15.06.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Oct 2021 06:09:19 -0700 (PDT) Date: Fri, 15 Oct 2021 15:09:18 +0200 From: Andrew Jones To: Reiji Watanabe Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morse , Alexandru Elisei , Suzuki K Poulose , Paolo Bonzini , Will Deacon , Peng Liang , Peter Shier , Ricardo Koller , Oliver Upton , Jing Zhang , Raghavendra Rao Anata Subject: Re: [RFC PATCH 02/25] KVM: arm64: Save ID registers' sanitized value per vCPU Message-ID: <20211015130918.ezlygga73doepbw6@gator> References: <20211012043535.500493-1-reijiw@google.com> <20211012043535.500493-3-reijiw@google.com> MIME-Version: 1.0 In-Reply-To: <20211012043535.500493-3-reijiw@google.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211015_060926_283489_010DE514 X-CRM114-Status: GOOD ( 29.68 ) 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 On Mon, Oct 11, 2021 at 09:35:12PM -0700, Reiji Watanabe wrote: > Extend sys_regs[] of kvm_cpu_context for ID registers and save ID > registers' sanitized value in the array for the vCPU at the first > vCPU reset. Use the saved ones when ID registers are read by > userspace (via KVM_GET_ONE_REG) or the guest. > > Signed-off-by: Reiji Watanabe > --- > arch/arm64/include/asm/kvm_host.h | 10 ++++++++++ > arch/arm64/kvm/sys_regs.c | 26 ++++++++++++++++++-------- > 2 files changed, 28 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 9b5e7a3b6011..0cd351099adf 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -145,6 +145,14 @@ struct kvm_vcpu_fault_info { > u64 disr_el1; /* Deferred [SError] Status Register */ > }; > > +/* > + * (Op0, Op1, CRn, CRm, Op2) of ID registers is (3, 0, 0, crm, op2), > + * where 0<=crm<8, 0<=op2<8. crm is 4 bits, so this should be 0 <= crm < 16 and... > + */ > +#define KVM_ARM_ID_REG_MAX_NUM 64 ...this should be 128. Or am I missing something? > +#define IDREG_IDX(id) ((sys_reg_CRm(id) << 3) | sys_reg_Op2(id)) > +#define IDREG_SYS_IDX(id) (ID_REG_BASE + IDREG_IDX(id)) > + > enum vcpu_sysreg { > __INVALID_SYSREG__, /* 0 is reserved as an invalid value */ > MPIDR_EL1, /* MultiProcessor Affinity Register */ > @@ -209,6 +217,8 @@ enum vcpu_sysreg { > CNTP_CVAL_EL0, > CNTP_CTL_EL0, > > + ID_REG_BASE, > + ID_REG_END = ID_REG_BASE + KVM_ARM_ID_REG_MAX_NUM - 1, > /* Memory Tagging Extension registers */ > RGSR_EL1, /* Random Allocation Tag Seed Register */ > GCR_EL1, /* Tag Control Register */ > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 1d46e185f31e..72ca518e7944 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -273,7 +273,7 @@ static bool trap_loregion(struct kvm_vcpu *vcpu, > struct sys_reg_params *p, > const struct sys_reg_desc *r) > { > - u64 val = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1); > + u64 val = __vcpu_sys_reg(vcpu, IDREG_SYS_IDX(SYS_ID_AA64MMFR1_EL1)); > u32 sr = reg_to_encoding(r); > > if (!(val & (0xfUL << ID_AA64MMFR1_LOR_SHIFT))) { > @@ -1059,12 +1059,11 @@ static bool access_arch_timer(struct kvm_vcpu *vcpu, > return true; > } > > -/* Read a sanitised cpufeature ID register by sys_reg_desc */ > static u64 read_id_reg(const struct kvm_vcpu *vcpu, > struct sys_reg_desc const *r, bool raz) > { > u32 id = reg_to_encoding(r); > - u64 val = raz ? 0 : read_sanitised_ftr_reg(id); > + u64 val = raz ? 0 : __vcpu_sys_reg(vcpu, IDREG_SYS_IDX(id)); > > switch (id) { > case SYS_ID_AA64PFR0_EL1: > @@ -1174,6 +1173,16 @@ static unsigned int sve_visibility(const struct kvm_vcpu *vcpu, > return REG_HIDDEN; > } > > +static void reset_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd) Since not all ID registers will use this, then maybe name it reset_sanitised_id_reg? > +{ > + u32 id = reg_to_encoding(rd); > + > + if (vcpu_has_reset_once(vcpu)) > + return; Ah, I see my kvm_vcpu_initialized() won't work since vcpu->arch.target is set before the first reset. While vcpu->arch.target is only being used like a "is_initialized" boolean at this time, I guess we better keep it in case we ever want to implement CPU models (which this series gets us a step closer to). > + > + __vcpu_sys_reg(vcpu, IDREG_SYS_IDX(id)) = read_sanitised_ftr_reg(id); > +} > + > static int set_id_aa64pfr0_el1(struct kvm_vcpu *vcpu, > const struct sys_reg_desc *rd, > const struct kvm_one_reg *reg, void __user *uaddr) > @@ -1219,9 +1228,7 @@ static int set_id_aa64pfr0_el1(struct kvm_vcpu *vcpu, > /* > * cpufeature ID register user accessors > * > - * For now, these registers are immutable for userspace, so no values > - * are stored, and for set_id_reg() we don't allow the effective value > - * to be changed. > + * We don't allow the effective value to be changed. > */ > static int __get_id_reg(const struct kvm_vcpu *vcpu, > const struct sys_reg_desc *rd, void __user *uaddr, > @@ -1375,6 +1382,7 @@ static unsigned int mte_visibility(const struct kvm_vcpu *vcpu, > #define ID_SANITISED(name) { \ > SYS_DESC(SYS_##name), \ > .access = access_id_reg, \ > + .reset = reset_id_reg, \ > .get_user = get_id_reg, \ > .set_user = set_id_reg, \ > .visibility = id_visibility, \ > @@ -1830,8 +1838,10 @@ static bool trap_dbgdidr(struct kvm_vcpu *vcpu, > if (p->is_write) { > return ignore_write(vcpu, p); > } else { > - u64 dfr = read_sanitised_ftr_reg(SYS_ID_AA64DFR0_EL1); > - u64 pfr = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1); > + u64 dfr = __vcpu_sys_reg(vcpu, > + IDREG_SYS_IDX(SYS_ID_AA64DFR0_EL1)); > + u64 pfr = __vcpu_sys_reg(vcpu, > + IDREG_SYS_IDX(SYS_ID_AA64PFR0_EL1)); Please avoid these ugly line breaks when we're well under Linux's max length, which is 100. > u32 el3 = !!cpuid_feature_extract_unsigned_field(pfr, ID_AA64PFR0_EL3_SHIFT); > > p->regval = ((((dfr >> ID_AA64DFR0_WRPS_SHIFT) & 0xf) << 28) | > -- > 2.33.0.882.g93a45727a2-goog > Thanks, drew _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel