From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2113C2D0A8 for ; Mon, 28 Sep 2020 19:51:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E3D5206D4 for ; Mon, 28 Sep 2020 19:51:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AAoOB5Ld" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726837AbgI1TvO (ORCPT ); Mon, 28 Sep 2020 15:51:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36956 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726794AbgI1TvG (ORCPT ); Mon, 28 Sep 2020 15:51:06 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601322665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9rpNQECxq6OYIaEZqaz3igYOs9tEZIiIEI3FKsWeIfs=; b=AAoOB5LdGtGtvRP/FktG4azXkjKS2L8boduHG1h8QHAr38fAerYUzczLZAbKHXr6GzEUzh rW0bjbJFPSLpVKdARHj6n0ZRNI55SdzawJGzY4f3TNJCllfWb4oB1SfACycn4uKLcSoSR6 nDt14VuG2ulPA1LtAdpKQZX7rqtihy4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-303-cgWx4KvVPziMpn0Moj7cwg-1; Mon, 28 Sep 2020 15:51:03 -0400 X-MC-Unique: cgWx4KvVPziMpn0Moj7cwg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CB0E11868420; Mon, 28 Sep 2020 19:51:01 +0000 (UTC) Received: from laptop.redhat.com (ovpn-113-210.ams2.redhat.com [10.36.113.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D4BA7366D; Mon, 28 Sep 2020 19:50:58 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, joro@8bytes.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, will.deacon@arm.com, robin.murphy@arm.com, dwmw2@infradead.org, alex.williamson@redhat.com Cc: baolu.lu@linux.intel.com, shameerali.kolothum.thodi@huawei.com, jean-philippe.brucker@arm.com Subject: [RFC 2/3] iommu: Account for dma_mask and iommu aperture in IOVA reserved regions Date: Mon, 28 Sep 2020 21:50:36 +0200 Message-Id: <20200928195037.22654-3-eric.auger@redhat.com> In-Reply-To: <20200928195037.22654-1-eric.auger@redhat.com> References: <20200928195037.22654-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VFIO currently exposes the usable IOVA regions through the VFIO_IOMMU_GET_INFO ioctl. However it fails to take into account the dma_mask of the devices within the container. The top limit currently is defined by the iommu aperture. So, for instance, if the IOMMU supports up to 48bits, it may give the impression the max IOVA is 48b while a device may have a dma_mask of 42b. So this API cannot really be used to compute the max usable IOVA. This patch removes the IOVA region beyond the dma_mask's. As we start to expose this reserved region in the sysfs file /sys/kernel/iommu_groups//reserved_regions, we also need to expose the IOVA range beyond the IOMMU aperture to handle the case where the dma_mask would have a higher number of bits than the iommu max input address. Those out-of-reach regions get the IOMMU_RESV_RESERVED type. This is a change to the ABI as this reserved region was not yet exposed in sysfs /sys/kernel/iommu_groups//reserved_regions or through the VFIO ioctl. Document that change. Signed-off-by: Eric Auger --- .../ABI/testing/sysfs-kernel-iommu_groups | 7 ++++ drivers/iommu/iommu.c | 39 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-kernel-iommu_groups b/Documentation/ABI/testing/sysfs-kernel-iommu_groups index 017f5bc3920c..2f316686c88b 100644 --- a/Documentation/ABI/testing/sysfs-kernel-iommu_groups +++ b/Documentation/ABI/testing/sysfs-kernel-iommu_groups @@ -33,3 +33,10 @@ Description: In case an RMRR is used only by graphics or USB devices it is now exposed as "direct-relaxable" instead of "direct". In device assignment use case, for instance, those RMRR are considered to be relaxable and safe. + +What: /sys/kernel/iommu_groups/reserved_regions +Date: Sept 2020 +KernelVersion: v5.11 +Contact: Eric Auger +Description: Regions beyond the device dma_mask and the iommu aperture + now are exposed as IOMMU_RESV_RESERVED reserved regions. diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index dd8cda340e62..d797f07b3625 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2511,9 +2511,48 @@ EXPORT_SYMBOL_GPL(iommu_domain_set_attr); void iommu_get_resv_regions(struct device *dev, struct list_head *list) { const struct iommu_ops *ops = dev->bus->iommu_ops; + struct iommu_resv_region *region; + struct iommu_domain *domain; + + domain = iommu_get_domain_for_dev(dev); + + if (domain) { + struct iommu_domain_geometry geo; + + if (iommu_domain_get_attr(domain, DOMAIN_ATTR_GEOMETRY, &geo)) + return; + + if (geo.aperture_end < ULLONG_MAX && geo.aperture_end != geo.aperture_start) { + region = iommu_alloc_resv_region(geo.aperture_end + 1, + ULLONG_MAX - geo.aperture_end, + 0, IOMMU_RESV_RESERVED); + if (!region) + return; + list_add_tail(®ion->list, list); + } + + if (geo.aperture_start > 0) { + region = iommu_alloc_resv_region(0, geo.aperture_start, + 0, IOMMU_RESV_RESERVED); + if (!region) + return; + list_add_tail(®ion->list, list); + } + } if (ops && ops->get_resv_regions) ops->get_resv_regions(dev, list); + + if (!dev->dma_mask || *dev->dma_mask == ULLONG_MAX) + return; + + region = iommu_alloc_resv_region(*dev->dma_mask + 1, + ULLONG_MAX - *dev->dma_mask, + 0, IOMMU_RESV_RESERVED); + if (!region) + return; + + list_add_tail(®ion->list, list); } void iommu_put_resv_regions(struct device *dev, struct list_head *list) -- 2.21.3