From patchwork Fri Jan 5 13:12:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 123519 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp801310qgn; Fri, 5 Jan 2018 05:13:55 -0800 (PST) X-Google-Smtp-Source: ACJfBovNfwKMh2BXs59GAQ1/IZc5C4swchGBwfIOeeRqyxphSHoGyrQwzW3HxXqfn01SqNGlQT45 X-Received: by 10.84.231.130 with SMTP id g2mr3025837plk.309.1515158035274; Fri, 05 Jan 2018 05:13:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515158035; cv=none; d=google.com; s=arc-20160816; b=KFJr6G5Qk+YJ9zYwZc8M55ifcbWJXpGgziR21uqgazNfNmC3hosahekoAOjSLIjHAP SW4GRfP2U1FavKJf64uhD0XK/Sc0Y/5bcn6kswOoDaQv3h/GmnnM5NM7vMEoCogB3K5y 00AYyYlEMMxFRIqfQLbCTX/UUXuwBeICYXHUyA9ECc7fUKBYJmfGL0ZjfUvIJqHjEaGL qcFM2o2Pg6e6Fan9mvRYH84dJdt0hxe+S2tA160lUlPlFUSb/Bh1hE4hcK5Mh47Hdm1v kNtKUJQBu/uVaRYo9VKHjrM7Fh58YupjY+cJ10hF7CO2118eWhm21QIFGXTu0MPlugKe AHew== 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:arc-authentication-results; bh=aWAAohPCL/d8SZkGZOFj+DcqDFMfevwgGwnkpe8hBm8=; b=JsF4gC1mWcqXmLfM6HCkJ1fa5Dl2Koy9hauuMXsfdAarrI2hieY4Z6jBHwBuA31T7d dK8aDkEkWEsmG+3Sic64rv9NCf/E7taWGpGfKu7pj5SJFCysLpH5tVtdAIgILoCMHQc/ jyTXojBJd8tkOAQebWrOeDivm6FGLSStMbSPMzWbCPlfz20JMJUvNKsICNp/3INHh2X9 9FBJ4zRB8m3gKzOPUdhaYHvcViZTkWl0yHy2tfrug4m3MfI7g8sW3l+XZJ97WMrymjEg f06NJyJJWfhQy/L8ry6kxoa9Xwkdi9BR3Kx5Sa2Sp5admwq+msD4Ff1K0IzkoUnOxVLY f2Iw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v11si1185307pgf.326.2018.01.05.05.13.55; Fri, 05 Jan 2018 05:13:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751947AbeAENNO (ORCPT + 27 others); Fri, 5 Jan 2018 08:13:14 -0500 Received: from foss.arm.com ([217.140.101.70]:44792 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658AbeAENMo (ORCPT ); Fri, 5 Jan 2018 08:12:44 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D7C4E169F; Fri, 5 Jan 2018 05:12:43 -0800 (PST) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A697D3F7C7; Fri, 5 Jan 2018 05:12:43 -0800 (PST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 7DEE51AE2F47; Fri, 5 Jan 2018 13:12:43 +0000 (GMT) From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, christoffer.dall@linaro.org, linux-kernel@vger.kernel.org, labbott@redhat.com, Will Deacon Subject: [PATCH v2 09/11] arm64: KVM: Make PSCI_VERSION a fast path Date: Fri, 5 Jan 2018 13:12:39 +0000 Message-Id: <1515157961-20963-10-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1515157961-20963-1-git-send-email-will.deacon@arm.com> References: <1515157961-20963-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Zyngier For those CPUs that require PSCI to perform a BP invalidation, going all the way to the PSCI code for not much is a waste of precious cycles. Let's terminate that call as early as possible. Signed-off-by: Marc Zyngier Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/switch.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.1.4 diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 8d4f3c9d6dc4..4d273f6d0e69 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -341,6 +342,18 @@ int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) if (exit_code == ARM_EXCEPTION_TRAP && !__populate_fault_info(vcpu)) goto again; + if (exit_code == ARM_EXCEPTION_TRAP && + (kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_HVC64 || + kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_HVC32) && + vcpu_get_reg(vcpu, 0) == PSCI_0_2_FN_PSCI_VERSION) { + u64 val = PSCI_RET_NOT_SUPPORTED; + if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) + val = 2; + + vcpu_set_reg(vcpu, 0, val); + goto again; + } + if (static_branch_unlikely(&vgic_v2_cpuif_trap) && exit_code == ARM_EXCEPTION_TRAP) { bool valid;