On Thu, Nov 12, 2020 at 04:57:46PM +0100, Vitaly Kuznetsov wrote:
> Wei Liu <wei.liu@xxxxxxxxxx> writes:
[...]
> > diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
> > index 67f5d35a73d3..4e590a167160 100644
> > --- a/arch/x86/include/asm/mshyperv.h
> > +++ b/arch/x86/include/asm/mshyperv.h
> > @@ -80,6 +80,10 @@ extern void __percpu **hyperv_pcpu_output_arg;
> >
> > extern u64 hv_current_partition_id;
> >
> > +int hv_call_deposit_pages(int node, u64 partition_id, u32 num_pages);
> > +int hv_call_add_logical_proc(int node, u32 lp_index, u32 acpi_id);
> > +int hv_call_create_vp(int node, u64 partition_id, u32 vp_index, u32 flags);
>
> You seem to be only doing EXPORT_SYMBOL_GPL() for
> hv_call_deposit_pages() and hv_call_create_vp() but not for
> hv_call_add_logical_proc() - is this intended? Also, I don't see
> hv_call_create_vp()/hv_call_add_logical_proc() usage outside of
> arch/x86/kernel/cpu/mshyperv.c so maybe we don't need to export them at all?
>
hv_call_deposit_pages and hv_call_create_vp will be needed by /dev/mshv,
which can be built as a module.
hv_call_add_logical_proc is only needed by mshyperv.c and not exported
in the first place.
This code is fine.
> > +
> > static inline u64 hv_do_hypercall(u64 control, void *input, void *output)
> > {
> > u64 input_address = input ? virt_to_phys(input) : 0;
> > diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h
> > index 87b1a79b19eb..b6c74e1a5524 100644
> > --- a/include/asm-generic/hyperv-tlfs.h
> > +++ b/include/asm-generic/hyperv-tlfs.h
> > @@ -142,6 +142,8 @@ struct ms_hyperv_tsc_page {
> > #define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST_EX 0x0014
> > #define HVCALL_SEND_IPI_EX 0x0015
> > #define HVCALL_GET_PARTITION_ID 0x0046
> > +#define HVCALL_DEPOSIT_MEMORY 0x0048
> > +#define HVCALL_CREATE_VP 0x004e
> > #define HVCALL_GET_VP_REGISTERS 0x0050
> > #define HVCALL_SET_VP_REGISTERS 0x0051
> > #define HVCALL_POST_MESSAGE 0x005c
> > @@ -149,6 +151,7 @@ struct ms_hyperv_tsc_page {
> > #define HVCALL_POST_DEBUG_DATA 0x0069
> > #define HVCALL_RETRIEVE_DEBUG_DATA 0x006a
> > #define HVCALL_RESET_DEBUG_SESSION 0x006b
> > +#define HVCALL_ADD_LOGICAL_PROCESSOR 0x0076
> > #define HVCALL_RETARGET_INTERRUPT 0x007e
> > #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af
> > #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0
> > @@ -413,6 +416,70 @@ struct hv_get_partition_id {
> > u64 partition_id;
> > } __packed;
> >
> > +/* HvDepositMemory hypercall */
> > +struct hv_deposit_memory {
> > + u64 partition_id;
> > + u64 gpa_page_list[];
> > +} __packed;
> > +
> > +struct hv_proximity_domain_flags {
> > + u32 proximity_preferred : 1;
> > + u32 reserved : 30;
> > + u32 proximity_info_valid : 1;
> > +};
> > +
> > +/* Not a union in windows but useful for zeroing */
> > +union hv_proximity_domain_info {
> > + struct {
> > + u32 domain_id;
> > + struct hv_proximity_domain_flags flags;
> > + };
> > + u64 as_uint64;
> > +};
> > +
> > +struct hv_lp_startup_status {
> > + u64 hv_status;
> > + u64 substatus1;
> > + u64 substatus2;
> > + u64 substatus3;
> > + u64 substatus4;
> > + u64 substatus5;
> > + u64 substatus6;
> > +};
> > +
> > +/* HvAddLogicalProcessor hypercall */
> > +struct hv_add_logical_processor_in {
> > + u32 lp_index;
> > + u32 apic_id;
> > + union hv_proximity_domain_info proximity_domain_info;
> > + u64 flags;
> > +};
> > +
> > +struct hv_add_logical_processor_out {
> > + struct hv_lp_startup_status startup_status;
> > +};
> > +
> > +enum HV_SUBNODE_TYPE
> > +{
> > + HvSubnodeAny = 0,
> > + HvSubnodeSocket,
> > + HvSubnodeAmdNode,
> > + HvSubnodeL3,
> > + HvSubnodeCount,
> > + HvSubnodeInvalid = -1
> > +};
> > +
> > +/* HvCreateVp hypercall */
> > +struct hv_create_vp {
> > + u64 partition_id;
> > + u32 vp_index;
> > + u8 padding[3];
> > + u8 subnode_type;
> > + u64 subnode_id;
> > + union hv_proximity_domain_info proximity_domain_info;
> > + u64 flags;
> > +};
>
> You add '__packed' to 'struct hv_deposit_memory' but not to 'struct
> hv_create_vp'/'struct hv_add_logical_processor_in', this looks
> inconsistent.
Fixed.
Wei.
