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.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 A1626C433DF for ; Wed, 29 Jul 2020 10:29:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6EFA5206D4 for ; Wed, 29 Jul 2020 10:29:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FeyRywsT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ulqa/g5k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EFA5206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=C3KnDWrcIC235a3ZNgPzzyZmi7MIIoh4Qq7XeUcw2m8=; b=FeyRywsTFnaez6ODveBcV2pIT ISN7D71iDduwI4Aqw+ACFUOZnNCZfXVqYxfl7tAlqXAeS8H3Z4B/vas0vw2SrSiH7V97tIUaNr2zN 3/X4xlxxh64r5dSZ4JSbmwKBkocQSJj1M/kr8s+JzMYAH9hxUEtxSI4YG9ra+jSfTNjbj3tXm5kyo 2cTuPrzrCCjlrUTpHRweHq0RV/aHP1Oc/DrO0GY69UcxqkLTR8vXCINKXKqTpDCXOuwx6Km1p5dto gQTHYq6Ds35XxzFrONWvl/FpVanMjeUtgS/2BeS1/BDhH9IymZolxJ1y2tPLxS3p+oCH7kfaW/fmh FoTT5uEPw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0jKE-0000yg-88; Wed, 29 Jul 2020 10:28:42 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0jK4-0000wF-8R for linux-arm-kernel@lists.infradead.org; Wed, 29 Jul 2020 10:28:33 +0000 Received: from localhost.localdomain (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 439B8206D4; Wed, 29 Jul 2020 10:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596018511; bh=LYlPZd8d9yHn5jCIMkg56g8w4VoNaOxcimdZZswPGLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ulqa/g5kQNPcj8sM7Eir9ygH/dn4MFiEXvmJHvAzK2hAfrrxbrbMBd+J1utcgPqQN xg+dCZ6w8uTn3VcYO8y31B4Wl/i+mFKNCZxNZyVVB+veDSYmfciFvqVUzPrqObQPcA Hzt0EJimviDn2FjduiePIC5mejr22UqnYzuoo33I= From: Will Deacon To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v2 3/4] KVM: arm64: Don't skip cache maintenance for read-only memslots Date: Wed, 29 Jul 2020 11:28:20 +0100 Message-Id: <20200729102821.23392-4-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200729102821.23392-1-will@kernel.org> References: <20200729102821.23392-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200729_062832_376785_DC40C88B X-CRM114-Status: GOOD ( 15.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Will Deacon , Suzuki Poulose , Marc Zyngier , Quentin Perret , James Morse , kernel-team@android.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If a guest performs cache maintenance on a read-only memslot, we should inform userspace rather than skip the instruction altogether. Cc: Marc Zyngier Cc: Quentin Perret Signed-off-by: Will Deacon --- arch/arm64/kvm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 96d995a1ef68..4150bce3d0b6 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -2121,7 +2121,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) * So let's assume that the guest is just being * cautious, and skip the instruction. */ - if (kvm_vcpu_dabt_is_cm(vcpu)) { + if (kvm_is_error_hva(hva) && kvm_vcpu_dabt_is_cm(vcpu)) { kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); ret = 1; goto out_unlock; -- 2.28.0.rc0.142.g3c755180ce-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel