Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp959878imu; Wed, 23 Jan 2019 08:32:39 -0800 (PST) X-Google-Smtp-Source: ALg8bN6tEXZb1Ueg+coWSXFc+TT8rp3MnLPA6diGg88CJtxpXebGEVh3pDYyFmESzQxIXDD+JVH/ X-Received: by 2002:a63:7c6:: with SMTP id 189mr2585647pgh.129.1548261159012; Wed, 23 Jan 2019 08:32:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548261158; cv=none; d=google.com; s=arc-20160816; b=JsUdDR2UZ6UkVZA4jnGg/nEihhDDXpfmeBneXQWkju93OXBFUx70rPKif90OqYTz5h sxUS3Tkfeg7+yOPQO++mxzGfehG76rCqrmAxsG0NssBH36Jkivh+Y0iQOGE/I7MAVXGo 8oZn5o9mkItGgyIe58vYCFOXjx2/J4LDHpF0ol4d2u9boQcfmOXxrnh4wJIn3/7Nuaet YLu9uCSjoZxmwf1IrIPJNXcvlunRbw0QneVr/UI9ydRYg3nM+QUH9qiGNECemhzWnTlf QaU6HQUWrhxQSHztyXHtmBfb0JFxT63auZqqtSYR5XtUInNkwPiafsBUyIh+9grfBHSS dyMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=u1TsdjwMyp2alLpOOfcDM/bIZo2JJERXF5VdwGHep5s=; b=IuJ0k9wOIqOBQc/RWjmJ+dGi5rGrdV/agAH/nR3qCUB/pC4zanLYFT70lYyh3T8iXc AVorJfHimetmlPd+WMBrTF8A3fSm1VT5+e660y/R8WdlkU/1JcD9jEVU7UdZCfqg3Xj7 iwW/is7d2tpBHKR7+ze5AZ2q2xdk8ScazbXrwoQGCyKOk3puwMEd/QVDEsR437ERpAPb d+yeHDoxZPwlqZgsderrhfcCfNYw3NPe2F/oULiP4yrSXgWh8WZszH4HC80y9gChfMuV hDXKOZlCtRSsu/PvAaW5M9GoKWCyNVECpT1LY+61jRzmhGboMTPiRPViqx7llwxA42ox pTXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v7si18652780pgs.304.2019.01.23.08.32.22; Wed, 23 Jan 2019 08:32:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726735AbfAWQaz (ORCPT + 99 others); Wed, 23 Jan 2019 11:30:55 -0500 Received: from 8bytes.org ([81.169.241.247]:59214 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726178AbfAWQax (ORCPT ); Wed, 23 Jan 2019 11:30:53 -0500 Received: by theia.8bytes.org (Postfix, from userid 1000) id A3193451; Wed, 23 Jan 2019 17:30:51 +0100 (CET) From: Joerg Roedel To: "Michael S . Tsirkin" , Jason Wang , Konrad Rzeszutek Wilk , Christoph Hellwig Cc: Jens Axboe , virtualization@lists.linux-foundation.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, jfehlig@suse.com, jon.grimm@amd.com, brijesh.singh@amd.com, joro@8bytes.org, jroedel@suse.de Subject: [PATCH 3/5] dma: Introduce dma_max_mapping_size() Date: Wed, 23 Jan 2019 17:30:47 +0100 Message-Id: <20190123163049.24863-4-joro@8bytes.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123163049.24863-1-joro@8bytes.org> References: <20190123163049.24863-1-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel The function returns the maximum size that can be mapped using DMA-API functions. The patch also adds the implementation for direct DMA and a new dma_map_ops pointer so that other implementations can expose their limit. Signed-off-by: Joerg Roedel --- include/linux/dma-mapping.h | 16 ++++++++++++++++ kernel/dma/direct.c | 11 +++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index f6ded992c183..a3ca8a71a704 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -130,6 +130,7 @@ struct dma_map_ops { enum dma_data_direction direction); int (*dma_supported)(struct device *dev, u64 mask); u64 (*get_required_mask)(struct device *dev); + size_t (*max_mapping_size)(struct device *dev); }; #define DMA_MAPPING_ERROR (~(dma_addr_t)0) @@ -257,6 +258,8 @@ static inline void dma_direct_sync_sg_for_cpu(struct device *dev, } #endif +size_t dma_direct_max_mapping_size(struct device *dev); + #ifdef CONFIG_HAS_DMA #include @@ -440,6 +443,19 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) return 0; } +static inline size_t dma_max_mapping_size(struct device *dev) +{ + const struct dma_map_ops *ops = get_dma_ops(dev); + size_t size = SIZE_MAX; + + if (dma_is_direct(ops)) + size = dma_direct_max_mapping_size(dev); + else if (ops && ops->max_mapping_size) + size = ops->max_mapping_size(dev); + + return size; +} + void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag, unsigned long attrs); void dma_free_attrs(struct device *dev, size_t size, void *cpu_addr, diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 355d16acee6d..6310ad01f915 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -380,3 +380,14 @@ int dma_direct_supported(struct device *dev, u64 mask) */ return mask >= __phys_to_dma(dev, min_mask); } + +size_t dma_direct_max_mapping_size(struct device *dev) +{ + size_t size = SIZE_MAX; + + /* If SWIOTLB is active, use its maximum mapping size */ + if (is_swiotlb_active()) + size = swiotlb_max_mapping_size(dev); + + return size; +} -- 2.17.1