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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 EC3CDC433E6 for ; Mon, 1 Mar 2021 08:34:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7E6E264DDE for ; Mon, 1 Mar 2021 08:34:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E6E264DDE 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 1C07A8D005A; Mon, 1 Mar 2021 03:34:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 170B28D0059; Mon, 1 Mar 2021 03:34:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 062128D005A; Mon, 1 Mar 2021 03:34:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0034.hostedemail.com [216.40.44.34]) by kanga.kvack.org (Postfix) with ESMTP id E43CB8D0059 for ; Mon, 1 Mar 2021 03:34:49 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id AB107180ACF76 for ; Mon, 1 Mar 2021 08:34:49 +0000 (UTC) X-FDA: 77870644698.24.FDE04E5 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 35337E0011E3 for ; Mon, 1 Mar 2021 08:34:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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; bh=u8wenE83xNnepC5igb4zL7nbRigZYhYPUAh9K0DcSt4=; b=le2X1i9G+q9874lCk+S1kQo4w0 +ExgRDaa/Omact5Rb4dB1EeYpycDSNeMU32iwrMYNoEmsf4vC8i7w11GJO51oKZYFE9+xnxvirUSR XfiAzTgXS+8FyRuncAqy+hK+xu7Cdp/H5dtKumAnGsQdW5ivFyoPG4zy9Un5SsV+S2UedInfXjDIm 89aLhh7pPjsMppJ7JsWu1SK9Wuwu/zIGIp3n2CK/bCkfeO2UNDm0rwBse8G8NjDZIiOTpCgdzOK5M RconJ4hCSWP33FgcLJzkAqvYVJTuy04fP8GdCXyMhP7VXmk7fZNDipSgIJQkzGQaPzht7taUYjSgG 77MghFfQ==; Received: from [2001:4bb8:19b:e4b7:cdf9:733f:4874:8eb4] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1lGe0J-00FTzw-Ew; Mon, 01 Mar 2021 08:34:16 +0000 From: Christoph Hellwig To: Andrew Morton , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Chris Wilson , Daniel Vetter , Peter Zijlstra , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Subject: [PATCH 2/2] i915: use remap_pfn_range_notrack Date: Mon, 1 Mar 2021 09:33:20 +0100 Message-Id: <20210301083320.943079-3-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210301083320.943079-1-hch@lst.de> References: <20210301083320.943079-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-Stat-Signature: izdzzunqxyb5ekuxy8krtxa7f1tamdce X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 35337E0011E3 Received-SPF: none (casper.srs.infradead.org>: No applicable sender policy available) receiver=imf13; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614587686-208662 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: Use the remap_pfn_range_notrack helper instead of directly messing with PTEs. Signed-off-by: Christoph Hellwig --- drivers/gpu/drm/i915/i915_mm.c | 101 +++++++++------------------------ 1 file changed, 26 insertions(+), 75 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_mm.c b/drivers/gpu/drm/i915/i915_m= m.c index 666808cb3a3260..a6bafac5ade0bd 100644 --- a/drivers/gpu/drm/i915/i915_mm.c +++ b/drivers/gpu/drm/i915/i915_mm.c @@ -28,55 +28,10 @@ =20 #include "i915_drv.h" =20 -struct remap_pfn { - struct mm_struct *mm; - unsigned long pfn; - pgprot_t prot; - - struct sgt_iter sgt; - resource_size_t iobase; -}; - -static int remap_pfn(pte_t *pte, unsigned long addr, void *data) -{ - struct remap_pfn *r =3D data; - - /* Special PTE are not associated with any struct page */ - set_pte_at(r->mm, addr, pte, pte_mkspecial(pfn_pte(r->pfn, r->prot))); - r->pfn++; - - return 0; -} +#define EXPECTED_FLAGS (VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP) =20 #define use_dma(io) ((io) !=3D -1) =20 -static inline unsigned long sgt_pfn(const struct remap_pfn *r) -{ - if (use_dma(r->iobase)) - return (r->sgt.dma + r->sgt.curr + r->iobase) >> PAGE_SHIFT; - else - return r->sgt.pfn + (r->sgt.curr >> PAGE_SHIFT); -} - -static int remap_sg(pte_t *pte, unsigned long addr, void *data) -{ - struct remap_pfn *r =3D data; - - if (GEM_WARN_ON(!r->sgt.sgp)) - return -EINVAL; - - /* Special PTE are not associated with any struct page */ - set_pte_at(r->mm, addr, pte, - pte_mkspecial(pfn_pte(sgt_pfn(r), r->prot))); - r->pfn++; /* track insertions in case we need to unwind later */ - - r->sgt.curr +=3D PAGE_SIZE; - if (r->sgt.curr >=3D r->sgt.max) - r->sgt =3D __sgt_iter(__sg_next(r->sgt.sgp), use_dma(r->iobase)); - - return 0; -} - /** * remap_io_mapping - remap an IO mapping to userspace * @vma: user vma to map to @@ -91,25 +46,12 @@ int remap_io_mapping(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn, unsigned long size, struct io_mapping *iomap) { - struct remap_pfn r; - int err; - -#define EXPECTED_FLAGS (VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP) GEM_BUG_ON((vma->vm_flags & EXPECTED_FLAGS) !=3D EXPECTED_FLAGS); =20 /* We rely on prevalidation of the io-mapping to skip track_pfn(). */ - r.mm =3D vma->vm_mm; - r.pfn =3D pfn; - r.prot =3D __pgprot((pgprot_val(iomap->prot) & _PAGE_CACHE_MASK) | - (pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK)); - - err =3D apply_to_page_range(r.mm, addr, size, remap_pfn, &r); - if (unlikely(err)) { - zap_vma_ptes(vma, addr, (r.pfn - pfn) << PAGE_SHIFT); - return err; - } - - return 0; + return remap_pfn_range_notrack(vma, addr, pfn, size, + __pgprot((pgprot_val(iomap->prot) & _PAGE_CACHE_MASK) | + (pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK))); } =20 /** @@ -126,12 +68,7 @@ int remap_io_sg(struct vm_area_struct *vma, unsigned long addr, unsigned long size, struct scatterlist *sgl, resource_size_t iobase) { - struct remap_pfn r =3D { - .mm =3D vma->vm_mm, - .prot =3D vma->vm_page_prot, - .sgt =3D __sgt_iter(sgl, use_dma(iobase)), - .iobase =3D iobase, - }; + unsigned long pfn, len, remapped =3D 0; int err; =20 /* We rely on prevalidation of the io-mapping to skip track_pfn(). */ @@ -140,11 +77,25 @@ int remap_io_sg(struct vm_area_struct *vma, if (!use_dma(iobase)) flush_cache_range(vma, addr, size); =20 - err =3D apply_to_page_range(r.mm, addr, size, remap_sg, &r); - if (unlikely(err)) { - zap_vma_ptes(vma, addr, r.pfn << PAGE_SHIFT); - return err; - } - - return 0; + do { + if (use_dma(iobase)) { + if (!sg_dma_len(sgl)) + break; + pfn =3D (sg_dma_address(sgl) + iobase) >> PAGE_SHIFT; + len =3D sg_dma_len(sgl); + } else { + pfn =3D page_to_pfn(sg_page(sgl)); + len =3D sgl->length; + } + + err =3D remap_pfn_range_notrack(vma, addr + remapped, pfn, len, + vma->vm_page_prot); + if (err) + break; + remapped +=3D len; + } while ((sgl =3D __sg_next(sgl))); + + if (err) + zap_vma_ptes(vma, addr, remapped); + return err; } --=20 2.29.2