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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1A30C3A5A8 for ; Wed, 4 Sep 2019 16:14:46 +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 95BF121670 for ; Wed, 4 Sep 2019 16:14:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CYQm0yjg"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="ryF2Oile"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="lyQbiSBk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95BF121670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ryn0KglFVUDi0QLPQXVWDrqkzwyEM9QmjDTx/lyNi5k=; b=CYQm0yjg2MqH5e a+N6Udrpg3TCBVZ43AWWCZW4h+GS2S1UXp+5OPwLiFS78YGHCgkw+/yM7tM9uO51UG0cHDn0LVjDY A5Q5HG0Unvf2sPW9S0rL+JFfkDPgcuR3xGGegnTfeISPJB16/fg0yEmqANnldHVPVEjs8LyNzPkXm gAT9u2aTFcuAbbGTugu5tlE/D5TyuAlhmcPt6mOiQOCTtVQctCgV0/0a+LBhvbyReYbsFeidqT1mS qZFPZjSP31LGTyKzx5KAaSDpWvawu7etZlqGLvjAhZX2KKhGUIbZuWK8v8MacA0q5dw3+0MjvnOnr v9TUqdpc9g2RxdoNjOeg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i5Xvi-0001c4-9f; Wed, 04 Sep 2019 16:14:46 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i5Xvg-0001aS-4w for linux-riscv@lists.infradead.org; Wed, 04 Sep 2019 16:14:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1567613684; x=1599149684; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=dyrF6izOq5sqcNAw3cJtmFoiEXCoEfPHdpn8K0kiMXA=; b=ryF2OileC2itjoQ6zZ8djUXgd7FWXvPem/HY+dGc4VcwjEbboALfNy/3 YL/erAfHZWakEN8i0n/wRziyfMdsw3s5ybjLHzPcc3kgQScpsgXXVuonG BY4LYTv5T1E8hoTyLtlTgfVqev2R5nb8hOGq3dSG1WwvTCt6Hv1JuWzAv 8APrVOQr2BFEaCQu6WGW9FR6JDt27Tbvp+jmH+y8hEV9Z46O4ZsB9ampu U0jitTy2XthEhKXR7p3WhYLMo5Rb9EIrXmMltJynNKG0rF6+nwtyM4Kt+ PZNadB5EUKCXvhg/xdmxNkm/o1rmFHhKGbEvGDRA6/yUljB+J7ZNPa5QV g==; IronPort-SDR: TpYW4CWXCaOnYHaUrRSQd3vmg4n2GgI5L/NAKFoGRjR5sOA8S0INTKG3JtML7Ola+QJc2BP58l veiFHNFPVVb+JA4BrKt78hpKGW+ZshE7tIXLUKYf9KLkbQB3/+Meg836Fossr69MTvr/yW/rn8 2K4o2fHg9bC1xKv9YcO3+E/rtmQfBS4GCzElRw20zjcCa60PGfkk4c11xeN1yO/I2MshfmSt8x 1+sUOKnyI5hkFkk0gHqR+mOIbbM6urtIkm3Q2gI2UeqJyi2DnEjMi000zQpLpynb/EGMlIZTMY r/A= X-IronPort-AV: E=Sophos;i="5.64,467,1559491200"; d="scan'208";a="118323879" Received: from mail-dm3nam05lp2056.outbound.protection.outlook.com (HELO NAM05-DM3-obe.outbound.protection.outlook.com) ([104.47.49.56]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2019 00:14:43 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cuIreg4Nk50U9TUxcOAYFY0Rm0zaq6R71bdahnyRy7WChl2kP87mKXBU3QghN9mF1FsCGrX7GjqtAuS+7la+0vxGoYWeAdZSxkOTRujrgHKIW9+KxpIG4ns34e9YYftjVS+ti5pASGRLex6fePHpOq5+yDZk8ROIDTI7seIpC+56WQV+XO+6I3fosrMoa2O67JpmL5ZMmgNOt7wYVynKNr37oeqZNMPYvhL9CODVROvEVoG5lz44TsMGuxFvbEyRrZPTWSWraU99UF+ee5PNjYHtzvwn8oDpdieg7S3h8zPrnAV5jkiN852TqepHrFOMAQv6aeex96dUf8AHtv03qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ur4t1q5QEmIXmlJHmmVTaWWmvsOpi2JJsk+lUDL39BM=; b=CKDDlQSFwdyyfOkT7bRqTDdUZhOKm2dWF9shdPvM8The7h5LMlVE3paHYdU27S0icpP4Rt7/lENr1QyP2Ia0H9o+WDfZmAYOqrKa1O3vMkB7raoXt+6RYA+7rXGXSs8k7BFGEG/k20M80BYyh8AQacEyH12kF9ryj7r9+aHMdZ5Twrxf5520KTPg4priAwMqEJ85XJpKPS08REwzzBYg1X4FXMi0WyUQasHxorjDAvfuabKUt8LCRDGprd02fI+KOVpnGwuzCyGI5LvdpG4XaeeZifbYbVKcQH7NFPSFDQx8Y7+U+sfL2LtgypTnHIhr/OJM92r6bY6pF5kNqmbkmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ur4t1q5QEmIXmlJHmmVTaWWmvsOpi2JJsk+lUDL39BM=; b=lyQbiSBkzUHRASEtywdfWGFh+RB5+ulMQ7rTrdSMDm40f1jgKJwF+dwSn8PxbnDOr82aiFPzngiTEZ5BGigkNqugdRCmrop6jB4zgL3BIWEt42agSYkJAqvOBIayEw443iYWEqYqem5biW+j5yHhVdQLPOYbkMHb4PrNE/nySVY= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB5504.namprd04.prod.outlook.com (20.178.247.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Wed, 4 Sep 2019 16:14:41 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::e1a5:8de2:c3b1:3fb0]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::e1a5:8de2:c3b1:3fb0%7]) with mapi id 15.20.2220.022; Wed, 4 Sep 2019 16:14:41 +0000 From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Paolo Bonzini , Radim K Subject: [PATCH v7 06/21] RISC-V: KVM: Implement VCPU create, init and destroy functions Thread-Topic: [PATCH v7 06/21] RISC-V: KVM: Implement VCPU create, init and destroy functions Thread-Index: AQHVYzvbd193kldVsUabuJEP6uuoFQ== Date: Wed, 4 Sep 2019 16:14:41 +0000 Message-ID: <20190904161245.111924-8-anup.patel@wdc.com> References: <20190904161245.111924-1-anup.patel@wdc.com> In-Reply-To: <20190904161245.111924-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0084.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::24) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.53.222] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7350d7c9-3ac4-4784-375c-08d73152fd38 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:MN2PR04MB5504; x-ms-traffictypediagnostic: MN2PR04MB5504: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:454; x-forefront-prvs: 0150F3F97D x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(376002)(136003)(396003)(346002)(366004)(39860400002)(199004)(189003)(66556008)(66446008)(7416002)(7736002)(8676002)(478600001)(25786009)(386003)(66946007)(99286004)(256004)(14444005)(50226002)(14454004)(66476007)(64756008)(6506007)(6512007)(102836004)(6436002)(8936002)(54906003)(6116002)(3846002)(486006)(26005)(55236004)(86362001)(1076003)(53936002)(476003)(316002)(71200400001)(71190400001)(81156014)(76176011)(52116002)(305945005)(5660300002)(6486002)(36756003)(186003)(11346002)(2616005)(66066001)(44832011)(4326008)(2906002)(446003)(81166006)(110136005); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB5504; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: IRqkW8PLdvMf5YCMjCDtXa8hQNIjc09Ji8RgXoVXXzzXB90vN85wrBY4KeDjiuIuEGxwhOzCEaVoX1ACtlnjsy9k/SSPxMmXZIzZXppGJcqztzwVH4XyU/2H2I+ObbujAz9QVCLY7kiIopSxi+gytYJJiT41aIFpxb5D23morSndQCDHigTdGnVC+/xNmGcln2xzWUAknn5zjpoukQdo+FZ3HKGGhEMQOcab9Y8u5qtMtfCURuZB8/o6iCGeCP+2S5NgcoSCcSYZ27ecz6t5wzRan2jMJuTh5iV5+37CyIkoMCCd2sybxd8hgigP9imFFWiu1/A4Z0Z4SeKD0j5TYeT/PitNBv4tI+6FigK+n73wa86cij+L6YapDZihlhzinVJMxGv7uIT4NIfR0u/+/5q3lAfI/nIRmMHaYojoRFI= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7350d7c9-3ac4-4784-375c-08d73152fd38 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Sep 2019 16:14:41.2017 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: pK/Wb+v+aj/3T/Q3nIE15TPeGCj3lMG4jq6jUqSPqpk5igmLkDNpREmsiDzxVl3ER9qheZ2U2W7N0QCnWYOiyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB5504 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190904_091444_321655_5F9D5F52 X-CRM114-Status: GOOD ( 14.35 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Le Moal , Anup Patel , "kvm@vger.kernel.org" , Anup Patel , Daniel Lezcano , "linux-kernel@vger.kernel.org" , Christoph Hellwig , Atish Patra , Alexander Graf , Alistair Francis , Thomas Gleixner , "linux-riscv@lists.infradead.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org This patch implements VCPU create, init and destroy functions required by generic KVM module. We don't have much dynamic resources in struct kvm_vcpu_arch so thest functions are quite simple for KVM RISC-V. Signed-off-by: Anup Patel Acked-by: Paolo Bonzini Reviewed-by: Paolo Bonzini Reviewed-by: Alexander Graf --- arch/riscv/include/asm/kvm_host.h | 68 +++++++++++++++++++++++++++++++ arch/riscv/kvm/vcpu.c | 68 +++++++++++++++++++++++++++++-- 2 files changed, 132 insertions(+), 4 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 9459709656be..dab32c9c3470 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -53,7 +53,75 @@ struct kvm_arch { phys_addr_t pgd_phys; }; +struct kvm_cpu_context { + unsigned long zero; + unsigned long ra; + unsigned long sp; + unsigned long gp; + unsigned long tp; + unsigned long t0; + unsigned long t1; + unsigned long t2; + unsigned long s0; + unsigned long s1; + unsigned long a0; + unsigned long a1; + unsigned long a2; + unsigned long a3; + unsigned long a4; + unsigned long a5; + unsigned long a6; + unsigned long a7; + unsigned long s2; + unsigned long s3; + unsigned long s4; + unsigned long s5; + unsigned long s6; + unsigned long s7; + unsigned long s8; + unsigned long s9; + unsigned long s10; + unsigned long s11; + unsigned long t3; + unsigned long t4; + unsigned long t5; + unsigned long t6; + unsigned long sepc; + unsigned long sstatus; + unsigned long hstatus; +}; + +struct kvm_vcpu_csr { + unsigned long vsstatus; + unsigned long vsie; + unsigned long vstvec; + unsigned long vsscratch; + unsigned long vsepc; + unsigned long vscause; + unsigned long vstval; + unsigned long vsip; + unsigned long vsatp; +}; + struct kvm_vcpu_arch { + /* VCPU ran atleast once */ + bool ran_atleast_once; + + /* ISA feature bits (similar to MISA) */ + unsigned long isa; + + /* CPU context of Guest VCPU */ + struct kvm_cpu_context guest_context; + + /* CPU CSR context of Guest VCPU */ + struct kvm_vcpu_csr guest_csr; + + /* CPU context upon Guest VCPU reset */ + struct kvm_cpu_context guest_reset_context; + + /* CPU CSR context upon Guest VCPU reset */ + struct kvm_vcpu_csr guest_reset_csr; + /* Don't run the VCPU (blocked) */ bool pause; diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 48536cb0c8e7..8272b05d6ce4 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -31,10 +31,48 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { { NULL } }; +#define KVM_RISCV_ISA_ALLOWED (riscv_isa_extension_mask(a) | \ + riscv_isa_extension_mask(c) | \ + riscv_isa_extension_mask(d) | \ + riscv_isa_extension_mask(f) | \ + riscv_isa_extension_mask(i) | \ + riscv_isa_extension_mask(m) | \ + riscv_isa_extension_mask(s) | \ + riscv_isa_extension_mask(u)) + +static void kvm_riscv_reset_vcpu(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; + struct kvm_vcpu_csr *reset_csr = &vcpu->arch.guest_reset_csr; + struct kvm_cpu_context *cntx = &vcpu->arch.guest_context; + struct kvm_cpu_context *reset_cntx = &vcpu->arch.guest_reset_context; + + memcpy(csr, reset_csr, sizeof(*csr)); + + memcpy(cntx, reset_cntx, sizeof(*cntx)); +} + struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) { - /* TODO: */ - return NULL; + int err; + struct kvm_vcpu *vcpu; + + vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL); + if (!vcpu) { + err = -ENOMEM; + goto out; + } + + err = kvm_vcpu_init(vcpu, kvm, id); + if (err) + goto free_vcpu; + + return vcpu; + +free_vcpu: + kmem_cache_free(kvm_vcpu_cache, vcpu); +out: + return ERR_PTR(err); } int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) @@ -48,13 +86,32 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) { - /* TODO: */ + struct kvm_cpu_context *cntx; + + /* Mark this VCPU never ran */ + vcpu->arch.ran_atleast_once = false; + + /* Setup ISA features available to VCPU */ + vcpu->arch.isa = riscv_isa_extension_base(NULL) & KVM_RISCV_ISA_ALLOWED; + + /* Setup reset state of shadow SSTATUS and HSTATUS CSRs */ + cntx = &vcpu->arch.guest_reset_context; + cntx->sstatus = SR_SPP | SR_SPIE; + cntx->hstatus = 0; + cntx->hstatus |= HSTATUS_SP2V; + cntx->hstatus |= HSTATUS_SP2P; + cntx->hstatus |= HSTATUS_SPV; + + /* Reset VCPU */ + kvm_riscv_reset_vcpu(vcpu); + return 0; } void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) { - /* TODO: */ + kvm_riscv_stage2_flush_cache(vcpu); + kmem_cache_free(kvm_vcpu_cache, vcpu); } int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) @@ -199,6 +256,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) int ret; unsigned long scause, stval; + /* Mark this VCPU ran atleast once */ + vcpu->arch.ran_atleast_once = true; + vcpu->arch.srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); /* Process MMIO value returned from user-space */ -- 2.17.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv