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,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 23594C433FF for ; Wed, 14 Aug 2019 07:59:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CE8AD208C2 for ; Wed, 14 Aug 2019 07:59:55 +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="D/znYnV0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE8AD208C2 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 7BD306B000D; Wed, 14 Aug 2019 03:59:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 774B96B000E; Wed, 14 Aug 2019 03:59:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5EEEC6B0010; Wed, 14 Aug 2019 03:59:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0055.hostedemail.com [216.40.44.55]) by kanga.kvack.org (Postfix) with ESMTP id 33CE46B000D for ; Wed, 14 Aug 2019 03:59:55 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id E2F16482D for ; Wed, 14 Aug 2019 07:59:54 +0000 (UTC) X-FDA: 75820284708.22.cook05_5684510140137 X-HE-Tag: cook05_5684510140137 X-Filterd-Recvd-Size: 9009 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Wed, 14 Aug 2019 07:59:54 +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: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=4sJ9dgtsUC7Ci1f0SdNsLJkuIBkzca2k4D6PTH5Qbvc=; b=D/znYnV0I3O2TacWBvxIjKktVJ ON3aGDJeLV1KqzSGLA8rUTKXgzgbnYiSJN4BU07R4YKJ1a7yb1G8oOD8ITKLxh2I/035XkuM0VNJD ybQ1zcD7BJw5FATEfoGeRsqoiyoqV+mjLui7NDMVTq5WaWriD6TydoZoSfg4uaITb3UZYmjwFsawu jCdxQBbATYR/cuUdU+RX35jKjFSALBrmNZxEgzkQFbMPV2xF9+cRN1/3EatZaztRSt5tYGQGTgmIb 5JvV++90mf7GdDAY2ofHbe+whhRAw/bwQN1U9ouc8oxpdTWJgMVi2lBZIJq30k129Pz9UMWOi56Hf 8VGxMUyA==; Received: from [2001:4bb8:180:1ec3:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hxoCE-00082k-FZ; Wed, 14 Aug 2019 07:59:50 +0000 From: Christoph Hellwig To: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: Ralph Campbell , Bharata B Rao , Andrew Morton , linux-mm@kvack.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] nouveau: simplify nouveau_dmem_migrate_to_ram Date: Wed, 14 Aug 2019 09:59:24 +0200 Message-Id: <20190814075928.23766-7-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814075928.23766-1-hch@lst.de> References: <20190814075928.23766-1-hch@lst.de> 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: Factor the main copy page to ram routine out into a helper that acts on a single page and which doesn't require the nouveau_dmem_fault structure for argument passing. Also remove the loop over multiple pages as we only handle one at the moment, although the structure of the main worker function makes it relatively easy to add multi page support back if needed in the future. But at least for now this avoid the needed to dynamically allocate memory for the dma addresses in what is essentially the page fault path. Signed-off-by: Christoph Hellwig Reviewed-by: Ralph Campbell --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 161 ++++++------------------- 1 file changed, 40 insertions(+), 121 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nou= veau/nouveau_dmem.c index 21052a4aaf69..7dded864022c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -86,13 +86,6 @@ static inline struct nouveau_dmem *page_to_dmem(struct= page *page) return container_of(page->pgmap, struct nouveau_dmem, pagemap); } =20 -struct nouveau_dmem_fault { - struct nouveau_drm *drm; - struct nouveau_fence *fence; - dma_addr_t *dma; - unsigned long npages; -}; - struct nouveau_migrate { struct vm_area_struct *vma; struct nouveau_drm *drm; @@ -146,130 +139,55 @@ static void nouveau_dmem_fence_done(struct nouveau= _fence **fence) } } =20 -static void -nouveau_dmem_fault_alloc_and_copy(struct vm_area_struct *vma, - const unsigned long *src_pfns, - unsigned long *dst_pfns, - unsigned long start, - unsigned long end, - struct nouveau_dmem_fault *fault) +static vm_fault_t nouveau_dmem_fault_copy_one(struct nouveau_drm *drm, + struct vm_fault *vmf, struct migrate_vma *args, + dma_addr_t *dma_addr) { - struct nouveau_drm *drm =3D fault->drm; struct device *dev =3D drm->dev->dev; - unsigned long addr, i, npages =3D 0; - nouveau_migrate_copy_t copy; - int ret; - - - /* First allocate new memory */ - for (addr =3D start, i =3D 0; addr < end; addr +=3D PAGE_SIZE, i++) { - struct page *dpage, *spage; - - dst_pfns[i] =3D 0; - spage =3D migrate_pfn_to_page(src_pfns[i]); - if (!spage || !(src_pfns[i] & MIGRATE_PFN_MIGRATE)) - continue; - - dpage =3D alloc_page_vma(GFP_HIGHUSER, vma, addr); - if (!dpage) { - dst_pfns[i] =3D MIGRATE_PFN_ERROR; - continue; - } - lock_page(dpage); - - dst_pfns[i] =3D migrate_pfn(page_to_pfn(dpage)) | - MIGRATE_PFN_LOCKED; - npages++; - } - - /* Allocate storage for DMA addresses, so we can unmap later. */ - fault->dma =3D kmalloc(sizeof(*fault->dma) * npages, GFP_KERNEL); - if (!fault->dma) - goto error; - - /* Copy things over */ - copy =3D drm->dmem->migrate.copy_func; - for (addr =3D start, i =3D 0; addr < end; addr +=3D PAGE_SIZE, i++) { - struct page *spage, *dpage; - - dpage =3D migrate_pfn_to_page(dst_pfns[i]); - if (!dpage || dst_pfns[i] =3D=3D MIGRATE_PFN_ERROR) - continue; - - spage =3D migrate_pfn_to_page(src_pfns[i]); - if (!spage || !(src_pfns[i] & MIGRATE_PFN_MIGRATE)) { - dst_pfns[i] =3D MIGRATE_PFN_ERROR; - __free_page(dpage); - continue; - } + struct page *dpage, *spage; =20 - fault->dma[fault->npages] =3D - dma_map_page_attrs(dev, dpage, 0, PAGE_SIZE, - PCI_DMA_BIDIRECTIONAL, - DMA_ATTR_SKIP_CPU_SYNC); - if (dma_mapping_error(dev, fault->dma[fault->npages])) { - dst_pfns[i] =3D MIGRATE_PFN_ERROR; - __free_page(dpage); - continue; - } - - ret =3D copy(drm, 1, NOUVEAU_APER_HOST, - fault->dma[fault->npages++], - NOUVEAU_APER_VRAM, - nouveau_dmem_page_addr(spage)); - if (ret) { - dst_pfns[i] =3D MIGRATE_PFN_ERROR; - __free_page(dpage); - continue; - } - } - - nouveau_fence_new(drm->dmem->migrate.chan, false, &fault->fence); - - return; - -error: - for (addr =3D start, i =3D 0; addr < end; addr +=3D PAGE_SIZE, ++i) { - struct page *page; - - if (!dst_pfns[i] || dst_pfns[i] =3D=3D MIGRATE_PFN_ERROR) - continue; + spage =3D migrate_pfn_to_page(args->src[0]); + if (!spage || !(args->src[0] & MIGRATE_PFN_MIGRATE)) + return 0; =20 - page =3D migrate_pfn_to_page(dst_pfns[i]); - dst_pfns[i] =3D MIGRATE_PFN_ERROR; - if (page =3D=3D NULL) - continue; + dpage =3D alloc_page_vma(GFP_HIGHUSER, vmf->vma, vmf->address); + if (!dpage) + return VM_FAULT_SIGBUS; + lock_page(dpage); =20 - __free_page(page); - } -} + *dma_addr =3D dma_map_page(dev, dpage, 0, PAGE_SIZE, DMA_BIDIRECTIONAL)= ; + if (dma_mapping_error(dev, *dma_addr)) + goto error_free_page; =20 -static void -nouveau_dmem_fault_finalize_and_map(struct nouveau_dmem_fault *fault) -{ - struct nouveau_drm *drm =3D fault->drm; + if (drm->dmem->migrate.copy_func(drm, 1, NOUVEAU_APER_HOST, *dma_addr, + NOUVEAU_APER_VRAM, nouveau_dmem_page_addr(spage))) + goto error_dma_unmap; =20 - nouveau_dmem_fence_done(&fault->fence); + args->dst[0] =3D migrate_pfn(page_to_pfn(dpage)) | MIGRATE_PFN_LOCKED; + return 0; =20 - while (fault->npages--) { - dma_unmap_page(drm->dev->dev, fault->dma[fault->npages], - PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); - } - kfree(fault->dma); +error_dma_unmap: + dma_unmap_page(dev, *dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); +error_free_page: + __free_page(dpage); + return VM_FAULT_SIGBUS; } =20 static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf) { struct nouveau_dmem *dmem =3D page_to_dmem(vmf->page); - unsigned long src[1] =3D {0}, dst[1] =3D {0}; + struct nouveau_drm *drm =3D dmem->drm; + struct nouveau_fence *fence; + unsigned long src =3D 0, dst =3D 0; + dma_addr_t dma_addr =3D 0; + vm_fault_t ret; struct migrate_vma args =3D { .vma =3D vmf->vma, .start =3D vmf->address, .end =3D vmf->address + PAGE_SIZE, - .src =3D src, - .dst =3D dst, + .src =3D &src, + .dst =3D &dst, }; - struct nouveau_dmem_fault fault =3D { .drm =3D dmem->drm }; =20 /* * FIXME what we really want is to find some heuristic to migrate more @@ -281,16 +199,17 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struc= t vm_fault *vmf) if (!args.cpages) return 0; =20 - nouveau_dmem_fault_alloc_and_copy(args.vma, src, dst, args.start, - args.end, &fault); - migrate_vma_pages(&args); - nouveau_dmem_fault_finalize_and_map(&fault); + ret =3D nouveau_dmem_fault_copy_one(drm, vmf, &args, &dma_addr); + if (ret || dst =3D=3D 0) + goto done; =20 + nouveau_fence_new(dmem->migrate.chan, false, &fence); + migrate_vma_pages(&args); + nouveau_dmem_fence_done(&fence); + dma_unmap_page(drm->dev->dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); +done: migrate_vma_finalize(&args); - if (dst[0] =3D=3D MIGRATE_PFN_ERROR) - return VM_FAULT_SIGBUS; - - return 0; + return ret; } =20 static const struct dev_pagemap_ops nouveau_dmem_pagemap_ops =3D { --=20 2.20.1