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,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 1D7B2C10F14 for ; Thu, 3 Oct 2019 05:07:07 +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 DD5D321D81 for ; Thu, 3 Oct 2019 05:07:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="u4gxkQw1"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="GzBGd9fW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="dDIulKoF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD5D321D81 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=WXuYGbz3SupoHI9vVwuyetLQCKBidZhHh2rT0BaMxRE=; b=u4gxkQw1GwxKeO I7NTYhCSyRn0C+vdZS4uD1YEN3K13NQZ4fkZ3S2a6LKJx6nXtPUsj8nRFk/req6Gimgnh3xyFNrzT 40Ll6yhmzTLWN8C52cnZEs5rLkc844xn6qY2iFV/Zz4E9vCOZhzNUukQi0o12Fz98SRpxeNuIS40H 9hGIUOnlfVVpILbRfe+0OOtshHlsDj2An4NMTmMzhWuSRPZuyFZZ5hXHVX9aFc026wGLD9FEPCzbu oVtNihZItNDcEojSy8HzytoiptE0g3fqyy85YinrJC8qbIhfuH2Qsv7IQBFc9KtHSp15Bb2WYARin RU59tirTLpgpH54qdwvw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFtKU-0003S3-Hf; Thu, 03 Oct 2019 05:07:06 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFtKR-0003QU-Vq for linux-riscv@lists.infradead.org; Thu, 03 Oct 2019 05:07:05 +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=1570079224; x=1601615224; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=fDLT/tvUtxZor/pyJ7arbei5F/B1X1c5CWdgm4TQvIE=; b=GzBGd9fWTfsFSyPtUxvr8/CiHJLWm99ltL0hZm8eWfHIjOW+s54gDogG iYCB6wkgYqeqKAg4vzP4pNk9tYmGXa2P400PH9+PNztS0Dhzrq7BMGXKc KYTIrxg5+AB80QZOQCt4KUwdf7q3WROmL/rcMVGAU5xOSSNtkAs7IAq9f WcRN+NMfYm/tjEIRwySuzwz4SL6fB5p/aKyIuafBIj2Gawd5yp3LACe7w /RFuAWvoXzfWVahW+mpyAQsGmSkNh+V35UkdCMsHo3SyKIksIMjIX9sFL GBpPvs4m9+usVpw/628H8cMfBRC0wFZvewxfPfFNgoSyoHLfYs3ESvMRJ w==; IronPort-SDR: hPDB85gqcOZkUb2fE6hqZVQnpLKlah90v+Dw/rVLlbZDCND7concAkZq7FXbHnb3KF0Wnhgmsm HXAv0NZ4u8kNWBHqRfqG3tkAbLZ6alGylSu5qrnsv+x/v+3RtlVSt66Bl1z2iFHJc97zp0poL4 /Sn3X89o3V2XHPkqy8cWpx6m3BVoWt1KJW2jBzOSl4QdwFPqD4Y4ovGJF6CabphmjMcmPQz8Ok TMI+Xw33krbPla5nuAEG789ikw7q0A0mkQRe15IXqgNEZ3zIB3JHulnTbKVxBsgytb7QMsyhbd FUY= X-IronPort-AV: E=Sophos;i="5.67,251,1566835200"; d="scan'208";a="120461312" Received: from mail-co1nam03lp2051.outbound.protection.outlook.com (HELO NAM03-CO1-obe.outbound.protection.outlook.com) ([104.47.40.51]) by ob1.hgst.iphmx.com with ESMTP; 03 Oct 2019 13:07:03 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UQj3jGpIQ03JR3ufwMKjbsm3gpunf6eZFYKLrxA/EDc0cH/fWjITGalralT5LTrFB7Lk0lwAVlyl0hz5JFztAqCX5TEwdened4QRGlxZCzOF582NNOR1Tgvwq6pzaOa9wr9P1m1B9jNfg4k2JDk1+eYiOj6l7QR28D8NDBLZuXQOw0rrTOOZVCmAxLIwjJ7YHynTLJcUUb0kJua1qlwmbBTQcZiaMSDkcmz1FR2R/IyPfWxIxXqjIZuNdL0dwguNfupX6tcRPF1Ez3ZDEUEbmwsf0p3qBTBFz5kh9CGc8wEgoCw/wIzaohF2iCVc6aq75ZBSoFhGo6oQ714fsYfe+Q== 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=VqmrXHzIruAcNotF2clWWzYvQNRNRKr+C27TLUx8gRQ=; b=czmuWvjbJe4HgWgEQDlR6toUt7RnY4IRPiCncQvOE3OvP/rpW1jKAVVF4R235wq9DFFOtzJKMgTSo3tig2V3HTWgN8VGehmDWrd6709Z7FhvREywyF70cDxHZttwNg5qpqi/zUUC7/YCaQjL/eiIhZzmGoTs18qME9Pc9N+Le9LLQ3YwyZnwhqsvzL1L0ABpaBTDEMw+60K47v86Do9Q2r899u2dSev8FnhH/N/tMGQyigLh1ulGB2zs05RsHmSAdu9PnytjfpBE3rmRi5yrpdaBrfeb/gJjafUnMxuUG+6rdBS53aXMO8E0LTYsYZaIkeoDM+uOwFO9SffxJsEc0A== 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=VqmrXHzIruAcNotF2clWWzYvQNRNRKr+C27TLUx8gRQ=; b=dDIulKoFcNSUppzvUl9UPCVxAtkJQpbLfhMgtFqSOsEERuIihVaPWD4x3xyrWTb4e/AWSYK2cay949/NARkP8UlRyERUU+JqlnjBpo8C1cLgdFRxV4fvzNFu8viTTp010RWBsSlGE+lL6qloiiQQBsE4WGT7q95jseQpiHjjAvE= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6991.namprd04.prod.outlook.com (10.186.144.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2305.18; Thu, 3 Oct 2019 05:07:01 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1454:87a:13b0:d3a]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1454:87a:13b0:d3a%7]) with mapi id 15.20.2305.023; Thu, 3 Oct 2019 05:07:01 +0000 From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Paolo Bonzini , Radim K Subject: [PATCH v8 04/19] RISC-V: KVM: Implement VCPU create, init and destroy functions Thread-Topic: [PATCH v8 04/19] RISC-V: KVM: Implement VCPU create, init and destroy functions Thread-Index: AQHVeahjaOd40LXvJEyLeU+X/Cfsog== Date: Thu, 3 Oct 2019 05:07:01 +0000 Message-ID: <20191003050558.9031-5-anup.patel@wdc.com> References: <20191003050558.9031-1-anup.patel@wdc.com> In-Reply-To: <20191003050558.9031-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BMXPR01CA0030.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::16) 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: [111.235.74.37] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ed6237c5-7bda-452e-b1e8-08d747bf863c x-ms-office365-filtering-ht: Tenant x-ms-traffictypediagnostic: MN2PR04MB6991: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:454; x-forefront-prvs: 01792087B6 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(4636009)(366004)(346002)(39860400002)(136003)(376002)(396003)(189003)(199004)(7416002)(52116002)(25786009)(102836004)(76176011)(54906003)(6506007)(1076003)(386003)(7736002)(44832011)(6436002)(486006)(66066001)(71190400001)(71200400001)(11346002)(446003)(6116002)(3846002)(476003)(2616005)(26005)(305945005)(6512007)(36756003)(186003)(14454004)(110136005)(5660300002)(6486002)(66446008)(66476007)(8936002)(66556008)(256004)(64756008)(14444005)(66946007)(86362001)(8676002)(81156014)(81166006)(99286004)(316002)(4326008)(2906002)(478600001)(50226002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6991; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: R+YBdmRbXisA7fadUnY8B+LcCurm/VXywrkZoFija+oecPnlIJ7SCakUNP43SlAzmElY2WO4ei+A+zgkY2q6AZd2HyvXMKmBw0nFjlMdIp1nkZIc9oUN5omoN9PyzqdZ83BInLn4ryUtGMyJ6YJ8QPQcgn2usJ4D3L9U2H/DFN3nj+N16wrFaz+SkK+pBVlZsd2TL8yIb7dqxGE/NgHXlSs5pvj0W5M+nsEsiooqI7mZE+K4O/GpZC/58GZMiQqtZYqRJoX4GdyqOG/M9yXSqmZJUt9wenfR7j55RN3bxFf4xUr0JZQdmVyuT4SGqAWTSrlKFhPYxfB5cLQ4EM9hhUifs/ylStIrjgUn9aK76n7zaAA7kZp6vS6mb8YvRT4aDc/D1pptRL/m/rFmschUDUBSIWlbqvYo0W8hc+FXdCc= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed6237c5-7bda-452e-b1e8-08d747bf863c X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Oct 2019 05:07:01.6122 (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: WEvkuVpR2oQhIKqA1CxaBYQ9ahZGKnBAsfc39n3HUkuTy8dxEA4VzXPEeYePtivPC3Ntx24Rhm5nKCZDEyYSug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6991 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191002_220704_036042_1B4B9D85 X-CRM114-Status: GOOD ( 14.91 ) 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 these 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