From patchwork Mon Nov 9 11:32:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 11891313 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B35891130 for ; Mon, 9 Nov 2020 11:43:12 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 434B7206ED for ; Mon, 9 Nov 2020 11:43:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NcKdoZcp"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="E975gf4E"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="HytYuhUL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 434B7206ED 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+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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=va+KTAwQxt/xJDW5zMq8W+WvQ+MAUcwD3JOgEGtBZtk=; b=NcKdoZcpx16yDCYQtkACOUDjb SZW+YVC2MlkuO7RN6Q6W7p7yreR6GYSc8hrQ+9B1zy/vf5QaSxy0La7tEyn5qAxFtQW/ZsktE4v91 rQGf9F16jO297EOEDpDJ1PaX8/aGolk6f4wXIB6Nq5OEe6olE9m9D9YWejw5os5UiHa+JEjRCMRde pHh7/cIQ7pxbRXw4AMly3AQiT4LEYlXzzKad1eIGlAzoVvpCSUKX2XOsqQbzPKApL742pCN8XDGv7 VtA5i8bQk9FDXxY6n10m+UOy0Ds4kd3/NTuMMqMe06IlZQV1CgilM5uCdXfQ+VolTWiWvvZNkfrnD 74/O+gU3Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc5Zj-00014k-Ec; Mon, 09 Nov 2020 11:43:07 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc5Ql-0004ii-9b; Mon, 09 Nov 2020 11:33:59 +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=1604921630; x=1636457630; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=t/J5BhuLT+5vJaoywOQClLYe0pLHLd8PHzF4nEQxl8Y=; b=E975gf4E3nr2dht22xgW7VJQhQiQbuac5Mar4Sg6o5S3uY5I15C8ZYIC nQ9CmCQG2dW7vCGfnOQWi502+Bj7FhwNlg+K4qMzhecYnrEFiRtUa0aw5 TgsyzD/rvx3I37UFkX/NttHXKBMHW83fiOOjJeuMZY2rg9SY8yuwgSnGw pU4dVeYqKeeZk9ZBMz7zvvnPLPunKPNlNQk3DpoPL4vAeIIpOjLwkcaeb orTILDTP+lCaLBDcPICnVLxUFRxVz9CLECjbh4gRNQ4TJHjM70A58IQfN CumI3Rnx9FOoPRUTp32HlZG3qBoRLGPVJjRINHas2daPpa6a7cj5Bl25r w==; IronPort-SDR: Vjf+4iloCKfytQi9ibOL9AYv5aCEOcOcLmEnIMj8LIQzb1W2LkKOpmmj8si1EEGWTq+6/MsHt3 NM8VnoagqCvlpr69Y47oXyO88vCqH07lLhgR/Bhr5ztAguZAgmgJuLBoafRfM9Inzc21RvWR4p 9yA+tDrxSxk3jDIRyb+tB7t3ODJ3ZvqJKRc02UdUGUN1/qryHdz8kojcYt1Y3sKEaMeMKYiGU1 wVyTswQ2D9841+y85yvIoY/wq0mFaCCi0MDyunFTXxNZL+IT40l3Z4lhm5HhHzu+WocCJMtWTx nWY= X-IronPort-AV: E=Sophos;i="5.77,463,1596470400"; d="scan'208";a="152286350" Received: from mail-bn8nam11lp2172.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.172]) by ob1.hgst.iphmx.com with ESMTP; 09 Nov 2020 19:33:47 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AjpryUpDEI8BoD7r42dGg1Hg5SmH61ZfVxiq9hjt6QgJ3vqx5M3ZipyWzlL2O7iexk+QjVISGCMLLXc+SdF030OLaKRkMmou7pfCGKgsYQ/M1D/PkRjeiiL5/mK3tH3lIl5YULo7ID7UuvaN1pcpJn+099cmCJExdAxuxCvEOiPtcCqo7A63Rc+EaJ9N/z4y+3u7V7G0JCoQSW7lD/fyQt7oGGUM95ARmp3sve/yQ+YoU3kIyst4314fn5CffuRoaWOruE1fEQq7Fy7OzcMp8CTp1vjEHRqWX4KZ3KVkMcE1+Ydg+7jaZwDCzP95/1cFA5a2sItQOARDozP4wLXzWA== 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=pT+3ONsRZew7hKC3TTIXCxmIgYa9u06HktJCk8qmInI=; b=oNgkrYUyDQjUHVDbePv915OXmTkd3xWcCghOT6iatIDUzl0xBPTgSSpSB29PIiJwdAXVQxXna07bVw4rvrvXHlsfaqUvv70FZiOX7ElwVtiYolODalp/mEKG+/O07plKVP41NeAQng0jbdytdYSfmtnB6KRkmKDMrobPh8W4nELIGw+YOfUxYPWmP3K9om+th7o4ZRC8zcql7qCeACR+ylOPtFBR9oZGPh+fsZiF5MLt1n56fC51jcZX2MXZ2eR6VfZKhJ4GnMW16/Zol62vWD0T9v+o+vkVAakeAk55i/2xnDQSOm/mSVsHkJZhLZ8KcBWFPYs+7l7z7Cy+XxrZKQ== 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=pT+3ONsRZew7hKC3TTIXCxmIgYa9u06HktJCk8qmInI=; b=HytYuhULlrlMSHCBQBJ2z+FHYk8wr+JPrqmKWvT8nn0WdxH6cCwQ/ZmwD4Cox66XMXdO76hTTES0GfRcnXWDAL/dVb2lfQ6BR7CyVP619cyiEwonizDpEX+KKPOWAfT3nxUri5o2OpTy1cntgQ64f+rK4JnYsXAzAAp4V4y5ye8= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none;dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB3866.namprd04.prod.outlook.com (2603:10b6:5:ad::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Mon, 9 Nov 2020 11:33:46 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd%6]) with mapi id 15.20.3541.025; Mon, 9 Nov 2020 11:33:46 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou , Paolo Bonzini Subject: [PATCH v15 03/17] RISC-V: KVM: Implement VCPU create, init and destroy functions Date: Mon, 9 Nov 2020 17:02:26 +0530 Message-Id: <20201109113240.3733496-4-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201109113240.3733496-1-anup.patel@wdc.com> References: <20201109113240.3733496-1-anup.patel@wdc.com> X-Originating-IP: [122.171.188.68] X-ClientProxiedBy: MAXPR01CA0099.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::17) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.188.68) by MAXPR01CA0099.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Mon, 9 Nov 2020 11:33:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f4814fde-b469-4ca5-b023-08d884a3521e X-MS-TrafficTypeDiagnostic: DM6PR04MB3866: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:1284; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gvsv02vFJkf6OV7XxKe2m0XQUXrEDjDiGF25hMF9eXFltmb7a8gnLcXNqMdH06axww/saTaHr7P/1Hap/SoabPjxroH/AhaR1GSi97uMH5pjI04SRAUg348wXF1Mk+02403dPgm6bQBubZ7vTJrj42flBGCb0KuY2KZhfps8fGl5ItfLWCRW3a/cE1ptkI5NDqkgGFF9f4c5gIO+jKSRSN7hTwwd7EBJaJ4b8x5AQpsSMp8GV1Us5BRBi5rar/qIed5KqN/sQ3su9SEjbsxoYzG4AW1pfMkj+NgEYiexHg5PUvrjXEcRF5D/a4M/h30M X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(136003)(39860400002)(376002)(55016002)(7416002)(83380400001)(1076003)(44832011)(16526019)(186003)(316002)(26005)(8676002)(110136005)(54906003)(5660300002)(52116002)(7696005)(956004)(2616005)(478600001)(66476007)(66556008)(4326008)(66946007)(6666004)(2906002)(36756003)(86362001)(8886007)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: gFjDOgIWHSgdkWh8aN8Ap/O75o6GA0UTebNdxExjRlo+9/aJDovdpPJkQ3xZC64cdMqTPfZ0EbPSXl/tk46v6Kd3XE3xHarBjtxShlRgWdrp6g7S7NTDxErHp+bxYXAAWyjUfD6zEDlanAcAshLaqO6uh+btJ5CH6yi9If5tydDtidD278yJiPWNw57rB00hZtSVwFwYkCKuk3NY+LXRJIhqfGfZ8az+7OTwBXUl6tT0Pk1JpfTBTejoZVI2nt2cK+HlHGrF68wE2eZf/m+3mlLk+OBX6+Ft0MObM2HIX12GkFIREfbvZvjO3C87ktuZHof6+pGObT6HdqIh2hmZz+KwEUhEBxyJHn12VhPOryk1l2qdd/1bb/2YDh+CnFR8BHmoNe+hDhNv0uzMZrPM+hEdg3ednzQml/Z/LJYN2UY5Uj9WHsrdcRIIV0Nz5h974Ns0/QZF83asJ6EBtcE5/rW73CW4LMleOfoP6BC5quFdstRf/b9ggWdhF5qJVQEum3USAqWUmAvsuxE6lT105MV88enFFf6dwJ/JO9gj2o/5xFEGbqX5F0zSnyVswvaQW5bW7VCbWloSy3ir5gBzDMfZu2+9l37fwzJxxdZD+9ILJrVLkdZ0iRbTon5+903nbpJu4XXxv1duJX9oAvktgA== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4814fde-b469-4ca5-b023-08d884a3521e X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2020 11:33:46.6902 (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: LO/L0iRhCa3BWMVC/bdOZkqh61L3cROWm90jqFgBfpjhBdllMTtSahNQbg/LrgN3gD55DzvS8WherI7Sgir7zQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB3866 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201109_063351_603779_BF108469 X-CRM114-Status: GOOD ( 19.89 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.153.144 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay 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 , kvm@vger.kernel.org, Anup Patel , Anup Patel , linux-kernel@vger.kernel.org, Atish Patra , Alistair Francis , kvm-riscv@lists.infradead.org, Alexander Graf , linux-riscv@lists.infradead.org Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.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 | 69 +++++++++++++++++++++++++++++++ arch/riscv/kvm/vcpu.c | 55 ++++++++++++++++++++---- 2 files changed, 115 insertions(+), 9 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index fdd63bafb714..43e85523a07e 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -63,7 +63,76 @@ struct kvm_cpu_trap { unsigned long htinst; }; +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 hie; + unsigned long vstvec; + unsigned long vsscratch; + unsigned long vsepc; + unsigned long vscause; + unsigned long vstval; + unsigned long hvip; + unsigned long vsatp; + unsigned long scounteren; +}; + 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 8d8d140a0caf..84deeddbffbe 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -35,6 +35,27 @@ 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)); +} + int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id) { return 0; @@ -42,7 +63,25 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id) int kvm_arch_vcpu_create(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_VTW; + cntx->hstatus |= HSTATUS_SPVP; + cntx->hstatus |= HSTATUS_SPV; + + /* Reset VCPU */ + kvm_riscv_reset_vcpu(vcpu); + return 0; } @@ -55,15 +94,10 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) { } -int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) -{ - /* TODO: */ - return 0; -} - void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) { - /* TODO: */ + /* Flush the pages pre-allocated for Stage2 page table mappings */ + kvm_riscv_stage2_flush_cache(vcpu); } int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) @@ -209,6 +243,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) struct kvm_cpu_trap trap; struct kvm_run *run = vcpu->run; + /* Mark this VCPU ran at least once */ + vcpu->arch.ran_atleast_once = true; + vcpu->arch.srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); /* Process MMIO value returned from user-space */ @@ -282,7 +319,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) * get an interrupt between __kvm_riscv_switch_to() and * local_irq_enable() which can potentially change CSRs. */ - trap.sepc = 0; + trap.sepc = vcpu->arch.guest_context.sepc; trap.scause = csr_read(CSR_SCAUSE); trap.stval = csr_read(CSR_STVAL); trap.htval = csr_read(CSR_HTVAL);