From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Zyngier Subject: [PATCH 06/85] KVM: arm: Enable emulation of the physical timer Date: Wed, 28 Mar 2018 13:51:35 +0100 Message-ID: <20180328125254.31380-7-marc.zyngier@arm.com> References: <20180328125254.31380-1-marc.zyngier@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Christoffer Dall , Shunyong Yang , Julien Thierry , Andre Przywara , Will Deacon , Shih-Wei Li , Catalin Marinas , Dave Martin To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Return-path: In-Reply-To: <20180328125254.31380-1-marc.zyngier@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu List-Id: kvm.vger.kernel.org RnJvbTogSsOpcsOpbXkgRmFuZ3XDqGRlIDxqLmZhbmd1ZWRlQHZpcnR1YWxvcGVuc3lzdGVtcy5j b20+CgpTZXQgdGhlIGhhbmRsZXJzIHRvIGVtdWxhdGUgcmVhZCBhbmQgd3JpdGUgb3BlcmF0aW9u cyBmb3IgQ05UUF9DVEwsCkNOVFBfQ1ZBTCBhbmQgQ05UUF9UVkFMIHJlZ2lzdGVycyBpbiBzdWNo IGEgd2F5IHRoYXQgVk1zIGNhbiB1c2UgdGhlCnBoeXNpY2FsIHRpbWVyLgoKU2lnbmVkLW9mZi1i eTogSsOpcsOpbXkgRmFuZ3XDqGRlIDxqLmZhbmd1ZWRlQHZpcnR1YWxvcGVuc3lzdGVtcy5jb20+ ClNpZ25lZC1vZmYtYnk6IENocmlzdG9mZmVyIERhbGwgPGNocmlzdG9mZmVyLmRhbGxAbGluYXJv Lm9yZz4KLS0tCiBhcmNoL2FybS9rdm0vY29wcm9jLmMgfCA2MSArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA2MSBpbnNl cnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0va3ZtL2NvcHJvYy5jIGIvYXJjaC9hcm0v a3ZtL2NvcHJvYy5jCmluZGV4IDZkMWQyZTI2ZGZlNS4uM2EwMmU3NjY5OWE2IDEwMDY0NAotLS0g YS9hcmNoL2FybS9rdm0vY29wcm9jLmMKKysrIGIvYXJjaC9hcm0va3ZtL2NvcHJvYy5jCkBAIC0y NzAsNiArMjcwLDYwIEBAIHN0YXRpYyBib29sIGFjY2Vzc19naWNfc3JlKHN0cnVjdCBrdm1fdmNw dSAqdmNwdSwKIAlyZXR1cm4gdHJ1ZTsKIH0KIAorc3RhdGljIGJvb2wgYWNjZXNzX2NudHBfdHZh bChzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUsCisJCQkgICAgIGNvbnN0IHN0cnVjdCBjb3Byb2NfcGFy YW1zICpwLAorCQkJICAgICBjb25zdCBzdHJ1Y3QgY29wcm9jX3JlZyAqcikKK3sKKwl1NjQgbm93 ID0ga3ZtX3BoeXNfdGltZXJfcmVhZCgpOworCXU2NCB2YWw7CisKKwlpZiAocC0+aXNfd3JpdGUp IHsKKwkJdmFsID0gKnZjcHVfcmVnKHZjcHUsIHAtPlJ0MSk7CisJCWt2bV9hcm1fdGltZXJfc2V0 X3JlZyh2Y3B1LCBLVk1fUkVHX0FSTV9QVElNRVJfQ1ZBTCwgdmFsICsgbm93KTsKKwl9IGVsc2Ug eworCQl2YWwgPSBrdm1fYXJtX3RpbWVyX2dldF9yZWcodmNwdSwgS1ZNX1JFR19BUk1fUFRJTUVS X0NWQUwpOworCQkqdmNwdV9yZWcodmNwdSwgcC0+UnQxKSA9IHZhbCAtIG5vdzsKKwl9CisKKwly ZXR1cm4gdHJ1ZTsKK30KKworc3RhdGljIGJvb2wgYWNjZXNzX2NudHBfY3RsKHN0cnVjdCBrdm1f dmNwdSAqdmNwdSwKKwkJCSAgICBjb25zdCBzdHJ1Y3QgY29wcm9jX3BhcmFtcyAqcCwKKwkJCSAg ICBjb25zdCBzdHJ1Y3QgY29wcm9jX3JlZyAqcikKK3sKKwl1MzIgdmFsOworCisJaWYgKHAtPmlz X3dyaXRlKSB7CisJCXZhbCA9ICp2Y3B1X3JlZyh2Y3B1LCBwLT5SdDEpOworCQlrdm1fYXJtX3Rp bWVyX3NldF9yZWcodmNwdSwgS1ZNX1JFR19BUk1fUFRJTUVSX0NUTCwgdmFsKTsKKwl9IGVsc2Ug eworCQl2YWwgPSBrdm1fYXJtX3RpbWVyX2dldF9yZWcodmNwdSwgS1ZNX1JFR19BUk1fUFRJTUVS X0NUTCk7CisJCSp2Y3B1X3JlZyh2Y3B1LCBwLT5SdDEpID0gdmFsOworCX0KKworCXJldHVybiB0 cnVlOworfQorCitzdGF0aWMgYm9vbCBhY2Nlc3NfY250cF9jdmFsKHN0cnVjdCBrdm1fdmNwdSAq dmNwdSwKKwkJCSAgICAgY29uc3Qgc3RydWN0IGNvcHJvY19wYXJhbXMgKnAsCisJCQkgICAgIGNv bnN0IHN0cnVjdCBjb3Byb2NfcmVnICpyKQoreworCXU2NCB2YWw7CisKKwlpZiAocC0+aXNfd3Jp dGUpIHsKKwkJdmFsID0gKHU2NCkqdmNwdV9yZWcodmNwdSwgcC0+UnQyKSA8PCAzMjsKKwkJdmFs IHw9ICp2Y3B1X3JlZyh2Y3B1LCBwLT5SdDEpOworCQlrdm1fYXJtX3RpbWVyX3NldF9yZWcodmNw dSwgS1ZNX1JFR19BUk1fUFRJTUVSX0NWQUwsIHZhbCk7CisJfSBlbHNlIHsKKwkJdmFsID0ga3Zt X2FybV90aW1lcl9nZXRfcmVnKHZjcHUsIEtWTV9SRUdfQVJNX1BUSU1FUl9DVkFMKTsKKwkJKnZj cHVfcmVnKHZjcHUsIHAtPlJ0MSkgPSB2YWw7CisJCSp2Y3B1X3JlZyh2Y3B1LCBwLT5SdDIpID0g dmFsID4+IDMyOworCX0KKworCXJldHVybiB0cnVlOworfQorCiAvKgogICogV2UgY291bGQgdHJh cCBJRF9ERlIwIGFuZCB0ZWxsIHRoZSBndWVzdCB3ZSBkb24ndCBzdXBwb3J0IHBlcmZvcm1hbmNl CiAgKiBtb25pdG9yaW5nLiAgVW5mb3J0dW5hdGVseSB0aGUgcGF0Y2ggdG8gbWFrZSB0aGUga2Vy bmVsIGNoZWNrIElEX0RGUjAgd2FzCkBAIC00MjMsMTAgKzQ3NywxNyBAQCBzdGF0aWMgY29uc3Qg c3RydWN0IGNvcHJvY19yZWcgY3AxNV9yZWdzW10gPSB7CiAJeyBDUm4oMTMpLCBDUm0oIDApLCBP cDEoIDApLCBPcDIoIDQpLCBpczMyLAogCQkJTlVMTCwgcmVzZXRfdW5rbm93biwgYzEzX1RJRF9Q UklWIH0sCiAKKwkvKiBDTlRQICovCisJeyBDUm02NCgxNCksIE9wMSggMiksIGlzNjQsIGFjY2Vz c19jbnRwX2N2YWx9LAorCiAJLyogQ05US0NUTDogc3dhcHBlZCBieSBpbnRlcnJ1cHQuUy4gKi8K IAl7IENSbigxNCksIENSbSggMSksIE9wMSggMCksIE9wMiggMCksIGlzMzIsCiAJCQlOVUxMLCBy ZXNldF92YWwsIGMxNF9DTlRLQ1RMLCAweDAwMDAwMDAwIH0sCiAKKwkvKiBDTlRQICovCisJeyBD Um4oMTQpLCBDUm0oIDIpLCBPcDEoIDApLCBPcDIoIDApLCBpczMyLCBhY2Nlc3NfY250cF90dmFs IH0sCisJeyBDUm4oMTQpLCBDUm0oIDIpLCBPcDEoIDApLCBPcDIoIDEpLCBpczMyLCBhY2Nlc3Nf Y250cF9jdGwgfSwKKwogCS8qIFRoZSBDb25maWd1cmF0aW9uIEJhc2UgQWRkcmVzcyBSZWdpc3Rl ci4gKi8KIAl7IENSbigxNSksIENSbSggMCksIE9wMSggNCksIE9wMiggMCksIGlzMzIsIGFjY2Vz c19jYmFyfSwKIH07Ci0tIAoyLjE0LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmt2bWFybSBtYWlsaW5nIGxpc3QKa3ZtYXJtQGxpc3RzLmNzLmNvbHVt YmlhLmVkdQpodHRwczovL2xpc3RzLmNzLmNvbHVtYmlhLmVkdS9tYWlsbWFuL2xpc3RpbmZvL2t2 bWFybQo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: marc.zyngier@arm.com (Marc Zyngier) Date: Wed, 28 Mar 2018 13:51:35 +0100 Subject: [PATCH 06/85] KVM: arm: Enable emulation of the physical timer In-Reply-To: <20180328125254.31380-1-marc.zyngier@arm.com> References: <20180328125254.31380-1-marc.zyngier@arm.com> Message-ID: <20180328125254.31380-7-marc.zyngier@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: J?r?my Fangu?de Set the handlers to emulate read and write operations for CNTP_CTL, CNTP_CVAL and CNTP_TVAL registers in such a way that VMs can use the physical timer. Signed-off-by: J?r?my Fangu?de Signed-off-by: Christoffer Dall --- arch/arm/kvm/coproc.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c index 6d1d2e26dfe5..3a02e76699a6 100644 --- a/arch/arm/kvm/coproc.c +++ b/arch/arm/kvm/coproc.c @@ -270,6 +270,60 @@ static bool access_gic_sre(struct kvm_vcpu *vcpu, return true; } +static bool access_cntp_tval(struct kvm_vcpu *vcpu, + const struct coproc_params *p, + const struct coproc_reg *r) +{ + u64 now = kvm_phys_timer_read(); + u64 val; + + if (p->is_write) { + val = *vcpu_reg(vcpu, p->Rt1); + kvm_arm_timer_set_reg(vcpu, KVM_REG_ARM_PTIMER_CVAL, val + now); + } else { + val = kvm_arm_timer_get_reg(vcpu, KVM_REG_ARM_PTIMER_CVAL); + *vcpu_reg(vcpu, p->Rt1) = val - now; + } + + return true; +} + +static bool access_cntp_ctl(struct kvm_vcpu *vcpu, + const struct coproc_params *p, + const struct coproc_reg *r) +{ + u32 val; + + if (p->is_write) { + val = *vcpu_reg(vcpu, p->Rt1); + kvm_arm_timer_set_reg(vcpu, KVM_REG_ARM_PTIMER_CTL, val); + } else { + val = kvm_arm_timer_get_reg(vcpu, KVM_REG_ARM_PTIMER_CTL); + *vcpu_reg(vcpu, p->Rt1) = val; + } + + return true; +} + +static bool access_cntp_cval(struct kvm_vcpu *vcpu, + const struct coproc_params *p, + const struct coproc_reg *r) +{ + u64 val; + + if (p->is_write) { + val = (u64)*vcpu_reg(vcpu, p->Rt2) << 32; + val |= *vcpu_reg(vcpu, p->Rt1); + kvm_arm_timer_set_reg(vcpu, KVM_REG_ARM_PTIMER_CVAL, val); + } else { + val = kvm_arm_timer_get_reg(vcpu, KVM_REG_ARM_PTIMER_CVAL); + *vcpu_reg(vcpu, p->Rt1) = val; + *vcpu_reg(vcpu, p->Rt2) = val >> 32; + } + + return true; +} + /* * We could trap ID_DFR0 and tell the guest we don't support performance * monitoring. Unfortunately the patch to make the kernel check ID_DFR0 was @@ -423,10 +477,17 @@ static const struct coproc_reg cp15_regs[] = { { CRn(13), CRm( 0), Op1( 0), Op2( 4), is32, NULL, reset_unknown, c13_TID_PRIV }, + /* CNTP */ + { CRm64(14), Op1( 2), is64, access_cntp_cval}, + /* CNTKCTL: swapped by interrupt.S. */ { CRn(14), CRm( 1), Op1( 0), Op2( 0), is32, NULL, reset_val, c14_CNTKCTL, 0x00000000 }, + /* CNTP */ + { CRn(14), CRm( 2), Op1( 0), Op2( 0), is32, access_cntp_tval }, + { CRn(14), CRm( 2), Op1( 0), Op2( 1), is32, access_cntp_ctl }, + /* The Configuration Base Address Register. */ { CRn(15), CRm( 0), Op1( 4), Op2( 0), is32, access_cbar}, }; -- 2.14.2