From patchwork Wed Aug 7 08:21:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 265398 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AC96B2C0220 for ; Wed, 7 Aug 2013 18:27:05 +1000 (EST) Received: from localhost ([::1]:41817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6z5D-0001cI-Sc for incoming@patchwork.ozlabs.org; Wed, 07 Aug 2013 04:27:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6z16-0003Ia-QF for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:22:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6z10-0007Z3-L9 for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:22:48 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:51930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6z10-0007Yt-EU for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:22:42 -0400 Received: by mail-pd0-f173.google.com with SMTP id p11so1136132pdj.32 for ; Wed, 07 Aug 2013 01:22:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IgGtx6MpFsL1WZXXAOYOoJF+QXWCJq9MGjsIYr4Rhxs=; b=gE9gbmyP/hTAQ7wD4oNz3vQK3csJqIa8DWakl7ucRzcz5VxYcjulpSIF9MQ/obW8Os zDSj4HH9gAxswIpKitW7PnMeSk22mBmXcy8kAqia/F/bNeQk/vO+830psRmc2P8iNnxd 3AZ8yzWdrReq7nLm4mdj54YE+iyPxnqbVNuNrRgV/vEa01PJBtzLyahxYkmRBZblhWCH wW162gA+B5xwZMqOMfDi9xCEZ5iBytomppSzJCQkj7WsuMs/nWC08X1gkSRTj1HoFrsQ kcyBHvXh8S7AJ4XyCEwPPg+iIZYq47SsQqzK0gf75V0Hr2EIUM9/zv1rQBvP6L6u5JFB Nf+g== X-Gm-Message-State: ALoCoQmDwMMjG5+2ldIUG+BlhSw+xRv9l1LasBnX0vTmT8RgFuxPXjhasn/mkpLWw9S7UGSzP9Ss X-Received: by 10.66.121.234 with SMTP id ln10mr3158165pab.20.1375863761709; Wed, 07 Aug 2013 01:22:41 -0700 (PDT) Received: from ka1.ozlabs.ibm.com (ibmaus65.lnk.telstra.net. [165.228.126.9]) by mx.google.com with ESMTPSA id 7sm8957160paf.22.2013.08.07.01.22.33 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Aug 2013 01:22:36 -0700 (PDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Wed, 7 Aug 2013 18:21:32 +1000 Message-Id: <1375863692-12207-9-git-send-email-aik@ozlabs.ru> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1375863692-12207-1-git-send-email-aik@ozlabs.ru> References: <1375863692-12207-1-git-send-email-aik@ozlabs.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.173 Cc: Anthony Liguori , "Michael S . Tsirkin" , Alexey Kardashevskiy , Alexander Graf , Alex Williamson , qemu-ppc@nongnu.org, Paolo Bonzini , Paul Mackerras , David Gibson Subject: [Qemu-devel] [PATCH 8/8] spapr vfio: enable for spapr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This turns the sPAPR support on and enables VFIO container use in the kernel. Signed-off-by: Alexey Kardashevskiy --- hw/misc/vfio.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 4571f64..4484826 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2812,6 +2812,37 @@ static int vfio_connect_container(VFIOGroup *group, VFIOAddressSpace *space) memory_listener_register(&container->iommu_data.listener, container->space->as); + } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) { + ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd); + if (ret) { + error_report("vfio: failed to set group container: %m"); + g_free(container); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_SPAPR_TCE_IOMMU); + if (ret) { + error_report("vfio: failed to set iommu for container: %m"); + g_free(container); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_IOMMU_ENABLE); + if (ret) { + error_report("vfio: failed to enable container: %s", + strerror(errno)); + g_free(container); + close(fd); + return -errno; + } + + container->iommu_data.listener = vfio_memory_listener; + container->iommu_data.release = vfio_listener_release; + + memory_listener_register(&container->iommu_data.listener, + container->space->as); } else { error_report("vfio: No available IOMMU models"); g_free(container);