From patchwork Thu Nov 16 15:39:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 119054 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5734688qgn; Thu, 16 Nov 2017 07:39:49 -0800 (PST) X-Google-Smtp-Source: AGs4zMbmbH4bgY2AB4pIq5+pnaENtGThuhnSWUY0CANumloTU22oHHLhE1JtY7ndbCK67yi0occ7 X-Received: by 10.84.238.140 with SMTP id v12mr2074940plk.356.1510846789287; Thu, 16 Nov 2017 07:39:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510846789; cv=none; d=google.com; s=arc-20160816; b=Vcb/YgB8VHWtg39piAUvaRRrjwPiWlPEyYYWwM7WsRoO1oeyGBiWVHXkQibX9/ysdR QaC6zsg7leeJJaHBgmzEaffV5DYSa6xeJpC2BpB840tSnqB7wDpeGRHR/CRt9xAdj4m7 08gp5saYzVEy4kah5R5SDicFn9yg48oh+CmUfrFlG7eKB61+vkfZl9iz3aQKli3LMx4B m9kJIJ+VkdcYocoRMU6+OGJ9hbdR3g6+E4lX5XdQXpbVfw7naI2P0Pajz4pbnvPxLqJH XRRUR9SFH06yFBB9Wn2hH9c6STL17YBxJBBt8zblEBnx/7dDZ+yZ/sm2lIXtMTArnizc fzGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=vQQJ10t1lIqeeOaF2rAFpUln0qYoIa5cY0eg26tvcGk=; b=goPhBYXUn9vyJHgVjkBJmSNXo2w7t1vtA+C5/UcZzgbhNU/TYqc1o5HfQ1OZpLroVL +vd64bJg6iTpp6E42QI6xI2F7dR3wq86pKuEZ1FrvIN7+GBDuDs96C9ykoUVsmagLEMY wYCzUdem3Y20Zt4SfKujykblpfkd4Z2fyg1OXhGpY4jNzPHRyT7I4JyvybMnl5M1HcXv yguQYo1+mlU1lG5dUXsUdvdXmr+FWj+OAmjkgq7Ia19geC8zpMVif56ia1U/MZzl5pAh yGNgaeQC+4VwsiMmtuLuacelD0Bm7SMI07W4G/cZrgcYC4G99tZ1yJDMU+Pem77Fbngd 10rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gtmUTmny; 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 x5si1156918pfx.313.2017.11.16.07.39.49; Thu, 16 Nov 2017 07:39:49 -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; dkim=pass header.i=@linaro.org header.s=google header.b=gtmUTmny; 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 S965272AbdKPPjr (ORCPT + 28 others); Thu, 16 Nov 2017 10:39:47 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:57161 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935676AbdKPPj0 (ORCPT ); Thu, 16 Nov 2017 10:39:26 -0500 Received: by mail-wr0-f196.google.com with SMTP id u98so1468597wrb.13 for ; Thu, 16 Nov 2017 07:39:26 -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 :mime-version:content-transfer-encoding; bh=vQQJ10t1lIqeeOaF2rAFpUln0qYoIa5cY0eg26tvcGk=; b=gtmUTmnyvfWM9aX+TFiIMfV6rtof0RF7YXgUvrRm/MBcCn6FiNr3RQyHKFTQkq+5Y5 e4MuKPvHvQiOdCpgOirvVSq7Zs4y2cLMjou2kMf//+DxxM5cdRUVRzNKqGFNFPMYgL9L 4weIDLJ2eDUKDXkD2gHkCVOUjRlOJE6ero6Lc= 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:mime-version:content-transfer-encoding; bh=vQQJ10t1lIqeeOaF2rAFpUln0qYoIa5cY0eg26tvcGk=; b=ZWH82MAJR1Y2cTaiZgO75SgVINeVxHXH+n7dayeE8sI3W9fGhI8M12Tm9K2mJo/cYL sMDv8UJJuneingY+2+yVk7WEQSuuZMtyVHHmhnt6cw7hSBuix5vBbbiCnziPiOxYyTWA 7ro4N+/VwObD0F+hrASkyVCqmyuTfBVCsXCkQ2kls3btACh0CgMgknCWKS2tCGnFw5pT 16ihn3NuOnGNOY+ucIpxZih1YSsJSI/KTvIRJS/AlVY4btE43m5UeuxJcgccZiBHkrjL z4ls/A7f3XNzvF20WjSWlidbiowde+mawvf0joZQ1hCSZ1idoz5qDQxMMbBHa/fTNhwq CYwA== X-Gm-Message-State: AJaThX7G4OetoBveaJRImvPw0cgX9a/HMbAIIAkIdOj5AZxJ2T3hmoYA Oudc0vU5dMDHobJyjVFIDVPoU1Rz8RQ= X-Received: by 10.223.139.3 with SMTP id n3mr1963510wra.166.1510846765555; Thu, 16 Nov 2017 07:39:25 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m64sm1272694wmb.10.2017.11.16.07.39.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Nov 2017 07:39:23 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4EE983E0426; Thu, 16 Nov 2017 15:39:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: julien.thierry@arm.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 3/3] kvm: arm64: handle single-step of userspace mmio instructions Date: Thu, 16 Nov 2017 15:39:21 +0000 Message-Id: <20171116153921.21991-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171116153921.21991-1-alex.bennee@linaro.org> References: <20171116153921.21991-1-alex.bennee@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The system state of KVM when using userspace emulation is not complete until we return into KVM_RUN. To handle mmio related updates we wait until they have been committed and then schedule our KVM_EXIT_DEBUG. The kvm_arm_handle_step_debug() helper tells us if we need to return and sets up the exit_reason for us. Signed-off-by: Alex Bennée --- v2 - call helper directly from kvm_arch_vcpu_ioctl_run v3 - return 0 (ioctl success) instead of 1 --- virt/kvm/arm/arm.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.15.0 Reviewed-by: Julien Thierry diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 95cba0799828..b40440defca1 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -625,6 +625,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) ret = kvm_handle_mmio_return(vcpu, vcpu->run); if (ret) return ret; + if (kvm_arm_handle_step_debug(vcpu, vcpu->run)) + return 0; + } if (run->immediate_exit)