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 v19 08/17] RISC-V: KVM: Handle WFI exits for VCPU
Date:   Tue, 27 Jul 2021 11:24:41 +0530
Message-Id: <20210727055450.2742868-9-anup.patel@wdc.com>
In-Reply-To: <20210727055450.2742868-1-anup.patel@wdc.com>
References: <20210727055450.2742868-1-anup.patel@wdc.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from wdc.com (122.171.179.229) by MA1PR0101CA0030.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:22::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.26 via Frontend Transport; Tue, 27 Jul 2021 05:55:48 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: f608aaa7-2b2d-4164-3436-08d950c330de
X-MS-TrafficTypeDiagnostic: CO6PR04MB8377:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <CO6PR04MB8377CB8592A1CE87788AC7E78DE99@CO6PR04MB8377.namprd04.prod.outlook.com>
WDCIPOUTBOUND: EOP-TRUE
X-MS-Oob-TLC-OOBClassifiers: OLM:2887;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: bewYLB+Dy6tOE8vyB/R3U/mNzircnyDfRPqDW0aWN+xfsQIiCmiBlJSlXah2SaFBTWdZV0ks4eiNawXq8yMxQlbdKO2ibRofZE7yRUdcWNA/yUrXJD67Yyb6GY6MeVz1C32npFoeTaJkz+lVPPyT7MbjrEYF9D8TM0idgwXBL4wRbmh5I61Rv/IJX6QAYVoWIfcw7AKkN2wxFC/yKlQ5fOBBhwOvUpmdNCC4wyN8DhPApF7TH7bWCPG2kPv88/uIPN8FtXP5gFquzXmd+tUk9GhWPr1mstpRZYXyQ5lhjwjV/qtKj29oj5STks7l8EisPjRP/2Rn6ZHx5EX4/vgQQer1cnu7DBDE8Zzw7AwR8631hQ6uhs7qBaJQOIeHQN19zmRTb42gXIL3ZAE1q4KhQLDuSX9FaQ3GKFUG8GfU4PGsoeZx0cFP4xljP+ndBcTQrNYZDkescT73+dHE2VFFrZBxOTQnA3/lNrDiWk/7AJIFUWtI+GHVERDkdSFu8d/CYFc87eP7FiLEk9KvSc5TIYEvBLRZyFEL/NJwGV6qZJQPWPBZOp8IBOjPanvP8Pmo1/zi34FE73FoLOqItNSmeaFe83X3NCzCHI6jQWdXJBCwLxvHX7+yT41Kd9OZo5kNLPEZv8uDr9MraiD3mjlIYWrDfK3Y4BlywZZp3cd5bI1/UVsqFw6a8tvvMAQxLZccfuPEZpfsjLUUXw8UkRMxCA==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR04MB7812.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(7696005)(52116002)(26005)(66946007)(54906003)(5660300002)(6666004)(956004)(2616005)(8936002)(186003)(38100700002)(316002)(36756003)(508600001)(8886007)(7416002)(66476007)(2906002)(1076003)(110136005)(86362001)(44832011)(83380400001)(8676002)(4326008)(66556008)(55016002)(38350700002);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JWUHCsMKg4d5fXiYl5eEXEYtve4s9pXsQQNVxuQueY4MufxoExu4rPCWx2Xt?=
 =?us-ascii?Q?c2zAtolVevC2Tb/XH5tuPKpjtzavdHDQC/eoh+CQyYDLRJqjbBAJuRoUfsst?=
 =?us-ascii?Q?sJ3JF3F+fi6rQkD8r9WcM4m7DevR7Zin+JF1rsavaOTxQXIxXP/T72L40hrd?=
 =?us-ascii?Q?BXQWFCzC9B4I6Zbs55pmBDUuJOOKDgq5I4JgAGpyCXyQpJm2j/7HBKTc9Liv?=
 =?us-ascii?Q?Dl9OjjVXm1FRZFCT3hc7pWGDjJbyhkUs5ef0+4DfqORIVc3vMf1Jimzqz7gq?=
 =?us-ascii?Q?6XkrsX86l9MVA6MiEJy66kzoWIHATndLbOrs/PyPiVG9YfM2MpCnXTU7aL93?=
 =?us-ascii?Q?i/P3N3edw493W/awT6PEUcgyywnT1CAGHuDNv1spr7UIYDMFkJDUyhjhPA0I?=
 =?us-ascii?Q?0xMG4sRyecYeKzVDuCSXFdb1tQw+TI96nY1CX8HeW2wMfDfLJwx6HdqMoEP/?=
 =?us-ascii?Q?0t6wTPdJ3PhMvJPYvqWIJEHKz4tvxAYFE4h4jBl3sNsCDrfFYGvQrRW7Nquj?=
 =?us-ascii?Q?YZ8D6AreRgBsO9RmQXPcTo9Jxu/KI3c344RGKdsueZTY5Dh2Yjkcr5nYYpR5?=
 =?us-ascii?Q?KkLdUZjPNQhJUT3r3QzOO9ZQ7eZSQvetT1ftdR3K0i4Aaa30982DT5jgHxqG?=
 =?us-ascii?Q?QP9dAuCgd7LfqqAHbqJcNnm1Z5YK2+GC56e49EM24vqSevFhgQUEu1Rc3PbB?=
 =?us-ascii?Q?ePb4+CixMreSup1tjMp5g+VhAOlQXvzIsbrT5pn5VH4pTr+zypKcEAQQDjzo?=
 =?us-ascii?Q?dPYevJDyoncG4wcMlP8sVVKkbkSn4Y7keFjPz2xRlWKNEspj0RONh8htFTot?=
 =?us-ascii?Q?E34Y0xK2+hZuHGY4UgTGl9QojhLdZXHssdZ16RU3u1rs/+H9wDldCvifsc+W?=
 =?us-ascii?Q?dDqF4QQ+VEOWRkSEkq6ekwVqhoDOpmKE8Awrjun/zhCpY+DJxy/6E2WLSR1P?=
 =?us-ascii?Q?PEBd4hOJxldciOLws+jZqxYFeQhARv0dmyBnuaPtOgchEViLKCu4xgjlvdLC?=
 =?us-ascii?Q?z+dWrQ3GFe2oi8RSmXWwDcH0YcZ0CnEJ8wVovgInD39OSzenFjF+rKjOGN9v?=
 =?us-ascii?Q?unVrc631Y0TkXxuStUH0ytqqha0aF3eCCHZ20h7NJ/NeMp4y+MXt7Wrkr1tI?=
 =?us-ascii?Q?ZZGvrBvtvIrUP0eESmGjNLohJlt5X4Gp3LsIKGazXlxaKXWAxrzv88LsM1SC?=
 =?us-ascii?Q?m9Xk0SroPtgt1avTYzEk4oB043De+k7HU10gZSsV275XSNLfwga4YD10yvdr?=
 =?us-ascii?Q?3qNKKGE0cVMdClJs1eAMrq0lyFKJeLFBEv5wj7hQJK+DmDYZjFFSqsPGLMdu?=
 =?us-ascii?Q?A/C2B0e8cAEezNB6fo2ubXu5?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f608aaa7-2b2d-4164-3436-08d950c330de
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2021 05:55:52.1525
 (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: UV2bUveUtLfrgpzXjUmue0sro84IjF6g1FGBQ4TAOypvhPSM8IKtUC0WH0buJewcTyZOzddA45C7DIIs9qm6Lg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB8377
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..1873b8c35101 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		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