On 2/27/2025 5:27 PM, Easwar Hariharan wrote:
> On 2/26/2025 3:08 PM, Nuno Das Neves wrote:
>> A few additional definitions are required for the mshv driver code
>> (to follow). Introduce those here and clean up a little bit while
>> at it.
>>
>> Signed-off-by: Nuno Das Neves <nunodasneves@xxxxxxxxxxxxxxxxxxx>
>> ---
>> include/hyperv/hvgdk_mini.h | 64 ++++++++++++++++-
>> include/hyperv/hvhdk.h | 132 ++++++++++++++++++++++++++++++++++--
>> include/hyperv/hvhdk_mini.h | 91 +++++++++++++++++++++++++
>> 3 files changed, 280 insertions(+), 7 deletions(-)
>>
>> diff --git a/include/hyperv/hvgdk_mini.h b/include/hyperv/hvgdk_mini.h
>> index 58895883f636..e4a3cca0cbce 100644
>> --- a/include/hyperv/hvgdk_mini.h
>> +++ b/include/hyperv/hvgdk_mini.h
>> @@ -13,7 +13,7 @@ struct hv_u128 {
>> u64 high_part;
>> } __packed;
>>
>
> <snip>
>
>> union hv_input_vtl {
>> u8 as_uint8;
>> struct {
>> @@ -1325,6 +1344,49 @@ struct hv_retarget_device_interrupt { /* HV_INPUT_RETARGET_DEVICE_INTERRUPT */
>> struct hv_device_interrupt_target int_target;
>> } __packed __aligned(8);
>>
>> +enum hv_intercept_type {
>> +#if defined(CONFIG_X86_64)
>
> These chosen ifdef's come across kinda arbitrary. The hypervisor code has
> this enabled for both 32-bit and 64-bit x86, but you've chosen x86_64 only.
> I thought that may be because we only intend to support root partition for 64-bit
> platforms, but then, below...
>
Oops! They should all be X86 instead of X86_64. It's true root partition is only
supported on 64-bit systems, but guests (whom also use these headers) can of course
be 32-bit. It makes better sense to just use CONFIG_X86 for these ifdefs.
>> + HV_INTERCEPT_TYPE_X64_IO_PORT = 0x00000000,
>> + HV_INTERCEPT_TYPE_X64_MSR = 0x00000001,
>> + HV_INTERCEPT_TYPE_X64_CPUID = 0x00000002,
>> +#endif
>> + HV_INTERCEPT_TYPE_EXCEPTION = 0x00000003,
>> + /* Used to be HV_INTERCEPT_TYPE_REGISTER */
>> + HV_INTERCEPT_TYPE_RESERVED0 = 0x00000004,
>> + HV_INTERCEPT_TYPE_MMIO = 0x00000005,
>> +#if defined(CONFIG_X86_64)
>> + HV_INTERCEPT_TYPE_X64_GLOBAL_CPUID = 0x00000006,
>> + HV_INTERCEPT_TYPE_X64_APIC_SMI = 0x00000007,
>> +#endif
>> + HV_INTERCEPT_TYPE_HYPERCALL = 0x00000008,
>> +#if defined(CONFIG_X86_64)
>> + HV_INTERCEPT_TYPE_X64_APIC_INIT_SIPI = 0x00000009,
>> + HV_INTERCEPT_MC_UPDATE_PATCH_LEVEL_MSR_READ = 0x0000000A,
>> + HV_INTERCEPT_TYPE_X64_APIC_WRITE = 0x0000000B,
>> + HV_INTERCEPT_TYPE_X64_MSR_INDEX = 0x0000000C,
>> +#endif
>> + HV_INTERCEPT_TYPE_MAX,
>> + HV_INTERCEPT_TYPE_INVALID = 0xFFFFFFFF,
>> +};
>> +
>> +union hv_intercept_parameters {
>> + /* HV_INTERCEPT_PARAMETERS is defined to be an 8-byte field. */
>> + __u64 as_uint64;
>> +#if defined(CONFIG_X86_64)
>> + /* HV_INTERCEPT_TYPE_X64_IO_PORT */
>> + __u16 io_port;
>> + /* HV_INTERCEPT_TYPE_X64_CPUID */
>> + __u32 cpuid_index;
>> + /* HV_INTERCEPT_TYPE_X64_APIC_WRITE */
>> + __u32 apic_write_mask;
>> + /* HV_INTERCEPT_TYPE_EXCEPTION */
>> + __u16 exception_vector;
>> + /* HV_INTERCEPT_TYPE_X64_MSR_INDEX */
>> + __u32 msr_index;
>> +#endif
>> + /* N.B. Other intercept types do not have any parameters. */
>> +};
>> +
>> /* Data structures for HVCALL_MMIO_READ and HVCALL_MMIO_WRITE */
>> #define HV_HYPERCALL_MMIO_MAX_DATA_LENGTH 64
>>
>> diff --git a/include/hyperv/hvhdk.h b/include/hyperv/hvhdk.h
>> index 64407c2a3809..1b447155c338 100644
>> --- a/include/hyperv/hvhdk.h
>> +++ b/include/hyperv/hvhdk.h
>> @@ -19,11 +19,24 @@
>>
>> #define HV_VP_REGISTER_PAGE_VERSION_1 1u
>>
>> +#define HV_VP_REGISTER_PAGE_MAX_VECTOR_COUNT 7
>> +
>> +union hv_vp_register_page_interrupt_vectors {
>> + u64 as_uint64;
>> + struct {
>> + u8 vector_count;
>> + u8 vector[HV_VP_REGISTER_PAGE_MAX_VECTOR_COUNT];
>> + } __packed;
>> +} __packed;
>> +
>> struct hv_vp_register_page {
>> u16 version;
>> u8 isvalid;
>> u8 rsvdz;
>> u32 dirty;
>> +
>> +#if IS_ENABLED(CONFIG_X86)
>> +
>
> ...you've chosen to include 32bit here, where the hypervisor code supports both.
>
> Confused
>
>> union {
>> struct {
>> /* General purpose registers
>> @@ -95,6 +108,22 @@ struct hv_vp_register_page {
>> union hv_x64_pending_interruption_register pending_interruption;
>> union hv_x64_interrupt_state_register interrupt_state;
>> u64 instruction_emulation_hints;
>> + u64 xfem;
>> +
>> + /*
>> + * Fields from this point are not included in the register page save chunk.
>> + * The reserved field is intended to maintain alignment for unsaved fields.
>> + */
>> + u8 reserved1[0x100];
>> +
>> + /*
>> + * Interrupts injected as part of HvCallDispatchVp.
>> + */
>> + union hv_vp_register_page_interrupt_vectors interrupt_vectors;
>> +
>> +#elif IS_ENABLED(CONFIG_ARM64)
>> + /* Not yet supported in ARM */
>> +#endif
>> } __packed;
>>
>> #define HV_PARTITION_PROCESSOR_FEATURES_BANKS 2
>> @@ -299,10 +328,11 @@ union hv_partition_isolation_properties {
>> #define HV_PARTITION_ISOLATION_HOST_TYPE_RESERVED 0x2
>>
>> /* Note: Exo partition is enabled by default */
>> -#define HV_PARTITION_CREATION_FLAG_EXO_PARTITION BIT(8)
>> -#define HV_PARTITION_CREATION_FLAG_LAPIC_ENABLED BIT(13)
>> -#define HV_PARTITION_CREATION_FLAG_INTERCEPT_MESSAGE_PAGE_ENABLED BIT(19)
>> -#define HV_PARTITION_CREATION_FLAG_X2APIC_CAPABLE BIT(22)
>> +#define HV_PARTITION_CREATION_FLAG_GPA_SUPER_PAGES_ENABLED BIT(4)
>> +#define HV_PARTITION_CREATION_FLAG_EXO_PARTITION BIT(8)
>> +#define HV_PARTITION_CREATION_FLAG_LAPIC_ENABLED BIT(13)
>> +#define HV_PARTITION_CREATION_FLAG_INTERCEPT_MESSAGE_PAGE_ENABLED BIT(19)
>> +#define HV_PARTITION_CREATION_FLAG_X2APIC_CAPABLE BIT(22)
>>
>> struct hv_input_create_partition {
>> u64 flags;
>> @@ -349,13 +379,23 @@ struct hv_input_set_partition_property {
>> enum hv_vp_state_page_type {
>> HV_VP_STATE_PAGE_REGISTERS = 0,
>> HV_VP_STATE_PAGE_INTERCEPT_MESSAGE = 1,
>> + HV_VP_STATE_PAGE_GHCB,
>> HV_VP_STATE_PAGE_COUNT
>> };
>>
>> struct hv_input_map_vp_state_page {
>> u64 partition_id;
>> u32 vp_index;
>> - u32 type; /* enum hv_vp_state_page_type */
>> + u16 type; /* enum hv_vp_state_page_type */
>> + union hv_input_vtl input_vtl;
>> + union {
>> + u8 as_uint8;
>> + struct {
>> + u8 map_location_provided : 1;
>> + u8 reserved : 7;
>> + };
>> + } flags;
>> + u64 requested_map_location;
>> } __packed;
>>
>> struct hv_output_map_vp_state_page {
>> @@ -365,7 +405,14 @@ struct hv_output_map_vp_state_page {
>> struct hv_input_unmap_vp_state_page {
>> u64 partition_id;
>> u32 vp_index;
>> - u32 type; /* enum hv_vp_state_page_type */
>> + u16 type; /* enum hv_vp_state_page_type */
>> + union hv_input_vtl input_vtl;
>> + u8 reserved0;
>> +} __packed;
>> +
>> +struct hv_x64_apic_eoi_message {
>> + __u32 vp_index;
>> + __u32 interrupt_vector;
>
> Can these be plain u32? Similar below...
>
Yes, these are some uapi types I forgot to convert somehow, oops!
Thanks
Nuno
<snip>
