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 64AE9C43331 for ; Wed, 13 Nov 2019 13:45:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 15A3F22459 for ; Wed, 13 Nov 2019 13:45:35 +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="iF3sTTwc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 15A3F22459 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AB4406B0008; Wed, 13 Nov 2019 08:45:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A40546B000A; Wed, 13 Nov 2019 08:45:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 905516B000C; Wed, 13 Nov 2019 08:45:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 72CA16B0008 for ; Wed, 13 Nov 2019 08:45:34 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id F3F9A824999B for ; Wed, 13 Nov 2019 13:45:33 +0000 (UTC) X-FDA: 76151376588.27.jelly08_6abdcf99a9840 X-HE-Tag: jelly08_6abdcf99a9840 X-Filterd-Recvd-Size: 7796 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Wed, 13 Nov 2019 13:45:33 +0000 (UTC) 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: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:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dbHXvHHO0vExx9pg+QDwRlvBCR8gm4rqbdm4b46pTX8=; b=iF3sTTwcKd+vHRsn5vqbMfUMX LMs3j0MwWMiqhx1P88B7CqzUsVMzgxihjAq/fb4Cm/ZVmGJdxG1b07NFu3DkIW7uwDuvKdiBm8jh9 sBSvLTUBxkAedST/O/gArj7PJd4necaG+lxm7k/Crx/BkyN3gYfzH9sk8eEQnVue2hYWfkOmx6ZgD elJgLa2toIFgzhQ70D+w+u60Z4SjbNesnZHmZQyNGxovmCPbMSALyHmOBtwGCJbptuNUL75CNek/w H5Hjbwrdsy3u5CLHLVND0CgGZc9wYTmwSU8SKLa6ydJYtZ2LGn0eSpitye5we3cl+pVQK/nn78GKX hnRsq5pTQ==; 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 1iUsxe-00052U-EJ; Wed, 13 Nov 2019 13:45:30 +0000 From: Christoph Hellwig To: jgg@ziepe.ca, jglisse@redhat.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/hmm: remove hmm_range_dma_map and hmm_range_dma_unmap Date: Wed, 13 Nov 2019 14:45:28 +0100 Message-Id: <20191113134528.21187-1-hch@lst.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: These two functions have never been used since they were added. Signed-off-by: Christoph Hellwig --- include/linux/hmm.h | 23 ------- mm/hmm.c | 147 -------------------------------------------- 2 files changed, 170 deletions(-) diff --git a/include/linux/hmm.h b/include/linux/hmm.h index b4af51735232..922c8d015cdb 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -230,34 +230,11 @@ static inline uint64_t hmm_device_entry_from_pfn(co= nst struct hmm_range *range, * Please see Documentation/vm/hmm.rst for how to use the range API. */ long hmm_range_fault(struct hmm_range *range, unsigned int flags); - -long hmm_range_dma_map(struct hmm_range *range, - struct device *device, - dma_addr_t *daddrs, - unsigned int flags); -long hmm_range_dma_unmap(struct hmm_range *range, - struct device *device, - dma_addr_t *daddrs, - bool dirty); #else static inline long hmm_range_fault(struct hmm_range *range, unsigned int= flags) { return -EOPNOTSUPP; } - -static inline long hmm_range_dma_map(struct hmm_range *range, - struct device *device, dma_addr_t *daddrs, - unsigned int flags) -{ - return -EOPNOTSUPP; -} - -static inline long hmm_range_dma_unmap(struct hmm_range *range, - struct device *device, - dma_addr_t *daddrs, bool dirty) -{ - return -EOPNOTSUPP; -} #endif =20 /* diff --git a/mm/hmm.c b/mm/hmm.c index 9e9d3f4ea17c..ab883eefe847 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -698,150 +698,3 @@ long hmm_range_fault(struct hmm_range *range, unsig= ned int flags) return (hmm_vma_walk.last - range->start) >> PAGE_SHIFT; } EXPORT_SYMBOL(hmm_range_fault); - -/** - * hmm_range_dma_map - hmm_range_fault() and dma map page all in one. - * @range: range being faulted - * @device: device to map page to - * @daddrs: array of dma addresses for the mapped pages - * @flags: HMM_FAULT_* - * - * Return: the number of pages mapped on success (including zero), or an= y - * status return from hmm_range_fault() otherwise. - */ -long hmm_range_dma_map(struct hmm_range *range, struct device *device, - dma_addr_t *daddrs, unsigned int flags) -{ - unsigned long i, npages, mapped; - long ret; - - ret =3D hmm_range_fault(range, flags); - if (ret <=3D 0) - return ret ? ret : -EBUSY; - - npages =3D (range->end - range->start) >> PAGE_SHIFT; - for (i =3D 0, mapped =3D 0; i < npages; ++i) { - enum dma_data_direction dir =3D DMA_TO_DEVICE; - struct page *page; - - /* - * FIXME need to update DMA API to provide invalid DMA address - * value instead of a function to test dma address value. This - * would remove lot of dumb code duplicated accross many arch. - * - * For now setting it to 0 here is good enough as the pfns[] - * value is what is use to check what is valid and what isn't. - */ - daddrs[i] =3D 0; - - page =3D hmm_device_entry_to_page(range, range->pfns[i]); - if (page =3D=3D NULL) - continue; - - /* Check if range is being invalidated */ - if (mmu_range_check_retry(range->notifier, - range->notifier_seq)) { - ret =3D -EBUSY; - goto unmap; - } - - /* If it is read and write than map bi-directional. */ - if (range->pfns[i] & range->flags[HMM_PFN_WRITE]) - dir =3D DMA_BIDIRECTIONAL; - - daddrs[i] =3D dma_map_page(device, page, 0, PAGE_SIZE, dir); - if (dma_mapping_error(device, daddrs[i])) { - ret =3D -EFAULT; - goto unmap; - } - - mapped++; - } - - return mapped; - -unmap: - for (npages =3D i, i =3D 0; (i < npages) && mapped; ++i) { - enum dma_data_direction dir =3D DMA_TO_DEVICE; - struct page *page; - - page =3D hmm_device_entry_to_page(range, range->pfns[i]); - if (page =3D=3D NULL) - continue; - - if (dma_mapping_error(device, daddrs[i])) - continue; - - /* If it is read and write than map bi-directional. */ - if (range->pfns[i] & range->flags[HMM_PFN_WRITE]) - dir =3D DMA_BIDIRECTIONAL; - - dma_unmap_page(device, daddrs[i], PAGE_SIZE, dir); - mapped--; - } - - return ret; -} -EXPORT_SYMBOL(hmm_range_dma_map); - -/** - * hmm_range_dma_unmap() - unmap range of that was map with hmm_range_dm= a_map() - * @range: range being unmapped - * @device: device against which dma map was done - * @daddrs: dma address of mapped pages - * @dirty: dirty page if it had the write flag set - * Return: number of page unmapped on success, -EINVAL otherwise - * - * Note that caller MUST abide by mmu notifier or use HMM mirror and abi= de - * to the sync_cpu_device_pagetables() callback so that it is safe here = to - * call set_page_dirty(). Caller must also take appropriate locks to avo= id - * concurrent mmu notifier or sync_cpu_device_pagetables() to make progr= ess. - */ -long hmm_range_dma_unmap(struct hmm_range *range, - struct device *device, - dma_addr_t *daddrs, - bool dirty) -{ - unsigned long i, npages; - long cpages =3D 0; - - /* Sanity check. */ - if (range->end <=3D range->start) - return -EINVAL; - if (!daddrs) - return -EINVAL; - if (!range->pfns) - return -EINVAL; - - npages =3D (range->end - range->start) >> PAGE_SHIFT; - for (i =3D 0; i < npages; ++i) { - enum dma_data_direction dir =3D DMA_TO_DEVICE; - struct page *page; - - page =3D hmm_device_entry_to_page(range, range->pfns[i]); - if (page =3D=3D NULL) - continue; - - /* If it is read and write than map bi-directional. */ - if (range->pfns[i] & range->flags[HMM_PFN_WRITE]) { - dir =3D DMA_BIDIRECTIONAL; - - /* - * See comments in function description on why it is - * safe here to call set_page_dirty() - */ - if (dirty) - set_page_dirty(page); - } - - /* Unmap and clear pfns/dma address */ - dma_unmap_page(device, daddrs[i], PAGE_SIZE, dir); - range->pfns[i] =3D range->values[HMM_PFN_NONE]; - /* FIXME see comments in hmm_vma_dma_map() */ - daddrs[i] =3D 0; - cpages++; - } - - return cpages; -} -EXPORT_SYMBOL(hmm_range_dma_unmap); --=20 2.20.1