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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 8BE3BC2D0A3 for ; Mon, 9 Nov 2020 11:35:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14853206A4 for ; Mon, 9 Nov 2020 11:35:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="ddtWlGIX"; dkim=pass (1024-bit key) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="MO9lJ2SE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730036AbgKILeZ (ORCPT ); Mon, 9 Nov 2020 06:34:25 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:25620 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729983AbgKILeP (ORCPT ); Mon, 9 Nov 2020 06:34:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1604921655; x=1636457655; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=UIBmdsMijVnoB86PGXc09lLpFU2SSSkqbdZIhmV4sGE=; b=ddtWlGIXokQdMUyABs60he415j3gsuU8J+XFlLnE23fJ7F2QlqxHjswH 1ZXbDgHhYeNhfHWUrHo/IWvH5JN+WXv4YacgFZ+iLn2y0Gwbqq12gdwe0 9tEvl92hcXbodyTiKghny+nDvsml4+39BQAxVKcUJnF3YuGZldywq2rIS PNsRtqknoIjJxoJKcZsjmkNdRQR3Eln22KIIZVsqVk1/4eU9DDHrDC9/I gGHs1vTvVEYwxvdGU8OqQyBlAUTZfVN7sGknPlf+q2flLJc0gsQeRf7L5 2Zn1nUjJhh7s0CvjmI/1TALNqIDNeysou5b9Pnga7g+/J/bsPRtQm72aC A==; IronPort-SDR: B0Lmj5S3lGwhTXYeNBVI952C9dyuNRRARerHBWTN1+hBZUJ0znYhv+ShZMLnpLZz/R8UoMY9mT XRbDxO7ZxXy2CHuzzkOtm0RmHXvZ2GHd7RVq8ioqMUMV/Ly75dmyLa4ldMfbeLrjkZDEaE1Bf5 ojvEHfuHg5RMbXekvcjWe7HDPQLZNPNRtFqFY77G5lSr+66DanmUC3hnrWmGn74p1yl9SaMLlG wYvTjkSJpRXvVvfB0hpqn7bNDpXO+jM/D80NsGI9C8Q5ae+mdeWH/H6+ImJvVIxYQjhIfWKS9T shc= X-IronPort-AV: E=Sophos;i="5.77,463,1596470400"; d="scan'208";a="153382766" Received: from mail-bn8nam11lp2171.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.171]) by ob1.hgst.iphmx.com with ESMTP; 09 Nov 2020 19:34:13 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c4MCRasUlkIjtD0eL3fQHxOHkUkjO+dyHx712eEfFc8xvpKvetwSfPPQkNlFkd58JdpqEH3zVUgOIgbnC0X4tPK7OnBByY8d3Ga782pWGKSeRQ4mlrjBxCqnyYBYPl/fUY49hIpyslo/PdzcxT7OsLVIOtbufaG/LwNkF1g3aRdjqOwSoBsh+jGAVIegD4ecde+fJX/FJm8N1/GLHMS5rHMw8PUINOL4Za78MctzqzYm6gF4fRUPmyoabSbFD3w/85TVZQKZPnvdZ0zfj5gD8M12JX+bRD3f/IiTV5oTygHgKHrGUeaeJ670eQe82zWWQTiIyVMqQz/jHzRJud837g== 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=Uj0+u47lIaGm+B2jAWE5EMYunC632wWH19d0y9CLShA=; b=I/coC+bGDmdGfeyRxhX4LidPXteO3uSCvM3lO8j9l54zWBm09pDwIJbn/e6Zoj9Y1LPvAqqr6ekKzUeoNGhxFtFx0p8j3qBgyN6hpoJ4JfyJV/6Mww/71+WNaT5weerWZcTCsM9BgqT1m0g0oyfJNF6PhBVnpE0tXU5YxBF1A+F2PktOjjkYEB3kSpduRn49SiZtiw9ErN5HdnHkr9vYdLKcP+nq6Uf86SPiAQU4gvs/ME3tPGIGycyqmNOH/yMMImAab5VdOUnbTubmL2Udn3VKr2djseYSa0Pu69d1MIh9f2u6Mastf3BoJWm1YAfRPFhyZ8fT3FWiE45YrqM7SA== 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=Uj0+u47lIaGm+B2jAWE5EMYunC632wWH19d0y9CLShA=; b=MO9lJ2SEgqeyE4EJxmo1fs+3ZEuXKO8o2O7NkrLam23mcrE6P3M6WrqGiukgvwqrZitom2/V4TRs1TWtQf7RW+Meo/7UdcJmLlkSbJ8kK1/BDKmO5rULhLOoJIaWaMmeYCQecGsGYJXYzQsPYboPrWum6Mk0UubOQnOo7b5KIlc= 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:34:12 +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:34:12 +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 v15 08/17] RISC-V: KVM: Handle WFI exits for VCPU Date: Mon, 9 Nov 2020 17:02:31 +0530 Message-Id: <20201109113240.3733496-9-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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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:34:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 38b76cf1-b6e6-4ac9-19a7-08d884a36150 X-MS-TrafficTypeDiagnostic: DM6PR04MB3866: 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: qyMthL2iUXiOo8N7OcygLP/bhE/1KY37XDas6G+dCV/2TsOwJzO0MMFGMIyViSCpGO250tw7Uzli6uJHrMxxHbr2/vcYHGXBl4i55Rupo53sYn6WqNqMou46bi0uHwhrsqYD8a1bn0MAB0Mb6xlyboo/e0XpQGjzdEOrDsuWIsq6AtfIZrjQ7beAsJc8eWG/iBYuxCwRcgNuAMSv3JEFBDtDvrDrMKfDUMrAvi0iH54nez5mCNMoUiCZggkg4qHj68s8zAkJzS8LN8oEAPu6SeLyJMB/ZFSjU3JebXnrKFCLD86qzHPfvdu+vL5C4DZsqFE4OJfoYcXpQdaqHysq9w== 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: 5XYkx16nJq0xOmU05AxXStrxxrJses1rd9ZqzJjBbWT6/p9Ezjj/N6aQUlL1TiJb/O/WPVPev6E3ZAplBiZvLr56pWECvZg9IFc7D4YV6IpQ5MpAz/wo8CS3CN+aGBISD5mgaWbIDgRTPcX6sxX+b67u18NVFz46D+AgQYXqhwKFkVtk7dDFrt2TNnyvfTdMBrw1Dd6jD4GrHvBNAGT182Dm1+OEbEO1KzH5mPJYdYdnUlMAWh6xPDGaImHbeOb0XAGx6Q3mdPeiPic1vQUu1GZbblV42AiF10TDC0RvgGy6Xd9RNDIHtgfgVgJcudiMwHuIPcTvgDhemG1ga9kfoRbyNm4TRN3YfF7Kwp/+B0U0iF9aEMBkj9HDooSgg0eMOwaq/eitxq6uDlhTfEUT0WG4CY5HFhis3ioJM8V0jtOee5jfp0oFlKIOAFcx+Xua4a9oyZtvZbQg3kvjKxLiThci3kBGOfHXC/jvg+FegDdzEA+eOjvOU/6aOiQhm7h1rZySqvfj7/W7D7PJ6Do4rgCn6JhR00iaHxl3wOS9jc6kqYhkJVQPe6aZV25+1l8tZbsP/bDWi1z7r4V8dNIoSnRKhAbbhcJz9GiE4T1SdgCn30L5CznffGxfanzUCo36REH34D2C0Mzj4bKy3tSCUg== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38b76cf1-b6e6-4ac9-19a7-08d884a36150 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:34:12.1589 (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: flfMkkHPZdREeTDo+CwIIi97+0oU3Or1anBTju1nLqyafOHo2IUB2y9h5/0DcZdtSIKfxLTO78GVscvRGqkBoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB3866 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 01392dd00284..5b41a12ee5b0 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: -- 2.25.1