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=-2.6 required=3.0 tests=DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,T_DKIM_INVALID, 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 2DB5EC6778F for ; Wed, 25 Jul 2018 11:38:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB86220882 for ; Wed, 25 Jul 2018 11:38:23 +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="m7CpYs4+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB86220882 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729020AbeGYMti (ORCPT ); Wed, 25 Jul 2018 08:49:38 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:39580 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728942AbeGYMth (ORCPT ); Wed, 25 Jul 2018 08:49:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding: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=vy1AbUPxoxTHXAfojuJcKE3dc0cefIj3qw16oX/W7wI=; b=m7CpYs4+j9tiPXdMkWUEB+dbc W8mxfQP3rzWH9y5DS0xufrTJ+F79pH1WieyIIcSJYyB/9j08f7PdssX8T27mjrnsIfn3s/S88+GO8 vC/BmScZ2EJT32ifEYosYLPBeZT1EkC3wY4HJXuELxU5VbY/yG9aV2tw5Jnegozq1dkUlbJiHKjML em5Zzt3lXHkC2fgaMbh28EJdryjdE2xTsgsjf3au9Fh8d5SsN+kEydcxp/7OO3V9OusEUuBFVCQXY hzb2FcSonrVidMZCAMxcnnjnY7aRDX3hHJ/rDyO8ZALZHzV4b2bkr2+wQtrPFCu4WrtE1wJcHUoZJ u1flhSNFg==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fiI7X-0006p2-Bt; Wed, 25 Jul 2018 11:38:19 +0000 From: Christoph Hellwig To: Konrad Rzeszutek Wilk Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] swiotlb: share more code between map_page and map_sg Date: Wed, 25 Jul 2018 13:38:01 +0200 Message-Id: <20180725113802.18943-6-hch@lst.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180725113802.18943-1-hch@lst.de> References: <20180725113802.18943-1-hch@lst.de> 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 Refactor all the common code into what previously was map_single, which is now renamed to __swiotlb_map_page. This also improves the map_sg error handling and diagnostics to match the map_page ones. Signed-off-by: Christoph Hellwig --- kernel/dma/swiotlb.c | 114 ++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 61 deletions(-) diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 5555e1fd03cf..8ca0964ebf3a 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -593,21 +593,47 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, /* * Allocates bounce buffer and returns its physical address. */ -static phys_addr_t -map_single(struct device *hwdev, phys_addr_t phys, size_t size, - enum dma_data_direction dir, unsigned long attrs) +static int +__swiotlb_map_page(struct device *dev, phys_addr_t phys, size_t size, + enum dma_data_direction dir, unsigned long attrs, + dma_addr_t *dma_addr) { - dma_addr_t start_dma_addr; - - if (swiotlb_force == SWIOTLB_NO_FORCE) { - dev_warn_ratelimited(hwdev, "Cannot do DMA to address %pa\n", - &phys); - return SWIOTLB_MAP_ERROR; + phys_addr_t map_addr; + + if (WARN_ON_ONCE(dir == DMA_NONE)) + return -EINVAL; + *dma_addr = phys_to_dma(dev, phys); + + switch (swiotlb_force) { + case SWIOTLB_NO_FORCE: + dev_warn_ratelimited(dev, + "swiotlb: force disabled for address %pa\n", &phys); + return -EOPNOTSUPP; + case SWIOTLB_NORMAL: + /* can we address the memory directly? */ + if (dma_capable(dev, *dma_addr, size)) + return 0; + break; + case SWIOTLB_FORCE: + break; } - start_dma_addr = __phys_to_dma(hwdev, io_tlb_start); - return swiotlb_tbl_map_single(hwdev, start_dma_addr, phys, size, - dir, attrs); + trace_swiotlb_bounced(dev, *dma_addr, size, swiotlb_force); + map_addr = swiotlb_tbl_map_single(dev, __phys_to_dma(dev, io_tlb_start), + phys, size, dir, attrs); + if (unlikely(map_addr == SWIOTLB_MAP_ERROR)) + return -ENOMEM; + + /* Ensure that the address returned is DMA'ble */ + *dma_addr = __phys_to_dma(dev, map_addr); + if (unlikely(!dma_capable(dev, *dma_addr, size))) { + dev_err_ratelimited(dev, + "DMA: swiotlb buffer not addressable.\n"); + swiotlb_tbl_unmap_single(dev, map_addr, size, dir, + attrs | DMA_ATTR_SKIP_CPU_SYNC); + return -EINVAL; + } + return 0; } /* @@ -773,35 +799,12 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, enum dma_data_direction dir, unsigned long attrs) { - phys_addr_t map, phys = page_to_phys(page) + offset; - dma_addr_t dev_addr = phys_to_dma(dev, phys); - - BUG_ON(dir == DMA_NONE); - /* - * If the address happens to be in the device's DMA window, - * we can safely return the device addr and not worry about bounce - * buffering it. - */ - if (dma_capable(dev, dev_addr, size) && swiotlb_force != SWIOTLB_FORCE) - return dev_addr; + dma_addr_t dma_addr; - trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force); - - /* Oh well, have to allocate and map a bounce buffer. */ - map = map_single(dev, phys, size, dir, attrs); - if (map == SWIOTLB_MAP_ERROR) + if (unlikely(__swiotlb_map_page(dev, page_to_phys(page) + offset, size, + dir, attrs, &dma_addr) < 0)) return __phys_to_dma(dev, io_tlb_overflow_buffer); - - dev_addr = __phys_to_dma(dev, map); - - /* Ensure that the address returned is DMA'ble */ - if (dma_capable(dev, dev_addr, size)) - return dev_addr; - - attrs |= DMA_ATTR_SKIP_CPU_SYNC; - swiotlb_tbl_unmap_single(dev, map, size, dir, attrs); - - return __phys_to_dma(dev, io_tlb_overflow_buffer); + return dma_addr; } /* @@ -892,37 +895,26 @@ swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr, * same here. */ int -swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, +swiotlb_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nelems, enum dma_data_direction dir, unsigned long attrs) { struct scatterlist *sg; int i; - BUG_ON(dir == DMA_NONE); - for_each_sg(sgl, sg, nelems, i) { - phys_addr_t paddr = sg_phys(sg); - dma_addr_t dev_addr = phys_to_dma(hwdev, paddr); - - if (swiotlb_force == SWIOTLB_FORCE || - !dma_capable(hwdev, dev_addr, sg->length)) { - phys_addr_t map = map_single(hwdev, sg_phys(sg), - sg->length, dir, attrs); - if (map == SWIOTLB_MAP_ERROR) { - /* Don't panic here, we expect map_sg users - to do proper error handling. */ - attrs |= DMA_ATTR_SKIP_CPU_SYNC; - swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir, - attrs); - sg_dma_len(sgl) = 0; - return 0; - } - sg->dma_address = __phys_to_dma(hwdev, map); - } else - sg->dma_address = dev_addr; + if (unlikely(__swiotlb_map_page(dev, sg_phys(sg), sg->length, + dir, attrs, &sg->dma_address) < 0)) + goto out_error; sg_dma_len(sg) = sg->length; } + return nelems; + +out_error: + swiotlb_unmap_sg_attrs(dev, sgl, i, dir, + attrs | DMA_ATTR_SKIP_CPU_SYNC); + sg_dma_len(sgl) = 0; + return 0; } /* -- 2.18.0