From patchwork Mon Jul 24 17:00:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1811944 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=iDghV8dg; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R8md666j7z1yYc for ; Tue, 25 Jul 2023 03:00:42 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qNyvF-0000Mc-7D; Mon, 24 Jul 2023 17:00:37 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qNyv6-0000Df-FU for kernel-team@lists.ubuntu.com; Mon, 24 Jul 2023 17:00:28 +0000 Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 1911F3F04D for ; Mon, 24 Jul 2023 17:00:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1690218028; bh=NYH/uXllV50mhkYKDz4mx0z6qN2nMn1gABF1bCylw+8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iDghV8dg5lNzEohXgkA45qS3kSy186EaHrO0vURjfmmY4HAIA2Twf4Kc9f6JW78SB rJgjJICwUklvwUaLxvOk+GMFmwZI9TrgFS/yhtkx6T6ThI//cW3Jv7iHrjqvHxHSpO AiPtz20VNJia3KAYVSBHyDME5JTE/dXL+zP1qFALby47xeB+LMmuleLOhZ2ktccN2s PkTGdXstOFR/AVqvXMW3hax/fMiv9vjW7I0kEHxKGf5l585e/hRBI6cXIexCYcKI0m fe8o7loG41shYYt5/fth1CRg4hHZ66UMV+a6iuk2PItF4a1YHzFYUA0jT6aJvcK/N6 cPfYfEqpmQnpw== Received: by mail-io1-f72.google.com with SMTP id ca18e2360f4ac-780addd7382so330279739f.1 for ; Mon, 24 Jul 2023 10:00:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690218026; x=1690822826; 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=NYH/uXllV50mhkYKDz4mx0z6qN2nMn1gABF1bCylw+8=; b=BZZ6fvBoUAvUVpgSH+ORWoNj+7IxNMZuo/6gqm0ExqShytDOcQO3Hqf9gnSXqz38Dd V+rlpucPRNMTpRjMVpDN7b3vM9T6jzN6KZzfTyvvAEalPyFXI4zk63ZHvcDfrdjY79DK JQu+mrjApecfFFRupB89qBvzfpi5t3LG50qbwrNnyluMy5BD83fL12824wGPDhqpn+0b KXTpBCjHB1lTpPJ1VOnmxvLZjcKqvNBoiTEb0+KmdpsY62fwZF41eve+653rBAu9UmTE 9p4FNevy7yf2TMmNP+biSpnABcTl/k4U0DB1T2kKhPAXT8yYV3uQStcokZz58Fc+4Hft XZGg== X-Gm-Message-State: ABy/qLb+mLsJ8CFkR5C/272CgnlMWoTZ8+3kqutCLpSTAQ+zZ/2loPHU aDgMxP8odg3+n1W6rZMueydc8GPHEzOqgv+WUedR/hLh2a0Ls79uKi0Em/2KeFNU/RW9J6mA4Eh SlhU5GbkwRRQejZ3KnlhTxbfStSBCGc55oVD6RCEi/oFMyLsT9w== X-Received: by 2002:a6b:7b49:0:b0:783:65ba:8614 with SMTP id m9-20020a6b7b49000000b0078365ba8614mr481334iop.10.1690218026703; Mon, 24 Jul 2023 10:00:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlHkmXpmzc/dIsCYFi73KpBs94JUx+uYXiskF5PdUrZ2jdyl9iYqFOzAkEiiG5e9I59VBY4d8w== X-Received: by 2002:a6b:7b49:0:b0:783:65ba:8614 with SMTP id m9-20020a6b7b49000000b0078365ba8614mr481324iop.10.1690218026521; Mon, 24 Jul 2023 10:00:26 -0700 (PDT) Received: from smtp.gmail.com (174-045-099-030.res.spectrum.com. [174.45.99.30]) by smtp.gmail.com with ESMTPSA id c20-20020a5d9754000000b00760e7a343c1sm3480609ioo.30.2023.07.24.10.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 10:00:25 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/5] UBUNTU: SAUCE: Fix building ARM64 Date: Mon, 24 Jul 2023 11:00:17 -0600 Message-Id: <20230724170017.17988-6-tim.gardner@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724170017.17988-1-tim.gardner@canonical.com> References: <20230724170017.17988-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dexuan Cui BugLink: https://bugs.launchpad.net/bugs/2028286 (cherry picked from commit 1727b08420f8909333573aaa67e1aa8738d4fb88 https://github.com/dcui/linux) Signed-off-by: Tim Gardner --- arch/x86/hyperv/ivm.c | 2 -- arch/x86/kernel/cpu/mshyperv.c | 1 - drivers/hv/hv_common.c | 9 +++++++++ include/asm-generic/mshyperv.h | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c index 4e31677d1c02..e68051eba25a 100644 --- a/arch/x86/hyperv/ivm.c +++ b/arch/x86/hyperv/ivm.c @@ -122,8 +122,6 @@ u64 hv_tdx_hypercall_fast(u64 control, u64 input) return hv_tdx_hypercall(control | HV_HYPERCALL_FAST_BIT, input_address, output_address); } -EXPORT_SYMBOL_GPL(hv_tdx_hypercall_fast); - static inline u64 rd_ghcb_msr(void) { diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index 63223d40aa03..c7c8ec666fd0 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -41,7 +41,6 @@ struct ms_hyperv_info ms_hyperv; bool hyperv_paravisor_present; /* The variable is used in modules via hv_do_hypercall() */ -EXPORT_SYMBOL_GPL(hyperv_paravisor_present); #if IS_ENABLED(CONFIG_HYPERV) static inline unsigned int hv_get_nested_reg(unsigned int reg) diff --git a/drivers/hv/hv_common.c b/drivers/hv/hv_common.c index 23871a9d02e9..308d7d485803 100644 --- a/drivers/hv/hv_common.c +++ b/drivers/hv/hv_common.c @@ -37,6 +37,9 @@ bool __weak hv_root_partition; EXPORT_SYMBOL_GPL(hv_root_partition); +bool __weak hyperv_paravisor_present; +EXPORT_SYMBOL_GPL(hyperv_paravisor_present); + bool __weak hv_nested; EXPORT_SYMBOL_GPL(hv_nested); @@ -338,3 +341,9 @@ u64 __weak hv_ivm_hypercall(u64 control, void *input, void *output, u32 input_si return HV_STATUS_INVALID_PARAMETER; } EXPORT_SYMBOL_GPL(hv_ivm_hypercall); + +u64 __weak hv_tdx_hypercall_fast(u64 control, u64 input) +{ + return HV_STATUS_INVALID_PARAMETER; +} +EXPORT_SYMBOL_GPL(hv_tdx_hypercall_fast); diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h index e7e3445e99b7..8081ef1180e0 100644 --- a/include/asm-generic/mshyperv.h +++ b/include/asm-generic/mshyperv.h @@ -183,6 +183,7 @@ extern int vmbus_interrupt; extern int vmbus_irq; extern bool hv_root_partition; +extern bool hyperv_paravisor_present; #if IS_ENABLED(CONFIG_HYPERV) /*