From patchwork Tue Sep 1 15:10:03 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: 248880 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6447:0:0:0:0 with SMTP id l7csp3681926ejn; Tue, 1 Sep 2020 08:23:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQtWMorZDwLopK+/kG4bvcnQjRYsOCDNXuTok8QwMXKURjWJJqd20+vgJUO6N+BJby9EBC X-Received: by 2002:a05:6402:176c:: with SMTP id da12mr2224953edb.386.1598973797575; Tue, 01 Sep 2020 08:23:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598973797; cv=none; d=google.com; s=arc-20160816; b=nefJybQV84co0LjF82yBsGKLfFlVdF170CnQGFW8mjCzb7BNQa0RPxO8T2MN0YY46N AM8T+A7Y4U0ofwv3FTT30zSHUvPeMcXASpUNU4E9rzEeXYFeelohDGP505sFwJd3UZqb 8wKZs5mA+0zSU+MLP+2Do+rvwqHgI8MbTiltpGKrzA82JzWh+C8q1pRlcIMSjbYnQu1F MvPiglNUeL3mSVYg8a9BdUOhO63ZgtS1uegqm0snSQdzDW0iTy+ZcvkZmknZ//oZ5p+S 7qnoE/fCi8lO2XFY8xz8FneQcenNGYxkdVlKbBGUnTe3/HAZW4/60FtXN34+VQlgJBml n3Wg== 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=Wod4B7QPmIYA2832a8BcM47Bav8WHDF5NHqFqaIVt7E=; b=lMkND4QasePAhSE+WJoe5Ycdijkf46WytZvtKiSRatqDz9GyvKUG3t6PIp8PJ2Vuox oJrx0Lnyg8dRFkEz75CcKqysXp0Wumou++alr8ex1E8rllylE5oSttiI3/j0JTcastXz Lm76E5nMRTr2c2awXC/BVZ+qpbHbBuw61iKcJSkkzV9d6vA+OcoQJMD88ETuDXLw2lFY ikXlGnPyP5c+qt19qByU9+WeJhD0z+JHxxbrtgGEOm+emC+DHDowJg2OpIc2uo1zMepJ L/gvIJczZca24oJKlQTG1LTuAyfyO43QstgT+WgwsIRTj2VEukj7FfcP6d4QAJXabLIU Q/tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kWdKRL6X; 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 s5si812785ejz.589.2020.09.01.08.23.17; Tue, 01 Sep 2020 08:23:17 -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=kWdKRL6X; 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 S1729401AbgIAPXP (ORCPT + 15 others); Tue, 1 Sep 2020 11:23:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:46028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729788AbgIAPXM (ORCPT ); Tue, 1 Sep 2020 11:23:12 -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 BF627206FA; Tue, 1 Sep 2020 15:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598973792; bh=s1FMidq3wD/dyOM19kLBhZ8R6vwh+ZWiVn506wglIyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kWdKRL6XJ2qons59x5uH10LzyiMDBXMCrb9SQuENUrkGIWsVFZPqWdP9Vt8fXAidO Ha0rBcdy0MD3WDVSyJeHkxME7A8ioJc5tI8mHsw+D7XCxtswXfD0eg6nV+7hoQ6okZ LjaErRgpnQKh0T27qDe/1iJXc+Fn+Y4L6qARhgYM= 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.19 048/125] KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe Date: Tue, 1 Sep 2020 17:10:03 +0200 Message-Id: <20200901150936.906354748@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901150934.576210879@linuxfoundation.org> References: <20200901150934.576210879@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 f3978931aaf40..3cdefd84af545 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -626,7 +626,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,