From patchwork Tue Jan 26 13:12:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 8121761 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0FD629F818 for ; Tue, 26 Jan 2016 13:16:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 38FEE2020F for ; Tue, 26 Jan 2016 13:16:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D9B6A20256 for ; Tue, 26 Jan 2016 13:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965828AbcAZNQY (ORCPT ); Tue, 26 Jan 2016 08:16:24 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:34601 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965726AbcAZNNc (ORCPT ); Tue, 26 Jan 2016 08:13:32 -0500 Received: by mail-wm0-f44.google.com with SMTP id u188so105678785wmu.1 for ; Tue, 26 Jan 2016 05:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PjMEHhTlHqm0y6zEGcNQ9fL0DqWYPq1dF2MIwZvU9r4=; b=ZkuST9omE+ZYo7lBtCukvI2fayhuVo0+An8wk0fXwYRaWdPgu0eylb2H4OW1Xs7pHV 1bAi0qhZmO0CL9sidEtnAHEIE+FhEYtb2S1w9MopTGKYoiv8wGu4GiiTOFjHBlTMxrfz h0wPGnREZCKFA9JQNWzodimcDlX7/BD2FRZtQ= 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=PjMEHhTlHqm0y6zEGcNQ9fL0DqWYPq1dF2MIwZvU9r4=; b=UjUwKFeb6z78Jl3pYYX74S+QZHEb3XYnRmQjNyB5UHcaiQXMilOld7PsBDw7EGrBm0 vRoTm/+Y2Mwhqxcxt7QVDdKHZewqlXRJCyNA/rfl1RYaIzvgORL8U36CFGps/8uhUCXj x5vEUh0h78P1k+bXg6Y/huFHY98joiCfSk6PWwo4HxSR+u+4hqSS0uQkDMZxcsdRKa6C /x8KyI/OGffa6RpN7bSNov9RFw4Ama8k76fKmFr/gJGyuWUKcw5/ofPJO4SRPg7x6Jsi +9JsRMidcJ9c56CiU8FiAZaXBJevEkaJplBc+U/cs5rNRR86NqjiE+JyrjkY00UUdhHV Qajg== X-Gm-Message-State: AG10YOQA9Y7h5Awn2Ftt76vnRDbRew2Na+G13vqfj31N9TbcN0a/6nuUmhXDZI/OlqwyYcXX X-Received: by 10.28.232.221 with SMTP id f90mr23219797wmi.60.1453814010934; Tue, 26 Jan 2016 05:13:30 -0800 (PST) Received: from localhost.localdomain (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id ct2sm1388885wjb.46.2016.01.26.05.13.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jan 2016 05:13:29 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, alex.williamson@redhat.com, will.deacon@arm.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, suravee.suthikulpanit@amd.com, linux-kernel@vger.kernel.org, patches@linaro.org, iommu@lists.linux-foundation.org Subject: [PATCH 04/10] vfio: introduce VFIO_IOVA_RESERVED vfio_dma type Date: Tue, 26 Jan 2016 13:12:42 +0000 Message-Id: <1453813968-2024-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453813968-2024-1-git-send-email-eric.auger@linaro.org> References: <1453813968-2024-1-git-send-email-eric.auger@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 We introduce a vfio_dma type since we will need to discriminate legacy vfio_dma's from new reserved ones. Since those latter are not mapped at registration, some handlings must be unplugged: removal, replay. They will be enhanced later on. Signed-off-by: Eric Auger --- drivers/vfio/vfio_iommu_type1.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 32438d9..33a9ce4 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -53,6 +53,15 @@ module_param_named(disable_hugepages, MODULE_PARM_DESC(disable_hugepages, "Disable VFIO IOMMU support for IOMMU hugepages."); +enum vfio_iova_type { + VFIO_IOVA_USER = 0, /* standard IOVA used to map user vaddr */ + /* + * IOVA reserved to map special host physical addresses, + * MSI frames for instance + */ + VFIO_IOVA_RESERVED, +}; + struct vfio_iommu { struct list_head domain_list; struct mutex lock; @@ -78,6 +87,7 @@ struct vfio_dma { unsigned long vaddr; /* Process virtual addr */ size_t size; /* Map size (bytes) */ int prot; /* IOMMU_READ/WRITE */ + enum vfio_iova_type type; /* type of IOVA */ }; struct vfio_reserved_binding { @@ -480,7 +490,8 @@ static void vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma) static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma) { - vfio_unmap_unpin(iommu, dma); + if (likely(dma->type != VFIO_IOVA_RESERVED)) + vfio_unmap_unpin(iommu, dma); vfio_unlink_dma(iommu, dma); kfree(dma); } @@ -756,6 +767,10 @@ static int vfio_iommu_replay(struct vfio_iommu *iommu, dma_addr_t iova; dma = rb_entry(n, struct vfio_dma, node); + + if (unlikely(dma->type == VFIO_IOVA_RESERVED)) + continue; + iova = dma->iova; while (iova < dma->iova + dma->size) {