From patchwork Mon Aug 25 13:27:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 35916 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E56EF20565 for ; Mon, 25 Aug 2014 13:28:55 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id v10sf103973976pde.2 for ; Mon, 25 Aug 2014 06:28:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=sAzxn4p7xTDZz2RlXfFESih3DPKqLr7RzyP7gTJHroo=; b=W3QKY5+YYQ0e9C57OigyOVN+wnBJ5f7/HHINitgGEkxYmtVlwbXaE/ZbgiUO6rT/03 Widx8iIDCQT4LP0MxQMlA7hjLnkTx1OU2K9PsMbM+U19yhh3STUhk0tf6GaAiA1zOQMQ jekMgyOx0jI+6GSSgphWT32Ms3s3QlkaRQc0pFXq0udJO8sAqXOagQysL/8X5aeFQxEo W0mX4BI2NsjhxZq6tti54SSydOdBFTTRiGtB2uzgHZBW4jKvMNbijSeBYur7x62X0xqx UD/wJeLDUIW3ru0PhOYOnsY3rcUM4jtApes/SDQJ5LL+cRhi+BDtIJR56QbDsL90qmAn LwFA== X-Gm-Message-State: ALoCoQnIebAX6mzB0ZT/ZG2nxLH+mVLEKAlC2gMm1y8Ue+FOrYgSrlU+ujHaFYU1QNpbwE7z1GGR X-Received: by 10.66.216.233 with SMTP id ot9mr14364640pac.38.1408973333609; Mon, 25 Aug 2014 06:28:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.33.246 with SMTP id j109ls2064950qgj.83.gmail; Mon, 25 Aug 2014 06:28:53 -0700 (PDT) X-Received: by 10.220.196.147 with SMTP id eg19mr5485924vcb.60.1408973333405; Mon, 25 Aug 2014 06:28:53 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id q14si15142591vds.103.2014.08.25.06.28.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 06:28:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so15054013vcb.36 for ; Mon, 25 Aug 2014 06:28:53 -0700 (PDT) X-Received: by 10.221.62.195 with SMTP id xb3mr5641941vcb.45.1408973333336; Mon, 25 Aug 2014 06:28:53 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp117332vcb; Mon, 25 Aug 2014 06:28:52 -0700 (PDT) X-Received: by 10.180.108.147 with SMTP id hk19mr15251320wib.4.1408973332242; Mon, 25 Aug 2014 06:28:52 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id u12si329637wiv.33.2014.08.25.06.28.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 06:28:52 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.50 as permitted sender) client-ip=74.125.82.50; Received: by mail-wg0-f50.google.com with SMTP id n12so13298766wgh.9 for ; Mon, 25 Aug 2014 06:28:51 -0700 (PDT) X-Received: by 10.194.62.104 with SMTP id x8mr23393414wjr.7.1408973331742; Mon, 25 Aug 2014 06:28:51 -0700 (PDT) Received: from gnx2579.gnb.st.com (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id co6sm100101595wjb.31.2014.08.25.06.28.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 06:28:51 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, alex.williamson@redhat.com, joel.schopp@amd.com, kim.phillips@freescale.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org, will.deacon@arm.com, a.motakis@virtualopensystems.com, a.rigo@virtualopensystems.com, john.liuli@huawei.com Subject: [RFC 7/9] KVM: KVM-VFIO: add new VFIO external API hooks Date: Mon, 25 Aug 2014 15:27:42 +0200 Message-Id: <1408973264-30384-8-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408973264-30384-1-git-send-email-eric.auger@linaro.org> References: <1408973264-30384-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , add functions that implement the gateway to the extended external VFIO API: - kvm_vfio_device_get_external_user - kvm_vfio_device_put_external_user - kvm_vfio_external_get_type - kvm_vfio_external_get_base_device Signed-off-by: Eric Auger --- arch/arm/include/asm/kvm_host.h | 6 ++++ virt/kvm/vfio.c | 62 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 6dfb404..62cbf5b 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -171,6 +171,12 @@ void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte); unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu); int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices); +struct vfio_device; +struct vfio_device *kvm_vfio_device_get_external_user(struct file *filep); +void kvm_vfio_device_put_external_user(struct vfio_device *vdev); +int kvm_vfio_external_get_type(struct vfio_device *vdev); +struct device *kvm_vfio_external_get_base_device(struct vfio_device *vdev); + /* We do not have shadow page tables, hence the empty hooks */ static inline int kvm_age_hva(struct kvm *kvm, unsigned long hva) { diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c index 89d3b75..f1c4e35 100644 --- a/virt/kvm/vfio.c +++ b/virt/kvm/vfio.c @@ -59,6 +59,67 @@ static void kvm_vfio_group_put_external_user(struct vfio_group *vfio_group) symbol_put(vfio_group_put_external_user); } +struct vfio_device *kvm_vfio_device_get_external_user(struct file *filep) +{ + struct vfio_device *vdev; + struct vfio_device *(*fn)(struct file *); + + fn = symbol_get(vfio_device_get_external_user); + if (!fn) + return ERR_PTR(-EINVAL); + + vdev = fn(filep); + + symbol_put(vfio_device_get_external_user); + + return vdev; +} + +void kvm_vfio_device_put_external_user(struct vfio_device *vdev) +{ + void (*fn)(struct vfio_device *); + + fn = symbol_get(vfio_device_put_external_user); + if (!fn) + return; + + fn(vdev); + + symbol_put(vfio_device_put_external_user); +} + +int kvm_vfio_external_get_type(struct vfio_device *vdev) +{ + int (*fn)(struct vfio_device *); + int ret; + + fn = symbol_get(vfio_external_get_type); + if (!fn) + return -EINVAL; + + ret = fn(vdev); + + symbol_put(vfio_external_get_type); + + return ret; +} + +struct device *kvm_vfio_external_get_base_device(struct vfio_device *vdev) +{ + struct device *(*fn)(struct vfio_device *); + struct device *dev; + + fn = symbol_get(vfio_external_get_base_device); + if (!fn) + return NULL; + + dev = fn(vdev); + + symbol_put(vfio_external_get_base_device); + + return dev; +} + static bool kvm_vfio_group_is_coherent(struct vfio_group *vfio_group) { long (*fn)(struct vfio_group *, unsigned long); @@ -277,6 +338,7 @@ static int kvm_vfio_create(struct kvm_device *dev, u32 type) return 0; } + struct kvm_device_ops kvm_vfio_ops = { .name = "kvm-vfio", .create = kvm_vfio_create,