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.5 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,URIBL_BLOCKED,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 CB3EAC76186 for ; Wed, 17 Jul 2019 06:26:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A52472173E for ; Wed, 17 Jul 2019 06:26:29 +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="bBnd0AdO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727192AbfGQG02 (ORCPT ); Wed, 17 Jul 2019 02:26:28 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:55754 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725799AbfGQG00 (ORCPT ); Wed, 17 Jul 2019 02:26:26 -0400 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=OLwTCcLK9RCDLApQkrPt1aEZJtEp881EMTzP2xH5Nhs=; b=bBnd0AdOa9hsjs95DLZBAj9wOu 71SngVQOvq1F+jY06WmWvge52T04SRT5Th26KVoNHdiBc0susGmKQZReAbCj8/9X3cVg/4WZ84kR2 NmMVO8GukhfU7LlPZKWeyTh30O8Pr//KBdWHKuaGrVUOQGvGYIevCAbDkx85VrQZiVJ6SDc9pVMpw oPCq5ICplg/V35SDoQhpUribj7InOPzVApExlLAIL8D4O3iEdCFsRhB6mgo2shJO7pN/+Gd+ie0su 1oL4/pa/hcD9CRAW6GeVKpJR2f0mGPj8zMYhSgl6j0TspJw0MuL+poTX8xJLFcBI0ncvF/cWApd27 kIpw7SKA==; Received: from [213.208.157.38] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hndOS-0003n0-Eu; Wed, 17 Jul 2019 06:26:24 +0000 From: Christoph Hellwig To: iommu@lists.linux-foundation.org Cc: Joerg Roedel , Benjamin Herrenschmidt , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] dma-direct: only limit the mapping size if swiotlb could be used Date: Wed, 17 Jul 2019 08:26:15 +0200 Message-Id: <20190717062615.10569-3-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717062615.10569-1-hch@lst.de> References: <20190717062615.10569-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 Don't just check for a swiotlb buffer, but also if buffering might be required for this particular device. Fixes: 133d624b1cee ("dma: Introduce dma_max_mapping_size()") Reported-by: Benjamin Herrenschmidt Signed-off-by: Christoph Hellwig Tested-by: Benjamin Herrenschmidt --- kernel/dma/direct.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index d7cec866d16b..e269b6f9b444 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -399,11 +399,9 @@ int dma_direct_supported(struct device *dev, u64 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; + if (is_swiotlb_active() && + (dma_addressing_limited(dev) || swiotlb_force == SWIOTLB_FORCE)) + return swiotlb_max_mapping_size(dev); + return SIZE_MAX; } -- 2.20.1