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=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 F31B9C71156 for ; Tue, 24 Nov 2020 17:08:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF83F20857 for ; Tue, 24 Nov 2020 17:08:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403890AbgKXRIf (ORCPT ); Tue, 24 Nov 2020 12:08:35 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41343 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390452AbgKXRH5 (ORCPT ); Tue, 24 Nov 2020 12:07:57 -0500 Received: by mail-wr1-f66.google.com with SMTP id 23so23056575wrc.8; Tue, 24 Nov 2020 09:07:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1iDJ9M4DqawewainPQ04+57YNKdB3IqMR4dCvr0jFDE=; b=rbOCOk/4j1WyEy6nSD5IGyNtkKzM3ixmvXPgG3SsJktlokSyG/6/ijP+PvTeMV2gE5 vweyNOcnwDtCf7l/OSlo6il47eVPaHUQJ0s9/pT4Tl+yeCUiSRD424mfZ4fSuXu0rUpf 5ORl3FxPMiaQWuRBKcNsCj0iMuZvCGtlceqI6AR7h9lszrrpSZP4dP+XI10bzosE48oB UVoKQQ5XfUMyUVPOMyj32knbVtMWMi9TzcxErLax6FBAEd61Zw+/x8AJPzbdfdXwwCpe 27HR8+kchTlaUxjlnwzqFfvcKwCOPqjtgro9C1HAr57OzjVPMirIpdtF/sgBDzIdnrmy lQvQ== X-Gm-Message-State: AOAM532LAZckJLobmeLI55aauy/4NATU+tK+jrzznmIeiPISjjY1nsH/ QLRwn5gvy7zlrpFKrJuSZ/LBbJCudQ8= X-Google-Smtp-Source: ABdhPJwC6pqzgbs7jsHpqHgycHR3wjXYagfFKCCkKbHj4yqkadGMOPSvjG2vTmSQnkCFHQJ0FaLeyQ== X-Received: by 2002:a5d:634d:: with SMTP id b13mr6383485wrw.310.1606237675185; Tue, 24 Nov 2020 09:07:55 -0800 (PST) Received: from liuwe-devbox-debian-v2.j3c5onc20sse1dnehy4noqpfcg.zx.internal.cloudapp.net ([51.145.34.42]) by smtp.gmail.com with ESMTPSA id v20sm6419874wmh.44.2020.11.24.09.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 09:07:54 -0800 (PST) From: Wei Liu To: Linux on Hyper-V List Cc: virtualization@lists.linux-foundation.org, Linux Kernel List , Michael Kelley , Vineeth Pillai , Sunil Muthuswamy , Nuno Das Neves , Wei Liu , Lillian Grassin-Drake , "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , Arnd Bergmann , linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES) Subject: [PATCH v3 07/17] x86/hyperv: extract partition ID from Microsoft Hypervisor if necessary Date: Tue, 24 Nov 2020 17:07:34 +0000 Message-Id: <20201124170744.112180-8-wei.liu@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201124170744.112180-1-wei.liu@kernel.org> References: <20201124170744.112180-1-wei.liu@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org We will need the partition ID for executing some hypercalls later. Signed-off-by: Lillian Grassin-Drake Co-Developed-by: Sunil Muthuswamy Signed-off-by: Wei Liu --- v3: 1. Make hv_get_partition_id static. 2. Change code structure a bit. --- arch/x86/hyperv/hv_init.c | 27 +++++++++++++++++++++++++++ arch/x86/include/asm/mshyperv.h | 2 ++ include/asm-generic/hyperv-tlfs.h | 6 ++++++ 3 files changed, 35 insertions(+) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 6f4cb40e53fe..fc9941bd8653 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -26,6 +26,9 @@ #include #include +u64 hv_current_partition_id = ~0ull; +EXPORT_SYMBOL_GPL(hv_current_partition_id); + void *hv_hypercall_pg; EXPORT_SYMBOL_GPL(hv_hypercall_pg); @@ -331,6 +334,25 @@ static struct syscore_ops hv_syscore_ops = { .resume = hv_resume, }; +static void __init hv_get_partition_id(void) +{ + struct hv_get_partition_id *output_page; + u16 status; + unsigned long flags; + + local_irq_save(flags); + output_page = *this_cpu_ptr(hyperv_pcpu_output_arg); + status = hv_do_hypercall(HVCALL_GET_PARTITION_ID, NULL, output_page) & + HV_HYPERCALL_RESULT_MASK; + if (status != HV_STATUS_SUCCESS) { + /* No point in proceeding if this failed */ + pr_err("Failed to get partition ID: %d\n", status); + BUG(); + } + hv_current_partition_id = output_page->partition_id; + local_irq_restore(flags); +} + /* * This function is to be invoked early in the boot sequence after the * hypervisor has been detected. @@ -426,6 +448,11 @@ void __init hyperv_init(void) register_syscore_ops(&hv_syscore_ops); + if (cpuid_ebx(HYPERV_CPUID_FEATURES) & HV_ACCESS_PARTITION_ID) + hv_get_partition_id(); + + BUG_ON(hv_root_partition && hv_current_partition_id == ~0ull); + return; remove_cpuhp_state: diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index 62d9390f1ddf..67f5d35a73d3 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -78,6 +78,8 @@ extern void *hv_hypercall_pg; extern void __percpu **hyperv_pcpu_input_arg; extern void __percpu **hyperv_pcpu_output_arg; +extern u64 hv_current_partition_id; + 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 e6903589a82a..87b1a79b19eb 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -141,6 +141,7 @@ struct ms_hyperv_tsc_page { #define HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE_EX 0x0013 #define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST_EX 0x0014 #define HVCALL_SEND_IPI_EX 0x0015 +#define HVCALL_GET_PARTITION_ID 0x0046 #define HVCALL_GET_VP_REGISTERS 0x0050 #define HVCALL_SET_VP_REGISTERS 0x0051 #define HVCALL_POST_MESSAGE 0x005c @@ -407,6 +408,11 @@ struct hv_tlb_flush_ex { u64 gva_list[]; } __packed; +/* HvGetPartitionId hypercall (output only) */ +struct hv_get_partition_id { + u64 partition_id; +} __packed; + /* HvRetargetDeviceInterrupt hypercall */ union hv_msi_entry { u64 as_uint64; -- 2.20.1