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,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 19587C433FF for ; Wed, 7 Aug 2019 12:29: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 E0D5B21E6C for ; Wed, 7 Aug 2019 12:29: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="AFtwjYRt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="p3EfNKHo"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="PbEt+hsn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E0D5B21E6C 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=S9yDDGMtJpmqEEVQqMqVR28FSkh+JfKQ23+e853wce8=; b=AFtwjYRtyHxB59 9YpMl6TRotYb+L6sQy5m0hi0HjHHsgX4lsIoCTzdZRzXkNZkxmrjH98TmWhS3rBQYT0BZ8KS4+LDN ourtQ9B3umdfOHnifAk1p1k6cxyv96FAWocxsxutDLDFndY7pVB1h/G43QdGoBGuN5F8/imjWLXUE JhkL3otOTEWrRx6+E9oYXRvJJPauPu2ceAJZ1nJdlHo9FmNDeMbr90fRFG2s3mb2a2RO/M63eLqTS nYgZrUgVn5k6j7uBK4IDzecsvGC/eK5rfm8xyJUB1GCq7uBH8E7FHYr3mI0SBcNS7lAJ+3l67UlFX h9WtjxTYn9159AGhmyCg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hvL3x-0005Jd-Q9; Wed, 07 Aug 2019 12:29:05 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hvL3u-00059a-AZ for linux-riscv@lists.infradead.org; Wed, 07 Aug 2019 12:29:03 +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=1565180943; x=1596716943; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=LJK/Ave72PsAI8/vCQ5O2MevwtdH9wZZUfu65V+58yE=; b=p3EfNKHokl80mrkAu88xBaeifzmVZqNYqX5be9uuVOG/D5VE+ef7VdUi 0gY4BwWQ+h3sG731swq9Z6FJEGYkK5blkX0gtxdOpTzTEfmIcoE36eUEg qEcG+1tpLSOOF8DmuIn73piz9nLUD14HayNLe60KTIEherYmjhiRViSjl QoZG5bVjlybdlvPjiiWV5sGK05ZhiSXKyR8BNWBw3JlV3p1YhZaFcKCoy zXp+q9HDlq03wcaLGQuRBp24BVyHKK6WkbTiUHO4QoGp3YaOBh7s4o5U9 b30LnaKsgfuhzgP+06VgmNaZIVf8ODCYAb/RueEASSS27/BsjXjZOdPM9 w==; IronPort-SDR: Wl0Onmd4KpTW1dNGCa2KQqOmXPWNoqq4PiTO9PsHIxzSuQK1lakRn1HijWmNrV2lDIt9gWf/Tb UnRWKfOB/WXqkHSXHlf+zAePiD/oQmjcfEjPT6+GZH96MaRFEwOJo+WWdLA9Us25sLNRtQz+lD FW/Yt1EvzuhroFKqZN8OUBgWNEpyrx+lQRc3y8OHHNZ/wxx15fQTtuKxYGr/Hq0npE5L5StfGr 7vBZ1twWmNNBmKgLFZNMarqdy1HMv38nn2BozpW8SamnLVJqBi3U94Be1W1oD2c8cbLOR+KVPH yew= X-IronPort-AV: E=Sophos;i="5.64,357,1559491200"; d="scan'208";a="116203144" Received: from mail-sn1nam02lp2050.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.50]) by ob1.hgst.iphmx.com with ESMTP; 07 Aug 2019 20:29:02 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fi9nfPyUerCZUsNH3bOgWTamHzA/+bT6ioptXQvhZV6jwoao1EVWu6twHpiZ4YXxNxvxKoJiVAJdM3Ax6bA8TO4FE95G1YnguOg6ZUeR0HzwsRj5KfNZYLn4LwOIMQyH2O7JJKTi0XMQLNabySILoFBChD8a3kpA+G3ndBnDMKY5teayS/ybC0541XtzBshr3/vRux2AnwmOpg2AI6VP6h5LX/BDCnbddmlTzhzlyjMgSYYW/2RaI8FV9MXmxTUMWNWVOHnRalFbOefGJ2XJofYf7Ev0RKMAafCdseIUW630XOkSN4PpFDtVypW8zhYAwANu/ZdKTcym4cW2/PFWSw== 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=mVYBAjg+2QT2TGeXB9UPwk4iIcAgNCJaLaePojKPLFg=; b=e+3g0lMVrYJj29yrDQZxBa0dgsmPqODiyS2GSyd9CLMqwWvWOsMyUkBLqfiuePwwD3XmdLwtEy1YpT/Dl0H8y+vXgJ/sZBhiIHxYxBzKhUpj05bctasktE4YtN5WoBdkaOkjKw2mJTokeVtfnsibUXs5MBXWQZQLIY+cgX0RPl/ZSKwbSco8dHPYhD0yEjimM+0mibBoySj7uaKAmMijFJPAAi1aymagV7IPxfSrDFnA7go+q+Sx/WgJbJnUIZVm6OEWAo0UVujFYYkepj0BDlv9HZC0P6iJyJaPt8frVtvRxV/gTMD/PMCaCPOCRvD9//PCQ33v24ZQbXlk32H4Vw== 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=mVYBAjg+2QT2TGeXB9UPwk4iIcAgNCJaLaePojKPLFg=; b=PbEt+hsn6BqmvYM5zzeHwqjrxpA0xUGS1tqy1j9JaVlVi6lgwoiChM7EfbCB6bOnxWKLUDhq9kG8MJY0S/mIwQ9WmJlpZGL9Jgs//kUCU+KCSFdUeUu5aFeLbjVxkjJENfvkElrPq7ltAyf6DBNtvc85SOpSLm4yePDyjHizI2I= 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:29:00 +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:29:00 +0000 From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Paolo Bonzini , Radim K Subject: [PATCH v4 11/20] RISC-V: KVM: Handle WFI exits for VCPU Thread-Topic: [PATCH v4 11/20] RISC-V: KVM: Handle WFI exits for VCPU Thread-Index: AQHVTRuwIPnaNBGEi0+X6jARzczRdw== Date: Wed, 7 Aug 2019 12:29:00 +0000 Message-ID: <20190807122726.81544-12-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: fd9282e7-174b-4ed3-8321-08d71b32d30b 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:4502; x-forefront-prvs: 01221E3973 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(396003)(366004)(136003)(376002)(346002)(39860400002)(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)(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: xiI6hfI9lgmQk6fO8KNaXWebnfZ69SBxaA0vBJmrVqG9yNHcnxxBpxhBuNFaYCQiOtuC6WWX+W4Qp3k50dpmNvhyVas9ddlWPAl330KYLbuOC+J1YygSyNirSRYyTyGM92P2ETd+COY9VP65HlKJd5ayjqy4Ueo/FzoxFzNUrqasDSz7sv95nDGc6kHe4sc2U7DYPPaIIttUxVMhuz1WtyKitxiffnS2U5e63tt0Hp25rdoNFr98fVtAEjuENJ6j7LCERgy/XRpjBnkoGCTtb9kdg7moUfEektHSB7icgJbyvN55gDPMAWnMaf4ADL0ABF1Xco6qHtO6rnLwY0HYLM5wP1PQESg/4z7muZzsokwRahESLRpjw5rJac6GqgsYmbZMiDijNPwTSbgWH8apEedULcTZFZi0BwpvCserpmA= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd9282e7-174b-4ed3-8321-08d71b32d30b X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2019 12:29:00.1764 (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: ZqLweSAutyUeXscTYWOgM2c915XaBQ9Ul+g8V6+v65PmKf76XcWl6rokRTMs284uHBY0HXU+Zyq0Y80JPVphog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6736 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190807_052902_550925_1C894BB2 X-CRM114-Status: GOOD ( 14.72 ) 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 , 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 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 --- arch/riscv/kvm/vcpu_exit.c | 88 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/arch/riscv/kvm/vcpu_exit.c b/arch/riscv/kvm/vcpu_exit.c index efc06198c259..fbc04fe335ad 100644 --- a/arch/riscv/kvm/vcpu_exit.c +++ b/arch/riscv/kvm/vcpu_exit.c @@ -12,6 +12,9 @@ #include #include +#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 @@ -179,6 +182,87 @@ static ulong get_insn(struct kvm_vcpu *vcpu) return val; } +typedef int (*illegal_insn_func)(struct kvm_vcpu *vcpu, + struct kvm_run *run, + ulong insn); + +static int truly_illegal_insn(struct kvm_vcpu *vcpu, + struct kvm_run *run, + ulong insn) +{ + /* TODO: Redirect trap to Guest VCPU */ + return -ENOTSUPP; +} + +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 illegal_insn_func illegal_insn_table[32] = { + truly_illegal_insn, /* 0 */ + truly_illegal_insn, /* 1 */ + truly_illegal_insn, /* 2 */ + truly_illegal_insn, /* 3 */ + truly_illegal_insn, /* 4 */ + truly_illegal_insn, /* 5 */ + truly_illegal_insn, /* 6 */ + truly_illegal_insn, /* 7 */ + truly_illegal_insn, /* 8 */ + truly_illegal_insn, /* 9 */ + truly_illegal_insn, /* 10 */ + truly_illegal_insn, /* 11 */ + truly_illegal_insn, /* 12 */ + truly_illegal_insn, /* 13 */ + truly_illegal_insn, /* 14 */ + truly_illegal_insn, /* 15 */ + truly_illegal_insn, /* 16 */ + truly_illegal_insn, /* 17 */ + truly_illegal_insn, /* 18 */ + truly_illegal_insn, /* 19 */ + truly_illegal_insn, /* 20 */ + truly_illegal_insn, /* 21 */ + truly_illegal_insn, /* 22 */ + truly_illegal_insn, /* 23 */ + truly_illegal_insn, /* 24 */ + truly_illegal_insn, /* 25 */ + truly_illegal_insn, /* 26 */ + truly_illegal_insn, /* 27 */ + system_opcode_insn, /* 28 */ + truly_illegal_insn, /* 29 */ + truly_illegal_insn, /* 30 */ + truly_illegal_insn /* 31 */ +}; + +static int illegal_inst_fault(struct kvm_vcpu *vcpu, struct kvm_run *run, + unsigned long stval) +{ + ulong insn = stval; + + if (unlikely((insn & 3) != 3)) { + if (insn == 0) + insn = get_insn(vcpu); + if ((insn & 3) != 3) + return truly_illegal_insn(vcpu, run, insn); + } + + return illegal_insn_table[(insn & 0x7c) >> 2](vcpu, run, insn); +} + static int emulate_load(struct kvm_vcpu *vcpu, struct kvm_run *run, unsigned long fault_addr) { @@ -439,6 +523,10 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, ret = -EFAULT; run->exit_reason = KVM_EXIT_UNKNOWN; switch (scause) { + case EXC_INST_ILLEGAL: + if (vcpu->arch.guest_context.hstatus & HSTATUS_SPV) + ret = illegal_inst_fault(vcpu, run, stval); + break; case EXC_INST_PAGE_FAULT: case EXC_LOAD_PAGE_FAULT: case EXC_STORE_PAGE_FAULT: -- 2.17.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv