{"id":842662,"url":"http://patchwork.ozlabs.org/api/patches/842662/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-10-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-10-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:09","name":"[v2,09/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_mpstate","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"698e26d78d9210f275c869aba520e3c7e858bfdf","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-10-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/842662/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842662/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=\"Fnxlg91q\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5sy5CXjz9t7x\n\tfor ;\n\tThu, 30 Nov 2017 03:42:14 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933677AbdK2QmH (ORCPT );\n\tWed, 29 Nov 2017 11:42:07 -0500","from mail-wr0-f194.google.com ([209.85.128.194]:41062 \"EHLO\n\tmail-wr0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933766AbdK2Qlf (ORCPT\n\t); Wed, 29 Nov 2017 11:41:35 -0500","by mail-wr0-f194.google.com with SMTP id z18so3978352wrb.8\n\tfor ; Wed, 29 Nov 2017 08:41:35 -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.32\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:33 -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=d0JIc15NQDKD5O+KuNLF3EfrhYvrSsjginc7xaq4VOc=;\n\tb=Fnxlg91q3ePQGHJTMaKab3ktYWJd7MaJDjG4l9zSmkYB/7QOcPi5h3ecNyEmOcuzZG\n\tjIXKgEfO6i0p3tLPVpZytLPButqaFYRPKTmE7RBPAwSQi3lKZ2TcAC3btfSvoQritoto\n\tRfTm8xLP0cn0wMs+P4ECmaXYtaer/g10WWJvs=","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=d0JIc15NQDKD5O+KuNLF3EfrhYvrSsjginc7xaq4VOc=;\n\tb=p2zrRi34SkqwHUQIgIbdwtGLauV456Bup4lAUJIWGzj2K0cjSrOura6/i0q6C7gC+Z\n\tlRbUC9v0fpXK2zSlNFzxEAD5zBqRl8JoeTjpImbd0CI8VnYjEt4AMVYDQM3FFmD22hi9\n\tiAtA7TRO2tFkjXis6tufWM4NsiYIweCSlvIiCtUP+bLthk25KMtUsFyfWj7xo+/ogGQx\n\tYE4ED6lJ3EG6rInJFAmXExk9zdVPOezE1fpEYExaw68ChJcwewlbtSKN7nxckADJUd83\n\tOdkL4WOT4jFO8EIM6tz1BQ5m/i/H5vAnecW/0JCm0d03PQRuOtgZkuPrRXi77FER549G\n\tyGfw==","X-Gm-Message-State":"AJaThX4Bfvdjy+I1dMagsWgk0jQO96kc82p5iNGS3g9Nr9E1mMIcPlPZ\n\t0n35Nas7rOz1KMH+s3dYFGuymA==","X-Google-Smtp-Source":"AGs4zMYujtx2DEVt3sosN/PG+Zy761xUYx8FWfhLMbYyXlKB9Jp+sr1sKhmXPh7WYQrCtLhvi5Lmng==","X-Received":"by 10.223.144.204 with SMTP id i70mr3185150wri.57.1511973694473; \n\tWed, 29 Nov 2017 08:41:34 -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 09/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_set_mpstate","Date":"Wed, 29 Nov 2017 17:41:09 +0100","Message-Id":"<20171129164116.16167-10-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_set_mpstate().\n\nSigned-off-by: Christoffer Dall \n---\n arch/s390/kvm/kvm-s390.c | 3 +++\n arch/x86/kvm/x86.c | 15 ++++++++++++---\n virt/kvm/arm/arm.c | 9 +++++++--\n virt/kvm/kvm_main.c | 2 --\n 4 files changed, 22 insertions(+), 7 deletions(-)","diff":"diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c\nindex 396fc3d..8fade85 100644\n--- a/arch/s390/kvm/kvm-s390.c\n+++ b/arch/s390/kvm/kvm-s390.c\n@@ -2853,6 +2853,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n {\n \tint rc = 0;\n \n+\tvcpu_load(vcpu);\n+\n \t/* user space knows about this interface - let it control the state */\n \tvcpu->kvm->arch.user_cpu_state_ctrl = 1;\n \n@@ -2870,6 +2872,7 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n \t\trc = -ENXIO;\n \t}\n \n+\tvcpu_put(vcpu);\n \treturn rc;\n }\n \ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex 9bf62c3..ee357b6 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7456,15 +7456,20 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,\n int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n \t\t\t\t struct kvm_mp_state *mp_state)\n {\n+\tint ret;\n+\n+\tvcpu_load(vcpu);\n+\n+\tret = -EINVAL;\n \tif (!lapic_in_kernel(vcpu) &&\n \t mp_state->mp_state != KVM_MP_STATE_RUNNABLE)\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \t/* INITs are latched while in SMM */\n \tif ((is_smm(vcpu) || vcpu->arch.smi_pending) &&\n \t (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED ||\n \t mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED))\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \tif (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) {\n \t\tvcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;\n@@ -7472,7 +7477,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n \t} else\n \t\tvcpu->arch.mp_state = mp_state->mp_state;\n \tkvm_make_request(KVM_REQ_EVENT, vcpu);\n-\treturn 0;\n+\n+\tret = 0;\n+out:\n+\tvcpu_put(vcpu);\n+\treturn ret;\n }\n \n int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int idt_index,\ndiff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c\nindex a717170..9a3acbc 100644\n--- a/virt/kvm/arm/arm.c\n+++ b/virt/kvm/arm/arm.c\n@@ -395,6 +395,10 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,\n int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n \t\t\t\t struct kvm_mp_state *mp_state)\n {\n+\tint ret = 0;\n+\n+\tvcpu_load(vcpu);\n+\n \tswitch (mp_state->mp_state) {\n \tcase KVM_MP_STATE_RUNNABLE:\n \t\tvcpu->arch.power_off = false;\n@@ -403,10 +407,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n \t\tvcpu_power_off(vcpu);\n \t\tbreak;\n \tdefault:\n-\t\treturn -EINVAL;\n+\t\tret = -EINVAL;\n \t}\n \n-\treturn 0;\n+\tvcpu_put(vcpu);\n+\treturn ret;\n }\n \n /**\ndiff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c\nindex eac3c29..f360005 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -2618,9 +2618,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t\tr = -EFAULT;\n \t\tif (copy_from_user(&mp_state, argp, sizeof(mp_state)))\n \t\t\tgoto out;\n-\t\tvcpu_load(vcpu);\n \t\tr = kvm_arch_vcpu_ioctl_set_mpstate(vcpu, &mp_state);\n-\t\tvcpu_put(vcpu);\n \t\tbreak;\n \t}\n \tcase KVM_TRANSLATE: {\n","prefixes":["v2","09/16"]}