From patchwork Tue Sep 19 05:30:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saurabh Singh Sengar X-Patchwork-Id: 141890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3383066vqi; Tue, 19 Sep 2023 06:24:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHB+K57gz8V4Q0wI/TJUVtH4s6rFiLE4gUN1BhzOXtpF1GMQTDSBj34iAXyILD6iT+pbxNq X-Received: by 2002:a17:902:d4c7:b0:1c4:636:51ef with SMTP id o7-20020a170902d4c700b001c4063651efmr12144716plg.30.1695129872669; Tue, 19 Sep 2023 06:24:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695129872; cv=none; d=google.com; s=arc-20160816; b=IS03VX+81MSBnD0AVTGmzyerIzagmaoby+d49kEhQF7aPubjJ3vO2scpPswlaf9Ye8 CCd93/liZfXOSHjIfwexIOMejPkWw1M0qfYQQDPAQx2f9OLxDIR8XM4yINff+Rq37MoM eSh8VB5KDiWZ49Vqzjp69mxy4+FIGujp9tqHjrl7j3B9AYnpjF2gy0PvyWgbQEakrigl 7xA0LjWLH2FdF8MiqxcKMo0HsaTE8z16OmanWkcowYWgtiQXnem4dup+ZHGfXseIxS0X zq8+I4U2pjCzP2W2G2yh/dSXMMDh6IHwp5y9nyP+GPSW18SFGwXhFTJJfGGfSvQw/N9T j5bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=bS/lJoH3L9FxG8X53V4Tq19fvrqY0he1EUARIKyLRGo=; fh=X76b0S9MjgH4l53FcWzDKTpXTkHyZ97zz1+LlFXz+Fk=; b=EvKm81lMEn/0DI74ZERZbKOZdBb/uVD1Cqwitx6NzyA+x8nBitPq5UZHAxejlzSLDm KCRmN9M9g5yj41ui7h1h1VX4hUAicAdM7lmbtDkvPrvlE8Qz3LeuqGlr73FBqtTd6A7H BXPtGeL7kKtwfBHHiAqqR6VDTL+q8mwiJFC4lHMawmJVUGPhmB2MWvtjuT1PUC45T6My OxjysWR307fNK0TTjuTpxDPgsT1IR7n27fBSFKrBfldXSVG4bt0akI1bIxUIHJNKqkoO ZW2P02ZF8MWMf18i0LaD87ULDlqBR/NWe/NsTPXMDXyhdrVTKJSirc8z/f6ln6sqJcKq qLnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=EEp9YaUY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id kb14-20020a170903338e00b001bdfb3c4e0asi9563326plb.326.2023.09.19.06.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 06:24:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=EEp9YaUY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id D11C78086516; Mon, 18 Sep 2023 22:30:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230467AbjISFaX (ORCPT + 25 others); Tue, 19 Sep 2023 01:30:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229960AbjISFaW (ORCPT ); Tue, 19 Sep 2023 01:30:22 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 69A0BFC; Mon, 18 Sep 2023 22:30:16 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 4FBE2212C48B; Mon, 18 Sep 2023 22:30:15 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4FBE2212C48B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1695101415; bh=bS/lJoH3L9FxG8X53V4Tq19fvrqY0he1EUARIKyLRGo=; h=From:To:Cc:Subject:Date:From; b=EEp9YaUYM3qMkV/+XK91LIsy7m5DWZKxbbsCsJen8UCzhrHF8ID+QDqMrsOCjT/+q xdUka3yi+1ZTVZRtpkLWceIho2Dgu5dH1K5ot7f6GQH0C4cY4mQa+DsgC1SRkMaLpW fEyiXgC1Bmta6EQEyM4OjTMZHV4rocdXsw3lcoRA= From: Saurabh Sengar 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, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, mikelley@microsoft.com, vkuznets@redhat.com Cc: ssengar@microsoft.com Subject: [PATCH v2] x86/hyperv: Restrict get_vtl to only VTL platforms Date: Mon, 18 Sep 2023 22:30:08 -0700 Message-Id: <1695101408-22432-1-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 18 Sep 2023 22:30:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777472501419456997 X-GMAIL-MSGID: 1777472501419456997 For non VTL platforms vtl is always 0, and there is no need of get_vtl function. For VTL platforms get_vtl should always succeed and should return the correct VTL. Signed-off-by: Saurabh Sengar Reviewed-by: Vitaly Kuznetsov --- [V2] - Put the if else at function definition rather then at the caller arch/x86/hyperv/hv_init.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 783ed339f341..f0128fd4031d 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -394,6 +394,7 @@ static void __init hv_get_partition_id(void) local_irq_restore(flags); } +#if IS_ENABLED(CONFIG_HYPERV_VTL_MODE) static u8 __init get_vtl(void) { u64 control = HV_HYPERCALL_REP_COMP_1 | HVCALL_GET_VP_REGISTERS; @@ -416,13 +417,16 @@ static u8 __init get_vtl(void) if (hv_result_success(ret)) { ret = output->as64.low & HV_X64_VTL_MASK; } else { - pr_err("Failed to get VTL(%lld) and set VTL to zero by default.\n", ret); - ret = 0; + pr_err("Failed to get VTL(error: %lld) exiting...\n", ret); + BUG(); } local_irq_restore(flags); return ret; } +#else +static inline u8 get_vtl(void) { return 0; } +#endif /* * This function is to be invoked early in the boot sequence after the @@ -604,8 +608,7 @@ void __init hyperv_init(void) hv_query_ext_cap(0); /* Find the VTL */ - if (!ms_hyperv.paravisor_present && hv_isolation_type_snp()) - ms_hyperv.vtl = get_vtl(); + ms_hyperv.vtl = get_vtl(); return;