From patchwork Thu Mar 19 14:55:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 46037 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6690121515 for ; Thu, 19 Mar 2015 14:58:28 +0000 (UTC) Received: by wivz2 with SMTP id z2sf13375670wiv.1 for ; Thu, 19 Mar 2015 07:58:27 -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=TFTeTSWLFJOPcbcAPNmAOiS1JPmGla+wK3UtVI1sZ34=; b=X68sLMBN/DjSvnP7CebXbh8nXGiR/EafmUUX0uUuXDllWVO1fXp2zXFSi+Qb0L4ad1 lmFf2uMIjtDQxerWIovghF30W6DyqdKA7XjmJK3eAlErrG3A/pS7GpbFIoLjsX8qbsoa DApEYVFV+CeWAQ747OOALscPSaxFGgqoPn0Ir50YTVh6rVW/f/B2Oqh88QGIT8hbYhbq FzpJMA6x87q3lXTm5RN6MHJt8g8sNjZil7qVaq20pLe/t9j1DADDdtFjRX7v08ivifT+ TU0/mYJTf6XxEsIhw8y1TixkYd2WjwuVMV2YhqMTVVJQVCtJ7w+/D5AouOs8dU8jObWU IQjA== X-Gm-Message-State: ALoCoQk0s8nVVJabxpo5zCOPzzl9Vn44V2aQE6aNN9nAU6WC3Va2ZoeZq67tIYd6EPpjTGLFC6pf X-Received: by 10.194.178.67 with SMTP id cw3mr7824121wjc.2.1426777107750; Thu, 19 Mar 2015 07:58:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.227 with SMTP id b3ls256133lak.58.gmail; Thu, 19 Mar 2015 07:58:27 -0700 (PDT) X-Received: by 10.152.44.137 with SMTP id e9mr68365321lam.87.1426777107329; Thu, 19 Mar 2015 07:58:27 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id n1si1200586lbc.29.2015.03.19.07.58.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 07:58:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lamx15 with SMTP id x15so64443145lam.3 for ; Thu, 19 Mar 2015 07:58:27 -0700 (PDT) X-Received: by 10.152.29.68 with SMTP id i4mr19595601lah.19.1426777107252; Thu, 19 Mar 2015 07:58:27 -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.112.35.133 with SMTP id h5csp441322lbj; Thu, 19 Mar 2015 07:58:26 -0700 (PDT) X-Received: by 10.180.97.106 with SMTP id dz10mr16885816wib.33.1426777106574; Thu, 19 Mar 2015 07:58:26 -0700 (PDT) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com. [74.125.82.181]) by mx.google.com with ESMTPS id 16si2602442wjs.171.2015.03.19.07.58.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 07:58:26 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.181 as permitted sender) client-ip=74.125.82.181; Received: by webcq43 with SMTP id cq43so59517768web.2 for ; Thu, 19 Mar 2015 07:58:26 -0700 (PDT) X-Received: by 10.180.83.195 with SMTP id s3mr17520434wiy.54.1426777106200; Thu, 19 Mar 2015 07:58:26 -0700 (PDT) Received: from gnx2579.gnb.st.com (weg38-3-78-232-41-119.fbx.proxad.net. [78.232.41.119]) by mx.google.com with ESMTPSA id a6sm1695350wiy.17.2015.03.19.07.58.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Mar 2015 07:58:25 -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, kvm@vger.kernel.org, alex.williamson@redhat.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org, pbonzini@redhat.com, kim.phillips@freescale.com, b.reynal@virtualopensystems.com, feng.wu@intel.com, Kim Phillips Subject: [RFC v5 01/13] KVM: arm/arm64: Enable the KVM-VFIO device Date: Thu, 19 Mar 2015 15:55:39 +0100 Message-Id: <1426776951-24901-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426776951-24901-1-git-send-email-eric.auger@linaro.org> References: <1426776951-24901-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.215.53 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: , From: Kim Phillips The KVM-VFIO device is used by the QEMU VFIO device. It is used to record the list of in-use VFIO groups so that KVM can manipulate them. With this series, it will also be used to record the forwarded IRQs. Signed-off-by: Kim Phillips Signed-off-by: Eric Auger --- v4 -> v5: - reword the commit message to explain both usages of the KVM-VFIO device in QEMU - squash both arm and arm64 enables --- arch/arm/kvm/Kconfig | 1 + arch/arm/kvm/Makefile | 2 +- arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/Makefile | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index f1f79d1..bfb915d 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -28,6 +28,7 @@ config KVM select KVM_GENERIC_DIRTYLOG_READ_PROTECT select SRCU select MMU_NOTIFIER + select KVM_VFIO select HAVE_KVM_EVENTFD select HAVE_KVM_IRQFD depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile index a093bf1..a4dbb97 100644 --- a/arch/arm/kvm/Makefile +++ b/arch/arm/kvm/Makefile @@ -15,7 +15,7 @@ AFLAGS_init.o := -Wa,-march=armv7-a$(plus_virt) AFLAGS_interrupts.o := -Wa,-march=armv7-a$(plus_virt) KVM := ../../../virt/kvm -kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o +kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o obj-y += kvm-arm.o init.o interrupts.o obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 5105e29..bfffe8f 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -28,6 +28,7 @@ config KVM select KVM_ARM_HOST select KVM_GENERIC_DIRTYLOG_READ_PROTECT select SRCU + select KVM_VFIO select HAVE_KVM_EVENTFD select HAVE_KVM_IRQFD ---help--- diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index b22c636..7104ca1 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -11,7 +11,7 @@ ARM=../../../arch/arm/kvm obj-$(CONFIG_KVM_ARM_HOST) += kvm.o -kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o +kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/arm.o $(ARM)/mmu.o $(ARM)/mmio.o kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o