From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19B96C433DB for ; Mon, 15 Mar 2021 12:39:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9D6064E4D for ; Mon, 15 Mar 2021 12:39:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229623AbhCOMi4 (ORCPT ); Mon, 15 Mar 2021 08:38:56 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:42831 "EHLO wout1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbhCOMiq (ORCPT ); Mon, 15 Mar 2021 08:38:46 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 4D7EB31E; Mon, 15 Mar 2021 08:38:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 15 Mar 2021 08:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=eXSo/rrpfJdFFM4H2VHIthFijyS ureLWt5N+YGNHuMw=; b=UHrMejKxlIIie1tATu++mw7TqyBbljWh789guHmmw+P sbyFYICai+MP3P5vjASiA0exmqOaPIZdth6lrx7dUaitQGfIAV9gVAnqyCPOmqdi bZ7xjGmOL/XRHwTbarPCYwUqecX8Z+ESf30rPHBnJcQ4P7O6ro/+w8Br81jwYTvk h7BW/fgorknJ3XRfjGg0iUBGNtD05FqPwNiMC8L5Zis+BdSst5aX67H0CRoG9QGd BBlH6wNUBTGx/SJEZfQFAyUU3wdqOdHo+X4KwPHZSaYCInLclWygYpGXeHeShw1j gJmGDv7ya/ABwxEspjikjxvq3UjpgbpIVKBFEWqGNjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=eXSo/r rpfJdFFM4H2VHIthFijySureLWt5N+YGNHuMw=; b=ZYDVl3BgRw37jdjp9smX9y MVBq0a55wmnIOCjbX2z9ramOR04X4KQP9NbeKa16B+Ca9tr9/onaWDNPBvFWue+R Q43ijYr/2GcTZxY/oXxlJEQWz88pnZDwjlQ7rbeQDNhQ/Ld7IfD5aCl2L7fD8Kar +dDpTBBtHPVEhBpxghDSaNvIgnvPU77iqprvGs4ZK6G6IV0FM2l20C8cZeICU6Hv EaFjS79irrna1emYa1DXp3VwySuO69Ufd4ZG6QyUg7xttCG4NZyZOM2ubquwudZl ap4cjqt6lOB+HOrTfs9/gk/rQsbavmi+P5nzBQGz089yld4GjaCBiVee7kGrcIwQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvledggeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeeuleeltd ehkeeltefhleduuddvhfffuedvffduveegheekgeeiffevheegfeetgfenucffohhmrghi nhepkhgvrhhnvghlrdhorhhgnecukfhppeekfedrkeeirdejgedrieegnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghh rdgtohhm X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id 326B724005C; Mon, 15 Mar 2021 08:38:45 -0400 (EDT) Date: Mon, 15 Mar 2021 13:38:42 +0100 From: Greg KH To: Andrew Scull Cc: kvmarm@lists.cs.columbia.edu, maz@kernel.org, kernel-team@android.com, stable@vger.kernel.org Subject: Re: [PATCH] KVM: arm64: Fix nVHE hyp panic host context restore Message-ID: References: <20210315122136.1687370-1-ascull@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210315122136.1687370-1-ascull@google.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Mar 15, 2021 at 12:21:36PM +0000, Andrew Scull wrote: > Commit c4b000c3928d4f20acef79dccf3a65ae3795e0b0 upstream. > > When panicking from the nVHE hyp and restoring the host context, x29 is > expected to hold a pointer to the host context. This wasn't being done > so fix it to make sure there's a valid pointer the host context being > used. > > Rather than passing a boolean indicating whether or not the host context > should be restored, instead pass the pointer to the host context. NULL > is passed to indicate that no context should be restored. > > Fixes: a2e102e20fd6 ("KVM: arm64: nVHE: Handle hyp panics") > Cc: stable@vger.kernel.org # 5.11.y only > Signed-off-by: Andrew Scull > Signed-off-by: Marc Zyngier > Link: https://lore.kernel.org/r/20210219122406.1337626-1-ascull@google.com > --- > arch/arm64/include/asm/kvm_hyp.h | 3 ++- > arch/arm64/kvm/hyp/nvhe/host.S | 20 ++++++++++---------- > arch/arm64/kvm/hyp/nvhe/switch.c | 3 +-- > 3 files changed, 13 insertions(+), 13 deletions(-) Both backports now queued up, thanks. greg k-h From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 207A7C433E0 for ; Mon, 15 Mar 2021 12:38:52 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 863E864E4D for ; Mon, 15 Mar 2021 12:38:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 863E864E4D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kroah.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 19E414B30B; Mon, 15 Mar 2021 08:38:51 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@kroah.com Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@messagingengine.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A56mDJIs24wx; Mon, 15 Mar 2021 08:38:50 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 058AC4B337; Mon, 15 Mar 2021 08:38:50 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id F0AB94B30B for ; Mon, 15 Mar 2021 08:38:48 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T9mWMBPNDArN for ; Mon, 15 Mar 2021 08:38:47 -0400 (EDT) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id CB9E34B295 for ; Mon, 15 Mar 2021 08:38:47 -0400 (EDT) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 4D7EB31E; Mon, 15 Mar 2021 08:38:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 15 Mar 2021 08:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=eXSo/rrpfJdFFM4H2VHIthFijyS ureLWt5N+YGNHuMw=; b=UHrMejKxlIIie1tATu++mw7TqyBbljWh789guHmmw+P sbyFYICai+MP3P5vjASiA0exmqOaPIZdth6lrx7dUaitQGfIAV9gVAnqyCPOmqdi bZ7xjGmOL/XRHwTbarPCYwUqecX8Z+ESf30rPHBnJcQ4P7O6ro/+w8Br81jwYTvk h7BW/fgorknJ3XRfjGg0iUBGNtD05FqPwNiMC8L5Zis+BdSst5aX67H0CRoG9QGd BBlH6wNUBTGx/SJEZfQFAyUU3wdqOdHo+X4KwPHZSaYCInLclWygYpGXeHeShw1j gJmGDv7ya/ABwxEspjikjxvq3UjpgbpIVKBFEWqGNjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=eXSo/r rpfJdFFM4H2VHIthFijySureLWt5N+YGNHuMw=; b=ZYDVl3BgRw37jdjp9smX9y MVBq0a55wmnIOCjbX2z9ramOR04X4KQP9NbeKa16B+Ca9tr9/onaWDNPBvFWue+R Q43ijYr/2GcTZxY/oXxlJEQWz88pnZDwjlQ7rbeQDNhQ/Ld7IfD5aCl2L7fD8Kar +dDpTBBtHPVEhBpxghDSaNvIgnvPU77iqprvGs4ZK6G6IV0FM2l20C8cZeICU6Hv EaFjS79irrna1emYa1DXp3VwySuO69Ufd4ZG6QyUg7xttCG4NZyZOM2ubquwudZl ap4cjqt6lOB+HOrTfs9/gk/rQsbavmi+P5nzBQGz089yld4GjaCBiVee7kGrcIwQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvledggeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeeuleeltd ehkeeltefhleduuddvhfffuedvffduveegheekgeeiffevheegfeetgfenucffohhmrghi nhepkhgvrhhnvghlrdhorhhgnecukfhppeekfedrkeeirdejgedrieegnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghh rdgtohhm X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id 326B724005C; Mon, 15 Mar 2021 08:38:45 -0400 (EDT) Date: Mon, 15 Mar 2021 13:38:42 +0100 From: Greg KH To: Andrew Scull Subject: Re: [PATCH] KVM: arm64: Fix nVHE hyp panic host context restore Message-ID: References: <20210315122136.1687370-1-ascull@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210315122136.1687370-1-ascull@google.com> Cc: maz@kernel.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, stable@vger.kernel.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Mon, Mar 15, 2021 at 12:21:36PM +0000, Andrew Scull wrote: > Commit c4b000c3928d4f20acef79dccf3a65ae3795e0b0 upstream. > > When panicking from the nVHE hyp and restoring the host context, x29 is > expected to hold a pointer to the host context. This wasn't being done > so fix it to make sure there's a valid pointer the host context being > used. > > Rather than passing a boolean indicating whether or not the host context > should be restored, instead pass the pointer to the host context. NULL > is passed to indicate that no context should be restored. > > Fixes: a2e102e20fd6 ("KVM: arm64: nVHE: Handle hyp panics") > Cc: stable@vger.kernel.org # 5.11.y only > Signed-off-by: Andrew Scull > Signed-off-by: Marc Zyngier > Link: https://lore.kernel.org/r/20210219122406.1337626-1-ascull@google.com > --- > arch/arm64/include/asm/kvm_hyp.h | 3 ++- > arch/arm64/kvm/hyp/nvhe/host.S | 20 ++++++++++---------- > arch/arm64/kvm/hyp/nvhe/switch.c | 3 +-- > 3 files changed, 13 insertions(+), 13 deletions(-) Both backports now queued up, thanks. greg k-h _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm