{"id":842652,"url":"http://patchwork.ozlabs.org/api/patches/842652/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-2-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-2-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:01","name":"[v2,01/16] KVM: Take vcpu->mutex outside vcpu_load","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5706ff521a6474b2810355a26435d09f72ed7fd6","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-2-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/842652/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842652/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=\"AqMhwxFB\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5s544CKz9t3w\n\tfor ;\n\tThu, 30 Nov 2017 03:41:29 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933745AbdK2Ql1 (ORCPT );\n\tWed, 29 Nov 2017 11:41:27 -0500","from mail-wr0-f196.google.com ([209.85.128.196]:36251 \"EHLO\n\tmail-wr0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933508AbdK2QlV (ORCPT\n\t); Wed, 29 Nov 2017 11:41:21 -0500","by mail-wr0-f196.google.com with SMTP id v105so3976421wrc.3\n\tfor ; Wed, 29 Nov 2017 08:41:21 -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.19\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:19 -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=cE3UQ+UGCvUHsFL/BgBxgkgcOiwL2R9NJZGc0t11Z2w=;\n\tb=AqMhwxFBkfNqWSd5/g6l9DvYyox2n6JuCe8u8RdJ6XYxr0Q96aosH8Z+/+NN8EAOBg\n\tR36PCzCV62AWWpy+hcgsqfRT4JpgezvkxIJTSAPr1KUQ3b7HTaXKmck1DiFZb1mui1S3\n\t6HWq1yqRXUxOmsC7N3XTdiUP3fZQLDGhNuEXs=","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=cE3UQ+UGCvUHsFL/BgBxgkgcOiwL2R9NJZGc0t11Z2w=;\n\tb=luNus6j1kXCWuPFVcrA1Aje/iGaVUe9mRQTcAl4XXV1TdlNLvShlSfXDlqZSXai4Ra\n\tCHzdGqMGsJTh8ACkN7+j2dM0ctQrJqTK6dpQ8qMnprssECdRogXCSmSrJzv2Y2a76DgO\n\tna11af9muWk8CZAMauL/Opxp7Bo5JzW7tmIUcViRtOdnFFVQNFboDj7grpf9G24enF3W\n\tR8cpgG7u2G6X2PdCKFFhxiYutIul4UVH92As+Dsb674kEm35IPwy6riJdSO2LxpEfdlm\n\tBjKV+ulOTqw6XFbNA5T6aUi0L2XGjKR+hQVKvmIgqbi/tethxF8QuJ6YNBhHBUe1XZ1y\n\teJTA==","X-Gm-Message-State":"AJaThX5Rw42YyZOLT149JenthfntF5UrWI0zr80jETQlmHaoe7+v48y7\n\tArAQInjA/DOxbrhGT6PLYMM+WA==","X-Google-Smtp-Source":"AGs4zMYi76geJnkazaBOWek0hLM6WBzETAAUX4Ed3Q2VPOiGBOz+9FWqaWbqwa8Gvi5D0Db+W4Osdg==","X-Received":"by 10.223.170.143 with SMTP id h15mr3236747wrc.49.1511973680629; \n\tWed, 29 Nov 2017 08:41:20 -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 01/16] KVM: Take vcpu->mutex outside vcpu_load","Date":"Wed, 29 Nov 2017 17:41:01 +0100","Message-Id":"<20171129164116.16167-2-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":"As we're about to call vcpu_load() from architecture-specific\nimplementations of the KVM vcpu ioctls, but yet we access data\nstructures protected by the vcpu->mutex in the generic code, factor\nthis logic out from vcpu_load().\n\nSigned-off-by: Christoffer Dall \n---\n arch/x86/kvm/vmx.c | 4 +---\n arch/x86/kvm/x86.c | 20 +++++++-------------\n include/linux/kvm_host.h | 2 +-\n virt/kvm/kvm_main.c | 17 ++++++-----------\n 4 files changed, 15 insertions(+), 28 deletions(-)","diff":"diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c\nindex 714a067..e7c46d2 100644\n--- a/arch/x86/kvm/vmx.c\n+++ b/arch/x86/kvm/vmx.c\n@@ -9559,10 +9559,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)\n static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu)\n {\n struct vcpu_vmx *vmx = to_vmx(vcpu);\n- int r;\n \n- r = vcpu_load(vcpu);\n- BUG_ON(r);\n+ vcpu_load(vcpu);\n vmx_switch_vmcs(vcpu, &vmx->vmcs01);\n free_nested(vmx);\n vcpu_put(vcpu);\ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex 34c85aa..9b8f864 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7747,16 +7747,12 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,\n \n int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)\n {\n-\tint r;\n-\n \tkvm_vcpu_mtrr_init(vcpu);\n-\tr = vcpu_load(vcpu);\n-\tif (r)\n-\t\treturn r;\n+\tvcpu_load(vcpu);\n \tkvm_vcpu_reset(vcpu, false);\n \tkvm_mmu_setup(vcpu);\n \tvcpu_put(vcpu);\n-\treturn r;\n+\treturn 0;\n }\n \n void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)\n@@ -7766,13 +7762,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)\n \n \tkvm_hv_vcpu_postcreate(vcpu);\n \n-\tif (vcpu_load(vcpu))\n+\tif (mutex_lock_killable(&vcpu->mutex))\n \t\treturn;\n+\tvcpu_load(vcpu);\n \tmsr.data = 0x0;\n \tmsr.index = MSR_IA32_TSC;\n \tmsr.host_initiated = true;\n \tkvm_write_tsc(vcpu, &msr);\n \tvcpu_put(vcpu);\n+\tmutex_unlock(&vcpu->mutex);\n \n \tif (!kvmclock_periodic_sync)\n \t\treturn;\n@@ -7783,11 +7781,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)\n \n void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)\n {\n-\tint r;\n \tvcpu->arch.apf.msr_val = 0;\n \n-\tr = vcpu_load(vcpu);\n-\tBUG_ON(r);\n+\tvcpu_load(vcpu);\n \tkvm_mmu_unload(vcpu);\n \tvcpu_put(vcpu);\n \n@@ -8155,9 +8151,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)\n \n static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)\n {\n-\tint r;\n-\tr = vcpu_load(vcpu);\n-\tBUG_ON(r);\n+\tvcpu_load(vcpu);\n \tkvm_mmu_unload(vcpu);\n \tvcpu_put(vcpu);\n }\ndiff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h\nindex 2e754b7..a000dd8 100644\n--- a/include/linux/kvm_host.h\n+++ b/include/linux/kvm_host.h\n@@ -533,7 +533,7 @@ static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu)\n int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id);\n void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);\n \n-int __must_check vcpu_load(struct kvm_vcpu *vcpu);\n+void vcpu_load(struct kvm_vcpu *vcpu);\n void vcpu_put(struct kvm_vcpu *vcpu);\n \n #ifdef __KVM_HAVE_IOAPIC\ndiff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c\nindex f169ecc..39961fb 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -146,17 +146,12 @@ bool kvm_is_reserved_pfn(kvm_pfn_t pfn)\n /*\n * Switches to specified vcpu, until a matching vcpu_put()\n */\n-int vcpu_load(struct kvm_vcpu *vcpu)\n+void vcpu_load(struct kvm_vcpu *vcpu)\n {\n-\tint cpu;\n-\n-\tif (mutex_lock_killable(&vcpu->mutex))\n-\t\treturn -EINTR;\n-\tcpu = get_cpu();\n+\tint cpu = get_cpu();\n \tpreempt_notifier_register(&vcpu->preempt_notifier);\n \tkvm_arch_vcpu_load(vcpu, cpu);\n \tput_cpu();\n-\treturn 0;\n }\n EXPORT_SYMBOL_GPL(vcpu_load);\n \n@@ -166,7 +161,6 @@ void vcpu_put(struct kvm_vcpu *vcpu)\n \tkvm_arch_vcpu_put(vcpu);\n \tpreempt_notifier_unregister(&vcpu->preempt_notifier);\n \tpreempt_enable();\n-\tmutex_unlock(&vcpu->mutex);\n }\n EXPORT_SYMBOL_GPL(vcpu_put);\n \n@@ -2529,9 +2523,9 @@ static long kvm_vcpu_ioctl(struct file *filp,\n #endif\n \n \n-\tr = vcpu_load(vcpu);\n-\tif (r)\n-\t\treturn r;\n+\tif (mutex_lock_killable(&vcpu->mutex))\n+\t\treturn -EINTR;\n+\tvcpu_load(vcpu);\n \tswitch (ioctl) {\n \tcase KVM_RUN: {\n \t\tstruct pid *oldpid;\n@@ -2704,6 +2698,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t}\n out:\n \tvcpu_put(vcpu);\n+\tmutex_unlock(&vcpu->mutex);\n \tkfree(fpu);\n \tkfree(kvm_sregs);\n \treturn r;\n","prefixes":["v2","01/16"]}