From patchwork Tue Sep 1 15:10:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 248946 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6447:0:0:0:0 with SMTP id l7csp3769068ejn; Tue, 1 Sep 2020 10:10:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLcIm2y8ZYznmj0l0nRPVmXARWfhV8Dz//Q7da/up0BxJwHaFfIe3FEVnX4vuZAyrMZIq/ X-Received: by 2002:a17:906:fcc7:: with SMTP id qx7mr2588252ejb.254.1598980246651; Tue, 01 Sep 2020 10:10:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598980246; cv=none; d=google.com; s=arc-20160816; b=olh8t0CpfSchtMcxnTmR+AkKLwOEvw6HO9KpmO7OMA0tUYDrRzvfgBFV29R58xqzut W56md9GJh2T5jDSqMPKHbEqk8wxZ6p7TbrLpc9XveaCJTJuNXCkNTv3P3x8TydT46zYC eINmr0RdFpW806VIhQdiygktEgcWap0nPHynd+PeP+NvqglCFk8Jj8jnGi0SwTJzekYY X80JbSiN/mp69942K9/6IrcV2D5jY58TmDliCTJxjVR+QdwiChCA9yXYOSHettY8v1oF F3Wck0DP88HgMSuP4999JadYYHlnEDNtcKctTKDbFrYMbWsqj6ZcD2UycnTCFGxaKAls 8CWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=l80dOYu+BQZHO+8CXdjq9uOjvkBvjLyMq6QsmDHaxK0=; b=cxRr1SSsV6G8gVd+2NwaSPlDQLE9nAzOvCztht4Xq+k3+KwFfKPAEemMSFGHHAgpAH Zw4UvfGK2GMQdnB0cdRm/gBjvy74PVjIffF/PgfEvOhKBppFrr/8pcPlFaGNk9BqCDA4 Fym1eguIctmMx6Gj5YiFJR7dxmAuI65qXusqay4x8A4jEBYeESlSb6kKt99BVFpFGpXR ICEvKwtl2W9sxlcPqZFeglL4ZcegLeLBn93jtnKWpHHUnlFLbbf4fUILIbGnmMtX6tFf ICKapvqkxy6Q8Kld6z1YfRq099OJIza89SLtnGOWxSCizg8n3ZVpj13W9mdPhH5/6Hg5 K7bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bDyDvjNv; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q24si990952edi.78.2020.09.01.10.10.46; Tue, 01 Sep 2020 10:10:46 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bDyDvjNv; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729366AbgIARKm (ORCPT + 15 others); Tue, 1 Sep 2020 13:10:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:33710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728498AbgIAPQp (ORCPT ); Tue, 1 Sep 2020 11:16:45 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8866F20BED; Tue, 1 Sep 2020 15:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598973405; bh=2byLAjL8FQUhmh6j4A6XfH4H+LgGHJgmhQ0w05syvho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bDyDvjNvuMu2NBIDjG7Rpc6u0R8MeGHT16t8kq5DaYBotr5pmrOS49dqxnZRjltTu Z1bpfOWVQnJs0Sw0n5M7341PoNXc/5I96R3QmG4VJJp0pRCa1WmKOAxWFs9HTQdMNV P7GRIYJA4hWSshMBR0VtBQMdhCqzXIrQ+o6gztg4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Brazdil , Marc Zyngier , Sasha Levin Subject: [PATCH 4.9 34/78] KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe Date: Tue, 1 Sep 2020 17:10:10 +0200 Message-Id: <20200901150926.451457648@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901150924.680106554@linuxfoundation.org> References: <20200901150924.680106554@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: David Brazdil [ Upstream commit b38b298aa4397e2dc74a89b4dd3eac9e59b64c96 ] __hyp_call_panic_nvhe contains inline assembly which did not declare its dependency on the __hyp_panic_string symbol. The static-declared string has previously been kept alive because of a use in __hyp_call_panic_vhe. Fix this in preparation for separating the source files between VHE and nVHE when the two users land in two different compilation units. The static variable otherwise gets dropped when compiling the nVHE source file, causing an undefined symbol linker error later. Signed-off-by: David Brazdil Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20200625131420.71444-2-dbrazdil@google.com Signed-off-by: Sasha Levin --- arch/arm64/kvm/hyp/switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 115b0955715f3..ed7e3a288b4e5 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -412,7 +412,7 @@ static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par, * making sure it is a kernel address and not a PC-relative * reference. */ - asm volatile("ldr %0, =__hyp_panic_string" : "=r" (str_va)); + asm volatile("ldr %0, =%1" : "=r" (str_va) : "S" (__hyp_panic_string)); __hyp_do_panic(str_va, spsr, elr,