{"id":842667,"url":"http://patchwork.ozlabs.org/api/patches/842667/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-4-christoffer.dall@linaro.org/","project":{"id":23,"url":"http://patchwork.ozlabs.org/api/projects/23/?format=json","name":"KVM PowerPC development","link_name":"kvm-ppc","list_id":"kvm-ppc.vger.kernel.org","list_email":"kvm-ppc@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171129164116.16167-4-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:03","name":"[v2,03/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_run","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5f421f0e7db9427cc2acfdb08c1e8adb2e9393e1","submitter":{"id":26352,"url":"http://patchwork.ozlabs.org/api/people/26352/?format=json","name":"Christoffer Dall","email":"christoffer.dall@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-4-christoffer.dall@linaro.org/mbox/","series":[{"id":15778,"url":"http://patchwork.ozlabs.org/api/series/15778/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/list/?series=15778","date":"2017-11-29T16:41:00","name":"Move vcpu_load and vcpu_put calls to arch code","version":2,"mbox":"http://patchwork.ozlabs.org/series/15778/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/842667/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842667/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=kvm-ppc-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"COD0uBxN\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5tC5Wx4z9t3l\n\tfor ;\n\tThu, 30 Nov 2017 03:42:27 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933711AbdK2QmZ (ORCPT );\n\tWed, 29 Nov 2017 11:42:25 -0500","from mail-wm0-f67.google.com ([74.125.82.67]:38254 \"EHLO\n\tmail-wm0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933733AbdK2QlZ (ORCPT\n\t); Wed, 29 Nov 2017 11:41:25 -0500","by mail-wm0-f67.google.com with SMTP id 64so7181403wme.3\n\tfor ; Wed, 29 Nov 2017 08:41:24 -0800 (PST)","from localhost.localdomain (x50d2404e.cust.hiper.dk.\n\t[80.210.64.78]) by smtp.gmail.com with ESMTPSA id\n\te71sm2080765wma.13.2017.11.29.08.41.22\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:23 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=I6zDGNYn/W5V+sBqnML0DEVrl8nUEUFGc6cUrcuvuR8=;\n\tb=COD0uBxNCe28dE/FXqjRBAIJlKiZc0aoiWEQLYfioyPoE/7h+QldClw6KgeItDnCiU\n\t+f+AX8o5JcpwT0KW3jgQxtxpBFZzJagFalQL0NHlx2SBPfuF8ZgZvX11FBomwzDgElFX\n\tkisxPxaoLWvqtoetJBW9Tq2yOiVaBsBJDdB6E=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=I6zDGNYn/W5V+sBqnML0DEVrl8nUEUFGc6cUrcuvuR8=;\n\tb=FNkxKIaEQx0otauQ6q0Z6RNuDMiiTtR9goo3Kpk61yOmyk4aI5uu6YrOvtrAZoFtUh\n\t6c3C7kmvtLPG8hBrVKc2fceF5rRp9EVI+oy/9fBY4BGPFvU+UZfGglc+MKwJs4WSvlca\n\tcJ5IaVKWtP55CUjxHaYaBlbMVK2kcr+YWoFmEiSQy0/P+zT4MjuUxcAPfSIjdMj24un2\n\tV91qGrvxDi8wOhq3dC07v2UTT6Q8uHDa/4Y/eDFVgOLcemn5udKhcEdXXtBSmFQL8/pI\n\tGl9I7gHP/TfxwPwZJat2Mc/QU6u2lyNUJj6B99Y14qnIs67thR4I32N7RS6/E5DAK6aJ\n\tEf4g==","X-Gm-Message-State":"AJaThX76209nM7tCDkpa/fmJcQeBgPn2c7UOEb//KHthpyyy5WJMm0xd\n\tf0DkcaI+PzivEl1KIGCTbiayaA==","X-Google-Smtp-Source":"AGs4zManHOAFJBsw3sRki28Y2hwGePNMNvWGIcfWPuB253ccOW2UwFR7b0euYVZKPgoSLwujeV/J0w==","X-Received":"by 10.28.158.212 with SMTP id h203mr2942193wme.157.1511973683913;\n\tWed, 29 Nov 2017 08:41:23 -0800 (PST)","From":"Christoffer Dall ","To":"kvm@vger.kernel.org","Cc":"Andrew Jones , Christoffer Dall\n\t, Paolo Bonzini ,\n\t=?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= ,\n\tMarc Zyngier , kvmarm@lists.cs.columbia.edu,\n\tlinux-arm-kernel@lists.infradead.org, James Hogan ,\n\tlinux-mips@linux-mips.org, Alexander Graf ,\n\tkvm-ppc@vger.kernel.org, \n\tChristian Borntraeger , Cornelia Huck\n\t, linux-s390@vger.kernel.org","Subject":"[PATCH v2 03/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_run","Date":"Wed, 29 Nov 2017 17:41:03 +0100","Message-Id":"<20171129164116.16167-4-christoffer.dall@linaro.org>","X-Mailer":"git-send-email 2.14.2","In-Reply-To":"<20171129164116.16167-1-christoffer.dall@linaro.org>","References":"<20171129164116.16167-1-christoffer.dall@linaro.org>","Sender":"kvm-ppc-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"kvm-ppc@vger.kernel.org"},"content":"Move vcpu_load() and vcpu_put() into the architecture specific\nimplementations of kvm_arch_vcpu_ioctl_run().\n\nSigned-off-by: Christoffer Dall \n---\n arch/mips/kvm/mips.c | 3 +++\n arch/powerpc/kvm/powerpc.c | 6 +++++-\n arch/s390/kvm/kvm-s390.c | 10 ++++++++--\n arch/x86/kvm/x86.c | 3 +++\n virt/kvm/arm/arm.c | 15 +++++++++++----\n virt/kvm/kvm_main.c | 2 --\n 6 files changed, 30 insertions(+), 9 deletions(-)","diff":"diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c\nindex d535edc..b5c28f0 100644\n--- a/arch/mips/kvm/mips.c\n+++ b/arch/mips/kvm/mips.c\n@@ -447,6 +447,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n \tint r = -EINTR;\n \tsigset_t sigsaved;\n \n+\tvcpu_load(vcpu);\n+\n \tif (vcpu->sigset_active)\n \t\tsigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);\n \n@@ -483,6 +485,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n \tif (vcpu->sigset_active)\n \t\tsigprocmask(SIG_SETMASK, &sigsaved, NULL);\n \n+\tvcpu_put(vcpu);\n \treturn r;\n }\n \ndiff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c\nindex 6b6c53c..c06bc95 100644\n--- a/arch/powerpc/kvm/powerpc.c\n+++ b/arch/powerpc/kvm/powerpc.c\n@@ -1409,6 +1409,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n \tint r;\n \tsigset_t sigsaved;\n \n+\tvcpu_load(vcpu);\n+\n \tif (vcpu->mmio_needed) {\n \t\tvcpu->mmio_needed = 0;\n \t\tif (!vcpu->mmio_is_write)\n@@ -1423,7 +1425,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n \t\t\tr = kvmppc_emulate_mmio_vsx_loadstore(vcpu, run);\n \t\t\tif (r == RESUME_HOST) {\n \t\t\t\tvcpu->mmio_needed = 1;\n-\t\t\t\treturn r;\n+\t\t\t\tgoto out;\n \t\t\t}\n \t\t}\n #endif\n@@ -1459,6 +1461,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n \tif (vcpu->sigset_active)\n \t\tsigprocmask(SIG_SETMASK, &sigsaved, NULL);\n \n+out:\n+\tvcpu_put(vcpu);\n \treturn r;\n }\n \ndiff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c\nindex 98ad8b9..2b3e874 100644\n--- a/arch/s390/kvm/kvm-s390.c\n+++ b/arch/s390/kvm/kvm-s390.c\n@@ -3377,9 +3377,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)\n \tif (kvm_run->immediate_exit)\n \t\treturn -EINTR;\n \n+\tvcpu_load(vcpu);\n+\n \tif (guestdbg_exit_pending(vcpu)) {\n \t\tkvm_s390_prepare_debug_exit(vcpu);\n-\t\treturn 0;\n+\t\trc = 0;\n+\t\tgoto out;\n \t}\n \n \tif (vcpu->sigset_active)\n@@ -3390,7 +3393,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)\n \t} else if (is_vcpu_stopped(vcpu)) {\n \t\tpr_err_ratelimited(\"can't run stopped vcpu %d\\n\",\n \t\t\t\t vcpu->vcpu_id);\n-\t\treturn -EINVAL;\n+\t\trc = -EINVAL;\n+\t\tgoto out;\n \t}\n \n \tsync_regs(vcpu, kvm_run);\n@@ -3421,6 +3425,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)\n \t\tsigprocmask(SIG_SETMASK, &sigsaved, NULL);\n \n \tvcpu->stat.exit_userspace++;\n+out:\n+\tvcpu_put(vcpu);\n \treturn rc;\n }\n \ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex 9b8f864..d9deb62 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7252,6 +7252,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)\n \tint r;\n \tsigset_t sigsaved;\n \n+\tvcpu_load(vcpu);\n+\n \tfpu__initialize(fpu);\n \n \tif (vcpu->sigset_active)\n@@ -7301,6 +7303,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)\n \tif (vcpu->sigset_active)\n \t\tsigprocmask(SIG_SETMASK, &sigsaved, NULL);\n \n+\tvcpu_put(vcpu);\n \treturn r;\n }\n \ndiff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c\nindex a6524ff..1f448b2 100644\n--- a/virt/kvm/arm/arm.c\n+++ b/virt/kvm/arm/arm.c\n@@ -620,18 +620,22 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n \tif (unlikely(!kvm_vcpu_initialized(vcpu)))\n \t\treturn -ENOEXEC;\n \n+\tvcpu_load(vcpu);\n+\n \tret = kvm_vcpu_first_run_init(vcpu);\n \tif (ret)\n-\t\treturn ret;\n+\t\tgoto out;\n \n \tif (run->exit_reason == KVM_EXIT_MMIO) {\n \t\tret = kvm_handle_mmio_return(vcpu, vcpu->run);\n \t\tif (ret)\n-\t\t\treturn ret;\n+\t\t\tgoto out;\n \t}\n \n-\tif (run->immediate_exit)\n-\t\treturn -EINTR;\n+\tif (run->immediate_exit) {\n+\t\tret = -EINTR;\n+\t\tgoto out;\n+\t}\n \n \tif (vcpu->sigset_active)\n \t\tsigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);\n@@ -771,6 +775,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n \n \tif (vcpu->sigset_active)\n \t\tsigprocmask(SIG_SETMASK, &sigsaved, NULL);\n+\n+out:\n+\tvcpu_put(vcpu);\n \treturn ret;\n }\n \ndiff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c\nindex 480b16c..198f2f9 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -2531,7 +2531,6 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t\tr = -EINVAL;\n \t\tif (arg)\n \t\t\tgoto out;\n-\t\tvcpu_load(vcpu);\n \t\toldpid = rcu_access_pointer(vcpu->pid);\n \t\tif (unlikely(oldpid != current->pids[PIDTYPE_PID].pid)) {\n \t\t\t/* The thread running this VCPU changed. */\n@@ -2543,7 +2542,6 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t\t\tput_pid(oldpid);\n \t\t}\n \t\tr = kvm_arch_vcpu_ioctl_run(vcpu, vcpu->run);\n-\t\tvcpu_put(vcpu);\n \t\ttrace_kvm_userspace_exit(vcpu->run->exit_reason, r);\n \t\tbreak;\n \t}\n","prefixes":["v2","03/16"]}