From patchwork Fri Oct 2 20:19:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Haskins X-Patchwork-Id: 51430 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n92KKgKq025764 for ; Fri, 2 Oct 2009 20:20:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756808AbZJBUTy (ORCPT ); Fri, 2 Oct 2009 16:19:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757931AbZJBUTw (ORCPT ); Fri, 2 Oct 2009 16:19:52 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:45117 "EHLO victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756808AbZJBUTu (ORCPT ); Fri, 2 Oct 2009 16:19:50 -0400 Received: from dev.haskins.net (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by victor.provo.novell.com with ESMTP (TLS encrypted); Fri, 02 Oct 2009 14:19:39 -0600 Received: from dev.haskins.net (localhost [127.0.0.1]) by dev.haskins.net (Postfix) with ESMTP id 252EF4641EB; Fri, 2 Oct 2009 16:19:38 -0400 (EDT) From: Gregory Haskins Subject: [PATCH v2 4/4] KVM: add scatterlist support to xinterface To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, ghaskins@novell.com Date: Fri, 02 Oct 2009 16:19:38 -0400 Message-ID: <20091002201937.4014.96148.stgit@dev.haskins.net> In-Reply-To: <20091002201159.4014.33268.stgit@dev.haskins.net> References: <20091002201159.4014.33268.stgit@dev.haskins.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/include/linux/kvm_xinterface.h b/include/linux/kvm_xinterface.h index 684b6f8..eefb575 100644 --- a/include/linux/kvm_xinterface.h +++ b/include/linux/kvm_xinterface.h @@ -9,6 +9,7 @@ #include #include #include +#include struct kvm_xinterface; struct kvm_xvmap; @@ -36,6 +37,9 @@ struct kvm_xinterface_ops { u64 addr, unsigned long len, unsigned long flags); + unsigned long (*sgmap)(struct kvm_xinterface *intf, + struct scatterlist *sgl, int nents, + unsigned long flags); void (*release)(struct kvm_xinterface *); }; diff --git a/virt/kvm/xinterface.c b/virt/kvm/xinterface.c index c356835..16729f6 100644 --- a/virt/kvm/xinterface.c +++ b/virt/kvm/xinterface.c @@ -467,6 +467,77 @@ fail: } +static unsigned long +xinterface_sgmap(struct kvm_xinterface *intf, + struct scatterlist *sgl, int nents, + unsigned long flags) +{ + struct _xinterface *_intf = to_intf(intf); + struct task_struct *p = _intf->task; + struct mm_struct *mm = _intf->mm; + struct kvm *kvm = _intf->kvm; + struct kvm_memory_slot *memslot = NULL; + bool kthread = !current->mm; + int ret; + struct scatterlist *sg; + int i; + + down_read(&kvm->slots_lock); + + if (kthread) + use_mm(_intf->mm); + + for_each_sg(sgl, sg, nents, i) { + unsigned long gpa = sg_dma_address(sg); + unsigned long len = sg_dma_len(sg); + unsigned long gfn = gpa >> PAGE_SHIFT; + off_t offset = offset_in_page(gpa); + unsigned long hva; + struct page *pg; + + /* ensure that we do not have more than one page per entry */ + if ((PAGE_ALIGN(len + offset) >> PAGE_SHIFT) != 1) { + ret = -EINVAL; + break; + } + + /* check for a memslot-cache miss */ + if (!memslot + || gfn < memslot->base_gfn + || gfn >= memslot->base_gfn + memslot->npages) { + memslot = gfn_to_memslot(kvm, gfn); + if (!memslot) { + ret = -EFAULT; + break; + } + } + + hva = (memslot->userspace_addr + + (gfn - memslot->base_gfn) * PAGE_SIZE); + + if (kthread || current->mm == mm) + ret = get_user_pages_fast(hva, 1, 1, &pg); + else + ret = get_user_pages(p, mm, hva, 1, 1, 0, &pg, NULL); + + if (ret != 1) { + if (ret >= 0) + ret = -EFAULT; + break; + } + + sg_set_page(sg, pg, len, offset); + ret = 0; + } + + if (kthread) + unuse_mm(_intf->mm); + + up_read(&kvm->slots_lock); + + return ret; +} + static void xinterface_release(struct kvm_xinterface *intf) { @@ -483,6 +554,7 @@ struct kvm_xinterface_ops _xinterface_ops = { .copy_from = xinterface_copy_from, .vmap = xinterface_vmap, .ioevent = xinterface_ioevent, + .sgmap = xinterface_sgmap, .release = xinterface_release, };