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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 C7190C43603 for ; Wed, 4 Dec 2019 13:03:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DABB2081B for ; Wed, 4 Dec 2019 13:03:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="O02zHQzr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727875AbfLDNDx (ORCPT ); Wed, 4 Dec 2019 08:03:53 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:52816 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726604AbfLDNDw (ORCPT ); Wed, 4 Dec 2019 08:03:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Bsp64KSmEt23YRaXfKdUqcfbhoOeVUFI6KMtsCkAMJ0=; b=O02zHQzrKFO01+E9khYYAfSWTl sG0EHS77rxbJgE9iF5UQhyISJ9McxENpxxDdE8QKmD9iBEvNg7ywCw6eFSCCXq5G0kKAEeBOxtOf5 HLqnyKvYW2Vk/9vSrrJhxB2YtTgSQrHJzv5DSh5J0X+7lrUlYZ7NcwQ4ttafjaZTHvJGYAU8n8pf3 4aGKHqFN7/tJVfiDZdjwb4eZZUamhM/GquFxXt5FEWCofCgVYgj7blSK+1LeJGmMkM28WJ4U7VXgL oK9NyP+RoL51DgRcN2MlOXw6XPi5zqXBlX9pSeB2Zs7Gw9jzcdQ2I7gAaFSNeO8f9x2e9uiR1x7c8 bkFk/VrQ==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1icUJn-0004D1-C8; Wed, 04 Dec 2019 13:03:47 +0000 From: Christoph Hellwig To: Thomas Hellstrom Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= , Tom Lendacky , iommu@lists.linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] dma-mapping: force unencryped devices are always addressing limited Date: Wed, 4 Dec 2019 14:03:39 +0100 Message-Id: <20191204130339.22804-3-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191204130339.22804-1-hch@lst.de> References: <20191204130339.22804-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Devices that are forced to DMA through swiotlb need to be treated as if they are addressing limited. Signed-off-by: Christoph Hellwig --- include/linux/dma-direct.h | 1 + kernel/dma/direct.c | 8 ++++++-- kernel/dma/mapping.c | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h index 24b8684aa21d..83aac21434c6 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -85,4 +85,5 @@ int dma_direct_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size, unsigned long attrs); int dma_direct_supported(struct device *dev, u64 mask); +bool dma_direct_addressing_limited(struct device *dev); #endif /* _LINUX_DMA_DIRECT_H */ diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 6af7ae83c4ad..450f3abe5cb5 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -497,11 +497,15 @@ int dma_direct_supported(struct device *dev, u64 mask) return mask >= __phys_to_dma(dev, min_mask); } +bool dma_direct_addressing_limited(struct device *dev) +{ + return force_dma_unencrypted(dev) || swiotlb_force == SWIOTLB_FORCE; +} + size_t dma_direct_max_mapping_size(struct device *dev) { /* If SWIOTLB is active, use its maximum mapping size */ - if (is_swiotlb_active() && - (dma_addressing_limited(dev) || swiotlb_force == SWIOTLB_FORCE)) + if (is_swiotlb_active() && dma_addressing_limited(dev)) return swiotlb_max_mapping_size(dev); return SIZE_MAX; } diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 1dbe6d725962..ebc60633d89a 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -416,6 +416,9 @@ EXPORT_SYMBOL_GPL(dma_get_merge_boundary); */ bool dma_addressing_limited(struct device *dev) { + if (dma_is_direct(get_dma_ops(dev)) && + dma_direct_addressing_limited(dev)) + return true; return min_not_zero(dma_get_mask(dev), dev->bus_dma_limit) < dma_get_required_mask(dev); } -- 2.20.1