From patchwork Tue Sep 1 15:09:01 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: 248894 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6447:0:0:0:0 with SMTP id l7csp3687380ejn; Tue, 1 Sep 2020 08:29:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzy2SSyQADiNprrIo4a+V4QSlSpOQxbttdb1MNWGzRg/FKVsld8Q/4uj6lpmNz4d5z1rF4C X-Received: by 2002:a05:6402:2c3:: with SMTP id b3mr2200829edx.213.1598974190840; Tue, 01 Sep 2020 08:29:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598974190; cv=none; d=google.com; s=arc-20160816; b=IqRhgFAebZLn7ivwQcVxSgSZYm4msTt5pOWmGRn/bTjM5DSJHaTTPUgjiy0fZAbd3S H8WhOtVNGWVXjvK5knXiI6UcqLgOZtsxLynVdDyg1+miGb+cxj3FUNVPV+YC2XuaUYRR w/79q5X0t4/VvHISraE9/bw7AYk9Rtt7xYeGzLzFsWRc77t4/qhtzGukZSCwO5rvoGFO aFGfNj3oYOIV7BDlvazI9WxGPKbZiaz/nkQda7UWcmt8e00b3IAGOrer0NDByIcgVjWH Jo2ZUdit1WlUiT5rcFco7q4h5MJw4ZWKiFUCj3G5kwMMRGQaUqInwfx+oFmp39itx4pu WsQQ== 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=UH2WKbMRMM80Un8seFtGxjjkSo/SSuqLw/rON812Sws=; b=VFjxY8jkCEzcd/8ZYjBaJ8cbmIxEGLJWoKk6SbaU6k4saV+ihdkK5+jWhZ/baiYFEu Vh6uCUlDv/9TNMUwF32hxTUly8SfombESA/N+qT8bqbIclcgKObHjz1gbbkEgTwySIwu o2jF7qmJcrojztzLZICHrBaRI63ksOvqlSUAvSW4fhx5Z0FA2k2X0P6NfaNlpMbQYDph 7jea1UwJyIpNtaNcQThX+dAGgT4tjM+V8B/6X/T/b9IT/ptFz8g8PD036zYKuAXCLv8E pmu0e1OoGH7cLoFuAyGNbBZbu17KhGy73TKK7YwkJmU0rIr1EBwn2Zkc0fhTTDlIWr69 l5CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=d19DZ3Fp; 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 l7si807189edv.594.2020.09.01.08.29.50; Tue, 01 Sep 2020 08:29:50 -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=d19DZ3Fp; 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 S1730210AbgIAP3t (ORCPT + 15 others); Tue, 1 Sep 2020 11:29:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:59466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730553AbgIAP3s (ORCPT ); Tue, 1 Sep 2020 11:29:48 -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 08E0E2078B; Tue, 1 Sep 2020 15:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598974187; bh=WBAWP8txpeH9Pazy5YXen/TfY6UKlJXLsPE5CpfFVGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d19DZ3Fp/4JOhkmuF5HGiD9iZPz1IYO54PacNxMYjB0T9apL+PMJ6D1YvTIaQzgX3 CRgtiyV31isnzrMcv9o3iSnjtGGLP37pNadwm7Nrxh+/ThUzhIR5IGZDuwGskvBtLP RVwnoFTypkO448WXImhL+XFYM5RelgBvfHgZtLlA= 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 5.4 061/214] KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe Date: Tue, 1 Sep 2020 17:09:01 +0200 Message-Id: <20200901150955.907938010@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901150952.963606936@linuxfoundation.org> References: <20200901150952.963606936@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 d76a3d39b2699..6f4838b475d0d 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -754,7 +754,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,