From patchwork Thu Aug 10 16:04:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianyu Lan X-Patchwork-Id: 134095 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp539098vqi; Thu, 10 Aug 2023 09:31:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDNKOZ/ty8gXtYpfKqu+yHpe0nMoYLOQ44A8+qCkqCyAHflgxnxgLS8bm2jjx79YsYGgrl X-Received: by 2002:a05:6a20:7fa9:b0:13e:23bc:f4cc with SMTP id d41-20020a056a207fa900b0013e23bcf4ccmr3799875pzj.37.1691685079821; Thu, 10 Aug 2023 09:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691685079; cv=none; d=google.com; s=arc-20160816; b=skdbyzWmqvSo/obX/dcATuN5XGhlfv7N9Of8XMU3Qk8OfgwqYyoFjW3n/VFYFWqq+q U3jQD64a6iZRJEvNZe5TKrtZpD2WHwpDSslggmTM2FqHQTAhwU4OVfKWSw4VNPsRnO/0 5PXdGykc1pvfhfEhKmRVnLvesQN/IYIhknbuZfMctihkIck9oVcdPDx0w7FPzTVT2KYV wHF5eqU9LuaIp2t5mDB8wSeWrJ7HFps/w1T9T5vtXkH0JARwQdGUQ3WXGOT7heF4o86q E9WxqQq/9eUIsdUUVvB4Rla30xNt+xORQq4Nwxxnx2TEnG1Kv2lqZkaC+1bdh7szhh4a SHtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X8HG9m2FhTY7ykIGIVjN0UNBMFpCY7kGIu3exS03aBg=; fh=TxLVtSsj0Yk+bstPG6ly04YaPbvjOFEmGNSQ8sZkNQc=; b=llyzOETmTwFp94YMW3nCTw+rFsaqN6uhJwNTc0Zlf5tSyBtRD9432txU5KBVLZ12yi Dcmx4Yx3ONivtQIlo7wuV2n5baUvXk3u8T/WyQanmMqdrKFork/ujPMIZc/lvD07hzXN O6FI5S7tMzQLMo+E6WSM0VnlpSrYLtku2tSJ0Mz4jj9pM4FUWC+n+wK55whxOQBO2oD7 EJyHPmsdQABw3WfTwB6kuQDrwgKj2eciqi3RZIbHR4nBKoLKkd7LYb9uicJ4qEikeBKx y9VlAigTOlns9SYoEMrcsfSQHHreV//FqTXI4gL7nt3+1N4fFu+4tXW5vN2O/fPtNTGU P6uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=BvyOcglw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q65-20020a632a44000000b0054ff40bf1ccsi1898737pgq.702.2023.08.10.09.31.06; Thu, 10 Aug 2023 09:31:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=BvyOcglw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236529AbjHJQGA (ORCPT + 99 others); Thu, 10 Aug 2023 12:06:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236530AbjHJQFO (ORCPT ); Thu, 10 Aug 2023 12:05:14 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DB303A9B; Thu, 10 Aug 2023 09:04:24 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1bba48b0bd2so8201415ad.3; Thu, 10 Aug 2023 09:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691683464; x=1692288264; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X8HG9m2FhTY7ykIGIVjN0UNBMFpCY7kGIu3exS03aBg=; b=BvyOcglwtN0KdFjuajbsYSGBarEbrGc9nhhaMhMPdeQ060nPx7GPEybQgz+D2JgFzz +FhJLFYCW2FiR7KGHFHtMe4G07OCY3dfRst8sF7jl28hoePPWK2iFmV8O2iecxhwd9dJ Rrj2glh608QcXR3+WgH2+GljkgDb7ggAMNr384/m3FGqp35ulkZGQn/neyYNo4dK1seZ zbKCTYUy3aItNR/RNxKLEAUKjPHfI/zrKufp3/060fbXTse7OqCt5pCQuRConD3jXpng LfNVUeR9P4poZdinRn+cF6tvc16mVNpIoOF8KrDyP/s3SYTeUTSCL9/iBefOijzVysUB EBCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691683464; x=1692288264; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X8HG9m2FhTY7ykIGIVjN0UNBMFpCY7kGIu3exS03aBg=; b=CEY/9Q5HGr4TrovAJwSNf+ibQdCObWlwladViUeE1ftw9V/tuiiWsEV1mcupnxsHe1 ZhIkbelsXcgocDX+44LhKmEsd2h6FbE0JRJ4Q0ExPyVvwr89QnXHElXu/ZOvsaHC0Naa G+ar9nyT8GvqVk7vD2fFFIg6R8fF0cqQYgLBq0hjLIwSxcgqtP8Cbgcl10O7Y7DI/gpN 8hfaId74g0FrZr8b3yrfbwkYjxiFIsKWBJAdRzRA9uMxzp67XGTiWtNX3pWe/SFRMXEC yqpFlz6l1kGwnKyMI3MFqF2aijXn32os6rJ6rYCB9NQgDpeYZ54Q/yHWmdJsNLLkucmY HNiA== X-Gm-Message-State: AOJu0Ywh+dvE2ojLSeZLNTZZxWfb6ql7br8lkP3T7AVsNiwJCr81EZrZ cKXVoB4iLYHt6LzL38lYujI= X-Received: by 2002:a17:903:41d2:b0:1b7:f443:c7f8 with SMTP id u18-20020a17090341d200b001b7f443c7f8mr3081314ple.15.1691683463871; Thu, 10 Aug 2023 09:04:23 -0700 (PDT) Received: from ubuntu-Virtual-Machine.corp.microsoft.com ([2001:4898:80e8:0:c620:2003:6c97:8057]) by smtp.gmail.com with ESMTPSA id r4-20020a1709028bc400b001b895a17429sm1948821plo.280.2023.08.10.09.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Aug 2023 09:04:22 -0700 (PDT) From: Tianyu Lan To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, daniel.lezcano@linaro.org, arnd@arndb.de, michael.h.kelley@microsoft.com Cc: Tianyu Lan , linux-arch@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, vkuznets@redhat.com, Michael Kelley Subject: [PATCH V5 2/8] x86/hyperv: Set Virtual Trust Level in VMBus init message Date: Thu, 10 Aug 2023 12:04:05 -0400 Message-Id: <20230810160412.820246-3-ltykernel@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810160412.820246-1-ltykernel@gmail.com> References: <20230810160412.820246-1-ltykernel@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773860374227788080 X-GMAIL-MSGID: 1773860374227788080 From: Tianyu Lan SEV-SNP guests on Hyper-V can run at multiple Virtual Trust Levels (VTL). During boot, get the VTL at which we're running using the GET_VP_REGISTERs hypercall, and save the value for future use. Then during VMBus initialization, set the VTL with the saved value as required in the VMBus init message. Reviewed-by: Michael Kelley Signed-off-by: Tianyu Lan Reviewed-by: Dexuan Cui --- * Change since v3: Call get_vtl() when SEV-SNP is available and set vtl to 0 by default if fail to get VTL from Hyper-V. * Change since v2: Update the change log. --- arch/x86/hyperv/hv_init.c | 39 ++++++++++++++++++++++++++++++ arch/x86/include/asm/hyperv-tlfs.h | 7 ++++++ drivers/hv/connection.c | 1 + include/asm-generic/mshyperv.h | 1 + include/linux/hyperv.h | 4 +-- 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 6c04b52f139b..0fd0f82c4f07 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -378,6 +378,41 @@ static void __init hv_get_partition_id(void) local_irq_restore(flags); } +static u8 __init get_vtl(void) +{ + u64 control = HV_HYPERCALL_REP_COMP_1 | HVCALL_GET_VP_REGISTERS; + struct hv_get_vp_registers_input *input; + struct hv_get_vp_registers_output *output; + unsigned long flags; + u64 ret; + + local_irq_save(flags); + input = *this_cpu_ptr(hyperv_pcpu_input_arg); + output = (struct hv_get_vp_registers_output *)input; + if (!input) { + local_irq_restore(flags); + goto done; + } + + memset(input, 0, struct_size(input, element, 1)); + input->header.partitionid = HV_PARTITION_ID_SELF; + input->header.vpindex = HV_VP_INDEX_SELF; + input->header.inputvtl = 0; + input->element[0].name0 = HV_X64_REGISTER_VSM_VP_STATUS; + + ret = hv_do_hypercall(control, input, output); + if (hv_result_success(ret)) { + ret = output->as64.low & HV_X64_VTL_MASK; + } else { + pr_err("Failed to get VTL and set VTL to zero by default.\n"); + ret = 0; + } + + local_irq_restore(flags); +done: + return ret; +} + /* * This function is to be invoked early in the boot sequence after the * hypervisor has been detected. @@ -506,6 +541,10 @@ void __init hyperv_init(void) /* Query the VMs extended capability once, so that it can be cached. */ hv_query_ext_cap(0); + /* Find the VTL */ + if (cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) + ms_hyperv.vtl = get_vtl(); + return; clean_guest_os_id: diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h index cea95dcd27c2..4bf0b315b0ce 100644 --- a/arch/x86/include/asm/hyperv-tlfs.h +++ b/arch/x86/include/asm/hyperv-tlfs.h @@ -301,6 +301,13 @@ enum hv_isolation_type { #define HV_X64_MSR_TIME_REF_COUNT HV_REGISTER_TIME_REF_COUNT #define HV_X64_MSR_REFERENCE_TSC HV_REGISTER_REFERENCE_TSC +/* + * Registers are only accessible via HVCALL_GET_VP_REGISTERS hvcall and + * there is not associated MSR address. + */ +#define HV_X64_REGISTER_VSM_VP_STATUS 0x000D0003 +#define HV_X64_VTL_MASK GENMASK(3, 0) + /* Hyper-V memory host visibility */ enum hv_mem_host_visibility { VMBUS_PAGE_NOT_VISIBLE = 0, diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c index 5978e9dbc286..02b54f85dc60 100644 --- a/drivers/hv/connection.c +++ b/drivers/hv/connection.c @@ -98,6 +98,7 @@ int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo, u32 version) */ if (version >= VERSION_WIN10_V5) { msg->msg_sint = VMBUS_MESSAGE_SINT; + msg->msg_vtl = ms_hyperv.vtl; vmbus_connection.msg_conn_id = VMBUS_MESSAGE_CONNECTION_ID_4; } else { msg->interrupt_page = virt_to_phys(vmbus_connection.int_page); diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h index 580c766958de..efd0d2aedad3 100644 --- a/include/asm-generic/mshyperv.h +++ b/include/asm-generic/mshyperv.h @@ -54,6 +54,7 @@ struct ms_hyperv_info { }; }; u64 shared_gpa_boundary; + u8 vtl; }; extern struct ms_hyperv_info ms_hyperv; extern bool hv_nested; diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index bfbc37ce223b..1f2bfec4abde 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -665,8 +665,8 @@ struct vmbus_channel_initiate_contact { u64 interrupt_page; struct { u8 msg_sint; - u8 padding1[3]; - u32 padding2; + u8 msg_vtl; + u8 reserved[6]; }; }; u64 monitor_page1;