Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp5400524ybh; Wed, 7 Aug 2019 05:30:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwmGWzuO1Z+69Ixu5wbIU8ZVuRy2yRs519hHl1lRp7OCJPgczZYdjrZjMqNI4FSsnI91vOn X-Received: by 2002:a17:90a:30cf:: with SMTP id h73mr8324422pjb.42.1565181021211; Wed, 07 Aug 2019 05:30:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1565181021; cv=pass; d=google.com; s=arc-20160816; b=mmgBAqFhc1XKn5GMjaiCMLqEPoBWoopNzZORMCgbmoOL3XMEwNR0LbYT0E+At6+2xx aa/ubSnFPAzcLxrjFuJydxg8J0fiGY2+K7CUxrSMG+OfUGaGVTL1Xss/y0mr0U/1IRtD oJXkKR3ZTdJSh78jP18iyqugOToHRqHKK89UcNRK+nS462trCS+Mq1tB4hebdD/0p6zy IGZGue2MXAVEDOgMDf/Ax5Y/RzfxrtcQzRFBm/7hF/dJd88US1Yah5JKQ/It6l50g+kI SEL3T4+y8Ez3ItUZpx9nlB4ovH3wGdIY2FokTTKqkMu4MNUumtOXexGtq6PxkhiMQFI4 6v6A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :wdcipoutbound:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:subject:cc:to :from:dkim-signature:ironport-sdr:dkim-signature; bh=SQYmc1Z5Ci0WKcNE18yonnwPd+aJ5+ALRdaMMGB7DTQ=; b=GKq90AyzmHxDNcoMVYVsV6WOR5hzWsebr5QgL/NLpdf5DxzSwK7+airUoynyu5tSUI OeA7vYsfnRdJE7ZcUJlnTHYfWDiZz37S/UewufHqcQQhcIzVbdXd5Lxylu3z/k9vcgGU tKr+rG+sBFoWFQfyXmUNOW62VX/hESIHKCs56/Cm3bwmyrD9mHLPg09CRu8j3nv/5jsG FiIpbzSPkZstra0qh9iw2TZlh6aRGToHkIJ4XZLx1qJqbjuM8BVVn81x5HD69lQQZL9u wjFG4lv6HVpUoEOdShaECRvkHywpAQX2AmniDIN/bMdsTAkHZQtlKuB40RuumKFZ0MA4 g4/g== ARC-Authentication-Results: i=2; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=LOvs3mH6; dkim=pass header.i=@sharedspace.onmicrosoft.com header.s=selector2-sharedspace-onmicrosoft-com header.b=zXRbUPMO; arc=pass (i=1 spf=pass spfdomain=wdc.com dkim=pass dkdomain=wdc.com dmarc=pass fromdomain=wdc.com); spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t2si52517469pgq.488.2019.08.07.05.30.05; Wed, 07 Aug 2019 05:30:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=LOvs3mH6; dkim=pass header.i=@sharedspace.onmicrosoft.com header.s=selector2-sharedspace-onmicrosoft-com header.b=zXRbUPMO; arc=pass (i=1 spf=pass spfdomain=wdc.com dkim=pass dkdomain=wdc.com dmarc=pass fromdomain=wdc.com); spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387962AbfHGM3A (ORCPT + 99 others); Wed, 7 Aug 2019 08:29:00 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:14458 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387952AbfHGM25 (ORCPT ); Wed, 7 Aug 2019 08:28:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1565180937; x=1596716937; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8eAH+F1Lo+N7jBB63zF5Ol7tADfBATXmLoXtJBvOCEQ=; b=LOvs3mH6uBxSWHd7hsOlcmf+JGQ1uwmodysp/dwnJtkVkpfmgzzoHOMq LJwgOun6DJ07K0O0Li7dbmiiXjsy1GbKs2W56BNZNdFCTlk1stm4WX4nJ kBofKn/FsP1OytG+rGA5wD4w02DA5Xk34fFUDLIE/E8UvE7BfRCzxenwK d8sJnHpC8diDXsQrMfsd9tUZq9DTLE4yjXZYuSoYbYzaLRZ8MGQ7EjoyT wAEtA+0Cuig9fhXPZbd8/sldSdUA84EAsrBbVL8PE2Rrb4z1YUhm/uqHd tEjicrrTJ61mOZmOaH9m/9lgbe/20DArj2dqhvYudb73UKodomtOWypOB w==; IronPort-SDR: a3kziK1GVdF90u7UspNBp/CHFWyYSd7CJ17rAM2ZpFGXHQaJkm/X77fVCa9Bk1GyzNFB6rjGlk FO1JYndd31r1C3uxu7u6brxURd8d4PpcbcetjUtIFJ5U/XlP4CUObOs817bZOIl3mOD+jnZPEQ mFE5kJJ8FCNP7dNEnz2O+RbGznR55bfWGwMnZCtkS/VbQJQKfVqEHkQTeZTVIu6eEPVlLv4DZn Y9WwzqDm7Gi7UDhFxjkDEsnOqlp8cwq73gck9aFNjFcR1aErN6kEmamoVYJgW+WC5fm9NftgYh PiI= X-IronPort-AV: E=Sophos;i="5.64,357,1559491200"; d="scan'208";a="116203140" Received: from mail-sn1nam02lp2056.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.56]) by ob1.hgst.iphmx.com with ESMTP; 07 Aug 2019 20:28:56 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DldAIEMe8kU0QbmyXTgTwGaOkV1iKM9ih21k89Kf8k4AOvwb9fF3hTdneWbfeeqSOOgoVaVqCH4Xt+Wal6LGicN4yWtcFmqVcghW6Wl+70wqDne8w1gS1EZEyCE2HVIF74wEOPNW3fbPoMSn1FJ8MhCoxDMOAGO15pcf/EJmohpDTLQuHh1fspSv18TU+ATBhgNsz+VUfVUQhRgeh8OxBZSPp9pwvvjcCIniy0kkBeoifwP3xqYbfusqnXmoepHoHEuDcoqgIE+biOR3s6qNWowSwpSyA8XDTD667c4JWbjp4Ho6/geyFtkQPcv7eL9R3R7AEnK6ltHE9CBWye/s6A== 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=SQYmc1Z5Ci0WKcNE18yonnwPd+aJ5+ALRdaMMGB7DTQ=; b=SnvELQEZbG8gQe2ltHcRpKC5eDLB+rWgeBcKrZOpjzL4X5R6QeEqI/bb75Ku7uLzrSRqalkI5H2iWivIKuGltPyL1UR3QenUpaO9x+TTSBTQlZyyHwx9VvhfV6cMRXNK1q0o+sb3xfV6qR/0ijEGOyLeqGFMeKrv3YPTV032/cSOYo9bXXeaODh1F2Uoumk4sE4W+0ZdRplCXm+8eWWuMwS1zTfmeduufNa7ogmQ020UxE4fZ4AMOeqpUVMCGmHtFEbIMuB81qHvnlsCNoPmjZuMjRjou/ZDISv/7LIihcWozZjDArsedZpGmZs70YJqeHrLC4sjvLu7vc9exvIHjA== 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=SQYmc1Z5Ci0WKcNE18yonnwPd+aJ5+ALRdaMMGB7DTQ=; b=zXRbUPMOQ4q2lYHiKcCtT6cWYMmRgcnVh3vXUhjHRw0cM4clUEi87f9C20dJUxdbs+R4gKNUO8KnRSLRjquUgR6tqUapa7LfF2l9L03LMsYOeh3U07GA+baxF+wi2QFufs5txd435gEzPLk0Yy6X8sq7fCupluHby4UX/tWz/CE= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6736.namprd04.prod.outlook.com (10.141.117.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.17; Wed, 7 Aug 2019 12:28:54 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::a815:e61a:b4aa:60c8]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::a815:e61a:b4aa:60c8%7]) with mapi id 15.20.2157.015; Wed, 7 Aug 2019 12:28:54 +0000 From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Paolo Bonzini , Radim K CC: Daniel Lezcano , Thomas Gleixner , Atish Patra , Alistair Francis , Damien Le Moal , Christoph Hellwig , Anup Patel , "kvm@vger.kernel.org" , "linux-riscv@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Anup Patel Subject: [PATCH v4 10/20] RISC-V: KVM: Handle MMIO exits for VCPU Thread-Topic: [PATCH v4 10/20] RISC-V: KVM: Handle MMIO exits for VCPU Thread-Index: AQHVTRut9bnoruNCi0Sv6ho/yipXcg== Date: Wed, 7 Aug 2019 12:28:54 +0000 Message-ID: <20190807122726.81544-11-anup.patel@wdc.com> References: <20190807122726.81544-1-anup.patel@wdc.com> In-Reply-To: <20190807122726.81544-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PN1PR01CA0097.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00::13) 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.52.255] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b3e58aea-3222-4473-164d-08d71b32cfa8 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:MN2PR04MB6736; x-ms-traffictypediagnostic: MN2PR04MB6736: x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:421; x-forefront-prvs: 01221E3973 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(396003)(366004)(136003)(376002)(346002)(39860400002)(43544003)(199004)(189003)(386003)(1076003)(3846002)(446003)(86362001)(186003)(26005)(11346002)(76176011)(52116002)(36756003)(54906003)(6506007)(102836004)(55236004)(2616005)(478600001)(44832011)(66066001)(110136005)(7416002)(476003)(486006)(8676002)(6436002)(6486002)(6512007)(4326008)(81166006)(81156014)(316002)(66476007)(66556008)(305945005)(68736007)(2906002)(53936002)(25786009)(256004)(5660300002)(30864003)(14454004)(50226002)(7736002)(71190400001)(99286004)(66446008)(6116002)(64756008)(8936002)(71200400001)(66946007)(14444005);DIR:OUT;SFP:1102;SCL:1;SRVR:MN2PR04MB6736;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: 7c527UF8BoaFwUy2OBoaeevaIvuO0wvpF2JOdPCl335YhHFzapE43KBHH9rKfd3GHN4xHlprV2NH/2WGsioklRT+s7l0gwojirGJTbuenS0iQOCZD91TvPQBwTia1WyGQKEj9CkpPZhXNMiQz5j4pk9ZZFEQIsYdKbARlckqBJP4aa+DCiA7fpXmn766jttMv0F83xXG6dHyRc9BjOPxFcyuto5eBCyqBLGHxZal9eiL5UMTezvmrkvzK2P6MFUkFRxgVX7M0pL5rjXmPb0UzicrufcMb27KiVKJQr3IEji3CEiMgTtgdPvW7ftG4ekmUdhqN33+U1ptiEo9LzwYhAkQ6FxwWZcKT/JScpImiEh+azuYhb+D3B8/iHmVS1lTFVjtzubgK6lnPQdqkdlBd6Tslc7k0B3H4rIGvubRaYI= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3e58aea-3222-4473-164d-08d71b32cfa8 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2019 12:28:54.4377 (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: IE6Z5iIsCr/ofYt0u1hOboIKcgjYAl3PYGV2dNp28opRzrem2io/yWULUOM94QjMcRWMHMbOV/F+oXIF8nlp5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6736 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We will get stage2 page faults whenever Guest/VM access SW emulated MMIO device or unmapped Guest RAM. This patch implements MMIO read/write emulation by extracting MMIO details from the trapped load/store instruction and forwarding the MMIO read/write to user-space. The actual MMIO emulation will happen in user-space and KVM kernel module will only take care of register updates before resuming the trapped VCPU. The handling for stage2 page faults for unmapped Guest RAM will be implemeted by a separate patch later. Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_host.h | 11 + arch/riscv/kvm/mmu.c | 7 + arch/riscv/kvm/vcpu_exit.c | 436 +++++++++++++++++++++++++++++- 3 files changed, 451 insertions(+), 3 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm= _host.h index 18f1097f1d8d..4388bace6d70 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -53,6 +53,12 @@ struct kvm_arch { phys_addr_t pgd_phys; }; =20 +struct kvm_mmio_decode { + unsigned long insn; + int len; + int shift; +}; + struct kvm_cpu_context { unsigned long zero; unsigned long ra; @@ -141,6 +147,9 @@ struct kvm_vcpu_arch { unsigned long irqs_pending; unsigned long irqs_pending_mask; =20 + /* MMIO instruction details */ + struct kvm_mmio_decode mmio_decode; + /* VCPU power-off state */ bool power_off; =20 @@ -160,6 +169,8 @@ static inline void kvm_arch_vcpu_block_finish(struct kv= m_vcpu *vcpu) {} int kvm_riscv_setup_vsip(void); void kvm_riscv_cleanup_vsip(void); =20 +int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu, gpa_t gpa, unsigned long h= va, + bool is_write); void kvm_riscv_stage2_flush_cache(struct kvm_vcpu *vcpu); int kvm_riscv_stage2_alloc_pgd(struct kvm *kvm); void kvm_riscv_stage2_free_pgd(struct kvm *kvm); diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c index 04dd089b86ff..2b965f9aac07 100644 --- a/arch/riscv/kvm/mmu.c +++ b/arch/riscv/kvm/mmu.c @@ -61,6 +61,13 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, return 0; } =20 +int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu, gpa_t gpa, unsigned long h= va, + bool is_write) +{ + /* TODO: */ + return 0; +} + void kvm_riscv_stage2_flush_cache(struct kvm_vcpu *vcpu) { /* TODO: */ diff --git a/arch/riscv/kvm/vcpu_exit.c b/arch/riscv/kvm/vcpu_exit.c index e4d7c8f0807a..efc06198c259 100644 --- a/arch/riscv/kvm/vcpu_exit.c +++ b/arch/riscv/kvm/vcpu_exit.c @@ -6,9 +6,371 @@ * Anup Patel */ =20 +#include #include #include #include +#include + +#define INSN_MATCH_LB 0x3 +#define INSN_MASK_LB 0x707f +#define INSN_MATCH_LH 0x1003 +#define INSN_MASK_LH 0x707f +#define INSN_MATCH_LW 0x2003 +#define INSN_MASK_LW 0x707f +#define INSN_MATCH_LD 0x3003 +#define INSN_MASK_LD 0x707f +#define INSN_MATCH_LBU 0x4003 +#define INSN_MASK_LBU 0x707f +#define INSN_MATCH_LHU 0x5003 +#define INSN_MASK_LHU 0x707f +#define INSN_MATCH_LWU 0x6003 +#define INSN_MASK_LWU 0x707f +#define INSN_MATCH_SB 0x23 +#define INSN_MASK_SB 0x707f +#define INSN_MATCH_SH 0x1023 +#define INSN_MASK_SH 0x707f +#define INSN_MATCH_SW 0x2023 +#define INSN_MASK_SW 0x707f +#define INSN_MATCH_SD 0x3023 +#define INSN_MASK_SD 0x707f + +#define INSN_MATCH_C_LD 0x6000 +#define INSN_MASK_C_LD 0xe003 +#define INSN_MATCH_C_SD 0xe000 +#define INSN_MASK_C_SD 0xe003 +#define INSN_MATCH_C_LW 0x4000 +#define INSN_MASK_C_LW 0xe003 +#define INSN_MATCH_C_SW 0xc000 +#define INSN_MASK_C_SW 0xe003 +#define INSN_MATCH_C_LDSP 0x6002 +#define INSN_MASK_C_LDSP 0xe003 +#define INSN_MATCH_C_SDSP 0xe002 +#define INSN_MASK_C_SDSP 0xe003 +#define INSN_MATCH_C_LWSP 0x4002 +#define INSN_MASK_C_LWSP 0xe003 +#define INSN_MATCH_C_SWSP 0xc002 +#define INSN_MASK_C_SWSP 0xe003 + +#define INSN_LEN(insn) ((((insn) & 0x3) < 0x3) ? 2 : 4) + +#ifdef CONFIG_64BIT +#define LOG_REGBYTES 3 +#else +#define LOG_REGBYTES 2 +#endif +#define REGBYTES (1 << LOG_REGBYTES) + +#define SH_RD 7 +#define SH_RS1 15 +#define SH_RS2 20 +#define SH_RS2C 2 + +#define RV_X(x, s, n) (((x) >> (s)) & ((1 << (n)) - 1)) +#define RVC_LW_IMM(x) ((RV_X(x, 6, 1) << 2) | \ + (RV_X(x, 10, 3) << 3) | \ + (RV_X(x, 5, 1) << 6)) +#define RVC_LD_IMM(x) ((RV_X(x, 10, 3) << 3) | \ + (RV_X(x, 5, 2) << 6)) +#define RVC_LWSP_IMM(x) ((RV_X(x, 4, 3) << 2) | \ + (RV_X(x, 12, 1) << 5) | \ + (RV_X(x, 2, 2) << 6)) +#define RVC_LDSP_IMM(x) ((RV_X(x, 5, 2) << 3) | \ + (RV_X(x, 12, 1) << 5) | \ + (RV_X(x, 2, 3) << 6)) +#define RVC_SWSP_IMM(x) ((RV_X(x, 9, 4) << 2) | \ + (RV_X(x, 7, 2) << 6)) +#define RVC_SDSP_IMM(x) ((RV_X(x, 10, 3) << 3) | \ + (RV_X(x, 7, 3) << 6)) +#define RVC_RS1S(insn) (8 + RV_X(insn, SH_RD, 3)) +#define RVC_RS2S(insn) (8 + RV_X(insn, SH_RS2C, 3)) +#define RVC_RS2(insn) RV_X(insn, SH_RS2C, 5) + +#define SHIFT_RIGHT(x, y) \ + ((y) < 0 ? ((x) << -(y)) : ((x) >> (y))) + +#define REG_MASK \ + ((1 << (5 + LOG_REGBYTES)) - (1 << LOG_REGBYTES)) + +#define REG_OFFSET(insn, pos) \ + (SHIFT_RIGHT((insn), (pos) - LOG_REGBYTES) & REG_MASK) + +#define REG_PTR(insn, pos, regs) \ + (ulong *)((ulong)(regs) + REG_OFFSET(insn, pos)) + +#define GET_RM(insn) (((insn) >> 12) & 7) + +#define GET_RS1(insn, regs) (*REG_PTR(insn, SH_RS1, regs)) +#define GET_RS2(insn, regs) (*REG_PTR(insn, SH_RS2, regs)) +#define GET_RS1S(insn, regs) (*REG_PTR(RVC_RS1S(insn), 0, regs)) +#define GET_RS2S(insn, regs) (*REG_PTR(RVC_RS2S(insn), 0, regs)) +#define GET_RS2C(insn, regs) (*REG_PTR(insn, SH_RS2C, regs)) +#define GET_SP(regs) (*REG_PTR(2, 0, regs)) +#define SET_RD(insn, regs, val) (*REG_PTR(insn, SH_RD, regs) =3D (val)) +#define IMM_I(insn) ((s32)(insn) >> 20) +#define IMM_S(insn) (((s32)(insn) >> 25 << 5) | \ + (s32)(((insn) >> 7) & 0x1f)) +#define MASK_FUNCT3 0x7000 + +#define STR(x) XSTR(x) +#define XSTR(x) #x + +/* TODO: Handle traps due to unpriv load and redirect it back to VS-mode *= / +static ulong get_insn(struct kvm_vcpu *vcpu) +{ + ulong __sepc =3D vcpu->arch.guest_context.sepc; + ulong __hstatus, __sstatus, __vsstatus; +#ifdef CONFIG_RISCV_ISA_C + ulong rvc_mask =3D 3, tmp; +#endif + ulong flags, val; + + local_irq_save(flags); + + __vsstatus =3D csr_read(CSR_VSSTATUS); + __sstatus =3D csr_read(CSR_SSTATUS); + __hstatus =3D csr_read(CSR_HSTATUS); + + csr_write(CSR_VSSTATUS, __vsstatus | SR_MXR); + csr_write(CSR_SSTATUS, vcpu->arch.guest_context.sstatus | SR_MXR); + csr_write(CSR_HSTATUS, vcpu->arch.guest_context.hstatus | HSTATUS_SPRV); + +#ifndef CONFIG_RISCV_ISA_C + asm ("\n" +#ifdef CONFIG_64BIT + STR(LWU) " %[insn], (%[addr])\n" +#else + STR(LW) " %[insn], (%[addr])\n" +#endif + : [insn] "=3D&r" (val) : [addr] "r" (__sepc)); +#else + asm ("and %[tmp], %[addr], 2\n" + "bnez %[tmp], 1f\n" +#ifdef CONFIG_64BIT + STR(LWU) " %[insn], (%[addr])\n" +#else + STR(LW) " %[insn], (%[addr])\n" +#endif + "and %[tmp], %[insn], %[rvc_mask]\n" + "beq %[tmp], %[rvc_mask], 2f\n" + "sll %[insn], %[insn], %[xlen_minus_16]\n" + "srl %[insn], %[insn], %[xlen_minus_16]\n" + "j 2f\n" + "1:\n" + "lhu %[insn], (%[addr])\n" + "and %[tmp], %[insn], %[rvc_mask]\n" + "bne %[tmp], %[rvc_mask], 2f\n" + "lhu %[tmp], 2(%[addr])\n" + "sll %[tmp], %[tmp], 16\n" + "add %[insn], %[insn], %[tmp]\n" + "2:" + : [vsstatus] "+&r" (__vsstatus), [insn] "=3D&r" (val), + [tmp] "=3D&r" (tmp) + : [addr] "r" (__sepc), [rvc_mask] "r" (rvc_mask), + [xlen_minus_16] "i" (__riscv_xlen - 16)); +#endif + + csr_write(CSR_HSTATUS, __hstatus); + csr_write(CSR_SSTATUS, __sstatus); + csr_write(CSR_VSSTATUS, __vsstatus); + + local_irq_restore(flags); + + return val; +} + +static int emulate_load(struct kvm_vcpu *vcpu, struct kvm_run *run, + unsigned long fault_addr) +{ + int shift =3D 0, len =3D 0; + ulong insn =3D get_insn(vcpu); + + /* Decode length of MMIO and shift */ + if ((insn & INSN_MASK_LW) =3D=3D INSN_MATCH_LW) { + len =3D 4; + shift =3D 8 * (sizeof(ulong) - len); + } else if ((insn & INSN_MASK_LB) =3D=3D INSN_MATCH_LB) { + len =3D 1; + shift =3D 8 * (sizeof(ulong) - len); + } else if ((insn & INSN_MASK_LBU) =3D=3D INSN_MATCH_LBU) { + len =3D 1; + shift =3D 8 * (sizeof(ulong) - len); +#ifdef CONFIG_64BIT + } else if ((insn & INSN_MASK_LD) =3D=3D INSN_MATCH_LD) { + len =3D 8; + shift =3D 8 * (sizeof(ulong) - len); + } else if ((insn & INSN_MASK_LWU) =3D=3D INSN_MATCH_LWU) { + len =3D 4; +#endif + } else if ((insn & INSN_MASK_LH) =3D=3D INSN_MATCH_LH) { + len =3D 2; + shift =3D 8 * (sizeof(ulong) - len); + } else if ((insn & INSN_MASK_LHU) =3D=3D INSN_MATCH_LHU) { + len =3D 2; +#ifdef CONFIG_RISCV_ISA_C +#ifdef CONFIG_64BIT + } else if ((insn & INSN_MASK_C_LD) =3D=3D INSN_MATCH_C_LD) { + len =3D 8; + shift =3D 8 * (sizeof(ulong) - len); + insn =3D RVC_RS2S(insn) << SH_RD; + } else if ((insn & INSN_MASK_C_LDSP) =3D=3D INSN_MATCH_C_LDSP && + ((insn >> SH_RD) & 0x1f)) { + len =3D 8; + shift =3D 8 * (sizeof(ulong) - len); +#endif + } else if ((insn & INSN_MASK_C_LW) =3D=3D INSN_MATCH_C_LW) { + len =3D 4; + shift =3D 8 * (sizeof(ulong) - len); + insn =3D RVC_RS2S(insn) << SH_RD; + } else if ((insn & INSN_MASK_C_LWSP) =3D=3D INSN_MATCH_C_LWSP && + ((insn >> SH_RD) & 0x1f)) { + len =3D 4; + shift =3D 8 * (sizeof(ulong) - len); +#endif + } else { + return -ENOTSUPP; + } + + /* Fault address should be aligned to length of MMIO */ + if (fault_addr & (len - 1)) + return -EIO; + + /* Save instruction decode info */ + vcpu->arch.mmio_decode.insn =3D insn; + vcpu->arch.mmio_decode.shift =3D shift; + vcpu->arch.mmio_decode.len =3D len; + + /* Exit to userspace for MMIO emulation */ + vcpu->stat.mmio_exit_user++; + run->exit_reason =3D KVM_EXIT_MMIO; + run->mmio.is_write =3D false; + run->mmio.phys_addr =3D fault_addr; + run->mmio.len =3D len; + + /* Move to next instruction */ + vcpu->arch.guest_context.sepc +=3D INSN_LEN(insn); + + return 0; +} + +static int emulate_store(struct kvm_vcpu *vcpu, struct kvm_run *run, + unsigned long fault_addr) +{ + u8 data8; + u16 data16; + u32 data32; + u64 data64; + ulong data; + int len =3D 0; + ulong insn =3D get_insn(vcpu); + + data =3D GET_RS2(insn, &vcpu->arch.guest_context); + data8 =3D data16 =3D data32 =3D data64 =3D data; + + if ((insn & INSN_MASK_SW) =3D=3D INSN_MATCH_SW) { + len =3D 4; + } else if ((insn & INSN_MASK_SB) =3D=3D INSN_MATCH_SB) { + len =3D 1; +#ifdef CONFIG_64BIT + } else if ((insn & INSN_MASK_SD) =3D=3D INSN_MATCH_SD) { + len =3D 8; +#endif + } else if ((insn & INSN_MASK_SH) =3D=3D INSN_MATCH_SH) { + len =3D 2; +#ifdef CONFIG_RISCV_ISA_C +#ifdef CONFIG_64BIT + } else if ((insn & INSN_MASK_C_SD) =3D=3D INSN_MATCH_C_SD) { + len =3D 8; + data64 =3D GET_RS2S(insn, &vcpu->arch.guest_context); + } else if ((insn & INSN_MASK_C_SDSP) =3D=3D INSN_MATCH_C_SDSP && + ((insn >> SH_RD) & 0x1f)) { + len =3D 8; + data64 =3D GET_RS2C(insn, &vcpu->arch.guest_context); +#endif + } else if ((insn & INSN_MASK_C_SW) =3D=3D INSN_MATCH_C_SW) { + len =3D 4; + data32 =3D GET_RS2S(insn, &vcpu->arch.guest_context); + } else if ((insn & INSN_MASK_C_SWSP) =3D=3D INSN_MATCH_C_SWSP && + ((insn >> SH_RD) & 0x1f)) { + len =3D 4; + data32 =3D GET_RS2C(insn, &vcpu->arch.guest_context); +#endif + } else { + return -ENOTSUPP; + } + + /* Fault address should be aligned to length of MMIO */ + if (fault_addr & (len - 1)) + return -EIO; + + /* Clear instruction decode info */ + vcpu->arch.mmio_decode.insn =3D 0; + vcpu->arch.mmio_decode.shift =3D 0; + vcpu->arch.mmio_decode.len =3D 0; + + /* Copy data to kvm_run instance */ + switch (len) { + case 1: + *((u8 *)run->mmio.data) =3D data8; + break; + case 2: + *((u16 *)run->mmio.data) =3D data16; + break; + case 4: + *((u32 *)run->mmio.data) =3D data32; + break; + case 8: + *((u64 *)run->mmio.data) =3D data64; + break; + default: + return -ENOTSUPP; + }; + + /* Exit to userspace for MMIO emulation */ + vcpu->stat.mmio_exit_user++; + run->exit_reason =3D KVM_EXIT_MMIO; + run->mmio.is_write =3D true; + run->mmio.phys_addr =3D fault_addr; + run->mmio.len =3D len; + + /* Move to next instruction */ + vcpu->arch.guest_context.sepc +=3D INSN_LEN(insn); + + return 0; +} + +static int stage2_page_fault(struct kvm_vcpu *vcpu, struct kvm_run *run, + unsigned long scause, unsigned long stval) +{ + struct kvm_memory_slot *memslot; + unsigned long hva; + bool writable; + gfn_t gfn; + int ret; + + gfn =3D stval >> PAGE_SHIFT; + memslot =3D gfn_to_memslot(vcpu->kvm, gfn); + hva =3D gfn_to_hva_memslot_prot(memslot, gfn, &writable); + + if (kvm_is_error_hva(hva) || + (scause =3D=3D EXC_STORE_PAGE_FAULT && !writable)) { + switch (scause) { + case EXC_LOAD_PAGE_FAULT: + return emulate_load(vcpu, run, stval); + case EXC_STORE_PAGE_FAULT: + return emulate_store(vcpu, run, stval); + default: + return -ENOTSUPP; + }; + } + + ret =3D kvm_riscv_stage2_map(vcpu, stval, hva, + (scause =3D=3D EXC_STORE_PAGE_FAULT) ? true : false); + if (ret < 0) + return ret; + + return 1; +} =20 /** * kvm_riscv_vcpu_mmio_return -- Handle MMIO loads after user space emulat= ion @@ -19,7 +381,44 @@ */ int kvm_riscv_vcpu_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run) { - /* TODO: */ + u8 data8; + u16 data16; + u32 data32; + u64 data64; + ulong insn; + int len, shift; + + if (run->mmio.is_write) + return 0; + + insn =3D vcpu->arch.mmio_decode.insn; + len =3D vcpu->arch.mmio_decode.len; + shift =3D vcpu->arch.mmio_decode.shift; + switch (len) { + case 1: + data8 =3D *((u8 *)run->mmio.data); + SET_RD(insn, &vcpu->arch.guest_context, + (ulong)data8 << shift >> shift); + break; + case 2: + data16 =3D *((u16 *)run->mmio.data); + SET_RD(insn, &vcpu->arch.guest_context, + (ulong)data16 << shift >> shift); + break; + case 4: + data32 =3D *((u32 *)run->mmio.data); + SET_RD(insn, &vcpu->arch.guest_context, + (ulong)data32 << shift >> shift); + break; + case 8: + data64 =3D *((u64 *)run->mmio.data); + SET_RD(insn, &vcpu->arch.guest_context, + (ulong)data64 << shift >> shift); + break; + default: + return -ENOTSUPP; + }; + return 0; } =20 @@ -30,6 +429,37 @@ int kvm_riscv_vcpu_mmio_return(struct kvm_vcpu *vcpu, s= truct kvm_run *run) int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, unsigned long scause, unsigned long stval) { - /* TODO: */ - return 0; + int ret; + + /* If we got host interrupt then do nothing */ + if (scause & SCAUSE_IRQ_FLAG) + return 1; + + /* Handle guest traps */ + ret =3D -EFAULT; + run->exit_reason =3D KVM_EXIT_UNKNOWN; + switch (scause) { + case EXC_INST_PAGE_FAULT: + case EXC_LOAD_PAGE_FAULT: + case EXC_STORE_PAGE_FAULT: + if ((vcpu->arch.guest_context.hstatus & HSTATUS_SPV) && + (vcpu->arch.guest_context.hstatus & HSTATUS_STL)) + ret =3D stage2_page_fault(vcpu, run, scause, stval); + break; + default: + break; + }; + + /* Print details in-case of error */ + if (ret < 0) { + kvm_err("VCPU exit error %d\n", ret); + kvm_err("SEPC=3D0x%lx SSTATUS=3D0x%lx HSTATUS=3D0x%lx\n", + vcpu->arch.guest_context.sepc, + vcpu->arch.guest_context.sstatus, + vcpu->arch.guest_context.hstatus); + kvm_err("SCAUSE=3D0x%lx STVAL=3D0x%lx\n", + scause, stval); + } + + return ret; } --=20 2.17.1