drm/i915: Use remap_io_mapping() to prefault all PTE in a single pass (c58305af) · Commits · 戴 / test

drivers/gpu/drm/i915/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ subdir-ccflags-y += \
		i915-y := i915_drv.o \
		i915_irq.o \
		i915_memcpy.o \
		i915_mm.o \
		i915_params.o \
		i915_pci.o \
		i915_suspend.o \

drivers/gpu/drm/i915/i915_drv.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -3931,6 +3931,11 @@ static inline bool __i915_request_irq_complete(struct drm_i915_gem_request *req)
		void i915_memcpy_init_early(struct drm_i915_private *dev_priv);
		bool i915_memcpy_from_wc(void dst, const void src, unsigned long len);

		/* i915_mm.c */
		int remap_io_mapping(struct vm_area_struct *vma,
		unsigned long addr, unsigned long pfn, unsigned long size,
		struct io_mapping *iomap);

		#define ptr_mask_bits(ptr) ({ \
		unsigned long __v = (unsigned long)(ptr); \
		(typeof(ptr))(__v & PAGE_MASK); \

drivers/gpu/drm/i915/i915_gem.c

+7 −43

Original line number	Diff line number	Diff line
		@@ -1705,7 +1705,6 @@ int i915_gem_fault(struct vm_area_struct area, struct vm_fault vmf)
		bool write = !!(vmf->flags & FAULT_FLAG_WRITE);
		struct i915_vma *vma;
		pgoff_t page_offset;
		unsigned long pfn;
		unsigned int flags;
		int ret;

		@@ -1790,48 +1789,13 @@ int i915_gem_fault(struct vm_area_struct area, struct vm_fault vmf)
		goto err_unpin;

		/* Finally, remap it using the new GTT offset */
		pfn = ggtt->mappable_base + i915_ggtt_offset(vma);
		pfn >>= PAGE_SHIFT;

		if (vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL) {
		if (!obj->fault_mappable) {
		unsigned long size =
		min_t(unsigned long,
		area->vm_end - area->vm_start,
		obj->base.size) >> PAGE_SHIFT;
		unsigned long base = area->vm_start;
		int i;

		for (i = 0; i < size; i++) {
		ret = vm_insert_pfn(area,
		base + i * PAGE_SIZE,
		pfn + i);
		if (ret)
		break;
		}
		} else
		ret = vm_insert_pfn(area,
		(unsigned long)vmf->virtual_address,
		pfn + page_offset);
		} else {
		/* Overriding existing pages in partial view does not cause
		* us any trouble as TLBs are still valid because the fault
		* is due to userspace losing part of the mapping or never
		* having accessed it before (at this partials' range).
		*/
		const struct i915_ggtt_view *view = &vma->ggtt_view;
		unsigned long base = area->vm_start +
		(view->params.partial.offset << PAGE_SHIFT);
		unsigned int i;

		for (i = 0; i < view->params.partial.size; i++) {
		ret = vm_insert_pfn(area,
		base + i * PAGE_SIZE,
		pfn + i);
		ret = remap_io_mapping(area,
		area->vm_start + (vma->ggtt_view.params.partial.offset << PAGE_SHIFT),
		(ggtt->mappable_base + vma->node.start) >> PAGE_SHIFT,
		min_t(u64, vma->size, area->vm_end - area->vm_start),
		&ggtt->mappable);
		if (ret)
		break;
		}
		}
		goto err_unpin;

		obj->fault_mappable = true;
		err_unpin:

drivers/gpu/drm/i915/i915_mm.c

0 → 100644

+84 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright © 2014 Intel Corporation
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice (including the next
		* paragraph) shall be included in all copies or substantial portions of the
		* Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
		* IN THE SOFTWARE.
		*
		*/

		#include <linux/mm.h>
		#include <linux/io-mapping.h>

		#include <asm/pgtable.h>

		#include "i915_drv.h"

		struct remap_pfn {
		struct mm_struct *mm;
		unsigned long pfn;
		pgprot_t prot;
		};

		static int remap_pfn(pte_t *pte, pgtable_t token,
		unsigned long addr, void *data)
		{
		struct remap_pfn *r = 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;
		}

		/**
		* remap_io_mapping - remap an IO mapping to userspace
		* @vma: user vma to map to
		* @addr: target user address to start at
		* @pfn: physical address of kernel memory
		* @size: size of map area
		* @iomap: the source io_mapping
		*
		* Note: this is only safe if the mm semaphore is held when called.
		*/
		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;

		GEM_BUG_ON((vma->vm_flags &
		(VM_IO \| VM_PFNMAP \| VM_DONTEXPAND \| VM_DONTDUMP)) !=
		(VM_IO \| VM_PFNMAP \| VM_DONTEXPAND \| VM_DONTDUMP));

		/* We rely on prevalidation of the io-mapping to skip track_pfn(). */
		r.mm = vma->vm_mm;
		r.pfn = pfn;
		r.prot = __pgprot((pgprot_val(iomap->prot) & _PAGE_CACHE_MASK) \|
		(pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK));

		err = 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;
		}

drivers/gpu/drm/Makefile

+1 −1

File changed.

Contains only whitespace changes.

Admin message