Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Anup Patel <anup.patel@wdc.com>
To:     Palmer Dabbelt <palmer@dabbelt.com>,
        Palmer Dabbelt <palmerdabbelt@google.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Paolo Bonzini <pbonzini@redhat.com>
Cc:     Alexander Graf <graf@amazon.com>,
        Atish Patra <atish.patra@wdc.com>,
        Alistair Francis <Alistair.Francis@wdc.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Anup Patel <anup@brainfault.org>, kvm@vger.kernel.org,
        kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org,
        linux-kernel@vger.kernel.org, Anup Patel <anup.patel@wdc.com>
Subject: [PATCH v20 08/17] RISC-V: KVM: Handle WFI exits for VCPU
Date:   Mon, 27 Sep 2021 17:10:07 +0530
Message-Id: <20210927114016.1089328-9-anup.patel@wdc.com>
In-Reply-To: <20210927114016.1089328-1-anup.patel@wdc.com>
References: <20210927114016.1089328-1-anup.patel@wdc.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
WDCIPOUTBOUND: EOP-TRUE
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BRv590qruwvT7eIzwLSggwRsl/ZZCOOiXgYMckd6mKTc0FZqKP7zw4AL6+OA?=
 =?us-ascii?Q?cq7Gqywz3/KSVTOJSpkziPRoQMaCAkXT8uo5+zWuj46axxjti90EJ0gm8JkN?=
 =?us-ascii?Q?cbATOraT+I0DJrdznsaca6Scs9jd7u1/JbUNtxtrN0jlnfmM93PZ4apOpsN1?=
 =?us-ascii?Q?8QLli15JYM4q9NuDVNzlERSFI1NvaoRs9/Kq3+f4+aH6bHZkFjhIfjx/lgLP?=
 =?us-ascii?Q?M7/9knfvfC+YuJXGEqXhNQG1z76XYqnsYf6Q5w2NedrnS73+z+Lx+I6urUpv?=
 =?us-ascii?Q?r4hYFRvxdrpB3cbnDBXVtdo9r9vrqMSZQp+5WsSUW3t97/5gsv0i2fLOeCaz?=
 =?us-ascii?Q?TFVim4u5hjyNpLPRHCbqktIWLHTWiYHo+v8gfop66i+TdfMHuOZd1DaWQI+r?=
 =?us-ascii?Q?mvvgDAlMAwvO19AUdl6BckgCJkTipRY7zdK9+X+POOwVOy6t0JExFgpIycP8?=
 =?us-ascii?Q?21xx/6E4kLtafNqMADalw/w+EnjDANa8wxPzmxmqo0sxZgPoI4y6eSjBeBwx?=
 =?us-ascii?Q?l0juAII+Z1iH0KYSSWlyAt+qGQ1z/G83jfigC0HI9X7szUyyAhMMhXF3EQFx?=
 =?us-ascii?Q?59P/ScVSCSbtVJqajNSPq97h/GJg6LaH2R6pRi/j6eXcDbFUdYiof32GkTMN?=
 =?us-ascii?Q?gntJ87j/AwaMFGBBLPpgvzDjKpSkOHJOap+nz8noDbXoGuR2NlsWnNHpLSkp?=
 =?us-ascii?Q?gNxNaDQvO6Lx6q1/nmMv9BUzL2LryOfRTEBddVjQ+OpL/y97MNTiXLyDtJD3?=
 =?us-ascii?Q?pOs1ClFxKHZ07drF/vo5B3gXj7Q/W0zlWdeLSVuFOj6y4ZWFpFnK7dGGtO4S?=
 =?us-ascii?Q?NdX52+/RwJZTfvNACdDj3lTgFV9jduExNk1VCGfvPPUYXR9hd3WPooITsqm2?=
 =?us-ascii?Q?byS2Ov+iEXiWQaXUT7VnXXHEco8tMHnS93LAH5cv7srivFbiAQUCm32bd1d8?=
 =?us-ascii?Q?t8wh6Q7ca47AONi0tHY9H8O3ofWZ4qEu2WRKfAcuHEjIxAoOZQppfEZ6L1iR?=
 =?us-ascii?Q?mqN3lFyKKG7ChkRSjy4dmpQ2UtVrPdrvO1dx9S77+5a+bqsCUVu0A0Jq3bRt?=
 =?us-ascii?Q?wQmTGui5ALL+U3nZTdU2Is0V9c1XIL/acZfO8wfCxWSMXYGBGRBRfvP6kHnf?=
 =?us-ascii?Q?CNBv5R6w/o0QaUiwgIW7ONP7aqJ2kb7/mwnlL1ahjYZ/51yIrL+YMKWSCNX1?=
 =?us-ascii?Q?UI720CcniqRLN/hfJc/w2ziSJo4+ZmZX8JgRkvsuMyo0j8Cm7vWM8ZY+UsGP?=
 =?us-ascii?Q?qs99cbktNMGZsYUVNHXtyxyqJiVxMeG/jtnmPkL2sRTA0oDtfDyi3SanvI+N?=
 =?us-ascii?Q?OmtwzHXp3biMdTisyoW6V83u?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ba24e6ea-47bb-4ada-008c-08d981abb94f
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:41:20.1742
 (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: XDqKS7O1z60I8j+EhaTZL2yqf3VF9sxz4ISn0BN3Jl8Gp4XU4R0aVUFYubYo9SkRrxmE/jElJWFH3gwp4l/gYw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR04MB8236
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
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 <anup.patel@wdc.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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..f659be94231d 100644
--- a/arch/riscv/kvm/vcpu_exit.c
+++ b/arch/riscv/kvm/vcpu_exit.c
@@ -12,6 +12,13 @@
 #include <linux/kvm_host.h>
 #include <asm/csr.h>
 
+#define INSN_OPCODE_MASK	0x007c
+#define INSN_OPCODE_SHIFT	2
+#define INSN_OPCODE_SYSTEM	28
+
+#define INSN_MASK_WFI		0xffffffff
+#define INSN_MATCH_WFI		0x10500073
+
 #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