{"id":842661,"url":"http://patchwork.ozlabs.org/api/patches/842661/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-9-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-9-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:08","name":"[v2,08/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_get_mpstate","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d248a2981dacb5871dfe569609923613c13e58cb","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-9-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/842661/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842661/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=\"N4lc+1TZ\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5st1mCbz9t9n\n\tfor ;\n\tThu, 30 Nov 2017 03:42:10 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933766AbdK2QmI (ORCPT );\n\tWed, 29 Nov 2017 11:42:08 -0500","from mail-wr0-f196.google.com ([209.85.128.196]:39696 \"EHLO\n\tmail-wr0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933760AbdK2Qle (ORCPT\n\t); Wed, 29 Nov 2017 11:41:34 -0500","by mail-wr0-f196.google.com with SMTP id a41so2105538wra.6\n\tfor ; Wed, 29 Nov 2017 08:41:33 -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.31\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:32 -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=CZPnP6nGssexHqRuGMm7Nw54fNn3j2sNXvS0KdU9Vuo=;\n\tb=N4lc+1TZ4IuA94W0xVQkItJ9hkWjsMe7X1qFj282paEauSldcq7uwimNtQjdrE8y9A\n\tpk9cxbHmMRTwyMeHEKe1PQlVOSDK6IcKvbMTS6KKfM0t+pt8BT2wg5tzRbH9W2YttYkr\n\tKtepx0k5Am9tnRF0ZU06q/Uvd8j9SPQkA28SI=","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=CZPnP6nGssexHqRuGMm7Nw54fNn3j2sNXvS0KdU9Vuo=;\n\tb=SOwZsbOuADWsuTdSb4Eoci7wM5UCtZ/zrC+1/UjuIVJDhtjzolIdu2//L4RfNFO5eq\n\t4IABUgdu78YQM/4BEQR7Gw5SRP/pfyAZMqtU1KRiHv/35McCSdtgaN8X3mqaeuGtsixB\n\t81s0WOYr9eECRRTyG+bzMh7fuc/T+EFZLfdFZdqi233p/nar9mzN0aiQ+kUp5uBZztad\n\tYEe4On77viNSW1VAH2clMlfQoQsUsTh0o6Q8qov07KYnNqUMYI0+C437Ens/W8a2uA/n\n\t/Au2eZcwM3Ga7gXrKn9Rah5YD/QEjUa7k8CVLNNo3/O1IVZRYvLhBRG5knb8yxpypJSj\n\tXFZQ==","X-Gm-Message-State":"AJaThX51/X4zPo2Y5E1CKPwGuVDjU6q/rZqsOq+9x+qC7vT256JR2uG3\n\tdGtTWZtni6XGN1FiR3pNDbOf3A==","X-Google-Smtp-Source":"AGs4zMZtutc7gal9/VY5Igy84dOd0GGM9MySY12GMSde5kHkdTZl62fPX0BE31Dd0sb0E41oxoQFkQ==","X-Received":"by 10.223.188.81 with SMTP id a17mr2862652wrh.146.1511973692836; \n\tWed, 29 Nov 2017 08:41:32 -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 08/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_get_mpstate","Date":"Wed, 29 Nov 2017 17:41:08 +0100","Message-Id":"<20171129164116.16167-9-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_get_mpstate().\n\nSigned-off-by: Christoffer Dall \n---\n arch/s390/kvm/kvm-s390.c | 11 +++++++++--\n arch/x86/kvm/x86.c | 3 +++\n virt/kvm/arm/arm.c | 3 +++\n virt/kvm/kvm_main.c | 2 --\n 4 files changed, 15 insertions(+), 4 deletions(-)","diff":"diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c\nindex d95b4f1..396fc3d 100644\n--- a/arch/s390/kvm/kvm-s390.c\n+++ b/arch/s390/kvm/kvm-s390.c\n@@ -2836,9 +2836,16 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,\n int kvm_arch_vcpu_ioctl_get_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 \t/* CHECK_STOP and LOAD are not supported yet */\n-\treturn is_vcpu_stopped(vcpu) ? KVM_MP_STATE_STOPPED :\n-\t\t\t\t KVM_MP_STATE_OPERATING;\n+\tret = is_vcpu_stopped(vcpu) ? KVM_MP_STATE_STOPPED :\n+\t\t\t\t KVM_MP_STATE_OPERATING;\n+\n+\tvcpu_put(vcpu);\n+\treturn ret;\n }\n \n int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex a31a80a..9bf62c3 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7440,6 +7440,8 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,\n int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,\n \t\t\t\t struct kvm_mp_state *mp_state)\n {\n+\tvcpu_load(vcpu);\n+\n \tkvm_apic_accept_events(vcpu);\n \tif (vcpu->arch.mp_state == KVM_MP_STATE_HALTED &&\n \t\t\t\t\tvcpu->arch.pv.pv_unhalted)\n@@ -7447,6 +7449,7 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,\n \telse\n \t\tmp_state->mp_state = vcpu->arch.mp_state;\n \n+\tvcpu_put(vcpu);\n \treturn 0;\n }\n \ndiff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c\nindex 1f448b2..a717170 100644\n--- a/virt/kvm/arm/arm.c\n+++ b/virt/kvm/arm/arm.c\n@@ -381,11 +381,14 @@ static void vcpu_power_off(struct kvm_vcpu *vcpu)\n int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,\n \t\t\t\t struct kvm_mp_state *mp_state)\n {\n+\tvcpu_load(vcpu);\n+\n \tif (vcpu->arch.power_off)\n \t\tmp_state->mp_state = KVM_MP_STATE_STOPPED;\n \telse\n \t\tmp_state->mp_state = KVM_MP_STATE_RUNNABLE;\n \n+\tvcpu_put(vcpu);\n \treturn 0;\n }\n \ndiff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c\nindex 19cf2d1..eac3c29 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -2603,9 +2603,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \tcase KVM_GET_MP_STATE: {\n \t\tstruct kvm_mp_state mp_state;\n \n-\t\tvcpu_load(vcpu);\n \t\tr = kvm_arch_vcpu_ioctl_get_mpstate(vcpu, &mp_state);\n-\t\tvcpu_put(vcpu);\n \t\tif (r)\n \t\t\tgoto out;\n \t\tr = -EFAULT;\n","prefixes":["v2","08/16"]}