From patchwork Tue Sep 1 15:08:44 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: 248912 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4354350ilg; Tue, 1 Sep 2020 08:38:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz093ko/Eo8IesJQFqzKx8kmKZwjWqgToMxr0cqwlCIuclFZ204yDvUX6qRHreuCmPayIze X-Received: by 2002:a17:906:bb0e:: with SMTP id jz14mr2078592ejb.525.1598974726002; Tue, 01 Sep 2020 08:38:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598974725; cv=none; d=google.com; s=arc-20160816; b=q4Kbrr3D42i28G76a+D9TN0TxHy6jWGefDYWFtJDyf8+8GGz6mTwsQ0NhD8fO6m3wp YdFlDD0sXDVxoteN7a5DPduTSx0A+tjZhEAJAznS2avOVDyqBgsYmisuyswUShfWgMTy Ze++p1PkyOOIQEYa5jQJhNkodJAYl2RsrZ+2HZv26czOaQNHr5+HGMCulBG9LuJlZhUu OFn1fbu2o8V9tLEFNxi9Ib7LVylbv5mUn7mbh+YApy8oTx9AiymFqcyl3v12wt6KAe/1 0/coDBZ4vEFYdoJp6Ri38soy0ibctFWAeH1PLzNqO+caqIq4LQVOdpIYIcB+4lfiolwo 9GoQ== 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=URa0EmjdqLDWrtVAYdNQOTm1xNO83H83rJM6l3ZK1pI=; b=M4TpxfNkY6UjpKoqp/Qp1X+rR9u19ZAac6JzfoRQD6I70nODfpiVPn8H+7ml4uOlTH SNcszSQOo17rUQmTVjr80AtH1RrrxOdJB+Df1A+aSsxNKcP+J06XtBk2ID/+99DW74GJ qVbyTctr8cw6Dycown9tD0I8TKdui1g2FjzoejRTmPTlzRwl13P5WM/qaNzI6OpxiO+D FRafkuwI89B3SitRI7hxHI1LVG6Hzdun/eB8D4xVClIQSV+MoYgT2FQjXuAlR2AnN1dj 9UNNXMLXEmg1FPGAe1iWx/pImtVK0CccWurmtw8snnnsrpHAocKnhu5U6JCA2/hoKrtc UVYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Nb9BZPMi; 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 dm15si788906edb.236.2020.09.01.08.38.45; Tue, 01 Sep 2020 08:38:45 -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=Nb9BZPMi; 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 S1731266AbgIAPio (ORCPT + 15 others); Tue, 1 Sep 2020 11:38:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:47976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731246AbgIAPim (ORCPT ); Tue, 1 Sep 2020 11:38:42 -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 A620E215A4; Tue, 1 Sep 2020 15:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598974718; bh=lngNyFxX/DnstX+1EJ7n1XfWmHHqJakTC8eaUVu7TfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nb9BZPMiwjR+HVlXD2J/nEhXIpuPMcm6sLc4wmd1GVf5KqB893ojwS2cBXw9ZXF4i TZn/ehWx+mhZysErRkFavs9A3DrnB5a8wB/4rI+PaBU5Ob/wgpQKvKeUCfxUf34EtQ DKyG/eiuJ1aJRjNr3gQT88SSLGUlcRu0i52QLE0E= 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.8 068/255] KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe Date: Tue, 1 Sep 2020 17:08:44 +0200 Message-Id: <20200901151003.992019324@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901151000.800754757@linuxfoundation.org> References: <20200901151000.800754757@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 db1c4487d95d1..9270b14157b55 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -897,7 +897,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,