From patchwork Thu Apr 1 13:34:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 12178095 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,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 8BF05C433B4 for ; Thu, 1 Apr 2021 13:38:06 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 C851760698 for ; Thu, 1 Apr 2021 13:38:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C851760698 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+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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZUUuDQrxBDuXmtGYsP1W3xYCA5kdq9rYatAJYP/rAdE=; b=Y3P56rh4W+bD0aM52JY/QCAFp a7So6N8ixJ+E0ZAxfvksQjO1UIVUvCDikfawK39C9SfJHesIUXbYa+ObaAecNFGSnPKRqYYdxQman 6mIjermxvPgWrwsj7p/CzXVrrBVKsxMrmjbUeyagboYKo6Ocn0SB/C3lqwmpPp8iRC00biutfK+gA OE4BuNnnCmURE8WkryUkXd6tMEuepfTf/PpXLGM68yeSrHyePXBy8y5Zwf+B+cWtkknobKaErSJSe GLuDOtx6Uc7kJod8TOZC35nBhfQ7QAxdRL2F/eH2y4SmxQ2VJNPl27v/o1ZEuaWmIgk5NI8MBmvYa 1oyfsemgQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRxWD-009hae-11; Thu, 01 Apr 2021 13:37:53 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRxVx-009hRh-1L; Thu, 01 Apr 2021 13:37:43 +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=1617284256; x=1648820256; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=8WjELUyEWFgOO9PJfLTe7LIuvVnMx7WB9bialeDHDlM=; b=ASKlpHOYtUH6v9Ddk8p7S4WgYy3wLbrv8+TDt9tGMDX6enx4dUu3i6Pg dGoVpbMK5xIdM5zXbgylB5W8VXxxzCmSORL+9ie2Dp/qyBwEeQV2Ve8th w4vf0qpk/H6HTG9W5pRvEbbVua5YEH6bTeZ7IXmvgBSGELb56pWSaqB7l ljWKss27trIE03AfqXW6kf0yBxKViKlnMdaRNzNrHMmQKVc+tPzagdi5L jmBmllldupggC0y33f6CfM0m2eQYXpBzbeSwNPt3/oy74thrUQ4UItL2J qgNK8AHaUc9T1q3oyj1oIedP/+K+MeVimUTjuENsCQtWdLxBkuDRV4cIr Q==; IronPort-SDR: xETTGaOdxH3+tx50MeyEeP9AsqvoA6FBi0QWWpHvKdbqgiHUxWWYLDpJ29k1b5TkvJW94VWjJo Pqe8Gv2s3LXd1XHNlMh6WWwCH1HWSXhEf0sGLDdZHHAyXFv4AnKwoXtTMPWwWBLTuIriE9hB5J 5wahpH+H0eBejU6uWxTj0lhNkmrLCeh/FBT4vxaYcimOPrUbFcUqGoKwNGXz5AH4pVT0Os+VgE H+bmRt8oGlvAkZfl4CH9+TpfaNVqoS4Ge0RgTKd+Sbg7Bhlw9PUvgtTYILeWw1a3N7BU7YhLhY h/Y= X-IronPort-AV: E=Sophos;i="5.81,296,1610380800"; d="scan'208";a="168041423" Received: from mail-dm6nam12lp2169.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.169]) by ob1.hgst.iphmx.com with ESMTP; 01 Apr 2021 21:37:26 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d26GEsLcfbqTdMCk8rlY3Yel2+c6wsdnnHyQnTarNH6brHxa3/62+prkfTNP9CEmKp/L6feovyeEnkfTsB/OKiT4HXRtt6zEDnM8YVjw89bIOK3Lsed+N3qOUvYIa4W6ckm54J8bazN+d28DZRa60nfwk4VRPy5gfygyvVOPw2agudqiMxtk8GH+6t3oQ6O8ZPg5F7nMWM/K1IIRVCwsHIW06+kSuq8fAuWnbJKX5awUxqACiFf+KbuJVUosG4qQmEA+qw6AyrfqXz1e7Z0mlUwPzbdhgnIE+ErJsPM5oa5idrBTPr5lnSIBBhxKKnhIyKOOgb/UCto+ojbu8JZeuQ== 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=iHS3rsJ7aNjjgERKEoyEmsnZwdhhC6uxjhr7XZvP+S0=; b=m5IaAeCVmSaykTxTZ+LMyOlONouy2w7DtnZr909EemRx0K/H/LR54uChfEfBbC0jEkYmU+CuK4PfewxVDtpAx3d3qC5DqTcnzIyQWA3wYtr341dks3ncZECuQOGz6jqF8qJeSSfpD4zr0qAcJ6XNhwYwCgCPJWDY2ymkcyhhNWXvGagFpdCwLEvT7SMagappSvGxvsli5rgaie+0t6hiA0QPvIA9AQUz/HO7agtx5z8mhHX1mD/0o1F22esdvWpQqFS/b2UBVzmJM4X3vlSEKhe3RvV90NU31pFfZ3IXJbOcuDHQzvWa/tHIpMdW/sFh33EfUcEIQa0UHZVp+3QGEQ== 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=iHS3rsJ7aNjjgERKEoyEmsnZwdhhC6uxjhr7XZvP+S0=; b=pb7HmHee4bMkWVS2Lt11ej/86D+c6NUTJbGTynW8TYrO5zJFFhNMAjW1Ejtoo0vTp3eEw4R/9MgDiRi/klZordpCZe8RyHCgIRXotSTT7C49eE7u6vIFZQ8gTgAI9Ql5c+SNDiGjy7Cmz4Pfl2wms6vk+FVKKtJtZXd0byD2BH8= 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 DM6PR04MB6528.namprd04.prod.outlook.com (2603:10b6:5:20a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Thu, 1 Apr 2021 13:37:14 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3977.033; Thu, 1 Apr 2021 13:37:14 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou , Paolo Bonzini Cc: Alexander Graf , Atish Patra , Alistair Francis , Damien Le Moal , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH v17 08/17] RISC-V: KVM: Handle WFI exits for VCPU Date: Thu, 1 Apr 2021 19:04:26 +0530 Message-Id: <20210401133435.383959-9-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210401133435.383959-1-anup.patel@wdc.com> References: <20210401133435.383959-1-anup.patel@wdc.com> X-Originating-IP: [122.179.112.210] X-ClientProxiedBy: MA1PR01CA0104.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::20) 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.179.112.210) by MA1PR01CA0104.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 13:37:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 72c44c85-83cc-4b87-3026-08d8f5134240 X-MS-TrafficTypeDiagnostic: DM6PR04MB6528: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J0iiDJk1GYyl49RQ5uGttxd4IORusf9y+NoKe3p4QZ/M6Dsfg+HTUvtwlG0dD1TOJLH8nKxMwkqX0xbCzZ+s63DyVM1LWZ/zOdAYJnV3dCl0WC2jU/OKfDP0fBAZIEaDjRQ0CLoP+jNKxH3srBeKNJ/Qin8V52Zb3DcQTnnfs+jaw2/qrDRC0/tR9qDSiACgl1Bqbwcq8EoqHsth23P1FP9MlPRRZFlvIsutU7ATmK505bGY9L47eCAFsqFpz+wFY9ERR4UvWsO0j/o60ogHpKslwTOtbNSLrl6j/bjj559hoC5Fe8EVckQ2LQI7Fy1sJgvpbHy0BH+C798A41BefFT7A3y9Lbhv40ds2DqKuBoSeSa1HY3VI7zTf/Rzg0EsKBtn1+FozHPHtKFM397VqvYGPTUqSA44CT3JHSB3l4zP4WF/GnulUdH6Qv1Uof/PUnvDP1WKhjcomrKS7nsuTVYoHGrX4M0qqV3wc7E+/rBrtYHODfQG5MRtPRVdM2rLKTqdtI0DTdceFS002Q/yNXM8abcLnF8WOwFF2hqfY/CSUtkR+wArNuoeERvikgRYoWW1iPXITk3VGq8zZ6goCSxWhALzMsnr81C/nr9Y7nhaBos4sK1mAuqJZE11g711p93P6TQBrzwqPg9anlED7THnVYyw0hO74YJTd/PIKjg= 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)(136003)(366004)(376002)(396003)(346002)(39860400002)(8886007)(16526019)(36756003)(186003)(4326008)(956004)(2616005)(6666004)(316002)(66556008)(478600001)(26005)(66476007)(2906002)(54906003)(7416002)(1076003)(8936002)(55016002)(86362001)(83380400001)(8676002)(52116002)(110136005)(7696005)(5660300002)(38100700001)(44832011)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: KfTz1Cq/vb8drio+fIAYWs/9vm5SRDS5knk8Qw/le3rgnESJw1aqzJsYGcaoKnyIPIT4U3O04odXCDy5pwS7ZP3lz6oP4qpZTIS2VPtbp7GgkH8o0Ku6+CUzoTpuk4vEfLUhMxfPlI0slIiFibjUBF7SVvxx01Lahyj/FTJrEhGCFh6ZDQmcNEVCgbTl6/CckQ5jpXTdFUfGT+p6hKhJWgKGUOjzH5OTXUI81yhwa9UtA6E0bYpxvSa88BD87vr1gUEv2k7sDT/Ak6eR03vEMd3q9w65+4RFZKymuI7R11RCcHDhvAkwHj86EfClgAwfEjCKa/3DejR6oxqVr7leU6TqAUq8KTYDqWpv1D8NRxpO85eDVLdXLqPhX08EeXzA7I8IpyWdXHIOEoIX8BENBghPMp1GYt304EGdyvBcGZvp2g3L2Iy3KadCf3FmLRAb7N/ldZYDiJkgDiEB/zlI05nPYrjk48tXkF/QRVBRK8rncYhcxaXano+UzZTpMIooGHMgh98asovrx7klPYSotToxQhBM4b/Lg2wQC2qUWUiX7qoEcMnXoQ8vXkNW3MuISsDdBsa3T+BFozsoJa8ykZnWYqOx776Dgb/c4pWdWth2pL+EaRMfm+SKkNrZousOBUVAgRuTCeKYP6XnldPuuQi8gmex1ZMP9HgNDydnHQOorFDqk6mN36F2aKJWCxs4eEcRwe29dIuyugTmw5U77D/O4LlL6QUYTSBgQUhpKT5DhP+0sH5o/cWK8ZA1GopPVjC+FfGYSU1dwjReKB7yXZCOTOjshfFBn5/luvVHq2mDOSiPhCmbeKNrJUHn247lr9X+pPlzYcQuHV436qxxRNNehum8vcO662gApOEIp4idHno5TSMI9GFsj9hPLiacjiml6X/QFWZGWsnvFhJcnXPBjHgbfcFcxaz/evCbXJA2AB1kYNUaWAzSjY27qWhswrPUBYE5bMe4zwlJQQnh5h1K5jYWX6flUYgKgI8dJ0Gx032yKnK3WQqr+onyzAbb/WQYjc0jT6XEkfpAoiQ/pcAxrzpmrvrkGC9Vj6MFp44ksgALdU4SyiaOlyCvQ1YMG8NHP+jTnVWeaqqbbeju/E132gBkLtj0SZtNjLRgrfOaCllnKMB8fhfHwGcgnFR7J2KgTI5rHmea2Z+2MaZRwxFjJ6spTtw1Jw5KBFrPLztk2n1SO+AZbcf0wSSdqJMgt60dEKSMo+zRtj0H1/9vE5kB70y3PdIKFMFWeyimjxvfCbgJMHBjZjVg3rUKzXFM20NjalqJATzSDLQa4Wavcfa0P31nrEH5iIZlgsvdsCRXbZplXEJdwFPT4cyKEbJo735NeIECBKmIVSix2i6U0A== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72c44c85-83cc-4b87-3026-08d8f5134240 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 13:37:14.1269 (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: IL8tIofOJfm3/lBZ5tbJegdVDfo952KX4Ml2+orOmxqVZ3RaBdOuhj7EAErReZ+DMVzJsvAPyIL45ctF3xfFLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6528 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210401_143737_700942_1BC7341D X-CRM114-Status: GOOD ( 15.07 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org We get illegal instruction trap whenever Guest/VM executes WFI instruction. This patch handles WFI trap by blocking the trapped VCPU using kvm_vcpu_block() API. The blocked VCPU will be automatically resumed whenever a VCPU interrupt is injected from user-space or from in-kernel IRQCHIP emulation. Signed-off-by: Anup Patel Acked-by: Paolo Bonzini Reviewed-by: Paolo Bonzini --- arch/riscv/kvm/vcpu_exit.c | 76 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/arch/riscv/kvm/vcpu_exit.c b/arch/riscv/kvm/vcpu_exit.c index dc66be032ad7..1873b8c35101 100644 --- a/arch/riscv/kvm/vcpu_exit.c +++ b/arch/riscv/kvm/vcpu_exit.c @@ -12,6 +12,13 @@ #include #include +#define INSN_OPCODE_MASK 0x007c +#define INSN_OPCODE_SHIFT 2 +#define INSN_OPCODE_SYSTEM 28 + +#define INSN_MASK_WFI 0xffffff00 +#define INSN_MATCH_WFI 0x10500000 + #define INSN_MATCH_LB 0x3 #define INSN_MASK_LB 0x707f #define INSN_MATCH_LH 0x1003 @@ -116,6 +123,71 @@ (s32)(((insn) >> 7) & 0x1f)) #define MASK_FUNCT3 0x7000 +static int truly_illegal_insn(struct kvm_vcpu *vcpu, + struct kvm_run *run, + ulong insn) +{ + struct kvm_cpu_trap utrap = { 0 }; + + /* Redirect trap to Guest VCPU */ + utrap.sepc = vcpu->arch.guest_context.sepc; + utrap.scause = EXC_INST_ILLEGAL; + utrap.stval = insn; + kvm_riscv_vcpu_trap_redirect(vcpu, &utrap); + + return 1; +} + +static int system_opcode_insn(struct kvm_vcpu *vcpu, + struct kvm_run *run, + ulong insn) +{ + if ((insn & INSN_MASK_WFI) == INSN_MATCH_WFI) { + vcpu->stat.wfi_exit_stat++; + if (!kvm_arch_vcpu_runnable(vcpu)) { + srcu_read_unlock(&vcpu->kvm->srcu, vcpu->arch.srcu_idx); + kvm_vcpu_block(vcpu); + vcpu->arch.srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); + kvm_clear_request(KVM_REQ_UNHALT, vcpu); + } + vcpu->arch.guest_context.sepc += INSN_LEN(insn); + return 1; + } + + return truly_illegal_insn(vcpu, run, insn); +} + +static int virtual_inst_fault(struct kvm_vcpu *vcpu, struct kvm_run *run, + struct kvm_cpu_trap *trap) +{ + unsigned long insn = trap->stval; + struct kvm_cpu_trap utrap = { 0 }; + struct kvm_cpu_context *ct; + + if (unlikely(INSN_IS_16BIT(insn))) { + if (insn == 0) { + ct = &vcpu->arch.guest_context; + insn = kvm_riscv_vcpu_unpriv_read(vcpu, true, + ct->sepc, + &utrap); + if (utrap.scause) { + utrap.sepc = ct->sepc; + kvm_riscv_vcpu_trap_redirect(vcpu, &utrap); + return 1; + } + } + if (INSN_IS_16BIT(insn)) + return truly_illegal_insn(vcpu, run, insn); + } + + switch ((insn & INSN_OPCODE_MASK) >> INSN_OPCODE_SHIFT) { + case INSN_OPCODE_SYSTEM: + return system_opcode_insn(vcpu, run, insn); + default: + return truly_illegal_insn(vcpu, run, insn); + } +} + static int emulate_load(struct kvm_vcpu *vcpu, struct kvm_run *run, unsigned long fault_addr, unsigned long htinst) { @@ -596,6 +668,10 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, ret = -EFAULT; run->exit_reason = KVM_EXIT_UNKNOWN; switch (trap->scause) { + case EXC_VIRTUAL_INST_FAULT: + if (vcpu->arch.guest_context.hstatus & HSTATUS_SPV) + ret = virtual_inst_fault(vcpu, run, trap); + break; case EXC_INST_GUEST_PAGE_FAULT: case EXC_LOAD_GUEST_PAGE_FAULT: case EXC_STORE_GUEST_PAGE_FAULT: