From patchwork Fri Mar 9 09:07:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 131091 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp748198lja; Fri, 9 Mar 2018 01:10:41 -0800 (PST) X-Google-Smtp-Source: AG47ELs2M70Jmo0x46hGJ/RaWoxGOKjwOgeAShyFJJEt5nz/uuIbALrBvVlcYtFJcPbeXJa1Xl0X X-Received: by 10.99.180.3 with SMTP id s3mr23494403pgf.258.1520586640940; Fri, 09 Mar 2018 01:10:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520586640; cv=none; d=google.com; s=arc-20160816; b=hu6qC1u7o7ZzSy4t8C+FdhJsl/D9H9+6KzXiIIUOW0OvDz9a8zZAv/K6d88m7VtYue SnifprfTxuZxawwXrgdGf9f87qbkM+EFGu5ZuFnid3S9qSgVnq8Knlkg/xxH2ryb+7bb WFj3W7erQ4//VAAvTDCLQAXCfmY1FLdeRXlsyFM4mVk6Pdqb7NZVrtxqK0QjeGN3YO3f 39J0IIy08Av/jjAkAvvam383t+TFPcovNFEKorQgTn6Rr4kDFiwaklSR+z2/EKbUFt+Z j5cgj12PS4ioFjCExn5bMCEafq7fUDfsCwl+FcHwHZDn7pb4Y5Ex+R2jjvjS9NKGg5yJ BW/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Tq4hPDXUAswFY+BzhgeuJo8JpPQc0VI5qWituqvYsfw=; b=RQCmAPeuPH7xqjlvjA3tCIVGLsT4XKPB1Uu2ZPOa3UmNQqO0Fxdvfq9q3zK/2Aztpv GXWvnGwwsPEDDnO0iswZPLFd/VOxhdVX0dDQVHwa8D/TmgusLb5loJw0+61xUEY549CI /wsQZJ4Np83CfSinEsXED6xKR8mAMrXVv9hyE5dCFUNwmuogY6WlPtfigMdJyYmswcG+ oyfQNbV/SMDfOZxZn+wEc0IIA8iLH/DbrJxcuCLA7KX0gHHnecNKJVZ3oYqZIg52FSjK oPv7fpMMIj/YcY7+uujVGSF3OJRqphrD4Okfs1FFokNVviJkXGK3wbD6dhXH1Irb1KbJ NheA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eLZxvXAr; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id be7-v6si552881plb.201.2018.03.09.01.10.40; Fri, 09 Mar 2018 01:10:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eLZxvXAr; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751223AbeCIJKj (ORCPT + 10 others); Fri, 9 Mar 2018 04:10:39 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:43585 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751078AbeCIJKf (ORCPT ); Fri, 9 Mar 2018 04:10:35 -0500 Received: by mail-pg0-f67.google.com with SMTP id e9so3326077pgs.10 for ; Fri, 09 Mar 2018 01:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Tq4hPDXUAswFY+BzhgeuJo8JpPQc0VI5qWituqvYsfw=; b=eLZxvXArN+S5O58urZiQujArZu3zlI/6AlUfWGkeATYvK/qc5oELiLVwLeRgIWdZKl VWZxHRfNtMkA7ezp3Tfw9uxUf9ml7E4PByMBVBG9vIeNXF6TN8Wh/IQ48BcBPmMO69Mm RaSfW5QHKMtIne2SuO3PSffrrnujezp/Iqkag= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Tq4hPDXUAswFY+BzhgeuJo8JpPQc0VI5qWituqvYsfw=; b=RGuCCZO9v9oxkcoiYNhWLnoS5EUwmFM3lEiMJx/gUQw9hB06u19gyYm8XNo5TOpVhh j5BnZq4z5DnYriS7S6gdmzNqE9Jkj5mm29F1wublgUZID+hWTXCvhwa/N/VDARm5gNO1 FqpcgDnsX542AkfJRVcTNLFTQRqnwuMTsi/V5APanMxdrEc3E1a5oJUGIdiRSrILrQea R4WoYh5s0oxvUbGmZa3yofQy3BJLq0G/JBUiLmSH9WYcENQX0GZN2upi73dhYK2Sknil Y1clroBZ4P0pOqBsVU9l0+YJ4GuuSDIhnMypn7Ijepy9DJ9RMHgu2f7X01NKAIK6bqg3 tMqA== X-Gm-Message-State: AElRT7GLt8n22jCGo4MFmzd3o2aHb68p1fHhM2HBjSbwXctHyTJiPJ5e 1UEIX3axKtxCV8weZYRvnuLLPw== X-Received: by 10.99.113.94 with SMTP id b30mr333107pgn.196.1520586635283; Fri, 09 Mar 2018 01:10:35 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id c7sm1961752pfg.36.2018.03.09.01.10.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 01:10:34 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , broonie@linaro.org, linux-arm-kernel@lists.infradead.org Cc: stable@vger.kernel.org, Alex Shi Subject: [PATCH 22/39] arm64: KVM: Increment PC after handling an SMC trap Date: Fri, 9 Mar 2018 17:07:05 +0800 Message-Id: <20180309090722.26279-23-alex.shi@linaro.org> X-Mailer: git-send-email 2.16.2.440.gc6284da In-Reply-To: <20180309090722.26279-1-alex.shi@linaro.org> References: <20180309090722.26279-1-alex.shi@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Zyngier commit f5115e8869e1 upstream. When handling an SMC trap, the "preferred return address" is set to that of the SMC, and not the next PC (which is a departure from the behaviour of an SMC that isn't trapped). Increment PC in the handler, as the guest is otherwise forever stuck... Cc: stable@vger.kernel.org Fixes: acfb3b883f6d ("arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls") Reviewed-by: Christoffer Dall Tested-by: Ard Biesheuvel Signed-off-by: Marc Zyngier Signed-off-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Alex Shi --- arch/arm64/kvm/handle_exit.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.16.2.440.gc6284da diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 5295aef7c8f0..c43e0e100c11 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -51,7 +51,16 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run) { + /* + * "If an SMC instruction executed at Non-secure EL1 is + * trapped to EL2 because HCR_EL2.TSC is 1, the exception is a + * Trap exception, not a Secure Monitor Call exception [...]" + * + * We need to advance the PC after the trap, as it would + * otherwise return to the same address... + */ vcpu_set_reg(vcpu, 0, ~0UL); + kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); return 1; }