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: Eric Auger X-Patchwork-Id: 4774821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3F552C0338 for ; Mon, 25 Aug 2014 13:32:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1AA362011E for ; Mon, 25 Aug 2014 13:32:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3DBF2012E for ; Mon, 25 Aug 2014 13:32:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XLuL7-0007rG-Gm; Mon, 25 Aug 2014 13:29:41 +0000 Received: from mail-we0-f170.google.com ([74.125.82.170]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XLuKg-0007Qj-Rs for linux-arm-kernel@lists.infradead.org; Mon, 25 Aug 2014 13:29:15 +0000 Received: by mail-we0-f170.google.com with SMTP id w62so13297659wes.29 for ; Mon, 25 Aug 2014 06:28:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sAzxn4p7xTDZz2RlXfFESih3DPKqLr7RzyP7gTJHroo=; b=d7o2d7zR5UBaOfMOLZa2QnLHDBn+wD3kqY18LpGkL8MYay+TKeAfP71Wtvt1HZlrxL VDwTKfh0Fs0Yi1lmhptewV0ag1QLdI4RIj+D/4WMI76hK2rN6AlRVczMS5pZ7IwSmPjq BOZA1ipgDGV4J/kO/jPsNAPaDLNTdEEoeS73FPFX2gdlSUHxZV/y2t2oY4Sscp4kBA1I UjFwvW6A7QOkEhJLkVoTMXSPc7jaKcZBVAcYo9DrGz+Ie3FkbZrBZCWr7XJ57iFDxrKy tp5pH+/lot8NVUtSOcZS1coI0vCgdzuksJ0KfC0K2NlB7AXuMz11Um5hHuFZupKg4w/0 aPKQ== X-Gm-Message-State: ALoCoQnhJFcZFTM3yn0v+SjlKgV+V8/s935FN8UxYeWWsSmeyqymFsVIGPRVLQPv1PYEr40yQOGl 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140825_062915_067793_139FD82B X-CRM114-Status: GOOD ( 12.06 ) X-Spam-Score: -0.7 (/) Cc: patches@linaro.org, john.liuli@huawei.com, will.deacon@arm.com, a.rigo@virtualopensystems.com, linux-kernel@vger.kernel.org, a.motakis@virtualopensystems.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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,