From patchwork Mon Nov 30 16:22:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smetanin X-Patchwork-Id: 7727651 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CF4779F3CD for ; Mon, 30 Nov 2015 16:23:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3EA120573 for ; Mon, 30 Nov 2015 16:23:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF1E120575 for ; Mon, 30 Nov 2015 16:23:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754166AbbK3QXL (ORCPT ); Mon, 30 Nov 2015 11:23:11 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:33409 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120AbbK3QXJ (ORCPT ); Mon, 30 Nov 2015 11:23:09 -0500 Received: from asm-pc.sw.ru ([10.30.16.30]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id tAUGMclA021806; Mon, 30 Nov 2015 19:22:47 +0300 (MSK) From: Andrey Smetanin To: kvm@vger.kernel.org Cc: Gleb Natapov , Paolo Bonzini , "K. Y. Srinivasan" , Haiyang Zhang , Vitaly Kuznetsov , Roman Kagan , "Denis V. Lunev" , qemu-devel@nongnu.org Subject: [PATCH v2 3/9] drivers/hv: Move struct hv_message into UAPI Hyper-V x86 header Date: Mon, 30 Nov 2015 19:22:15 +0300 Message-Id: <1448900541-19939-4-git-send-email-asmetanin@virtuozzo.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1448900541-19939-1-git-send-email-asmetanin@virtuozzo.com> References: <1448900541-19939-1-git-send-email-asmetanin@virtuozzo.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This struct is required for Hyper-V SynIC timers implementation inside KVM and for upcoming Hyper-V VMBus support by userspace(QEMU). So place it into Hyper-V UAPI header. Signed-off-by: Andrey Smetanin Acked-by: K. Y. Srinivasan Reviewed-by: Roman Kagan CC: Gleb Natapov CC: Paolo Bonzini CC: "K. Y. Srinivasan" CC: Haiyang Zhang CC: Vitaly Kuznetsov CC: Roman Kagan CC: Denis V. Lunev CC: qemu-devel@nongnu.org --- arch/x86/include/uapi/asm/hyperv.h | 74 ++++++++++++++++++++++++++++++++++++++ drivers/hv/hyperv_vmbus.h | 73 ------------------------------------- 2 files changed, 74 insertions(+), 73 deletions(-) diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h index 07981f0..76e503d 100644 --- a/arch/x86/include/uapi/asm/hyperv.h +++ b/arch/x86/include/uapi/asm/hyperv.h @@ -271,4 +271,78 @@ typedef struct _HV_REFERENCE_TSC_PAGE { #define HV_SYNIC_STIMER_COUNT (4) +/* Define synthetic interrupt controller message constants. */ +#define HV_MESSAGE_SIZE (256) +#define HV_MESSAGE_PAYLOAD_BYTE_COUNT (240) +#define HV_MESSAGE_PAYLOAD_QWORD_COUNT (30) + +/* Define hypervisor message types. */ +#define HVMSG_NONE 0x00000000 + +/* Memory access messages. */ +#define HVMSG_UNMAPPED_GPA 0x80000000 +#define HVMSG_GPA_INTERCEPT 0x80000001 + +/* Timer notification messages. */ +#define HVMSG_TIMER_EXPIRED 0x80000010 + +/* Error messages. */ +#define HVMSG_INVALID_VP_REGISTER_VALUE 0x80000020 +#define HVMSG_UNRECOVERABLE_EXCEPTION 0x80000021 +#define HVMSG_UNSUPPORTED_FEATURE 0x80000022 + +/* Trace buffer complete messages. */ +#define HVMSG_EVENTLOG_BUFFERCOMPLETE 0x80000040 + +/* Platform-specific processor intercept messages. */ +#define HVMSG_X64_IOPORT_INTERCEPT 0x80010000 +#define HVMSG_X64_MSR_INTERCEPT 0x80010001 +#define HVMSG_X64_CPUID_INTERCEPT 0x80010002 +#define HVMSG_X64_EXCEPTION_INTERCEPT 0x80010003 +#define HVMSG_X64_APIC_EOI 0x80010004 +#define HVMSG_X64_LEGACY_FP_ERROR 0x80010005 + +/* Define synthetic interrupt controller message flags. */ +union hv_message_flags { + __u8 asu8; + struct { + __u8 msg_pending:1; + __u8 reserved:7; + }; +}; + +/* Define port identifier type. */ +union hv_port_id { + __u32 asu32; + struct { + __u32 id:24; + __u32 reserved:8; + } u; +}; + +/* Define synthetic interrupt controller message header. */ +struct hv_message_header { + __u32 message_type; + __u8 payload_size; + union hv_message_flags message_flags; + __u8 reserved[2]; + union { + __u64 sender; + union hv_port_id port; + }; +}; + +/* Define synthetic interrupt controller message format. */ +struct hv_message { + struct hv_message_header header; + union { + __u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT]; + } u; +}; + +/* Define the synthetic interrupt message page layout. */ +struct hv_message_page { + struct hv_message sint_message[HV_SYNIC_SINT_COUNT]; +}; + #endif diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index f214e37..3f3756b 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -63,10 +63,6 @@ enum hv_cpuid_function { /* Define version of the synthetic interrupt controller. */ #define HV_SYNIC_VERSION (1) -/* Define synthetic interrupt controller message constants. */ -#define HV_MESSAGE_SIZE (256) -#define HV_MESSAGE_PAYLOAD_BYTE_COUNT (240) -#define HV_MESSAGE_PAYLOAD_QWORD_COUNT (30) #define HV_ANY_VP (0xFFFFFFFF) /* Define synthetic interrupt controller flag constants. */ @@ -74,44 +70,9 @@ enum hv_cpuid_function { #define HV_EVENT_FLAGS_BYTE_COUNT (256) #define HV_EVENT_FLAGS_DWORD_COUNT (256 / sizeof(u32)) -/* Define hypervisor message types. */ -#define HVMSG_NONE 0x00000000 - -/* Memory access messages. */ -#define HVMSG_UNMAPPED_GPA 0x80000000 -#define HVMSG_GPA_INTERCEPT 0x80000001 - -/* Timer notification messages. */ -#define HVMSG_TIMER_EXPIRED 0x80000010 - -/* Error messages. */ -#define HVMSG_INVALID_VP_REGISTER_VALUE 0x80000020 -#define HVMSG_UNRECOVERABLE_EXCEPTION 0x80000021 -#define HVMSG_UNSUPPORTED_FEATURE 0x80000022 - -/* Trace buffer complete messages. */ -#define HVMSG_EVENTLOG_BUFFERCOMPLETE 0x80000040 - -/* Platform-specific processor intercept messages. */ -#define HVMSG_X64_IOPORT_INTERCEPT 0x80010000 -#define HVMSG_X64_MSR_INTERCEPT 0x80010001 -#define HVMSG_X64_CPUID_INTERCEPT 0x80010002 -#define HVMSG_X64_EXCEPTION_INTERCEPT 0x80010003 -#define HVMSG_X64_APIC_EOI 0x80010004 -#define HVMSG_X64_LEGACY_FP_ERROR 0x80010005 - /* Define invalid partition identifier. */ #define HV_PARTITION_ID_INVALID ((u64)0x0) -/* Define port identifier type. */ -union hv_port_id { - u32 asu32; - struct { - u32 id:24; - u32 reserved:8; - } u ; -}; - /* Define port type. */ enum hv_port_type { HVPORT_MSG = 1, @@ -159,27 +120,6 @@ struct hv_connection_info { }; }; -/* Define synthetic interrupt controller message flags. */ -union hv_message_flags { - u8 asu8; - struct { - u8 msg_pending:1; - u8 reserved:7; - }; -}; - -/* Define synthetic interrupt controller message header. */ -struct hv_message_header { - u32 message_type; - u8 payload_size; - union hv_message_flags message_flags; - u8 reserved[2]; - union { - u64 sender; - union hv_port_id port; - }; -}; - /* * Timer configuration register. */ @@ -205,22 +145,9 @@ struct hv_timer_message_payload { u64 delivery_time; /* When the message was delivered */ }; -/* Define synthetic interrupt controller message format. */ -struct hv_message { - struct hv_message_header header; - union { - u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT]; - } u ; -}; - /* Define the number of message buffers associated with each port. */ #define HV_PORT_MESSAGE_BUFFER_COUNT (16) -/* Define the synthetic interrupt message page layout. */ -struct hv_message_page { - struct hv_message sint_message[HV_SYNIC_SINT_COUNT]; -}; - /* Define the synthetic interrupt controller event flags format. */ union hv_synic_event_flags { u8 flags8[HV_EVENT_FLAGS_BYTE_COUNT];