From: Dave Martin <Dave.Martin@arm.com> To: kvmarm@lists.cs.columbia.edu Cc: Okamoto Takayuki <tokamoto@jp.fujitsu.com>, Christoffer Dall <cdall@kernel.org>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Marc Zyngier <marc.zyngier@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Zhang Lei <zhang.lei@jp.fujitsu.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 10/26] KVM: arm64: Propagate vcpu into read_id_reg() Date: Mon, 18 Feb 2019 19:52:23 +0000 [thread overview] Message-ID: <1550519559-15915-11-git-send-email-Dave.Martin@arm.com> (raw) In-Reply-To: <1550519559-15915-1-git-send-email-Dave.Martin@arm.com> Architecture features that are conditionally visible to the guest will require run-time checks in the ID register accessor functions. In particular, read_id_reg() will need to perform checks in order to generate the correct emulated value for certain ID register fields such as ID_AA64PFR0_EL1.SVE for example. This patch propagates vcpu into read_id_reg() so that future patches can add run-time checks on the guest configuration here. For now, there is no functional change. Signed-off-by: Dave Martin <Dave.Martin@arm.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> --- arch/arm64/kvm/sys_regs.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index e3e3722..71c5825 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1029,7 +1029,8 @@ static bool access_cntp_cval(struct kvm_vcpu *vcpu, } /* Read a sanitised cpufeature ID register by sys_reg_desc */ -static u64 read_id_reg(struct sys_reg_desc const *r, bool raz) +static u64 read_id_reg(const struct kvm_vcpu *vcpu, + struct sys_reg_desc const *r, bool raz) { u32 id = sys_reg((u32)r->Op0, (u32)r->Op1, (u32)r->CRn, (u32)r->CRm, (u32)r->Op2); @@ -1068,7 +1069,7 @@ static bool __access_id_reg(struct kvm_vcpu *vcpu, if (p->is_write) return write_to_read_only(vcpu, p, r); - p->regval = read_id_reg(r, raz); + p->regval = read_id_reg(vcpu, r, raz); return true; } @@ -1097,16 +1098,18 @@ static u64 sys_reg_to_index(const struct sys_reg_desc *reg); * are stored, and for set_id_reg() we don't allow the effective value * to be changed. */ -static int __get_id_reg(const struct sys_reg_desc *rd, void __user *uaddr, +static int __get_id_reg(const struct kvm_vcpu *vcpu, + const struct sys_reg_desc *rd, void __user *uaddr, bool raz) { const u64 id = sys_reg_to_index(rd); - const u64 val = read_id_reg(rd, raz); + const u64 val = read_id_reg(vcpu, rd, raz); return reg_to_user(uaddr, &val, id); } -static int __set_id_reg(const struct sys_reg_desc *rd, void __user *uaddr, +static int __set_id_reg(const struct kvm_vcpu *vcpu, + const struct sys_reg_desc *rd, void __user *uaddr, bool raz) { const u64 id = sys_reg_to_index(rd); @@ -1118,7 +1121,7 @@ static int __set_id_reg(const struct sys_reg_desc *rd, void __user *uaddr, return err; /* This is what we mean by invariant: you can't change it. */ - if (val != read_id_reg(rd, raz)) + if (val != read_id_reg(vcpu, rd, raz)) return -EINVAL; return 0; @@ -1127,25 +1130,25 @@ static int __set_id_reg(const struct sys_reg_desc *rd, void __user *uaddr, static int get_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, const struct kvm_one_reg *reg, void __user *uaddr) { - return __get_id_reg(rd, uaddr, false); + return __get_id_reg(vcpu, rd, uaddr, false); } static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, const struct kvm_one_reg *reg, void __user *uaddr) { - return __set_id_reg(rd, uaddr, false); + return __set_id_reg(vcpu, rd, uaddr, false); } static int get_raz_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, const struct kvm_one_reg *reg, void __user *uaddr) { - return __get_id_reg(rd, uaddr, true); + return __get_id_reg(vcpu, rd, uaddr, true); } static int set_raz_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, const struct kvm_one_reg *reg, void __user *uaddr) { - return __set_id_reg(rd, uaddr, true); + return __set_id_reg(vcpu, rd, uaddr, true); } /* sys_reg_desc initialiser for known cpufeature ID registers */ -- 2.1.4 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Dave Martin <Dave.Martin@arm.com> To: kvmarm@lists.cs.columbia.edu Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Okamoto Takayuki" <tokamoto@jp.fujitsu.com>, "Christoffer Dall" <cdall@kernel.org>, "Ard Biesheuvel" <ard.biesheuvel@linaro.org>, "Marc Zyngier" <marc.zyngier@arm.com>, "Catalin Marinas" <catalin.marinas@arm.com>, "Will Deacon" <will.deacon@arm.com>, "Zhang Lei" <zhang.lei@jp.fujitsu.com>, "Julien Grall" <julien.grall@arm.com>, "Alex Bennée" <alex.bennee@linaro.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 10/26] KVM: arm64: Propagate vcpu into read_id_reg() Date: Mon, 18 Feb 2019 19:52:23 +0000 [thread overview] Message-ID: <1550519559-15915-11-git-send-email-Dave.Martin@arm.com> (raw) In-Reply-To: <1550519559-15915-1-git-send-email-Dave.Martin@arm.com> Architecture features that are conditionally visible to the guest will require run-time checks in the ID register accessor functions. In particular, read_id_reg() will need to perform checks in order to generate the correct emulated value for certain ID register fields such as ID_AA64PFR0_EL1.SVE for example. This patch propagates vcpu into read_id_reg() so that future patches can add run-time checks on the guest configuration here. For now, there is no functional change. Signed-off-by: Dave Martin <Dave.Martin@arm.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> --- arch/arm64/kvm/sys_regs.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index e3e3722..71c5825 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1029,7 +1029,8 @@ static bool access_cntp_cval(struct kvm_vcpu *vcpu, } /* Read a sanitised cpufeature ID register by sys_reg_desc */ -static u64 read_id_reg(struct sys_reg_desc const *r, bool raz) +static u64 read_id_reg(const struct kvm_vcpu *vcpu, + struct sys_reg_desc const *r, bool raz) { u32 id = sys_reg((u32)r->Op0, (u32)r->Op1, (u32)r->CRn, (u32)r->CRm, (u32)r->Op2); @@ -1068,7 +1069,7 @@ static bool __access_id_reg(struct kvm_vcpu *vcpu, if (p->is_write) return write_to_read_only(vcpu, p, r); - p->regval = read_id_reg(r, raz); + p->regval = read_id_reg(vcpu, r, raz); return true; } @@ -1097,16 +1098,18 @@ static u64 sys_reg_to_index(const struct sys_reg_desc *reg); * are stored, and for set_id_reg() we don't allow the effective value * to be changed. */ -static int __get_id_reg(const struct sys_reg_desc *rd, void __user *uaddr, +static int __get_id_reg(const struct kvm_vcpu *vcpu, + const struct sys_reg_desc *rd, void __user *uaddr, bool raz) { const u64 id = sys_reg_to_index(rd); - const u64 val = read_id_reg(rd, raz); + const u64 val = read_id_reg(vcpu, rd, raz); return reg_to_user(uaddr, &val, id); } -static int __set_id_reg(const struct sys_reg_desc *rd, void __user *uaddr, +static int __set_id_reg(const struct kvm_vcpu *vcpu, + const struct sys_reg_desc *rd, void __user *uaddr, bool raz) { const u64 id = sys_reg_to_index(rd); @@ -1118,7 +1121,7 @@ static int __set_id_reg(const struct sys_reg_desc *rd, void __user *uaddr, return err; /* This is what we mean by invariant: you can't change it. */ - if (val != read_id_reg(rd, raz)) + if (val != read_id_reg(vcpu, rd, raz)) return -EINVAL; return 0; @@ -1127,25 +1130,25 @@ static int __set_id_reg(const struct sys_reg_desc *rd, void __user *uaddr, static int get_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, const struct kvm_one_reg *reg, void __user *uaddr) { - return __get_id_reg(rd, uaddr, false); + return __get_id_reg(vcpu, rd, uaddr, false); } static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, const struct kvm_one_reg *reg, void __user *uaddr) { - return __set_id_reg(rd, uaddr, false); + return __set_id_reg(vcpu, rd, uaddr, false); } static int get_raz_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, const struct kvm_one_reg *reg, void __user *uaddr) { - return __get_id_reg(rd, uaddr, true); + return __get_id_reg(vcpu, rd, uaddr, true); } static int set_raz_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, const struct kvm_one_reg *reg, void __user *uaddr) { - return __set_id_reg(rd, uaddr, true); + return __set_id_reg(vcpu, rd, uaddr, true); } /* sys_reg_desc initialiser for known cpufeature ID registers */ -- 2.1.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-18 19:54 UTC|newest] Thread overview: 189+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-18 19:52 [PATCH v5 00/26] KVM: arm64: SVE guest support Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 01/26] KVM: Documentation: Document arm64 core registers in detail Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-21 11:48 ` Julien Grall 2019-02-21 11:48 ` Julien Grall 2019-02-26 12:05 ` Dave Martin 2019-02-26 12:05 ` Dave Martin 2019-02-21 11:57 ` Peter Maydell 2019-02-21 11:57 ` Peter Maydell 2019-02-18 19:52 ` [PATCH v5 02/26] arm64: fpsimd: Always set TIF_FOREIGN_FPSTATE on task state flush Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-21 12:39 ` Julien Grall 2019-02-26 12:06 ` Dave Martin 2019-02-26 12:06 ` Dave Martin 2019-02-26 12:35 ` Julien Grall 2019-02-26 12:35 ` Julien Grall 2019-02-18 19:52 ` [PATCH v5 03/26] KVM: arm64: Delete orphaned declaration for __fpsimd_enabled() Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 04/26] KVM: arm64: Refactor kvm_arm_num_regs() for easier maintenance Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 05/26] KVM: arm64: Add missing #include of <linux/bitmap.h> to kvm_host.h Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-20 15:23 ` Mark Rutland 2019-02-20 15:23 ` Mark Rutland 2019-02-26 12:06 ` Dave Martin 2019-02-26 12:06 ` Dave Martin 2019-02-26 12:31 ` Mark Rutland 2019-02-26 12:33 ` Dave Martin 2019-02-26 12:33 ` Dave Martin 2019-02-26 12:40 ` Mark Rutland 2019-02-26 12:40 ` Mark Rutland 2019-02-18 19:52 ` [PATCH v5 06/26] arm64/sve: Check SVE virtualisability Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-20 11:12 ` Julien Thierry 2019-02-20 11:12 ` Julien Thierry 2019-02-26 12:06 ` Dave Martin 2019-02-26 12:06 ` Dave Martin 2019-03-01 12:39 ` Julien Thierry 2019-03-01 12:39 ` Julien Thierry 2019-03-01 14:44 ` Dave Martin 2019-03-01 14:44 ` Dave Martin 2019-02-21 13:36 ` Julien Grall 2019-02-21 13:36 ` Julien Grall 2019-02-26 12:06 ` Dave Martin 2019-02-26 12:06 ` Dave Martin 2019-02-26 15:43 ` Julien Grall 2019-02-26 15:43 ` Julien Grall 2019-02-18 19:52 ` [PATCH v5 07/26] arm64/sve: Clarify role of the VQ map maintenance functions Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-20 11:43 ` Julien Thierry 2019-02-20 11:43 ` Julien Thierry 2019-02-26 12:06 ` Dave Martin 2019-02-26 12:06 ` Dave Martin 2019-02-21 13:46 ` Julien Grall 2019-02-21 13:46 ` Julien Grall 2019-02-26 12:07 ` Dave Martin 2019-02-26 12:07 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 08/26] arm64/sve: Enable SVE state tracking for non-task contexts Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-22 15:26 ` Julien Grall 2019-02-22 15:26 ` Julien Grall 2019-02-26 12:07 ` Dave Martin 2019-02-26 12:07 ` Dave Martin 2019-02-26 15:49 ` Julien Grall 2019-02-26 15:49 ` Julien Grall 2019-02-26 15:58 ` Dave Martin 2019-02-26 15:58 ` Dave Martin 2019-02-26 15:59 ` Julien Grall 2019-02-26 15:59 ` Julien Grall 2019-02-26 16:03 ` Dave Martin 2019-02-26 16:03 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 09/26] KVM: arm64: Add a vcpu flag to control SVE visibility for the guest Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` Dave Martin [this message] 2019-02-18 19:52 ` [PATCH v5 10/26] KVM: arm64: Propagate vcpu into read_id_reg() Dave Martin 2019-02-18 19:52 ` [PATCH v5 11/26] KVM: arm64: Extend reset_unknown() to handle mixed RES0/UNKNOWN registers Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-20 13:33 ` Julien Thierry 2019-02-20 13:33 ` Julien Thierry 2019-02-26 12:07 ` Dave Martin 2019-02-26 12:07 ` Dave Martin 2019-02-22 16:04 ` Julien Grall 2019-02-22 16:04 ` Julien Grall 2019-02-18 19:52 ` [PATCH v5 12/26] KVM: arm64: Support runtime sysreg visibility filtering Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-20 14:33 ` Julien Thierry 2019-02-20 14:33 ` Julien Thierry 2019-02-26 12:07 ` Dave Martin 2019-02-26 12:07 ` Dave Martin 2019-02-20 15:37 ` Mark Rutland 2019-02-20 15:37 ` Mark Rutland 2019-02-26 12:12 ` Dave Martin 2019-02-26 12:12 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 13/26] KVM: arm64/sve: System register context switch and access support Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-20 16:48 ` Julien Thierry 2019-02-20 16:48 ` Julien Thierry 2019-02-26 16:32 ` Julien Grall 2019-02-26 16:32 ` Julien Grall 2019-02-26 17:01 ` Dave Martin 2019-02-26 17:01 ` Dave Martin 2019-02-27 12:02 ` Julien Grall 2019-02-27 12:02 ` Julien Grall 2019-02-27 13:50 ` Dave Martin 2019-02-27 13:50 ` Dave Martin 2019-02-27 14:17 ` Julien Grall 2019-02-27 14:17 ` Julien Grall 2019-02-27 14:38 ` Dave Martin 2019-02-27 14:38 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 14/26] KVM: arm64/sve: Context switch the SVE registers Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-20 16:19 ` Mark Rutland 2019-02-20 16:19 ` Mark Rutland 2019-02-26 12:13 ` Dave Martin 2019-02-26 12:13 ` Dave Martin 2019-02-20 16:46 ` Julien Thierry 2019-02-20 16:46 ` Julien Thierry 2019-02-26 12:13 ` Dave Martin 2019-02-26 12:13 ` Dave Martin 2019-02-26 16:56 ` Julien Grall 2019-02-26 16:56 ` Julien Grall 2019-02-27 13:37 ` Dave Martin 2019-02-27 13:37 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 15/26] KVM: Allow 2048-bit register access via ioctl interface Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 16/26] KVM: arm64: Add missing #include of <linux/string.h> in guest.c Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 17/26] KVM: arm64: Reject ioctl access to FPSIMD V-regs on SVE vcpus Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-21 12:06 ` Julien Thierry 2019-02-21 12:06 ` Julien Thierry 2019-02-26 12:13 ` Dave Martin 2019-02-26 12:13 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 18/26] KVM: arm64/sve: Add SVE support to register access ioctl interface Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-21 15:23 ` Julien Thierry 2019-02-21 15:23 ` Julien Thierry 2019-02-26 12:13 ` Dave Martin 2019-02-26 12:13 ` Dave Martin 2019-03-01 13:03 ` Julien Thierry 2019-03-01 13:03 ` Julien Thierry 2019-03-01 14:45 ` Dave Martin 2019-03-01 14:45 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 19/26] KVM: arm64: Enumerate SVE register indices for KVM_GET_REG_LIST Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-21 16:28 ` Julien Thierry 2019-02-21 16:28 ` Julien Thierry 2019-02-18 19:52 ` [PATCH v5 20/26] arm64/sve: In-kernel vector length availability query interface Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 21/26] KVM: arm/arm64: Add hook to finalize the vcpu configuration Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 22/26] KVM: arm64/sve: Add pseudo-register for the guest's vector lengths Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-21 17:48 ` Julien Thierry 2019-02-21 17:48 ` Julien Thierry 2019-02-26 12:13 ` Dave Martin 2019-02-26 12:13 ` Dave Martin 2019-03-01 13:28 ` Julien Thierry 2019-03-01 13:28 ` Julien Thierry 2019-03-01 14:55 ` Dave Martin 2019-03-01 14:55 ` Dave Martin 2019-03-07 13:47 ` Marc Zyngier 2019-03-07 13:47 ` Marc Zyngier 2019-03-07 15:30 ` Dave Martin 2019-03-07 15:30 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 23/26] KVM: arm64/sve: Allow userspace to enable SVE for vcpus Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-22 9:05 ` Julien Thierry 2019-02-22 9:05 ` Julien Thierry 2019-02-26 12:13 ` Dave Martin 2019-02-26 12:13 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 24/26] KVM: arm64: Add a capabillity to advertise SVE support Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-22 9:10 ` Julien Thierry 2019-02-22 9:10 ` Julien Thierry 2019-02-26 12:14 ` Dave Martin 2019-02-26 12:14 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 25/26] KVM: Document errors for KVM_GET_ONE_REG and KVM_SET_ONE_REG Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-18 19:52 ` [PATCH v5 26/26] KVM: arm64/sve: Document KVM API extensions for SVE Dave Martin 2019-02-18 19:52 ` Dave Martin 2019-02-20 15:47 ` [PATCH v5 00/26] KVM: arm64: SVE guest support Dave Martin 2019-02-20 15:47 ` Dave Martin 2019-03-03 2:40 ` Zhang, Lei 2019-03-05 9:47 ` Dave Martin 2019-03-05 9:47 ` Dave Martin 2019-03-08 7:06 ` Zhang, Lei 2019-03-08 7:06 ` Zhang, Lei
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1550519559-15915-11-git-send-email-Dave.Martin@arm.com \ --to=dave.martin@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=cdall@kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=tokamoto@jp.fujitsu.com \ --cc=will.deacon@arm.com \ --cc=zhang.lei@jp.fujitsu.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.