From patchwork Tue Oct 3 03:11:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 114644 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1384964qgn; Mon, 2 Oct 2017 20:12:34 -0700 (PDT) X-Received: by 10.99.42.141 with SMTP id q135mr14105169pgq.102.1507000354829; Mon, 02 Oct 2017 20:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507000354; cv=none; d=google.com; s=arc-20160816; b=Ma+OiBpuoFy/PyJEQ4N73RzIdh49FgVoD5okNaZdXYm5hd/dpWI5ouJ2nUO3LnmeEj bH3vM6r8OAgWPl9z4EKMEJzHntIqMyNmmaM4freVQBlZUwbu4CqnoGhhA+NmvkXX3Hkc ZCOh711Mn77s3O40oIAOjrHpsxLlhq7fa5SSY3Nbe2efeCxiBttr2KnCTrDdQ4G9yQiA cr7uEQLya+MWNBj0h4cpuyRyGqXDpM8llC8iET2ANr+E8zB+gD6bpm8xmafOP2cR1I9y 5PL9Bw/d+BBIhwSZ0+/0RgV9knP+WC36gjpgx1ibc7lIvMEMcOUS0fW0ZIXFpg+ApEoW QJDw== 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=UKqqZH0PQQRDqhFJrUnEN3msoL2mkBMjdYBdeAHkGYU=; b=jZD2vkeknm1WaDVI2etNxpxBIKkJ9Ld5Ikzvtn/gc4yz9CBCCtF5Ca0WZxFKuuKaHO 7WDno//h+xVAsEpHHwN2xZ+54QiMBhUxGfSUcDk0eTWcWGBCf4v7P5OOVcc64Wb6TKni HbgGyJsXNxMDbYo+UwuZ7PcVUMASBI7pJ3FeYIob3QSX9XJZi8SKocQ56BrGAoccrdpx HvdEJp2MuV6btuYwabQsPRSdcCzotS+sqfK0GBlFFSluvamfWiershdF8Y/T+Kb+NgPQ 6E3l4Rl9Tmi+GlLcS+qdNlCDQKVDuAbxIDUvS7WElF2FSRqd1/A1/aC7lvcGAr+YhMEV 95sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UzrcLgg6; 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; 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 k10si8810618pgc.320.2017.10.02.20.12.34; Mon, 02 Oct 2017 20:12:34 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=UzrcLgg6; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752085AbdJCDMb (ORCPT + 26 others); Mon, 2 Oct 2017 23:12:31 -0400 Received: from mail-io0-f174.google.com ([209.85.223.174]:47017 "EHLO mail-io0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752033AbdJCDMO (ORCPT ); Mon, 2 Oct 2017 23:12:14 -0400 Received: by mail-io0-f174.google.com with SMTP id d16so6451371ioj.3 for ; Mon, 02 Oct 2017 20:12:13 -0700 (PDT) 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=UKqqZH0PQQRDqhFJrUnEN3msoL2mkBMjdYBdeAHkGYU=; b=UzrcLgg6kMknyUlhHctCWi6o9FqV5MhvBMavDfBBp7IvDlFr/U7grT0MezPcBdeRzq HJHSvOKlnzXzavxI9M67ChuQLoIzSJjPAFdeO3F+UvBpVm5RHZtxp0GBK1wPWeB24rFB DuAwvIVO17kC/HktuxgiqbP2zFPU2T/JPrPac= 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=UKqqZH0PQQRDqhFJrUnEN3msoL2mkBMjdYBdeAHkGYU=; b=nTLLu41PK5g7tSUNDv6QOaAd5KAUMj7aHq7Ijol7YLyd3VZRg1Y8DYWBcykkmJkymT FXujFJQ9vVKM94jDIvmsxk+NFWPzDGw4toShGFZHrFNVG9sHfl4L9eX1HHIkVNuy8xeC ehTz7jJ1uOh9yNM7svAppU5iSfczQoGYNbQrq4zyvVtGsT7qzgVy6BTF9MPiEPiXQj0m /rfGFGAOR/6Sglb4PSBGzDDHeW7m1OktKTr4BIv4c0QmvAFnbHMhvKupCiE52r5xGVhI +V+vMLscRIYBVj2Uc/ZUC/e37QbxPCS4iK3Aukxm8WWM+d8tMLOF6JW78d8PtFWQDxMB 7UpQ== X-Gm-Message-State: AMCzsaVe/uZQfyV0rOZP9Uj9cTaGkFVqYNR8hnsIW8cszfTPNL2maQW7 JS0ufR8y407LR9HVeJkBgk2l1g== X-Google-Smtp-Source: AOwi7QCKyvxBzMMBQgd3U2cEOA1B48pYsWI2hlaCq7sjJauE0eMTIEP/KHXtAM7E6Z5ckAUSMT+0Ug== X-Received: by 10.107.137.164 with SMTP id t36mr2055438ioi.198.1507000333522; Mon, 02 Oct 2017 20:12:13 -0700 (PDT) Received: from node.jintackl-qv28633.kvmarm-pg0.wisc.cloudlab.us (c220g1-031126.wisc.cloudlab.us. [128.104.222.76]) by smtp.gmail.com with ESMTPSA id h84sm5367193iod.72.2017.10.02.20.12.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Oct 2017 20:12:12 -0700 (PDT) From: Jintack Lim To: christoffer.dall@linaro.org, marc.zyngier@arm.com, kvmarm@lists.cs.columbia.edu Cc: jintack@cs.columbia.edu, pbonzini@redhat.com, rkrcmar@redhat.com, catalin.marinas@arm.com, will.deacon@arm.com, linux@armlinux.org.uk, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Jintack Lim Subject: [RFC PATCH v2 31/31] KVM: arm64: Fixes to toggle_cache for nesting Date: Mon, 2 Oct 2017 22:11:13 -0500 Message-Id: <1507000273-3735-29-git-send-email-jintack.lim@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507000273-3735-1-git-send-email-jintack.lim@linaro.org> References: <1507000273-3735-1-git-send-email-jintack.lim@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoffer Dall So far we were flushing almost the entire universe whenever a VM would load/unload the SCTLR_EL1 and the two versions of that register had different MMU enabled settings. This turned out to be so slow that it prevented forward progress for a nested VM, because a scheduler timer tick interrupt would always be pending when we reached the nested VM. To avoid this problem, we consider the SCTLR_EL2 when evaluating if caches are on or off when entering virtual EL2 (because this is the value that we end up shadowing onto the hardware EL1 register). Signed-off-by: Christoffer Dall Signed-off-by: Jintack Lim --- arch/arm64/include/asm/kvm_mmu.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 601f431..7a1c581 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -240,7 +240,10 @@ static inline bool kvm_page_empty(void *ptr) static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu) { - return (vcpu_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101; + if (vcpu_mode_el2(vcpu)) + return (vcpu_sys_reg(vcpu, SCTLR_EL2) & 0b101) == 0b101; + else + return (vcpu_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101; } static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu,