From patchwork Thu Feb 1 13:48:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Kagan X-Patchwork-Id: 10195537 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 440AB60247 for ; Thu, 1 Feb 2018 13:49:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C306288CF for ; Thu, 1 Feb 2018 13:49:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20BDB289F8; Thu, 1 Feb 2018 13:49:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE6A4288CF for ; Thu, 1 Feb 2018 13:49:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751563AbeBANtF (ORCPT ); Thu, 1 Feb 2018 08:49:05 -0500 Received: from mail-db5eur01on0120.outbound.protection.outlook.com ([104.47.2.120]:6016 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752256AbeBANsz (ORCPT ); Thu, 1 Feb 2018 08:48:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9+p7+K3FBA1B1jwdZRJMSn/jJ9WuyQ+iK1k3qFEoD6s=; b=VfTPy/H2nTfm8dciZkjrrbRRGjH1Nhl/wzRcZUap0jQAX4puh97HBL9BLQj/CgEgeRaePxRaQC9YpQ5g5DrpRN94eMeOdxP9T+gLiEJ+4IWWSosFRvp7XTwyKq72z0cmr8MwuGUfP937aphu+euqugzLDJ/SODeprWsIYMfM7GQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; Received: from rkaganb.sw.ru (195.214.232.6) by VI1PR0801MB1982.eurprd08.prod.outlook.com (2603:10a6:800:8a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Thu, 1 Feb 2018 13:48:50 +0000 From: Roman Kagan To: kvm@vger.kernel.org, Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: "Denis V. Lunev" , Konrad Rzeszutek Wilk , Vitaly Kuznetsov , David Hildenbrand Subject: [PATCH v9 2/2] kvm: x86: hyperv: guest->host event signaling via eventfd Date: Thu, 1 Feb 2018 16:48:32 +0300 Message-Id: <20180201134832.17259-3-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180201134832.17259-1-rkagan@virtuozzo.com> References: <20180201134832.17259-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0401CA0071.eurprd04.prod.outlook.com (2603:10a6:3:19::39) To VI1PR0801MB1982.eurprd08.prod.outlook.com (2603:10a6:800:8a::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ea74a14-f507-49e4-667f-08d5697a86cd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1982; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1982; 3:jbA5dzSVFKo/hzI28VK7XHrwK+0JtvhHTtduSfszpKfOYwsQIG3Cx3YR2GABZgFb1cKbJauyxNXBMEQeK7NIyb9l4SBIRZTwKRGOAdd/3Y7Kul2Y2phr3gSR+jyk89r6tk1l5ooeLbO/b8NzkMUaIPHvv3plA8mxEKe25nIAmyukh4Bd9p66SjI6xtyY9+GkBwpVAB4tePYNAMI1Odx7k6OKif7YMOHuuoCrZqw2YG2I05cJ5u4kA2hlDvqMSW9z; 25:sXlM2ug+Qu2ftml6J/J5gAZzyyUV4WreZA7KSjCzsCSyWWeAWOwCVLdgNTceK5lyUQ16v/KyoElomF208l6hZddt3z7BMrtB96xxcXnnm4xVztXPXU2LB0bvbnuBXfR2tRIoQYCPhVIQYN0DUwz7+C/QBfAHt6UG8TWSHpPzjKyMRV0G0n6EZtHDnPdmBtiTbNrfkQjpbYRKf2vUFPRWcBy/M30FAPbKkM0kKEOtPpzbT9YYQ1HR3Gz6TF3u51xpu/7lGSAOi2qF2gmPcZO4r9ojuMKqN1gW357M2WtE9yg6nSJhj5az60qm5pQZNIg9Xr5EPLzGuqxsVRlgMW/JbA==; 31:HLHK/Y64g3zGLJsvGKkvTbRZ7svIcnkwfbUSFuyMdy5jejRUccIUXfXxHhq/i9fn46f/cGHbfUWQ+Vcgf24uM3dtvzhgVvcrKMj1mAaRno5LHLK3aK+FyCcU4jnxkrI97TU5ta/W0LmkkzKtlgMoHFcJjVfkx79uMzGBMVf6j+JcxRk9YHkt8tTUHF6vc4LbsObGgDSfZ1queTizkBS/B5RmLhbTUaMZ53+C3UtMbeM= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1982: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1982; 20:lGZxYPXj6Px2b97u6HLmV/6IXlm7zZu9uRvfnNePIFeAHk16zGMn3PTfiqBQsNRW/4CemPir/jx8J5Ngc/dx7w+ZrLQy/pjcbG7yN8/jgXPSsCULJU8GeJnQdt0JJ8k6EbgikplyquznfIeBvez/dUYV754lhm2MSydYhsU/urBBg3xtOZXNAa0nOC0YCom/7nfy0JZgMgC47MEj3cjo9u0n2sUtBgmeZu4MzPK8/GqPg6ThVH5fZbgS4i18LXlt2Gaha8lcgpShSlRYvya20I8FogddHD8jz7f1HrI9mJeb3ZmN3QWZ61G12+ho9ndafENPAuMIV9qRwYVSW4GTmEXIpswdcnGLsV3pup5e/M0luPqEqevvUmRhXZMoNrnr8Tishzp1iDynslAYkPRjLqD8Y6HqzjKvphIJFLjpEas=; 4:T88gbh8uhqjCACaxFVbdqfmaSpvStMa2xntmRjUTd4adZNhQFFheAO9xizA4N06GB+dhCv7PmUrhZqqNxOyNVDN7LpMGx9u47M+6NByGm1Yr1A7eU8g097+lNj5Ctp5R5dCAUfYXqx/cYhzNK255gC8dN3chb9L8B4M6g8Wa2hnfCuRRKDVofwfejjjSMHF9bODIikZnCgHXXlYxGiBMfjYcg6n7VBRurWELO4k3bos/tvALiBS1+EG7uqvTYnbdtA1DPSRoECf/T2+mGxkxVw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231101)(2400082)(944501161)(10201501046)(3002001)(6041288)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR0801MB1982; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0801MB1982; X-Forefront-PRVS: 0570F1F193 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(376002)(366004)(39380400002)(39850400004)(396003)(199004)(189003)(2906002)(50466002)(16526019)(105586002)(6506007)(97736004)(386003)(86362001)(1076002)(7736002)(59450400001)(25786009)(50226002)(26005)(305945005)(3846002)(186003)(53936002)(76176011)(51416003)(36756003)(47776003)(6512007)(68736007)(69596002)(110136005)(6116002)(66066001)(6666003)(2950100002)(4326008)(478600001)(8676002)(53416004)(52116002)(106356001)(5660300001)(48376002)(81166006)(16586007)(8936002)(54906003)(316002)(55236004)(81156014)(6486002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1982; H:rkaganb.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0801MB1982; 23:eNBqEFPUmeRbypGLP8HsvbFwPCAKhNO80PDvVg1?= =?us-ascii?Q?7fsQ7X/iVQMzq7rbfxYvptPIeIf6eTrAPJq7/6dx++ouJZ6BFPBXriLiF5+c?= =?us-ascii?Q?A4IscT6lMSwixZ7exzXgc7IuzoAUw1nmvWsYEDt8uiIyJt9GBXhb3PI6/Xot?= =?us-ascii?Q?JXZzoeWhAwGf+Uw1IKlarE7BVtu66oXss8EI0Yg01yFgRhUAOC3r+DYQmuye?= =?us-ascii?Q?vGNJNwNjLeg2OiYHW1Is5KDzUVRj/Gr5pGvo174WoRKTYEulArNIRbj0+dmE?= =?us-ascii?Q?q2Ta9Lfur8vR7i6OKA2H3Yx11Qy8iizm35YXI9ZmAGhMewNvQ+kM7ff0UOZO?= =?us-ascii?Q?PQ2oOjtEvPRtGr9ROjlW9c6n51ycShUSY78k+sDXxskQV269209D86WwmZrG?= =?us-ascii?Q?7E7M67YmgpiwGMPXrXdgKQ8Dm4cADwJtHks9mZXWTcdjFMF3+sUmifWEYfjX?= =?us-ascii?Q?x57hVKjfCDXlTnUGZB1YR3G4oinfRr9n69InaR7SkPFC1Q67Vab7TsY8dlhr?= =?us-ascii?Q?9NfosOHxn6Ovz6tB47FCtcU0hRJF/2EfGqStDlpY64o7yFGRxDsWZNU6N/Yx?= =?us-ascii?Q?smduZ22Aig/5d29mxhrwJLUVZzS52AdLo7zUW250VpFEt4VJ7Kkj7d3yPWYc?= =?us-ascii?Q?7nB32ktOxB88b0FZIMAVnHfdekLqlRG/v5rb5hExMxjONN56diyqRzoyfW5m?= =?us-ascii?Q?VhqCf+0nhW3FfsWsMVuKZUkopgG7VuNlakuRXpApcomj9ztEKJixuTS7FU1S?= =?us-ascii?Q?L7HFtuOVP766x4CX16vF3T9/3fmEbpPZKt9kM0qt+YTs+1BkmQt4JmKvzM/p?= =?us-ascii?Q?suZCDdURiIHboZvf5Mqs5/Sw3zeaT/dZ/qxh333LPuSSmTaHR8MepGrFqWL6?= =?us-ascii?Q?uo0RSKnXMx5O+cgoFadByR/LZQdhXPGdXwGsqZN1UpbrBp52Qc42U8Qbymjs?= =?us-ascii?Q?20BGnyqQXzf7KMLU7YZkW9F1RpoM35aod6FnzEVFep0kt7VXZdJZrLxoCS1p?= =?us-ascii?Q?8rwVH+Py0E3KtwY56CtmnyFjG0V7OK5RNyM2h5zL15mjgPd0ED+pK9lB1KTO?= =?us-ascii?Q?OPa1FNykCi7DPou3pffvlAeO0MbOxqkSVvdXnVclLENB6msg7x8xbVf1m9nc?= =?us-ascii?Q?smJ+ytQBmxRKTIU9hUv3zk/3L1dbb50esgIl8GaEZDdOQjJ6WXONl5GlW3D2?= =?us-ascii?Q?V+szmEBEdwwFKiYjYHmT0Z/Wl3wSJuj7F+fxLg39aoWYAsA9qaAAx/RZwfA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1982; 6:A5DmkBEZNrFYViEU8s0ly0vXy5Drbd6E70WRg2G0HsZce2j4Xg0F5jMXkfww54xe8gISR19xmTHDVHFYvExBzREW8iM/x//h7SbdFiBh9O1CmLjxtak/Y5K15wPFOUJtQ+N+Bl+AseKO8WBoS5Vdkhwsyr17h3Mkauwp1LXdTWqpk2sPajyQnZ04puItKX3dM5jDgU8SENveJUynKf6bzT9+Fbg5mQfoumNA8kK9eg8/pjKNJXnJiFmg2o+x2+pjeuujv8PC7wPI2GjBz+n9CvMWFz3HWqlNf2J863nXb3SYoQBDtwGw7IN2+SrI2eGt+rpR6vntwwAvyN+fvo1qFa1SEu0aNNJc/T6c11yj2wI=; 5:egZ9d0xcIRj2tb2CVNRyr8pig1an2p1TRRLUE60Zv0kTSXPWL1Iqqh7brfLRbHz2ptSYvbBHROIsKgIvS4iXSbNhiCHyZi2IzHi99VwupO71ICvaY6/o+8ONfSVc3y6zM6jBRYp5g9BXJOqL5r9QluEaLpbUrIxzh4uFFqvNnNI=; 24:l7+q5zWdThmebmO3D30NYyHlkh4tDktRVYsLXhVF6fF6jT8XAWTCGvmc2htmoJyyxfkzqq8mWEpFdPGSEhciEHDvAiZRWlOgNk8223Lg+Zo=; 7:pVcp44pNypt8ECW3HclON/Or4CBJig9LS+VGqiLjjIkA/wlxuuFUhxqCmM9Lk3iU2a6diNcxGXrekTbIdVwBmEzyxWIBdi1IlTsoKRTYiT/jqqL3xh2657Hb7O/5wjY/T0PjzUSw2XCy0Wz54XzXGBCa07gsN+ug4jCbuvCl1VvaZ4qU9+WpMXcb8JpZO0OqJd6AKCldo+LxXE9KwoNQikZ+opKi6xsV0TyqzzFJlAGT/gmTv1tvLclGEub/8FhA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1982; 20:wCxH1xkFcn77ON6wZLQ1bdJLIQNmtHkbwkj7VU2TF4r4ocL7/eajTwIei/6obKff7BvW55XuFsvdvQ5r7SzdcQW03zHwsyozdH5Ae1XR+blVyO47vO1NbKT1is5qo23nH/yMWUDBowAPmoidfwJwrPk/xQQpMPNirKadm1mU5ek= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2018 13:48:50.4921 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ea74a14-f507-49e4-667f-08d5697a86cd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1982 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In Hyper-V, the fast guest->host notification mechanism is the SIGNAL_EVENT hypercall, with a single parameter of the connection ID to signal. Currently this hypercall incurs a user exit and requires the userspace to decode the parameters and trigger the notification of the potentially different I/O context. To avoid the costly user exit, process this hypercall and signal the corresponding eventfd in KVM, similar to ioeventfd. The association between the connection id and the eventfd is established via the newly introduced KVM_HYPERV_EVENTFD ioctl, and maintained in an (srcu-protected) IDR. Signed-off-by: Roman Kagan Reviewed-by: David Hildenbrand --- v8 -> v9: - pass events with non-zero FlagNumber to userspace v7 -> v8: - rebase to latest master (adjust ioctl and doc section numbers) v6 -> v7: - reject non-zero flag number as invalid - adjust error returns to better match the spec [these changes didn't look critical so I retained David's r-b] v5 -> v6: - drop unnecessary srcu_read_lock/unlock, and clean up after that v4 -> v5: - fix block comment formatting v3 -> v4: - switch to kvm_vcpu_read_guest and take srcu_read_lock around it - rework and document the interpretation of the hypercall parameter - merge !fast version into kvm_hvcall_signal_event for brevity v2 -> v3: - expand docs on allowed values and return codes - fix uninitialized return - style fixes v1 -> v2: - make data types consistent - get by without the recently dropped struct hv_input_signal_event - fix subject prefix Documentation/virtual/kvm/api.txt | 31 +++++++++++ arch/x86/include/asm/kvm_host.h | 2 + arch/x86/include/uapi/asm/hyperv.h | 2 + arch/x86/kvm/hyperv.h | 1 + include/uapi/linux/kvm.h | 13 +++++ arch/x86/kvm/hyperv.c | 103 ++++++++++++++++++++++++++++++++++++- arch/x86/kvm/x86.c | 10 ++++ 7 files changed, 161 insertions(+), 1 deletion(-) diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index fc3ae951bc07..3a3fbcc3377d 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -3449,6 +3449,37 @@ array bounds check and the array access. These fields use the same bit definitions as the new H_GET_CPU_CHARACTERISTICS hypercall. +4.110 KVM_HYPERV_EVENTFD + +Capability: KVM_CAP_HYPERV_EVENTFD +Architectures: x86 +Type: vm ioctl +Parameters: struct kvm_hyperv_eventfd (in) + +This ioctl (un)registers an eventfd to receive notifications from the guest on +the specified Hyper-V connection id through the SIGNAL_EVENT hypercall, without +causing a user exit. + +struct kvm_hyperv_eventfd { + __u32 conn_id; + __s32 fd; + __u32 flags; + __u32 padding[3]; +}; + +The conn_id field should fit within 24 bits: + +#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff + +The acceptable values for the flags field are: + +#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0) + +Returns: 0 on success, + -EINVAL if conn_id or flags is outside the allowed range + -ENOENT on deassign if the conn_id isn't registered + -EEXIST on assign if the conn_id is already registered + 5. The kvm_run structure ------------------------ diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 516798431328..6a9914752a84 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -752,6 +752,8 @@ struct kvm_hv { u64 hv_crash_ctl; HV_REFERENCE_TSC_PAGE tsc_ref; + + struct idr conn_to_evt; }; enum kvm_irqchip_mode { diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h index 1a5bfead93b4..f9ed479d479c 100644 --- a/arch/x86/include/uapi/asm/hyperv.h +++ b/arch/x86/include/uapi/asm/hyperv.h @@ -276,7 +276,9 @@ enum HV_GENERIC_SET_FORMAT { #define HV_STATUS_INVALID_HYPERCALL_CODE 2 #define HV_STATUS_INVALID_HYPERCALL_INPUT 3 #define HV_STATUS_INVALID_ALIGNMENT 4 +#define HV_STATUS_INVALID_PARAMETER 5 #define HV_STATUS_INSUFFICIENT_MEMORY 11 +#define HV_STATUS_INVALID_PORT_ID 17 #define HV_STATUS_INVALID_CONNECTION_ID 18 #define HV_STATUS_INSUFFICIENT_BUFFERS 19 diff --git a/arch/x86/kvm/hyperv.h b/arch/x86/kvm/hyperv.h index cc2468244ca2..837465d69c6d 100644 --- a/arch/x86/kvm/hyperv.h +++ b/arch/x86/kvm/hyperv.h @@ -90,5 +90,6 @@ void kvm_hv_setup_tsc_page(struct kvm *kvm, void kvm_hv_init_vm(struct kvm *kvm); void kvm_hv_destroy_vm(struct kvm *kvm); +int kvm_vm_ioctl_hv_eventfd(struct kvm *kvm, struct kvm_hyperv_eventfd *args); #endif diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 8fb90a0819c3..38d29ea65c64 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -934,6 +934,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_S390_AIS_MIGRATION 150 #define KVM_CAP_PPC_GET_CPU_CHAR 151 #define KVM_CAP_S390_BPB 152 +#define KVM_CAP_HYPERV_EVENTFD 153 #ifdef KVM_CAP_IRQ_ROUTING @@ -1363,6 +1364,8 @@ struct kvm_s390_ucas_mapping { #define KVM_S390_GET_CMMA_BITS _IOWR(KVMIO, 0xb8, struct kvm_s390_cmma_log) #define KVM_S390_SET_CMMA_BITS _IOW(KVMIO, 0xb9, struct kvm_s390_cmma_log) +#define KVM_HYPERV_EVENTFD _IOW(KVMIO, 0xba, struct kvm_hyperv_eventfd) + #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) #define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1) #define KVM_DEV_ASSIGN_MASK_INTX (1 << 2) @@ -1423,4 +1426,14 @@ struct kvm_assigned_msix_entry { #define KVM_ARM_DEV_EL1_PTIMER (1 << 1) #define KVM_ARM_DEV_PMU (1 << 2) +struct kvm_hyperv_eventfd { + __u32 conn_id; + __s32 fd; + __u32 flags; + __u32 padding[3]; +}; + +#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff +#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0) + #endif /* __LINUX_KVM_H */ diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index 015fb06c7522..8e38a6ef84cc 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -1226,6 +1227,43 @@ static int kvm_hv_hypercall_complete_userspace(struct kvm_vcpu *vcpu) return 1; } +static u16 kvm_hvcall_signal_event(struct kvm_vcpu *vcpu, bool fast, u64 param) +{ + struct eventfd_ctx *eventfd; + + if (unlikely(!fast)) { + int ret; + gpa_t gpa = param; + + if ((gpa & (__alignof__(param) - 1)) || + offset_in_page(gpa) + sizeof(param) > PAGE_SIZE) + return HV_STATUS_INVALID_ALIGNMENT; + + ret = kvm_vcpu_read_guest(vcpu, gpa, ¶m, sizeof(param)); + if (ret < 0) + return HV_STATUS_INVALID_ALIGNMENT; + } + + /* + * Per spec, bits 32-47 contain the extra "flag number". However, we + * have no use for it, and in all known usecases it is zero, so just + * report lookup failure if it isn't. + */ + if (param & 0xffff00000000) + return HV_STATUS_INVALID_PORT_ID; + /* remaining bits are reserved-zero */ + if (param & ~KVM_HYPERV_CONN_ID_MASK) + return HV_STATUS_INVALID_HYPERCALL_INPUT; + + /* conn_to_evt is protected by vcpu->kvm->srcu */ + eventfd = idr_find(&vcpu->kvm->arch.hyperv.conn_to_evt, param); + if (!eventfd) + return HV_STATUS_INVALID_PORT_ID; + + eventfd_signal(eventfd, 1); + return HV_STATUS_SUCCESS; +} + int kvm_hv_hypercall(struct kvm_vcpu *vcpu) { u64 param, ingpa, outgpa, ret; @@ -1276,8 +1314,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) case HVCALL_NOTIFY_LONG_SPIN_WAIT: kvm_vcpu_on_spin(vcpu, true); break; - case HVCALL_POST_MESSAGE: case HVCALL_SIGNAL_EVENT: + res = kvm_hvcall_signal_event(vcpu, fast, ingpa); + if (res != HV_STATUS_INVALID_PORT_ID) + break; + /* maybe userspace knows this conn_id: fall through */ + case HVCALL_POST_MESSAGE: /* don't bother userspace if it has no way to handle it */ if (!vcpu_to_synic(vcpu)->active) { res = HV_STATUS_INVALID_HYPERCALL_CODE; @@ -1305,8 +1347,67 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) void kvm_hv_init_vm(struct kvm *kvm) { mutex_init(&kvm->arch.hyperv.hv_lock); + idr_init(&kvm->arch.hyperv.conn_to_evt); } void kvm_hv_destroy_vm(struct kvm *kvm) { + struct eventfd_ctx *eventfd; + int i; + + idr_for_each_entry(&kvm->arch.hyperv.conn_to_evt, eventfd, i) + eventfd_ctx_put(eventfd); + idr_destroy(&kvm->arch.hyperv.conn_to_evt); +} + +static int kvm_hv_eventfd_assign(struct kvm *kvm, u32 conn_id, int fd) +{ + struct kvm_hv *hv = &kvm->arch.hyperv; + struct eventfd_ctx *eventfd; + int ret; + + eventfd = eventfd_ctx_fdget(fd); + if (IS_ERR(eventfd)) + return PTR_ERR(eventfd); + + mutex_lock(&hv->hv_lock); + ret = idr_alloc(&hv->conn_to_evt, eventfd, conn_id, conn_id + 1, + GFP_KERNEL); + mutex_unlock(&hv->hv_lock); + + if (ret >= 0) + return 0; + + if (ret == -ENOSPC) + ret = -EEXIST; + eventfd_ctx_put(eventfd); + return ret; +} + +static int kvm_hv_eventfd_deassign(struct kvm *kvm, u32 conn_id) +{ + struct kvm_hv *hv = &kvm->arch.hyperv; + struct eventfd_ctx *eventfd; + + mutex_lock(&hv->hv_lock); + eventfd = idr_remove(&hv->conn_to_evt, conn_id); + mutex_unlock(&hv->hv_lock); + + if (!eventfd) + return -ENOENT; + + synchronize_srcu(&kvm->srcu); + eventfd_ctx_put(eventfd); + return 0; +} + +int kvm_vm_ioctl_hv_eventfd(struct kvm *kvm, struct kvm_hyperv_eventfd *args) +{ + if ((args->flags & ~KVM_HYPERV_EVENTFD_DEASSIGN) || + (args->conn_id & ~KVM_HYPERV_CONN_ID_MASK)) + return -EINVAL; + + if (args->flags == KVM_HYPERV_EVENTFD_DEASSIGN) + return kvm_hv_eventfd_deassign(kvm, args->conn_id); + return kvm_hv_eventfd_assign(kvm, args->conn_id, args->fd); } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f57635bd9e61..aa2707f2b396 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2701,6 +2701,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_HYPERV_SYNIC: case KVM_CAP_HYPERV_SYNIC2: case KVM_CAP_HYPERV_VP_INDEX: + case KVM_CAP_HYPERV_EVENTFD: case KVM_CAP_PCI_SEGMENT: case KVM_CAP_DEBUGREGS: case KVM_CAP_X86_ROBUST_SINGLESTEP: @@ -4295,6 +4296,15 @@ long kvm_arch_vm_ioctl(struct file *filp, r = kvm_vm_ioctl_enable_cap(kvm, &cap); break; } + case KVM_HYPERV_EVENTFD: { + struct kvm_hyperv_eventfd hvevfd; + + r = -EFAULT; + if (copy_from_user(&hvevfd, argp, sizeof(hvevfd))) + goto out; + r = kvm_vm_ioctl_hv_eventfd(kvm, &hvevfd); + break; + } default: r = -ENOTTY; }