From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934905AbcLMTdY (ORCPT ); Tue, 13 Dec 2016 14:33:24 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:36102 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933857AbcLMTbI (ORCPT ); Tue, 13 Dec 2016 14:31:08 -0500 MIME-Version: 1.0 X-Originating-IP: [2a02:168:56b5:0:ac27:b86c:7764:9429] In-Reply-To: <20161213092344.nbxshhrri5y7u5bd@zhen-hp.sh.intel.com> References: <20161213092344.nbxshhrri5y7u5bd@zhen-hp.sh.intel.com> From: Daniel Vetter Date: Tue, 13 Dec 2016 20:31:04 +0100 X-Google-Sender-Auth: ZyyL7uBORlWD-e5GykyJA-xoaYU Message-ID: Subject: Fwd: kvmgt-vfio-mdev-for-v4.10 pull request content To: Linus Torvalds , Dave Airlie Cc: intel-gfx , dri-devel , Linux Kernel Mailing List Content-Type: multipart/mixed; boundary=94eb2c05665cec2c8a05438f427e Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --94eb2c05665cec2c8a05438f427e Content-Type: text/plain; charset=UTF-8 Hi Linus, Below is the gvt pull request from Zhenyu, now that the vfio stuff has landed. I figured no point in passing this all through the various trees especially since Dave is kinda in vacation mode anyway. But I did a local test pull and looked all reasonable to me. Diffstat and summary is wrong ofc (includes the vfio stuff), for you it should just be the merge to create the baseline + 3 patches to add the gvt support. I can also regen and do a separate pull if you prefer this. In case Dave isn't around to ack, I discussed this a few weeks back with him and he said it should be ok. I hope that still holds. Cheers, Daniel ---------- Forwarded message ---------- From: Zhenyu Wang Date: Tue, Dec 13, 2016 at 10:23 AM Subject: kvmgt-vfio-mdev-for-v4.10 pull request content To: Daniel Vetter Cc: Daniel Vetter --8<-- The following changes since commit 2cf026ae85c42f253feb9f420d1b4bc99bd5503d: Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-next (2016-12-13 14:29:05 +1000) are available in the git repository at: https://github.com/01org/gvt-linux.git tags/kvmgt-vfio-mdev-for-v4.10 for you to fetch changes up to e1e7bc4b62f43fa25943a96f9a6782a6cc208331: drm/i915/gvt/kvmgt: add vfio/mdev support to KVMGT (2016-12-13 16:56:19 +0800) ---------------------------------------------------------------- kvmgt-vfio-mdev-for-v4.10 This is KVMGT support depending on VFIO/mdev framework. ---------------------------------------------------------------- Cao jin (1): vfio/pci: Drop unnecessary pcibios_err_to_errno() Christophe JAILLET (1): vfio: Fix handling of error returned by 'vfio_group_get_from_dev()' Eric Auger (1): vfio: fix vfio_info_cap_add/shift Jike Song (6): vfio: vfio_register_notifier: classify iommu notifier vfio: support notifier chain in vfio_group kvm: set/clear kvm to/from vfio_group when group add/delete drm/i915/gvt/kvmgt: replace kmalloc() by kzalloc() drm/i915/gvt/kvmgt: read/write GPA via KVM API drm/i915/gvt/kvmgt: add vfio/mdev support to KVMGT Kirti Wankhede (24): vfio: Mediated device Core driver vfio: VFIO based driver for Mediated devices vfio: Rearrange functions to get vfio_group from dev vfio: Common function to increment container_users vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops vfio iommu type1: Update arguments of vfio_lock_acct vfio iommu type1: Update argument of vaddr_get_pfn() vfio iommu type1: Add find_iommu_group() function vfio iommu type1: Add task structure to vfio_dma vfio iommu type1: Add support for mediated devices vfio iommu: Add blocking notifier to notify DMA_UNMAP vfio: Introduce common function to add capabilities vfio_pci: Update vfio_pci to use vfio_info_add_capability() vfio: Introduce vfio_set_irqs_validate_and_prepare() vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() vfio_platform: Updated to use vfio_set_irqs_validate_and_prepare() vfio: Define device_api strings docs: Add Documentation for Mediated devices docs: Sysfs ABI for mediated device framework docs: Sample driver to demonstrate how to use Mediated device framework. MAINTAINERS: Add entry VFIO based Mediated device drivers vfio iommu type1: WARN_ON if notifier block is not unregistered vfio iommu type1: Fix size argument to vfio_find_dma() during DMA UNMAP. vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages Zhenyu Wang (1): Merge Alex's VFIO branch for v4.10-rc1 Documentation/ABI/testing/sysfs-bus-vfio-mdev | 111 ++ Documentation/vfio-mediated-device.txt | 398 +++++++ MAINTAINERS | 9 + drivers/gpu/drm/i915/Kconfig | 1 + drivers/gpu/drm/i915/gvt/Makefile | 2 - drivers/gpu/drm/i915/gvt/gvt.h | 6 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 975 +++++++++++++++- drivers/vfio/Kconfig | 1 + drivers/vfio/Makefile | 1 + drivers/vfio/mdev/Kconfig | 17 + drivers/vfio/mdev/Makefile | 5 + drivers/vfio/mdev/mdev_core.c | 385 +++++++ drivers/vfio/mdev/mdev_driver.c | 119 ++ drivers/vfio/mdev/mdev_private.h | 41 + drivers/vfio/mdev/mdev_sysfs.c | 286 +++++ drivers/vfio/mdev/vfio_mdev.c | 148 +++ drivers/vfio/pci/vfio_pci.c | 83 +- drivers/vfio/pci/vfio_pci_config.c | 10 +- drivers/vfio/platform/vfio_platform_common.c | 31 +- drivers/vfio/vfio.c | 461 +++++++- drivers/vfio/vfio_iommu_type1.c | 885 ++++++++++++--- include/linux/mdev.h | 168 +++ include/linux/vfio.h | 48 +- include/uapi/linux/vfio.h | 10 + samples/vfio-mdev/Makefile | 13 + samples/vfio-mdev/mtty.c | 1503 +++++++++++++++++++++++++ virt/kvm/vfio.c | 18 + 27 files changed, 5409 insertions(+), 326 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-vfio-mdev create mode 100644 Documentation/vfio-mediated-device.txt create mode 100644 drivers/vfio/mdev/Kconfig create mode 100644 drivers/vfio/mdev/Makefile create mode 100644 drivers/vfio/mdev/mdev_core.c create mode 100644 drivers/vfio/mdev/mdev_driver.c create mode 100644 drivers/vfio/mdev/mdev_private.h create mode 100644 drivers/vfio/mdev/mdev_sysfs.c create mode 100644 drivers/vfio/mdev/vfio_mdev.c create mode 100644 include/linux/mdev.h create mode 100644 samples/vfio-mdev/Makefile create mode 100644 samples/vfio-mdev/mtty.c --8<-- -- Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch --94eb2c05665cec2c8a05438f427e Content-Type: application/pgp-signature; name="signature.asc" Content-Disposition: attachment; filename="signature.asc" Content-Transfer-Encoding: base64 X-Attachment-Id: 88dada689958f8e0_0.1 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0NCg0KaUVZRUFSRUNBQVlGQWxoUHZpQUFDZ2tR c1FRYU0wMTRHQ2ROVmdDZmFlSnQ0QjBULzNwTm9vU3N2UzRGSlROcw0KQWZjQW4wOFNWQWFtSmFs N3VIVWNwWGxVMDBLRXRYVTENCj00NmxhDQotLS0tLUVORCBQR1AgU0lHTkFUVVJFLS0tLS0NCg== --94eb2c05665cec2c8a05438f427e--