{"id":842665,"url":"http://patchwork.ozlabs.org/api/patches/842665/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-7-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-7-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:06","name":"[v2,06/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_get_sregs","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b937ed16d845efcfabf7c35c2a47a4f5ff6160b7","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-7-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/842665/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842665/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=\"KNJZx6rO\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5t550k2z9s5L\n\tfor ;\n\tThu, 30 Nov 2017 03:42:21 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933752AbdK2QmS (ORCPT );\n\tWed, 29 Nov 2017 11:42:18 -0500","from mail-wm0-f67.google.com ([74.125.82.67]:39798 \"EHLO\n\tmail-wm0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933751AbdK2Qla (ORCPT\n\t); Wed, 29 Nov 2017 11:41:30 -0500","by mail-wm0-f67.google.com with SMTP id i11so7184695wmf.4\n\tfor ; Wed, 29 Nov 2017 08:41:29 -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.27\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:28 -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=+x7Tj1ma7JNOaL50EYqTseGo42XF3O2SwSjAwDF+Wbw=;\n\tb=KNJZx6rOmR7Ud97yP0Dpurj2gFyehl7NCP/FShf4lpCkACcZF0JnQOFweebKMoIJGs\n\ta5YAQkRGr2sTUVlJS9MakC2iFzQNhMn27gqF5WcNjXhZuKZxx98PLfCSvqjsH8eNKLGS\n\te+kGX8Ln9qat+tW585xuhxUlAKcz0+wt+GQCc=","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=+x7Tj1ma7JNOaL50EYqTseGo42XF3O2SwSjAwDF+Wbw=;\n\tb=tCh7AVss7x49t4X/PO1bVGQ9KUCEEDIMVAhaia4/y+VpU8nx2dPN55wFHk75VhN5rl\n\t9Xlmgd5DUqYNzJQg2elWJ9pUlFHsbK8W3QXbMECcSoDnU+3E5HOsRcycaghx2JCnOLj3\n\t7IH+qqhs9oP2YHzsu2it1QBueCAwYWNh9HciIm18xGdFn9r7IbHi6mLZbFHF+Pm3y/4c\n\tFfqrXHXQoj9U8lfiTVoKTLTgCf30UuLx7l5ngCrIXiNwAcAC25QnUFTlP9NPm4CRUI6f\n\tLN6Zo6nMssuwavWGVs/GCDw3sVc2AGfB5b6Nz2y51Lsqnjkiv0G+mWggYjTvAD8xwG84\n\ts0TQ==","X-Gm-Message-State":"AJaThX41fZ26l39ycU+6TLyZBL7q34yQffYvZDwY70hKku3UC+lC/N+O\n\teFp0YRxfqnTzY3vcgV+rH7WmUA==","X-Google-Smtp-Source":"AGs4zMZcPT1zG/d/V2nEM5C8lXr+7/bDIsyScfv7hwUSlupwMwUoRxR3z52PooLq05QqJlY2iObryA==","X-Received":"by 10.28.63.9 with SMTP id m9mr3184329wma.137.1511973689102;\n\tWed, 29 Nov 2017 08:41:29 -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 06/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_get_sregs","Date":"Wed, 29 Nov 2017 17:41:06 +0100","Message-Id":"<20171129164116.16167-7-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_sregs().\n\nSigned-off-by: Christoffer Dall \n---\n arch/powerpc/kvm/book3s.c | 8 +++++++-\n arch/powerpc/kvm/booke.c | 9 ++++++++-\n arch/s390/kvm/kvm-s390.c | 4 ++++\n arch/x86/kvm/x86.c | 3 +++\n virt/kvm/kvm_main.c | 2 --\n 5 files changed, 22 insertions(+), 4 deletions(-)","diff":"diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c\nindex 24bc7aa..6cc2377 100644\n--- a/arch/powerpc/kvm/book3s.c\n+++ b/arch/powerpc/kvm/book3s.c\n@@ -484,7 +484,13 @@ void kvmppc_subarch_vcpu_uninit(struct kvm_vcpu *vcpu)\n int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,\n \t\t\t\t struct kvm_sregs *sregs)\n {\n-\treturn vcpu->kvm->arch.kvm_ops->get_sregs(vcpu, sregs);\n+\tint ret;\n+\n+\tvcpu_load(vcpu);\n+\tret = vcpu->kvm->arch.kvm_ops->get_sregs(vcpu, sregs);\n+\tvcpu_put(vcpu);\n+\n+\treturn ret;\n }\n \n int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,\ndiff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\nindex bcbbedd..f647e12 100644\n--- a/arch/powerpc/kvm/booke.c\n+++ b/arch/powerpc/kvm/booke.c\n@@ -1613,11 +1613,18 @@ int kvmppc_set_sregs_ivor(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)\n int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,\n struct kvm_sregs *sregs)\n {\n+\tint ret;\n+\n+\tvcpu_load(vcpu);\n+\n \tsregs->pvr = vcpu->arch.pvr;\n \n \tget_sregs_base(vcpu, sregs);\n \tget_sregs_arch206(vcpu, sregs);\n-\treturn vcpu->kvm->arch.kvm_ops->get_sregs(vcpu, sregs);\n+\tret = vcpu->kvm->arch.kvm_ops->get_sregs(vcpu, sregs);\n+\n+\tvcpu_put(vcpu);\n+\treturn ret;\n }\n \n int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,\ndiff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c\nindex e347643..18011fc 100644\n--- a/arch/s390/kvm/kvm-s390.c\n+++ b/arch/s390/kvm/kvm-s390.c\n@@ -2737,8 +2737,12 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,\n int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,\n \t\t\t\t struct kvm_sregs *sregs)\n {\n+\tvcpu_load(vcpu);\n+\n \tmemcpy(&sregs->acrs, &vcpu->run->s.regs.acrs, sizeof(sregs->acrs));\n \tmemcpy(&sregs->crs, &vcpu->arch.sie_block->gcr, sizeof(sregs->crs));\n+\n+\tvcpu_put(vcpu);\n \treturn 0;\n }\n \ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex 75eacce..20a5f67 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7400,6 +7400,8 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,\n {\n \tstruct desc_ptr dt;\n \n+\tvcpu_load(vcpu);\n+\n \tkvm_get_segment(vcpu, &sregs->cs, VCPU_SREG_CS);\n \tkvm_get_segment(vcpu, &sregs->ds, VCPU_SREG_DS);\n \tkvm_get_segment(vcpu, &sregs->es, VCPU_SREG_ES);\n@@ -7431,6 +7433,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,\n \t\tset_bit(vcpu->arch.interrupt.nr,\n \t\t\t(unsigned long *)sregs->interrupt_bitmap);\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 963e249..779c03e 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -2581,9 +2581,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t\tr = -ENOMEM;\n \t\tif (!kvm_sregs)\n \t\t\tgoto out;\n-\t\tvcpu_load(vcpu);\n \t\tr = kvm_arch_vcpu_ioctl_get_sregs(vcpu, kvm_sregs);\n-\t\tvcpu_put(vcpu);\n \t\tif (r)\n \t\t\tgoto out;\n \t\tr = -EFAULT;\n","prefixes":["v2","06/16"]}