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.8 required=3.0 tests=BAYES_00, 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 040BDC433E1 for ; Tue, 25 Aug 2020 02:51:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE442204EC for ; Tue, 25 Aug 2020 02:51:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728463AbgHYCvG (ORCPT ); Mon, 24 Aug 2020 22:51:06 -0400 Received: from mga18.intel.com ([134.134.136.126]:37715 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728093AbgHYCvD (ORCPT ); Mon, 24 Aug 2020 22:51:03 -0400 IronPort-SDR: fQ760+w1NBwORbBdLfVKJ2EqgNY/wGkeg0WE9XFdx8ETuiOLLfymHRFkHOyKXcrzKwBVDMgkNq zam11qYertWg== X-IronPort-AV: E=McAfee;i="6000,8403,9723"; a="143690784" X-IronPort-AV: E=Sophos;i="5.76,350,1592895600"; d="scan'208";a="143690784" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2020 19:51:02 -0700 IronPort-SDR: qx8yP6Sn5osvrp6p2yZxmB1yCyhe5hGqNM9a3meIHcWIZ6TTrwR+4IAKlqP8KMQpqkgLIZPpjq 4bJVV+IRna+A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,350,1592895600"; d="scan'208";a="312409792" Received: from shsi6026.sh.intel.com ([10.239.147.135]) by orsmga002.jf.intel.com with ESMTP; 24 Aug 2020 19:50:58 -0700 From: shuo.a.liu@intel.com To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Sean Christopherson , Yu Wang , Reinette Chatre , x86@kernel.org, Shuo Liu , Zhi Wang , Zhenyu Wang Subject: [PATCH 07/17] virt: acrn: Introduce an ioctl to set vCPU registers state Date: Tue, 25 Aug 2020 10:45:07 +0800 Message-Id: <20200825024516.16766-8-shuo.a.liu@intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825024516.16766-1-shuo.a.liu@intel.com> References: <20200825024516.16766-1-shuo.a.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shuo Liu A virtual CPU of User VM has different context due to the different registers state. ACRN userspace needs to set the virtual CPU registers state (e.g. giving a initial registers state to a virtual BSP of a User VM). HSM provides an ioctl ACRN_IOCTL_SET_VCPU_REGS to do the virtual CPU registers state setting. The ioctl passes the registers state from ACRN userspace to the hypervisor directly. Signed-off-by: Shuo Liu Reviewed-by: Zhi Wang Reviewed-by: Reinette Chatre Cc: Zhi Wang Cc: Zhenyu Wang Cc: Yu Wang Cc: Reinette Chatre --- drivers/virt/acrn/hsm.c | 13 +++++++ drivers/virt/acrn/hypercall.h | 13 +++++++ include/uapi/linux/acrn.h | 71 +++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c index ed8921a6c68b..31dec2f1aa12 100644 --- a/drivers/virt/acrn/hsm.c +++ b/drivers/virt/acrn/hsm.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) "acrn: " fmt +#include #include #include #include @@ -47,6 +48,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd, { struct acrn_vm *vm = filp->private_data; struct acrn_vm_creation *vm_param; + struct acrn_vcpu_regs *cpu_regs; int ret = 0; if (cmd == ACRN_IOCTL_GET_API_VERSION) { @@ -101,6 +103,17 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd, case ACRN_IOCTL_DESTROY_VM: ret = acrn_vm_destroy(vm); break; + case ACRN_IOCTL_SET_VCPU_REGS: + cpu_regs = memdup_user((void __user *)ioctl_param, + sizeof(struct acrn_vcpu_regs)); + if (IS_ERR(cpu_regs)) + return PTR_ERR(cpu_regs); + + ret = hcall_set_vcpu_regs(vm->vmid, virt_to_phys(cpu_regs)); + if (ret < 0) + pr_err("Failed to set regs state of VM%u!\n", vm->vmid); + kfree(cpu_regs); + break; default: pr_warn("Unknown IOCTL 0x%x!\n", cmd); ret = -EINVAL; diff --git a/drivers/virt/acrn/hypercall.h b/drivers/virt/acrn/hypercall.h index 6429e7a06e7e..5cc975db38d9 100644 --- a/drivers/virt/acrn/hypercall.h +++ b/drivers/virt/acrn/hypercall.h @@ -22,6 +22,7 @@ #define HC_START_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x02) #define HC_PAUSE_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x03) #define HC_RESET_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x05) +#define HC_SET_VCPU_REGS _HC_ID(HC_ID, HC_ID_VM_BASE + 0x06) /** * hcall_get_api_version() - Get API version from hypervisor @@ -89,4 +90,16 @@ static inline long hcall_reset_vm(u64 vmid) return acrn_hypercall1(HC_RESET_VM, vmid); } +/** + * hcall_set_vcpu_regs() - Set up registers of virtual CPU of a User VM + * @vmid: User VM ID + * @regs_state: Service VM GPA of registers state + * + * Return: 0 on success, <0 on failure + */ +static inline long hcall_set_vcpu_regs(u64 vmid, u64 regs_state) +{ + return acrn_hypercall2(HC_SET_VCPU_REGS, vmid, regs_state); +} + #endif /* __ACRN_HSM_HYPERCALL_H */ diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h index f8f00b18cd46..392d59a46499 100644 --- a/include/uapi/linux/acrn.h +++ b/include/uapi/linux/acrn.h @@ -46,6 +46,75 @@ struct acrn_vm_creation { __u8 reserved2[8]; } __attribute__((aligned(8))); +struct acrn_gp_regs { + __u64 rax; + __u64 rcx; + __u64 rdx; + __u64 rbx; + __u64 rsp; + __u64 rbp; + __u64 rsi; + __u64 rdi; + __u64 r8; + __u64 r9; + __u64 r10; + __u64 r11; + __u64 r12; + __u64 r13; + __u64 r14; + __u64 r15; +}; + +struct acrn_descriptor_ptr { + __u16 limit; + __u64 base; + __u16 reserved[3]; +} __attribute__ ((__packed__)); + +struct acrn_regs { + struct acrn_gp_regs gprs; + struct acrn_descriptor_ptr gdt; + struct acrn_descriptor_ptr idt; + + __u64 rip; + __u64 cs_base; + __u64 cr0; + __u64 cr4; + __u64 cr3; + __u64 ia32_efer; + __u64 rflags; + __u64 reserved_64[4]; + + __u32 cs_ar; + __u32 cs_limit; + __u32 reserved_32[3]; + + __u16 cs_sel; + __u16 ss_sel; + __u16 ds_sel; + __u16 es_sel; + __u16 fs_sel; + __u16 gs_sel; + __u16 ldt_sel; + __u16 tr_sel; + + __u16 reserved_16[4]; +}; + +/** + * struct acrn_vcpu_regs - Info of vCPU registers state + * @vcpu_id: vCPU ID + * @reserved0: Reserved + * @vcpu_regs: vCPU registers state + * + * This structure will be passed to hypervisor directly. + */ +struct acrn_vcpu_regs { + __u16 vcpu_id; + __u16 reserved0[3]; + struct acrn_regs vcpu_regs; +} __attribute__((aligned(8))); + /* The ioctl type, documented in ioctl-number.rst */ #define ACRN_IOCTL_TYPE 0xA2 @@ -65,5 +134,7 @@ struct acrn_vm_creation { _IO(ACRN_IOCTL_TYPE, 0x13) #define ACRN_IOCTL_RESET_VM \ _IO(ACRN_IOCTL_TYPE, 0x15) +#define ACRN_IOCTL_SET_VCPU_REGS \ + _IOW(ACRN_IOCTL_TYPE, 0x16, struct acrn_vcpu_regs) #endif /* _UAPI_ACRN_H */ -- 2.28.0